@xgjktech/xg_cwork_im 1.16.45 → 1.17.0

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

@@ -0,0 +1,121 @@
+import { isPlanEventPayload, planEventStream } from "@xgjktech/xg-openclaw-shared";
+import { getToken } from "./auth.js";
+import { sendTextMessage } from "./send-service.js";
+/**
+ * xg-harness-tools 的 plugin id：streams 过滤需要与其 openclaw.plugin.json 的 id 一致。
+ */
+const HARNESS_PLUGIN_ID = "xg-harness-tools";
+const LOG_PREFIX = "[xg_cwork_im] [plan-event-subscription]";
+/**
+ * `deliveryContext` 类型在 `@xgjktech/xg-openclaw-shared` 侧声明为 `unknown`（跨插件契约不引入
+ * openclaw 依赖），运行时实际形状是 openclaw `DeliveryContext`（`{ to?, accountId?, ... }`），
+ * 这里只做安全的结构读取，不假设其余字段存在。
+ */
+function resolveFromDeliveryContext(deliveryContext) {
+    if (typeof deliveryContext !== "object" || deliveryContext === null) {
+        return undefined;
+    }
+    const to = deliveryContext.to;
+    if (typeof to !== "string" || to === "") {
+        return undefined;
+    }
+    return { groupId: to };
+}
+/**
+ * `agentAccountId`/`messageChannel` → IM 侧 groupId 的反查目前没有映射表
+ * （spec §1.4：若映射彻底无法建立，该次事件应放弃推群，不影响正确性，
+ * 因为主感知路径本就是 SQLite 反查而非事件）。保留函数形态与 spec 一致，
+ * 便于未来接入映射表时零改动补上实现。
+ */
+function resolveFromAccountAndChannel(_agentAccountId, _messageChannel) {
+    return undefined;
+}
+/**
+ * 路由定位（spec §1.2 优先级）：
+ * 1. `payload.deliveryContext`
+ * 2. `payload.agentAccountId` / `payload.messageChannel`
+ * 3. 备用：`payload.sessionKey ?? event.sessionKey`（当前无 sessionKey→群 映射，直接放弃）
+ *
+ * ⚠️ 这些路由字段都在 `event.data`（即 payload）内部，`AgentEventPayload` 顶层没有
+ * `deliveryContext`/`agentAccountId`/`messageChannel`（DESIGN.md §3 已编译级确认），
+ * 只有 `sessionKey` 在顶层也存在，用作备用兜底的次优先级来源。
+ */
+function resolveDeliveryTarget(payload, event) {
+    if (payload.deliveryContext !== undefined) {
+        return resolveFromDeliveryContext(payload.deliveryContext);
+    }
+    if (payload.agentAccountId !== undefined || payload.messageChannel !== undefined) {
+        return resolveFromAccountAndChannel(payload.agentAccountId, payload.messageChannel);
+    }
+    const sessionKey = payload.sessionKey ?? event.sessionKey;
+    if (sessionKey === undefined) {
+        return undefined;
+    }
+    // 当前无 sessionKey → 群 的映射表（spec §1.4：若没有可以不建，直接放弃推群）
+    return undefined;
+}
+function buildBlockedNoticeText(payload) {
+    if (payload.taskStatus !== "blocked" || payload.blockedNote === undefined) {
+        return undefined;
+    }
+    const note = payload.blockedNote.trim();
+    if (note === "") {
+        return undefined;
+    }
+    return `计划「${payload.goal}」卡在任务「${payload.taskTitle}」：${note}\n需要人工介入才能继续。`;
+}
+/**
+ * 构造事件订阅的 `handle` 回调，可独立单测（不依赖真实 api/网络）。
+ *
+ * 降级纪律同 middleware：handle 内全身 try/catch，绝不外抛（与 middleware 同进程）。
+ *
+ * ⚠️ 当前 OpenClaw 版本下 xg-harness-tools 恒因缺少 runId 而不发送此事件，
+ * 此 handle 不会被触发，保留以便未来该限制解除后零改动生效。
+ * 不得将其作为任何正确性判断依据——权威状态来自 TASK-2 的 SQLite 只读反查。
+ */
+export function createPlanEventHandler(deps) {
+    return async (event, _ctx) => {
+        try {
+            if (!isPlanEventPayload(event.data)) {
+                return;
+            }
+            const payload = event.data;
+            const target = resolveDeliveryTarget(payload, { sessionKey: event.sessionKey });
+            if (!target) {
+                console.warn(`${LOG_PREFIX} 无法定位投递目标，放弃本次推群 planId=${payload.planId} taskIndex=${payload.taskIndex}`);
+                return;
+            }
+            const content = buildBlockedNoticeText(payload);
+            if (!content) {
+                return;
+            }
+            await deps.sendText(target.groupId, content);
+        }
+        catch (err) {
+            console.warn(`${LOG_PREFIX} handle 内部异常，已吞: ${String(err)}`);
+        }
+    };
+}
+/**
+ * 注册计划事件订阅（spec §1，前瞻性预留）。
+ *
+ * ⚠️ 当前 OpenClaw 版本下 xg-harness-tools 恒因缺少 runId 而不发送此事件，
+ * 此订阅不会被触发，保留以便未来该限制解除后零改动生效。
+ */
+export function registerPlanEventSubscription(api, config) {
+    const handle = createPlanEventHandler({
+        sendText: async (groupId, content) => {
+            const identity = await getToken(config);
+            await sendTextMessage(config, identity.token, groupId, content);
+        },
+    });
+    api.agent.events.registerAgentEventSubscription({
+        id: "xg-cwork-im-plan-progress",
+        description: "订阅 xg-harness-tools 计划进度事件，推送到群。前瞻性预留：" +
+            "当前 OpenClaw 版本下 xg-harness-tools 恒因缺少 runId 而不发送此事件，" +
+            "此订阅暂不会被触发，保留以便未来该限制解除后零改动生效。",
+        streams: [planEventStream(HARNESS_PLUGIN_ID)],
+        handle,
+    });
+}
+//# sourceMappingURL=plan-event-subscription.js.map

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

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

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

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

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

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

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

