@ynhcj/xiaoyi-channel 0.0.163-next → 0.0.164-next

package/dist/index.js

@@ -37,18 +37,19 @@ function registerCronDetectionHook(api) {
 }
 /** 从 cron add 工具结果中提取 jobId 并写入 pushId 映射。 */
 async function captureCronAddMapping(event, ctx) {
-    // 诊断：先看 after_tool_call 是否为 cron 工具触发
-    if (event.toolName !== "cron")
+    // 两条创建路径都要捕获：
+    //   1) cron agent 工具：toolName==="cron", params.action==="add"
+    //   2) exec 跑 CLI：toolName==="exec", params.command 含 "cron add"
+    //      （agent 实际用的是这条：openclaw cron add --name ... --cron ... --message ...）
+    const isCronAddTool = event.toolName === "cron" &&
+        (event.params?.action === "add" || event.params?.action === "create");
+    const isExecCronAdd = event.toolName === "exec" && isExecCronAddCommand(event.params?.command);
+    if (!isCronAddTool && !isExecCronAdd)
         return;
-    const action = typeof event.params?.action === "string" ? event.params.action : "";
-    console.log(`[CRONMAP] after_tool_call cron, action=${action}, resultType=${typeof event.result}`);
-    if (action !== "add") {
-        console.log(`[CRONMAP] skip: action !== "add" (got ${action})`);
-        return;
-    }
+    console.log(`[CRONMAP] after_tool_call path=${event.toolName}, resultType=${typeof event.result}`);
     const jobId = readJobIdFromResult(event.result);
     if (!jobId) {
-        console.log(`[CRONMAP] skip: could not extract jobId from result. preview=${preview(event.result)}`);
+        console.log(`[CRONMAP] skip: could not extract jobId. preview=${preview(event.result)}`);
         return;
     }
     console.log(`[CRONMAP] extracted jobId=${jobId}`);
@@ -68,10 +69,16 @@ async function captureCronAddMapping(event, ctx) {
         pushId,
         sessionId,
         deviceType: sessionCtx?.deviceType,
-        source: "conversation",
+        source: event.toolName === "exec" ? "exec-cli" : "conversation",
     });
     console.log(`[CRONMAP] map written OK`);
 }
+/** 判断 exec 命令是否为 cron add（匹配 "openclaw cron add" 或裸 "cron add"，排除 list/remove 等）。 */
+function isExecCronAddCommand(command) {
+    if (typeof command !== "string")
+        return false;
+    return /\bcron\s+add\b/.test(command);
+}
 /** 取结果的短预览，用于诊断。 */
 function preview(value) {
     if (value == null)
@@ -79,18 +86,27 @@ function preview(value) {
     const s = typeof value === "string" ? value : JSON.stringify(value);
     return s.length > 200 ? s.slice(0, 200) + "…" : s;
 }
-/** 防御性地从 cron add 结果中取 job id（可能是对象、JSON 字符串或工具输出文本）。 */
+/** 防御性地从 cron add 结果中取 job id。
+ *  覆盖：裸 job 对象、JSON 字符串、exec 输出文本、{stdout}/data/result/job 嵌套。 */
 function readJobIdFromResult(result) {
     if (!result)
         return undefined;
+    // exec 工具结果常把命令输出包在 {stdout, stderr, exitCode} 里
+    if (result && typeof result === "object") {
+        const stdout = result.stdout;
+        if (typeof stdout === "string" && stdout.trim()) {
+            const fromStdout = readJobIdFromResult(stdout);
+            if (fromStdout)
+                return fromStdout;
+        }
+    }
     let obj = result;
     if (typeof result === "string") {
-        // 优先尝试 JSON 解析
         try {
             obj = JSON.parse(result);
         }
         catch {
-            // 解析失败：可能是纯文本工具输出，尝试从文本里抓 "id":"..." 或 id=...
+            // 纯文本：从文本里抓 "id":"..." 或 id=...
             const m = result.match(/"id"\s*:\s*"([^"]+)"/);
             if (m)
                 return m[1];
@@ -101,7 +117,6 @@ function readJobIdFromResult(result) {
         const id = obj.id;
         if (typeof id === "string" && id.trim())
             return id.trim();
-        // 兜底：result 可能把 job 包在 data/result 字段里
         for (const k of ["data", "result", "job"]) {
             const inner = obj[k];
             if (inner && typeof inner === "object") {

package/dist/src/utils/cron-push-map.d.ts

@@ -1,5 +1,5 @@
 /** 映射来源，区分两种创建路径。 */
-export type CronPushMapSource = "conversation" | "cron-query";
+export type CronPushMapSource = "conversation" | "cron-query" | "exec-cli";
 export interface CronPushMapEntry {
     pushId: string;
     /** 创建该 cron 时的 xy sessionId，便于同进程兜底。 */

package/package.json

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