@ynhcj/xiaoyi-channel 0.0.231-next → 0.0.232-next

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (88) hide show
  1. package/dist/index.js +171 -6
  2. package/dist/src/channel.js +5 -2
  3. package/dist/src/conversation/conversation-manager.d.ts +12 -3
  4. package/dist/src/conversation/conversation-manager.js +89 -8
  5. package/dist/src/conversation/conversation-session.d.ts +16 -0
  6. package/dist/src/conversation/conversation-session.js +5 -0
  7. package/dist/src/conversation/cron-buffer.d.ts +36 -11
  8. package/dist/src/conversation/cron-buffer.js +157 -56
  9. package/dist/src/conversation/outbound-gateway.d.ts +4 -0
  10. package/dist/src/conversation/outbound-gateway.js +2 -2
  11. package/dist/src/conversation/outbound-queue.d.ts +35 -0
  12. package/dist/src/conversation/outbound-queue.js +96 -0
  13. package/dist/src/conversation/stream-assembler.d.ts +52 -0
  14. package/dist/src/conversation/stream-assembler.js +122 -0
  15. package/dist/src/cron-command.js +2 -24
  16. package/dist/src/cspl/call_api.js +8 -2
  17. package/dist/src/cspl/constants.d.ts +1 -0
  18. package/dist/src/cspl/constants.js +2 -0
  19. package/dist/src/cspl/sentinel_hook.js +6 -9
  20. package/dist/src/cspl/utils.d.ts +2 -2
  21. package/dist/src/cspl/utils.js +8 -8
  22. package/dist/src/dispatch/bot.js +43 -3
  23. package/dist/src/dispatch/outbound.js +14 -5
  24. package/dist/src/dispatch/reply-dispatcher.js +283 -155
  25. package/dist/src/dynamic-skill-trigger.d.ts +8 -0
  26. package/dist/src/dynamic-skill-trigger.js +62 -0
  27. package/dist/src/formatter.d.ts +7 -0
  28. package/dist/src/formatter.js +71 -94
  29. package/dist/src/provider.js +87 -4
  30. package/dist/src/reply-dispatcher.js +16 -12
  31. package/dist/src/self-evolution-handler.d.ts +1 -1
  32. package/dist/src/skill-retriever/config.js +2 -2
  33. package/dist/src/skill-retriever/hooks.js +34 -13
  34. package/dist/src/skill-retriever/skill-status.d.ts +22 -0
  35. package/dist/src/skill-retriever/skill-status.js +125 -0
  36. package/dist/src/skill-retriever/tool-search.d.ts +4 -2
  37. package/dist/src/skill-retriever/tool-search.js +75 -15
  38. package/dist/src/skill-retriever/types.d.ts +1 -0
  39. package/dist/src/tools/agent-as-skill-tool.js +1 -1
  40. package/dist/src/tools/calendar-tool.js +1 -1
  41. package/dist/src/tools/call-device-tool.js +24 -13
  42. package/dist/src/tools/call-phone-tool.js +4 -2
  43. package/dist/src/tools/check-plugin-privilege-tool.js +1 -1
  44. package/dist/src/tools/create-alarm-tool.js +1 -1
  45. package/dist/src/tools/delete-alarm-tool.js +1 -1
  46. package/dist/src/tools/discover-cross-devices-tool.js +1 -1
  47. package/dist/src/tools/display-a2ui-card-bypath-tool.js +43 -10
  48. package/dist/src/tools/hmos-cli.js +2 -2
  49. package/dist/src/tools/invoke.js +4 -4
  50. package/dist/src/tools/location-tool.js +1 -1
  51. package/dist/src/tools/login-token-tool.js +1 -1
  52. package/dist/src/tools/modify-alarm-tool.js +1 -1
  53. package/dist/src/tools/modify-note-tool.js +1 -1
  54. package/dist/src/tools/note-tool.js +1 -1
  55. package/dist/src/tools/query-app-message-tool.js +1 -1
  56. package/dist/src/tools/query-memory-data-tool.js +1 -1
  57. package/dist/src/tools/query-todo-task-tool.js +1 -1
  58. package/dist/src/tools/save-file-to-phone-tool.js +1 -1
  59. package/dist/src/tools/save-media-to-gallery-tool.js +1 -1
  60. package/dist/src/tools/search-alarm-tool.js +1 -1
  61. package/dist/src/tools/search-calendar-tool.js +1 -1
  62. package/dist/src/tools/search-contact-tool.js +1 -1
  63. package/dist/src/tools/search-email-tool.js +1 -1
  64. package/dist/src/tools/search-file-tool.js +1 -1
  65. package/dist/src/tools/search-message-tool.js +1 -1
  66. package/dist/src/tools/search-note-tool.js +1 -1
  67. package/dist/src/tools/search-photo-gallery-tool.js +1 -1
  68. package/dist/src/tools/send-cross-device-task-tool.js +1 -1
  69. package/dist/src/tools/send-email-tool.js +1 -2
  70. package/dist/src/tools/send-file-to-user-tool.js +1 -1
  71. package/dist/src/tools/send-message-tool.js +4 -2
  72. package/dist/src/tools/session-manager.d.ts +4 -4
  73. package/dist/src/tools/session-manager.js +23 -12
  74. package/dist/src/tools/upload-file-tool.js +1 -1
  75. package/dist/src/tools/upload-photo-tool.js +1 -1
  76. package/dist/src/tools/xiaoyi-add-collection-tool.js +1 -1
  77. package/dist/src/tools/xiaoyi-collection-tool.js +1 -1
  78. package/dist/src/tools/xiaoyi-delete-collection-tool.js +1 -1
  79. package/dist/src/tools/xiaoyi-gui-tool.js +3 -3
  80. package/dist/src/transport/push.d.ts +3 -1
  81. package/dist/src/transport/push.js +9 -1
  82. package/dist/src/trigger-handler.js +1 -1
  83. package/dist/src/utils/async-mutex.d.ts +5 -0
  84. package/dist/src/utils/async-mutex.js +14 -0
  85. package/dist/src/utils/cron-push-map.js +29 -21
  86. package/dist/src/utils/pushdata-manager.d.ts +9 -1
  87. package/dist/src/utils/pushdata-manager.js +28 -19
  88. package/package.json +1 -1
