@ynhcj/xiaoyi-channel 0.0.204-next → 0.0.205-next

package/dist/index.js

@@ -231,16 +231,27 @@ function registerFullHooks(api) {
     // message between splice and delete, it would be lost when delete removes
     // the (now-repopulated) entry. With delete-first, bot.ts always creates a
     // fresh entry for new messages.
+    let hookFireCount = 0;
     api.on("agent_turn_prepare", async (_event, ctx) => {
-        const sessionKey = ctx.sessionKey;
-        if (!sessionKey)
+        hookFireCount++;
+        // Use ctx.sessionId (A2A session UUID) as the queue lookup key.
+        // bot.ts writes with parsed.sessionId — both refer to the same A2A UUID.
+        const sessionId = ctx.sessionId;
+        if (!sessionId)
             return;
         const queue = getSteerQueue();
-        const pending = queue.get(sessionKey);
+        const pending = queue.get(sessionId);
+        // Diagnostic: log every N-th hook fire and whenever queue has entries
+        const queueKeys = Array.from(queue.keys());
+        if (hookFireCount <= 3 || queueKeys.length > 0 || (pending && pending.length > 0)) {
+            console.log(`[STEER-HOOK-DIAG] fireCount=${hookFireCount} sessionId=${sessionId} ` +
+                `sessionKey=${ctx.sessionKey} queueKeys=${JSON.stringify(queueKeys)} pendingLen=${pending?.length ?? 0}`);
+        }
         if (!pending || pending.length === 0)
             return;
-        queue.delete(sessionKey); // delete first to prevent race
+        queue.delete(sessionId); // delete first to prevent race
         const text = pending.splice(0).join("\n\n");
+        console.log(`[STEER-HOOK] Injecting steer: sessionId=${sessionId} textLen=${text.length}`);
         return { appendContext: `\n用户追加诉求：${text}` };
     });
 }

package/dist/src/bot.js

@@ -357,10 +357,16 @@ export async function handleXYMessage(params) {
         // the model on the next turn without blocking.
         if (isUpdate) {
             const steerQueue = getSteerQueue();
-            const pending = steerQueue.get(route.sessionKey) ?? [];
+            // Use parsed.sessionId (A2A session UUID) as the queue key instead of
+            // route.sessionKey. The agent_turn_prepare hook looks up by ctx.sessionId
+            // which is the same A2A session UUID stored in the OpenClaw session entry.
+            // Using sessionId avoids format mismatches between the channel's route-based
+            // sessionKey and the agent runner's sessionKey.
+            const queueKey = parsed.sessionId;
+            const pending = steerQueue.get(queueKey) ?? [];
             pending.push(textForAgent);
-            steerQueue.set(route.sessionKey, pending);
-            log.log(`[BOT] Steer bypass: queued for agent_turn_prepare hook, sessionKey=${route.sessionKey}, queueDepth=${pending.length}, skipReg=${skipReg}`);
+            steerQueue.set(queueKey, pending);
+            log.log(`[BOT] Steer bypass: queued for agent_turn_prepare hook, queueKey=${queueKey}, sessionKey=${route.sessionKey}, queueDepth=${pending.length}, skipReg=${skipReg}`);
             // Only decrement refCount when registerTaskId was called (non-skipReg).
             // skipReg callers (CSPL/self-evolution) don't increment refCount.
             if (!skipReg) {

package/package.json

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