@zhushanwen/pi-goal 0.12.0 → 0.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-goal",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "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,10 +29,10 @@
     "@earendil-works/pi-coding-agent": "^0.84.4",
     "@earendil-works/pi-tui": "^0.84.4",
     "typebox": "*",
-    "@zhushanwen/pi-pending-notifications": "0.5.2"
+    "@zhushanwen/pi-pending-notifications": "0.5.3"
   },
   "dependencies": {
-    "@xyz-agent/extension-protocol": "0.8.0"
+    "@xyz-agent/extension-protocol": "0.8.2"
   },
   "peerDependenciesMeta": {
     "@earendil-works/pi-tui": {

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

@@ -422,6 +422,66 @@ describe("parseGoalArgs — --criteria 分号拆分（U20/U21）", () => {
 	});
 });
 
+// ── parseGoalArgs — 子命令路由（表驱动 + update/set 分支）──
+
+describe("parseGoalArgs — 子命令路由", () => {
+	it("空串 / status → status", () => {
+		expect(parseGoalArgs("")).toEqual({ action: "status" });
+		expect(parseGoalArgs("   ")).toEqual({ action: "status" });
+		expect(parseGoalArgs("STATUS")).toEqual({ action: "status" });
+	});
+
+	it.each(["resume", "pause", "clear", "history"] as const)(
+		"%s（含大小写混写）→ 对应 action",
+		(action) => {
+			expect(parseGoalArgs(action)).toEqual({ action });
+			expect(parseGoalArgs(`  ${action.toUpperCase()} `)).toEqual({ action });
+		},
+	);
+
+	it("update 无参 → { action: update }（无 objective，上层报错）", () => {
+		expect(parseGoalArgs("update")).toEqual({ action: "update" });
+		expect(parseGoalArgs("UPDATE")).toEqual({ action: "update" });
+	});
+
+	it("update 带 objective（无 --criteria）→ objective 全量保留", () => {
+		expect(parseGoalArgs("update ship v2 --draft")).toEqual({
+			action: "update",
+			objective: "ship v2 --draft",
+		});
+	});
+
+	it("update 仅接 --criteria（分隔标记要求前导空白）→ 整体作 objective（锚定现状）", () => {
+		const parsed = parseGoalArgs("update --criteria a;b");
+		expect(parsed.action).toBe("update");
+		expect(parsed.objective).toBe("--criteria a;b");
+		expect(parsed.criteria).toBeUndefined();
+	});
+
+	it("未知文本 → set 路径：objective 剥 --tokens flag + budget 透传", () => {
+		expect(parseGoalArgs("write docs --tokens 3000")).toEqual({
+			action: "set",
+			objective: "write docs",
+			budget: { tokenBudget: 3000 },
+		});
+		expect(parseGoalArgs("write docs")).toEqual({
+			action: "set",
+			objective: "write docs",
+			budget: {},
+		});
+	});
+
+	it("仅 --tokens（剥空 objective）→ status（非 set）", () => {
+		expect(parseGoalArgs("--tokens 500")).toEqual({ action: "status" });
+	});
+
+	it("原型链键名（constructor 等）不命中路由表 → set 路径", () => {
+		const parsed = parseGoalArgs("constructor");
+		expect(parsed.action).toBe("set");
+		expect(parsed.objective).toBe("constructor");
+	});
+});
+
 // ── /goal set（提示词触发器：sendUserMessage 让 AI 调 goal_control create）──
 
 describe("handleGoalCommand — set (提示词触发器 + #11/D25 拒绝非终态)", () => {

package/src/__tests__/index.test.ts

@@ -252,7 +252,7 @@ describe("E1 全链路集成：goal_control create 数组 → 落盘 → 重载
 			expect(prompt).toContain("1. e2e cond a");
 			expect(prompt).toContain("2. e2e cond b");
 		} finally {
-			rmSync(dir, { recursive: true, force: true });
+			rmSync(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
 		}
 	});
 });

package/src/commands.ts

@@ -13,42 +13,33 @@ export interface GoalCommandArgs {
 	criteria?: string[];
 }
 