@@ -0,0 +1,257 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import { createPlanEventHandler } from "./plan-event-subscription.js";
+const FAKE_CTX = {
+    getRunContext: () => undefined,
+    setRunContext: () => { },
+    clearRunContext: () => { },
+};
+function makeBlockedPayload(overrides = {}) {
+    return {
+        kind: "plan_update",
+        planId: "plan-1",
+        goal: "迁移配置到新版本",
+        action: "advance",
+        taskIndex: 0,
+        taskTitle: "备份旧配置",
+        taskStatus: "blocked",
+        blockedNote: "缺少权限",
+        summary: { total: 3, completed: 1, blocked: 1, inProgress: 0 },
+        runId: "run-1",
+        ...overrides,
+    };
+}
+class RecordingSendText {
+    calls = [];
+    impl = async (groupId, content) => {
+        this.calls.push({ groupId, content });
+    };
+    sendText = (groupId, content) => this.impl(groupId, content);
+}
+describe("createPlanEventHandler: isPlanEventPayload 守卫", () => {
+    it("rejects malformed data without pushing or throwing", async () => {
+        const recorder = new RecordingSendText();
+        const handle = createPlanEventHandler({ sendText: recorder.sendText });
+        const event = {
+            runId: "run-1",
+            seq: 1,
+            stream: "xg-harness-tools.plan",
+            ts: Date.now(),
+            data: { kind: "not_plan_update" },
+        };
+        await assert.doesNotReject(() => Promise.resolve(handle(event, FAKE_CTX)));
+        assert.equal(recorder.calls.length, 0);
+    });
+    it("rejects when data is not an object at all", async () => {
+        const recorder = new RecordingSendText();
+        const handle = createPlanEventHandler({ sendText: recorder.sendText });
+        const event = {
+            runId: "run-1",
+            seq: 1,
+            stream: "xg-harness-tools.plan",
+            ts: Date.now(),
+            data: null,
+        };
+        await assert.doesNotReject(() => Promise.resolve(handle(event, FAKE_CTX)));
+        assert.equal(recorder.calls.length, 0);
+    });
+    it("rejects a payload that violates kind only — everything else (routing + copy fields) is valid (pins the guard)", async () => {
+        const recorder = new RecordingSendText();
+        const handle = createPlanEventHandler({ sendText: recorder.sendText });
+        const event = {
+            runId: "run-1",
+            seq: 1,
+            stream: "xg-harness-tools.plan",
+            ts: Date.now(),
+            data: makeBlockedPayload({
+                kind: "some_other_plugin_event", // 唯一的不合法项
+                deliveryContext: { to: "group-1" },
+            }),
+        };
+        await assert.doesNotReject(() => Promise.resolve(handle(event, FAKE_CTX)));
+        assert.equal(recorder.calls.length, 0);
+    });
+    it("rejects a payload with a malformed summary — everything else is valid", async () => {
+        const recorder = new RecordingSendText();
+        const handle = createPlanEventHandler({ sendText: recorder.sendText });
+        const event = {
+            runId: "run-1",
+            seq: 1,
+            stream: "xg-harness-tools.plan",
+            ts: Date.now(),
+            data: makeBlockedPayload({
+                summary: {},
+                deliveryContext: { to: "group-1" },
+            }),
+        };
+        await assert.doesNotReject(() => Promise.resolve(handle(event, FAKE_CTX)));
+        assert.equal(recorder.calls.length, 0);
+    });
+});
+describe("createPlanEventHandler: 路由字段取自 event.data 而非顶层", () => {
+    it("uses deliveryContext.to from event.data, ignoring a same-shaped decoy on the top-level event", async () => {
+        const recorder = new RecordingSendText();
+        const handle = createPlanEventHandler({ sendText: recorder.sendText });
+        const event = {
+            runId: "run-1",
+            seq: 1,
+            stream: "xg-harness-tools.plan",
+            ts: Date.now(),
+            sessionKey: "decoy-top-level-session-key",
+            // 顶层伪造一个同名但不存在于真实 AgentEventPayload 上的字段，确认代码不会误取
+            deliveryContext: { to: "decoy-top-level-group" },
+            data: makeBlockedPayload({ deliveryContext: { to: "real-group-from-data" } }),
+        };
+        await handle(event, FAKE_CTX);
+        assert.equal(recorder.calls.length, 1);
+        assert.equal(recorder.calls[0].groupId, "real-group-from-data");
+    });
+});
+describe("createPlanEventHandler: blocked payload 推送", () => {
+    it("assembles the spec §1.3 copy and calls sendText", async () => {
+        const recorder = new RecordingSendText();
+        const handle = createPlanEventHandler({ sendText: recorder.sendText });
+        const event = {
+            runId: "run-1",
+            seq: 1,
+            stream: "xg-harness-tools.plan",
+            ts: Date.now(),
+            data: makeBlockedPayload({
+                deliveryContext: { to: "group-1" },
+                goal: "迁移配置到新版本",
+                taskTitle: "备份旧配置",
+                blockedNote: "缺少权限",
+            }),
+        };
+        await handle(event, FAKE_CTX);
+        assert.equal(recorder.calls.length, 1);
+        assert.equal(recorder.calls[0].groupId, "group-1");
+        assert.equal(recorder.calls[0].content, "计划「迁移配置到新版本」卡在任务「备份旧配置」：缺少权限\n需要人工介入才能继续。");
+    });
+    it("does not push for non-blocked task status", async () => {
+        const recorder = new RecordingSendText();
+        const handle = createPlanEventHandler({ sendText: recorder.sendText });
+        const event = {
+            runId: "run-1",
+            seq: 1,
+            stream: "xg-harness-tools.plan",
+            ts: Date.now(),
+            data: makeBlockedPayload({
+                deliveryContext: { to: "group-1" },
+                taskStatus: "completed",
+                blockedNote: undefined,
+            }),
+        };
+        await handle(event, FAKE_CTX);
+        assert.equal(recorder.calls.length, 0);
+    });
+    it("does not push when no delivery target can be resolved", async () => {
+        const recorder = new RecordingSendText();
+        const handle = createPlanEventHandler({ sendText: recorder.sendText });
+        const event = {
+            runId: "run-1",
+            seq: 1,
+            stream: "xg-harness-tools.plan",
+            ts: Date.now(),
+            data: makeBlockedPayload(), // 无 deliveryContext/agentAccountId/messageChannel/sessionKey
+        };
+        await handle(event, FAKE_CTX);
+        assert.equal(recorder.calls.length, 0);
+    });
+    it("does not push when taskStatus is not blocked, even if blockedNote still carries a stale value (pins the taskStatus check)", async () => {
+        const recorder = new RecordingSendText();
+        const handle = createPlanEventHandler({ sendText: recorder.sendText });
+        const event = {
+            runId: "run-1",
+            seq: 1,
+            stream: "xg-harness-tools.plan",
+            ts: Date.now(),
+            data: makeBlockedPayload({
+                deliveryContext: { to: "group-1" },
+                taskStatus: "completed",
+                blockedNote: "缺少权限", // 上游残留的旧阻塞原因，taskStatus 已不再是 blocked
+            }),
+        };
+        await handle(event, FAKE_CTX);
+        assert.equal(recorder.calls.length, 0);
+    });
+    it("does not push when deliveryContext.to is an empty string, everything else valid (pins the empty-string check)", async () => {
+        const recorder = new RecordingSendText();
+        const handle = createPlanEventHandler({ sendText: recorder.sendText });
+        const event = {
+            runId: "run-1",
+            seq: 1,
+            stream: "xg-harness-tools.plan",
+            ts: Date.now(),
+            data: makeBlockedPayload({
+                deliveryContext: { to: "" },
+            }),
+        };
+        await handle(event, FAKE_CTX);
+        assert.equal(recorder.calls.length, 0);
+    });
+    it("does not push when deliveryContext.to is not a string", async () => {
+        const recorder = new RecordingSendText();
+        const handle = createPlanEventHandler({ sendText: recorder.sendText });
+        const event = {
+            runId: "run-1",
+            seq: 1,
+            stream: "xg-harness-tools.plan",
+            ts: Date.now(),
+            data: makeBlockedPayload({
+                deliveryContext: { to: 123 },
+            }),
+        };
+        await handle(event, FAKE_CTX);
+        assert.equal(recorder.calls.length, 0);
+    });
+    it("does not push when deliveryContext itself is not an object", async () => {
+        const recorder = new RecordingSendText();
+        const handle = createPlanEventHandler({ sendText: recorder.sendText });
+        const event = {
+            runId: "run-1",
+            seq: 1,
+            stream: "xg-harness-tools.plan",
+            ts: Date.now(),
+            data: makeBlockedPayload({
+                deliveryContext: "not-an-object",
+            }),
+        };
+        await handle(event, FAKE_CTX);
+        assert.equal(recorder.calls.length, 0);
+    });
+    it("does not push when blockedNote is whitespace-only, everything else valid (pins the trim/blank check)", async () => {
+        const recorder = new RecordingSendText();
+        const handle = createPlanEventHandler({ sendText: recorder.sendText });
+        const event = {
+            runId: "run-1",
+            seq: 1,
+            stream: "xg-harness-tools.plan",
+            ts: Date.now(),
+            data: makeBlockedPayload({
+                deliveryContext: { to: "group-1" },
+                blockedNote: "   ",
+            }),
+        };
+        await handle(event, FAKE_CTX);
+        assert.equal(recorder.calls.length, 0);
+    });
+});
+describe("createPlanEventHandler: handle 内部出错不外泄", () => {
+    it("resolves normally even when sendText rejects", async () => {
+        const recorder = new RecordingSendText();
+        recorder.impl = async () => {
+            throw new Error("boom");
+        };
+        const handle = createPlanEventHandler({ sendText: recorder.sendText });
+        const event = {
+            runId: "run-1",
+            seq: 1,
+            stream: "xg-harness-tools.plan",
+            ts: Date.now(),
+            data: makeBlockedPayload({ deliveryContext: { to: "group-1" } }),
+        };
+        await assert.doesNotReject(() => Promise.resolve(handle(event, FAKE_CTX)));
+    });
+});
+//# sourceMappingURL=plan-event-subscription.test.js.map

