@xgjktech/xg_cwork_im 1.16.45 → 1.17.0

package/dist/src/plan-tool-middleware.test.js

@@ -0,0 +1,329 @@
+import assert from "node:assert/strict";
+import { beforeEach, describe, it } from "node:test";
+import { createPlanToolResultMiddleware } from "./plan-tool-middleware.js";
+import { registerToolCallTarget, resetPlanSessionRegistryForTest, } from "./plan-session-registry.js";
+const FAKE_CTX = { runtime: "openclaw" };
+function makePlan(overrides = {}) {
+    return {
+        planId: "plan-1",
+        goal: "迁移配置到新版本",
+        createdAt: "2026-07-27T00:00:00.000Z",
+        updatedAt: "2026-07-27T00:00:00.000Z",
+        tasks: [],
+        ...overrides,
+    };
+}
+function makeEvent(overrides) {
+    const content = overrides.text !== undefined
+        ? [{ type: "text", text: overrides.text }]
+        : [];
+    return {
+        toolCallId: overrides.toolCallId ?? "call-1",
+        toolName: overrides.toolName ?? "xg_plan_write",
+        args: {},
+        result: {
+            details: overrides.details,
+            content,
+        },
+    };
+}
+function makeSuccessPayload(plan, withEvent = false) {
+    return {
+        ok: true,
+        planId: plan.planId,
+        plan,
+        ...(withEvent ? { event: { emitted: false, reason: "no runId" } } : {}),
+    };
+}
+class RecordingDeps {
+    calls = [];
+    sendTextImpl = async (target, content) => {
+        this.calls.push({ target, content });
+    };
+    planById = new Map();
+    sendText = (target, content) => {
+        return this.sendTextImpl(target, content);
+    };
+    getPlanById = (planId) => {
+        return this.planById.get(planId);
+    };
+}
+beforeEach(() => {
+    resetPlanSessionRegistryForTest();
+});
+describe("createPlanToolResultMiddleware: 非 plan 工具直接放行", () => {
+    it("does not touch sendText or getPlanById for unrelated tools", () => {
+        const deps = new RecordingDeps();
+        const handler = createPlanToolResultMiddleware(deps);
+        const event = makeEvent({
+            toolName: "some_other_tool",
+            details: { ok: true, data: 123 },
+        });
+        const result = handler(event, FAKE_CTX);
+        assert.equal(result, undefined);
+        assert.equal(deps.calls.length, 0);
+    });
+    it("does not push even when a non-plan tool's details is a structurally valid plan payload (pins the name filter)", () => {
+        const deps = new RecordingDeps();
+        const handler = createPlanToolResultMiddleware(deps);
+        // 表中已登记该 toolCallId，若名字过滤被删掉，结构守卫会放行并触发推送
+        registerToolCallTarget("call-evil", { groupId: "g-evil", token: "t-evil" });
+        const plan = makePlan({ tasks: [{ title: "备份旧配置", status: "blocked", note: "缺少权限" }] });
+        const event = makeEvent({
+            toolCallId: "call-evil",
+            toolName: "some_evil_tool",
+            details: makeSuccessPayload(plan),
+        });
+        const result = handler(event, FAKE_CTX);
+        assert.equal(result, undefined);
+        assert.equal(deps.calls.length, 0);
+    });
+});
+describe("createPlanToolResultMiddleware: details 路径", () => {
+    it("pushes a blocked notice when details carries a valid plan", () => {
+        const deps = new RecordingDeps();
+        const handler = createPlanToolResultMiddleware(deps);
+        registerToolCallTarget("call-1", { groupId: "g1", token: "t1" });
+        const plan = makePlan({
+            tasks: [{ title: "备份旧配置", status: "blocked", note: "缺少权限" }],
+        });
+        const event = makeEvent({
+            toolCallId: "call-1",
+            toolName: "xg_plan_write",
+            details: makeSuccessPayload(plan),
+        });
+        const result = handler(event, FAKE_CTX);
+        assert.equal(result, undefined);
+        assert.equal(deps.calls.length, 1);
+        assert.equal(deps.calls[0].target.groupId, "g1");
+        assert.ok(deps.calls[0].content.includes("备份旧配置"));
+        assert.ok(deps.calls[0].content.includes("缺少权限"));
+    });
+});
+describe("createPlanToolResultMiddleware: text 回退路径", () => {
+    it("falls back to content[0].text when details is undefined", () => {
+        const deps = new RecordingDeps();
+        const handler = createPlanToolResultMiddleware(deps);
+        registerToolCallTarget("call-2", { groupId: "g2", token: "t2" });
+        const plan = makePlan({
+            planId: "plan-2",
+            tasks: [{ title: "校验数据", status: "blocked", note: "依赖未就绪" }],
+        });
+        const rawBody = JSON.stringify(makeSuccessPayload(plan, true), null, 2);
+        const event = makeEvent({
+            toolCallId: "call-2",
+            toolName: "xg_plan_execute",
+            details: undefined,
+            text: rawBody,
+        });
+        const result = handler(event, FAKE_CTX);
+        assert.equal(result, undefined);
+        assert.equal(deps.calls.length, 1);
+        assert.ok(deps.calls[0].content.includes("校验数据"));
+    });
+    it("uses getPlanById authoritative state when details is missing (D5/RULING-1 §3)", () => {
+        const deps = new RecordingDeps();
+        const handler = createPlanToolResultMiddleware(deps);
+        registerToolCallTarget("call-3", { groupId: "g3", token: "t3" });
+        // text 路径拿到的 plan 里没有 blocked task，但权威反查里有
+        const textPlan = makePlan({ planId: "plan-3", tasks: [{ title: "t1", status: "pending" }] });
+        const authoritativePlan = makePlan({
+            planId: "plan-3",
+            tasks: [{ title: "t1", status: "blocked", note: "authoritative 才有的阻塞" }],
+        });
+        deps.planById.set("plan-3", authoritativePlan);
+        const rawBody = JSON.stringify(makeSuccessPayload(textPlan), null, 2);
+        const event = makeEvent({
+            toolCallId: "call-3",
+            toolName: "xg_plan_write",
+            details: undefined,
+            text: rawBody,
+        });
+        handler(event, FAKE_CTX);
+        assert.equal(deps.calls.length, 1);
+        assert.ok(deps.calls[0].content.includes("authoritative 才有的阻塞"));
+    });
+});
+describe("createPlanToolResultMiddleware: 守卫拒绝畸形 payload", () => {
+    it("does not push for ok:false", () => {
+        const deps = new RecordingDeps();
+        const handler = createPlanToolResultMiddleware(deps);
+        registerToolCallTarget("call-4", { groupId: "g4", token: "t4" });
+        const event = makeEvent({
+            toolCallId: "call-4",
+            toolName: "xg_plan_write",
+            details: { ok: false, error: { code: "PLAN_NOT_FOUND" } },
+        });
+        assert.equal(handler(event, FAKE_CTX), undefined);
+        assert.equal(deps.calls.length, 0);
+    });
+    it("does not push when planId is missing", () => {
+        const deps = new RecordingDeps();
+        const handler = createPlanToolResultMiddleware(deps);
+        registerToolCallTarget("call-5", { groupId: "g5", token: "t5" });
+        const event = makeEvent({
+            toolCallId: "call-5",
+            toolName: "xg_plan_write",
+            details: { ok: true, plan: makePlan() },
+        });
+        assert.equal(handler(event, FAKE_CTX), undefined);
+        assert.equal(deps.calls.length, 0);
+    });
+    it("does not push when tasks is not an array", () => {
+        const deps = new RecordingDeps();
+        const handler = createPlanToolResultMiddleware(deps);
+        registerToolCallTarget("call-6", { groupId: "g6", token: "t6" });
+        const event = makeEvent({
+            toolCallId: "call-6",
+            toolName: "xg_plan_write",
+            details: {
+                ok: true,
+                planId: "plan-6",
+                plan: { planId: "plan-6", goal: "g", createdAt: "t", updatedAt: "t", tasks: "not-an-array" },
+            },
+        });
+        assert.equal(handler(event, FAKE_CTX), undefined);
+        assert.equal(deps.calls.length, 0);
+    });
+});
+describe("createPlanToolResultMiddleware: handler 内部出错不外抛", () => {
+    it("resolves normally even when sendText throws synchronously", () => {
+        const deps = new RecordingDeps();
+        deps.sendTextImpl = () => {
+            throw new Error("boom");
+        };
+        const handler = createPlanToolResultMiddleware(deps);
+        registerToolCallTarget("call-7", { groupId: "g7", token: "t7" });
+        const plan = makePlan({ tasks: [{ title: "t1", status: "blocked", note: "n" }] });
+        const event = makeEvent({
+            toolCallId: "call-7",
+            toolName: "xg_plan_write",
+            details: makeSuccessPayload(plan),
+        });
+        assert.doesNotThrow(() => handler(event, FAKE_CTX));
+    });
+    it("resolves normally even when getPlanById throws", () => {
+        const deps = new RecordingDeps();
+        deps.getPlanById = () => {
+            throw new Error("boom");
+        };
+        const handler = createPlanToolResultMiddleware(deps);
+        registerToolCallTarget("call-8", { groupId: "g8", token: "t8" });
+        const plan = makePlan({ planId: "plan-8", tasks: [{ title: "t1", status: "blocked", note: "n" }] });
+        const rawBody = JSON.stringify(makeSuccessPayload(plan), null, 2);
+        const event = makeEvent({
+            toolCallId: "call-8",
+            toolName: "xg_plan_write",
+            details: undefined,
+            text: rawBody,
+        });
+        assert.doesNotThrow(() => handler(event, FAKE_CTX));
+    });
+});
+describe("createPlanToolResultMiddleware: 恒返回 void", () => {
+    it("handler's return value is undefined", () => {
+        const deps = new RecordingDeps();
+        const handler = createPlanToolResultMiddleware(deps);
+        registerToolCallTarget("call-9", { groupId: "g9", token: "t9" });
+        const plan = makePlan({ tasks: [{ title: "t1", status: "blocked", note: "n" }] });
+        const event = makeEvent({
+            toolCallId: "call-9",
+            toolName: "xg_plan_write",
+            details: makeSuccessPayload(plan),
+        });
+        const result = handler(event, FAKE_CTX);
+        assert.equal(result, undefined);
+    });
+});
+describe("createPlanToolResultMiddleware: 合成 id 未命中 → 静默降级 (RULING-2 追加约束 2)", () => {
+    it("does not push and does not throw when toolCallId is a synthetic openclaw-<uuid> not present in the table", () => {
+        const deps = new RecordingDeps();
+        const handler = createPlanToolResultMiddleware(deps);
+        // 故意不 registerToolCallTarget，模拟合成 id 未命中
+        const plan = makePlan({ tasks: [{ title: "t1", status: "blocked", note: "n" }] });
+        const event = makeEvent({
+            toolCallId: "openclaw-3f9a7c2e-1234-4a1b-9abc-000000000000",
+            toolName: "xg_plan_write",
+            details: makeSuccessPayload(plan),
+        });
+        assert.doesNotThrow(() => {
+            const result = handler(event, FAKE_CTX);
+            assert.equal(result, undefined);
+        });
+        assert.equal(deps.calls.length, 0);
+    });
+});
+describe("createPlanToolResultMiddleware: fire-and-forget", () => {
+    it("resolves immediately even when sendText returns a never-resolving promise", () => {
+        const deps = new RecordingDeps();
+        deps.sendTextImpl = () => new Promise(() => { });
+        const handler = createPlanToolResultMiddleware(deps);
+        registerToolCallTarget("call-10", { groupId: "g10", token: "t10" });
+        const plan = makePlan({ tasks: [{ title: "t1", status: "blocked", note: "n" }] });
+        const event = makeEvent({
+            toolCallId: "call-10",
+            toolName: "xg_plan_write",
+            details: makeSuccessPayload(plan),
+        });
+        // 若 handler 内部 await 了 sendText，这行会挂起整个测试进程（超时失败）；
+        // handler 是同步函数，必须立即返回 undefined。
+        const result = handler(event, FAKE_CTX);
+        assert.equal(result, undefined);
+    });
+});
+describe("createPlanToolResultMiddleware: 查表未命中不得毒化去重状态 (FINDING-1)", () => {
+    it("a miss does not mark the notice as sent — a later call with a freshly-registered toolCallId for the same blocked key must still push", () => {
+        const deps = new RecordingDeps();
+        const handler = createPlanToolResultMiddleware(deps);
+        const plan = makePlan({
+            planId: "plan-finding1",
+            tasks: [{ title: "备份旧配置", status: "blocked", note: "缺少权限" }],
+        });
+        // 第一次：不登记 toolCallId，模拟未命中（合成 id / TTL 过期 / onToolStart 早退）
+        const missEvent = makeEvent({
+            toolCallId: "call-miss",
+            toolName: "xg_plan_write",
+            details: makeSuccessPayload(plan),
+        });
+        handler(missEvent, FAKE_CTX);
+        assert.equal(deps.calls.length, 0, "未命中时不应有任何推送");
+        // 第二次：同一 planId、同一 task、同一 note（key 完全相同），
+        // 但 toolCallId 换成新登记的 call-new——模拟 onToolStart 用新 toolCallId 重新登记
+        registerToolCallTarget("call-new", { groupId: "g-new", token: "t-new" });
+        const hitEvent = makeEvent({
+            toolCallId: "call-new",
+            toolName: "xg_plan_write",
+            details: makeSuccessPayload(plan),
+        });
+        handler(hitEvent, FAKE_CTX);
+        assert.equal(deps.calls.length, 1, "未命中不应污染去重状态，换新 toolCallId 后必须能重推");
+        assert.equal(deps.calls[0].target.groupId, "g-new");
+        assert.ok(deps.calls[0].content.includes("备份旧配置"));
+        assert.ok(deps.calls[0].content.includes("缺少权限"));
+    });
+    it("does not push again for the same key once it has actually been sent (dedup regression guard)", () => {
+        const deps = new RecordingDeps();
+        const handler = createPlanToolResultMiddleware(deps);
+        const plan = makePlan({
+            planId: "plan-finding1-dedup",
+            tasks: [{ title: "备份旧配置", status: "blocked", note: "缺少权限" }],
+        });
+        registerToolCallTarget("call-first", { groupId: "g-first", token: "t-first" });
+        const firstEvent = makeEvent({
+            toolCallId: "call-first",
+            toolName: "xg_plan_write",
+            details: makeSuccessPayload(plan),
+        });
+        handler(firstEvent, FAKE_CTX);
+        assert.equal(deps.calls.length, 1, "首次命中应推送一次");
+        registerToolCallTarget("call-second", { groupId: "g-second", token: "t-second" });
+        const secondEvent = makeEvent({
+            toolCallId: "call-second",
+            toolName: "xg_plan_write",
+            details: makeSuccessPayload(plan),
+        });
+        handler(secondEvent, FAKE_CTX);
+        assert.equal(deps.calls.length, 1, "同一 key 已成功推送过，不应重复推送");
+    });
+});
+//# sourceMappingURL=plan-tool-middleware.test.js.map