+/**
+ * 无 objective 的简单子命令 → action（表驱动分发；空串 = 纯 /goal，归 status）。
+ * 用 Map 而非普通对象：输入是外部字符串，普通对象查表会命中 Object.prototype 上的键
+ *（如 "constructor"），导致与原 if 链不同的错误路由。
+ */
+const SIMPLE_SUBCOMMAND_ACTIONS = new Map<string, GoalCommandArgs["action"]>([
+	["", "status"],
+	["status", "status"],
+	["resume", "resume"],
+	["pause", "pause"],
+	["clear", "clear"],
+	["history", "history"],
+]);
+
 export function parseGoalArgs(raw: string): GoalCommandArgs {
 	const trimmed = raw.trim().toLowerCase();
 	const fullRaw = raw.trim();
 
-	// Subcommands without objective
-	if (trimmed === "" || trimmed === "status") {
-		return { action: "status" };
-	}
-	if (trimmed === "resume") {
-		return { action: "resume" };
-	}
-	if (trimmed === "pause") {
-		return { action: "pause" };
-	}
-	if (trimmed === "clear") {
-		return { action: "clear" };
-	}
-	if (trimmed === "history") {
-		return { action: "history" };
+	// Subcommands without objective（表驱动分发）
+	const simpleAction = SIMPLE_SUBCOMMAND_ACTIONS.get(trimmed);
+	if (simpleAction) {
+		return { action: simpleAction };
 	}
 
 	// /goal update <new objective> [--criteria <a;b;c>]
 	if (trimmed.startsWith("update ")) {
-		const rest = fullRaw.slice(UPDATE_PREFIX_LENGTH).trim();
-		// --criteria 作分隔标记（要求两侧空白，避免误切 objective 内文本）
-		const criteriaSep = rest.match(/\s--criteria\s+/);
-		if (criteriaSep) {
-			const sepStart = criteriaSep.index ?? 0;
-			const objective = rest.slice(0, sepStart).trim();
-			const criteriaText = rest.slice(sepStart + criteriaSep[0].length).trim();
-			// 分号拆分 + 逐段 trim + 去空段（"a;;b" → ["a","b"]）；全空段 → undefined
-			// （决策④：`--criteria "  "` / `";;"` 不产出空数组，handleUpdate 保留旧值）
-			const criteria = criteriaText.split(";").map((s) => s.trim()).filter(Boolean);
-			return { action: "update", objective, criteria: criteria.length > 0 ? criteria : undefined };
-		}
-		return { action: "update", objective: rest };
+		return parseUpdateArgs(fullRaw);
 	}
 	// /goal update (without argument) → 报错
 	if (trimmed === "update") {
@@ -56,20 +47,54 @@ export function parseGoalArgs(raw: string): GoalCommandArgs {
 	}
 
 	// /goal <objective> [--tokens N]
-	// 只匹配已知 flag，避免误删 objective 中的 -- 文本
-	const knownFlags = /--tokens\s+\d+/g;
-	const objective = fullRaw.replace(knownFlags, "").trim();
-	const budget: Partial<BudgetConfig> = {};
+	return parseSetArgs(fullRaw);
+}
 
-	const tokenMatch = fullRaw.match(/--tokens\s+(\d+)/);
-	if (tokenMatch) {
-		const val = parseInt(tokenMatch[1]!, 10);
-		if (!isNaN(val) && val > 0) budget.tokenBudget = val;
+/** /goal update 分支：--criteria 分隔标记切出 objective + criteria 列表 */
+function parseUpdateArgs(fullRaw: string): GoalCommandArgs {
+	const rest = fullRaw.slice(UPDATE_PREFIX_LENGTH).trim();
+	// --criteria 作分隔标记（要求两侧空白，避免误切 objective 内文本）
+	const criteriaSep = rest.match(/\s--criteria\s+/);
+	if (!criteriaSep) {
+		return { action: "update", objective: rest };
 	}
+	const sepStart = criteriaSep.index ?? 0;
+	const objective = rest.slice(0, sepStart).trim();
+	const criteriaText = rest.slice(sepStart + criteriaSep[0].length).trim();
+	return { action: "update", objective, criteria: parseCriteriaList(criteriaText) };
+}
+
+/**
+ * 分号拆分 + 逐段 trim + 去空段（"a;;b" → ["a","b"]）；全空段 → undefined
+ * （决策④：`--criteria "  "` / `";;"` 不产出空数组，handleUpdate 保留旧值）
+ */
+function parseCriteriaList(criteriaText: string): string[] | undefined {
+	const criteria = criteriaText.split(";").map((s) => s.trim()).filter(Boolean);
+	return criteria.length > 0 ? criteria : undefined;
+}
 
+/** /goal <objective> [--tokens N] 分支：objective 剥已知 flag + budget 解析 */
+function parseSetArgs(fullRaw: string): GoalCommandArgs {
+	const objective = stripKnownTokenFlag(fullRaw);
+	const budget = parseTokenBudget(fullRaw);
 	if (!objective) {
 		return { action: "status" };
 	}
-
 	return { action: "set", objective, budget };
 }
+
+/** 只匹配已知 flag，避免误删 objective 中的 -- 文本 */
+function stripKnownTokenFlag(fullRaw: string): string {
+	return fullRaw.replace(/--tokens\s+\d+/g, "").trim();
+}
+
+/** 提取 --tokens N 的数值；缺失 / 非法（isNaN 或 ≤0）→ 空 budget */
+function parseTokenBudget(fullRaw: string): Partial<BudgetConfig> {
+	const budget: Partial<BudgetConfig> = {};
+	const tokenMatch = fullRaw.match(/--tokens\s+(\d+)/);
+	if (tokenMatch) {
+		const val = parseInt(tokenMatch[1]!, 10);
+		if (!isNaN(val) && val > 0) budget.tokenBudget = val;
+	}
+	return budget;
+}