mirror of
https://github.com/openclaw/openclaw.git
synced 2026-03-22 23:41:07 +00:00
* ACPX: keep plugin-local runtime installs out of dist * Gateway: harden ACP startup and service PATH * ACP: reinitialize error-state configured bindings * ACP: classify pre-turn runtime failures as session init failures * Plugins: move configured ACP routing behind channel seams * Telegram tests: align startup probe assertions after rebase * Discord: harden ACP configured binding recovery * ACP: recover Discord bindings after stale runtime exits * ACPX: replace dead sessions during ensure * Discord: harden ACP binding recovery * Discord: fix review follow-ups * ACP bindings: load channel snapshots across workspaces * ACP bindings: cache snapshot channel plugin resolution * Experiments: add ACP pluginification holy grail plan * Experiments: rename ACP pluginification plan doc * Experiments: drop old ACP pluginification doc path * ACP: move configured bindings behind plugin services * Experiments: update bindings capability architecture plan * Bindings: isolate configured binding routing and targets * Discord tests: fix runtime env helper path * Tests: fix channel binding CI regressions * Tests: normalize ACP workspace assertion on Windows * Bindings: isolate configured binding registry * Bindings: finish configured binding cleanup * Bindings: finish generic cleanup * Bindings: align runtime approval callbacks * ACP: delete residual bindings barrel * Bindings: restore legacy compatibility * Revert "Bindings: restore legacy compatibility" This reverts commit ac2ed68fa2426ecc874d68278c71c71ad363fcfe. * Tests: drop ACP route legacy helper names * Discord/ACP: fix binding regressions --------- Co-authored-by: Onur <2453968+osolmaz@users.noreply.github.com>
76 lines
2.7 KiB
TypeScript
76 lines
2.7 KiB
TypeScript
import { resolveConfiguredBindingRecord } from "../../channels/plugins/binding-registry.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 = resolveConfiguredBindingRecord({
|
|
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;
|
|
}
|