package/dist/src/plan-tool-middleware.test.js.map

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

package/dist/src/plan-tool-result.d.ts

@@ -0,0 +1,20 @@
+import type { Plan } from "@xgjktech/xg-openclaw-shared";
+export interface ParsedPlanToolResult {
+    planId: string;
+    plan: Plan;
+    /** plan_execute 的返回带 event 字段，plan_write 没有——用于日志区分，不参与正确性判定 */
+    hasEventField: boolean;
+}
+/**
+ * 从已解析的值（如 JSON.parse 结果、middleware 的 `event.result.details`）中
+ * 结构校验并提取计划工具的成功返回。不是计划工具返回、ok:false 一律返回 undefined。
+ * 供 `parsePlanToolResult`（字符串输入）与 middleware（对象输入）共用同一份判定，
+ * 避免两份校验漂移。
+ */
+export declare function parsePlanToolResultFromValue(value: unknown): ParsedPlanToolResult | undefined;
+/**
+ * 从工具返回 JSON 文本中解析计划工具的成功返回。
+ * 不是计划工具返回、解析失败、ok:false 一律返回 undefined（绝不抛异常）。
+ */
+export declare function parsePlanToolResult(rawBody: string): ParsedPlanToolResult | undefined;
+//# sourceMappingURL=plan-tool-result.d.ts.map

