@xgjktech/xg_cwork_im 1.19.42 → 1.19.43

package/dist/src/per-message-model-pending.d.ts

@@ -1,25 +1,8 @@
 /**
  * 单轮模型覆盖：在 dispatch 前登记，由 before_model_resolve 消费。
- *
- * 语义：
- * - 覆盖只作用于本轮回复的「首次模型解析」（runId 首次调用）；模型 fallback 重试不重复覆盖。
- * - 若登记时该 session 正处于自动降级（modelOverrideSource === "auto"）且用户点名的正是降级来源
- *   （被冷却/额度跳过的原模型），则放弃覆盖，避免把降级候选改回不可用的原模型。
- *
- * 注意：OpenClaw 的 replyOptions 并不消费 modelOverride（该字段仅 2026.5.17~2026.5.22 短暂存在，
- * 用于 WebChat 图片模型路由，之后已移除）。因此本机制是单轮模型覆盖的唯一生效通道。
+ * 弥补 replyOptions.modelOverride 在部分自定义 provider 上解析失败时被 autoFallback 覆盖的问题。
  */
-import type { SessionEntry } from "openclaw/plugin-sdk/session-store-runtime";
-export interface PendingPerMessageModelFallbackOrigin {
-    provider?: string;
-    model: string;
-}
-/** 登记时该 session 的自动降级上下文。 */
-export interface SessionModelFallbackContext {
-    sessionInAutoFallback: boolean;
-    fallbackOrigin?: PendingPerMessageModelFallbackOrigin;
-}
-export interface PendingPerMessageModel extends SessionModelFallbackContext {
+export interface PendingPerMessageModel {
     /** 原始 model ref，如 xgjk-newapi/MiniMax-M2.7-Cloud */
     raw: string;
     provider?: string;
@@ -28,25 +11,7 @@ export interface PendingPerMessageModel extends SessionModelFallbackContext {
 export declare function normalizeModelRefRaw(raw: string): string;
 /** 将 provider/model 或别名拆成 hook 可用的字段 */
 export declare function splitModelRef(raw: string): PendingPerMessageModel | undefined;
-/** 比较用归一化 key：有 provider 时 `provider/model`，否则仅 model。 */
-export declare function normalizeModelRefForCompare(provider: string | undefined, model: string | undefined): string;
-/**
- * 用户点名的目标模型是否就是当前自动降级的来源模型。
- * 先比对 model（大小写不敏感）；origin 带 provider 时再要求 provider 一致（目标未带 provider 视为通配）。
- */
-export declare function targetMatchesFallbackOrigin(pending: PendingPerMessageModel): boolean;
-/** session 正处于自动降级，且目标就是降级来源时，放弃覆盖。 */
-export declare function shouldSkipOverrideForActiveFallback(pending: PendingPerMessageModel): boolean;
-/**
- * 本轮 run 是否首次解析模型。模型 fallback 会为同一 runId 再次调用 before_model_resolve，
- * 此时返回 false，避免降级候选被覆盖回主模型。runId 缺失时不限制。
- */
-export declare function claimPerMessageModelRun(runId: string | undefined): boolean;
-/** 从 session entry 提取自动降级上下文（纯函数，便于单测）。 */
-export declare function resolveSessionFallbackContextFromEntry(entry: SessionEntry | undefined): SessionModelFallbackContext;
-export declare function setPendingPerMessageModel(sessionKey: string, raw: string, fallbackContext?: SessionModelFallbackContext): PendingPerMessageModel | undefined;
+export declare function setPendingPerMessageModel(sessionKey: string, raw: string): PendingPerMessageModel | undefined;
 export declare function takePendingPerMessageModel(sessionKey: string | undefined): PendingPerMessageModel | undefined;
 export declare function clearPendingPerMessageModel(sessionKey: string | undefined): void;
-/** 插件卸载/重载时清空全部待消费的单轮模型覆盖。 */
-export declare function clearAllPendingPerMessageModel(): void;
 //# sourceMappingURL=per-message-model-pending.d.ts.map

package/dist/src/per-message-model-pending.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"per-message-model-pending.d.ts","sourceRoot":"","sources":["../../src/per-message-model-pending.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AAG9E,MAAM,WAAW,oCAAoC;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,6BAA6B;AAC7B,MAAM,WAAW,2BAA2B;IACxC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,cAAc,CAAC,EAAE,oCAAoC,CAAC;CACzD;AAED,MAAM,WAAW,sBAAuB,SAAQ,2BAA2B;IACvE,oDAAoD;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACjB;AAOD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wCAAwC;AACxC,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS,CAW7E;AAED,0DAA0D;AAC1D,wBAAgB,2BAA2B,CACvC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,KAAK,EAAE,MAAM,GAAG,SAAS,GAC1B,MAAM,CAKR;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAQpF;AAED,uCAAuC;AACvC,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAE5F;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAc1E;AAED,2CAA2C;AAC3C,wBAAgB,sCAAsC,CAClD,KAAK,EAAE,YAAY,GAAG,SAAS,GAChC,2BAA2B,CAmB7B;AAED,wBAAgB,yBAAyB,CACrC,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EACX,eAAe,CAAC,EAAE,2BAA2B,GAC9C,sBAAsB,GAAG,SAAS,CAUpC;AAED,wBAAgB,0BAA0B,CACtC,UAAU,EAAE,MAAM,GAAG,SAAS,GAC/B,sBAAsB,GAAG,SAAS,CAMpC;AAED,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAGhF;AAED,8BAA8B;AAC9B,wBAAgB,8BAA8B,IAAI,IAAI,CAGrD"}
+{"version":3,"file":"per-message-model-pending.d.ts","sourceRoot":"","sources":["../../src/per-message-model-pending.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,sBAAsB;IACnC,oDAAoD;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACjB;AAID,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wCAAwC;AACxC,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS,CAW7E;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS,CAK7G;AAED,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,sBAAsB,GAAG,SAAS,CAM7G;AAED,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAGhF"}

package/dist/src/per-message-model-pending.js

@@ -1,18 +1,8 @@
 /**
  * 单轮模型覆盖：在 dispatch 前登记，由 before_model_resolve 消费。
- *
- * 语义：
- * - 覆盖只作用于本轮回复的「首次模型解析」（runId 首次调用）；模型 fallback 重试不重复覆盖。
- * - 若登记时该 session 正处于自动降级（modelOverrideSource === "auto"）且用户点名的正是降级来源
- *   （被冷却/额度跳过的原模型），则放弃覆盖，避免把降级候选改回不可用的原模型。
- *
- * 注意：OpenClaw 的 replyOptions 并不消费 modelOverride（该字段仅 2026.5.17~2026.5.22 短暂存在，
- * 用于 WebChat 图片模型路由，之后已移除）。因此本机制是单轮模型覆盖的唯一生效通道。
+ * 弥补 replyOptions.modelOverride 在部分自定义 provider 上解析失败时被 autoFallback 覆盖的问题。
  */
-import { getSharedMap } from "./process-shared-store.js";
-const pendingBySessionKey = getSharedMap("pending-per-message-model");
-const appliedRunIds = getSharedMap("per-message-model-applied-run");
-const APPLIED_RUN_TTL_MS = 60 * 60_000;
+const pendingBySessionKey = new Map();
 export function normalizeModelRefRaw(raw) {
     return raw.trim().replace(/^["']|["']$/g, "").trim();
 }
@@ -27,90 +17,16 @@ export function splitModelRef(raw) {
         const model = normalized.slice(slash + 1).trim();
         if (!provider || !model)
             return undefined;
-        return { raw: normalized, provider, model, sessionInAutoFallback: false };
+        return { raw: normalized, provider, model };
     }
-    return { raw: normalized, model: normalized, sessionInAutoFallback: false };
+    return { raw: normalized, model: normalized };
 }
-/** 比较用归一化 key：有 provider 时 `provider/model`，否则仅 model。 */
-export function normalizeModelRefForCompare(provider, model) {
-    const p = (provider ?? "").trim().toLowerCase();
-    const m = (model ?? "").trim().toLowerCase();
-    if (!m)
-        return "";
-    return p ? `${p}/${m}` : m;
-}
-/**
- * 用户点名的目标模型是否就是当前自动降级的来源模型。
- * 先比对 model（大小写不敏感）；origin 带 provider 时再要求 provider 一致（目标未带 provider 视为通配）。
- */
-export function targetMatchesFallbackOrigin(pending) {
-    const originModel = pending.fallbackOrigin?.model?.trim().toLowerCase() ?? "";
-    const targetModel = pending.model.trim().toLowerCase();
-    if (!originModel || !targetModel || originModel !== targetModel)
-        return false;
-    const originProvider = (pending.fallbackOrigin?.provider ?? "").trim().toLowerCase();
-    if (!originProvider)
-        return true;
-    const targetProvider = (pending.provider ?? "").trim().toLowerCase();
-    return targetProvider === "" || targetProvider === originProvider;
-}
-/** session 正处于自动降级，且目标就是降级来源时，放弃覆盖。 */
-export function shouldSkipOverrideForActiveFallback(pending) {
-    return pending.sessionInAutoFallback === true && targetMatchesFallbackOrigin(pending);
-}
-/**
- * 本轮 run 是否首次解析模型。模型 fallback 会为同一 runId 再次调用 before_model_resolve，
- * 此时返回 false，避免降级候选被覆盖回主模型。runId 缺失时不限制。
- */
-export function claimPerMessageModelRun(runId) {
-    const key = runId?.trim();
-    if (!key)
-        return true;
-    const now = Date.now();
-    for (const [id, ts] of appliedRunIds) {
-        if (now - ts > APPLIED_RUN_TTL_MS) {
-            appliedRunIds.delete(id);
-        }
-    }
-    if (appliedRunIds.has(key)) {
-        return false;
-    }
-    appliedRunIds.set(key, now);
-    return true;
-}
-/** 从 session entry 提取自动降级上下文（纯函数，便于单测）。 */
-export function resolveSessionFallbackContextFromEntry(entry) {
-    if (!entry)
-        return { sessionInAutoFallback: false };
-    const originModel = entry.modelOverrideFallbackOriginModel?.trim();
-    const originProvider = entry.modelOverrideFallbackOriginProvider?.trim();
-    const sessionInAutoFallback = entry.modelOverrideSource === "auto";
-    if (!sessionInAutoFallback && !originModel) {
-        return { sessionInAutoFallback: false };
-    }
-    return {
-        sessionInAutoFallback,
-        ...(originModel
-            ? {
-                fallbackOrigin: {
-                    ...(originProvider ? { provider: originProvider } : {}),
-                    model: originModel,
-                },
-            }
-            : {}),
-    };
-}
-export function setPendingPerMessageModel(sessionKey, raw, fallbackContext) {
+export function setPendingPerMessageModel(sessionKey, raw) {
     const parsed = splitModelRef(raw);
     if (!parsed)
         return undefined;
-    const pending = {
-        ...parsed,
-        sessionInAutoFallback: fallbackContext?.sessionInAutoFallback === true,
-        ...(fallbackContext?.fallbackOrigin ? { fallbackOrigin: fallbackContext.fallbackOrigin } : {}),
-    };
-    pendingBySessionKey.set(sessionKey, pending);
-    return pending;
+    pendingBySessionKey.set(sessionKey, parsed);
+    return parsed;
 }
 export function takePendingPerMessageModel(sessionKey) {
     if (!sessionKey?.trim())
@@ -126,9 +42,4 @@ export function clearPendingPerMessageModel(sessionKey) {
         return;
     pendingBySessionKey.delete(sessionKey);
 }
-/** 插件卸载/重载时清空全部待消费的单轮模型覆盖。 */
-export function clearAllPendingPerMessageModel() {
-    pendingBySessionKey.clear();
-    appliedRunIds.clear();
-}
 //# sourceMappingURL=per-message-model-pending.js.map

package/dist/src/per-message-model-pending.js.map

@@ -1 +1 @@
-{"version":3,"file":"per-message-model-pending.js","sourceRoot":"","sources":["../../src/per-message-model-pending.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"per-message-model-pending.js","sourceRoot":"","sources":["../../src/per-message-model-pending.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAkC,CAAC;AAEtE,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC5C,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AACzD,CAAC;AAED,wCAAwC;AACxC,MAAM,UAAU,aAAa,CAAC,GAAW;IACrC,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,CAAC,UAAU;QAAE,OAAO,SAAS,CAAC;IAClC,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACZ,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;QACnD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACjD,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK;YAAE,OAAO,SAAS,CAAC;QAC1C,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAChD,CAAC;IACD,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,UAAkB,EAAE,GAAW;IACrE,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,mBAAmB,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC5C,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,UAA8B;IACrE,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACpD,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAC/B,mBAAmB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACvC,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,UAA8B;IACtE,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE;QAAE,OAAO;IAChC,mBAAmB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;AAC3C,CAAC"}

package/dist/src/plan/action-dispatch-event-compat.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=action-dispatch-event-compat.test.d.ts.map

package/dist/src/plan/action-dispatch-event-compat.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"action-dispatch-event-compat.test.d.ts","sourceRoot":"","sources":["../../../src/plan/action-dispatch-event-compat.test.ts"],"names":[],"mappings":""}

package/dist/src/plan/action-dispatch-event-compat.test.js

@@ -0,0 +1,81 @@
+import assert from "node:assert/strict";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { DatabaseSync } from "node:sqlite";
+import { afterEach, beforeEach, describe, it } from "node:test";
+import { resolvePlanDbPath } from "@xgjktech/xg-openclaw-shared";
+import { __resetActiveRoundRegistryForTests, registerActiveRound } from "../turn/active-round-registry.js";
+import { createTurnAgentEventHandler, disposeTurnAgentEvents } from "../turn/turn-agent-event-subscription.js";
+import { disposeActionStore, getActionById, setActionStateDir } from "./action-store-access.js";
+import { sendActionRunEvent } from "./action-run-event.js";
+import { createPlanToolResultMiddleware } from "./plan-tool-middleware.js";
+import { resetPlanWsRegistryForTest, setPlanWsClient } from "./plan-ws-registry.js";
+const GROUP = "action-compat-group";
+const SESSION = `agent:test:xg_cwork_im:group:${GROUP}`;
+const EVENT_ID = "evt-action-compat";
+let stateDir;
+let calls;
+let client;
+beforeEach(() => {
+    disposeTurnAgentEvents();
+    resetPlanWsRegistryForTest();
+    __resetActiveRoundRegistryForTests();
+    stateDir = mkdtempSync(join(tmpdir(), "xg-action-compat-"));
+    setActionStateDir(stateDir);
+    const db = new DatabaseSync(resolvePlanDbPath(stateDir));
+    db.exec("CREATE TABLE actions (event_id TEXT PRIMARY KEY, doc TEXT NOT NULL)");
+    db.prepare("INSERT INTO actions VALUES (?, ?)").run(EVENT_ID, JSON.stringify({
+        eventId: EVENT_ID, event: "action_dispatch", action: "ui_refresh", target: "BP",
+        version: 1, status: "completed", timestamp: new Date().toISOString(),
+        origin: { channel: "xg_cwork_im", to: GROUP }, payload: { data: { text: "x".repeat(600) } },
+    }));
+    db.close();
+    calls = [];
+    client = {
+        start: async () => { }, streamProgress: async () => { }, streamUsage: async () => { },
+        sendEvent: async (opts) => { calls.push(opts); }, end: async () => { },
+    };
+    setPlanWsClient(GROUP, client, "anchor");
+});
+afterEach(() => {
+    disposeActionStore();
+    disposeTurnAgentEvents();
+    resetPlanWsRegistryForTest();
+    __resetActiveRoundRegistryForTests();
+    rmSync(stateDir, { recursive: true, force: true });
+});
+function toolResult() {
+    const business = { ok: true, eventId: EVENT_ID, event: getActionById(EVENT_ID) };
+    return { details: business, content: [{ type: "text", text: JSON.stringify(business) }] };
+}
+function emitResult(result = toolResult(), toolCallId = "tool_call:parent:xg_action_dispatch:1") {
+    const handler = createTurnAgentEventHandler();
+    handler({
+        seq: 1, ts: Date.now(), runId: "run-compat", stream: "tool", sessionKey: SESSION,
+        data: { name: "xg_action_dispatch", phase: "result", toolCallId, result },
+    }, {});
+}
+describe("Action Dispatch: OpenClaw Default 嵌套工具兼容", () => {
+    it("真实 SQLite + tool_call 内层 result：ACTION_DISPATCH 完整发送，TOOL_EVENT 仍为 300 字符预览", () => {
+        registerActiveRound({ accountId: "test", groupId: GROUP, agentId: "test", sessionKey: SESSION, replyToMsgId: "anchor", streamClient: client });
+        emitResult();
+        assert.deepEqual(calls.map((call) => call.event), ["ACTION_DISPATCH", "TOOL_EVENT"]);
+        assert.equal(calls[0].data.target, "BP");
+        assert.equal((calls[0].data.payload.data.text).length, 600);
+        assert.equal(calls[1].data.result.length, 300);
+    });
+    it("直调只走原中间件，tool 流不重复派发", () => {
+        const middleware = createPlanToolResultMiddleware({ getActionById, sendActionRunEvent });
+        middleware({ toolName: "xg_action_dispatch", toolCallId: "direct", args: {}, result: toolResult() }, { runtime: "openclaw" });
+        emitResult(toolResult(), "direct");
+        assert.equal(calls.length, 1);
+    });
+    it("content-only 结果复用原解析器，缺库记录不派发", () => {
+        emitResult({ details: { ok: true, eventId: "missing" }, content: [] });
+        assert.equal(calls.length, 0);
+        emitResult({ details: undefined, content: toolResult().content });
+        assert.equal(calls.length, 1);
+    });
+});
+//# sourceMappingURL=action-dispatch-event-compat.test.js.map

package/dist/src/plan/action-dispatch-event-compat.test.js.map

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

package/dist/src/plan/action-store-lifecycle.test.js

@@ -38,11 +38,11 @@ function makeAction(eventId, overrides = {}) {
 function writeAction(stateDir, action) {
     const db = new DatabaseSync(resolvePlanDbPath(stateDir));
     try {
-        db.exec(`
-            CREATE TABLE IF NOT EXISTS actions (
-                event_id TEXT PRIMARY KEY,
-                doc      TEXT NOT NULL
-            ) STRICT;
+        db.exec(`
+            CREATE TABLE IF NOT EXISTS actions (
+                event_id TEXT PRIMARY KEY,
+                doc      TEXT NOT NULL
+            ) STRICT;
         `);
         db.prepare("INSERT INTO actions (event_id, doc) VALUES (?, ?)").run(action.eventId, JSON.stringify(action));
     }

package/dist/src/plan/plan-core-db.test.js

@@ -18,15 +18,15 @@ function seedAgentDb(baseDir, agentId, rows) {
     const dbPath = join(agentDir, "openclaw-agent.sqlite");
     const db = new DatabaseSync(dbPath);
     try {
-        db.exec(`
-            CREATE TABLE session_progress_cards (
-              session_key TEXT NOT NULL PRIMARY KEY,
-              markdown TEXT,
-              steps_json TEXT,
-              revision INTEGER NOT NULL,
-              created_at INTEGER NOT NULL,
-              updated_at INTEGER NOT NULL
-            ) STRICT;
+        db.exec(`
+            CREATE TABLE session_progress_cards (
+              session_key TEXT NOT NULL PRIMARY KEY,
+              markdown TEXT,
+              steps_json TEXT,
+              revision INTEGER NOT NULL,
+              created_at INTEGER NOT NULL,
+              updated_at INTEGER NOT NULL
+            ) STRICT;
         `);
         const insert = db.prepare("INSERT INTO session_progress_cards (session_key, markdown, steps_json, revision, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?);");
         for (const row of rows) {

package/dist/src/plan/plan-core-snapshot.test.js

@@ -21,15 +21,15 @@ function seedCard(baseDir, agentId, sessionKey, opts) {
     mkdirSync(agentDir, { recursive: true });
     const db = new DatabaseSync(join(agentDir, "openclaw-agent.sqlite"));
     try {
-        db.exec(`
-            CREATE TABLE IF NOT EXISTS session_progress_cards (
-              session_key TEXT NOT NULL PRIMARY KEY,
-              markdown TEXT,
-              steps_json TEXT,
-              revision INTEGER NOT NULL,
-              created_at INTEGER NOT NULL,
-              updated_at INTEGER NOT NULL
-            ) STRICT;
+        db.exec(`
+            CREATE TABLE IF NOT EXISTS session_progress_cards (
+              session_key TEXT NOT NULL PRIMARY KEY,
+              markdown TEXT,
+              steps_json TEXT,
+              revision INTEGER NOT NULL,
+              created_at INTEGER NOT NULL,
+              updated_at INTEGER NOT NULL
+            ) STRICT;
         `);
         db.prepare("INSERT INTO session_progress_cards (session_key, markdown, steps_json, revision, created_at, updated_at) VALUES (?, ?, ?, 1, ?, ?);").run(sessionKey, opts.markdown ?? null, opts.stepsJson, opts.createdAtMs ?? NOW - HOUR, opts.updatedAtMs ?? NOW - 5 * 60_000);
     }

package/dist/src/plan-event-subscription.d.ts

@@ -1,4 +1,4 @@
-import type { OpenClawPluginApi } from "openclaw/plugin-sdk/channel-plugin-common";
+import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
 import type { Plan } from "@xgjktech/xg-openclaw-shared";
 export interface PlanEventSubscriptionDeps {
     /** 按 planId 反查权威 plan（注入 getPlanById） */

package/dist/src/plan-event-subscription.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plan-event-subscription.d.ts","sourceRoot":"","sources":["../../src/plan-event-subscription.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAEnF,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AASzD,MAAM,WAAW,yBAAyB;IACtC,yCAAyC;IACzC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,SAAS,CAAC;IAClD,6CAA6C;IAC7C,YAAY,EAAE,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,KAAK,IAAI,CAAC;CAC/E;AAED,KAAK,kBAAkB,GAAG,UAAU,CAChC,iBAAiB,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,gCAAgC,CAAC,CACzE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AAEf;;;;;;;;;;;;;GAaG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,yBAAyB,GAAG,kBAAkB,CAmB1F;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,iBAAiB,EAAE,IAAI,EAAE,yBAAyB,GAAG,IAAI,CAY3G"}
+{"version":3,"file":"plan-event-subscription.d.ts","sourceRoot":"","sources":["../../src/plan-event-subscription.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AASzD,MAAM,WAAW,yBAAyB;IACtC,yCAAyC;IACzC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,SAAS,CAAC;IAClD,6CAA6C;IAC7C,YAAY,EAAE,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,KAAK,IAAI,CAAC;CAC/E;AAED,KAAK,kBAAkB,GAAG,UAAU,CAChC,iBAAiB,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,gCAAgC,CAAC,CACzE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AAEf;;;;;;;;;;;;;GAaG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,yBAAyB,GAAG,kBAAkB,CAmB1F;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,iBAAiB,EAAE,IAAI,EAAE,yBAAyB,GAAG,IAAI,CAY3G"}

package/dist/src/plan-stat-event.d.ts

@@ -1,4 +1,5 @@
-import type { Plan } from "@xgjktech/xg-openclaw-shared";
+import { type Plan } from "@xgjktech/xg-openclaw-shared";
+import type { ImStreamClient } from "./connection.js";
 /**
  * 组装发往前端的 plan：剥离 origin（内部路由信息，含 sessionKey，前端不需要也不该看到）。
  * 返回浅拷贝，不 mutate 入参（middleware 拿到的 plan 引用可能别处还要用）。
@@ -6,12 +7,22 @@ import type { Plan } from "@xgjktech/xg-openclaw-shared";
 export declare function toWirePlan(plan: Plan): Plan;
 /**
  * 发送一条 PLAN_STAT。绝不抛、绝不 await 调用方（内部自己 catch）。
- *
- * 计划状态来自 core progress_card（工具事件 or DB 回放），内部 origin 的
- * channel/to 用于路由到对应群的 WS client。
  */
 export declare function sendPlanStat(params: {
     plan: Plan;
     source: "tool" | "snapshot";
 }): void;
+/**
+ * 登记 WS client（供后续 PLAN_STAT 增量路由），登记完立刻 fire-and-forget 触发一次快照：
+ * 反查该群未完成的计划，逐个发 PLAN_STAT（source: "snapshot"）。
+ *
+ * dispatch 是热路径：整个快照过程包 try/catch、绝不 await、绝不抛——快照失败不能连累
+ * WS 绑定本身（登记必须先于快照执行、且不受快照结果影响）。
+ *
+ * `deps.listPlansByOrigin` 默认注入 plan-store-access 的实现；测试可传入假实现
+ * 模拟反查异常（红线防御性场景——即便被注入的反查实现意外抛出，本函数也绝不外抛）。
+ */
+export declare function registerPlanWsClientAndSnapshot(groupId: string, client: ImStreamClient, replyToMsgId: string, deps?: {
+    listPlansByOrigin: (channel: string, to: string) => Plan[];
+}): void;
 //# sourceMappingURL=plan-stat-event.d.ts.map

package/dist/src/plan-stat-event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plan-stat-event.d.ts","sourceRoot":"","sources":["../../src/plan-stat-event.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAKzD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAG3C;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,GAAG,IAAI,CA4BtF"}
+{"version":3,"file":"plan-stat-event.d.ts","sourceRoot":"","sources":["../../src/plan-stat-event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAMtD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAG3C;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,GAAG,IAAI,CA4BtF;AAOD;;;;;;;;;GASG;AACH,wBAAgB,+BAA+B,CAC3C,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,cAAc,EACtB,YAAY,EAAE,MAAM,EACpB,IAAI,GAAE;IAAE,iBAAiB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,IAAI,EAAE,CAAA;CAA0B,GAC7F,IAAI,CAqBN"}

package/dist/src/plan-stat-event.js

@@ -1,4 +1,6 @@
-import { getPlanWsClient } from "./plan-ws-registry.js";
+import { isPlanCancelled } from "@xgjktech/xg-openclaw-shared";
+import { getPlanWsClient, setPlanWsClient } from "./plan-ws-registry.js";
+import { listPlansByOrigin } from "./plan-store-access.js";
 const LOG_PREFIX = "[xg_cwork_im] [plan-stat-event]";
 /**
  * 组装发往前端的 plan：剥离 origin（内部路由信息，含 sessionKey，前端不需要也不该看到）。
@@ -10,9 +12,6 @@ export function toWirePlan(plan) {
 }
 /**
  * 发送一条 PLAN_STAT。绝不抛、绝不 await 调用方（内部自己 catch）。
- *
- * 计划状态来自 core progress_card（工具事件 or DB 回放），内部 origin 的
- * channel/to 用于路由到对应群的 WS client。
  */
 export function sendPlanStat(params) {
     const { plan, source } = params;
@@ -38,4 +37,38 @@ export function sendPlanStat(params) {
         console.warn(`${LOG_PREFIX} 发送失败 planId=${plan.planId} groupId=${to}: ${String(err)}`);
     });
 }
+/** 「未完成」判定：计划未取消，且存在 status !== "completed" 的 task。 */
+function isUnfinished(plan) {
+    return !isPlanCancelled(plan) && plan.tasks.some((task) => task.status !== "completed");
+}
+/**
+ * 登记 WS client（供后续 PLAN_STAT 增量路由），登记完立刻 fire-and-forget 触发一次快照：
+ * 反查该群未完成的计划，逐个发 PLAN_STAT（source: "snapshot"）。
+ *
+ * dispatch 是热路径：整个快照过程包 try/catch、绝不 await、绝不抛——快照失败不能连累
+ * WS 绑定本身（登记必须先于快照执行、且不受快照结果影响）。
+ *
+ * `deps.listPlansByOrigin` 默认注入 plan-store-access 的实现；测试可传入假实现
+ * 模拟反查异常（红线防御性场景——即便被注入的反查实现意外抛出，本函数也绝不外抛）。
+ */
+export function registerPlanWsClientAndSnapshot(groupId, client, replyToMsgId, deps = { listPlansByOrigin }) {
+    setPlanWsClient(groupId, client, replyToMsgId);
+    try {
+        const plans = deps.listPlansByOrigin("xg_cwork_im", groupId);
+        const unfinishedPlans = plans.filter(isUnfinished);
+        if (unfinishedPlans.length > 1) {
+            console.warn("[xg_cwork_im] [plan-telemetry] multi-active " + JSON.stringify({
+                to: groupId,
+                count: unfinishedPlans.length,
+                planIds: unfinishedPlans.map((plan) => plan.planId),
+            }));
+        }
+        for (const plan of unfinishedPlans) {
+            sendPlanStat({ plan, source: "snapshot" });
+        }
+    }
+    catch (err) {
+        console.warn(`${LOG_PREFIX} 会话快照失败，已吞 groupId=${groupId}: ${String(err)}`);
+    }
+}
 //# sourceMappingURL=plan-stat-event.js.map

package/dist/src/plan-stat-event.js.map

@@ -1 +1 @@
-{"version":3,"file":"plan-stat-event.js","sourceRoot":"","sources":["../../src/plan-stat-event.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,UAAU,GAAG,iCAAiC,CAAC;AAErD;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,IAAU;IACjC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAC;IAC9C,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,MAAmD;IAC5E,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;IACrC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;IAC3B,IAAI,OAAO,KAAK,aAAa,IAAI,CAAC,EAAE,EAAE,CAAC;QACnC,OAAO,CAAC,IAAI,CACR,GAAG,UAAU,4CAA4C,IAAI,CAAC,MAAM,YAAY,OAAO,IAAI,QAAQ,EAAE,CACxG,CAAC;QACF,OAAO;IACX,CAAC;IAED,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;IACnC,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,sCAAsC,IAAI,CAAC,MAAM,YAAY,EAAE,EAAE,CAAC,CAAC;QAC7F,OAAO;IACX,CAAC;IAED,KAAK,MAAM,CAAC,MAAM;SACb,SAAS,CAAC;QACP,OAAO,EAAE,EAAE;QACX,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE;KAC3C,CAAC;SACD,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;QACpB,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,gBAAgB,IAAI,CAAC,MAAM,YAAY,EAAE,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC3F,CAAC,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"plan-stat-event.js","sourceRoot":"","sources":["../../src/plan-stat-event.ts"],"names":[],"mappings":"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"}

package/dist/src/plan-stat-event.test.js

@@ -1,7 +1,7 @@
 import assert from "node:assert/strict";
 import { describe, it, beforeEach } from "node:test";
 import { resetPlanWsRegistryForTest, setPlanWsClient } from "./plan-ws-registry.js";
-import { sendPlanStat, toWirePlan } from "./plan-stat-event.js";
+import { registerPlanWsClientAndSnapshot, sendPlanStat, toWirePlan } from "./plan-stat-event.js";
 function makePlan(overrides = {}) {
     return {
         planId: "plan-1",
@@ -25,6 +25,20 @@ function makeRecordingClient() {
     };
     return { client, calls };
 }
+function captureWarnLines(fn) {
+    const original = console.warn;
+    const lines = [];
+    console.warn = (...args) => {
+        lines.push(args.map(String).join(" "));
+    };
+    try {
+        fn();
+    }
+    finally {
+        console.warn = original;
+    }
+    return lines;
+}
 beforeEach(() => {
     resetPlanWsRegistryForTest();
 });
@@ -128,4 +142,107 @@ describe("sendPlanStat: 🔴 fire-and-forget 红线", () => {
         assert.equal(result, undefined);
     });
 });
+describe("registerPlanWsClientAndSnapshot: 快照路径", () => {
+    it("cancelled 计划不推送，未取消未完成计划照常推送", () => {
+        const { client, calls } = makeRecordingClient();
+        const active = makePlan({
+            planId: "plan-active",
+            origin: { channel: "xg_cwork_im", to: "g-1" },
+            tasks: [{ title: "继续推进", status: "in_progress" }],
+        });
+        const cancelled = makePlan({
+            planId: "plan-cancelled",
+            origin: { channel: "xg_cwork_im", to: "g-1" },
+            status: "cancelled",
+            cancelledAt: "2026-07-31T01:02:03.000Z",
+            tasks: [{ title: "旧阻塞", status: "blocked", note: "不应再推" }],
+        });
+        const finished = makePlan({
+            planId: "plan-finished",
+            origin: { channel: "xg_cwork_im", to: "g-1" },
+            tasks: [{ title: "已完成", status: "completed" }],
+        });
+        registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
+            listPlansByOrigin: () => [cancelled, active, finished],
+        });
+        assert.equal(calls.length, 1);
+        assert.equal(calls[0].data.plan.planId, active.planId);
+        assert.equal(calls[0].data.source, "snapshot");
+    });
+    it("同群存在 2 份未完成计划时输出一行 multi-active 结构化遥测", () => {
+        const { client, calls } = makeRecordingClient();
+        const unfinished1 = makePlan({
+            planId: "plan-a",
+            origin: { channel: "xg_cwork_im", to: "g-1" },
+            tasks: [{ title: "t1", status: "in_progress" }],
+        });
+        const unfinished2 = makePlan({
+            planId: "plan-b",
+            origin: { channel: "xg_cwork_im", to: "g-1" },
+            tasks: [{ title: "t1", status: "blocked", note: "n" }],
+        });
+        const finished = makePlan({
+            planId: "plan-c",
+            origin: { channel: "xg_cwork_im", to: "g-1" },
+            tasks: [{ title: "t1", status: "completed" }],
+        });
+        const lines = captureWarnLines(() => {
+            registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
+                listPlansByOrigin: () => [unfinished1, unfinished2, finished],
+            });
+        });
+        assert.equal(calls.length, 2);
+        assert.ok(calls.every((c) => c.data.source === "snapshot"));
+        const planIds = calls.map((c) => c.data.plan.planId).sort();
+        assert.deepEqual(planIds, ["plan-a", "plan-b"]);
+        assert.deepEqual(lines, [
+            "[xg_cwork_im] [plan-telemetry] multi-active " + JSON.stringify({
+                to: "g-1",
+                count: 2,
+                planIds: ["plan-a", "plan-b"],
+            }),
+        ]);
+    });
+    it("同群只有 1 份或 0 份未完成计划时不输出 multi-active 遥测", () => {
+        const { client } = makeRecordingClient();
+        const active = makePlan({
+            planId: "plan-active",
+            origin: { channel: "xg_cwork_im", to: "g-1" },
+        });
+        const finished = makePlan({
+            planId: "plan-finished",
+            origin: { channel: "xg_cwork_im", to: "g-1" },
+            tasks: [{ title: "完成", status: "completed" }],
+        });
+        const cancelled = makePlan({
+            planId: "plan-cancelled",
+            origin: { channel: "xg_cwork_im", to: "g-1" },
+            status: "cancelled",
+        });
+        const lines = captureWarnLines(() => {
+            registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
+                listPlansByOrigin: () => [active, finished, cancelled],
+            });
+            registerPlanWsClientAndSnapshot("g-1", client, "msg-2", {
+                listPlansByOrigin: () => [finished, cancelled],
+            });
+        });
+        assert.deepEqual(lines, []);
+    });
+    it("🔴 反查抛异常 → registerPlanWsClientAndSnapshot 不抛，且登记本身仍然成功", () => {
+        const { client, calls } = makeRecordingClient();
+        assert.doesNotThrow(() => {
+            registerPlanWsClientAndSnapshot("g-1", client, "msg-1", {
+                listPlansByOrigin: () => {
+                    throw new Error("db locked");
+                },
+            });
+        });
+        assert.equal(calls.length, 0, "反查失败不应发出任何 PLAN_STAT");
+        // 登记仍然成功：紧接着用同一 client 发一条正常的 PLAN_STAT 应该能路由到
+        const plan = makePlan({ origin: { channel: "xg_cwork_im", to: "g-1" } });
+        sendPlanStat({ plan, source: "tool" });
+        assert.equal(calls.length, 1, "快照失败不能连累 WS 绑定，后续增量应仍能发出");
+    });
+});
 //# sourceMappingURL=plan-stat-event.test.js.map