@zhushanwen/pi-session-manager 0.6.4 → 0.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-session-manager",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "Pi extension for agent-managed sessions — create, message, monitor, abort, archive, and delete child sessions via ctx.ui.select channel.",
   "type": "module",
   "main": "index.ts",
@@ -30,10 +30,10 @@
     "README.md"
   ],
   "dependencies": {
-    "@zhushanwen/extension-protocol": "0.26.0",
-    "@zhushanwen/pi-delivery-port": "0.3.1",
-    "@zhushanwen/pi-extension-logger": "0.6.2",
-    "@zhushanwen/pi-ext-guards": "0.5.0"
+    "@zhushanwen/extension-protocol": "0.27.0",
+    "@zhushanwen/pi-delivery-port": "0.4.0",
+    "@zhushanwen/pi-ext-guards": "0.5.1",
+    "@zhushanwen/pi-extension-logger": "0.6.2"
   },
   "devDependencies": {
     "@types/node": "^24.0.0",

package/src/__tests__/notify-delivery-discipline.test.ts

@@ -9,7 +9,8 @@
 //      旧实例后缓存引用的 deliver 静默 rejected，对半概率丢全部通知的 D3⑤ 同律）；
 //   通道 = managed-session-notify 外部通道（payload.customType，port 批组隔离恒
 //   逐条不合批）；槽空降级（port 缺席 → warn + false，STANDARDS §11.1）；port
-//   rejected（persist-failed）→ warn + false（幂等键未登记，watch 重试合法）。
+//   rejected（persist-failed）→ warn + 立即单次重提（D8①：deliver 被调恰 2），重提
+//   仍 rejected 才 false（幂等键未登记，恢复 = 对账边沿，见下方两用例）。
 
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { createLoggerModuleMock, getLoggerMock } from "./helpers/logger-mock.ts";
@@ -38,8 +39,19 @@ type DeliverCall = {
 	collectKey: string[] | undefined;
 };
 
-function plantPort(behavior: "accept" | "reject" = "accept"): Array<DeliverCall> {
+/**
+ * 桩行为脚本项：accept（受理）| reject（拒收）。序列按 deliver 调用序消费（耗尽
+ * 后循环末项）——「首投 rejected、重提 accepted」的 disposed 窗口重绑恢复形态用
+ * ["reject", "accept"] 表达。reject 行为不进 calls（calls 只收受理）——重提单次
+ * 形态的计数经「deliver 被调次数」断言（attempt 封装在桩内，calls 长度 +
+ * rejected 次数还原总调次）。
+ */
+type DeliverStep = "accept" | "reject";
+
+function plantPort(behavior: DeliverStep | DeliverStep[] = "accept"): Array<DeliverCall> {
 	const calls: Array<DeliverCall> = [];
+	const script = Array.isArray(behavior) ? behavior : [behavior];
+	let attempt = 0;
 	Reflect.set(globalThis, PORT_SLOT_KEY, {
 		current: {
 			deliver: (
@@ -49,7 +61,9 @@ function plantPort(behavior: "accept" | "reject" = "accept"): Array<DeliverCall>
 				},
 				opts?: { collectKey?: string[] },
 			) => {
-				if (behavior === "reject") return { kind: "rejected", reason: "persist-failed (fake)" };
+				const step = script[Math.min(attempt, script.length - 1)]!;
+				attempt += 1;
+				if (step === "reject") return { kind: "rejected", reason: "persist-failed (fake)" };
 				calls.push({
 					id: envelope.id,
 					customType: envelope.payload.customType,
@@ -97,13 +111,34 @@ describe("recordManagedNotify 投递接入纪律（unified-delivery 波 2：port
 		expect(delivered[0]!.collectKey).toEqual(["sm-a", "sm-b"]);
 	});
 
-	it("port rejected（persist-failed）→ warn + false（幂等键未登记，watch 重试合法；不静默吞）", () => {
+	it("port rejected（persist-failed）→ 立即单次重提（D8①）：deliver 被调恰 2（原投 1 + 重提 1）、无第三次投递（RL10 单次形态同锁）、重提仍 rejected → false + warn 含对账恢复指引", () => {
 		plantPort("reject");
 		expect(recordManagedNotify("sm-rej", "content", makeDetails("sm-rej"), ["sm-rej"])).toBe(false);
 		expect(loggerMock.warn).toHaveBeenCalledWith(
 			expect.stringContaining("delivery port rejected notification"),
 			expect.objectContaining({ notifyId: "sm-rej" }),
 		);
+		// RL10：重提仍 rejected 即停（无重试循环无定时器）——warn 文案含单次语义与
+		// 对账边沿恢复指引（RL11 同族：持久成因不静默重试）
+		expect(loggerMock.warn).toHaveBeenCalledWith(
+			expect.stringContaining("notify retry rejected after the single re-acquire attempt"),
+			expect.objectContaining({ notifyId: "sm-rej" }),
+		);
+	});
+
+	it("rejected 后单次重提 accepted（disposed 窗口重绑恢复形态）→ true：重提原 envelope（同幂等键同 collectKey 申报）受理即恢复", () => {
+		const delivered = plantPort(["reject", "accept"]);
+		expect(recordManagedNotify("sm-retry", "hello", makeDetails("sm-retry"), ["sm-retry"])).toBe(true);
+		// 原投 rejected（不进 calls）+ 重提 accepted（进 calls）= 恰 1 条受理
+		expect(delivered).toHaveLength(1);
+		expect(delivered[0]!.id).toBe("sm-retry");
+		expect(delivered[0]!.content).toBe("hello");
+		expect(delivered[0]!.collectKey).toEqual(["sm-retry"]);
+		// 无第三次投递（重提受理即收尾——RL10 的收尾语义）
+		expect(loggerMock.warn).not.toHaveBeenCalledWith(
+			expect.stringContaining("retry rejected"),
+			expect.anything(),
+		);
 	});
 
 	it("投递异常（port.deliver 抛错）→ warn 留痕不外抛（不拖垮 watch 应答编排，unregister 照常）", () => {
@@ -122,4 +157,23 @@ describe("recordManagedNotify 投递接入纪律（unified-delivery 波 2：port
 			expect.objectContaining({ notifyId: "sm-throw-2" }),
 		);
 	});
+
+	it("rejected 后重取缺席（重提前槽被 dispose）→ 即停转对账兜底 + warn（重提路径第二停止位，不扩直发降级）", () => {
+		Reflect.set(globalThis, PORT_SLOT_KEY, {
+			current: {
+				deliver: () => {
+					// 模拟转换窗竞态：主投 rejected 后旧实例被 dispose（槽摘除——
+					// 重提的 getDeliveryPort() 将取到 undefined）
+					Reflect.deleteProperty(globalThis, PORT_SLOT_KEY);
+					return { kind: "rejected", reason: "persist-failed (fake)" };
+				},
+				flush: () => {},
+			},
+		});
+		expect(recordManagedNotify("sm-absent", "content", makeDetails("sm-absent"), ["sm-absent"])).toBe(false);
+		expect(loggerMock.warn).toHaveBeenCalledWith(
+			expect.stringContaining("delivery port absent on re-acquire"),
+			expect.objectContaining({ notifyId: "sm-absent" }),
+		);
+	});
 });

package/src/__tests__/notify-reconcile-resume-edge.test.ts

@@ -0,0 +1,95 @@
+// notify-reconcile-resume-edge.test.ts —— session-manager 域切回边沿订阅装配锁
+// （completion-signal-delivery D8② 三入口同构的切回补强边沿，U2 修复回归）：
+// extension load 装配期经 pi-delivery-port 进程级注册槽订阅切回派发——漏挂 =
+// 「进程存活 + rejected + 用户切走再切回」场景补投不触发的缺陷形态（入口①②
+// 在该场景不可达：切回不重发 session_start、无新回合则 agent_settled 不达）。
+//
+// 观察点：mock ./notify-reconcile.ts 的 runNotifyReconcileMaintenance（编排本体
+// 行为在 notify-reconcile.test.ts 直测权威，本文件只锁装配接线面）——default
+// export 执行后 dispatchResumeReconcile（真实槽）应驱动本域闭包以 reason="resume"
+// 调编排，且 deps 的 entries / sessionFile 从派发 ctx 现读。
+
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const { reconcileMock } = vi.hoisted(() => ({
+	reconcileMock: vi.fn(() => ({
+		scanned: 0,
+		candidates: 0,
+		redelivered: [],
+		skippedDelivered: [],
+		skippedJournaled: [],
+	})),
+}));
+
+vi.mock("../notify-reconcile.ts", async (importOriginal) => {
+	const actual = await importOriginal<typeof import("../notify-reconcile.ts")>();
+	return { ...actual, runNotifyReconcileMaintenance: reconcileMock };
+});
+
+import {
+	_resetResumeReconcileForTest,
+	dispatchResumeReconcile,
+	type ResumeReconcileContext,
+} from "@zhushanwen/pi-delivery-port";
+
+import registerExtension from "../index.ts";
+
+function makeMockPi() {
+	return {
+		registerTool: vi.fn(),
+		on: vi.fn(),
+		appendEntry: vi.fn(),
+	} as never;
+}
+
+function makeEdgeCtx(): ResumeReconcileContext {
+	return {
+		sessionManager: {
+			getEntries: () => [{ customType: "pending:register", data: { id: "sm-r1", type: "session", name: "worker" } }],
+			getSessionFile: () => "/sessions/edge.jsonl",
+			getSessionId: () => "sess-edge",
+		},
+	};
+}
+
+beforeEach(() => {
+	_resetResumeReconcileForTest();
+	reconcileMock.mockClear();
+});
+
+afterEach(() => {
+	_resetResumeReconcileForTest();
+});
+
+describe("session-manager 域切回边沿订阅（D8② 入口③，U2 修复）", () => {
+	it("extension load 后切回派发 → 本域对账闭包以 reason=resume 调编排，deps 从派发 ctx 现读", () => {
+		registerExtension(makeMockPi());
+		const ctx = makeEdgeCtx();
+
+		const failures = dispatchResumeReconcile(ctx);
+
+		expect(failures).toEqual([]);
+		expect(reconcileMock).toHaveBeenCalledTimes(1);
+		const deps = reconcileMock.mock.calls[0][0] as {
+			reason: string;
+			entries: readonly unknown[];
+			sessionFile: string | undefined;
+		};
+		expect(deps.reason).toBe("resume");
+		expect(deps.entries).toEqual(ctx.sessionManager.getEntries());
+		expect(deps.sessionFile).toBe("/sessions/edge.jsonl");
+	});
+
+	it("重复 load（同进程 session 替换形态）覆盖旧订阅：派发只打新闭包一次（无死 handler 双派发）", () => {
+		registerExtension(makeMockPi());
+		registerExtension(makeMockPi());
+
+		expect(dispatchResumeReconcile(makeEdgeCtx())).toEqual([]);
+		expect(reconcileMock).toHaveBeenCalledTimes(1);
+	});
+
+	it("未 load 本扩展时空槽派发零调用（扩展禁用形态，缺席语义非错误）", () => {
+		expect(dispatchResumeReconcile(makeEdgeCtx())).toEqual([]);
+		expect(reconcileMock).not.toHaveBeenCalled();
+	});
+});