* docs: add ACP persistent binding experiment plan * docs: align ACP persistent binding spec to channel-local config * docs: scope Telegram ACP bindings to forum topics only * docs: lock bound /new and /reset behavior to in-place ACP reset * ACP: add persistent discord/telegram conversation bindings * ACP: fix persistent binding reuse and discord thread parent context * docs: document channel-specific persistent ACP bindings * ACP: split persistent bindings and share conversation id helpers * ACP: defer configured binding init until preflight passes * ACP: fix discord thread parent fallback and explicit disable inheritance * ACP: keep bound /new and /reset in-place * ACP: honor configured bindings in native command flows * ACP: avoid configured fallback after runtime bind failure * docs: refine ACP bindings experiment config examples * acp: cut over to typed top-level persistent bindings * ACP bindings: harden reset recovery and native command auth * Docs: add ACP bound command auth proposal * Tests: normalize i18n registry zh-CN assertion encoding * ACP bindings: address review findings for reset and fallback routing * ACP reset: gate hooks on success and preserve /new arguments * ACP bindings: fix auth and binding-priority review findings * Telegram ACP: gate ensure on auth and accepted messages * ACP bindings: fix session-key precedence and unavailable handling * ACP reset/native commands: honor fallback targets and abort on bootstrap failure * Config schema: validate ACP binding channel and Telegram topic IDs * Discord ACP: apply configured DM bindings to native commands * ACP reset tails: dispatch through ACP after command handling * ACP tails/native reset auth: fix target dispatch and restore full auth * ACP reset detection: fallback to active ACP keys for DM contexts * Tests: type runTurn mock input in ACP dispatch test * ACP: dedup binding route bootstrap and reset target resolution * reply: align ACP reset hooks with bound session key * docs: replace personal discord ids with placeholders * fix: add changelog entry for ACP persistent bindings (#34873) (thanks @dutifulbob) --------- Co-authored-by: Onur <2453968+osolmaz@users.noreply.github.com>
77 lines
2.1 KiB
TypeScript
77 lines
2.1 KiB
TypeScript
import type { OpenClawConfig } from "../config/config.js";
|
|
import type { ResolvedAgentRoute } from "../routing/resolve-route.js";
|
|
import { resolveAgentIdFromSessionKey } from "../routing/session-key.js";
|
|
import {
|
|
ensureConfiguredAcpBindingSession,
|
|
resolveConfiguredAcpBindingRecord,
|
|
type ConfiguredAcpBindingChannel,
|
|
type ResolvedConfiguredAcpBinding,
|
|
} from "./persistent-bindings.js";
|
|
|
|
export function resolveConfiguredAcpRoute(params: {
|
|
cfg: OpenClawConfig;
|
|
route: ResolvedAgentRoute;
|
|
channel: ConfiguredAcpBindingChannel;
|
|
accountId: string;
|
|
conversationId: string;
|
|
parentConversationId?: string;
|
|
}): {
|
|
configuredBinding: ResolvedConfiguredAcpBinding | null;
|
|
route: ResolvedAgentRoute;
|
|
boundSessionKey?: string;
|
|
boundAgentId?: string;
|
|
} {
|
|
const configuredBinding = resolveConfiguredAcpBindingRecord({
|
|
cfg: params.cfg,
|
|
channel: params.channel,
|
|
accountId: params.accountId,
|
|
conversationId: params.conversationId,
|
|
parentConversationId: params.parentConversationId,
|
|
});
|
|
if (!configuredBinding) {
|
|
return {
|
|
configuredBinding: null,
|
|
route: params.route,
|
|
};
|
|
}
|
|
const boundSessionKey = configuredBinding.record.targetSessionKey?.trim() ?? "";
|
|
if (!boundSessionKey) {
|
|
return {
|
|
configuredBinding,
|
|
route: params.route,
|
|
};
|
|
}
|
|
const boundAgentId = resolveAgentIdFromSessionKey(boundSessionKey) || params.route.agentId;
|
|
return {
|
|
configuredBinding,
|
|
boundSessionKey,
|
|
boundAgentId,
|
|
route: {
|
|
...params.route,
|
|
sessionKey: boundSessionKey,
|
|
agentId: boundAgentId,
|
|
matchedBy: "binding.channel",
|
|
},
|
|
};
|
|
}
|
|
|
|
export async function ensureConfiguredAcpRouteReady(params: {
|
|
cfg: OpenClawConfig;
|
|
configuredBinding: ResolvedConfiguredAcpBinding | null;
|
|
}): Promise<{ ok: true } | { ok: false; error: string }> {
|
|
if (!params.configuredBinding) {
|
|
return { ok: true };
|
|
}
|
|
const ensured = await ensureConfiguredAcpBindingSession({
|
|
cfg: params.cfg,
|
|
spec: params.configuredBinding.spec,
|
|
});
|
|
if (ensured.ok) {
|
|
return { ok: true };
|
|
}
|
|
return {
|
|
ok: false,
|
|
error: ensured.error ?? "unknown error",
|
|
};
|
|
}
|