@xgjktech/xg_cwork_im 1.19.43 → 1.19.45

package/dist/src/session-group-prompt.js

@@ -0,0 +1,101 @@
+/**
+ * 会话级「群背景」缓存（跨回合续轮补注入）。
+ *
+ * 背景：`GroupSystemPrompt` 由入站 @ 回合构建并注入（`account-connection.ts` → `inboundCtx`），
+ * 而 heartbeat / exec 完成唤醒等**自触发回合**没有入站消息，OpenClaw 不会重新注入，
+ * 导致 agent 在续轮丢失 `userInfo.background` + `agentContext`（「待办背景未带入」）。
+ *
+ * 本缓存只保存**动态段**（用户块 + 项目块，见 `resolveInboundGroupPromptParts`），
+ * 不含配置里的静态段；最新一轮动态段为空时**清空**，避免把过期背景补进续轮。
+ *
+ * 过期与容量：TTL + 条目上限双重兜底，防止无界增长；进程级共享，跨热重载存活。
+ */
+import { getSharedMap } from "./process-shared-store.js";
+/** 条目上限（防御无界增长）。 */
+const MAX_ENTRIES = 500;
+/**
+ * 条目有效期。唤醒轮多为 **exec 完成唤醒**，后台任务时长可达小时级，故取 24h 覆盖长任务；
+ * 内存由 `MAX_ENTRIES` 兜底，TTL 只负责防陈旧（下一次被 @ 的入站轮会覆盖或清空）。
+ */
+const TTL_MS = 24 * 60 * 60 * 1000;
+const bySessionKey = getSharedMap("session-group-prompt");
+function nonEmpty(value) {
+    if (typeof value !== "string")
+        return undefined;
+    const text = value.trim();
+    return text.length > 0 ? text : undefined;
+}
+function pruneExpired(now) {
+    for (const [key, entry] of bySessionKey) {
+        if (now - entry.updatedAt > TTL_MS) {
+            bySessionKey.delete(key);
+        }
+    }
+}
+function evictOldestIfOverCapacity() {
+    if (bySessionKey.size < MAX_ENTRIES)
+        return;
+    let oldestKey;
+    let oldestAt = Number.POSITIVE_INFINITY;
+    for (const [key, entry] of bySessionKey) {
+        if (entry.updatedAt < oldestAt) {
+            oldestAt = entry.updatedAt;
+            oldestKey = key;
+        }
+    }
+    if (oldestKey !== undefined) {
+        bySessionKey.delete(oldestKey);
+    }
+}
+/**
+ * 记录一次入站构建的群背景动态段。
+ *
+ * - `prompt` 非空 → 覆盖写入并刷新 `updatedAt`；
+ * - `prompt` 为空 / undefined → **删除该会话缓存**（最新一轮没有背景，续轮不得复用旧背景）。
+ */
+export function setSessionGroupPrompt(sessionKey, prompt) {
+    const key = nonEmpty(sessionKey);
+    if (!key)
+        return;
+    const text = nonEmpty(prompt);
+    if (!text) {
+        bySessionKey.delete(key);
+        return;
+    }
+    const now = Date.now();
+    pruneExpired(now);
+    if (!bySessionKey.has(key)) {
+        evictOldestIfOverCapacity();
+    }
+    bySessionKey.set(key, { prompt: text, updatedAt: now });
+}
+/** 读取某会话最近一次入站构建的群背景动态段（过期返回 undefined）。 */
+export function getSessionGroupPrompt(sessionKey) {
+    const key = nonEmpty(sessionKey);
+    if (!key)
+        return undefined;
+    const entry = bySessionKey.get(key);
+    if (!entry)
+        return undefined;
+    if (Date.now() - entry.updatedAt > TTL_MS) {
+        bySessionKey.delete(key);
+        return undefined;
+    }
+    return entry.prompt;
+}
+/** 清除某会话的群背景缓存。 */
+export function clearSessionGroupPrompt(sessionKey) {
+    const key = nonEmpty(sessionKey);
+    if (!key)
+        return;
+    bySessionKey.delete(key);
+}
+/** 插件卸载/重载时清空全部缓存。 */
+export function clearAllSessionGroupPrompts() {
+    bySessionKey.clear();
+}
+/** 仅供测试：内部条目数。 */
+export function __sessionGroupPromptSizeForTests() {
+    return bySessionKey.size;
+}
+//# sourceMappingURL=session-group-prompt.js.map

package/dist/src/session-group-prompt.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-group-prompt.js","sourceRoot":"","sources":["../../src/session-group-prompt.ts"],"names":[],"mappings":"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"}

package/dist/src/session-group-prompt.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=session-group-prompt.test.d.ts.map

package/dist/src/session-group-prompt.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-group-prompt.test.d.ts","sourceRoot":"","sources":["../../src/session-group-prompt.test.ts"],"names":[],"mappings":""}