package/dist/src/plan-event-subscription.test.js.map

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

package/dist/src/plan-session-registry.d.ts

@@ -0,0 +1,24 @@
+import type { BlockedTaskNotice } from "./plan-blocked-notice.js";
+export interface ToolCallTarget {
+    groupId: string;
+    token: string;
+    sessionKey?: string;
+}
+/** 测试用：替换时间源，避免测 TTL 时 sleep。 */
+export declare function setNowFnForTest(fn: () => number): void;
+export declare function registerToolCallTarget(toolCallId: string, target: ToolCallTarget): void;
+/** 取出并删除（一次性消费）。未命中返回 undefined。 */
+export declare function takeToolCallTarget(toolCallId: string): ToolCallTarget | undefined;
+/**
+ * 传入本次扫描出的全部 notice，返回其中「需要推送的新增项」，并同步更新集合。
+ *
+ * 语义（按 DESIGN.md D2）：
+ * - 新增 = 本次 keys − 已推送 keys → 返回它们
+ * - 清理 = 已推送集中「本次已不在」的 key → 移除（让 blocked→修复→再 blocked 能重新推）
+ * - 已推送集 = 已推送 ∪ 新增
+ * - 按 planId 分桶
+ */
+export declare function diffAndMarkBlockedNotices(planId: string, notices: readonly BlockedTaskNotice[]): BlockedTaskNotice[];
+/** 测试用：重置模块级缓存与 stateDir */
+export declare function resetPlanSessionRegistryForTest(): void;
+//# sourceMappingURL=plan-session-registry.d.ts.map

