6a705a37f2
* 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>
76 lines
2.7 KiB
TypeScript
76 lines
2.7 KiB
TypeScript
import { resolveConfiguredAcpBindingRecord } from "../../acp/persistent-bindings.js";
|
|
import type { OpenClawConfig } from "../../config/config.js";
|
|
import { getSessionBindingService } from "../../infra/outbound/session-binding-service.js";
|
|
import { DEFAULT_ACCOUNT_ID, isAcpSessionKey } from "../../routing/session-key.js";
|
|
|
|
function normalizeText(value: string | undefined | null): string {
|
|
return value?.trim() ?? "";
|
|
}
|
|
|
|
export function resolveEffectiveResetTargetSessionKey(params: {
|
|
cfg: OpenClawConfig;
|
|
channel?: string | null;
|
|
accountId?: string | null;
|
|
conversationId?: string | null;
|
|
parentConversationId?: string | null;
|
|
activeSessionKey?: string | null;
|
|
allowNonAcpBindingSessionKey?: boolean;
|
|
skipConfiguredFallbackWhenActiveSessionNonAcp?: boolean;
|
|
fallbackToActiveAcpWhenUnbound?: boolean;
|
|
}): string | undefined {
|
|
const activeSessionKey = normalizeText(params.activeSessionKey);
|
|
const activeAcpSessionKey =
|
|
activeSessionKey && isAcpSessionKey(activeSessionKey) ? activeSessionKey : undefined;
|
|
const activeIsNonAcp = Boolean(activeSessionKey) && !activeAcpSessionKey;
|
|
|
|
const channel = normalizeText(params.channel).toLowerCase();
|
|
const conversationId = normalizeText(params.conversationId);
|
|
if (!channel || !conversationId) {
|
|
return activeAcpSessionKey;
|
|
}
|
|
const accountId = normalizeText(params.accountId) || DEFAULT_ACCOUNT_ID;
|
|
const parentConversationId = normalizeText(params.parentConversationId) || undefined;
|
|
const allowNonAcpBindingSessionKey = Boolean(params.allowNonAcpBindingSessionKey);
|
|
|
|
const serviceBinding = getSessionBindingService().resolveByConversation({
|
|
channel,
|
|
accountId,
|
|
conversationId,
|
|
parentConversationId,
|
|
});
|
|
const serviceSessionKey =
|
|
serviceBinding?.targetKind === "session" ? serviceBinding.targetSessionKey.trim() : "";
|
|
if (serviceSessionKey) {
|
|
if (allowNonAcpBindingSessionKey) {
|
|
return serviceSessionKey;
|
|
}
|
|
return isAcpSessionKey(serviceSessionKey) ? serviceSessionKey : undefined;
|
|
}
|
|
|
|
if (activeIsNonAcp && params.skipConfiguredFallbackWhenActiveSessionNonAcp) {
|
|
return undefined;
|
|
}
|
|
|
|
const configuredBinding = resolveConfiguredAcpBindingRecord({
|
|
cfg: params.cfg,
|
|
channel,
|
|
accountId,
|
|
conversationId,
|
|
parentConversationId,
|
|
});
|
|
const configuredSessionKey =
|
|
configuredBinding?.record.targetKind === "session"
|
|
? configuredBinding.record.targetSessionKey.trim()
|
|
: "";
|
|
if (configuredSessionKey) {
|
|
if (allowNonAcpBindingSessionKey) {
|
|
return configuredSessionKey;
|
|
}
|
|
return isAcpSessionKey(configuredSessionKey) ? configuredSessionKey : undefined;
|
|
}
|
|
if (params.fallbackToActiveAcpWhenUnbound === false) {
|
|
return undefined;
|
|
}
|
|
return activeAcpSessionKey;
|
|
}
|