package/dist/src/session-group-prompt.test.js

@@ -0,0 +1,72 @@
+import assert from "node:assert/strict";
+import { beforeEach, describe, it } from "node:test";
+import { __sessionGroupPromptSizeForTests, clearAllSessionGroupPrompts, clearSessionGroupPrompt, getSessionGroupPrompt, setSessionGroupPrompt, } from "./session-group-prompt.js";
+const TTL_MS = 24 * 60 * 60 * 1000;
+const MAX_ENTRIES = 500;
+describe("session-group-prompt", () => {
+    beforeEach(() => {
+        clearAllSessionGroupPrompts();
+    });
+    it("records and reads the dynamic group prompt per session", () => {
+        setSessionGroupPrompt("session-1", "## 当前用户\n\n发送者：张三");
+        assert.equal(getSessionGroupPrompt("session-1"), "## 当前用户\n\n发送者：张三");
+    });
+    it("overwrites the previous entry for the same session", () => {
+        setSessionGroupPrompt("session-1", "first");
+        setSessionGroupPrompt("session-1", "second");
+        assert.equal(getSessionGroupPrompt("session-1"), "second");
+        assert.equal(__sessionGroupPromptSizeForTests(), 1);
+    });
+    it("clears the cache when the latest turn has no dynamic prompt", () => {
+        setSessionGroupPrompt("session-1", "stale-background");
+        setSessionGroupPrompt("session-1", undefined);
+        assert.equal(getSessionGroupPrompt("session-1"), undefined);
+        assert.equal(__sessionGroupPromptSizeForTests(), 0);
+        setSessionGroupPrompt("session-1", "stale-background");
+        setSessionGroupPrompt("session-1", "   ");
+        assert.equal(getSessionGroupPrompt("session-1"), undefined);
+        assert.equal(__sessionGroupPromptSizeForTests(), 0);
+    });
+    it("trims whitespace around the stored prompt", () => {
+        setSessionGroupPrompt("session-1", "  bg  ");
+        assert.equal(getSessionGroupPrompt("session-1"), "bg");
+    });
+    it("isolates sessions and ignores empty session keys", () => {
+        setSessionGroupPrompt("session-1", "a");
+        setSessionGroupPrompt("session-2", "b");
+        assert.equal(getSessionGroupPrompt("session-1"), "a");
+        assert.equal(getSessionGroupPrompt("session-2"), "b");
+        assert.equal(getSessionGroupPrompt("session-3"), undefined);
+        setSessionGroupPrompt("", "ignored");
+        setSessionGroupPrompt(undefined, "ignored");
+        assert.equal(__sessionGroupPromptSizeForTests(), 2);
+    });
+    it("expires entries past the TTL", (t) => {
+        t.mock.timers.enable({ apis: ["Date"], now: 1_000_000 });
+        setSessionGroupPrompt("session-1", "bg");
+        assert.equal(getSessionGroupPrompt("session-1"), "bg");
+        t.mock.timers.tick(TTL_MS);
+        assert.equal(getSessionGroupPrompt("session-1"), "bg");
+        t.mock.timers.tick(1);
+        assert.equal(getSessionGroupPrompt("session-1"), undefined);
+        assert.equal(__sessionGroupPromptSizeForTests(), 0);
+    });
+    it("evicts the oldest entry instead of growing past MAX_ENTRIES", () => {
+        for (let i = 0; i < MAX_ENTRIES; i++) {
+            setSessionGroupPrompt(`session-${i}`, `bg-${i}`);
+        }
+        assert.equal(__sessionGroupPromptSizeForTests(), MAX_ENTRIES);
+        setSessionGroupPrompt("session-new", "bg-new");
+        assert.equal(__sessionGroupPromptSizeForTests(), MAX_ENTRIES);
+        assert.equal(getSessionGroupPrompt("session-0"), undefined);
+        assert.equal(getSessionGroupPrompt("session-new"), "bg-new");
+    });
+    it("clearSessionGroupPrompt removes a single session", () => {
+        setSessionGroupPrompt("session-1", "a");
+        setSessionGroupPrompt("session-2", "b");
+        clearSessionGroupPrompt("session-1");
+        assert.equal(getSessionGroupPrompt("session-1"), undefined);
+        assert.equal(getSessionGroupPrompt("session-2"), "b");
+    });
+});
+//# sourceMappingURL=session-group-prompt.test.js.map

package/dist/src/session-group-prompt.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-group-prompt.test.js","sourceRoot":"","sources":["../../src/session-group-prompt.test.ts"],"names":[],"mappings":"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"}

package/dist/src/session-im-context.d.ts

