@ynhcj/xiaoyi-channel 0.0.179-beta → 0.0.179-next

package/dist/index.js

@@ -3,7 +3,10 @@ import { xiaoyiProvider } from "./src/provider.js";
 import { xyPlugin } from "./src/channel.js";
 import registerSentinelHook from "./src/cspl/sentinel_hook.js";
 import { setXYRuntime } from "./src/runtime.js";
-import { markCronToolCall, clearCronToolCall } from "./src/tools/session-manager.js";
+import { markCronToolCall, clearCronToolCall, getCurrentSessionContext } from "./src/tools/session-manager.js";
+import { configManager } from "./src/utils/config-manager.js";
+import { setJobPushId } from "./src/utils/cron-push-map.js";
+import { getAllPushIds } from "./src/utils/pushid-manager.js";
 import { registerSelfEvolutionToolResultNudge } from "./src/self-evolution-tool-result-nudge.js";
 import { createBeforePromptBuildHandler } from "./src/skill-retriever/hooks.js";
 import { normalizeToolRetrieverConfig } from "./src/skill-retriever/config.js";
@@ -25,8 +28,145 @@ function registerCronDetectionHook(api) {
         if (event.toolCallId) {
             clearCronToolCall(event.toolCallId);
         }
+        // 捕获对话创建的 cron job：agent 调 cron(add) 后，从 result 拿 jobId，
+        // 配合当前会话的 pushId，写入 jobId↔pushId 映射，供 fire 时反查设备。
+        await captureCronAddMapping(event, ctx).catch((err) => {
+            // 捕获失败不影响工具结果
+            console.error("[xy] captureCronAddMapping failed:", err);
+        });
     });
 }