@@ -5,9 +5,7 @@
5
5
  // independently of any session. The device processes the command and returns
6
6
  // results through the normal WebSocket connection, so response listening
7
7
  // works the same as for regular tool calls.
8
- import { randomUUID } from "crypto";
9
- import { XYPushService } from "./push.js";
10
- import { getAllPushIds } from "./utils/pushid-manager.js";
8
+ import { pushCommand } from "./conversation/outbound-gateway.js";
11
9
  import { logger } from "./utils/logger.js";
12
10
  /**
13
11
  * Send a tool command through the push channel (for cron-triggered tool calls).
@@ -24,28 +22,8 @@ export async function sendCommandViaPush(params) {
24
22
  command.header?.name ??
25
23
  "Command";
26
24
  logger.log(`[CRON-CMD] Sending command via push, intent=${intentName}`);
27
- // 1. 选 pushId:优先用调用方解析出的设备 pushId(多设备路由正确);
28
- // 未提供时回退到 getAllPushIds()[0](单设备兼容旧行为)。
29
- let pushId = config.pushId;
30
- if (params.pushId) {
31
- pushId = params.pushId;
32
- }
33
- else {
34
- try {
35
- const pushIdList = await getAllPushIds();
36
- if (pushIdList.length > 0) {
37
- pushId = pushIdList[0];
38
- }
39
- }
40
- catch (error) {
41
- logger.error("[CRON-CMD] Failed to load pushIds:", error);
42
- }
43
- }
44
- // 2. Build and send push notification with command in directives
45
- const pushService = new XYPushService(config);
46
- const sessionId = randomUUID();
47
25
  try {
48
- await pushService.sendPushWithDirectives(pushId, sessionId, [command]);
26
+ await pushCommand({ config, command, pushId: params.pushId });
49
27
  logger.log(`[CRON-CMD] Push sent successfully, intent=${intentName}`);
50
28
  }
51
29
  catch (error) {
@@ -3,6 +3,7 @@
3
3
  */