@@ -10,4 +10,6 @@ export declare function getSessionImContext(sessionKey: string): {
 } | undefined;
 export declare function clearSessionImContext(sessionKey: string, expectedReplyToMsgId?: string): boolean;
 export declare function touchSessionImContext(sessionKey: string): void;
+/** 插件卸载/重载时清空会话 IM 上下文与全部清理定时器。 */
+export declare function disposeSessionImContext(): void;
 //# sourceMappingURL=session-im-context.d.ts.map

package/dist/src/session-im-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-im-context.d.ts","sourceRoot":"","sources":["../../src/session-im-context.ts"],"names":[],"mappings":"AA6BA,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC9D,IAAI,CAGN;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,GACjB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAOxE;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,oBAAoB,CAAC,EAAE,MAAM,GAAG,OAAO,CAQhG;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAK9D"}
+{"version":3,"file":"session-im-context.d.ts","sourceRoot":"","sources":["../../src/session-im-context.ts"],"names":[],"mappings":"AAkCA,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC9D,IAAI,CAGN;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,GACjB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAOxE;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,oBAAoB,CAAC,EAAE,MAAM,GAAG,OAAO,CAQhG;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAK9D;AAED,mCAAmC;AACnC,wBAAgB,uBAAuB,IAAI,IAAI,CAM9C"}

package/dist/src/session-im-context.js

@@ -1,5 +1,6 @@
-const sessionCtxMap = new Map();
-const cleanupTimers = new Map();
+import { getSharedMap } from "./process-shared-store.js";
+const sessionCtxMap = getSharedMap("session-im-context");
+const cleanupTimers = getSharedMap("session-im-context-timers");
 const CLEANUP_DELAY_MS = 60 * 60 * 1000;
 function clearCleanupTimer(sessionKey) {
     const t = cleanupTimers.get(sessionKey);
@@ -42,4 +43,12 @@ export function touchSessionImContext(sessionKey) {
         scheduleCleanup(sessionKey);
     }
 }
+/** 插件卸载/重载时清空会话 IM 上下文与全部清理定时器。 */
+export function disposeSessionImContext() {
+    for (const timer of cleanupTimers.values()) {
+        clearTimeout(timer);
+    }
+    cleanupTimers.clear();
+    sessionCtxMap.clear();
+}
 //# sourceMappingURL=session-im-context.js.map

