@ynhcj/xiaoyi-channel 0.0.165-next → 0.0.166-next

package/dist/index.js

@@ -6,6 +6,7 @@ import { setXYRuntime } from "./src/runtime.js";
 import { markCronToolCall, clearCronToolCall, getSessionContext } from "./src/tools/session-manager.js";
 import { configManager } from "./src/utils/config-manager.js";
 import { setJobPushId } from "./src/utils/cron-push-map.js";
+import { getAllPushIds } from "./src/utils/pushid-manager.js";
 import { registerSelfEvolutionToolResultNudge } from "./src/self-evolution-tool-result-nudge.js";
 import { createBeforePromptBuildHandler } from "./src/skill-retriever/hooks.js";
 import { normalizeToolRetrieverConfig } from "./src/skill-retriever/config.js";
@@ -59,9 +60,9 @@ async function captureCronAddMapping(event, ctx) {
         console.log(`[CRONMAP] skip: no sessionId (sessionKey=${ctx.sessionKey}, ctxFound=${!!sessionCtx})`);
         return;
     }
-    const pushId = configManager.getPushId(sessionId);
+    const pushId = await resolvePushId(sessionId);
     if (!pushId) {
-        console.log(`[CRONMAP] skip: configManager has no pushId for sessionId=${sessionId}`);
+        console.log(`[CRONMAP] skip: no pushId available for sessionId=${sessionId} (no session match, no global, no file)`);
         return;
     }
     console.log(`[CRONMAP] writing map: jobId=${jobId}, sessionId=${sessionId}, pushId=${pushId.substring(0, 16)}...`);
@@ -73,6 +74,27 @@ async function captureCronAddMapping(event, ctx) {
     });
     console.log(`[CRONMAP] map written OK`);
 }
+/** 回退链取 pushId：当前会话 → 全局兜底 → 本地文件首个（保底）。 */
+async function resolvePushId(sessionId) {
+    // 1. 同会话
+    const session = configManager.getPushId(sessionId);
+    if (session)
+        return session;
+    // 2. 全局（任何会话注册过的）
+    const global = configManager.getPushId();
+    if (global)
+        return global;
+    // 3. 文件兜底
+    try {
+        const all = await getAllPushIds();
+        if (all.length > 0)
+            return all[0];
+    }
+    catch {
+        // ignore
+    }
+    return null;
+}
 /** 判断 exec 命令是否为 cron add（匹配 "openclaw cron add" 或裸 "cron add"，排除 list/remove 等）。 */
 function isExecCronAddCommand(command) {
     if (typeof command !== "string")

package/dist/src/utils/config-manager.d.ts

@@ -3,8 +3,9 @@
  * Specifically handles pushId which can be updated per-session.
  */
 declare class ConfigManager {
-    private sessionPushIds;
-    private globalPushId;
+    private get sessionPushIds();
+    private get globalPushId();
+    private set globalPushId(value);
     /**
      * Update push ID for a specific session.
      */

package/dist/src/utils/config-manager.js

@@ -1,12 +1,32 @@
 // Dynamic configuration manager for runtime updates
+//
+// NOTE: xy_channel is loaded from multiple module resolution paths
+// (plugin entry vs tool registration), which duplicates class instances.
+// sessionPushIds and globalPushId must live on globalThis so all copies
+// share the same Map — same reason activeSessions is on globalThis in
+// session-manager.ts.
 import { logger } from "./logger.js";
+const _g = globalThis;
+if (!_g.__xyConfigSessionPushIds) {
+    _g.__xyConfigSessionPushIds = new Map();
+}
+if (!_g.__xyConfigGlobalPushId) {
+    _g.__xyConfigGlobalPushId = null;
+}
 /**
  * Manages dynamic configuration updates that can change at runtime.
  * Specifically handles pushId which can be updated per-session.
  */
 class ConfigManager {
-    sessionPushIds = new Map();
-    globalPushId = null;
+    get sessionPushIds() {
+        return _g.__xyConfigSessionPushIds;
+    }
+    get globalPushId() {
+        return _g.__xyConfigGlobalPushId;
+    }
+    set globalPushId(value) {
+        _g.__xyConfigGlobalPushId = value;
+    }
     /**
      * Update push ID for a specific session.
      */

package/package.json

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