package/dist/src/plan-session-registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plan-session-registry.d.ts","sourceRoot":"","sources":["../../src/plan-session-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,MAAM,WAAW,cAAc;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAeD,iCAAiC;AACjC,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,MAAM,GAAG,IAAI,CAEtD;AA0BD,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,IAAI,CAMvF;AAED,oCAAoC;AACpC,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAUjF;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACrC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,SAAS,iBAAiB,EAAE,GACtC,iBAAiB,EAAE,CAsBrB;AAED,4BAA4B;AAC5B,wBAAgB,+BAA+B,IAAI,IAAI,CAItD"}

package/dist/src/plan-session-registry.js

@@ -0,0 +1,84 @@
+/** toolCallId → 投递目标表的 TTL：超过这个时长未被消费的登记视为过期。 */
+const TOOL_CALL_TARGET_TTL_MS = 10 * 60 * 1000;
+/** toolCallId → 投递目标表的容量上限：超出时逐出最旧的条目（插入序）。 */
+const TOOL_CALL_TARGET_CAPACITY = 500;
+let nowFn = () => Date.now();
+/** 测试用：替换时间源，避免测 TTL 时 sleep。 */
+export function setNowFnForTest(fn) {
+    nowFn = fn;
+}
+const toolCallTargets = new Map();
+/** planId → 已推送 blocked notice key 集合 */
+const blockedNotifiedKeys = new Map();
+function evictExpiredToolCallTargets() {
+    const now = nowFn();
+    for (const [toolCallId, entry] of toolCallTargets) {
+        if (now - entry.registeredAt > TOOL_CALL_TARGET_TTL_MS) {
+            toolCallTargets.delete(toolCallId);
+        }
+    }
+}
+function evictOldestToolCallTargetsOverCapacity() {
+    while (toolCallTargets.size > TOOL_CALL_TARGET_CAPACITY) {
+        const oldestKey = toolCallTargets.keys().next().value;
+        if (oldestKey === undefined) {
+            break;
+        }
+        toolCallTargets.delete(oldestKey);
+    }
+}
+export function registerToolCallTarget(toolCallId, target) {
+    evictExpiredToolCallTargets();
+    // 重新登记同一 id 应刷新插入序（视为新条目），先删再插
+    toolCallTargets.delete(toolCallId);
+    toolCallTargets.set(toolCallId, { target, registeredAt: nowFn() });
+    evictOldestToolCallTargetsOverCapacity();
+}
+/** 取出并删除（一次性消费）。未命中返回 undefined。 */
+export function takeToolCallTarget(toolCallId) {
+    const entry = toolCallTargets.get(toolCallId);
+    if (!entry) {
+        return undefined;
+    }
+    toolCallTargets.delete(toolCallId);
+    if (nowFn() - entry.registeredAt > TOOL_CALL_TARGET_TTL_MS) {
+        return undefined;
+    }
+    return entry.target;
+}
+/**
+ * 传入本次扫描出的全部 notice，返回其中「需要推送的新增项」，并同步更新集合。
+ *
+ * 语义（按 DESIGN.md D2）：
+ * - 新增 = 本次 keys − 已推送 keys → 返回它们
+ * - 清理 = 已推送集中「本次已不在」的 key → 移除（让 blocked→修复→再 blocked 能重新推）
+ * - 已推送集 = 已推送 ∪ 新增
+ * - 按 planId 分桶
+ */
+export function diffAndMarkBlockedNotices(planId, notices) {
+    const notified = blockedNotifiedKeys.get(planId) ?? new Set();
+    const currentKeys = new Set(notices.map((n) => n.key));
+    const fresh = notices.filter((n) => !notified.has(n.key));
+    for (const key of notified) {
+        if (!currentKeys.has(key)) {
+            notified.delete(key);
+        }
+    }
+    for (const notice of fresh) {
+        notified.add(notice.key);
+    }
+    if (notified.size > 0) {
+        blockedNotifiedKeys.set(planId, notified);
+    }
+    else {
+        blockedNotifiedKeys.delete(planId);
+    }
+    return fresh;
+}
+/** 测试用：重置模块级缓存与 stateDir */
+export function resetPlanSessionRegistryForTest() {
+    toolCallTargets.clear();
+    blockedNotifiedKeys.clear();
+    nowFn = () => Date.now();
+}
+//# sourceMappingURL=plan-session-registry.js.map

