@narumitw/pi-goal 0.1.16 → 0.1.18

package/README.md

@@ -2,19 +2,19 @@
 
 [![npm](https://img.shields.io/npm/v/@narumitw/pi-goal)](https://www.npmjs.com/package/@narumitw/pi-goal) [![Pi extension](https://img.shields.io/badge/Pi-extension-blue)](https://pi.dev) [![License: MIT](https://img.shields.io/badge/license-MIT-green.svg)](./LICENSE)
 
-`@narumitw/pi-goal` is a native [Pi coding agent](https://pi.dev) extension that adds durable `/goal` commands and a `goal_complete` tool for autonomous, verifiable task completion.
+`@narumitw/pi-goal` is a native [Pi coding agent](https://pi.dev) extension that adds session-scoped `/goal` commands and a `goal_complete` tool for autonomous, verifiable task completion.
 
 Goal mode keeps sending guarded automatic follow-up messages until the agent calls `goal_complete`, the user pauses or clears the goal, or an optional token budget is reached.
 
 ## ✨ Features
 
-- Adds `/goal <goal_to_complete>` to start goal mode.
+- Adds `/goal <goal_to_complete>` to start goal mode, with confirmation before replacing an existing goal.
 - Bare `/goal` shows the current goal summary.
-- Adds `/goal pause`, `/goal resume`, `/goal clear`, and `/goal edit <goal_to_complete>`.
-- Keeps `/goal-status` and `/goal-stop` as compatibility aliases.
+- Keeps advanced goal management inside `/goal` subcommands: `pause`, `resume`, `clear`, and `edit`.
+- Exposes only one top-level command: `/goal`.
 - Supports optional token budgets such as `/goal --tokens 100k <goal>`.
 - Tracks `active`, `paused`, `budget_limited`, and `complete` states.
-- Persists in-progress goal state per working directory under the Pi agent config directory.
+- Stores goal state in the current Pi session, following Codex's thread-owned goal model instead of using a global per-directory goal.
 - Registers a `goal_complete` tool for explicit completion.
 - Automatically prompts the agent to continue if an active turn ends early.
 - Guards auto-follow-ups so replaced, paused, cleared, completed, or budget-limited goals are not continued.
@@ -44,35 +44,37 @@ pi -e ./extensions/pi-goal
 /goal
 /goal implement snake game
 /goal --tokens 100k fix the failing test and verify it
+/goal edit ship the smaller fix first
 /goal pause
 /goal resume
 /goal clear
-/goal edit ship the smaller fix first
-/goal-status
-/goal-stop
 ```
 
-- `/goal` shows the current goal, status, iteration count, elapsed time, and token usage.
-- `/goal <goal_to_complete>` starts goal mode when no other goal is active.
-- `/goal --tokens 100k <goal_to_complete>` starts goal mode with a token budget. `k` and `m` suffixes are accepted, for example `100k` or `1.5m`.
+- `/goal` shows the current goal, status, iteration count, elapsed time, token usage, and available `/goal` subcommands.
+- `/goal <goal_to_complete>` starts goal mode. If another unfinished goal exists, Pi asks for confirmation before replacing it with a new active goal and resetting its usage counters.
+- `/goal --tokens 100k <goal_to_complete>` starts or replaces goal mode with a token budget. `k` and `m` suffixes are accepted, for example `100k` or `1.5m`.
+- `/goal edit <goal_to_complete>` updates the existing goal objective without resetting usage counters. Active goals stay active, paused goals stay paused, and budget-limited goals remain budget-limited if their budget is still exhausted.
 - `/goal pause` stops prompt injection and auto-continuation without forgetting the goal.
-- `/goal resume` resumes a paused or budget-limited goal.
-- `/goal clear` cancels the current goal and clears persisted state.
-- `/goal edit <goal_to_complete>` replaces the current goal with a new active goal.
-- `/goal-status` is a compatibility alias for `/goal`.
-- `/goal-stop` is a compatibility alias for `/goal clear`.
+- `/goal resume` resumes a paused or budget-limited goal when the token budget allows it.
+- `/goal clear` cancels the current goal and also removes any legacy persisted state for the current working directory.
 
 Goal objectives are limited to 4,000 characters. Put longer instructions in a file and reference the file path from `/goal`.
 
+## 🔁 Session and reload behavior
+
+Goal state is stored as Pi session state, similar to Codex's thread-owned goals. `/reload` and reopening the same Pi session can restore that session's unfinished goal. Starting a new Pi session in the same working directory does not inherit the old goal.
+
+Older versions wrote unfinished goals to `~/.pi/agent/pi-goal-state.json` keyed by working directory. This version no longer reads that global file, and `/goal clear` removes any legacy entry for the current working directory.
+
 ## 📊 Statusline states
 
 `pi-goal` writes compact status strings for statusline extensions:
 
-- `goal: active 3m` — an active goal without a token budget.
-- `goal: active 18k/100k` — an active goal with token usage and budget.
-- `goal: paused` — auto-continuation is paused.
-- `goal: budget 100k/100k` — the token budget was reached; auto-continuation stops.
-- `goal: complete` — shown briefly after `goal_complete` succeeds.
+- `🎯 active 3m` — an active goal without a token budget.
+- `🎯 active 18k/100k` — an active goal with token usage and budget.
+- `🎯 paused` — auto-continuation is paused.
+- `🎯 budget 100k/100k` — the token budget was reached; auto-continuation stops.
+- `🎯 complete` — shown briefly after `goal_complete` succeeds.
 
 ## ✅ How completion works
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-goal",
-	"version": "0.1.16",
+	"version": "0.1.18",
 	"description": "Pi extension that keeps working on a /goal until the agent marks it complete.",
 	"type": "module",
 	"license": "MIT",

package/src/goal.ts

@@ -25,6 +25,10 @@ interface GoalCompleteDetails {
 	summary: string;
 }
 
+interface GoalStateEntryData {
+	goal?: ActiveGoal | null;
+}
+
 interface CommandResult {
 	kind: "show" | "start" | "pause" | "resume" | "clear" | "edit";
 	objective?: string;
@@ -34,6 +38,7 @@ interface CommandResult {
 interface StatusContext {
 	cwd: string;
 	ui: {
+		confirm: (title: string, message: string) => Promise<boolean>;
 		notify: (message: string, level?: "info" | "warning" | "error") => void;
 		setStatus: (key: string, value: string | undefined) => void;
 	};
@@ -42,6 +47,7 @@ interface StatusContext {
 }
 
 const STATUS_KEY = "goal";
+const GOAL_STATE_ENTRY_TYPE = "goal-state";
 const MAX_OBJECTIVE_LENGTH = 4_000;
 const STATE_FILE = join(
 	process.env.PI_CODING_AGENT_DIR ?? join(process.env.HOME ?? ".", ".pi", "agent"),
@@ -50,6 +56,7 @@ const STATE_FILE = join(
 
 let activeGoal: ActiveGoal | undefined;
 let completionStatusTimer: NodeJS.Timeout | undefined;
+let extensionApi: ExtensionAPI | undefined;
 
 const goalCompleteTool = defineTool({
 	name: "goal_complete",
@@ -71,7 +78,7 @@ const goalCompleteTool = defineTool({
 		if (completedGoal) {
 			activeGoal = transitionGoal(completedGoal, "complete");
 			updateGoalUsage(activeGoal, ctx);
-			persistGoal(ctx.cwd, activeGoal);
+			persistGoal(activeGoal);
 		}
 
 		const goal = completedGoal?.text ?? "unknown goal";
@@ -91,6 +98,7 @@ const goalCompleteTool = defineTool({
 });
 
 export default function goal(pi: ExtensionAPI) {
+	extensionApi = pi;
 	pi.registerTool(goalCompleteTool);
 
 	pi.registerCommand("goal", {
@@ -116,33 +124,23 @@ export default function goal(pi: ExtensionAPI) {
 					clearGoal(ctx);
 					return;
 				case "edit":
-					editGoal(result.objective ?? "", result.tokenBudget, ctx);
+					editGoal(result.objective ?? "", result.tokenBudget, pi, ctx);
 					return;
 				case "start":
-					startGoal(result.objective ?? "", result.tokenBudget, pi, ctx);
+					await startGoal(result.objective ?? "", result.tokenBudget, pi, ctx);
 					return;
 			}
 		},
 	});
 
-	pi.registerCommand("goal-stop", {
-		description: "Compatibility alias for /goal clear",
-		handler: async (_args, ctx) => clearGoal(ctx),
-	});
-
-	pi.registerCommand("goal-status", {
-		description: "Compatibility alias for bare /goal",
-		handler: async (_args, ctx) => showGoal(ctx),
-	});
-
 	pi.on("session_start", (_event, ctx) => {
-		activeGoal = loadGoal(ctx.cwd);
+		activeGoal = loadGoalFromSession(ctx);
 		if (activeGoal) updateStatus(ctx, activeGoal);
 		else ctx.ui.setStatus(STATUS_KEY, undefined);
 	});
 
 	pi.on("session_shutdown", (_event, ctx) => {
-		if (activeGoal) persistGoal(ctx.cwd, activeGoal);
+		if (activeGoal) persistGoal(activeGoal);
 		ctx.ui.setStatus(STATUS_KEY, undefined);
 		if (completionStatusTimer) clearTimeout(completionStatusTimer);
 	});
@@ -164,13 +162,13 @@ export default function goal(pi: ExtensionAPI) {
 
 		if (activeGoal.tokenBudget !== undefined && activeGoal.tokensUsed >= activeGoal.tokenBudget) {
 			activeGoal = transitionGoal(activeGoal, "budget_limited");
-			persistGoal(ctx.cwd, activeGoal);
+			persistGoal(activeGoal);
 			updateStatus(ctx, activeGoal);
 			ctx.ui.notify(`Goal token budget reached: ${formatBudget(activeGoal)}`, "warning");
 			return;
 		}
 
-		persistGoal(ctx.cwd, activeGoal);
+		persistGoal(activeGoal);
 		updateStatus(ctx, activeGoal);
 
 		const currentGoal = activeGoal;
@@ -179,25 +177,34 @@ export default function goal(pi: ExtensionAPI) {
 	});
 }
 
-function startGoal(objective: string, tokenBudget: number | undefined, pi: ExtensionAPI, ctx: StatusContext) {
+async function startGoal(
+	objective: string,
+	tokenBudget: number | undefined,
+	pi: ExtensionAPI,
+	ctx: StatusContext,
+) {
 	const validationError = validateObjective(objective);
 	if (validationError) {
 		ctx.ui.notify(validationError, "warning");
 		return;
 	}
 
-	if (activeGoal && activeGoal.status !== "complete") {
-		ctx.ui.notify(
-			`A goal is already ${activeGoal.status}. Use /goal edit <objective> to replace it, /goal clear to stop it, or /goal to inspect it.`,
-			"warning",
+	const existingGoal = activeGoal?.status !== "complete" ? activeGoal : undefined;
+	if (existingGoal) {
+		const shouldReplace = await ctx.ui.confirm(
+			"Replace goal?",
+			`Current goal: ${existingGoal.text}\n\nNew goal: ${objective}`,
 		);
-		return;
+		if (!shouldReplace) {
+			ctx.ui.notify(`Goal kept: ${existingGoal.text}`, "info");
+			return;
+		}
 	}
 
 	activeGoal = createGoal(objective, tokenBudget, currentTokenTotal(ctx));
-	persistGoal(ctx.cwd, activeGoal);
+	persistGoal(activeGoal);
 	updateStatus(ctx, activeGoal);
-	ctx.ui.notify(`Goal started: ${objective}`, "info");
+	ctx.ui.notify(existingGoal ? `Goal replaced: ${objective}` : `Goal started: ${objective}`, "info");
 	sendGoalPrompt(pi, ctx, activeGoal);
 }
 
@@ -211,7 +218,7 @@ function pauseGoal(ctx: StatusContext) {
 		return;
 	}
 	activeGoal = transitionGoal(activeGoal, "paused");
-	persistGoal(ctx.cwd, activeGoal);
+	persistGoal(activeGoal);
 	updateStatus(ctx, activeGoal);
 	ctx.ui.notify(`Goal paused: ${activeGoal.text}`, "info");
 }
@@ -226,7 +233,7 @@ function resumeGoal(ctx: StatusContext) {
 		return;
 	}
 	activeGoal = transitionGoal(activeGoal, "active");
-	persistGoal(ctx.cwd, activeGoal);
+	persistGoal(activeGoal);
 	updateStatus(ctx, activeGoal);
 	ctx.ui.notify(`Goal resumed: ${activeGoal.text}`, "info");
 }
@@ -244,27 +251,44 @@ function clearGoal(ctx: StatusContext) {
 	ctx.ui.notify(`Goal cleared: ${stoppedGoal}`, "warning");
 }
 
-function editGoal(objective: string, tokenBudget: number | undefined, ctx: StatusContext) {
+function editGoal(
+	objective: string,
+	tokenBudget: number | undefined,
+	pi: ExtensionAPI,
+	ctx: StatusContext,
+) {
 	const validationError = validateObjective(objective);
 	if (validationError) {
 		ctx.ui.notify(validationError, "warning");
 		return;
 	}
+	if (!activeGoal) {
+		ctx.ui.notify("No active goal. Use /goal <objective> to start one.", "warning");
+		return;
+	}
 
-	activeGoal = createGoal(objective, tokenBudget, currentTokenTotal(ctx));
-	persistGoal(ctx.cwd, activeGoal);
+	updateGoalUsage(activeGoal, ctx);
+	activeGoal = normalizeGoalForBudget({
+		...activeGoal,
+		text: objective,
+		status: editedGoalStatus(activeGoal.status),
+		tokenBudget: tokenBudget ?? activeGoal.tokenBudget,
+		updatedAt: Date.now(),
+	});
+	persistGoal(activeGoal);
 	updateStatus(ctx, activeGoal);
 	ctx.ui.notify(`Goal updated: ${objective}`, "info");
+	if (activeGoal.status === "active") sendObjectiveUpdatedPrompt(pi, ctx, activeGoal);
 }
 
 function showGoal(ctx: StatusContext) {
 	if (!activeGoal) {
-		ctx.ui.notify("No active goal.", "info");
+		ctx.ui.notify("Usage: /goal <objective>\nNo goal is currently set.", "info");
 		ctx.ui.setStatus(STATUS_KEY, undefined);
 		return;
 	}
 	updateGoalUsage(activeGoal, ctx);
-	persistGoal(ctx.cwd, activeGoal);
+	persistGoal(activeGoal);
 	updateStatus(ctx, activeGoal);
 	ctx.ui.notify(goalSummary(activeGoal), "info");
 }
@@ -286,7 +310,22 @@ function createGoal(text: string, tokenBudget: number | undefined, baselineToken
 }
 
 function transitionGoal(goal: ActiveGoal, status: GoalStatus): ActiveGoal {
-	return { ...goal, status, updatedAt: Date.now() };
+	return normalizeGoalForBudget({ ...goal, status, updatedAt: Date.now() });
+}
+
+function editedGoalStatus(status: GoalStatus): GoalStatus {
+	return status === "paused" ? "paused" : "active";
+}
+
+function normalizeGoalForBudget(goal: ActiveGoal): ActiveGoal {
+	if (
+		goal.status === "active" &&
+		goal.tokenBudget !== undefined &&
+		goal.tokensUsed >= goal.tokenBudget
+	) {
+		return { ...goal, status: "budget_limited" };
+	}
+	return goal;
 }
 
 function incrementGoal(goal: ActiveGoal): ActiveGoal {
@@ -382,17 +421,23 @@ function sendGoalPrompt(pi: ExtensionAPI, ctx: StatusContext, goal: ActiveGoal)
 	else pi.sendUserMessage(prompt, { deliverAs: "followUp" });
 }
 
+function sendObjectiveUpdatedPrompt(pi: ExtensionAPI, ctx: StatusContext, goal: ActiveGoal) {
+	const prompt = buildObjectiveUpdatedPrompt(goal);
+	if (ctx.isIdle?.()) pi.sendUserMessage(prompt);
+	else pi.sendUserMessage(prompt, { deliverAs: "followUp" });
+}
+
 function updateStatus(ctx: StatusContext, goal: ActiveGoal) {
 	ctx.ui.setStatus(STATUS_KEY, formatStatus(goal));
 }
 
 function formatStatus(goal: ActiveGoal | undefined) {
 	if (!goal) return undefined;
-	if (goal.status === "complete") return "goal: complete";
-	if (goal.status === "paused") return "goal: paused";
-	if (goal.status === "budget_limited") return `goal: budget ${formatBudget(goal)}`;
-	if (goal.tokenBudget !== undefined) return `goal: active ${formatBudget(goal)}`;
-	return `goal: active ${formatDuration(goal.timeUsedSeconds)}`;
+	if (goal.status === "complete") return "🎯 complete";
+	if (goal.status === "paused") return "🎯 paused";
+	if (goal.status === "budget_limited") return `🎯 budget ${formatBudget(goal)}`;
+	if (goal.tokenBudget !== undefined) return `🎯 active ${formatBudget(goal)}`;
+	return `🎯 active ${formatDuration(goal.timeUsedSeconds)}`;
 }
 
 function formatBudget(goal: ActiveGoal) {
@@ -406,9 +451,16 @@ function goalSummary(goal: ActiveGoal) {
 		`Iteration: ${goal.iteration}`,
 		`Elapsed: ${formatDuration(goal.timeUsedSeconds)}`,
 		`Tokens: ${goal.tokenBudget === undefined ? formatTokenCount(goal.tokensUsed) : formatBudget(goal)}`,
+		`Commands: ${goalCommandHint(goal.status)}`,
 	].join("\n");
 }
 
+function goalCommandHint(status: GoalStatus) {
+	if (status === "active") return "/goal edit <objective>, /goal pause, /goal clear";
+	if (status === "paused") return "/goal edit <objective>, /goal resume, /goal clear";
+	return "/goal edit <objective>, /goal clear";
+}
+
 function formatDuration(seconds: number) {
 	if (seconds < 60) return `${seconds}s`;
 	const minutes = Math.floor(seconds / 60);
@@ -428,6 +480,11 @@ function buildGoalPrompt(goal: ActiveGoal) {
 	return `Goal mode is active. Complete this goal fully:\n\n${goal.text}${budgetLine}\n\nKeep working until the goal is done. Do not stop after planning or partial progress. When the goal is fully complete and verified, call the goal_complete tool with a concise completion summary.`;
 }
 
+function buildObjectiveUpdatedPrompt(goal: ActiveGoal) {
+	const budgetLine = goal.tokenBudget === undefined ? "" : `\nToken budget: ${formatBudget(goal)} used.`;
+	return `The active /goal objective was updated. Continue working toward this goal:\n\n${goal.text}${budgetLine}\n\nKeep working until the updated goal is fully complete and verified, then call the goal_complete tool.`;
+}
+
 function buildGoalSystemPrompt(goal: ActiveGoal) {
 	const budgetLine = goal.tokenBudget === undefined ? "" : `\n- Respect the goal token budget (${formatBudget(goal)} used).`;
 	return `Active /goal: ${goal.text}\n\nGoal-mode rules:\n- Continue making concrete progress until the active goal is fully complete.\n- Do not end your response with only a plan, TODO list, or partial progress.\n- Verify the result when possible using appropriate checks.\n- If the goal is not complete at the end of a turn, expect an automatic follow-up and continue from where you left off.\n- Only call the goal_complete tool after the goal is fully complete and verified.${budgetLine}`;
@@ -452,18 +509,28 @@ function currentTokenTotal(ctx: StatusContext): number {
 	return total;
 }
 
-function persistGoal(cwd: string, goal: ActiveGoal) {
-	writeState(cwd, goal);
+function persistGoal(goal: ActiveGoal) {
+	extensionApi?.appendEntry<GoalStateEntryData>(GOAL_STATE_ENTRY_TYPE, { goal });
 }
 
 function clearPersistedGoal(cwd: string) {
-	writeState(cwd, undefined);
+	extensionApi?.appendEntry<GoalStateEntryData>(GOAL_STATE_ENTRY_TYPE, { goal: null });
+	clearLegacyPersistedGoal(cwd);
 }
 
-function loadGoal(cwd: string): ActiveGoal | undefined {
-	const goals = readState();
-	const stored = goals[cwd];
-	return isGoal(stored) && stored.status !== "complete" ? stored : undefined;
+function loadGoalFromSession(ctx: StatusContext): ActiveGoal | undefined {
+	const sessionManager = ctx.sessionManager as
+		| {
+				getBranch?: () => Array<{ type?: string; customType?: string; data?: unknown }>;
+				getEntries?: () => Array<{ type?: string; customType?: string; data?: unknown }>;
+			}
+		| undefined;
+	const entries = sessionManager?.getBranch?.() ?? sessionManager?.getEntries?.() ?? [];
+	const entry = entries
+		.filter((entry) => entry.type === "custom" && entry.customType === GOAL_STATE_ENTRY_TYPE)
+		.pop();
+	const data = entry?.data as GoalStateEntryData | undefined;
+	return isGoal(data?.goal) && data.goal.status !== "complete" ? data.goal : undefined;
 }
 
 function clearActiveGoal(ctx: StatusContext) {
@@ -474,7 +541,7 @@ function clearActiveGoal(ctx: StatusContext) {
 
 function showCompletionStatus(ctx: StatusContext) {
 	if (completionStatusTimer) clearTimeout(completionStatusTimer);
-	ctx.ui.setStatus(STATUS_KEY, "goal: complete");
+	ctx.ui.setStatus(STATUS_KEY, "🎯 complete");
 	completionStatusTimer = setTimeout(() => ctx.ui.setStatus(STATUS_KEY, undefined), 8_000);
 }
 
@@ -490,14 +557,15 @@ function readState(): Record<string, unknown> {
 	}
 }
 
-function writeState(cwd: string, goal: ActiveGoal | undefined) {
+function clearLegacyPersistedGoal(cwd: string) {
+	if (!existsSync(STATE_FILE)) return;
 	const goals = readState();
-	if (goal) goals[cwd] = goal;
-	else delete goals[cwd];
+	delete goals[cwd];
 	mkdirSync(dirname(STATE_FILE), { recursive: true });
 	writeFileSync(STATE_FILE, `${JSON.stringify(goals, null, 2)}\n`);
 }
 
+
 function isGoal(value: unknown): value is ActiveGoal {
 	if (!value || typeof value !== "object") return false;
 	const goal = value as Partial<ActiveGoal>;