@zhushanwen/pi-goal 0.5.1 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-goal",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "Codex-style /goal command for Pi — persistent goal-driven autonomous loop with evidence-based completion, token/time budgets, blocked detection, and steering templates.",
   "type": "module",
   "main": "src/index.ts",
@@ -24,8 +24,8 @@
   "peerDependencies": {
     "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-tui": "*",
-    "@mariozechner/pi-coding-agent": "*",
-    "@sinclair/typebox": "*"
+    "@earendil-works/pi-coding-agent": "*",
+    "typebox": "*"
   },
   "dependencies": {
     "@xyz-agent/extension-protocol": "^0.2.0"

package/src/__tests__/command-adapter.test.ts

@@ -9,7 +9,7 @@
  * 用 fake pi + fake ctx（不 import Pi SDK 真实实现）。
  * handleGoalCommand(pi, session, args, ctx) → Promise<void>。
  */
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { describe, expect, it } from "vitest";
 
 import { handleGoalCommand } from "../adapters/command-adapter";

package/src/__tests__/event-adapter.test.ts

@@ -9,7 +9,7 @@
  *
  * 用 fake pi + fake ctx（不 import Pi SDK）。handler 签名 (pi, session, ctx) → void/result。
  */
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { describe, expect, it, vi } from "vitest";
 
 import { handleAgentEnd } from "../adapters/event-handlers/agent-end";
@@ -343,8 +343,8 @@ describe("handleBeforeAgentStart", () => {
 		const { pi } = makeFakePi();
 		// 创建带 pending:register entries 的 ctx
 		const entries = [
-			{ customType: "pending:register", data: { id: "wf-1", type: "workflow", name: "test-wf" } },
-			{ customType: "pending:register", data: { id: "bg-1", type: "subagent", name: "worker" } },
+			{ type: "custom", customType: "pending:register", data: { id: "wf-1", type: "workflow", name: "test-wf" } },
+			{ type: "custom", customType: "pending:register", data: { id: "bg-1", type: "subagent", name: "worker" } },
 		];
 		const ctx = {
 			hasUI: true,
@@ -371,8 +371,8 @@ describe("handleBeforeAgentStart", () => {
 	it("有 pending register 但已 unregister → 不注入提示", async () => {
 		const { pi } = makeFakePi();
 		const entries = [
-			{ customType: "pending:register", data: { id: "wf-1", type: "workflow", name: "test-wf" } },
-			{ customType: "pending:unregister", data: { id: "wf-1" } },
+			{ type: "custom", customType: "pending:register", data: { id: "wf-1", type: "workflow", name: "test-wf" } },
+			{ type: "custom", customType: "pending:unregister", data: { id: "wf-1" } },
 		];
 		const ctx = {
 			hasUI: true,

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

@@ -15,7 +15,7 @@
  * 不 mock handleCreate：走真实 createGoal 让 session.state 含完整字段（slug/objective/budget），
  * 避免 hand-rolled state 与生产路径不一致。pi/ctx 用最小 fake（对齐 index.test.ts makeFactoryFixture）。
  */
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { describe, expect, it } from "vitest";
 
 import { registerGoalControlTool, type GoalControlDetails } from "../adapters/goal-control-adapter";

package/src/__tests__/index.test.ts

@@ -6,7 +6,7 @@
  *
  * 用最小 fake pi + fake ctx 实例化 goalExtension 工厂，再调 pi.__goalInit。
  */
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { describe, expect, it } from "vitest";
 
 import goalExtension from "../index";

package/src/adapters/command-adapter.ts

@@ -14,7 +14,7 @@
  * adapters 层可 import Pi 类型（桥接 Pi 和 service）。
  */
 
-import type { CustomEntry, ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { CustomEntry, ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 
 import { parseGoalArgs } from "../commands";
 import {
@@ -179,6 +179,8 @@ function handleResume(pi: ExtensionAPI, session: GoalSession, ctx: ExtensionCont
 interface GoalHistoryData {
 	goalId: string;
 	objective: string;
+	/** widget/history 标题用（fallback objective 截断）。旧 entry 无此字段。 */
+	slug?: string;
 	status: string;
 	completedTasks: number;
 	totalTasks: number;

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

@@ -18,7 +18,7 @@
  * 检查之后——终态 goal 仍走终态 notify（不被 ESC 影响），非 active 状态直接返回。
  */
 
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 
 import { checkBudgetOnTurnEnd } from "../../engine/budget";
 import { isActiveStatus, isTerminalStatus } from "../../engine/goal";

package/src/adapters/event-handlers/before-agent-start.ts

@@ -15,7 +15,7 @@
  * contextInjectionPrompt 恒定建议 plan mode（AI 自行决定是否用）。
  */
 
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { CustomEntry, ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 
 import { AUTO_CLEAR_TURNS, CONTEXT_USAGE_RATIO_LIMIT } from "../../constants";
 import { isActiveStatus, isTerminalStatus } from "../../engine/goal";
@@ -33,6 +33,14 @@ interface BeforeAgentStartResult {
 	};
 }
 
+/** 类型守卫：把 SDK 的 SessionEntry 联合收窄到 CustomEntry。
+ *  SessionEntry 现为联合类型（SessionMessageEntry | CompactionEntry | CustomEntry | ...），
+ *  只有 CustomEntry 带 customType/data（pending:register/unregister 由 pi.appendEntry 落地，
+ *  type 恒为 "custom"）。读取前必须先收窄。 */
+function isCustomEntry(e: { type: string }): e is CustomEntry {
+	return e.type === "custom";
+}
+
 export async function handleBeforeAgentStart(
 	pi: ExtensionAPI,
 	session: GoalSession,
@@ -67,10 +75,13 @@ export async function handleBeforeAgentStart(
 	// 但同一 session 内超时未 unregister 的 entry（如崩溃恢复遗漏）需此处完补以防误报 active。
 	const now = Date.now();
 	const entries = ctx.sessionManager.getEntries();
+	// pending:register/unregister 由 pi.appendEntry 落地为 CustomEntry（type:"custom"）。
+	// 先用 isCustomEntry 收窄联合类型，再读 customType/data。
+	const customEntries = entries.filter(isCustomEntry);
 	const pendingUnregisters = new Set(
-		entries.filter((e) => e.customType === "pending:unregister").map((e) => (e.data as Record<string, unknown>)?.id),
+		customEntries.filter((e) => e.customType === "pending:unregister").map((e) => (e.data as Record<string, unknown>)?.id),
 	);
-	const activePending = entries.filter((e) => {
+	const activePending = customEntries.filter((e) => {
 		if (e.customType !== "pending:register") return false;
 		const id = (e.data as Record<string, unknown>)?.id;
 		if (pendingUnregisters.has(id)) return false;

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

@@ -7,7 +7,7 @@
  * 不 persist / updateWidget。
  */
 
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 
 import { applyEvent } from "../../service";
 import type { GoalSession } from "../../session";

package/src/adapters/event-handlers/session-start.ts

@@ -4,7 +4,7 @@
  * 调 reconstructGoalState 重建持久化状态 + updateWidget。
  */
 
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 
 import { updateWidget } from "../../projection/widget";
 import type { GoalSession } from "../../session";

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

@@ -10,7 +10,7 @@
  * 不 persist（与旧 index.ts 行为对齐——turn_end 只内存变更 + widget）。
  */
 
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 
 import { updateWidget } from "../../projection/widget";
 import { applyEvent } from "../../service";

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

@@ -25,8 +25,8 @@
  */
 
 import { StringEnum } from "@earendil-works/pi-ai";
-import type { ExtensionAPI, ExtensionContext, Theme } from "@mariozechner/pi-coding-agent";
-import { Text } from "@mariozechner/pi-tui";
+import type { ExtensionAPI, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
+import { Text } from "@earendil-works/pi-tui";
 import { type GuiComponent, guiComponent, type GuiRenderResult,guiResult } from "@xyz-agent/extension-protocol";
 import { type Static, Type } from "typebox";
 

package/src/adapters/ports.ts

@@ -9,7 +9,7 @@
  * - session: ctx.sessionManager.getEntries + ctx.getContextUsage + ctx.signal
  */
 
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 
 import { ENTRY_TYPE, HISTORY_ENTRY_TYPE } from "../persistence";
 import type { MessagingPort, PersistencePort, SessionPort, UiPort } from "../ports";
@@ -37,7 +37,10 @@ export function buildPorts(pi: ExtensionAPI, ctx: ExtensionContext): ServicePort
 
 	const uiPort = {
 		setWidget(name: string, content: string[] | string | undefined): void {
-			ctx.ui.setWidget(name, content);
+			// SDK setWidget 重载只接受 string[] | undefined（或 factory）。本地 UiPort 允许单 string，
+			// 此处归一化：string 包一层成 [string]，再透传。
+			const lines = typeof content === "string" ? [content] : content;
+			ctx.ui.setWidget(name, lines);
 		},
 		setStatus(name: string, text: string | undefined): void {
 			ctx.ui.setStatus(name, text);

package/src/index.ts

@@ -17,8 +17,8 @@
  * FR-6.7：移除 pendingPause（ESC 改用 ctx.signal.aborted 守卫，在 event-adapter）。
  */
 
-import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext, Theme } from "@mariozechner/pi-coding-agent";
-import { Text } from "@mariozechner/pi-tui";
+import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
+import { Text } from "@earendil-works/pi-tui";
 
 import { handleGoalCommand } from "./adapters/command-adapter";
 import {
@@ -87,6 +87,21 @@ export default function goalExtension(pi: ExtensionAPI) {
 		handler: async (args: string | undefined, ctx: ExtensionCommandContext) => {
 			await handleGoalCommand(pi, session, args, ctx);
 		},
+		getArgumentCompletions(prefix: string) {
+			// 只补全一级静态子命令；update 后跟自由文本（目标描述），其他自由文本作为新目标，均不补全
+			const parts = prefix.trimStart().split(/\s+/).filter(Boolean);
+			if (parts.length > 1) return null;
+			const trimmed = (parts[0] ?? "").toLowerCase();
+			const opts = [
+				{ label: "status", value: "status", description: "查看当前 goal 状态" },
+				{ label: "resume", value: "resume", description: "恢复暂停/阻塞的 goal" },
+				{ label: "pause", value: "pause", description: "暂停活跃的 goal" },
+				{ label: "clear", value: "clear", description: "强制清除当前 goal" },
+				{ label: "history", value: "history", description: "查看历史 goal" },
+				{ label: "update", value: "update ", description: "重设目标（reshape）" },
+			];
+			return trimmed === "" ? opts : opts.filter((o) => o.label.startsWith(trimmed));
+		},
 	});
 
 	// ── Tool: goal_control（complete / report_blocked，#3 替代已删 goal_manager）──

package/src/ports.ts

@@ -63,6 +63,7 @@ export interface SessionEntryLike {
 
 export interface SessionPort {
 	getEntries(): SessionEntryLike[];
-	getContextUsage(): { tokens?: number; contextWindow?: number } | null;
+	// tokens 与 Pi SDK 的 ContextUsage.tokens 对齐：number | null（null = 未知，如压缩后未到下次 LLM 响应）。
+	getContextUsage(): { tokens: number | null; contextWindow: number } | null;
 	readonly signal: AbortSignal | undefined;
 }