@ynhcj/xiaoyi-channel 0.0.166-next → 0.0.167-next

package/dist/index.js

@@ -3,7 +3,7 @@ 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, getSessionContext } 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";
@@ -54,10 +54,10 @@ async function captureCronAddMapping(event, ctx) {
         return;
     }
     console.log(`[CRONMAP] extracted jobId=${jobId}`);
-    const sessionCtx = ctx.sessionKey ? getSessionContext(ctx.sessionKey) : null;
+    const sessionCtx = getCurrentSessionContext();
     const sessionId = sessionCtx?.sessionId;
     if (!sessionId) {
-        console.log(`[CRONMAP] skip: no sessionId (sessionKey=${ctx.sessionKey}, ctxFound=${!!sessionCtx})`);
+        console.log(`[CRONMAP] skip: no sessionId in ALS scope (ctxFound=${!!sessionCtx})`);
         return;
     }
     const pushId = await resolvePushId(sessionId);

package/dist/src/bot.js

@@ -6,7 +6,7 @@ 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";
@@ -160,19 +160,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.
@@ -380,7 +371,6 @@ export async function handleXYMessage(params) {
                 }
                 streamingSignals.delete(parsed.sessionId);
                 decrementTaskIdRef(parsed.sessionId);
-                unregisterSession(route.sessionKey);
                 log.log(`[BOT] Cleanup completed`);
             },
             run: () => {
@@ -390,6 +380,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({
@@ -422,7 +413,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;
@@ -430,18 +421,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`);
             }
         }
@@ -626,6 +605,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,

package/dist/src/channel.js

@@ -2,7 +2,7 @@ import { resolveXYConfig, listXYAccountIds, getDefaultXYAccountId } from "./conf
 import { xyConfigSchema } from "./config-schema.js";
 import { xyOutbound } from "./outbound.js";
 import { filterToolsByDevice } from "./tools/device-tool-map.js";
-import { getCurrentSessionContext, registerSession } from "./tools/session-manager.js";
+import { getCurrentSessionContext } from "./tools/session-manager.js";
 import { createAllTools } from "./tools/create-all-tools.js";
 import { logger } from "./utils/logger.js";
 /**
@@ -69,12 +69,10 @@ export const xyPlugin = {
     agentTools: (params) => {
         let ctx = getCurrentSessionContext();
         // ── Cron / non-session fallback ──────────────────────────────
-        // When no active xy WebSocket session exists but the openclaw cfg
-        // is provided (framework calls agentTools({ cfg })), create a
-        // synthetic "cron session".  This enables cron-triggered agent
-        // turns and cross-channel tool calls to use xiaoyi tools via the
-        // push channel.  sendCommand() detects the "cron-" sessionId
-        // prefix and routes commands through push instead of WebSocket.
+        // cron 路径不进 ALS: openclaw 的 cron runner 同步调 agentTools({cfg})
+        // 返回工具后才在别处跑 turn, xy_channel 没有 wrap 整个 turn 的点。
+        // 这里同步构造合成 ctx 给工具闭包捕获, 工具调用走 sendCommand/push,
+        // 不依赖 getCurrentSessionContext。所以不注册任何全局状态。
         if (!ctx && params?.cfg) {
             try {
                 const config = resolveXYConfig(params.cfg);
@@ -87,14 +85,16 @@ export const xyPlugin = {
                     agentId: "default",
                     isCron: true,
                 };
-                // Register so getCurrentSessionContext() fallback can find it
-                registerSession(`__cron__${cronId}`, ctx);
+                logger.log(`[ALS-PROOF] agentTools ctx from ALS miss, using synthetic cron ctx sessionId=${cronId} isCron=true`);
                 logger.log(`[CRON-TOOLS] Created cron session context: ${cronId}`);
             }
             catch (err) {
                 logger.error("[CRON-TOOLS] Failed to create cron context:", err);
             }
         }
+        else {
+            logger.log(`[ALS-PROOF] agentTools ctx from ALS sessionId=${ctx?.sessionId} taskId=${ctx?.taskId} isCron=${ctx?.isCron === true}`);
+        }
         if (!ctx) {
             logger.log("[CREATE-ALL-TOOLS] no session context, returning empty tools list");
             return [];

package/dist/src/cspl/sentinel_hook.js

@@ -6,7 +6,7 @@ import { callApi } from './call_api.js';
 import { processText, extractResultText, validateAndTruncateText, parseSecurityResult, handleExecToolInput, handleMessageToolInput, handleOtherToolInput } from './utils.js';
 import { ALLOWED_TOOLS, MAX_TEXT_LENGTH, MAX_TOTAL_LENGTH, MIN_TEXT_LENGTH, STEER_ABORT_MESSAGE, TOOL_OUTPUT_ACTION } from './constants.js';
 import { logger } from '../utils/logger.js';
-import { getSessionContext } from '../tools/session-manager.js';
+import { getCurrentSessionContext } from '../tools/session-manager.js';
 import { tryInjectSteer } from './steer-context.js';
 // 主入口模块
 export default function register(api) {
@@ -78,7 +78,7 @@ export default function register(api) {
                 logger.log(`[SENTINEL HOOK] TOOL_OUTPUT response: status=${result.status}.`);
                 if (result.status === 'REJECT') {
                     logger.warn('[SENTINEL HOOK] REJECT detected, attempting steer injection');
-                    const sessionCtx = ctx.sessionKey ? getSessionContext(ctx.sessionKey) : null;
+                    const sessionCtx = getCurrentSessionContext();
                     if (sessionCtx?.sessionId && sessionCtx?.taskId) {
                         await tryInjectSteer({
                             sessionId: sessionCtx.sessionId,

package/dist/src/formatter.js

@@ -2,7 +2,6 @@
 import { v4 as uuidv4 } from "uuid";
 import { getXYWebSocketManager } from "./client.js";
 import { logger } from "./utils/logger.js";
-import { getCurrentTaskId, getCurrentMessageId } from "./task-manager.js";
 import { redactSensitiveText, containsSensitiveInfo } from "./sensitive-redactor.js";
 import { rewriteOutboundApprovalText } from "./approval-bridge.js";
 import { isCronToolCall, getCurrentCronJobId } from "./tools/session-manager.js";
@@ -158,11 +157,7 @@ export async function sendReasoningTextUpdate(params) {
  */
 export async function sendStatusUpdate(params) {
     const { config, sessionId, taskId, messageId, text, state } = params;
-    // Dynamic lookup: use latest taskId/messageId from task-manager (handles steer/interrupt),
-    // fall back to closure-captured values
-    const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
-    const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
-    const log = logger.withContext(sessionId, currentTaskId);
+    const log = logger.withContext(sessionId, taskId);
     // 审批桥接和脱敏
     const bridgedText = rewriteOutboundApprovalText(sessionId, text);
     const redactedText = redactSensitiveText(bridgedText);
@@ -177,7 +172,7 @@ export async function sendStatusUpdate(params) {
         ],
     });
     const statusUpdate = {
-        taskId: currentTaskId,
+        taskId,
         kind: "status-update",
         final: false, // Status updates should not end the stream
         status: {
@@ -188,7 +183,7 @@ export async function sendStatusUpdate(params) {
     // Build JSON-RPC response
     const jsonRpcResponse = {
         jsonrpc: "2.0",
-        id: currentMessageId,
+        id: messageId,
         result: statusUpdate,
     };
     // Send via WebSocket
@@ -197,7 +192,7 @@ export async function sendStatusUpdate(params) {
         msgType: "agent_response",
         agentId: config.agentId,
         sessionId,
-        taskId: currentTaskId,
+        taskId,
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     // Log complete response body
@@ -270,15 +265,11 @@ export async function sendCommand(params) {
         return sendCommandViaPush({ config, command: commands[0], pushId });
     }
     // ── Normal mode: WebSocket ─────────────────────────────────────
-    // Dynamic lookup: use latest taskId/messageId from task-manager (handles steer/interrupt),
-    // fall back to closure-captured values
-    const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
-    const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
-    const log = logger.withContext(sessionId, currentTaskId);
+    const log = logger.withContext(sessionId, taskId);
     // Build artifact update with command as data
     // Wrap command in commands array as per protocol requirement
     const artifact = {
-        taskId: currentTaskId,
+        taskId,
         kind: "artifact-update",
         append: false,
         lastChunk: true,
@@ -300,7 +291,7 @@ export async function sendCommand(params) {
     // Build JSON-RPC response
     const jsonRpcResponse = {
         jsonrpc: "2.0",
-        id: currentMessageId,
+        id: messageId,
         result: artifact,
     };
     // Send via WebSocket
@@ -309,7 +300,7 @@ export async function sendCommand(params) {
         msgType: "agent_response",
         agentId: config.agentId,
         sessionId,
-        taskId: currentTaskId,
+        taskId,
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     // Log complete response body
@@ -329,12 +320,10 @@ export async function sendCard(params) {
         throw new Error("sendCard does not support cron mode");
     }
     // ── Normal mode: WebSocket ─────────────────────────────────────
-    const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
-    const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
-    const log = logger.withContext(sessionId, currentTaskId);
+    const log = logger.withContext(sessionId, taskId);
     // Build artifact update with cardsInfo as data
     const artifact = {
-        taskId: currentTaskId,
+        taskId,
         kind: "artifact-update",
         append: false,
         lastChunk: true,
@@ -354,7 +343,7 @@ export async function sendCard(params) {
     // Build JSON-RPC response
     const jsonRpcResponse = {
         jsonrpc: "2.0",
-        id: currentMessageId,
+        id: messageId,
         result: artifact,
     };
     // Send via WebSocket
@@ -363,7 +352,7 @@ export async function sendCard(params) {
         msgType: "agent_response",
         agentId: config.agentId,
         sessionId,
-        taskId: currentTaskId,
+        taskId,
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
     log.log(`[A2A_CARD] Sending card`);

package/dist/src/monitor.js

@@ -9,7 +9,6 @@ import { handleSelfEvolutionEvent, handleSelfEvolutionStateGetEvent } from "./se
 import { handleLoginTokenEvent } from "./login-token-handler.js";
 import { handleCronQueryEvent } from "./cron-query-handler.js";
 import { cleanupStaleTempFiles } from "./reply-dispatcher.js";
-import { cleanupStaleSessions, getActiveSessionCount, cleanupAllSessions } from "./tools/session-manager.js";
 import { logger } from "./utils/logger.js";
 /**
  * Per-session serial queue that ensures messages from the same session are processed
@@ -231,8 +230,7 @@ export async function monitorXYProvider(opts = {}) {
             wsManager.disconnect();
             // ✅ Remove manager from cache to prevent reusing dirty state
             removeXYWebSocketManager(account);
-            // Clean up all active sessions
-            cleanupAllSessions();
+            // Session context is ALS-scoped now — nothing global to clean up.
             loggedServers.clear();
             activeMessages.clear();
             logger.log(`[MONITOR-HANDLER] Cleanup complete, cleared active messages and sessions`);
@@ -300,12 +298,7 @@ export async function monitorXYProvider(opts = {}) {
             if (cleaned > 0) {
                 logger.log(`[HEALTH CHECK] Auto-cleaned ${cleaned} manager(s) with orphan connections`);
             }
-            // Cleanup stale sessions (older than 10min TTL)
-            const cleanedSessions = cleanupStaleSessions();
-            const remainingSessions = getActiveSessionCount();
-            if (cleanedSessions > 0 || remainingSessions > 0) {
-                logger.log(`[HEALTH CHECK] Sessions: cleaned=${cleanedSessions}, active=${remainingSessions}`);
-            }
+            // Session context is ALS-scoped — no global session cleanup needed.
             // Cleanup stale temp files (older than 24 hours)
             void cleanupStaleTempFiles();
         }, 6 * 60 * 60 * 1000); // 6 hours

package/dist/src/provider.js

@@ -393,24 +393,6 @@ function trimUserMetadata(text) {
     text = text.replace(/\n*Sender \(untrusted metadata\):\n```json\n[\s\S]*?\n```\n*/, "\n");
     return text.replace(/\n{3,}/g, "\n\n");
 }
-/**
- * Extract A2A taskId and deviceType from Conversation info JSON.
- * bot.ts stores them as MessageSid = "xiaoyi_taskId_deviceType".
- * The "xiaoyi_" prefix ensures extraction only happens for messages
- * routed through xiaoyi-channel, not other channels sharing the provider.
- */
-function extractA2AFromConversationInfo(text) {
-    const match = text.match(/Conversation info \(untrusted metadata\):\n```json\n([\s\S]*?)\n```/);
-    if (!match)
-        return null;
-    const msgIdMatch = match[1].match(/"message_id"\s*:\s*"([^"]+)"/);
-    if (!msgIdMatch)
-        return null;
-    const parts = msgIdMatch[1].split("_");
-    if (parts.length < 3 || parts[0] !== "xiaoyi")
-        return null;
-    return { taskId: parts[1], deviceType: parts[2] };
-}
 export const xiaoyiProvider = {
     id: "xiaoyiprovider",
     label: "Xiaoyi Provider",
@@ -424,7 +406,12 @@ export const xiaoyiProvider = {
      * xiaoyiprovider as long as the provider has a configured baseUrl.
      */
     resolveDynamicModel: (ctx) => {
-        const baseUrl = ctx.providerConfig?.baseUrl;
+        // providerConfig from models.providers.xiaoyiprovider is preferred;
+        // fall back to zai baseUrl when config-driven provider setup is unavailable.
+        let baseUrl = ctx.providerConfig?.baseUrl;
+        if (!baseUrl || typeof baseUrl !== "string") {
+            baseUrl = ctx.config?.models?.providers?.zai?.baseUrl;
+        }
         if (!baseUrl || typeof baseUrl !== "string")
             return null;
         return {
@@ -474,35 +461,10 @@ export const xiaoyiProvider = {
             return underlying;
         return async (model, context, options) => {
             const dynamicHeaders = {};
-            // ── Extract A2A taskId/deviceType from Conversation info ──
-            // bot.ts stores taskId_deviceType as MessageSid, which the framework
-            // renders as message_id in the Conversation info JSON block.
-            let extractedTaskId = null;
-            let extractedDeviceType = null;
-            if (context.messages) {
-                for (let i = context.messages.length - 1; i >= 0; i--) {
-                    const msg = context.messages[i];
-                    if (msg.role !== "user")
-                        continue;
-                    const text = typeof msg.content === "string"
-                        ? msg.content
-                        : Array.isArray(msg.content)
-                            ? msg.content.find((b) => b.type === "text")?.text ?? ""
-                            : "";
-                    if (!text)
-                        continue;
-                    const extracted = extractA2AFromConversationInfo(text);
-                    if (extracted) {
-                        extractedTaskId = extracted.taskId;
-                        extractedDeviceType = extracted.deviceType;
-                        break;
-                    }
-                }
-            }
             // ── Build dynamic headers ────────────────────────────
             // Priority:
             //   1. Cron-triggered: uid → cronUuid, with cron-specific headers
-            //   2. Xiaoyi A2A: taskId extracted from Conversation info (xiaoyi_ prefix)
+            //   2. Xiaoyi A2A: rawTaskId from AsyncLocalStorage, split on "&"
             //   3. UID-based fallback: sha256(uid).hex[:32]_timestamp
             const isCron = isCronTriggered(context.messages);
             if (isCron) {
@@ -533,21 +495,32 @@ export const xiaoyiProvider = {
                     dynamicHeaders["x-cron-title"] = encodeURIComponent(cronTitle);
                 if (context.messages?.length === 1)
                     dynamicHeaders["x-cron-flag"] = "begin";
-            }
-            else if (extractedTaskId) {
-                const sessionId = extractedTaskId.split("&")[0];
-                const interactionId = extractedTaskId.split("&")[1] ?? "";
-                dynamicHeaders[HEADER_TRACE_ID] = extractedTaskId;
-                dynamicHeaders[HEADER_SESSION_ID] = sessionId;
-                dynamicHeaders[HEADER_INTERACTION_ID] = interactionId;
+                logger.log(`[ALS-PROOF] provider headers source=cron`);
             }
             else {
-                const fallbackPrefix = ctx.extraParams?.[FALLBACK_PREFIX_KEY];
-                if (typeof fallbackPrefix === "string") {
-                    const fallbackValue = `${fallbackPrefix}_${Date.now()}`;
-                    dynamicHeaders[HEADER_TRACE_ID] = fallbackValue;
-                    dynamicHeaders[HEADER_SESSION_ID] = fallbackValue;
-                    dynamicHeaders[HEADER_INTERACTION_ID] = fallbackValue;
+                // ALS path: rawTaskId comes from the per-turn AsyncLocalStorage scope
+                // set by bot.ts runWithSessionContext. Real upstream params.id is
+                // `realSession&realInteraction`; tester UUIDs degenerate to the whole
+                // id as sessionId with empty interactionId.
+                const als = getCurrentSessionContext();
+                const rawTaskId = als?.taskId;
+                if (rawTaskId) {
+                    const sessionId = rawTaskId.split("&")[0];
+                    const interactionId = rawTaskId.split("&")[1] ?? "";
+                    dynamicHeaders[HEADER_TRACE_ID] = rawTaskId;
+                    dynamicHeaders[HEADER_SESSION_ID] = sessionId;
+                    dynamicHeaders[HEADER_INTERACTION_ID] = interactionId;
+                    logger.log(`[ALS-PROOF] provider headers source=ALS traceId=${rawTaskId} sessionId=${sessionId} interactionId=${interactionId}`);
+                }
+                else {
+                    const fallbackPrefix = ctx.extraParams?.[FALLBACK_PREFIX_KEY];
+                    if (typeof fallbackPrefix === "string") {
+                        const fallbackValue = `${fallbackPrefix}_${Date.now()}`;
+                        dynamicHeaders[HEADER_TRACE_ID] = fallbackValue;
+                        dynamicHeaders[HEADER_SESSION_ID] = fallbackValue;
+                        dynamicHeaders[HEADER_INTERACTION_ID] = fallbackValue;
+                    }
+                    logger.log(`[ALS-PROOF] provider headers source=uid-fallback (ALS miss)`);
                 }
             }
             // 记录输入
@@ -560,10 +533,8 @@ export const xiaoyiProvider = {
             if (context.systemPrompt) {
                 logger.log(`[xiaoyiprovider] system prompt length: ${context.systemPrompt.length}`);
             }
-            // deviceType: prefer value extracted from Conversation info,
-            // then ALS fallback.
-            const deviceType = extractedDeviceType
-                ?? getCurrentSessionContext()?.deviceType;
+            // deviceType: read from ALS (no more text-extraction).
+            const deviceType = getCurrentSessionContext()?.deviceType;
             // 在发送给模型前，优化 systemPrompt 结构
             if (context.systemPrompt) {
                 let sp = context.systemPrompt;