@ynhcj/xiaoyi-channel 0.0.110-next → 0.0.111-next

package/dist/src/bot.d.ts

@@ -9,6 +9,8 @@ export interface HandleXYMessageParams {
     message: A2AJsonRpcRequest;
     accountId: string;
     webSocketSessionId?: string;
+    /** Called after dispatch init is complete (agentTools/wrapStreamFn done). */
+    onInitComplete?: () => void;
 }
 /**
  * Handle an incoming A2A message.

package/dist/src/bot.js

@@ -209,6 +209,10 @@ export async function handleXYMessage(params) {
         const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(cfg);
         // Build message body with speaker prefix (following feishu pattern)
         let messageBody = textForAgent;
+        // Embed A2A taskId marker before the user query so the provider can
+        // extract it from messages without relying on AsyncLocalStorage.
+        // The provider strips this marker before sending to the model.
+        messageBody = `xiaoyiA2A info[taskId:${parsed.taskId},deviceType:${deviceType}] ${messageBody}`;
         // Add speaker prefix for clarity
         const speaker = parsed.sessionId;
         messageBody = `${speaker}: ${messageBody}`;
@@ -289,34 +293,42 @@ export async function handleXYMessage(params) {
                 unregisterSession(route.sessionKey);
                 log(`[BOT] ✅ Cleanup completed`);
             },
-            run: () => 
-            // 🔐 Use AsyncLocalStorage to provide session context to tools
-            runWithSessionContext(sessionContext, async () => {
-                log(`[BOT-DISPATCH] ⏳ dispatchReplyFromConfig starting...`);
-                log(`[BOT-DISPATCH]   - sessionKey: ${ctxPayload.SessionKey}`);
-                log(`[BOT-DISPATCH]   - provider: ${ctxPayload.Provider}`);
-                log(`[BOT-DISPATCH]   - surface: ${ctxPayload.Surface}`);
-                log(`[BOT-DISPATCH]   - from: ${ctxPayload.From}`);
-                log(`[BOT-DISPATCH]   - body length: ${ctxPayload.Body?.length ?? 0}`);
-                try {
-                    const result = await core.channel.reply.dispatchReplyFromConfig({
-                        ctx: ctxPayload,
-                        cfg,
-                        dispatcher,
-                        replyOptions,
-                    });
-                    log(`[BOT-DISPATCH] ✅ dispatchReplyFromConfig returned`);
-                    log(`[BOT-DISPATCH]   - result: ${JSON.stringify(result)}`);
-                    return result;
-                }
-                catch (dispatchErr) {
-                    error(`[BOT-DISPATCH] ❌ dispatchReplyFromConfig threw`);
-                    error(`[BOT-DISPATCH]   - error name: ${dispatchErr instanceof Error ? dispatchErr.name : "unknown"}`);
-                    error(`[BOT-DISPATCH]   - error message: ${String(dispatchErr)}`);
-                    error(`[BOT-DISPATCH]   - error stack: ${dispatchErr instanceof Error ? dispatchErr.stack?.slice(0, 500) : "N/A"}`);
-                    throw dispatchErr;
-                }
-            }),
+            run: () => {
+                // 🔐 Use AsyncLocalStorage to provide session context to tools.
+                // runWithSessionContext returns after the sync part of dispatch
+                // (including agentTools + wrapStreamFn) has executed, so we
+                // signal init complete to release the global dispatch gate
+                // for the next session.
+                const dispatchPromise = runWithSessionContext(sessionContext, async () => {
+                    log(`[BOT-DISPATCH] ⏳ dispatchReplyFromConfig starting...`);
+                    log(`[BOT-DISPATCH]   - sessionKey: ${ctxPayload.SessionKey}`);
+                    log(`[BOT-DISPATCH]   - provider: ${ctxPayload.Provider}`);
+                    log(`[BOT-DISPATCH]   - surface: ${ctxPayload.Surface}`);
+                    log(`[BOT-DISPATCH]   - from: ${ctxPayload.From}`);
+                    log(`[BOT-DISPATCH]   - body length: ${ctxPayload.Body?.length ?? 0}`);
+                    try {
+                        const result = await core.channel.reply.dispatchReplyFromConfig({
+                            ctx: ctxPayload,
+                            cfg,
+                            dispatcher,
+                            replyOptions,
+                        });
+                        log(`[BOT-DISPATCH] ✅ dispatchReplyFromConfig returned`);
+                        log(`[BOT-DISPATCH]   - result: ${JSON.stringify(result)}`);
+                        return result;
+                    }
+                    catch (dispatchErr) {
+                        error(`[BOT-DISPATCH] ❌ dispatchReplyFromConfig threw`);
+                        error(`[BOT-DISPATCH]   - error name: ${dispatchErr instanceof Error ? dispatchErr.name : "unknown"}`);
+                        error(`[BOT-DISPATCH]   - error message: ${String(dispatchErr)}`);
+                        error(`[BOT-DISPATCH]   - error stack: ${dispatchErr instanceof Error ? dispatchErr.stack?.slice(0, 500) : "N/A"}`);
+                        throw dispatchErr;
+                    }
+                });
+                // Signal init complete — sync part (agentTools, wrapStreamFn) is done
+                params.onInitComplete?.();
+                return dispatchPromise;
+            },
         });
         log(`[BOT] ✅ Dispatcher completed for session: ${parsed.sessionId}`);
         log(`xy: dispatch complete (session=${parsed.sessionId})`);

package/dist/src/monitor.js

@@ -68,6 +68,12 @@ export async function monitorXYProvider(opts = {}) {
     const activeMessages = new Set();
     // Create session queue for ordered message processing
     const enqueue = createSessionQueue();
+    // Global gate that serializes dispatch initialization across sessions.
+    // When a new session starts dispatching, it acquires this gate and holds it
+    // until agent setup (agentTools + wrapStreamFn) is complete, then releases it.
+    // This prevents lastRegisteredKey races when multiple sessions initialize
+    // concurrently.
+    let globalDispatchInitGate = Promise.resolve();
     // Health check interval
     let healthCheckInterval = null;
     return new Promise((resolve, reject) => {
@@ -83,6 +89,11 @@ export async function monitorXYProvider(opts = {}) {
             }
             activeMessages.add(messageKey);
             const task = async () => {
+                // Wait for the previous session's init to complete (global gate),
+                // then acquire the gate for this session's init.
+                await globalDispatchInitGate;
+                let releaseGate;
+                globalDispatchInitGate = new Promise((r) => { releaseGate = r; });
                 try {
                     await handleXYMessage({
                         cfg,
@@ -90,10 +101,12 @@ export async function monitorXYProvider(opts = {}) {
                         message,
                         accountId, // ✅ Pass accountId ("default")
                         webSocketSessionId: sessionId, // ✅ 传递 WebSocket 层级的 sessionId
+                        onInitComplete: () => releaseGate(),
                     });
                 }
                 catch (err) {
                     // ✅ Only log error, don't re-throw to prevent gateway restart
+                    releaseGate();
                     error(`XY gateway: error handling message from ${serverId}: ${String(err)}`);
                 }
                 finally {

package/dist/src/provider.js

@@ -8,8 +8,7 @@
 //   models.providers.xiaoyiprovider.api = "openai-completions"
 //   models.providers.xiaoyiprovider.models = [...]
 import { createHash } from "crypto";
-import { activeSessions, asyncLocalStorage, getCurrentSessionContext } from "./tools/session-manager.js";
-import { getCurrentTaskId } from "./task-manager.js";
+import { getCurrentSessionContext } from "./tools/session-manager.js";
 import { selfEvolutionManager } from "./utils/self-evolution-manager.js";
 // ── Retry config ──────────────────────────────────────────────
 const RETRY_DELAYS_MS = [10_000, 20_000, 40_000, 60_000, 60_000];
@@ -443,23 +442,48 @@ export const xiaoyiProvider = {
         const underlying = ctx.streamFn;
         if (!underlying)
             return underlying;
-        // Capture A2A sessionId at agent setup time for multi-session isolation.
-        // openclaw calls wrapStreamFn per-agent (per session), so this runs inside
-        // the correct runWithSessionContext() ALS scope.  When multiple sessions are
-        // active concurrently, getCurrentSessionContext() may later return the WRONG
-        // session (lastRegisteredKey fallback).  The captured sessionId lets us
-        // bypass that fallback and look up the correct taskId directly from
-        // task-manager.
-        const alsStore = asyncLocalStorage.getStore();
-        const sessionCtx = getCurrentSessionContext();
-        const capturedA2ASessionId = sessionCtx?.sessionId ?? null;
-        console.log(`[xiaoyiprovider] wrapStreamFn — ALS: ${alsStore ? "HIT" : "MISS"}, ` +
-            `capturedSessionId=${capturedA2ASessionId ?? "null"}, ` +
-            `taskId=${sessionCtx?.taskId ?? "null"}, ` +
-            `activeSessionsCount=${activeSessions.size}`);
+        // ── Regex to extract A2A taskId/deviceType from user messages ──
+        // bot.ts embeds: xiaoyiA2A info[taskId:<id>,deviceType:<type>]
+        const A2A_MARKER_RE = /xiaoyiA2A info\[taskId:([^\],]+)(?:,deviceType:([^\]]+))?\]\s*/;
         return async (model, context, options) => {
-            // 每次请求时从 ctx.extraParams 动态读取 header
             const dynamicHeaders = {};
+            // ── Extract A2A taskId/deviceType from user messages ──
+            // Scan from last user message backwards; strip the marker from all.
+            let resolvedTaskId = null;
+            let resolvedDeviceType = null;
+            if (context.messages) {
+                for (let i = context.messages.length - 1; i >= 0; i--) {
+                    const msg = context.messages[i];
+                    if (msg.role !== "user" || !msg.content)
+                        continue;
+                    const extract = (text) => {
+                        const match = text.match(A2A_MARKER_RE);
+                        if (match) {
+                            if (!resolvedTaskId)
+                                resolvedTaskId = match[1] ?? null;
+                            if (!resolvedDeviceType)
+                                resolvedDeviceType = match[2] ?? null;
+                            return text.replace(A2A_MARKER_RE, "");
+                        }
+                        return null;
+                    };
+                    if (typeof msg.content === "string") {
+                        const stripped = extract(msg.content);
+                        if (stripped !== null)
+                            msg.content = stripped;
+                    }
+                    else if (Array.isArray(msg.content)) {
+                        for (const block of msg.content) {
+                            if (block.type === "text" && typeof block.text === "string") {
+                                const stripped = extract(block.text);
+                                if (stripped !== null)
+                                    block.text = stripped;
+                            }
+                        }
+                    }
+                }
+            }
+            // ── Build dynamic headers ────────────────────────────
             if (ctx.extraParams) {
                 const fallbackPrefix = ctx.extraParams[FALLBACK_PREFIX_KEY];
                 if (typeof fallbackPrefix === "string") {
@@ -477,58 +501,46 @@ export const xiaoyiProvider = {
                             dynamicHeaders["x-cron-flag"] = "begin";
                     }
                 }
-                else {
-                    // Session mode: resolve taskId for the correct session.
-                    //
-                    // Priority:
-                    //   1. capturedA2ASessionId → getCurrentTaskId()  (most reliable,
-                    //      bypasses lastRegisteredKey fallback)
-                    //   2. getCurrentSessionContext()?.taskId           (works when ALS
-                    //      is intact)
-                    //   3. ctx.extraParams cached values                (last resort,
-                    //      may be stale / from wrong session)
-                    let resolvedTaskId = null;
-                    if (capturedA2ASessionId) {
-                        resolvedTaskId = getCurrentTaskId(capturedA2ASessionId);
-                    }
-                    if (!resolvedTaskId) {
-                        resolvedTaskId = getCurrentSessionContext()?.taskId ?? null;
-                    }
-                    const traceId = resolvedTaskId ?? ctx.extraParams[HEADER_TRACE_ID];
-                    const sessionId = resolvedTaskId?.split("&")[0]
-                        ?? ctx.extraParams[HEADER_SESSION_ID];
-                    const interactionId = resolvedTaskId?.split("&")[1]
-                        ?? ctx.extraParams[HEADER_INTERACTION_ID]
-                        ?? "";
-                    if (typeof traceId === "string") {
-                        const isCron = isCronTriggered(context.messages);
-                        dynamicHeaders[HEADER_TRACE_ID] = isCron ? `cron_${traceId}_${Date.now()}` : traceId;
-                        if (isCron) {
-                            const cronTitle = extractCronTitle(context.messages);
-                            if (cronTitle)
-                                dynamicHeaders["x-cron-title"] = encodeURIComponent(cronTitle);
-                            if (context.messages?.length === 1)
-                                dynamicHeaders["x-cron-flag"] = "begin";
-                        }
+                else if (resolvedTaskId) {
+                    // Session mode: taskId extracted from user message marker
+                    const traceId = resolvedTaskId;
+                    const sessionId = traceId.split("&")[0];
+                    const interactionId = traceId.split("&")[1] ?? "";
+                    const isCron = isCronTriggered(context.messages);
+                    dynamicHeaders[HEADER_TRACE_ID] = isCron ? `cron_${traceId}_${Date.now()}` : traceId;
+                    if (isCron) {
+                        const cronTitle = extractCronTitle(context.messages);
+                        if (cronTitle)
+                            dynamicHeaders["x-cron-title"] = encodeURIComponent(cronTitle);
+                        if (context.messages?.length === 1)
+                            dynamicHeaders["x-cron-flag"] = "begin";
                     }
                     if (typeof sessionId === "string")
                         dynamicHeaders[HEADER_SESSION_ID] = sessionId;
                     if (typeof interactionId === "string")
                         dynamicHeaders[HEADER_INTERACTION_ID] = interactionId;
                 }
+                else {
+                    // No marker found – fall back to extraParams cached values
+                    const traceId = ctx.extraParams[HEADER_TRACE_ID];
+                    const sessionId = ctx.extraParams[HEADER_SESSION_ID];
+                    const interactionId = ctx.extraParams[HEADER_INTERACTION_ID];
+                    if (typeof traceId === "string")
+                        dynamicHeaders[HEADER_TRACE_ID] = traceId;
+                    if (typeof sessionId === "string")
+                        dynamicHeaders[HEADER_SESSION_ID] = sessionId;
+                    if (typeof interactionId === "string")
+                        dynamicHeaders[HEADER_INTERACTION_ID] = interactionId;
+                }
             }
             // 记录输入
             console.log(`[xiaoyiprovider] input messages count: ${context.messages?.length ?? 0}`);
             if (context.systemPrompt) {
                 console.log(`[xiaoyiprovider] system prompt length: ${context.systemPrompt.length}`);
             }
-            // Prefer deviceType from extraParams (set by prepareExtraParams).
-            // Fall back to getCurrentSessionContext() because OpenClaw caches
-            // resolvePreparedExtraParams by provider/modelId – the cache key does
-            // not include session-specific data, so deviceType may be missing
-            // from the cached extraParams even when a session is active.
+            // deviceType: prefer marker-extracted value, fall back to extraParams
             const extraParamsDeviceType = ctx.extraParams?.[DEVICE_TYPE_KEY] || undefined;
-            const deviceType = extraParamsDeviceType ?? getCurrentSessionContext()?.deviceType;
+            const deviceType = resolvedDeviceType || extraParamsDeviceType || undefined;
             // 在发送给模型前，优化 systemPrompt 结构
             if (context.systemPrompt) {
                 let sp = context.systemPrompt;
@@ -561,7 +573,7 @@ export const xiaoyiProvider = {
             const selfEvolutionEnabled = await selfEvolutionManager.isEnabled();
             console.log(`[selfEvolution] selfEvolution flag: ${selfEvolutionEnabled}`);
             context.systemPrompt = applySelfEvolutionPrompt(context.systemPrompt, selfEvolutionEnabled);
-            // Append device context to systemPrompt (using pre-captured deviceType from prepareExtraParams)
+            // Append device context to systemPrompt
             if (deviceType) {
                 const displayDevice = (deviceType === "2in1") ? "鸿蒙PC" : deviceType;
                 const deviceSection = `\n\n## Current User Device Context\nThe current user is using the following device: ${displayDevice}\nYou need to be aware of the user's current device and provide guidance accordingly. If the response involves device-related tools or actions, you must tailor the reply based on the user's current device, using device-specific references such as "saved to the Notes/Calendar on your {deviceType}.\n"`;
@@ -598,19 +610,4 @@ export const xiaoyiProvider = {
             return createRetryingStream(makeStream, cronJob);
         };
     },
-    /**
-     * Diagnostic-only: log ctx.sessionId format on every transport turn.
-     * Goal: confirm whether sessionId = sessionKey (so we can use it to
-     * look up A2A context directly from activeSessions, bypassing ALS).
-     */
-    resolveTransportTurnState: (ctx) => {
-        console.log(`[xiaoyiprovider] resolveTransportTurnState — ` +
-            `sessionId=${ctx.sessionId ?? "null"}, ` +
-            `turnId=${ctx.turnId}, ` +
-            `transport=${ctx.transport}, ` +
-            `attempt=${ctx.attempt}, ` +
-            `provider=${ctx.provider}, ` +
-            `modelId=${ctx.modelId}`);
-        return null;
-    },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi-channel",
-  "version": "0.0.110-next",
+  "version": "0.0.111-next",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",