@zhushanwen/pi-goal 0.14.15 → 0.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-goal",
-  "version": "0.14.15",
+  "version": "0.15.0",
   "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",
@@ -29,7 +29,7 @@
     "@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.6"
+    "@zhushanwen/pi-pending-notifications": "0.9.0"
   },
   "dependencies": {
     "@zhushanwen/extension-protocol": "0.21.0",

package/src/__tests__/goal-control-summary.test.ts

@@ -0,0 +1,200 @@
+/**
+ * goal_control 收起态摘要测试：buildGoalControlSummary 三分支文案 + execute 补齐
+ * details.summary + renderResult 折叠/展开/旧形态回退。
+ *
+ * mock 形态对齐 goal-control-rpc.test.ts（捕获 registerTool 后直接调 execute/renderResult）。
+ */
+import type { ExtensionAPI, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
+import { describe, expect, it, vi } from "vitest";
+
+import {
+	buildGoalControlSummary,
+	registerGoalControlTool,
+	type GoalControlDetails,
+} from "../adapters/goal-control-adapter";
+import { createGoalSession } from "../session";
+
+// ── mock：logger + updateWidget（与 rpc 测试同款 no-op）──
+vi.mock("@zhushanwen/pi-extension-logger", () => ({
+	getLogger: () => ({ warn: vi.fn(), debug: vi.fn(), error: vi.fn() }),
+}));
+vi.mock("../projection/widget", () => ({ updateWidget: vi.fn() }));
+
+// ── buildGoalControlSummary ──────────────────────────
+
+describe("buildGoalControlSummary", () => {
+	it("create → Goal created: <slug>", () => {
+		const details = { action: "create", goalId: "g1", status: "active", slug: "refactor-auth" } as GoalControlDetails;
+		expect(buildGoalControlSummary({ action: "create" } as never, details)).toBe(
+			"Goal created: refactor-auth",
+		);
+	});
+
+	it("create 无 slug → 省略后缀", () => {
+		const details = { action: "create", goalId: "g1", status: "active" } as GoalControlDetails;
+		expect(buildGoalControlSummary({ action: "create" } as never, details)).toBe("Goal created");
+	});
+
+	it("complete → Goal completed: <goalId>（complete 的 details 无 slug）", () => {
+		const details = { action: "complete", goalId: "abc123", status: "complete" } as GoalControlDetails;
+		expect(buildGoalControlSummary({ action: "complete" } as never, details)).toBe(
+			"Goal completed: abc123",
+		);
+	});
+
+	it("report_blocked → Blocked: <reason 首 40 字>（超长加省略号）", () => {
+		const details = { action: "report_blocked", goalId: "g1", status: "blocked" } as GoalControlDetails;
+		const params = { action: "report_blocked", reason: "等待上游 API 修复" } as never;
+		expect(buildGoalControlSummary(params, details)).toBe("Blocked: 等待上游 API 修复");
+
+		const long = "x".repeat(50);
+		expect(buildGoalControlSummary({ action: "report_blocked", reason: long } as never, details)).toBe(
+			`Blocked: ${"x".repeat(40)}…`,
+		);
+	});
+
+	it("report_blocked 无 reason → 省略后缀", () => {
+		const details = { action: "report_blocked", goalId: "g1", status: "blocked" } as GoalControlDetails;
+		expect(buildGoalControlSummary({ action: "report_blocked" } as never, details)).toBe("Blocked");
+	});
+});
+
+// ── execute 补齐 details.summary + renderResult ──────
+
+interface CapturedTool {
+	name: string;
+	execute: (
+		toolCallId: string,
+		params: Record<string, unknown>,
+		signal: AbortSignal | undefined,
+		onUpdate: unknown,
+		ctx: ExtensionContext,
+	) => Promise<{ content: Array<{ type: "text"; text: string }>; details: GoalControlDetails }>;
+	renderResult: (result: unknown, options: { expanded: boolean }, theme: Theme) => { content: unknown };
+}
+
+function captureTool(): CapturedTool {
+	let captured: CapturedTool | undefined;
+	const pi = {
+		registerTool(tool: CapturedTool): void {
+			captured = tool;
+		},
+		on: () => {},
+		appendEntry: () => {},
+		notify: () => {},
+	} as unknown as ExtensionAPI;
+	registerGoalControlTool(pi, createGoalSession());
+	if (!captured) throw new Error("registerGoalControlTool did not register a tool");
+	return captured;
+}
+
+const ctx = {
+	mode: "rpc",
+	hasUI: true,
+	ui: {
+		theme: { fg: (_c: string, t: string) => t, bold: (t: string) => t },
+		setWidget: () => {},
+		setStatus: () => {},
+		notify: () => {},
+	},
+	sessionManager: { getEntries: () => [] },
+} as unknown as ExtensionContext;
+
+describe("goal_control execute details.summary", () => {
+	it("create → details 带现有字段 + summary", async () => {
+		const tool = captureTool();
+		const res = await tool.execute(
+			"id",
+			{
+				action: "create",
+				slug: "refactor-auth",
+				objective: "refactor the auth module",
+				successCriteria: ["tests pass"],
+			},
+			undefined,
+			undefined,
+			ctx,
+		);
+		expect(res.details).toMatchObject({
+			action: "create",
+			status: "active",
+			slug: "refactor-auth",
+			summary: "Goal created: refactor-auth",
+		});
+	});
+
+	it("report_blocked → details.summary 带 reason 首段", async () => {
+		const tool = captureTool();
+		const create = await tool.execute(
+			"id",
+			{ action: "create", slug: "g", objective: "obj", successCriteria: ["c"] },
+			undefined,
+			undefined,
+			ctx,
+		);
+		void create;
+		const res = await tool.execute(
+			"id",
+			{ action: "report_blocked", reason: "blocked by missing credentials" },
+			undefined,
+			undefined,
+			ctx,
+		);
+		expect(res.details).toMatchObject({
+			action: "report_blocked",
+			status: "blocked",
+			summary: "Blocked: blocked by missing credentials",
+		});
+	});
+});
+
+// ── renderResult 分态 ────────────────────────────────
+
+const mockTheme = {
+	fg: (_color: string, text: string) => text,
+	bg: (_color: string, text: string) => text,
+	bold: (text: string) => text,
+	italic: (text: string) => text,
+	underline: (text: string) => text,
+	inverse: (text: string) => text,
+	strikethrough: (text: string) => text,
+	getFgAnsi: (_color: string) => "",
+	getBgAnsi: (_color: string) => "",
+	getColorMode: () => "truecolor" as const,
+	getThinkingBorderColor: () => (text: string) => text,
+	getBashModeBorderColor: () => (text: string) => text,
+} as unknown as Theme;
+
+describe("goal_control renderResult", () => {
+	const tool = captureTool();
+
+	it("折叠态 → details.summary 一行（dim）", () => {
+		const result = {
+			content: [{ type: "text", text: "Goal created.\nGoal ID: g1" }],
+			details: { action: "create", goalId: "g1", status: "active", slug: "refactor-auth", summary: "Goal created: refactor-auth" },
+		};
+		expect(tool.renderResult(result, { expanded: false }, mockTheme).content).toBe(
+			"Goal created: refactor-auth",
+		);
+	});
+
+	it("展开态 → content 纯文本（多行）", () => {
+		const result = {
+			content: [{ type: "text", text: "Goal created.\nGoal ID: g1" }],
+			details: { action: "create", goalId: "g1", status: "active", slug: "refactor-auth", summary: "Goal created: refactor-auth" },
+		};
+		expect(tool.renderResult(result, { expanded: true }, mockTheme).content).toBe(
+			"Goal created.\nGoal ID: g1",
+		);
+	});
+
+	it("旧 entry 无 summary → 折叠态回退 ◆ 状态行", () => {
+		const result = {
+			content: [{ type: "text", text: "Goal created." }],
+			details: { action: "complete", goalId: "g1", status: "complete" },
+		};
+		expect(tool.renderResult(result, { expanded: false }, mockTheme).content).toBe(
+			"◆ Goal Completed",
+		);
+	});
+});

package/src/adapters/goal-control-adapter.ts

@@ -33,6 +33,7 @@
 
 import type { ExtensionAPI, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
+import { firstContentText } from "@zhushanwen/extension-protocol";
 import { getLogger } from "@zhushanwen/pi-extension-logger";
 import { type Static, Type } from "typebox";
 
@@ -140,6 +141,35 @@ export interface GoalControlDetails {
 	goalId: string;
 	status: GoalStatus;
 	slug?: string;
+	/** 收起态一行摘要（buildGoalControlSummary 产出；handler 返回后由 execute 统一补齐，
+	 *  历史 entry 无此字段——GUI 收起态与 TUI 折叠态共用）。 */
+	summary?: string;
+}
+
+/** 收起态摘要中 reason 的保留长度（超长截断加省略号）。 */
+const BLOCKED_REASON_SUMMARY_CHARS = 40;
+
+/** 收起态一行摘要：create → slug；complete → goalId（complete 的 details 无 slug）；
+ *  report_blocked → reason 首段（超长加省略号）。 */
+export function buildGoalControlSummary(
+	params: GoalControlParamsT,
+	details: GoalControlDetails,
+): string {
+	switch (details.action) {
+		case "create":
+			return details.slug ? `Goal created: ${details.slug}` : "Goal created";
+		case "complete":
+			return `Goal completed: ${details.goalId}`;
+		case "report_blocked": {
+			const reason = params.reason?.trim() ?? "";
+			if (reason === "") return "Blocked";
+			return reason.length > BLOCKED_REASON_SUMMARY_CHARS
+				? `Blocked: ${reason.slice(0, BLOCKED_REASON_SUMMARY_CHARS)}…`
+				: `Blocked: ${reason}`;
+		}
+		default:
+			return "Done";
+	}
 }
 
 // ── 业务 handler（契约对齐 §3，可测：fake ports）──────
@@ -385,6 +415,8 @@ export function registerGoalControlTool(pi: ExtensionAPI, session: GoalSession):
 			} else {
 				details = handleReportBlocked(params, session, ports);
 			}
+			// 收起态一行摘要：details 追加 summary（现有字段保留），GUI 收起态与 TUI 折叠态共用
+			details = { ...details, summary: buildGoalControlSummary(params, details) };
 
 			// 扁平化后 params.objective/reason 为 string|undefined（schema 不再按 action 收窄）；
 			// handler 已对必填字段做存在性校验，此处用 ?. 兜底，未定义时空串
@@ -423,20 +455,47 @@ export function registerGoalControlTool(pi: ExtensionAPI, session: GoalSession):
 			return new Text(theme.fg("toolTitle", theme.bold("goal_control ")) + actionLabel, 0, 0);
 		},
 
-		renderResult(result: unknown, _options: { expanded: boolean }, theme: Theme): Text {
+		renderResult(result: unknown, options: { expanded: boolean }, theme: Theme): Text {
 			const d = hasGoalDetails(result) ? result.details : undefined;
-			if (!d) return new Text(theme.fg("dim", "goal_control"), 0, 0);
-			const statusColor =
-				d.status === "active"
-					? "accent"
-					: d.status === "complete"
-						? "success"
-						: d.status === "blocked"
-							? "error"
-							: "muted";
-			const label = d.action === "create" ? "Created" : d.action === "complete" ? "Completed" : "Blocked";
-			const slugSuffix = d.slug ? theme.fg("dim", ` ${d.slug}`) : "";
-			return new Text(theme.fg(statusColor, `◆ Goal ${label}`) + slugSuffix, 0, 0);
+			// 展开态 = content 纯文本（多行详情）；content 缺失时回退折叠形态
+			if (options.expanded) {
+				const content = getContentText(result);
+				if (content !== "") return new Text(content, 0, 0);
+			}
+			// 折叠态 = details.summary 一行（dim）；旧 entry 无 summary 时保留原 ◆ 状态行
+			if (d?.summary !== undefined) {
+				return new Text(theme.fg("dim", d.summary), 0, 0);
+			}
+			return renderLegacyGoalResult(d, theme);
 		},
 	});
 }