4
4
  import https from 'https';
5
5
  import http from 'http';
6
+ import crypto from 'crypto';
6
7
  import { URL } from 'url';
7
8
  import * as fs from 'fs';
8
9
  import * as path from 'path';
@@ -10,13 +11,18 @@ import { fileURLToPath } from 'url';
10
11
  const __filename = fileURLToPath(import.meta.url);
11
12
  const __dirname = path.dirname(__filename);
12
13
  import { getConfig } from './config.js';
13
- import { DEFAULT_HTTPS_PORT, DEFAULT_HTTP_PORT, HTTP_STATUS_BAD_REQUEST, API_URL_SUFFIX } from './constants.js';
14
+ import { DEFAULT_HTTPS_PORT, DEFAULT_HTTP_PORT, HTTP_STATUS_BAD_REQUEST, API_URL_SUFFIX, MAX_TRACE_ID_LENGTH } from './constants.js';
15
+ // 安全扫描接口 trace-id:sessionId 为空时降级为 uuid,超过 MAX_TRACE_ID_LENGTH 截断
16
+ function buildTraceId(sessionId) {
17
+ const traceId = sessionId ? sessionId : crypto.randomUUID();
18
+ return traceId.length > MAX_TRACE_ID_LENGTH ? traceId.substring(0, MAX_TRACE_ID_LENGTH) : traceId;
19
+ }
14
20
  function buildHeadersForCelia(config, sessionId) {
15
21
  if (!config.uid || !config.apiKey || !config.skillId || !config.requestFrom) {
16
22
  throw new Error('[SENTINEL HOOK] Missing required configuration: uid, apiKey, skillId, or requestFrom is not defined');
17
23
  }
18
24
  return {
19
- 'x-hag-trace-id': sessionId,
25
+ 'x-hag-trace-id': buildTraceId(sessionId),
20
26
  'x-uid': config.uid,
21
27
  'x-api-key': config.apiKey,
22
28
  'x-request-from': config.requestFrom,
@@ -63,6 +63,7 @@ export declare const CONFIG_FILE_NAME = "configs.json";
63
63
  export declare const ENV_FILE_PATH = "/home/sandbox/.openclaw/.xiaoyienv";
64
64
  export declare const API_URL_SUFFIX = "/celia-claw/v1/rest-api/skill/execute";
65
65
  export declare const REQUIRED_ENV_VARS: string[];
66
+ export declare const MAX_TRACE_ID_LENGTH = 64;
66
67
  export declare const ALLOWED_TOOLS: string[];
67
68
  export declare const STEER_ABORT_MESSAGE = "\u5F53\u524D\u884C\u4E3A\u5B58\u5728\u5B89\u5168\u9690\u60A3\uFF0C\u7EC8\u6B62\u6240\u6709\u64CD\u4F5C\uFF0C\u5E76\u4E14\u5728\u6700\u7EC8\u56DE\u590D\u4E2D\u8BF4\u660E\uFF0C\u8BC6\u522B\u5230\u5F53\u524D\u6D41\u7A0B\u4E2D\u5B58\u5728\u6F5C\u5728\u5B89\u5168\u98CE\u9669\uFF0C\u5DF2\u5E2E\u60A8\u4E2D\u6B62\u5F53\u524D\u6D41\u7A0B\uFF0C\u8BF7\u6E05\u7A7A\u4E0A\u4E0B\u6587\u540E\u91CD\u8BD5";
68
69
  export declare const MAX_FILE_COUNT = 10;
@@ -35,6 +35,8 @@ export const CONFIG_FILE_NAME = 'configs.json';
35
35
  export const ENV_FILE_PATH = '/home/sandbox/.openclaw/.xiaoyienv';
36
36
  export const API_URL_SUFFIX = '/celia-claw/v1/rest-api/skill/execute';
37
37
  export const REQUIRED_ENV_VARS = ['PERSONAL-API-KEY', 'PERSONAL-UID', 'SERVICE_URL'];
38
+ // x-hag-trace-id 最大长度,超出截断
39
+ export const MAX_TRACE_ID_LENGTH = 64;
38
40
  // 工具白名单:除了web_fetch特殊处理外,只有这些工具才处理result文本
39
41
  export const ALLOWED_TOOLS = ['web_fetch', 'read', 'pdf', 'exec', 'message'];
40
42
  // Steer 注入话术:CSPL REJECT 时通过 steer 插话打断模型
@@ -7,7 +7,7 @@ import { callApi } from './call_api.js';
7
7
  import { processText, extractResultText, validateAndTruncateText, parseSecurityResult, handleExecToolInput, handleMessageToolInput, handleOtherToolInput, buildToolOutputPayload, extractInterActionId, extractSessionId } from './utils.js';
8
8
  import { ALLOWED_TOOLS, MAX_TOTAL_LENGTH, MIN_TEXT_LENGTH, MAX_TEXT_LENGTH, STEER_ABORT_MESSAGE } from './constants.js';
9
9
  import { getCurrentSessionContext } from '../tools/session-manager.js';
10
- import { tryInjectSteer } from './steer-context.js';
10
+ import { steer } from '../conversation/steer-service.js';
11
11
  // 主入口模块
12
12
  export default function register(api) {
13
13
  api.on("before_tool_call", async (event, _ctx) => {
@@ -76,7 +76,7 @@ export default function register(api) {
76
76
  }
77
77
  }
78
78
  const interActionID = extractInterActionId(taskId);
79
- const outputPayload = buildToolOutputPayload(taskId, payloadSessionId, event.toolName, content, event.toolCallId, interActionID);
79
+ const outputPayload = buildToolOutputPayload(payloadSessionId, event.toolName, content, event.toolCallId, interActionID);
80
80
  logger.log(`[SENTINEL HOOK] Content extracted successfully. Length: ${JSON.stringify(outputPayload).length}`);
81
81
  try {
82
82
  const response = await callApi(outputPayload, api, sessionId);
@@ -84,13 +84,10 @@ export default function register(api) {
84
84
  logger.log(`[SENTINEL HOOK] toolCallId=${event.toolCallId}, TOOL_OUTPUT response: status=${result.status}.`);
85
85
  if (result.status === 'REJECT') {
86
86
  logger.warn('[SENTINEL HOOK] REJECT detected, attempting steer injection');
87
- if (sessionCtx?.sessionId && sessionCtx?.taskId) {
88
- await tryInjectSteer({
89
- sessionId: sessionCtx.sessionId,
90
- taskId: sessionCtx.taskId,
91
- message: STEER_ABORT_MESSAGE,
92
- source: 'cspl',
93
- });
87
+ if (sessionCtx?.sessionId) {
88
+ // CSPL steer:经对话管理层直接 steer 当前会话;
89
+ // 注入失败即失败,仅记录日志,不做兜底(不新建 dispatcher)
90
+ await steer(sessionCtx.sessionId, STEER_ABORT_MESSAGE, 'cspl');
94
91
  }
95
92
  else {
96
93
  logger.warn(`[SENTINEL HOOK] Cannot inject steer: sessionKey=${ctx.sessionKey}, sessionCtx found=${!!sessionCtx}`);
@@ -17,7 +17,7 @@ export declare function getFileSizeInKB(filePath: string): number;
17
17
  export declare function extractSessionId(taskId: string): string;
18
18
  export declare function extractInterActionId(taskId: string): number;
19
19
  export declare function formatReqTime(): string;
20
- export declare function buildToolInputPayload(taskID: string, sessionID: string, toolName: string, toolArguments: string, toolCallId: string, interActionID: number, options?: {
20
+ export declare function buildToolInputPayload(sessionID: string, toolName: string, toolArguments: string, toolCallId: string, interActionID: number, options?: {
21
21
  file?: {
22
22
  type: string;
23
23
  url: string;
@@ -26,7 +26,7 @@ export declare function buildToolInputPayload(taskID: string, sessionID: string,
26
26
  body: string;
27
27
  };
28
28
  }): CallApiPayload;
29
- export declare function buildToolOutputPayload(taskID: string, sessionID: string, funcName: string, content: string, toolCallId: string, interActionID: number): CallApiPayload;
29
+ export declare function buildToolOutputPayload(sessionID: string, funcName: string, content: string, toolCallId: string, interActionID: number): CallApiPayload;
30
30
  export declare function handleExecToolInput(event: any, api: OpenClawPluginApi, sessionId: string, taskId: string): Promise<{
31
31
  status: 'ACCEPT' | 'REJECT';
32
32
  } | null>;
@@ -213,7 +213,7 @@ export function formatReqTime() {
213
213
  `${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}.${ms}+0800`;
214
214
  }
215
215
  // 构建工具输入新消息体(新接口格式)
216
- export function buildToolInputPayload(taskID, sessionID, toolName, toolArguments, toolCallId, interActionID, options) {
216
+ export function buildToolInputPayload(sessionID, toolName, toolArguments, toolCallId, interActionID, options) {
217
217
  const callObj = {
218
218
  type: 'function',
219
219
  name: toolName,
@@ -225,7 +225,7 @@ export function buildToolInputPayload(taskID, sessionID, toolName, toolArguments
225
225
  callObj.file = [options.file];
226
226
  }
227
227
  return {
228
- taskID,
228
+ taskID: crypto.randomUUID(),
229
229
  sessionID,
230
230
  businessID: 'voiceassistant',
231
231
  sceneID: 'XIAOYI_CLAW',
@@ -244,9 +244,9 @@ export function buildToolInputPayload(taskID, sessionID, toolName, toolArguments
244
244
  };
245
245
  }
246
246
  // 构建工具输出新消息体(新接口格式)
247
- export function buildToolOutputPayload(taskID, sessionID, funcName, content, toolCallId, interActionID) {
247
+ export function buildToolOutputPayload(sessionID, funcName, content, toolCallId, interActionID) {
248
248
  return {
249
- taskID,
249
+ taskID: crypto.randomUUID(),
250
250
  sessionID,
251
251
  businessID: 'voiceassistant',
252
252
  sceneID: 'XIAOYI_CLAW',
@@ -306,7 +306,7 @@ export async function handleExecToolInput(event, api, sessionId, taskId) {
306
306
  bodyContent = bodyContent.substring(0, MAX_TEXT_LENGTH);
307
307
  logger.warn(`[SENTINEL HOOK] File content truncated to ${MAX_TEXT_LENGTH} characters`);
308
308
  }
309
- const toolInputPayload = buildToolInputPayload(taskId, sessionId, 'exec', command, event.toolCallId, interActionID, { file: { type: 'doc', url: obsUrl, hash: fileHash, size: fileSize, body: bodyContent } });
309
+ const toolInputPayload = buildToolInputPayload(sessionId, 'exec', command, event.toolCallId, interActionID, { file: { type: 'doc', url: obsUrl, hash: fileHash, size: fileSize, body: bodyContent } });
310
310
  logger.log(`[SENTINEL HOOK] Sending TOOL_INPUT for file: ${path.basename(filePath)}, body length: ${JSON.stringify(toolInputPayload).length}`);
311
311
  try {
312
312
  lastResult = await sendToolInputRequest(toolInputPayload, api, sessionId, event.toolCallId);
@@ -328,7 +328,7 @@ export async function handleExecToolInput(event, api, sessionId, taskId) {
328
328
  else {
329
329
  // 场景2:直接执行代码(heredoc场景)
330
330
  logger.log('[SENTINEL HOOK] No code files found in command, treating as direct code execution');
331
- const toolInputPayload = buildToolInputPayload(taskId, sessionId, 'exec', command, event.toolCallId, interActionID);
331
+ const toolInputPayload = buildToolInputPayload(sessionId, 'exec', command, event.toolCallId, interActionID);
332
332
  logger.log(`[SENTINEL HOOK] Sending TOOL_INPUT for direct code execution, body length: ${JSON.stringify(toolInputPayload).length}`);
333
333
  return await sendToolInputRequest(toolInputPayload, api, sessionId, event.toolCallId);
334
334
  }
@@ -342,7 +342,7 @@ export async function handleMessageToolInput(event, api, sessionId, taskId) {
342
342
  }
343
343
  logger.log(`[SENTINEL HOOK] Processing message tool input, message length: ${message.length}`);
344
344
  const interActionID = extractInterActionId(taskId);
345
- const toolInputPayload = buildToolInputPayload(taskId, sessionId, 'message', message, event.toolCallId, interActionID);
345
+ const toolInputPayload = buildToolInputPayload(sessionId, 'message', message, event.toolCallId, interActionID);
346
346
  logger.log(`[SENTINEL HOOK] Sending TOOL_INPUT for message, body length: ${JSON.stringify(toolInputPayload).length}`);
347
347
  return await sendToolInputRequest(toolInputPayload, api, sessionId, event.toolCallId);
348
348
  }
@@ -459,7 +459,7 @@ export async function handleOtherToolInput(event, api, sessionId, taskId) {
459
459
  // 将 params 序列化为 JSON 字符串,并限制长度
460
460
  const paramsJson = JSON.stringify(params).substring(0, MAX_TEXT_LENGTH);
461
461
  const interActionID = extractInterActionId(taskId);
462
- const toolInputPayload = buildToolInputPayload(taskId, sessionId, event.toolName, paramsJson, event.toolCallId, interActionID);
462
+ const toolInputPayload = buildToolInputPayload(sessionId, event.toolName, paramsJson, event.toolCallId, interActionID);
463
463
  logger.log(`[SENTINEL HOOK] Sending TOOL_INPUT for ${event.toolName}, body length: ${JSON.stringify(toolInputPayload).length}`);
464
464
  return await sendToolInputRequest(toolInputPayload, api, sessionId, event.toolCallId);
465
465
  }
@@ -15,7 +15,7 @@ import { selfEvolutionManager } from "../utils/self-evolution-manager.js";
15
15
  import { saveRuntimeInfo } from "../utils/runtime-manager.js";
16
16
  import { toolCallNudgeManager } from "../utils/tool-call-nudge-manager.js";
17
17
  import { tryDirectSteer } from "../conversation/steer-service.js";
18
- import { registerTask, completeTask, hasActiveTask, bindSessionKey, getWaitState, hasWaitState, markParentSettled, cacheXYConfig, } from "../conversation/conversation-manager.js";
18
+ import { registerTask, completeTask, hasActiveTask, bindSessionKey, getWaitState, hasWaitState, markParentSettled, markTurnInflight, clearTurnInflight, cacheXYConfig, } from "../conversation/conversation-manager.js";
19
19
  import { logger } from "../utils/logger.js";
20
20
  /**
21
21
  * Handle an incoming A2A message.
@@ -172,6 +172,8 @@ export async function handleXYMessage(params) {
172
172
  // IMPORTANT: Only register on the FIRST message. Steer messages have a
173
173
  // different taskId — overwriting the mapping would break subagent wait
174
174
  // state tracking for the original message's subagents.
175
+ // 例外:steer 直接注入失败(no-active-run)且无存活等待态时,下方
176
+ // steer 重分发路径会重绑定到新 taskId(旧 run 已消失,无历史等待态需保护)。
175
177
  if (!isUpdate) {
176
178
  bindSessionKey(route.sessionKey, parsed.sessionId, parsed.taskId, parsed.messageId);
177
179
  }
@@ -315,6 +317,21 @@ export async function handleXYMessage(params) {
315
317
  }
316
318
  const steerFailReason = steerResult.reason;
317
319
  log.log(`[BOT-STEER] Direct steer failed (${steerFailReason}), re-dispatching as a new turn`);
320
+ // 🔑 steer 失败重分发前重绑 sessionKey → 本消息的 A2A 身份。
321
+ // 首条消息绑定刻意不被 steer 覆盖(见上方 bindSessionKey 注释),但那会让
322
+ // 新 turn 派生的 subagent 等待态挂在旧 taskId 上:spawn/ended 计数走
323
+ // sessionKeyIndex(旧身份),onIdle/onSettled/announce 捕获走新 taskId,
324
+ // 两套身份错位导致 final 帧提前发出、parentSettled 永远缺失、announce
325
+ // 落 push 兜底。旧 run 已不存在(no-active-run)时重绑定可让三者对齐。
326
+ // 安全条件:
327
+ // - 仅 no-active-run —— queue-rejected 说明旧 run 仍存活,重绑定会
328
+ // 打断旧 run 的 subagent 跟踪;
329
+ // - 无存活等待态 —— 旧 subagent 未归时保持旧绑定,保住旧任务的
330
+ // final 交付(新 turn 的 subagent 跟踪退化为已知限制)。
331
+ if (steerFailReason === "no-active-run" && !hasWaitState(parsed.sessionId)) {
332
+ bindSessionKey(route.sessionKey, parsed.sessionId, parsed.taskId, parsed.messageId);
333
+ log.log(`[BOT-STEER] Rebound sessionKey to new taskId (no active run, no pending subagent wait)`);
334
+ }
318
335
  }
319
336
  // Resolve envelope format options (following feishu pattern)
320
337
  const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(cfg);
@@ -404,15 +421,22 @@ export async function handleXYMessage(params) {
404
421
  runCrossTaskContext: runCrossTaskContext ?? undefined,
405
422
  };
406
423
  log.log(`[BOT-DISPATCH] withReplyDispatcher starting, sessionKey=${route.sessionKey}`);
424
+ // 🔑 登记本 turn 在途(onIdle 入口 / onSettled 兜底清除):subagent 终态
425
+ // 帧的时机门控据此判断"session 内仍有 turn 在流式输出",防止 final:true
426
+ // 提前截断在途回复。steer 直接注入成功的路径在上方已 return,不会登记。
427
+ markTurnInflight(parsed.sessionId, parsed.taskId);
407
428
  await core.channel.reply.withReplyDispatcher({
408
429
  dispatcher,
409
430
  onSettled: async () => {
410
431
  log.log(`[BOT] onSettled`);
432
+ // 🔑 兜底清除本 turn 在途标记(正常路径 onIdle 入口已清除;onIdle
433
+ // 未执行的异常路径靠此处,避免时机门控永久推迟 subagent 终态帧)。
434
+ clearTurnInflight(parsed.sessionId, parsed.taskId);
411
435
  // Subagent wait state: if parent has pending subagents, mark settled
412
436
  // and defer finalization. Cleanup is suppressed so the session stays alive.
413
- const pendingWait = getWaitState(parsed.sessionId, parsed.taskId);
437
+ const pendingWait = getWaitState(parsed.sessionId, parsed.taskId) ?? getWaitState(parsed.sessionId);
414
438
  if (pendingWait && !pendingWait.parentSettled) {
415
- const transition = markParentSettled(parsed.sessionId, parsed.taskId);
439
+ const transition = markParentSettled(parsed.sessionId, pendingWait.taskId);
416
440
  if (transition?.shouldFinalize) {
417
441
  // All completions arrived before parent settled → finalize now
418
442
  const { deliverSubagentFinalResult } = await import("../conversation/conversation-manager.js");
@@ -427,6 +451,17 @@ export async function handleXYMessage(params) {
427
451
  }
428
452
  return;
429
453
  }
454
+ // 🔑 安全网:等待态已就绪(父 settled + 全部完成)但尚未交付 ——
455
+ // 例如 finalize 因本 turn 当时在途被时机门控推迟,而本 turn 的
456
+ // onIdle 未走到 defer 分支(异常/竞态路径)。幂等,已交付时为 no-op。
457
+ if (pendingWait &&
458
+ pendingWait.deliveredCompletions >= pendingWait.expectedCompletions) {
459
+ const { deliverSubagentFinalResult } = await import("../conversation/conversation-manager.js");
460
+ await deliverSubagentFinalResult({
461
+ state: pendingWait,
462
+ reason: "ready-at-onsettled",
463
+ });
464
+ }
430
465
  // cleanup 已由 onIdleComplete 在 onIdle 的 finally 中执行。
431
466
  // onSettled 不做任何清理(直接在这里清理会发生 race condition)。
432
467
  },
@@ -478,6 +513,11 @@ export async function handleXYMessage(params) {
478
513
  errLog.log(`[BOT] Cleaning up after error`);
479
514
  // 清理 taskId
480
515
  completeTask(sessionId);
516
+ // 清理在途标记(dispatch 中途异常时 onIdle/onSettled 可能未执行,
517
+ // 避免残留标记让 subagent 终态帧的时机门控永久推迟)
518
+ if (errTaskId) {
519
+ clearTurnInflight(sessionId, errTaskId);
520
+ }
481
521
  errLog.log(`[BOT] Cleanup completed after error`);
482
522
  }
483
523
  }
@@ -106,7 +106,13 @@ export const xyOutbound = {
106
106
  // 定时任务执行期间的所有 sendText 一律吞掉(返回合成成功,保证
107
107
  // openclaw durable-delivery 记账正常),只放行 cron run 结束后的
108
108
  // announce 最终结果(唯一一条 push)。
109
- const cronGate = gateCronSendText(text, config);
109
+ // announce 时 meta 是 gate 同步快照的 cron 元数据(jobId/title),
110
+ // 随 push 下发供客户端识别来源;其余路径 meta 为 null。
111
+ // announceLike(无显式 target:to 为空或 DEFAULT_PUSH_MARKER)用于并发
112
+ // 场景下把 announce 与中间消息粗路由到正确的 job turn —— sendText 层
113
+ // 拿不到 jobId/runId。
114
+ const announceLike = !to || to === DEFAULT_PUSH_MARKER;
115
+ const { gate: cronGate, meta: cronMeta } = gateCronSendText(text, announceLike, config);
110
116
  if (cronGate === "swallow") {
111
117
  logger.log(`[xyOutbound.sendText] Cron turn active — swallowing intermediate sendText, len=${text?.length ?? 0}`);
112
118
  return {
@@ -169,11 +175,13 @@ export const xyOutbound = {
169
175
  // The push service will handle it based on config
170
176
  actualTo = config.defaultSessionId || "";
171
177
  }
172
- // 1. 持久化推送消息内容,获取 pushDataId
178
+ // 1. 持久化推送消息内容,获取 pushDataId(cron announce 时附带 cron 元数据)
173
179
  logger.log(`[xyOutbound.sendText] Saving push data to local storage...`);
174
180
  let pushDataId;
175
181
  try {
176
- pushDataId = await savePushData(text);
182
+ pushDataId = await savePushData(text, cronMeta
183
+ ? { cronJobId: cronMeta.jobId, cronTitle: cronMeta.jobTitle }
184
+ : undefined);
177
185
  logger.log(`[xyOutbound.sendText] Push data saved with ID: ${pushDataId.substring(0, 20)}`);
178
186
  }
179
187
  catch (error) {
@@ -191,10 +199,11 @@ export const xyOutbound = {
191
199
  title,
192
200
  to: actualTo,
193
201
  pushDataId,
202
+ ...(cronMeta ? { cronJobId: cronMeta.jobId, cronTitle: cronMeta.jobTitle } : {}),
194
203
  });
195
- // announce 最终结果已送达 —— 关闭 cron turn
204
+ // announce 最终结果已送达 —— 关闭该 job 的 cron turn(并发下不误关其它 job)
196
205
  if (cronGate === "announce") {
197
- closeCronTurn("announce-delivered");
206
+ closeCronTurn(cronMeta?.jobId, "announce-delivered");
198
207
  }
199
208
  // Return message info
200
209
  return {