@zhushanwen/pi-goal 0.14.10 → 0.14.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-goal",
-  "version": "0.14.10",
+  "version": "0.14.12",
   "description": "Codex-style /goal command for Pi — persistent goal-driven autonomous loop with evidence-based completion, token budget, agent-reported blocking, and steering templates.",
   "type": "module",
   "main": "src/index.ts",
@@ -25,15 +25,15 @@
     "index.ts"
   ],
   "peerDependencies": {
-    "@earendil-works/pi-ai": "^0.84.4",
-    "@earendil-works/pi-coding-agent": "^0.84.4",
-    "@earendil-works/pi-tui": "^0.84.4",
-    "typebox": "*",
-    "@zhushanwen/pi-pending-notifications": "0.8.1"
+    "@earendil-works/pi-ai": "^1.0.0",
+    "@earendil-works/pi-coding-agent": "^1.0.0",
+    "@earendil-works/pi-tui": "^1.0.0",
+    "typebox": "1.3.27",
+    "@zhushanwen/pi-pending-notifications": "0.8.3"
   },
   "dependencies": {
-    "@zhushanwen/extension-protocol": "0.17.0",
-    "@zhushanwen/pi-extension-logger": "0.6.1",
+    "@zhushanwen/extension-protocol": "0.19.0",
+    "@zhushanwen/pi-extension-logger": "0.6.2",
     "@zhushanwen/pi-session-path": "0.1.0"
   },
   "peerDependenciesMeta": {

package/src/__tests__/message-end.test.ts

@@ -0,0 +1,83 @@
+/**
+ * message_end handler 测试（D13① role 过滤 + FR-6.7 ESC 守卫）。
+ *
+ * 断言面：仅 user/assistant 的 message_end 进入 service 消费；system（pi 1.0
+ * 新形态）/ toolResult / 缺 role 在 handler 层显式拒绝；assistant 正常透传。
+ */
+
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+import { handleMessageEnd } from "../adapters/event-handlers/message-end";
+import { createGoalState } from "../engine/goal";
+import { applyEvent } from "../service";
+import { createGoalSession } from "../session";
+
+vi.mock("../service", async (importOriginal) => {
+	const actual = await importOriginal<typeof import("../service")>();
+	return { ...actual, applyEvent: vi.fn(actual.applyEvent) };
+});
+
+function makeSession(): ReturnType<typeof createGoalSession> {
+	const session = createGoalSession();
+	session.state = createGoalState("obj");
+	return session;
+}
+
+beforeEach(() => {
+	vi.mocked(applyEvent).mockClear();
+});
+
+function ctx(signalAborted = false): Parameters<typeof handleMessageEnd>[1] {
+	return { signal: { aborted: signalAborted } } as unknown as Parameters<typeof handleMessageEnd>[1];
+}
+
+function messageEndEvent(role: unknown): Parameters<typeof handleMessageEnd>[2] {
+	return { type: "message_end", message: { role } } as unknown as Parameters<typeof handleMessageEnd>[2];
+}
+
+describe("handleMessageEnd（D13① role 过滤）", () => {
+	it("assistant：透传 applyEvent（token 累加路径不受过滤影响）", async () => {
+		const session = makeSession();
+		const event = {
+			type: "message_end",
+			message: { role: "assistant", usage: { input: 100, output: 50, cacheRead: 20 } },
+		} as unknown as Parameters<typeof handleMessageEnd>[2];
+		await handleMessageEnd(session, ctx(), event);
+
+		// 加权口径同 service.test.ts：100×1 + 20×0.02 + 50×2 = 200.4
+		expect(session.state?.tokensUsed).toBe(200.4);
+	});
+
+	it("user：进入消费路径（applyEvent 被调；token 累加由 service 层 assistant-only 收窄）", async () => {
+		const session = makeSession();
+		const spy = vi.mocked(applyEvent);
+		await handleMessageEnd(session, ctx(), messageEndEvent("user"));
+
+		expect(spy).toHaveBeenCalledWith(session, "message_end", messageEndEvent("user"));
+	});
+
+	it("system（pi 1.0 新形态）：handler 层拒绝，不进 applyEvent", async () => {
+		const session = makeSession();
+		const spy = vi.mocked(applyEvent);
+		await handleMessageEnd(session, ctx(), messageEndEvent("system"));
+
+		expect(spy).not.toHaveBeenCalled();
+	});
+
+	it("toolResult / 缺 role：同样拒绝", async () => {
+		const session = makeSession();
+		const spy = vi.mocked(applyEvent);
+		await handleMessageEnd(session, ctx(), messageEndEvent("toolResult"));
+		await handleMessageEnd(session, ctx(), {} as Parameters<typeof handleMessageEnd>[2]);
+
+		expect(spy).not.toHaveBeenCalled();
+	});
+
+	it("ESC 守卫先于 role 过滤（aborted 直接返回）", async () => {
+		const session = makeSession();
+		const spy = vi.mocked(applyEvent);
+		await handleMessageEnd(session, ctx(true), messageEndEvent("assistant"));
+
+		expect(spy).not.toHaveBeenCalled();
+	});
+});

package/src/adapters/event-handlers/message-end.ts

@@ -4,6 +4,12 @@
  * FR-6.7 ESC 守卫：ctx.signal.aborted 时跳过 token 累加。
  * FR-8.6: token 累加算法（委托 service.applyEvent("message_end")）。
  *
+ * role 过滤（D13①，rename-session 先例同形态）：仅 user/assistant 的 message_end
+ * 进入消费——pi 1.0 起追加 system 消息（工具集变更高频写入）与嵌套形态，goal 的
+ * 事件消费是对话回合语义，系统/工具结果/扩展形态的 message_end 显式不消费。
+ * （token 累加在 service 层另有 assistant-only 收窄，本层过滤是消费关系显式化，
+ * 不依赖下游巧合兜住。）
+ *
  * 不 persist / updateWidget。
  */
 
@@ -12,6 +18,19 @@ import type { ExtensionContext, MessageEndEvent } from "@earendil-works/pi-codin
 import { applyEvent } from "../../service";
 import type { GoalSession } from "../../session";
 
+/**
+ * 畸形防御读取 message.role（D13①）：pi 事件经 JSON 解析，message 缺失 / 非对象 /
+ * 缺 role 的畸形形态不得崩 handler——一律按「非对话轴形态」拒绝（测试契约：
+ * toolResult / 缺 role / 缺 message 同走拒绝）。typeof + in 收窄替代 as 全可选
+ * 结构断言（后者任何对象都能通过，等于无校验）。
+ */
+function readMessageRole(event: MessageEndEvent): unknown {
+	const message: unknown = event.message;
+	if (typeof message !== "object" || message === null) return undefined;
+	if (!("role" in message)) return undefined;
+	return message.role;
+}
+
 export async function handleMessageEnd(
 	session: GoalSession,
 	ctx: ExtensionContext,
@@ -21,5 +40,9 @@ export async function handleMessageEnd(
 	// FR-6.7 ESC 守卫
 	if (ctx.signal?.aborted) return;
 
+	// D13① role 过滤：仅对话轴两形态（AgentMessage role 域为开放联合，宽比较）
+	const role = readMessageRole(event);
+	if (role !== "user" && role !== "assistant") return;
+
 	applyEvent(session, "message_end", event);
 }

package/src/index.ts

@@ -140,7 +140,7 @@ export default function goalExtension(pi: ExtensionAPI) {
 	 *
 	 * 通道形态（C-ext-06 globalThis slot 惯例）：裸函数直挂——plan 侧使用点以 typeof 守卫
 	 * 读取 `globalThis[Symbol.for("@zhushanwen/pi-goal.goalInit")]`（plan/src/compact.ts）。
-	 * 不挂 pi API 对象：pi 0.84.4 为每个扩展创建独立 ExtensionAPI，挂 pi 对象的字段
+	 * 不挂 pi API 对象：pi 为每个扩展创建独立 ExtensionAPI（1.0.0 复核同构），挂 pi 对象的字段
 	 * 跨扩展不可见。
 	 *
 	 * @param objective 目标描述