package/dist/src/session-im-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-im-context.js","sourceRoot":"","sources":["../../src/session-im-context.ts"],"names":[],"mappings":"AAAA,MAAM,aAAa,GAAG,IAAI,GAAG,EAIzB,CAAA;AAEJ,MAAM,aAAa,GAAG,IAAI,GAAG,EAAyC,CAAA;AAEtE,MAAM,gBAAgB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAEvC,SAAS,iBAAiB,CAAC,UAAkB;IAC3C,MAAM,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IACvC,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;QACpB,YAAY,CAAC,CAAC,CAAC,CAAA;QACf,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAClC,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,UAAkB;IACzC,iBAAiB,CAAC,UAAU,CAAC,CAAA;IAC7B,aAAa,CAAC,GAAG,CACf,UAAU,EACV,UAAU,CAAC,GAAG,EAAE;QACd,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAChC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAClC,CAAC,EAAE,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE,CAC/B,CAAA;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,UAAkB,EAClB,GAA+D;IAE/D,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;IAClC,eAAe,CAAC,UAAU,CAAC,CAAA;AAC7B,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,UAAkB;IAElB,IAAI,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAClC,iBAAiB,CAAC,UAAU,CAAC,CAAA;QAC7B,eAAe,CAAC,UAAU,CAAC,CAAA;QAC3B,OAAO,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IACtC,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,UAAkB,EAAE,oBAA6B;IACrF,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAC7C,IAAI,CAAC,OAAO,IAAI,CAAC,oBAAoB,IAAI,OAAO,CAAC,YAAY,KAAK,oBAAoB,CAAC,EAAE,CAAC;QACxF,OAAO,KAAK,CAAA;IACd,CAAC;IACD,iBAAiB,CAAC,UAAU,CAAC,CAAA;IAC7B,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAChC,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,UAAkB;IACtD,IAAI,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAClC,iBAAiB,CAAC,UAAU,CAAC,CAAA;QAC7B,eAAe,CAAC,UAAU,CAAC,CAAA;IAC7B,CAAC;AACH,CAAC"}
+{"version":3,"file":"session-im-context.js","sourceRoot":"","sources":["../../src/session-im-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,MAAM,aAAa,GAAG,YAAY,CAOhC,oBAAoB,CAAC,CAAC;AAExB,MAAM,aAAa,GAAG,YAAY,CAAwC,2BAA2B,CAAC,CAAC;AAEvG,MAAM,gBAAgB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAEvC,SAAS,iBAAiB,CAAC,UAAkB;IAC3C,MAAM,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IACvC,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;QACpB,YAAY,CAAC,CAAC,CAAC,CAAA;QACf,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAClC,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,UAAkB;IACzC,iBAAiB,CAAC,UAAU,CAAC,CAAA;IAC7B,aAAa,CAAC,GAAG,CACf,UAAU,EACV,UAAU,CAAC,GAAG,EAAE;QACd,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAChC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAClC,CAAC,EAAE,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE,CAC/B,CAAA;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,UAAkB,EAClB,GAA+D;IAE/D,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;IAClC,eAAe,CAAC,UAAU,CAAC,CAAA;AAC7B,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,UAAkB;IAElB,IAAI,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAClC,iBAAiB,CAAC,UAAU,CAAC,CAAA;QAC7B,eAAe,CAAC,UAAU,CAAC,CAAA;QAC3B,OAAO,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IACtC,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,UAAkB,EAAE,oBAA6B;IACrF,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAC7C,IAAI,CAAC,OAAO,IAAI,CAAC,oBAAoB,IAAI,OAAO,CAAC,YAAY,KAAK,oBAAoB,CAAC,EAAE,CAAC;QACxF,OAAO,KAAK,CAAA;IACd,CAAC;IACD,iBAAiB,CAAC,UAAU,CAAC,CAAA;IAC7B,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAChC,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,UAAkB;IACtD,IAAI,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAClC,iBAAiB,CAAC,UAAU,CAAC,CAAA;QAC7B,eAAe,CAAC,UAAU,CAAC,CAAA;IAC7B,CAAC;AACH,CAAC;AAED,mCAAmC;AACnC,MAAM,UAAU,uBAAuB;IACrC,KAAK,MAAM,KAAK,IAAI,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC;QAC3C,YAAY,CAAC,KAAK,CAAC,CAAA;IACrB,CAAC;IACD,aAAa,CAAC,KAAK,EAAE,CAAA;IACrB,aAAa,CAAC,KAAK,EAAE,CAAA;AACvB,CAAC"}

package/dist/src/session-model-fallback.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 读取 session store 中的自动降级上下文，供单轮模型覆盖的守卫判定使用。
+ *
+ * OpenClaw 在自动降级时会把 `modelOverrideSource: "auto"` 与
+ * `modelOverrideFallbackOriginProvider/Model`（被跳过的原模型）写入 session entry。
+ * 入站时读取一次即可判断「用户点名的模型是否就是冷却中的降级来源」。
+ */
+import { type SessionModelFallbackContext } from "./per-message-model-pending.js";
+export declare function resolveSessionModelFallbackContext(args: {
+    storePath: string;
+    sessionKey: string;
+}): SessionModelFallbackContext;
+//# sourceMappingURL=session-model-fallback.d.ts.map

package/dist/src/session-model-fallback.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-model-fallback.d.ts","sourceRoot":"","sources":["../../src/session-model-fallback.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH,OAAO,EAEH,KAAK,2BAA2B,EACnC,MAAM,gCAAgC,CAAC;AAExC,wBAAgB,kCAAkC,CAAC,IAAI,EAAE;IACrD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACtB,GAAG,2BAA2B,CAW9B"}

package/dist/src/session-model-fallback.js

@@ -0,0 +1,24 @@
+/**
+ * 读取 session store 中的自动降级上下文，供单轮模型覆盖的守卫判定使用。
+ *
+ * OpenClaw 在自动降级时会把 `modelOverrideSource: "auto"` 与
+ * `modelOverrideFallbackOriginProvider/Model`（被跳过的原模型）写入 session entry。
+ * 入站时读取一次即可判断「用户点名的模型是否就是冷却中的降级来源」。
+ */
+import { loadSessionStore, resolveSessionStoreEntry, } from "openclaw/plugin-sdk/session-store-runtime";
+import { resolveSessionFallbackContextFromEntry, } from "./per-message-model-pending.js";
+export function resolveSessionModelFallbackContext(args) {
+    const storePath = args.storePath?.trim();
+    const sessionKey = args.sessionKey?.trim();
+    if (!storePath || !sessionKey)
+        return { sessionInAutoFallback: false };
+    try {
+        const store = loadSessionStore(storePath, { skipCache: true });
+        const { existing } = resolveSessionStoreEntry({ store, sessionKey });
+        return resolveSessionFallbackContextFromEntry(existing);
+    }
+    catch {
+        return { sessionInAutoFallback: false };
+    }
+}
+//# sourceMappingURL=session-model-fallback.js.map

package/dist/src/session-model-fallback.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-model-fallback.js","sourceRoot":"","sources":["../../src/session-model-fallback.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACH,gBAAgB,EAChB,wBAAwB,GAC3B,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACH,sCAAsC,GAEzC,MAAM,gCAAgC,CAAC;AAExC,MAAM,UAAU,kCAAkC,CAAC,IAGlD;IACG,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;IACzC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;IAC3C,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC;IACvE,IAAI,CAAC;QACD,MAAM,KAAK,GAAG,gBAAgB,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,EAAE,QAAQ,EAAE,GAAG,wBAAwB,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QACrE,OAAO,sCAAsC,CAAC,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC;IAC5C,CAAC;AACL,CAAC"}

package/dist/src/subagent-monitor.d.ts

@@ -1,4 +1,4 @@
-import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
+import type { OpenClawPluginApi } from "openclaw/plugin-sdk/channel-plugin-common";
 import type { ImStreamClient } from "./connection.js";
 interface SubagentSpawnInfo {
     childSessionKey: string;
@@ -23,10 +23,23 @@ export declare function startMonitor(params: {
     spawn: SubagentSpawnInfo;
 }): boolean;
 export declare function hasActiveSubagents(roundKey: string, generation: number): boolean;
+/** 子任务结束事件定位其所属轮次（供 turn-end-controller 递减活跃子任务数）。 */
+export declare function findChildRoundIndex(childSessionKey: string): {
+    roundKey: string;
+    generation: number;
+    runId: string;
+} | undefined;
 export declare function deferFinished(roundKey: string, generation: number, reason: string): void;
 export declare function prepareSubagentInterrupt(roundKey: string, generation: number, now?: number): InterruptedSubagent[];
 export declare function markSubagentCompleted(childSessionKey: string, runId?: string): void;
+/**
+ * 整轮收尾时（dispatch wrapper 在 turn-end-controller 放行后）清理本轮监控。
+ * 与 removeMonitor 的 settle 路径不同：此处轮次真正结束，直接拆监控与子任务索引。
+ */
+export declare function finalizeRoundMonitoring(roundKey: string, generation: number): void;
 export declare function __tickForTests(): Promise<void>;
 export declare function __resetSubagentMonitorForTests(): void;
+/** 插件卸载/重载时停掉 subagent-monitor 的全部轮询与状态，避免旧实例 ticker 泄漏。 */
+export declare function disposeSubagentMonitor(): void;
 export {};
 //# sourceMappingURL=subagent-monitor.d.ts.map

package/dist/src/subagent-monitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-monitor.d.ts","sourceRoot":"","sources":["../../src/subagent-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,UAAU,iBAAiB;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAqBD,MAAM,WAAW,mBAAmB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,WAAW,GAAG,WAAW,CAAC;IAClC,QAAQ,EAAE,MAAM,EAAE,CAAC;CACtB;AAwBD,wBAAgB,YAAY,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAGzD;AAED,wBAAgB,4BAA4B,IAAI,MAAM,CAErD;AAsCD,wBAAgB,YAAY,CAAC,MAAM,EAAE;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,cAAc,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,iBAAiB,CAAC;CAC5B,GAAG,OAAO,CAsDV;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAOhF;AAED,wBAAgB,aAAa,CACzB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACf,IAAI,CAEN;AAED,wBAAgB,wBAAwB,CACpC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,GAAG,SAAa,GACjB,mBAAmB,EAAE,CAoBvB;AAED,wBAAgB,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CA+CnF;AA0KD,wBAAgB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAE9C;AAED,wBAAgB,8BAA8B,IAAI,IAAI,CASrD"}
+{"version":3,"file":"subagent-monitor.d.ts","sourceRoot":"","sources":["../../src/subagent-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,UAAU,iBAAiB;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AA4BD,MAAM,WAAW,mBAAmB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,WAAW,GAAG,WAAW,CAAC;IAClC,QAAQ,EAAE,MAAM,EAAE,CAAC;CACtB;AAkDD,wBAAgB,YAAY,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAsCzD;AA+CD,wBAAgB,4BAA4B,IAAI,MAAM,CAErD;AAsCD,wBAAgB,YAAY,CAAC,MAAM,EAAE;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,cAAc,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,iBAAiB,CAAC;CAC5B,GAAG,OAAO,CAsDV;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAOhF;AAED,sDAAsD;AACtD,wBAAgB,mBAAmB,CAC/B,eAAe,EAAE,MAAM,GACxB;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAErE;AAED,wBAAgB,aAAa,CACzB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACf,IAAI,CAEN;AAED,wBAAgB,wBAAwB,CACpC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,GAAG,SAAa,GACjB,mBAAmB,EAAE,CAoBvB;AAED,wBAAgB,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CA+CnF;AA4BD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAIlF;AAsKD,wBAAgB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAE9C;AAED,wBAAgB,8BAA8B,IAAI,IAAI,CAErD;AAED,4DAA4D;AAC5D,wBAAgB,sBAAsB,IAAI,IAAI,CAW7C"}

package/dist/src/subagent-monitor.js

@@ -1,25 +1,112 @@
-import { completeActiveRound } from "./active-round-registry.js";
+import { getOrCreateShared, getSharedMap } from "./process-shared-store.js";
+import { turnOnAllChildrenDone } from "./turn-end-controller.js";
 /** 模块实例 ID：用于确认插件是否被重复加载（若日志出现两个不同 id，则存在双实例，spawn/end 可能被不同实例处理）。 */
 const MODULE_INSTANCE_ID = `m${Date.now().toString(36)}${Math.random().toString(36).slice(2, 8)}`;
-console.log(`[subagent-monitor] module loaded instance=${MODULE_INSTANCE_ID}`);
-const childToRound = new Map();
-const roundMonitors = new Map();
-const deferredFinished = new Map();
-const roundAdmissionTombstones = new Map();
+console.log(`[subagent-monitor] module loaded instance=${MODULE_INSTANCE_ID} pid=${process.pid} title=${(process.title || "(none)").trim()}`);
+// 进程级共享：跨模块重载后监控不中断——各代模块读写同一份 maps/轮询/api 候选。
+const childToRound = getSharedMap("subagent-child-to-round");
+const roundMonitors = getSharedMap("subagent-round-monitors");
+const deferredFinished = getSharedMap("subagent-deferred-finished");
+const roundAdmissionTombstones = getSharedMap("subagent-round-admission-tombstones");
 /** 记录被 `/stop` 中断的 subagent run（按 childSessionKey 索引，存被中断 runId 与过期时间）。 */
-const childTombstones = new Map();
+const childTombstones = getSharedMap("subagent-child-tombstones");
 const POLL_INTERVAL_MS = 15_000;
+/**
+ * apiCandidates 保留上限：OpenClaw 会对同一模块反复重注册（多代 registry 并存且从不触发
+ * cleanup，见日志 `registerSeq` 递增而 `cleanup` 为 0）。每代 register 都会 push 一个新 api 进
+ * 进程级 candidates，若不停老代则数组无限增长、引用无法回收。该数组仅作为「当前 runtime 探测
+ * 不可用时的回退池」（resolveUsablePluginApi），而单进程内 register 是按时间顺序的短爆发（通常
+ * 2~4 次），功能上只需最近几代即可，故截断更早的候选。
+ */
+const MAX_API_CANDIDATES = 4;
 const ROUND_TOMBSTONE_TTL_MS = 30_000;
 const CHILD_TOMBSTONE_TTL_MS = 5 * 60_000;
 const MAX_INCR_MSGS = 5;
 const MSG_TRUNCATE_LEN = 40;
 /** 单次 tick 用 openclaw `agent.wait` 对账 subagent run 状态的探测超时。 */
 const RUN_STATUS_PROBE_TIMEOUT_MS = 1_000;
-let tickerTimer = null;
-let pluginApi = null;
+const m = getOrCreateShared("subagent-monitor-runtime", () => ({
+    api: null,
+    apiCandidates: [],
+    apiProbe: "unverified",
+    ticker: null,
+}));
 export function setPluginApi(api) {
-    pluginApi = api;
-    console.log(`[subagent-monitor] setPluginApi instance=${MODULE_INSTANCE_ID}`);
+    const isNewCandidate = api !== m.api && !m.apiCandidates.includes(api);
+    if (isNewCandidate) {
+        m.apiCandidates.push(api);
+        if (m.apiCandidates.length > MAX_API_CANDIDATES) {
+            m.apiCandidates.splice(0, m.apiCandidates.length - MAX_API_CANDIDATES);
+        }
+    }
+    if (m.api === null) {
+        m.api = api;
+        m.apiProbe = "unverified";
+        console.log(`[subagent-monitor] setPluginApi instance=${MODULE_INSTANCE_ID} adopt=first`);
+        return;
+    }
+    if (m.apiProbe === "good") {
+        // 已有确认可用的 runtime：拒绝未验证的新 runtime 覆盖，防止无绑定 registry 劫持监控。
+        if (isNewCandidate) {
+            console.warn(`[subagent-monitor] setPluginApi instance=${MODULE_INSTANCE_ID} keep=verified ` +
+                `candidates=${m.apiCandidates.length}`);
+        }
+        return;
+    }
+    if (m.apiProbe === "unverified") {
+        // 当前尚未探测：不切换，等首次 tick 探测出结果再决定。
+        console.log(`[subagent-monitor] setPluginApi instance=${MODULE_INSTANCE_ID} keep=unverified ` +
+            `candidates=${m.apiCandidates.length}`);
+        return;
+    }
+    // 当前已确认为不可用：采纳新候选重新探测。
+    m.api = api;
+    m.apiProbe = "unverified";
+    console.log(`[subagent-monitor] setPluginApi instance=${MODULE_INSTANCE_ID} adopt=switch candidates=${m.apiCandidates.length}`);
+}
+function isRequestScopedSubagentError(err) {
+    return err instanceof Error && err.name === "RequestScopedSubagentRuntimeError";
+}
+/**
+ * 探测某个 plugin api 的 runtime.subagent 是否可用。
+ * RequestScopedSubagentRuntimeError = 绑定不可用（无绑定 registry / 非 gateway 上下文）；
+ * 其它结果（如 runId 不存在返回 error/timeout）说明绑定存在、dispatch 通了，视为可用。
+ */
+async function probeApiUsable(api) {
+    try {
+        await api.runtime.subagent.waitForRun({ runId: "probe", timeoutMs: 1 });
+        return true;
+    }
+    catch (err) {
+        return !isRequestScopedSubagentError(err);
+    }
+}
+/**
+ * 确认当前 m.api 可用；若不可用，尝试从候选里切回可用的 runtime。
+ * 返回最终使用的 m.api（所有候选都不可用时仍返回当前，由事件路径兜底）。
+ */
+async function resolveUsablePluginApi() {
+    if (!m.api)
+        return null;
+    if (m.apiProbe === "good")
+        return m.api;
+    if (await probeApiUsable(m.api)) {
+        m.apiProbe = "good";
+        return m.api;
+    }
+    for (const candidate of m.apiCandidates) {
+        if (candidate === m.api)
+            continue;
+        if (await probeApiUsable(candidate)) {
+            console.warn(`[subagent-monitor] m.api switch instance=${MODULE_INSTANCE_ID} ` +
+                `candidates=${m.apiCandidates.length}`);
+            m.api = candidate;
+            m.apiProbe = "good";
+            return m.api;
+        }
+    }
+    m.apiProbe = "bad";
+    return m.api;
 }
 export function getSubagentMonitorInstanceId() {
     return MODULE_INSTANCE_ID;
@@ -35,9 +122,9 @@ function pruneTombstones(now = Date.now()) {
     }
 }
 function stopTickerIfIdle() {
-    if (roundMonitors.size === 0 && tickerTimer) {
-        clearInterval(tickerTimer);
-        tickerTimer = null;
+    if (roundMonitors.size === 0 && m.ticker) {
+        clearInterval(m.ticker);
+        m.ticker = null;
     }
 }
 function removeMonitor(monitor, reason) {
@@ -110,6 +197,10 @@ export function hasActiveSubagents(roundKey, generation) {
         monitor.generation === generation &&
         Array.from(monitor.subagents.values()).some((record) => !record.completed));
 }
+/** 子任务结束事件定位其所属轮次（供 turn-end-controller 递减活跃子任务数）。 */
+export function findChildRoundIndex(childSessionKey) {
+    return childToRound.get(childSessionKey);
+}
 export function deferFinished(roundKey, generation, reason) {
     deferredFinished.set(roundKey, { reason, generation });
 }
@@ -183,33 +274,46 @@ async function settleMonitorIfComplete(monitor) {
         return;
     if (!Array.from(monitor.subagents.values()).every((record) => record.completed))
         return;
-    const deferred = deferredFinished.get(monitor.roundKey);
-    const shouldCompleteRound = deferred?.generation === monitor.generation;
+    const signature = statSignature(monitor);
+    if (signature === monitor.lastPushedSignature)
+        return;
+    // 整轮收尾（WS FINISHED + RUN_USAGE + completeActiveRound）改由 turn-end-controller 在
+    // 主会话出现非 yield 段终态（或静默兜底）后，由 dispatch wrapper 统一执行；
+    // 这里只负责推送 SUBAGENT_STAT 快照，绝不自行 end/remove/complete ——
+    // OpenClaw 7.1+/8.x 中「所有已知子任务完成」不代表整轮结束（主会话可能 resume
+    // 继续派发新一批子任务），因此本快照允许多波次多次推送，仅对完全相同的状态去重。
     try {
         await sendFinalStat(monitor, monitor.streamClient);
-        if (shouldCompleteRound && deferred) {
-            await monitor.streamClient.end(deferred.reason, {
-                groupId: monitor.groupId,
-                replyToMsgId: monitor.replyToMsgId,
-            });
+        for (const record of monitor.subagents.values()) {
+            record.sendFrom = record.messages.length;
         }
+        monitor.lastPushedSignature = signature;
+        console.log(`[subagent-monitor] final SUBAGENT_STAT sent (settle) roundKey=${monitor.roundKey} gen=${monitor.generation} ` +
+            `subagents=${Array.from(monitor.subagents.values()).length} — waiting turn-end for FINISHED`);
     }
     catch (err) {
         console.error(`[subagent-monitor] final state send failed: ${String(err)}`);
     }
-    removeMonitor(monitor, "settle");
-    if (shouldCompleteRound) {
-        completeActiveRound(monitor.roundKey, monitor.generation);
-    }
+    turnOnAllChildrenDone(monitor.roundKey, monitor.generation);
+}
+/**
+ * 整轮收尾时（dispatch wrapper 在 turn-end-controller 放行后）清理本轮监控。
+ * 与 removeMonitor 的 settle 路径不同：此处轮次真正结束，直接拆监控与子任务索引。
+ */
+export function finalizeRoundMonitoring(roundKey, generation) {
+    const monitor = roundMonitors.get(roundKey);
+    if (!monitor || monitor.generation !== generation)
+        return;
+    removeMonitor(monitor, "round-finished");
 }
 async function readSubagentMessages(record) {
-    if (!pluginApi || record.reading)
+    if (!m.api || record.reading)
         return;
     record.reading = true;
     try {
         let messages = [];
         try {
-            const result = await pluginApi.runtime.subagent.getSessionMessages({
+            const result = await m.api.runtime.subagent.getSessionMessages({
                 sessionKey: record.childSessionKey,
             });
             messages = Array.isArray(result.messages) ? result.messages : [];
@@ -232,10 +336,10 @@ async function readSubagentMessages(record) {
  * 探测失败（如 runId 已不存在、状态码异常）保守按「仍在运行」处理，交给事件路径兜底。
  */
 async function probeRunStatus(record) {
-    if (!pluginApi)
+    if (!m.api)
         return false;
     try {
-        const result = await pluginApi.runtime.subagent.waitForRun({
+        const result = await m.api.runtime.subagent.waitForRun({
             runId: record.runId,
             timeoutMs: RUN_STATUS_PROBE_TIMEOUT_MS,
         });
@@ -247,17 +351,19 @@ async function probeRunStatus(record) {
     }
 }
 function ensureTickerRunning() {
-    if (tickerTimer)
+    if (m.ticker)
         return;
     void tick();
-    tickerTimer = setInterval(() => void tick(), POLL_INTERVAL_MS);
-    tickerTimer.unref?.();
+    m.ticker = setInterval(() => void tick(), POLL_INTERVAL_MS);
+    m.ticker.unref?.();
 }
 async function tick() {
     if (roundMonitors.size === 0) {
         stopTickerIfIdle();
         return;
     }
+    // 确保使用可用的 runtime：探测并必要时切回候选中的可用 api，避免坏 runtime 继续抛 RequestScoped。
+    await resolveUsablePluginApi();
     for (const monitor of Array.from(roundMonitors.values())) {
         try {
             const runningRecords = Array.from(monitor.subagents.values()).filter((record) => !record.completed);
@@ -325,7 +431,22 @@ function toSubagentList(monitor, incremental) {
             : record.messages,
     }));
 }
+/**
+ * 客户端可见状态的稳定签名：新增子任务、状态翻转（running→completed）或消息数变化都会改变。
+ * 仅凭它做「无变化不重复推送」的去重；同一轮多波次派发不会被锁死。
+ */
+function statSignature(monitor) {
+    return Array.from(monitor.subagents.values())
+        .map((r) => `${r.runId}:${r.completed ? "completed" : "running"}:${r.messages.length}`)
+        .join("|");
+}
 function sendWsStat(monitor, client) {
+    const signature = statSignature(monitor);
+    // 有 running 子任务时保持逐 tick 推送（running/新增消息语义不变）；
+    // 全部已完成且状态无变化（等 turn-end 的空窗）则去重，避免 tick 刷同一份完成快照。
+    const hasRunning = Array.from(monitor.subagents.values()).some((r) => !r.completed);
+    if (!hasRunning && signature === monitor.lastPushedSignature)
+        return;
     const subagentList = toSubagentList(monitor, true);
     client
         .sendEvent({
@@ -340,6 +461,7 @@ function sendWsStat(monitor, client) {
             if (record)
                 record.sendFrom += item.messages.length;
         });
+        monitor.lastPushedSignature = signature;
     })
         .catch((err) => {
         console.error(`[subagent-monitor] SUBAGENT_STAT failed: ${String(err)}`);
@@ -357,10 +479,16 @@ export function __tickForTests() {
     return tick();
 }
 export function __resetSubagentMonitorForTests() {
-    if (tickerTimer)
-        clearInterval(tickerTimer);
-    tickerTimer = null;
-    pluginApi = null;
+    disposeSubagentMonitor();
+}
+/** 插件卸载/重载时停掉 subagent-monitor 的全部轮询与状态，避免旧实例 ticker 泄漏。 */
+export function disposeSubagentMonitor() {
+    if (m.ticker)
+        clearInterval(m.ticker);
+    m.ticker = null;
+    m.api = null;
+    m.apiProbe = "unverified";
+    m.apiCandidates.length = 0;
     childToRound.clear();
     roundMonitors.clear();
     deferredFinished.clear();