@ynhcj/xiaoyi-channel 0.0.104-next → 0.0.105-next

package/dist/src/bot.js

@@ -253,7 +253,9 @@ export async function handleXYMessage(params) {
             log(`[BOT-DISPATCHER] ✅ Status interval started for first message`);
         }
         log(`[BOT-DISPATCH] ⏳ withReplyDispatcher starting, sessionKey=${route.sessionKey}`);
-        await core.channel.reply.withReplyDispatcher({
+        // 🔐 Set ALS BEFORE withReplyDispatcher so agentTools factory can read it
+        // during dispatcher setup (which happens before run() is called).
+        await xyAsyncLocalStorage.run({ openclawSessionKey: route.sessionKey }, () => core.channel.reply.withReplyDispatcher({
             dispatcher,
             onSettled: () => {
                 log(`[BOT] 🏁 onSettled called for session: ${route.sessionKey}`);
@@ -261,9 +263,7 @@ export async function handleXYMessage(params) {
                 unregisterSession(route.sessionKey);
                 log(`[BOT] ✅ Cleanup completed`);
             },
-            run: () => 
-            // 🔐 Run inside ALS with openclawSessionKey so agentTools factory can read it
-            xyAsyncLocalStorage.run({ openclawSessionKey: route.sessionKey }, async () => {
+            run: async () => {
                 log(`[BOT-DISPATCH] ⏳ dispatchReplyFromConfig starting...`);
                 log(`[BOT-DISPATCH]   - sessionKey: ${ctxPayload.SessionKey}`);
                 log(`[BOT-DISPATCH]   - provider: ${ctxPayload.Provider}`);
@@ -288,8 +288,8 @@ export async function handleXYMessage(params) {
                     error(`[BOT-DISPATCH]   - error stack: ${dispatchErr instanceof Error ? dispatchErr.stack?.slice(0, 500) : "N/A"}`);
                     throw dispatchErr;
                 }
-            }),
-        });
+            },
+        }));
         log(`[BOT] ✅ Dispatcher completed for session: ${parsed.sessionId}`);
         log(`xy: dispatch complete (session=${parsed.sessionId})`);
     }

package/dist/src/provider.js

@@ -454,9 +454,34 @@ export const xiaoyiProvider = {
             ? getSession(alsContext.openclawSessionKey)?.a2aSessionId ?? null
             : null;
         return async (model, context, options) => {
-            // 每次请求时从 ctx.extraParams 动态读取 header
             const dynamicHeaders = {};
-            if (ctx.extraParams) {
+            // Priority: session store lookup (captured a2aSessionId) → prepareExtraParams cache → uid fallback
+            // We check capturedA2ASessionId FIRST because OpenClaw caches prepareExtraParams
+            // by provider/modelId (not per-session). A previous call without ALS may have
+            // populated the cache with FALLBACK_PREFIX_KEY, which would shadow the session
+            // lookup if we checked it first.
+            let resolvedTaskId = null;
+            if (capturedA2ASessionId) {
+                resolvedTaskId = getSessionByA2AId(capturedA2ASessionId)?.taskId ?? null;
+            }
+            if (resolvedTaskId) {
+                // Session mode: use taskId from store (supports steer).
+                const sessionId = resolvedTaskId.split("&")[0];
+                const interactionId = resolvedTaskId.split("&")[1] || "";
+                const isCron = isCronTriggered(context.messages);
+                dynamicHeaders[HEADER_TRACE_ID] = isCron ? `cron_${resolvedTaskId}_${Date.now()}` : resolvedTaskId;
+                dynamicHeaders[HEADER_SESSION_ID] = sessionId;
+                dynamicHeaders[HEADER_INTERACTION_ID] = interactionId;
+                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 (ctx.extraParams) {
+                // No active session — try extraParams (may contain cached prepareExtraParams result).
                 const fallbackPrefix = ctx.extraParams[FALLBACK_PREFIX_KEY];
                 if (typeof fallbackPrefix === "string") {
                     // Fallback mode: generate fresh timestamp per request
@@ -474,18 +499,10 @@ export const xiaoyiProvider = {
                     }
                 }
                 else {
-                    // Session mode: resolve taskId from store using captured a2aSessionId.
-                    // This always returns the latest taskId (supports steer).
-                    let resolvedTaskId = null;
-                    if (capturedA2ASessionId) {
-                        resolvedTaskId = getSessionByA2AId(capturedA2ASessionId)?.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]
-                        ?? "";
+                    // No captured session, no fallback — use whatever is in prepareExtraParams cache.
+                    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") {
                         const isCron = isCronTriggered(context.messages);
                         dynamicHeaders[HEADER_TRACE_ID] = isCron ? `cron_${traceId}_${Date.now()}` : traceId;

package/package.json

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