@ynhcj/xiaoyi-channel 0.0.190-next → 0.0.191-next

package/dist/index.js

@@ -184,23 +184,36 @@ function registerSubagentHooks(api) {
     // This is the PRIMARY delivery tracking mechanism. When all expected
     // subagents have ended and parent has settled, we finalize the A2A session.
     api.on("subagent_ended", async (event, ctx) => {
-        const requesterSessionKey = ctx?.requesterSessionKey;
-        if (!requesterSessionKey)
-            return;
-        const transition = markSubagentEnded(requesterSessionKey);
-        console.log(`[XY-SUBAGENT] ended, sessionKey=${event?.targetSessionKey?.slice(0, 30)}, outcome=${event?.outcome}, complete=${transition?.isComplete ?? false}, shouldFinalize=${transition?.shouldFinalize ?? false}`);
-        if (transition?.shouldFinalize) {
-            // All subagents ended and parent already settled — finalize A2A session
-            const { resolveXYConfig } = await import("./src/config.js");
-            const { deliverSubagentFinalResult } = await import("./src/outbound.js");
-            const { getXYRuntime } = await import("./src/runtime.js");
-            const config = resolveXYConfig(getXYRuntime().config);
-            await deliverSubagentFinalResult({
-                config,
-                state: transition.state,
-                reason: "all-subagents-ended-after-parent-settled",
-            });
-            console.log(`[XY-SUBAGENT] Finalized A2A session after all subagents ended`);
+        try {
+            const requesterSessionKey = ctx?.requesterSessionKey;
+            if (!requesterSessionKey) {
+                console.log(`[XY-SUBAGENT-END] no requesterSessionKey in ctx`);
+                return;
+            }
+            const transition = markSubagentEnded(requesterSessionKey);
+            console.log(`[XY-SUBAGENT-END] ended, targetSessionKey=${event?.targetSessionKey?.slice(0, 30)}, outcome=${event?.outcome}, complete=${transition?.isComplete ?? false}, shouldFinalize=${transition?.shouldFinalize ?? false}, transition=${!!transition}`);
+            if (transition?.shouldFinalize) {
+                console.log(`[XY-SUBAGENT-END] Starting finalization...`);
+                const [{ resolveXYConfig }, { deliverSubagentFinalResult }, { getXYRuntime }] = await Promise.all([
+                    import("./src/config.js"),
+                    import("./src/outbound.js"),
+                    import("./src/runtime.js"),
+                ]);
+                const rt = getXYRuntime();
+                console.log(`[XY-SUBAGENT-END] Runtime config type: ${typeof rt.config}, keys: ${rt.config ? Object.keys(rt.config).slice(0, 5).join(',') : 'null'}`);
+                const cfg = rt.config;
+                const config = resolveXYConfig(cfg);
+                console.log(`[XY-SUBAGENT-END] XY config resolved, wsUrl=${config.wsUrl?.slice(0, 20)}`);
+                await deliverSubagentFinalResult({
+                    config,
+                    state: transition.state,
+                    reason: "all-subagents-ended-after-parent-settled",
+                });
+                console.log(`[XY-SUBAGENT-END] Finalized A2A session after all subagents ended`);
+            }
+        }
+        catch (err) {
+            console.error(`[XY-SUBAGENT-END] Error in subagent_ended hook:`, err instanceof Error ? `${err.name}: ${err.message}\n${err.stack}` : String(err));
         }
     });
 }

package/dist/src/outbound.js

@@ -20,7 +20,7 @@ export async function deliverSubagentFinalResult(params) {
     const log = logger.withContext(state.sessionId, state.taskId);
     const finalText = state.completionTexts.length > 0
         ? state.completionTexts.join("\n\n")
-        : (text ?? "");
+        : (text || undefined) ?? "子任务已完成";
     await sendStatusUpdate({
         config,
         sessionId: state.sessionId,

package/package.json

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