package/dist/src/plan-tool-result.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plan-tool-result.d.ts","sourceRoot":"","sources":["../../src/plan-tool-result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,8BAA8B,CAAC;AAErE,MAAM,WAAW,oBAAoB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,IAAI,CAAC;IACX,gEAAgE;IAChE,aAAa,EAAE,OAAO,CAAC;CAC1B;AA4CD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,GAAG,SAAS,CAmB7F;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS,CASrF"}

package/dist/src/plan-tool-result.js

@@ -0,0 +1,78 @@
+const TASK_STATUSES = [
+    "pending",
+    "in_progress",
+    "completed",
+    "blocked",
+];
+function isTaskStatus(value) {
+    return typeof value === "string" && TASK_STATUSES.includes(value);
+}
+function isPlainObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isValidPlan(value) {
+    if (!isPlainObject(value)) {
+        return false;
+    }
+    if (typeof value.planId !== "string" || value.planId === "") {
+        return false;
+    }
+    if (typeof value.goal !== "string") {
+        return false;
+    }
+    if (!Array.isArray(value.tasks)) {
+        return false;
+    }
+    for (const task of value.tasks) {
+        if (!isPlainObject(task)) {
+            return false;
+        }
+        if (typeof task.title !== "string") {
+            return false;
+        }
+        if (!isTaskStatus(task.status)) {
+            return false;
+        }
+    }
+    return true;
+}
+/**
+ * 从已解析的值（如 JSON.parse 结果、middleware 的 `event.result.details`）中
+ * 结构校验并提取计划工具的成功返回。不是计划工具返回、ok:false 一律返回 undefined。
+ * 供 `parsePlanToolResult`（字符串输入）与 middleware（对象输入）共用同一份判定，
+ * 避免两份校验漂移。
+ */
+export function parsePlanToolResultFromValue(value) {
+    if (!isPlainObject(value)) {
+        return undefined;
+    }
+    if (value.ok !== true) {
+        return undefined;
+    }
+    if (typeof value.planId !== "string" || value.planId === "") {
+        return undefined;
+    }
+    if (!isValidPlan(value.plan)) {
+        return undefined;
+    }
+    return {
+        planId: value.planId,
+        plan: value.plan,
+        hasEventField: "event" in value,
+    };
+}
+/**
+ * 从工具返回 JSON 文本中解析计划工具的成功返回。
+ * 不是计划工具返回、解析失败、ok:false 一律返回 undefined（绝不抛异常）。
+ */
+export function parsePlanToolResult(rawBody) {
+    let parsed;
+    try {
+        parsed = JSON.parse(rawBody);
+    }
+    catch {
+        return undefined;
+    }
+    return parsePlanToolResultFromValue(parsed);
+}
+//# sourceMappingURL=plan-tool-result.js.map

