@zhushanwen/pi-pending-notifications 0.2.0 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-pending-notifications",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Cross-extension async operation registration/query mechanism for Pi — prevents message injection during long-running operations.",
   "type": "module",
   "main": "src/index.ts",
@@ -25,8 +25,8 @@
     "vitest": "^4.1.8"
   },
   "peerDependencies": {
-    "@mariozechner/pi-coding-agent": "*",
-    "@sinclair/typebox": "*"
+    "@earendil-works/pi-coding-agent": "*",
+    "typebox": "*"
   },
   "scripts": {
     "typecheck": "npx tsc --noEmit",

package/src/__tests__/pending-notifications.test.ts

@@ -11,7 +11,7 @@
 
 /* eslint-disable taste/no-unsafe-cast */
 
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import pendingNotificationsExtension from "../index";
@@ -37,6 +37,7 @@ interface MockSetup {
 	handlers: HandlerRegistry;
 	appendEntryMock: ReturnType<typeof vi.fn>;
 	registerToolMock: ReturnType<typeof vi.fn>;
+	sendMessageMock: ReturnType<typeof vi.fn>;
 }
 
 function createMockPi(): MockSetup {
@@ -67,7 +68,7 @@ function createMockPi(): MockSetup {
 		},
 	} as unknown as ExtensionAPI;
 
-	return { pi, handlers, appendEntryMock, registerToolMock };
+	return { pi, handlers, appendEntryMock, registerToolMock, sendMessageMock };
 }
 
 function createMockCtx(entries: MockSessionEntry[], sessionId = "sess-current"): ExtensionContext {
@@ -89,9 +90,15 @@ async function runTool(
 	params: Record<string, unknown>,
 ): Promise<{ content: Array<{ type: string; text: string }>; details: unknown }> {
 	const tool = setup.registerToolMock.mock.calls[0][0] as {
-		execute: (p: unknown) => Promise<{ content: Array<{ type: string; text: string }>; details: unknown }>;
+		execute: (
+			toolCallId: string,
+			p: unknown,
+			signal: AbortSignal | undefined,
+			onUpdate: unknown,
+			ctx: ExtensionContext,
+		) => Promise<{ content: Array<{ type: string; text: string }>; details: unknown }>;
 	};
-	return tool.execute(params);
+	return tool.execute("test-call-id", params, undefined, undefined, createMockCtx([]));
 }
 
 async function getCount(setup: MockSetup): Promise<number> {
@@ -375,6 +382,7 @@ describe("pendingNotificationsExtension factory", () => {
 		});
 	});
 
+
 	describe("safeAppendEntry error handling", () => {
 		it("appendEntry throwing (stale context) does not break register listener, registry still updated", async () => {
 			// listener 先 register(registry) 更新内存，再 safeAppendEntry；appendEntry 抛错被 catch，registry 仍已更新

package/src/index.ts

@@ -22,8 +22,8 @@
  * workflow 侧通过 deps.eventBus 注入 pi.events（同一总线）。
  */
 
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
-import { Type } from "@sinclair/typebox";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
 
 import {
 	createRegistry,
@@ -46,9 +46,12 @@ const PendingNotificationsParams = Type.Object({
 	]),
 });
 
-/** tool 入参形状 */
-interface ToolParams {
-	action: "count" | "list";
+/** pending_notifications 工具的 details 形状。两个分支共用同一结构（items 缺省时 undefined），
+ *  让 registerTool 泛型对 TDetails 推断一致，避免 union 细节冲突。 */
+interface PendingToolDetails {
+	action: string;
+	count: number;
+	items?: PendingEntry[];
 }
 
 /**
@@ -218,13 +221,12 @@ export default function pendingNotificationsExtension(pi: ExtensionAPI): void {
 		description:
 			"查询当前活跃的异步操作（workflow/subagent）。action=count 返回数量；action=list 返回列表。状态由 EventBus + session entries 维护，无需手动注册。",
 		parameters: PendingNotificationsParams,
-		execute: async (params: unknown) => {
-			const p = params as ToolParams;
+		execute: async (_toolCallId: string, params: { action: "count" | "list" }, _signal: AbortSignal | undefined, _onUpdate: unknown, _ctx: ExtensionContext): Promise<{ content: { type: "text"; text: string }[]; details: PendingToolDetails }> => {
 			const active = getActive(registry);
 
-			debugLog("debug", `tool ${p.action} requested`, { action: p.action, activeCount: active.length });
+			debugLog("debug", `tool ${params.action} requested`, { action: params.action, activeCount: active.length });
 
-			if (p.action === "count") {
+			if (params.action === "count") {
 				return {
 					content: [{ type: "text" as const, text: `${active.length} pending operation(s)` }],
 					details: { action: "count", count: active.length },
@@ -263,9 +265,13 @@ function parseRegisterEvent(data: unknown): ParsedRegister | null {
 interface ParsedUnregister {
 	id: string;
 	reason: string;
+	result?: string;
+	error?: string;
+	patchFile?: string;
 }
 
-/** 解析 pending:unregister 事件 data（容错缺失/类型错误字段） */
+/** 解析 pending:unregister 事件 data（容错缺失/类型错误字段）。
+ *  T2 后 subagent 完成路径携带可选的 result/error/patchFile，供消费侧 sendMessage。 */
 function parseUnregisterEvent(data: unknown): ParsedUnregister | null {
 	if (typeof data !== "object" || data === null) return null;
 	const d = data as Record<string, unknown>;
@@ -273,6 +279,9 @@ function parseUnregisterEvent(data: unknown): ParsedUnregister | null {
 	return {
 		id: d.id,
 		reason: typeof d.reason === "string" ? d.reason : "completed",
+		result: typeof d.result === "string" ? d.result : undefined,
+		error: typeof d.error === "string" ? d.error : undefined,
+		patchFile: typeof d.patchFile === "string" ? d.patchFile : undefined,
 	};
 }
 

package/src/state.ts

@@ -48,9 +48,14 @@ interface RegisterEntryData {
 	sessionId: unknown;
 }
 
-/** pending:unregister entry 在 entries 里的最小可识别形状 */
+/** pending:unregister entry 在 entries 里的最小可识别形状。
+ *  result/error/patchFile 为 subagent 完成通知携带的附加字段（T2 后由 pending-notifications
+ *  消费侧读取并 sendMessage 到 LLM）。workflow 的 unregister 不携带这些字段。 */
 interface UnregisterEntryData {
 	id: unknown;
+	result?: unknown;
+	error?: unknown;
+	patchFile?: unknown;
 }
 
 /** SessionEntry 的最小可识别形状（duck-typed，避免依赖 SDK 具体类型） */