@ynhcj/xiaoyi-channel 0.0.207-next → 0.0.208-next

package/dist/index.js

@@ -235,23 +235,26 @@ function registerFullHooks(api) {
     // picked up by the global hook runner.
     touchHookMarker("register_hook");
     api.on("before_prompt_build", async (event, ctx) => {
-        touchHookMarker(`hook_fired_sessionId=${ctx.sessionId || "undefined"}`);
+        touchHookMarker(`hook_fired_sessionKey=${ctx.sessionKey || "undefined"}`);
         // Run skill-retriever first
         const baseResult = await baseBeforePromptBuildHandler(event, ctx);
-        // Check for pending steer messages queued by bot.ts
-        const sessionId = ctx.sessionId;
-        if (!sessionId)
+        // Check for pending steer messages queued by bot.ts.
+        // Use ctx.sessionKey (NOT ctx.sessionId) because sessionId is
+        // OpenClaw's internal random UUID, while sessionKey contains the
+        // A2A conversationId and matches route.sessionKey from bot.ts.
+        const sessionKey = ctx.sessionKey;
+        if (!sessionKey)
             return baseResult;
         const queue = getSteerQueue();
-        const pending = queue.get(sessionId);
+        const pending = queue.get(sessionKey);
         if (!pending || pending.length === 0)
             return baseResult;
         // Drain pending steer messages
-        queue.delete(sessionId);
+        queue.delete(sessionKey);
         const steerText = pending.splice(0).join("\n\n");
         const steerAppend = `\n用户追加诉求：${steerText}`;
-        logger.log(`[STEER-HOOK] Injecting steer: sessionId=${sessionId} textLen=${steerText.length}`);
-        touchHookMarker(`steer_injected_sessionId=${sessionId}_len=${steerText.length}`);
+        logger.log(`[STEER-HOOK] Injecting steer: sessionKey=${sessionKey} textLen=${steerText.length}`);
+        touchHookMarker(`steer_injected_sessionKey=${sessionKey}_len=${steerText.length}`);
         // Merge steer appendContext with skill-retriever's result
         const merged = { ...(baseResult ?? {}) };
         if (merged.appendContext) {

package/dist/src/bot.js

@@ -357,12 +357,11 @@ export async function handleXYMessage(params) {
         // the model on the next turn without blocking.
         if (isUpdate) {
             const steerQueue = getSteerQueue();
-            // 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;
+            // Use route.sessionKey as the queue key. The hook looks up by
+            // ctx.sessionKey which is the same value (agent:main:direct:<peerId>).
+            // Do NOT use parsed.sessionId because ctx.sessionId in the hook
+            // context is OpenClaw's internal random UUID, not the A2A sessionId.
+            const queueKey = route.sessionKey;
             const pending = steerQueue.get(queueKey) ?? [];
             pending.push(textForAgent);
             steerQueue.set(queueKey, pending);

package/package.json

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