package/dist/src/plan-session-registry.js.map

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

package/dist/src/plan-session-registry.test.d.ts

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

package/dist/src/plan-session-registry.test.d.ts.map

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

package/dist/src/plan-session-registry.test.js

@@ -0,0 +1,109 @@
+import assert from "node:assert/strict";
+import { beforeEach, describe, it } from "node:test";
+import { diffAndMarkBlockedNotices, registerToolCallTarget, resetPlanSessionRegistryForTest, setNowFnForTest, takeToolCallTarget, } from "./plan-session-registry.js";
+function makeTarget(overrides = {}) {
+    return {
+        groupId: "group-1",
+        token: "token-1",
+        ...overrides,
+    };
+}
+function makeNotice(overrides = {}) {
+    return {
+        key: "plan-1::0::缺少权限",
+        taskIndex: 0,
+        taskTitle: "备份旧配置",
+        note: "缺少权限",
+        content: "计划「X」卡在任务「备份旧配置」：缺少权限\n需要人工介入才能继续。",
+        ...overrides,
+    };
+}
+beforeEach(() => {
+    resetPlanSessionRegistryForTest();
+});
+describe("registerToolCallTarget / takeToolCallTarget", () => {
+    it("hits with the registered target and deletes it on consume (take twice → second undefined)", () => {
+        registerToolCallTarget("call-1", makeTarget());
+        const first = takeToolCallTarget("call-1");
+        assert.deepEqual(first, makeTarget());
+        const second = takeToolCallTarget("call-1");
+        assert.equal(second, undefined);
+    });
+    it("misses for an unregistered id", () => {
+        assert.equal(takeToolCallTarget("does-not-exist"), undefined);
+    });
+    it("expires entries past TTL (injected now, no sleep)", () => {
+        let t = 0;
+        setNowFnForTest(() => t);
+        registerToolCallTarget("call-ttl", makeTarget());
+        t = 10 * 60 * 1000 + 1; // TTL + 1ms
+        assert.equal(takeToolCallTarget("call-ttl"), undefined);
+    });
+    it("does not expire an entry read exactly at TTL boundary", () => {
+        let t = 0;
+        setNowFnForTest(() => t);
+        registerToolCallTarget("call-boundary", makeTarget());
+        t = 10 * 60 * 1000; // exactly TTL, not yet exceeded
+        assert.ok(takeToolCallTarget("call-boundary"));
+    });
+    it("evicts the oldest entry when capacity is exceeded", () => {
+        let t = 0;
+        setNowFnForTest(() => t);
+        for (let i = 0; i < 500; i++) {
+            t += 1;
+            registerToolCallTarget(`call-${i}`, makeTarget({ groupId: `g${i}` }));
+        }
+        // 表已满 500 条，call-0 是最旧的
+        t += 1;
+        registerToolCallTarget("call-500", makeTarget({ groupId: "g500" }));
+        assert.equal(takeToolCallTarget("call-0"), undefined, "oldest entry should have been evicted");
+        const kept = takeToolCallTarget("call-500");
+        assert.ok(kept);
+        assert.equal(kept.groupId, "g500");
+    });
+});
+describe("diffAndMarkBlockedNotices", () => {
+    it("returns all notices on first call", () => {
+        const notices = [makeNotice()];
+        const fresh = diffAndMarkBlockedNotices("plan-1", notices);
+        assert.deepEqual(fresh, notices);
+    });
+    it("returns empty on repeated identical call", () => {
+        const notices = [makeNotice()];
+        diffAndMarkBlockedNotices("plan-1", notices);
+        const second = diffAndMarkBlockedNotices("plan-1", notices);
+        assert.deepEqual(second, []);
+    });
+    it("treats a note change as a new notification (different key)", () => {
+        const first = [makeNotice({ key: "plan-1::0::缺少权限" })];
+        diffAndMarkBlockedNotices("plan-1", first);
+        const changed = [makeNotice({ key: "plan-1::0::权限问题已升级", note: "权限问题已升级" })];
+        const fresh = diffAndMarkBlockedNotices("plan-1", changed);
+        assert.deepEqual(fresh, changed);
+    });
+    it("clears a key once the task is no longer blocked, allowing re-notification later", () => {
+        const notice = makeNotice({ key: "plan-1::0::缺少权限" });
+        diffAndMarkBlockedNotices("plan-1", [notice]);
+        // task 修复：本次扫描不再含该 key
+        const clearedFresh = diffAndMarkBlockedNotices("plan-1", []);
+        assert.deepEqual(clearedFresh, []);
+        // 再次 blocked，同 key 应视为新增重新推送
+        const reblocked = diffAndMarkBlockedNotices("plan-1", [notice]);
+        assert.deepEqual(reblocked, [notice]);
+    });
+    it("keeps separate planIds independent", () => {
+        const noticeA = makeNotice({ key: "plan-a::0::原因A" });
+        const noticeB = makeNotice({ key: "plan-b::0::原因B" });
+        const freshA = diffAndMarkBlockedNotices("plan-a", [noticeA]);
+        const freshB = diffAndMarkBlockedNotices("plan-b", [noticeB]);
+        assert.deepEqual(freshA, [noticeA]);
+        assert.deepEqual(freshB, [noticeB]);
+        // plan-a 重复调用不应受 plan-b 影响，反之亦然
+        assert.deepEqual(diffAndMarkBlockedNotices("plan-a", [noticeA]), []);
+        assert.deepEqual(diffAndMarkBlockedNotices("plan-b", [noticeB]), []);
+    });
+    it("returns an empty array and does not throw when there are no notices", () => {
+        assert.deepEqual(diffAndMarkBlockedNotices("plan-empty", []), []);
+    });
+});
+//# sourceMappingURL=plan-session-registry.test.js.map