refactor: centralize account bindings + health probes

This commit is contained in:
Peter Steinberger
2026-01-17 01:13:46 +00:00
parent 99aba3a5c4
commit f14d622c0f
12 changed files with 877 additions and 164 deletions

84
src/routing/bindings.ts Normal file
View File

@@ -0,0 +1,84 @@
import { resolveDefaultAgentId } from "../agents/agent-scope.js";
import { normalizeChatChannelId } from "../channels/registry.js";
import type { ClawdbotConfig } from "../config/config.js";
import type { AgentBinding } from "../config/types.agents.js";
import { normalizeAccountId, normalizeAgentId } from "./session-key.js";
function normalizeBindingChannelId(raw?: string | null): string | null {
const normalized = normalizeChatChannelId(raw);
if (normalized) return normalized;
const fallback = (raw ?? "").trim().toLowerCase();
return fallback || null;
}
export function listBindings(cfg: ClawdbotConfig): AgentBinding[] {
return Array.isArray(cfg.bindings) ? cfg.bindings : [];
}
export function listBoundAccountIds(cfg: ClawdbotConfig, channelId: string): string[] {
const normalizedChannel = normalizeBindingChannelId(channelId);
if (!normalizedChannel) return [];
const ids = new Set<string>();
for (const binding of listBindings(cfg)) {
if (!binding || typeof binding !== "object") continue;
const match = binding.match;
if (!match || typeof match !== "object") continue;
const channel = normalizeBindingChannelId(match.channel);
if (!channel || channel !== normalizedChannel) continue;
const accountId = typeof match.accountId === "string" ? match.accountId.trim() : "";
if (!accountId || accountId === "*") continue;
ids.add(normalizeAccountId(accountId));
}
return Array.from(ids).sort((a, b) => a.localeCompare(b));
}
export function resolveDefaultAgentBoundAccountId(
cfg: ClawdbotConfig,
channelId: string,
): string | null {
const normalizedChannel = normalizeBindingChannelId(channelId);
if (!normalizedChannel) return null;
const defaultAgentId = normalizeAgentId(resolveDefaultAgentId(cfg));
for (const binding of listBindings(cfg)) {
if (!binding || typeof binding !== "object") continue;
if (normalizeAgentId(binding.agentId) !== defaultAgentId) continue;
const match = binding.match;
if (!match || typeof match !== "object") continue;
const channel = normalizeBindingChannelId(match.channel);
if (!channel || channel !== normalizedChannel) continue;
const accountId = typeof match.accountId === "string" ? match.accountId.trim() : "";
if (!accountId || accountId === "*") continue;
return normalizeAccountId(accountId);
}
return null;
}
export function buildChannelAccountBindings(cfg: ClawdbotConfig) {
const map = new Map<string, Map<string, string[]>>();
for (const binding of listBindings(cfg)) {
if (!binding || typeof binding !== "object") continue;
const match = binding.match;
if (!match || typeof match !== "object") continue;
const channelId = normalizeBindingChannelId(match.channel);
if (!channelId) continue;
const accountId = typeof match.accountId === "string" ? match.accountId.trim() : "";
if (!accountId || accountId === "*") continue;
const agentId = normalizeAgentId(binding.agentId);
const byAgent = map.get(channelId) ?? new Map<string, string[]>();
const list = byAgent.get(agentId) ?? [];
const normalizedAccountId = normalizeAccountId(accountId);
if (!list.includes(normalizedAccountId)) list.push(normalizedAccountId);
byAgent.set(agentId, list);
map.set(channelId, byAgent);
}
return map;
}
export function resolvePreferredAccountId(params: {
accountIds: string[];
defaultAccountId: string;
boundAccounts: string[];
}): string {
if (params.boundAccounts.length > 0) return params.boundAccounts[0];
return params.defaultAccountId;
}

View File

@@ -1,5 +1,6 @@
import { resolveDefaultAgentId } from "../agents/agent-scope.js";
import type { ClawdbotConfig } from "../config/config.js";
import { listBindings } from "./bindings.js";
import {
buildAgentMainSessionKey,
buildAgentPeerSessionKey,
@@ -85,11 +86,6 @@ export function buildAgentSessionKey(params: {
});
}
function listBindings(cfg: ClawdbotConfig) {
const bindings = cfg.bindings;
return Array.isArray(bindings) ? bindings : [];
}
function listAgents(cfg: ClawdbotConfig) {
const agents = cfg.agents?.list;
return Array.isArray(agents) ? agents : [];