package/dist/src/plan-tool-result.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plan-tool-result.js","sourceRoot":"","sources":["../../src/plan-tool-result.ts"],"names":[],"mappings":"AASA,MAAM,aAAa,GAA0B;IACzC,SAAS;IACT,aAAa;IACb,WAAW;IACX,SAAS;CACZ,CAAC;AAEF,SAAS,YAAY,CAAC,KAAc;IAChC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAK,aAAmC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC7F,CAAC;AAED,SAAS,aAAa,CAAC,KAAc;IACjC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAChF,CAAC;AAED,SAAS,WAAW,CAAC,KAAc;IAC/B,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;QAC1D,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAAC,KAAc;IACvD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,IAAI,KAAK,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;QAC1D,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO;QACH,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,aAAa,EAAE,OAAO,IAAI,KAAK;KAClC,CAAC;AACN,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAe;IAC/C,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACD,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,4BAA4B,CAAC,MAAM,CAAC,CAAC;AAChD,CAAC"}

package/dist/src/plan-tool-result.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=plan-tool-result.test.d.ts.map

package/dist/src/plan-tool-result.test.d.ts.map

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

package/dist/src/plan-tool-result.test.js

@@ -0,0 +1,107 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import { parsePlanToolResult } from "./plan-tool-result.js";
+const PLAN_WRITE_SUCCESS = JSON.stringify({
+    ok: true,
+    planId: "db3b57e4-aaaa-bbbb-cccc-000000000001",
+    plan: {
+        planId: "db3b57e4-aaaa-bbbb-cccc-000000000001",
+        goal: "迁移配置到新版本",
+        createdAt: "2026-07-27T00:00:00.000Z",
+        updatedAt: "2026-07-27T00:00:00.000Z",
+        tasks: [
+            {
+                title: "备份旧配置",
+                status: "blocked",
+                note: "阻塞原因",
+                steps: [{ text: "导出 json", status: "pending" }],
+            },
+        ],
+    },
+}, null, 2);
+const PLAN_EXECUTE_SUCCESS = JSON.stringify({
+    ok: true,
+    planId: "db3b57e4-aaaa-bbbb-cccc-000000000002",
+    plan: {
+        planId: "db3b57e4-aaaa-bbbb-cccc-000000000002",
+        goal: "迁移配置到新版本",
+        createdAt: "2026-07-27T00:00:00.000Z",
+        updatedAt: "2026-07-27T00:01:00.000Z",
+        tasks: [
+            {
+                title: "备份旧配置",
+                status: "completed",
+                steps: [{ text: "导出 json", status: "completed" }],
+            },
+        ],
+    },
+    event: { emitted: false, reason: "no runId" },
+}, null, 2);
+describe("parsePlanToolResult", () => {
+    it("parses a real plan_write success body", () => {
+        const result = parsePlanToolResult(PLAN_WRITE_SUCCESS);
+        assert.ok(result);
+        assert.equal(result.planId, "db3b57e4-aaaa-bbbb-cccc-000000000001");
+        assert.equal(result.plan.goal, "迁移配置到新版本");
+        assert.equal(result.hasEventField, false);
+    });
+    it("parses a real plan_execute success body with event field", () => {
+        const result = parsePlanToolResult(PLAN_EXECUTE_SUCCESS);
+        assert.ok(result);
+        assert.equal(result.planId, "db3b57e4-aaaa-bbbb-cccc-000000000002");
+        assert.equal(result.hasEventField, true);
+    });
+    for (const code of [
+        "PLAN_NOT_FOUND",
+        "INDEX_OUT_OF_RANGE",
+        "NOTE_REQUIRED",
+        "STEP_INDEX_REQUIRED",
+        "INVARIANT_VIOLATION",
+        "STORE_ERROR",
+    ]) {
+        it(`returns undefined for ok:false with code ${code}`, () => {
+            const body = JSON.stringify({ ok: false, error: { code, detail: "可选" } }, null, 2);
+            assert.equal(parsePlanToolResult(body), undefined);
+        });
+    }
+    it("returns undefined for empty string / non-json / non-object json", () => {
+        assert.equal(parsePlanToolResult(""), undefined);
+        assert.equal(parsePlanToolResult("not json"), undefined);
+        assert.equal(parsePlanToolResult("[]"), undefined);
+        assert.equal(parsePlanToolResult("123"), undefined);
+        assert.equal(parsePlanToolResult("null"), undefined);
+    });
+    it("does not misfire on an unrelated tool's ok:true body", () => {
+        const body = JSON.stringify({ ok: true, data: 123 }, null, 2);
+        assert.equal(parsePlanToolResult(body), undefined);
+    });
+    it("returns undefined when plan.tasks contains an invalid status", () => {
+        const body = JSON.stringify({
+            ok: true,
+            planId: "p1",
+            plan: {
+                planId: "p1",
+                goal: "g",
+                createdAt: "t",
+                updatedAt: "t",
+                tasks: [{ title: "x", status: "unknown_status" }],
+            },
+        }, null, 2);
+        assert.equal(parsePlanToolResult(body), undefined);
+    });
+    it("returns undefined when planId is missing or empty", () => {
+        const body = JSON.stringify({
+            ok: true,
+            planId: "",
+            plan: {
+                planId: "p1",
+                goal: "g",
+                createdAt: "t",
+                updatedAt: "t",
+                tasks: [],
+            },
+        }, null, 2);
+        assert.equal(parsePlanToolResult(body), undefined);
+    });
+});
+//# sourceMappingURL=plan-tool-result.test.js.map