+/** 从 cron add 工具结果中提取 jobId 并写入 pushId 映射。 */
+async function captureCronAddMapping(event, ctx) {
+    // 两条创建路径都要捕获：
+    //   1) cron agent 工具：toolName==="cron", params.action==="add"
+    //   2) exec 跑 CLI：toolName==="exec", params.command 含 "cron add"
+    //      （agent 实际用的是这条：openclaw cron add --name ... --cron ... --message ...）
+    const isCronAddTool = event.toolName === "cron" &&
+        (event.params?.action === "add" || event.params?.action === "create");
+    const isExecCronAdd = event.toolName === "exec" && isExecCronAddCommand(event.params?.command);
+    if (!isCronAddTool && !isExecCronAdd)
+        return;
+    console.log(`[CRONMAP] after_tool_call path=${event.toolName}, resultType=${typeof event.result}`);
+    const jobId = readJobIdFromResult(event.result);
+    if (!jobId) {
+        console.log(`[CRONMAP] skip: could not extract jobId. preview=${preview(event.result)}`);
+        return;
+    }
+    console.log(`[CRONMAP] extracted jobId=${jobId}`);
+    const sessionCtx = getCurrentSessionContext();
+    const sessionId = sessionCtx?.sessionId;
+    if (!sessionId) {
+        console.log(`[CRONMAP] skip: no sessionId in ALS scope (ctxFound=${!!sessionCtx})`);
+        return;
+    }
+    const pushId = await resolvePushId(sessionId);
+    if (!pushId) {
+        console.log(`[CRONMAP] skip: no pushId available for sessionId=${sessionId} (no session match, no global, no file)`);
+        return;
+    }
+    console.log(`[CRONMAP] writing map: jobId=${jobId}, sessionId=${sessionId}, pushId=${pushId.substring(0, 16)}...`);
+    await setJobPushId(jobId, {
+        pushId,
+        sessionId,
+        deviceType: sessionCtx?.deviceType,
+        source: event.toolName === "exec" ? "exec-cli" : "conversation",
+    });
+    console.log(`[CRONMAP] map written OK`);
+}
+/** 回退链取 pushId：当前会话 → 全局兜底 → 本地文件首个（保底）。 */
+async function resolvePushId(sessionId) {
+    // 1. 同会话
+    const session = configManager.getPushId(sessionId);
+    if (session)
+        return session;
+    // 2. 全局（任何会话注册过的）
+    const global = configManager.getPushId();
+    if (global)
+        return global;
+    // 3. 文件兜底
+    try {
+        const all = await getAllPushIds();
+        if (all.length > 0)
+            return all[0];
+    }
+    catch {
+        // ignore
+    }
+    return null;
+}
+/** 判断 exec 命令是否为 cron add（匹配 "openclaw cron add" 或裸 "cron add"，排除 list/remove 等）。 */
+function isExecCronAddCommand(command) {
+    if (typeof command !== "string")
+        return false;
+    return /\bcron\s+add\b/.test(command);
+}
+/** 取结果的短预览，用于诊断。 */
+function preview(value) {
+    if (value == null)
+        return String(value);
+    const s = typeof value === "string" ? value : JSON.stringify(value);
+    return s.length > 200 ? s.slice(0, 200) + "…" : s;
+}
+/** 防御性地从 cron add 结果中取 job id。
+ *  覆盖：裸 job 对象、JSON 字符串、exec 输出文本、
+ *  {content:[{text}]} / {stdout} / data/result/job 嵌套。 */
+function readJobIdFromResult(result) {
+    if (!result)
+        return undefined;
+    // {content: [{type:"text", text: "..."}]} — exec 工具的输出信封
+    if (result && typeof result === "object") {
+        const contentArr = result.content;
+        if (Array.isArray(contentArr)) {
+            for (const item of contentArr) {
+                if (item && typeof item === "object") {
+                    const text = item.text;
+                    if (typeof text === "string" && text.trim()) {
+                        const fromContent = readJobIdFromResult(text);
+                        if (fromContent)
+                            return fromContent;
+                    }
+                }
+            }
+        }
+    }
+    // {stdout} — 备选 exec 输出信封
+    if (result && typeof result === "object") {
+        const stdout = result.stdout;
+        if (typeof stdout === "string" && stdout.trim()) {
+            const fromStdout = readJobIdFromResult(stdout);
+            if (fromStdout)
+                return fromStdout;
+        }
+    }
+    let obj = result;
+    if (typeof result === "string") {
+        try {
+            obj = JSON.parse(result);
+        }
+        catch {
+            // 纯文本：可能含 stderr 前缀行 + JSON。用正则抓 "id":"..."。
+            const m = result.match(/"id"\s*:\s*"([^"]+)"/);
+            if (m)
+                return m[1];
+            return undefined;
+        }
+    }
+    if (obj && typeof obj === "object") {
+        const id = obj.id;
+        if (typeof id === "string" && id.trim())
+            return id.trim();
+        for (const k of ["data", "result", "job"]) {
+            const inner = obj[k];
+            if (inner && typeof inner === "object") {
+                const innerId = inner.id;
+                if (typeof innerId === "string" && innerId.trim())
+                    return innerId.trim();
+            }
+        }
+    }
+    return undefined;
+}
 function registerFullHooks(api) {
     // SKILL RETRIEVER HOOK: before_prompt_build hook
     const pluginConfig = api.pluginConfig || {};

package/dist/src/acp-session-binding.d.ts

@@ -0,0 +1,37 @@
+import { type BindingTargetKind } from "openclaw/plugin-sdk/conversation-runtime";
+type XyBindingTargetKind = "subagent" | "acp";
+type XyAcpBindingRecord = {
+    accountId: string;
+    conversationId: string;
+    parentConversationId?: string;
+    deliveryTo?: string;
+    targetKind: XyBindingTargetKind;
+    targetSessionKey: string;
+    agentId?: string;
+    label?: string;
+    boundBy?: string;
+    boundAt: number;
+    lastActivityAt: number;
+};
+type XyAcpBindingManager = {
+    accountId: string;
+    getByConversationId: (conversationId: string) => XyAcpBindingRecord | undefined;
+    listBySessionKey: (targetSessionKey: string) => XyAcpBindingRecord[];
+    bindConversation: (params: {
+        conversationId: string;
+        parentConversationId?: string;
+        targetKind: BindingTargetKind;
+        targetSessionKey: string;
+        metadata?: Record<string, unknown>;
+    }) => XyAcpBindingRecord | null;
+    touchConversation: (conversationId: string, at?: number) => XyAcpBindingRecord | null;
+    unbindConversation: (conversationId: string) => XyAcpBindingRecord | null;
+    unbindBySessionKey: (targetSessionKey: string) => XyAcpBindingRecord[];
+    stop: () => void;
+};
+export declare function createXyAcpBindingManager(params: {
+    accountId?: string;
+    cfg: any;
+}): XyAcpBindingManager;
+export declare function getXyAcpBindingManager(accountId?: string): XyAcpBindingManager | null;
+export {};

package/dist/src/acp-session-binding.js

@@ -0,0 +1,237 @@
+// ACP Session Binding Adapter for xiaoyi-channel.
+// Follows the feishu thread-bindings.ts pattern.
+//
+// Maps A2A sessionId (stable conversation identifier) to ACP/subagent
+// session keys so that openclaw can bind spawned sessions to the
+// current xiaoyi conversation.
+//
+// Key design: xiaoyi-channel only supports `placement: "current"` —
+// it cannot create child threads (unlike Discord). All spawned sessions
+// are bound to the current A2A conversation identified by sessionId.
+// NOTE: Using `any` for cfg type to avoid version mismatch between
+// local and global openclaw installs (auth.profiles.aws-sdk union).
+import { resolveThreadBindingIdleTimeoutMsForChannel, resolveThreadBindingMaxAgeMsForChannel, resolveThreadBindingConversationIdFromBindingId, registerSessionBindingAdapter, unregisterSessionBindingAdapter, } from "openclaw/plugin-sdk/conversation-runtime";
+import { normalizeAccountId, resolveAgentIdFromSessionKey } from "openclaw/plugin-sdk/routing";
+import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { logger } from "./utils/logger.js";
+// ─── Global state (survives module dedup) ─────────────────────
+const XY_ACP_BINDINGS_KEY = Symbol.for("openclaw.xyAcpBindingsState");
+let state;
+function getState() {
+    if (!state) {
+        const globalStore = globalThis;
+        state = globalStore[XY_ACP_BINDINGS_KEY] ?? {
+            managersByAccountId: new Map(),
+            bindingsByAccountConversation: new Map(),
+        };
+        globalStore[XY_ACP_BINDINGS_KEY] = state;
+    }
+    return state;
+}
+function resolveBindingKey(params) {
+    return `${params.accountId}:${params.conversationId}`;
+}
+// ─── Kind conversion ──────────────────────────────────────────
+function toSessionBindingTargetKind(raw) {
+    return raw === "subagent" ? "subagent" : "session";
+}
+function toXyTargetKind(raw) {
+    return raw === "subagent" ? "subagent" : "acp";
+}
+// ─── Record conversion ────────────────────────────────────────
+function toSessionBindingRecord(record, defaults) {
+    const idleExpiresAt = defaults.idleTimeoutMs > 0 ? record.lastActivityAt + defaults.idleTimeoutMs : undefined;
+    const maxAgeExpiresAt = defaults.maxAgeMs > 0 ? record.boundAt + defaults.maxAgeMs : undefined;
+    const expiresAt = idleExpiresAt != null && maxAgeExpiresAt != null
+        ? Math.min(idleExpiresAt, maxAgeExpiresAt)
+        : (idleExpiresAt ?? maxAgeExpiresAt);
+    return {
+        bindingId: resolveBindingKey({
+            accountId: record.accountId,
+            conversationId: record.conversationId,
+        }),
+        targetSessionKey: record.targetSessionKey,
+        targetKind: toSessionBindingTargetKind(record.targetKind),
+        conversation: {
+            channel: "xiaoyi-channel",
+            accountId: record.accountId,
+            conversationId: record.conversationId,
+            parentConversationId: record.parentConversationId,
+        },
+        status: "active",
+        boundAt: record.boundAt,
+        expiresAt,
+        metadata: {
+            agentId: record.agentId,
+            label: record.label,
+            boundBy: record.boundBy,
+            deliveryTo: record.deliveryTo,
+            lastActivityAt: record.lastActivityAt,
+            idleTimeoutMs: defaults.idleTimeoutMs,
+            maxAgeMs: defaults.maxAgeMs,
+        },
+    };
+}
+// ─── Manager factory ──────────────────────────────────────────
+export function createXyAcpBindingManager(params) {
+    const accountId = normalizeAccountId(params.accountId);
+    const existing = getState().managersByAccountId.get(accountId);
+    if (existing) {
+        return existing;
+    }
+    const idleTimeoutMs = resolveThreadBindingIdleTimeoutMsForChannel({
+        cfg: params.cfg,
+        channel: "xiaoyi-channel",
+        accountId,
+    });
+    const maxAgeMs = resolveThreadBindingMaxAgeMsForChannel({
+        cfg: params.cfg,
+        channel: "xiaoyi-channel",
+        accountId,
+    });
+    const log = logger.withContext("", "");
+    const manager = {
+        accountId,
+        getByConversationId: (conversationId) => getState().bindingsByAccountConversation.get(resolveBindingKey({ accountId, conversationId })),
+        listBySessionKey: (targetSessionKey) => [...getState().bindingsByAccountConversation.values()].filter((record) => record.accountId === accountId && record.targetSessionKey === targetSessionKey),
+        bindConversation: ({ conversationId, parentConversationId, targetKind, targetSessionKey, metadata, }) => {
+            const normalizedConversationId = conversationId.trim();
+            const normalizedTargetSessionKey = targetSessionKey.trim();
+            if (!normalizedConversationId || !normalizedTargetSessionKey) {
+                return null;
+            }
+            const existingLocal = getState().bindingsByAccountConversation.get(resolveBindingKey({ accountId, conversationId: normalizedConversationId }));
+            const now = Date.now();
+            const record = {
+                accountId,
+                conversationId: normalizedConversationId,
+                parentConversationId: normalizeOptionalString(parentConversationId) ?? existingLocal?.parentConversationId,
+                deliveryTo: typeof metadata?.deliveryTo === "string" && metadata.deliveryTo.trim()
+                    ? metadata.deliveryTo.trim()
+                    : existingLocal?.deliveryTo,
+                targetKind: toXyTargetKind(targetKind),
+                targetSessionKey: normalizedTargetSessionKey,
+                agentId: typeof metadata?.agentId === "string" && metadata.agentId.trim()
+                    ? metadata.agentId.trim()
+                    : (existingLocal?.agentId ?? resolveAgentIdFromSessionKey(normalizedTargetSessionKey)),
+                label: typeof metadata?.label === "string" && metadata.label.trim()
+                    ? metadata.label.trim()
+                    : existingLocal?.label,
+                boundBy: typeof metadata?.boundBy === "string" && metadata.boundBy.trim()
+                    ? metadata.boundBy.trim()
+                    : existingLocal?.boundBy,
+                boundAt: now,
+                lastActivityAt: now,
+            };
+            getState().bindingsByAccountConversation.set(resolveBindingKey({ accountId, conversationId: normalizedConversationId }), record);
+            log.log(`[XY-ACP-BIND] Bound ${targetKind} session ${normalizedTargetSessionKey.slice(0, 30)} to conversation ${normalizedConversationId.slice(0, 12)}`);
+            return record;
+        },
+        touchConversation: (conversationId, at = Date.now()) => {
+            const key = resolveBindingKey({ accountId, conversationId });
+            const existingRecord = getState().bindingsByAccountConversation.get(key);
+            if (!existingRecord) {
+                return null;
+            }
+            const updated = { ...existingRecord, lastActivityAt: at };
+            getState().bindingsByAccountConversation.set(key, updated);
+            return updated;
+        },
+        unbindConversation: (conversationId) => {
+            const key = resolveBindingKey({ accountId, conversationId });
+            const existingRecord = getState().bindingsByAccountConversation.get(key);
+            if (!existingRecord) {
+                return null;
+            }
+            getState().bindingsByAccountConversation.delete(key);
+            return existingRecord;
+        },
+        unbindBySessionKey: (targetSessionKey) => {
+            const removed = [];
+            for (const record of getState().bindingsByAccountConversation.values()) {
+                if (record.accountId !== accountId || record.targetSessionKey !== targetSessionKey) {
+                    continue;
+                }
+                getState().bindingsByAccountConversation.delete(resolveBindingKey({ accountId, conversationId: record.conversationId }));
+                removed.push(record);
+            }
+            return removed;
+        },
+        stop: () => {
+            for (const key of getState().bindingsByAccountConversation.keys()) {
+                if (key.startsWith(`${accountId}:`)) {
+                    getState().bindingsByAccountConversation.delete(key);
+                }
+            }
+            getState().managersByAccountId.delete(accountId);
+            unregisterSessionBindingAdapter({
+                channel: "xiaoyi-channel",
+                accountId,
+                adapter: sessionBindingAdapter,
+            });
+            log.log(`[XY-ACP-BIND] Stopped binding manager for account ${accountId}`);
+        },
+    };
+    const sessionBindingAdapter = {
+        channel: "xiaoyi-channel",
+        accountId,
+        capabilities: {
+            placements: ["current"],
+        },
+        bind: async (input) => {
+            if (input.conversation.channel !== "xiaoyi-channel" || input.placement === "child") {
+                return null;
+            }
+            const bound = manager.bindConversation({
+                conversationId: input.conversation.conversationId,
+                parentConversationId: input.conversation.parentConversationId,
+                targetKind: input.targetKind,
+                targetSessionKey: input.targetSessionKey,
+                metadata: input.metadata,
+            });
+            return bound ? toSessionBindingRecord(bound, { idleTimeoutMs, maxAgeMs }) : null;
+        },
+        listBySession: (targetSessionKey) => manager
+            .listBySessionKey(targetSessionKey)
+            .map((entry) => toSessionBindingRecord(entry, { idleTimeoutMs, maxAgeMs })),
+        resolveByConversation: (ref) => {
+            if (ref.channel !== "xiaoyi-channel") {
+                return null;
+            }
+            const found = manager.getByConversationId(ref.conversationId);
+            return found ? toSessionBindingRecord(found, { idleTimeoutMs, maxAgeMs }) : null;
+        },
+        touch: (bindingId, at) => {
+            const conversationId = resolveThreadBindingConversationIdFromBindingId({
+                accountId,
+                bindingId,
+            });
+            if (conversationId) {
+                manager.touchConversation(conversationId, at);
+            }
+        },
+        unbind: async (input) => {
+            if (input.targetSessionKey?.trim()) {
+                return manager
+                    .unbindBySessionKey(input.targetSessionKey.trim())
+                    .map((entry) => toSessionBindingRecord(entry, { idleTimeoutMs, maxAgeMs }));
+            }
+            const conversationId = resolveThreadBindingConversationIdFromBindingId({
+                accountId,
+                bindingId: input.bindingId,
+            });
+            if (!conversationId) {
+                return [];
+            }
+            const removed = manager.unbindConversation(conversationId);
+            return removed ? [toSessionBindingRecord(removed, { idleTimeoutMs, maxAgeMs })] : [];
+        },
+    };
+    registerSessionBindingAdapter(sessionBindingAdapter);
+    getState().managersByAccountId.set(accountId, manager);
+    log.log(`[XY-ACP-BIND] Created binding manager for account ${accountId} (idleTimeout=${idleTimeoutMs}ms, maxAge=${maxAgeMs}ms)`);
+    return manager;
+}
+export function getXyAcpBindingManager(accountId) {
+    return getState().managersByAccountId.get(normalizeAccountId(accountId)) ?? null;
+}

package/dist/src/bot.js

@@ -1,12 +1,12 @@
 import { updateSessionStoreEntry, updateSessionStore, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { getXYRuntime } from "./runtime.js";
 import { createXYReplyDispatcher } from "./reply-dispatcher.js";
-import { parseA2AMessage, extractTextFromParts, extractFileParts, extractPushId, extractDeviceType, extractModelName, extractTriggerData, extractRunCrossTaskContext } from "./parser.js";
+import { parseA2AMessage, extractTextFromParts, extractFileParts, extractPushId, extractDeviceType, extractAppVer, extractSdkApiVersion, extractModelName, extractTriggerData, extractRunCrossTaskContext } from "./parser.js";
 import { downloadFilesFromParts } from "./file-download.js";
 import { resolveXYConfig } from "./config.js";
 import { sendStatusUpdate, sendClearContextResponse, sendTasksCancelResponse, sendA2AResponse } from "./formatter.js";
 import { appendSelfEvolutionKeywordNudge, shouldNudgeForSelfEvolutionKeyword, } from "./self-evolution-keyword.js";
-import { registerSession, unregisterSession, runWithSessionContext } from "./tools/session-manager.js";
+import { runWithSessionContext } from "./tools/session-manager.js";
 import { configManager } from "./utils/config-manager.js";
 import { addPushId } from "./utils/pushid-manager.js";
 import { getPushDataById } from "./utils/pushdata-manager.js";
@@ -113,6 +113,13 @@ export async function handleXYMessage(params) {
         // Steer injections skip taskId registration to avoid overwriting the active taskId
         if (!skipReg) {
             registerTaskId(parsed.sessionId, parsed.taskId, parsed.messageId);
+            // 🔑 steer 场景：同步更新活跃 dispatcher 的 fallback taskId/messageId
+            if (isUpdate) {
+                const updater = dispatcherUpdaters.get(parsed.sessionId);
+                if (updater) {
+                    updater(parsed.taskId, parsed.messageId);
+                }
+            }
             // Extract and update push_id if present
             const pushId = extractPushId(parsed.parts);
             if (pushId) {
@@ -139,6 +146,15 @@ export async function handleXYMessage(params) {
         if (deviceType) {
             log.log(`[BOT] Extracted deviceType: ${deviceType}`);
         }
+        // Extract app_ver and sdk_api_version if present
+        const appVer = extractAppVer(parsed.parts);
+        if (appVer) {
+            log.log(`[BOT] Extracted app_ver: ${appVer}`);
+        }
+        const sdkApiVersion = extractSdkApiVersion(parsed.parts);
+        if (sdkApiVersion) {
+            log.log(`[BOT] Extracted sdk_api_version: ${sdkApiVersion}`);
+        }
         // Extract modelName if present (used by provider.ts to override model.id)
         const modelName = extractModelName(parsed.parts);
         if (modelName) {
@@ -160,19 +176,10 @@ export async function handleXYMessage(params) {
             },
         });
         log.log(`[BOT] Resolved route, sessionKey=${route.sessionKey}`);
-        // Steer injections skip session registration to avoid refCount leaks
+        // ALS only: no registerSession. The sessionContext built below is handed
+        // to runWithSessionContext() inside withReplyDispatcher.run, which is the
+        // single wrap point for the whole agent turn.
         if (!skipReg) {
-            registerSession(route.sessionKey, {
-                config,
-                sessionId: parsed.sessionId,
-                distributionSessionId,
-                taskId: parsed.taskId,
-                messageId: parsed.messageId,
-                agentId: route.accountId,
-                deviceType,
-                modelName,
-                runCrossTaskContext: runCrossTaskContext ?? undefined,
-            });
             // 🔑 Sync A2A modelName to OpenClaw session store so that session_status
             // reports the correct model. Without this, session_status returns the
             // configured default model instead of the A2A-specified one.
@@ -188,6 +195,7 @@ export async function handleXYMessage(params) {
                             modelOverrideSource: "user",
                             model: "",
                             modelProvider: "",
+                            contextTokens: 256_000,
                         }),
                     });
                     if (!result) {
@@ -205,6 +213,7 @@ export async function handleXYMessage(params) {
                                     providerOverride: "xiaoyiprovider",
                                     modelOverride: modelName,
                                     modelOverrideSource: "user",
+                                    contextTokens: 256_000,
                                 };
                             }
                         });
@@ -341,7 +350,18 @@ export async function handleXYMessage(params) {
         const steerState = { steered: false };
         // 🔑 创建dispatcher
         log.log(`[BOT-DISPATCHER] Creating reply dispatcher`);
-        const { dispatcher, replyOptions, markDispatchIdle, startStatusInterval } = createXYReplyDispatcher({
+        // Cleanup: 必须在 onIdle 内部执行（参见 reply-dispatcher.ts 中 onIdleComplete 的注释）
+        let cleaned = false;
+        const cleanup = () => {
+            if (cleaned)
+                return;
+            cleaned = true;
+            log.log(`[BOT] Cleanup started`);
+            streamingSignals.delete(parsed.sessionId);
+            decrementTaskIdRef(parsed.sessionId);
+            log.log(`[BOT] Cleanup completed`);
+        };
+        const { dispatcher, replyOptions, markDispatchIdle, startStatusInterval, updateFallbackTaskId } = createXYReplyDispatcher({
             cfg,
             runtime,
             sessionId: parsed.sessionId,
@@ -349,7 +369,10 @@ export async function handleXYMessage(params) {
             messageId: parsed.messageId,
             accountId: route.accountId,
             steerState,
+            onIdleComplete: cleanup,
         });
+        // 🔑 注册 dispatcher 的 fallback taskId 更新函数，供 steer 路径调用
+        dispatcherUpdaters.set(parsed.sessionId, updateFallbackTaskId);
         // Steer injections don't need status intervals
         if (!skipReg) {
             startStatusInterval();
@@ -363,6 +386,8 @@ export async function handleXYMessage(params) {
             messageId: parsed.messageId,
             agentId: route.accountId,
             deviceType,
+            appVer: appVer ?? undefined,
+            sdkApiVersion: sdkApiVersion ?? undefined,
             modelName,
             runCrossTaskContext: runCrossTaskContext ?? undefined,
         };
@@ -371,15 +396,14 @@ export async function handleXYMessage(params) {
             dispatcher,
             onSettled: () => {
                 log.log(`[BOT] onSettled, steered=${steerState.steered}`);
-                // 🔑 When steered, skip heavy cleanup — the first message's dispatcher is still running
+                // 🔑 When steered, skip cleanup — the first message's dispatcher is still running
                 if (steerState.steered) {
                     log.log(`[BOT] Steered dispatch settled, skipping cleanup`);
                     return;
                 }
-                streamingSignals.delete(parsed.sessionId);
-                decrementTaskIdRef(parsed.sessionId);
-                unregisterSession(route.sessionKey);
-                log.log(`[BOT] Cleanup completed`);
+                // cleanup 已由 onIdleComplete 在 onIdle 的 finally 中执行。
+                // onSettled 不做任何清理（直接在这里清理会发生 race condition）。
+                dispatcherUpdaters.delete(parsed.sessionId);
             },
             run: () => {
                 // 🔐 Use AsyncLocalStorage to provide session context to tools.
@@ -388,6 +412,7 @@ export async function handleXYMessage(params) {
                 // signal init complete to release the global dispatch gate
                 // for the next session.
                 const dispatchPromise = runWithSessionContext(sessionContext, async () => {
+                    log.log(`[ALS-PROOF] bot entered dispatch scope sessionId=${sessionContext.sessionId} taskId=${sessionContext.taskId} isSteer=false`);
                     log.log(`[BOT-DISPATCH] dispatchReplyFromConfig starting, body.length=${ctxPayload.Body?.length ?? 0}`);
                     try {
                         const result = await core.channel.reply.dispatchReplyFromConfig({
@@ -420,7 +445,7 @@ export async function handleXYMessage(params) {
         errLog.error("Failed to handle XY message:", err);
         runtime.error?.(`xy: Failed to handle message: ${String(err)}`);
         errLog.log(`[BOT] Error occurred, attempting cleanup`);
-        // 🔑 错误时也要清理taskId和session
+        // 🔑 错误时也要清理taskId（session 走 ALS，作用域退出自动清理）
         try {
             const params = message.params;
             const sessionId = params?.sessionId;
@@ -428,18 +453,6 @@ export async function handleXYMessage(params) {
                 errLog.log(`[BOT] Cleaning up after error`);
                 // 清理 taskId
                 decrementTaskIdRef(sessionId);
-                // 清理 session
-                const core = getXYRuntime();
-                const route = core.channel.routing.resolveAgentRoute({
-                    cfg,
-                    channel: "xiaoyi-channel",
-                    accountId,
-                    peer: {
-                        kind: "direct",
-                        id: sessionId,
-                    },
-                });
-                unregisterSession(route.sessionKey);
                 errLog.log(`[BOT] Cleanup completed after error`);
             }
         }
@@ -474,8 +487,11 @@ if (!_g.__xyStreamingSignals)
     _g.__xyStreamingSignals = new Map();
 if (!_g.__xySteerQueues)
     _g.__xySteerQueues = new Map();
+if (!_g.__xyDispatcherUpdaters)
+    _g.__xyDispatcherUpdaters = new Map();
 const streamingSignals = _g.__xyStreamingSignals;
 const steerQueues = _g.__xySteerQueues;
+const dispatcherUpdaters = _g.__xyDispatcherUpdaters;
 /**
  * 由 provider.ts 在 wrapStreamFn 调用时触发。
  * 这是模型 API 被调用的精确时刻，此时 isStreaming 一定为 true。
@@ -624,6 +640,7 @@ async function dispatchSteerWhenReady(params) {
         },
         run: () => {
             return runWithSessionContext(sessionContext, async () => {
+                log.log(`[ALS-PROOF] bot entered steer dispatch scope sessionId=${sessionContext.sessionId} taskId=${sessionContext.taskId} isSteer=true`);
                 const result = await core.channel.reply.dispatchReplyFromConfig({
                     ctx: ctxPayload,
                     cfg: params.cfg,