@ynhcj/xiaoyi-channel 0.0.130-beta → 0.0.131-beta

package/dist/src/provider.js

@@ -9,6 +9,7 @@
 //   models.providers.xiaoyiprovider.models = [...]
 import { createHash } from "crypto";
 import { getCurrentSessionContext } from "./tools/session-manager.js";
+import { getCurrentTaskId } from "./task-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];
@@ -442,6 +443,14 @@ 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 capturedA2ASessionId = getCurrentSessionContext()?.sessionId ?? null;
         return async (model, context, options) => {
             // 每次请求时从 ctx.extraParams 动态读取 header
             const dynamicHeaders = {};
@@ -463,16 +472,26 @@ export const xiaoyiProvider = {
                     }
                 }
                 else {
-                    // Session mode: get session context at request time via ALS.
-                    // OpenClaw caches prepareExtraParams by provider/modelId, so
-                    // ctx.extraParams holds the first session's values. We must
-                    // call getCurrentSessionContext() here to get the correct
-                    // sessionId/interactionId for the current concurrent request.
-                    const sessionCtx = getCurrentSessionContext();
-                    const traceId = ctx.extraParams[HEADER_TRACE_ID];
-                    const sessionId = sessionCtx?.taskId?.split("&")[0]
+                    // 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 = sessionCtx?.taskId?.split("&")[1]
+                    const interactionId = resolvedTaskId?.split("&")[1]
                         ?? ctx.extraParams[HEADER_INTERACTION_ID]
                         ?? "";
                     if (typeof traceId === "string") {

package/package.json

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