package/dist/src/plan-tool-result.test.js.map

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

package/dist/src/subagent-monitor.js

@@ -18,7 +18,7 @@ const groupMonitors = new Map();
 const wsClients = new Map();
 let tickerTimer = null;
 let pluginApi = null;
-const POLL_INTERVAL_MS = 15000;
+const POLL_INTERVAL_MS = 10000;
 console.log(`[subagent-monitor] module loaded, POLL_INTERVAL=${POLL_INTERVAL_MS}ms`);
 // ─── 公开 API ─────────────────────────────────────────────────────────
 export function setPluginApi(api) {
@@ -262,14 +262,12 @@ function cleanMsg(msg) {
     return "";
 }
 const MAX_INCR_MSGS = 5;
-function sendWsStat(groupId, monitor, client, replyToMsgId) {
-    // 构建增量消息列表，同时记录每个 subagent 发了几条
-    const sentCounts = new Map();
-    const subagentList = Array.from(monitor.subagents.entries()).map(([runId, record]) => {
-        const newMsgs = record.messages.length > record.sendFrom
-            ? record.messages.slice(record.sendFrom, record.sendFrom + MAX_INCR_MSGS)
-            : [];
-        sentCounts.set(runId, newMsgs.length);
+function buildSubagentList(monitor) {
+    return Array.from(monitor.subagents.entries()).map(([runId, record]) => {
+        const total = record.messages.length;
+        const newMsgs = total > record.sendFrom ? record.messages.slice(record.sendFrom, record.sendFrom + MAX_INCR_MSGS) : [];
+        if (newMsgs.length > 0)
+            record.sendFrom += newMsgs.length;
         return {
             runId,
             label: record.label ?? runId.slice(0, 8),
@@ -277,21 +275,17 @@ function sendWsStat(groupId, monitor, client, replyToMsgId) {
             messages: newMsgs,
         };
     });
+}
+function sendWsStat(groupId, monitor, client, replyToMsgId) {
+    const subagentList = buildSubagentList(monitor);
     client.sendEvent({
         groupId,
         replyToMsgId,
         event: "SUBAGENT_STAT",
         data: { subagentList },
-    }).then(() => {
-        // 发送成功后推进游标
-        for (const [runId, count] of sentCounts) {
-            const record = monitor.subagents.get(runId);
-            if (record)
-                record.sendFrom += count;
-        }
     }).catch((err) => {
         console.error(`[subagent-monitor] WS SUBAGENT_STAT failed: ${String(err)}`);
-        // 不推进游标，下次重试时消息不会丢失
+        // 不删除 wsClients，WS 重连后 ensureSocketReady 会拿到新连接
     });
 }
 function buildPayload(monitor) {