@ynhcj/xiaoyi-channel 0.0.106-next → 0.0.107-next

package/dist/src/provider.js

@@ -8,7 +8,7 @@
 //   models.providers.xiaoyiprovider.api = "openai-completions"
 //   models.providers.xiaoyiprovider.models = [...]
 import { createHash } from "crypto";
-import { getSession, getSessionByA2AId, xyAsyncLocalStorage } from "./xy-session-store.js";
+import { getSession, getSessionByA2AId, getAllActiveSessions, xyAsyncLocalStorage } from "./xy-session-store.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];
@@ -455,15 +455,27 @@ export const xiaoyiProvider = {
             : null;
         return async (model, context, options) => {
             const dynamicHeaders = {};
-            // 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.
+            // Resolve taskId via three-layer fallback (same pattern as requireSession):
+            //   1. capturedA2ASessionId → store lookup (set at wrapStreamFn setup if ALS was active)
+            //   2. ALS → store lookup (works at request time if async chain preserved context)
+            //   3. Store enumeration (safe when only one session is active)
             let resolvedTaskId = null;
             if (capturedA2ASessionId) {
                 resolvedTaskId = getSessionByA2AId(capturedA2ASessionId)?.taskId ?? null;
             }
+            if (!resolvedTaskId) {
+                const alsContext = xyAsyncLocalStorage.getStore();
+                const alsKey = alsContext?.openclawSessionKey;
+                if (alsKey) {
+                    resolvedTaskId = getSession(alsKey)?.taskId ?? null;
+                }
+            }
+            if (!resolvedTaskId) {
+                const allSessions = getAllActiveSessions();
+                if (allSessions.length === 1) {
+                    resolvedTaskId = allSessions[0].session.taskId;
+                }
+            }
             if (resolvedTaskId) {
                 // Session mode: use taskId from store (supports steer).
                 const sessionId = resolvedTaskId.split("&")[0];
@@ -481,7 +493,7 @@ export const xiaoyiProvider = {
                 }
             }
             else if (ctx.extraParams) {
-                // No active session — try extraParams (may contain cached prepareExtraParams result).
+                // No active session — fall back to prepareExtraParams cache.
                 const fallbackPrefix = ctx.extraParams[FALLBACK_PREFIX_KEY];
                 if (typeof fallbackPrefix === "string") {
                     // Fallback mode: generate fresh timestamp per request
@@ -531,9 +543,21 @@ export const xiaoyiProvider = {
             // not include session-specific data, so deviceType may be missing
             // from the cached extraParams even when a session is active.
             const extraParamsDeviceType = ctx.extraParams?.[DEVICE_TYPE_KEY] || undefined;
-            const storeDeviceType = capturedA2ASessionId
-                ? getSessionByA2AId(capturedA2ASessionId)?.deviceType
-                : undefined;
+            let storeDeviceType;
+            if (capturedA2ASessionId) {
+                storeDeviceType = getSessionByA2AId(capturedA2ASessionId)?.deviceType;
+            }
+            if (!storeDeviceType) {
+                const alsCtx = xyAsyncLocalStorage.getStore();
+                const key = alsCtx?.openclawSessionKey;
+                if (key)
+                    storeDeviceType = getSession(key)?.deviceType;
+            }
+            if (!storeDeviceType) {
+                const all = getAllActiveSessions();
+                if (all.length === 1)
+                    storeDeviceType = all[0].session.deviceType;
+            }
             const deviceType = extraParamsDeviceType ?? storeDeviceType;
             // 在发送给模型前，优化 systemPrompt 结构
             if (context.systemPrompt) {

package/package.json

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