+
+/** unknown 值按字段名安全取值（index-signature 收窄，替代全可选结构断言）。 */
+function fieldValue(v: unknown, key: string): unknown {
+	if (typeof v !== "object" || v === null) return undefined;
+	return (v as Record<string, unknown>)[key];
+}
+
+/** content[0] 的 text 纯文本（content 缺失或非 text 类型时兜底空串）。 */
+function getContentText(result: unknown): string {
+	const content = fieldValue(result, "content");
+	if (!Array.isArray(content)) return "";
+	return firstContentText({ content });
+}
+
+/** 旧形态回退（details 无 summary 的历史 entry）：原 ◆ 状态行，视觉零变化。 */
+function renderLegacyGoalResult(d: GoalControlDetails | undefined, theme: Theme): Text {
+	if (!d) return new Text(theme.fg("dim", "goal_control"), 0, 0);
+	const statusColor =
+		d.status === "active"
+			? "accent"
+			: d.status === "complete"
+				? "success"
+				: d.status === "blocked"
+					? "error"
+					: "muted";
+	const label = d.action === "create" ? "Created" : d.action === "complete" ? "Completed" : "Blocked";
+	const slugSuffix = d.slug ? theme.fg("dim", ` ${d.slug}`) : "";
+	return new Text(theme.fg(statusColor, `◆ Goal ${label}`) + slugSuffix, 0, 0);
+}