pi-goal-x 0.19.0 → 0.20.0

package/README.md

@@ -104,7 +104,7 @@ Pressing `Esc` or aborting an active run pauses the goal so it does not remain f
 - **Branch-local focus**: because focus is reconstructed from the current session branch, `/tree` navigation can restore a different focus for a different branch.
 - **One continuation chain**: auto-continue only schedules work for the focused goal in the current session.
 
-Creating a goal with `/goals`, `/sisyphus`, `/goals-set`, or `/sisyphus-set` no longer clears other open goals. It creates a new active goal file and focuses it. Use `/goal-list` to inspect open goals and `/goal-focus` to switch the session focus. If the latest focus entry explicitly clears focus, or points at a missing/stale goal, a remaining single open goal is not auto-focused; single-open auto-focus only happens when no focus entry exists at all. If multiple open goals exist and the session has no valid focus, `/goal-resume`, `/goal-clear`, `/goal-abort`, `/goal-pause`, and `/goal-tweak` ask the user to choose a goal instead of acting on all of them.
+Creating a goal with `/goals`, `/sisyphus`, `/goals-set`, or `/sisyphus-set` no longer clears other open goals. It creates a new active goal file and focuses it. Use `/goal-list` to inspect open goals and `/goal-focus` to switch the session focus. If the latest focus entry explicitly clears focus, or points at a missing/stale goal, a remaining single open goal is not auto-focused. By default (`autoSelectSingleGoal: false`) sessions start unfocused so goals stay session-scoped — useful when multiple sessions share the same `.pi/goals/` directory. Set `autoSelectSingleGoal: true` to restore the old behavior where a single open goal is auto-focused when no focus entry exists at all. If multiple open goals exist and the session has no valid focus, `/goal-resume`, `/goal-clear`, `/goal-abort`, `/goal-pause`, and `/goal-tweak` ask the user to choose a goal instead of acting on all of them.
 
 ## Agent tools
 
@@ -216,6 +216,7 @@ Configured interactively via `/goal-settings`, or edited directly:
   "disableTasks": false,
   "disableContracts": false,
   "subtaskDepth": 1,
+  "autoSelectSingleGoal": false,
   "provider": "fireworks",
   "model": "accounts/fireworks/models/deepseek-v4-flash",
   "thinkingLevel": "high",
@@ -228,6 +229,7 @@ Configured interactively via `/goal-settings`, or edited directly:
 | `disableTasks` | `false` | Suppress task list features entirely when `true` |
 | `disableContracts` | `false` | Suppress verification contract enforcement when `true` |
 | `subtaskDepth` | `1` | Maximum nesting depth for subtasks |
+| `autoSelectSingleGoal` | `false` | When `true`, auto-focus the single open goal when a session has no focus entry (default keeps goals session-scoped) |
 | `provider` | system default | Provider name for the auditor agent |
 | `model` | system default | Model name for the auditor agent |
 | `thinkingLevel` | system default | Thinking level: `off`, `minimal`, `low`, `medium`, `high`, `xhigh` |

package/extensions/goal-auditor.ts

@@ -242,6 +242,30 @@ function resolveAuditorModel(ctx: ExtensionContext, config: GoalSettings): { mod
 	return { model: undefined, error: `Configured auditor model is ambiguous or unavailable: ${config.model}` };
 }
 
+/**
+ * Options that reuse the parent session's auth + registered providers for the nested auditor.
+ *
+ * Pi 0.81+ `createAgentSession` accepts `modelRuntime` (and ignores `modelRegistry`).
+ * ExtensionContext still exposes `modelRegistry`, which wraps the live ModelRuntime.
+ * Sharing that runtime keeps extension providers such as `pi-cursor-sdk`'s `cursor`
+ * provider (and its auth) available. Without this, the auditor builds a fresh runtime
+ * with an empty resource loader, so Cursor models fail with "No API key found for cursor"
+ * even when `~/.pi/agent/auth.json` has a Cursor key.
+ *
+ * Older SDKs still accept `modelRegistry`; pass both for compatibility.
+ */
+export function resolveAuditorSessionModelOptions(ctx: ExtensionContext): {
+	modelRegistry: ExtensionContext["modelRegistry"];
+	modelRuntime?: unknown;
+} {
+	const registry = ctx.modelRegistry as ExtensionContext["modelRegistry"] & { runtime?: unknown };
+	const runtime = registry?.runtime;
+	if (runtime) {
+		return { modelRegistry: ctx.modelRegistry, modelRuntime: runtime };
+	}
+	return { modelRegistry: ctx.modelRegistry };
+}
+
 function modelLabel(model: Model<any> | undefined): string | undefined {
 	return model ? `${model.provider}/${model.id}` : undefined;
 }
@@ -318,13 +342,13 @@ export async function runGoalCompletionAuditor(args: {
 			cwd: args.ctx.cwd,
 			model,
 			thinkingLevel,
-			modelRegistry: args.ctx.modelRegistry,
+			...resolveAuditorSessionModelOptions(args.ctx),
 			resourceLoader: makeAuditorResourceLoader(),
 			sessionManager: SessionManager.inMemory(args.ctx.cwd),
 			settingsManager: SettingsManager.inMemory({ compaction: { enabled: false } }),
 			tools: ["read", "grep", "find", "ls", "bash", REPORT_AUDITOR_PROGRESS_TOOL_NAME],
 			customTools: [reportProgressTool],
-		});
+		} as Parameters<typeof createAgentSession>[0]);
 		const unsubscribe = session.subscribe((event) => {
 			if (event.type === "tool_execution_start") {
 				progress.currentTool = event.toolName;

package/extensions/goal-draft.ts

@@ -1,5 +1,3 @@
-import type { GoalTask } from "./goal-record.ts";
-
 export type GoalDraftingFocus = "goal" | "sisyphus";
 
 export interface GoalConfirmationIntentLike {
@@ -24,45 +22,6 @@ export type ToolGateDecision =
 	| { block: false }
 	| { block: true; reason: string };
 
-// ── Shared formatting helpers ──────────────────────────────────────────────
-
-function formatModeLabel(sisyphus: boolean): string {
-	return sisyphus ? "Sisyphus (prompt/criteria style)" : "Normal goal";
-}
-
-function formatPrefixedLines(content: string): string[] {
-	const lines: string[] = [];
-	for (const rawLine of content.split("\n")) {
-		const trimmed = rawLine.trim();
-		if (!trimmed) continue;
-		if (trimmed.startsWith("│")) {
-			lines.push(rawLine);
-		} else {
-			lines.push(`│   ${rawLine}`);
-		}
-	}
-	return lines;
-}
-
-function formatSection(title: string, content: string): string[] {
-	const body = formatPrefixedLines(content);
-	return ["", `─── ${title} ───`, "", ...body];
-}
-
-export function renderConfirmationTasks(tasks: GoalTask[], indent: number): string[] {
-	const prefix = "  ".repeat(indent);
-	const lines: string[] = [];
-	for (const t of tasks) {
-		const lw = t.lightweightSubtasks ? " (lightweight)" : "";
-		const contract = t.verificationContract ? ` contract: ${t.verificationContract}` : "";
-		lines.push(`${prefix}[ ] ${t.id}: ${t.title}${lw}${contract}`);
-		if (t.subtasks && t.subtasks.length > 0) {
-			lines.push(...renderConfirmationTasks(t.subtasks, indent + 1));
-		}
-	}
-	return lines;
-}
-
 export function promptSafeObjective(objective: string): string {
 	return objective.replace(/<\/?untrusted_objective>/gi, (tag) => tag.replace(/</g, "&lt;").replace(/>/g, "&gt;"));
 }
@@ -125,13 +84,30 @@ export function buildDraftConfirmationText(args: {
 	autoContinue: boolean;
 }): string {
 	const lines: string[] = [];
+	const modeLabel = args.focus === "sisyphus" ? "Sisyphus (prompt/criteria style)" : "Normal goal";
 	lines.push("● Goal draft ready for confirmation.");
 	lines.push("");
 	lines.push("─── Draft Details ───");
-	lines.push(`│   Mode: ${formatModeLabel(args.focus === "sisyphus")}`);
+	lines.push(`│   Mode: ${modeLabel}`);
 	lines.push(`│   Auto-continue: ${args.autoContinue ? "yes" : "no"}`);
-	lines.push(...formatSection("Original Topic", args.originalTopic.trim()));
-	lines.push(...formatSection("Proposed Goal", args.objective));
+	lines.push("");
+	lines.push("─── Original Topic ───");
+	lines.push("");
+	for (const topicLine of args.originalTopic.trim().split("\n")) {
+		if (topicLine.trim()) lines.push(`│   ${topicLine}`);
+	}
+	lines.push("");
+	lines.push("─── Proposed Goal ───");
+	lines.push("");
+	for (const objLine of args.objective.split("\n")) {
+		const trimmed = objLine.trim();
+		if (!trimmed) continue;
+		if (trimmed.startsWith("│")) {
+			lines.push(objLine);
+		} else {
+			lines.push(`│   ${objLine}`);
+		}
+	}
 	return lines.join("\n");
 }
 
@@ -140,22 +116,42 @@ export function buildTweakConfirmationText(args: {
 	newObjective: string;
 	changeSummary: string;
 	sisyphus: boolean;
-	tasks?: GoalTask[];
 }): string {
 	const lines: string[] = [];
+	const modeLabel = args.sisyphus ? "Sisyphus (prompt/criteria style)" : "Normal goal";
 	lines.push("● Goal tweak ready for confirmation.");
 	lines.push("");
 	lines.push("─── Draft Details ───");
-	lines.push(`│   Mode: ${formatModeLabel(args.sisyphus)}`);
-	lines.push(...formatSection("Change", args.changeSummary));
-	lines.push(...formatSection("Current Objective", args.currentObjective));
-	lines.push(...formatSection("Proposed New Objective", args.newObjective));
-	if (args.tasks && args.tasks.length > 0) {
-		const taskLines = renderConfirmationTasks(args.tasks, 0);
-		lines.push("");
-		lines.push(`┌─ TASKS ─────────────────────────────────────┐`);
-		for (const tl of taskLines) lines.push(tl);
-		lines.push(`└──────────────────────────────────────────────┘`);
+	lines.push(`│   Mode: ${modeLabel}`);
+	lines.push("");
+	lines.push("─── Change ───");
+	lines.push("");
+	for (const changeLine of args.changeSummary.split("\n")) {
+		if (changeLine.trim()) lines.push(`│   ${changeLine}`);
+	}
+	lines.push("");
+	lines.push("─── Current Objective ───");
+	lines.push("");
+	for (const curLine of args.currentObjective.split("\n")) {
+		const trimmed = curLine.trim();
+		if (!trimmed) continue;
+		if (trimmed.startsWith("│")) {
+			lines.push(curLine);
+		} else {
+			lines.push(`│   ${curLine}`);
+		}
+	}
+	lines.push("");
+	lines.push("─── Proposed New Objective ───");
+	lines.push("");
+	for (const newLine of args.newObjective.split("\n")) {
+		const trimmed = newLine.trim();
+		if (!trimmed) continue;
+		if (trimmed.startsWith("│")) {
+			lines.push(newLine);
+		} else {
+			lines.push(`│   ${newLine}`);
+		}
 	}
 	return lines.join("\n");
 }

package/extensions/goal-pool.ts

@@ -38,6 +38,7 @@ export function resolveSessionFocus(args: {
 	pool: Map<string, GoalRecord>;
 	focusEntry?: GoalFocusEntry | null;
 	legacyGoal?: GoalRecord | null;
+	autoSelectSingleGoal?: boolean;
 }): string | null {
 	const focusedGoalId = args.focusEntry?.focusedGoalId ?? null;
 	const focused = focusedGoalId ? focusedGoalFromPool(args.pool, focusedGoalId) : null;
@@ -52,8 +53,14 @@ export function resolveSessionFocus(args: {
 		args.pool.set(args.legacyGoal.id, cloneGoal(args.legacyGoal));
 		return args.legacyGoal.id;
 	}
-	const open = openGoalsFromPool(args.pool);
-	return open.length === 1 ? open[0]?.id ?? null : null;
+	// Auto-select single open goal only when explicitly enabled.
+	// Default (false): sessions start unfocused to prevent goals from
+	// bleeding across sessions that share the same .pi/goals/ directory.
+	if (args.autoSelectSingleGoal) {
+		const open = openGoalsFromPool(args.pool);
+		return open.length === 1 ? open[0]?.id ?? null : null;
+	}
+	return null;
 }
 
 export function goalSelectorLabel(goal: GoalRecord, focusedGoalId: string | null): string {

package/extensions/goal-settings.ts

@@ -26,6 +26,7 @@ export interface GoalSettings {
 	model?: string;
 	thinkingLevel?: ThinkingLevel;
 	disabled?: boolean;
+	autoSelectSingleGoal?: boolean;
 }
 
 export const PI_GOAL_SETTINGS_FILE_ENV = "PI_GOAL_SETTINGS_FILE";
@@ -41,6 +42,7 @@ const ALLOWED_SETTINGS_KEYS = new Set([
 	"thinkingLevel",
 	"thinking_level",
 	"disabled",
+	"autoSelectSingleGoal",
 ]);
 
 /**
@@ -105,6 +107,7 @@ export function parseGoalSettings(raw: unknown): GoalSettings {
 	if (model !== undefined) settings.model = model;
 	if (thinkingLevel !== undefined) settings.thinkingLevel = thinkingLevel;
 	if (record.disabled === true || record.disabled === "true") settings.disabled = true;
+	if (record.autoSelectSingleGoal === true || record.autoSelectSingleGoal === "true") settings.autoSelectSingleGoal = true;
 	return settings;
 }
 
@@ -136,6 +139,7 @@ export function loadGoalSettings(cwd: string, env: NodeJS.ProcessEnv = process.e
 		model: fileConfig.model,
 		thinkingLevel: fileConfig.thinkingLevel,
 		disabled: fileConfig.disabled,
+		autoSelectSingleGoal: fileConfig.autoSelectSingleGoal ?? false,
 	};
 }
 
@@ -166,6 +170,7 @@ export function saveGoalSettingsFileConfig(cwd: string, settings: GoalSettings):
 	if (disableTasks === true) clean.disableTasks = true;
 	if (disableContracts === true) clean.disableContracts = true;
 	if (subtaskDepth !== undefined) clean.subtaskDepth = subtaskDepth;
+	if (settings.autoSelectSingleGoal === true) clean.autoSelectSingleGoal = true;
 	const configPath = goalSettingsPath(cwd);
 	fs.mkdirSync(path.dirname(configPath), { recursive: true });
 	const persisted: Record<string, unknown> = {};
@@ -176,6 +181,7 @@ export function saveGoalSettingsFileConfig(cwd: string, settings: GoalSettings):
 	if (clean.disableTasks) persisted.disableTasks = true;
 	if (clean.disableContracts) persisted.disableContracts = true;
 	if (clean.subtaskDepth !== undefined) persisted.subtaskDepth = clean.subtaskDepth;
+	if (settings.autoSelectSingleGoal === true) persisted.autoSelectSingleGoal = true;
 	fs.writeFileSync(configPath, `${JSON.stringify(persisted, null, 2)}\n`, "utf8");
 	return clean;
 }

package/extensions/goal.ts

@@ -13,7 +13,6 @@ import {
 	buildTweakConfirmationText,
 	extractVerificationContract,
 	goalDraftingPrompt,
-	renderConfirmationTasks,
 	validateGoalDraftProposal,
 	type GoalDraftingFocus,
 } from "./goal-draft.ts";
@@ -147,7 +146,6 @@ const GOAL_EVENT_ENTRY = "pi-goal-event";
 const GOAL_AUDIT_ENTRY = "pi-goal-audit-event";
 const COMPLETE_STATUS = "complete";
 const CONTINUATION_IDLE_RETRY_MS = 50;
-const STATUS_REFRESH_MS = 1000;
 /**
  * Tools that count as "real work" toward the active goal. If a non-tool-use
  * turn ends without any of these having been called, we DO NOT queue the next
@@ -411,8 +409,6 @@ export default function goalExtension(pi: ExtensionAPI): void {
 	let continuationTimer: ReturnType<typeof setTimeout> | null = null;
 	let runningGoalId: string | null = null;
 	let terminalInputUnsubscribe: (() => void) | null = null;
-	let statusRefreshTimer: ReturnType<typeof setInterval> | null = null;
-	let statusRefreshCtx: ExtensionContext | null = null;
 	let auditProgress: AuditorWidgetProgress | null = null;
 	let auditAnimationTimer: ReturnType<typeof setInterval> | null = null;
 	let auditAbortController: AbortController | null = null;
@@ -430,15 +426,8 @@ export default function goalExtension(pi: ExtensionAPI): void {
 	//   after their successful execute. Once set, pi.on("tool_call") blocks all
 	//   subsequent in-turn tool calls except POST_STOP_ALLOWED_TOOLS. This is the
 	//   schema fix for "agent keeps writing files after pause_goal".
-	// turnSeq: lightweight generation counter, incremented at each turn start.
-	//   Used to scope turnStoppedFor so stale markers from prior turns or sessions
-	//   cannot poison a resumed active goal.
-	// checkpointGoalId: remembers the incoming goal id from queued continuations.
-	//   When set but the goal is no longer active/autoContinue, work tools are blocked.
 	let goalWorkToolCalledThisTurn = false;
-	let turnSeq = 0;
-	let turnStoppedFor: { goalId: string; turnSeq: number } | null = null;
-	let checkpointGoalId: string | null = null;
+	let turnStoppedFor: string | null = null;
 
 	// #5 post-compaction resync: when a compaction just happened, the next agent
 	// turn gets an extra reminder block. Set in session_compact, consumed
@@ -535,37 +524,6 @@ export default function goalExtension(pi: ExtensionAPI): void {
 		}
 	}
 
-	function stopStatusRefresh(): void {
-		if (statusRefreshTimer) {
-			clearInterval(statusRefreshTimer);
-			statusRefreshTimer = null;
-		}
-		statusRefreshCtx = null;
-	}
-
-	function syncStatusRefresh(ctx: ExtensionContext): void {
-		if (!ctx.hasUI || state.goal?.status !== "active") {
-			stopStatusRefresh();
-			return;
-		}
-		statusRefreshCtx = ctx;
-		if (statusRefreshTimer) return;
-		statusRefreshTimer = setInterval(() => {
-			if (!statusRefreshCtx || state.goal?.status !== "active") {
-				stopStatusRefresh();
-				return;
-			}
-			const displayGoal = goalForDisplay();
-			if (displayGoal) {
-				const otherCount = otherOpenGoalCount(goalsById, focusedGoalId);
-				statusRefreshCtx.ui.setStatus("goal", `${footerStatus(displayGoal)}${otherCount > 0 ? ` (+${otherCount} open)` : ""}`);
-			}
-			// Live-tick the above-editor widget so duration/tokens update.
-			goalWidgetComponent?.update();
-		}, STATUS_REFRESH_MS);
-		statusRefreshTimer.unref?.();
-	}
-
 	function clearContinuationTimer(): void {
 		if (continuationTimer) {
 			clearTimeout(continuationTimer);
@@ -584,28 +542,6 @@ export default function goalExtension(pi: ExtensionAPI): void {
 		accounting.lastAccountedAt = null;
 	}
 
-	function advanceTurnSeq(): void {
-		turnSeq += 1;
-		if (turnStoppedFor?.turnSeq !== turnSeq) turnStoppedFor = null;
-	}
-
-	function currentTurnStoppedGoalId(): string | null {
-		if (!turnStoppedFor) return null;
-		if (turnStoppedFor.turnSeq !== turnSeq) {
-			turnStoppedFor = null;
-			return null;
-		}
-		return turnStoppedFor.goalId;
-	}
-
-	function isActionableContinuationGoal(goalId: string | null | undefined): goalId is string {
-		return !!goalId && state.goal?.id === goalId && state.goal.status === "active" && state.goal.autoContinue;
-	}
-
-	function isStaleCheckpointBlockedToolCall(toolName: string): boolean {
-		return !POST_STOP_ALLOWED_TOOL_SET.has(toolName);
-	}
-
 	function clearStoppedRuntimeState(): void {
 		clearContinuationState();
 		clearActiveAccounting();
@@ -785,7 +721,6 @@ export default function goalExtension(pi: ExtensionAPI): void {
 				if (next) state.goal = next.status === "complete" ? archiveGoalFile(ctx, next) : writeActiveGoalFile(ctx, next);
 			}
 		}
-		pi.appendEntry(STATE_ENTRY, goalDetails(state.goal));
 		syncGoalTools();
 		if (ctx) updateUI(ctx);
 	}
@@ -794,7 +729,6 @@ export default function goalExtension(pi: ExtensionAPI): void {
 		if (!state.goal || state.goal.status === "complete") return;
 		if (syncGoalPromptFromDisk(ctx)) {
 			state.goal = { ...state.goal, updatedAt: nowIso() };
-			pi.appendEntry(STATE_ENTRY, goalDetails(state.goal));
 		}
 		syncGoalTools();
 		updateUI(ctx);
@@ -804,7 +738,10 @@ export default function goalExtension(pi: ExtensionAPI): void {
 	 * Live above-editor widget for the active goal. Inspired by rpiv-todo's
 	 * TodoOverlay: register the widget once with a factory, read live state
 	 * via the closure at render time, and call `tui.requestRender()` on every
-	 * state change so the overlay refreshes without re-registration.
+	 * state change so the overlay refreshes without re-registration. Normal pi
+	 * renders still read current values through the closure; do not request
+	 * periodic renders just to tick elapsed time because terminal redraws pull
+	 * users out of scrollback while they review long goals and earlier context.
 	 *
 	 * Layout (sisyphus, running):
 	 *   ◆ Sisyphus  [▰▰▰▱▱] 3/5
@@ -835,7 +772,6 @@ export default function goalExtension(pi: ExtensionAPI): void {
 		const totalOpen = openGoals().length;
 		if (!state.goal && totalOpen === 0) {
 			clearGoalWidget(ctx);
-			stopStatusRefresh();
 			return;
 		}
 		if (!state.goal) {
@@ -861,7 +797,6 @@ export default function goalExtension(pi: ExtensionAPI): void {
 			} else {
 				goalWidgetComponent?.update();
 			}
-			stopStatusRefresh();
 			return;
 		}
 
@@ -890,12 +825,6 @@ export default function goalExtension(pi: ExtensionAPI): void {
 		} else {
 			goalWidgetComponent?.update();
 		}
-
-		if (state.goal.status === "complete") {
-			stopStatusRefresh();
-		} else {
-			syncStatusRefresh(ctx);
-		}
 	}
 
 	function loadState(ctx: ExtensionContext): void {
@@ -920,7 +849,8 @@ export default function goalExtension(pi: ExtensionAPI): void {
 		if (legacyGoal && legacyGoal.status !== "complete") {
 			legacyGoal = sanitizeGoalPaths(ctx, mergeGoalPromptFromDisk(ctx, legacyGoal));
 		}
-		focusedGoalId = resolveSessionFocus({ pool: goalsById, focusEntry, legacyGoal });
+		const settings = loadGoalSettings(ctx.cwd);
+		focusedGoalId = resolveSessionFocus({ pool: goalsById, focusEntry, legacyGoal, autoSelectSingleGoal: settings.autoSelectSingleGoal });
 		if (!focusEntry && focusedGoalId) {
 			try {
 				appendFocusEntry(focusedGoalId, legacyGoal?.id === focusedGoalId ? "migrated" : "selected");
@@ -1315,7 +1245,7 @@ Verification contract:
 		continuationTimer = null;
 		continuationScheduledFor = null;
 		syncGoalTools();
-		if (!isActionableContinuationGoal(goalId)) {
+		if (!state.goal || state.goal.id !== goalId || state.goal.status !== "active" || !state.goal.autoContinue) {
 			if (continuationQueuedFor === goalId) continuationQueuedFor = null;
 			return;
 		}
@@ -1652,6 +1582,7 @@ Verification contract:
 		if (key === "disabled") return config.disabled === true ? "true" : "false";
 		if (key === "disableTasks") return config.disableTasks === true ? "true" : "false";
 		if (key === "disableContracts") return config.disableContracts === true ? "true" : "false";
+		if (key === "autoSelectSingleGoal") return config.autoSelectSingleGoal === true ? "true" : "false";
 		if (key === "subtaskDepth") return config.subtaskDepth !== undefined ? String(config.subtaskDepth) : "1";
 		return config[key] ?? "(default)";
 	}
@@ -1673,7 +1604,7 @@ Verification contract:
 			ctx.ui.notify(`Settings file: ${goalSettingsPath(ctx.cwd)}`, "info");
 			return;
 		}
-		const editorKeys = ["disabled", "provider", "model", "thinking_level", "subtaskDepth"] as const;
+		const editorKeys = ["disabled", "provider", "model", "thinking_level", "subtaskDepth", "autoSelectSingleGoal"] as const;
 		while (true) {
 			const config = loadGoalSettingsFileConfig(ctx.cwd);
 			const options = settingsLines(config).map((line) => `  ${line}`);
@@ -1695,6 +1626,12 @@ Verification contract:
 				ctx.ui.notify(`Settings saved:\n${settingsLines(loadGoalSettingsFileConfig(ctx.cwd)).join("\n")}`, "info");
 				continue;
 			}
+			if (key === "autoSelectSingleGoal") {
+				const next = { ...config, autoSelectSingleGoal: config.autoSelectSingleGoal !== true };
+				saveGoalSettingsFileConfig(ctx.cwd, next);
+				ctx.ui.notify(`Settings saved:\n${settingsLines(loadGoalSettingsFileConfig(ctx.cwd)).join("\n")}`, "info");
+				continue;
+			}
 			if (key === "subtaskDepth") {
 				const input = await ctx.ui.input("Set subtaskDepth", String(config.subtaskDepth ?? 1));
 				if (input === undefined) continue;
@@ -2027,6 +1964,20 @@ Verification contract:
 			const autoContinueFlag = params.autoContinue ?? true;
 			const sisyphusFlag = validation.expectedSisyphus;
 			// Build confirmation text: goal + optional task list
+			function renderConfirmationTasks(tasks: GoalTask[], indent: number): string[] {
+				const prefix = "  ".repeat(indent);
+				const lines: string[] = [];
+				for (const t of tasks) {
+					const lw = t.lightweightSubtasks ? " (lightweight)" : "";
+					const contract = t.verificationContract ? ` contract: ${t.verificationContract}` : "";
+					lines.push(`${prefix}[ ] ${t.id}: ${t.title}${lw}${contract}`);
+					if (t.subtasks && t.subtasks.length > 0) {
+						lines.push(...renderConfirmationTasks(t.subtasks, indent + 1));
+					}
+				}
+				return lines;
+			}
+
 			let taskSummarySection = "";
 			let tasksToCreate: GoalTask[] | undefined;
 			if (params.tasks && params.tasks.length > 0) {
@@ -2173,25 +2124,10 @@ ${objective}` : objective,
 			"The user will see a full plain-text report plus a [Confirm] / [Continue Chatting] choice. Confirm applies the tweak; Continue Chatting returns control to you to ask follow-up questions.",
 			"If the tool returns 'continue chatting', ask the user what they want changed. Do NOT re-propose the same content immediately; iterate based on their feedback first.",
 			"Do NOT use write/edit/bash to modify the active goal file directly. propose_goal_tweak is the only sanctioned channel.",
-			"tasks (optional): an array of task objects to REPLACE the current goal's task list. When omitted,",
-			"  the existing task list is inherited as-is. When provided, the full task list is replaced with",
-			"  the new tasks — add/remove/change tasks by passing the complete updated list.",
-			"  Each task has: {id, title, verificationContract?, lightweightSubtasks?, subtasks?}.",
-			"  Subtasks use the same shape recursively. The task list is displayed in the confirmation",
-			"  dialog alongside the objective diff, matching propose_goal_draft's rendering format.",
-			"Start from the current goal's objective text and task list (the inheritance defaults), then",
-			"  edit/rewrite them directly rather than composing a goal from scratch.",
 		],
 		parameters: Type.Object({
 			newObjective: Type.String({ description: "The complete revised objective text. For Sisyphus goals, preserve the Sisyphus style unless the user explicitly changes it." }),
-			changeSummary: Type.String({ description: "One-sentence description of what was changed (used in confirmation dialog, activity log, and tweak log)." }),
-			tasks: Type.Optional(Type.Array(Type.Object({
-				id: Type.String({ description: "Short stable slug e.g. 'task-1'" }),
-				title: Type.String({ description: "Human-readable task title" }),
-				verificationContract: Type.Optional(Type.String({ description: "Optional verification contract for this task." })),
-				lightweightSubtasks: Type.Optional(Type.Boolean({ description: "If true, subtasks are lightweight (no completion enforcement). Default false." })),
-				subtasks: Type.Optional(Type.Any({ description: "Optional recursive array of sub-tasks (same shape as parent)." })),
-			}), { description: "Optional task list to replace the current goal's tasks. When omitted the existing task list is inherited. Each task supports recursive subtasks." })),
+			changeSummary: Type.String({ description: "One-sentence description of what was changed (used in confirmation dialog and tweak log)." }),
 		}),
 		executionMode: "sequential",
 		async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
@@ -2213,41 +2149,6 @@ ${objective}` : objective,
 			const changeSummary = params.changeSummary.trim();
 			if (!changeSummary) throw new Error("propose_goal_tweak requires a non-empty changeSummary.");
 
-			// Resolve tasks: inherit from current goal if not provided, or normalize/validate the passed tasks.
-			let tweakTasks: GoalTask[] | undefined;
-			if (params.tasks && Array.isArray(params.tasks) && params.tasks.length > 0) {
-				tweakTasks = params.tasks.map((t: Record<string, unknown>) => {
-					const task: GoalTask = {
-						id: t.id as string,
-						title: t.title as string,
-						status: "pending",
-						verificationContract: t.verificationContract as string | undefined,
-						lightweightSubtasks: t.lightweightSubtasks === true ? true : undefined,
-					};
-					const rawSubtasks = t.subtasks;
-					if (Array.isArray(rawSubtasks) && rawSubtasks.length > 0) {
-						task.subtasks = rawSubtasks
-							.map((s: Record<string, unknown>) => normalizeTaskItem(s))
-							.filter((s: GoalTask | undefined): s is GoalTask => !!s);
-					}
-					return task;
-				});
-				// Validate task list
-				if (tweakTasks.length > 50) {
-					return { content: [{ type: "text", text: "Task list cannot exceed 50 tasks." }], details: goalDetails(state.goal) };
-				}
-				const settings = loadGoalSettings(ctx.cwd);
-				const depthViolation = findSubtaskDepthViolation(tweakTasks, settings.subtaskDepth ?? 1);
-				if (depthViolation) {
-					return { content: [{ type: "text", text: depthViolation }], details: goalDetails(state.goal) };
-				}
-			} else {
-				// Inherit current task list when no tasks parameter provided
-				if (state.goal.taskList && state.goal.taskList.tasks.length > 0) {
-					tweakTasks = state.goal.taskList.tasks;
-				}
-			}
-
 			// Auto-start the tweak drafting flow if not already active.
 			if (tweakDraftingFor !== state.goal.id) {
 				await startGoalTweakDrafting(changeSummary, ctx);
@@ -2267,7 +2168,6 @@ ${objective}` : objective,
 				newObjective,
 				changeSummary,
 				sisyphus: !!state.goal.sisyphus,
-				tasks: tweakTasks,
 			});
 
 			const headless = shouldAutoConfirmProposal({ hasUI: ctx.hasUI, autoConfirmEnv: process.env.PI_GOAL_AUTO_CONFIRM });
@@ -2304,9 +2204,6 @@ ${objective}` : objective,
 					// Clear any prior agent pause reason — the user has redefined the work.
 					pauseReason: undefined,
 					pauseSuggestedAction: undefined,
-					taskList: tweakTasks && tweakTasks.length > 0
-						? { tasks: tweakTasks, blockCompletion: false, proposedAt: nowIso() }
-						: undefined,
 				};
 				// IMPORTANT: bypass setGoal() / persist() here. persist() calls
 				// syncGoalPromptFromDisk() which would RE-READ the stale objective
@@ -2316,10 +2213,9 @@ ${objective}` : objective,
 				// minimal state update manually:
 				//   1) write the new record to disk authoritatively
 				//   2) update in-memory `goal` to the canonical post-write record
-				//   3) append the state entry and re-sync tools
+				//   3) re-sync tools
 				//   4) clear the tweak drafting gate so propose_goal_tweak can't be re-used
 				state.goal = writeActiveGoalFile(ctx, next);
-				pi.appendEntry(STATE_ENTRY, goalDetails(state.goal));
 				tweakDraftingFor = null;
 				// Reset autoContinue counter — plan changed, agent gets a fresh chain.
 				resetGetGoalNudgeState(state.goal.id);
@@ -2339,20 +2235,6 @@ ${objective}` : objective,
 				} catch {
 					// Ledger append failure should not crash tweak
 				}
-				// Append ledger event for task list change if tasks were provided
-				if (params.tasks && Array.isArray(params.tasks) && params.tasks.length > 0) {
-					try {
-						appendGoalEvent(ctx, {
-							type: "task_list_set",
-							goalId: state.goal.id,
-							taskCount: params.tasks.length,
-							blockCompletion: false,
-							at: state.goal.updatedAt,
-						});
-					} catch {
-						// Ledger append failure should not crash tweak
-					}
-				}
 				return {
 					content: [{
 						type: "text",
@@ -2497,7 +2379,6 @@ ${objective}` : objective,
 					updatedAt: nowIso(),
 				};
 				state.goal = writeActiveGoalFile(ctx, state.goal);
-				pi.appendEntry(STATE_ENTRY, goalDetails(state.goal));
 				turnStoppedFor = state.goal?.id ?? null;
 				resetGetGoalNudgeState(state.goal?.id);
 				syncGoalTools();
@@ -2564,7 +2445,6 @@ ${objective}` : objective,
 					updatedAt: nowIso(),
 				};
 				state.goal = writeActiveGoalFile(ctx, state.goal);
-				pi.appendEntry(STATE_ENTRY, goalDetails(state.goal));
 				turnStoppedFor = state.goal?.id ?? null;
 				resetGetGoalNudgeState(state.goal?.id);
 				syncGoalTools();
@@ -2694,7 +2574,6 @@ ${objective}` : objective,
 						updatedAt: nowIso(),
 					};
 					state.goal = writeActiveGoalFile(ctx, state.goal);
-					pi.appendEntry(STATE_ENTRY, goalDetails(state.goal));
 					turnStoppedFor = state.goal?.id ?? null;
 					resetGetGoalNudgeState(state.goal?.id);
 					syncGoalTools();
@@ -2795,7 +2674,6 @@ ${objective}` : objective,
 				updatedAt: nowIso(),
 			};
 			state.goal = writeActiveGoalFile(ctx, state.goal);
-			pi.appendEntry(STATE_ENTRY, goalDetails(state.goal));
 			turnStoppedFor = state.goal?.id ?? null;
 			resetGetGoalNudgeState(state.goal?.id);
 			syncGoalTools();
@@ -3389,8 +3267,8 @@ promptGuidelines: [
 
 	pi.on("turn_start", async (_event, ctx) => {
 		// Per-turn flag resets (#4 + C9 fix).
-		advanceTurnSeq();
 		goalWorkToolCalledThisTurn = false;
+		turnStoppedFor = null;
 		syncGoalTools();
 		beginAccounting();
 		updateUI(ctx);
@@ -3398,29 +3276,17 @@ promptGuidelines: [
 
 	// #4 + C9 fix + Phase 5 C3: gate in-turn tool calls based on lifecycle state.
 	pi.on("tool_call", async (event, ctx) => {
-		const stoppedGoalId = currentTurnStoppedGoalId();
 		// Post-stop in-turn block (C9 0ad8 fix): after pause_goal / abort_goal /
 		// complete_goal / propose_goal_tweak fires in this turn, block all subsequent tool calls except
 		// read-only inspection. Forces the agent to yield the turn instead of "fixing"
 		// the situation by creating extra files etc.
-		if (stoppedGoalId !== null && !POST_STOP_ALLOWED_TOOL_SET.has(event.toolName)) {
+		if (turnStoppedFor !== null && !POST_STOP_ALLOWED_TOOL_SET.has(event.toolName)) {
 			return {
 				block: true,
-				reason: `The goal was already stopped earlier in this turn (goalId=${stoppedGoalId}). ` +
+				reason: `The goal was already stopped earlier in this turn (goalId=${turnStoppedFor}). ` +
 					`Do not call more tools; end the turn with a brief summary and yield to the user.`,
 			};
 		}
-		// Stale checkpoint guard: if the turn was triggered by a queued continuation
-		// for a goal that is no longer active/autoContinue, block work tools.
-		if (checkpointGoalId !== null && !isActionableContinuationGoal(checkpointGoalId) && isStaleCheckpointBlockedToolCall(event.toolName)) {
-			// Block the tool call with a stale-checkpoint message.
-			return {
-				block: true,
-				reason: `Cannot call ${event.toolName}: the goal checkpoint that triggered this turn is no longer active. ` +
-					`Goal ${checkpointGoalId} has been paused, cleared, or replaced. ` +
-					`End the turn with a brief summary and yield to the user.`,
-			};
-		}
 		// Phase 5 soft gate relaxation: active-goal question block and repeated get_goal
 		// block are removed. The agent is trusted to prefer work tools; prompts nudge
 		// toward concrete work without hard-stopping the turn.
@@ -3501,8 +3367,8 @@ promptGuidelines: [
 	});
 
 	pi.on("session_start", async (event, ctx) => {
-		loadState(ctx);
 		syncGoalTools();
+		loadState(ctx);
 		syncTerminalInputPause(ctx);
 		if (event.reason === "resume" && !state.goal && openGoals().length > 1 && ctx.hasUI) {
 			await focusGoalCommand(ctx);
@@ -3543,13 +3409,11 @@ promptGuidelines: [
 	});
 
 	pi.on("before_agent_start", async (event, ctx) => {
-		advanceTurnSeq();
 		syncGoalTools();
 		const currentSystemPrompt = () => ctx.getSystemPrompt?.() || event.systemPrompt;
 		const incomingGoalId = extractGoalIdFromInjectedMessage(event.prompt ?? "");
 
 		if (confirmationIntent !== null) {
-			checkpointGoalId = null;
 			clearContinuationState();
 			clearActiveAccounting();
 			runningGoalId = null;
@@ -3557,7 +3421,6 @@ promptGuidelines: [
 		}
 
 		if (tweakDraftingFor !== null) {
-			checkpointGoalId = null;
 			clearContinuationState();
 			clearActiveAccounting();
 			runningGoalId = null;
@@ -3568,12 +3431,8 @@ promptGuidelines: [
 		// matches the active goal, abort the whole turn instead of letting the
 		// model act on a stale instruction.
 		if (incomingGoalId !== null) {
-			// Reconcile from disk to pick up any external state changes before
-			// evaluating whether the checkpoint is actionable.
-			reconcileFocusedGoalFromDisk(ctx);
-			checkpointGoalId = incomingGoalId;
 			clearContinuationState();
-			if (!isActionableContinuationGoal(incomingGoalId)) {
+			if (!state.goal || state.goal.id !== incomingGoalId || (state.goal.status !== "active") || !state.goal.autoContinue) {
 				try {
 					ctx.abort?.();
 				} catch {}
@@ -3582,12 +3441,10 @@ promptGuidelines: [
 					systemPrompt: `${currentSystemPrompt()}\n\n${staleContinuationPrompt(incomingGoalId, state.goal)}`,
 				};
 			}
-			checkpointGoalId = null;
 		} else {
 			// A user-driven turn — clear any queued continuation so we don't
 			// double-fire after the user's own message returns. Also reset the
 			// autoContinue nudge state so the user always gets a fresh chain.
-			checkpointGoalId = null;
 			clearContinuationState();
 			resetGetGoalNudgeState(state.goal?.id);
 		}
@@ -3689,7 +3546,6 @@ promptGuidelines: [
 	pi.on("session_shutdown", async (_event, ctx) => {
 		accountProgress(ctx);
 		clearContinuationTimer();
-		stopStatusRefresh();
 		terminalInputUnsubscribe?.();
 		terminalInputUnsubscribe = null;
 		if (state.goal) persist(ctx);

package/extensions/prompts/goal-prompts.ts

@@ -238,21 +238,14 @@ export function goalTweakDraftingPrompt(current: GoalRecord, hint: string): stri
 		"<current_objective>",
 		promptSafeObjective(current.objective),
 		"</current_objective>",
-		...(current.taskList && current.taskList.tasks.length > 0
-			? ["", taskListBlock(current), ""]
-			: []),
 		`Sisyphus mode: ${sisyphusOn ? "on (prompt/criteria style)" : "off"}`,
 		"",
 		"User's tweak hint (may be empty):",
-		"User's tweak hint (may be empty):",
 		"<tweak_hint>",
 		safeHint,
 		"</tweak_hint>",
 		"",
 		"Drafting protocol:",
-		"- Start from the EXISTING goal — you are editing the current goal, not writing from scratch.",
-		"  The current objective (above) and task list (if any) are your starting point. Edit/rewrite",
-		"  them directly, preserving what works and changing what needs to change.",
 		"- Apply common sense: if the hint is fully self-explanatory, acknowledge in one sentence and apply the tweak immediately. Do not invent unnecessary questions.",
 		"- Otherwise ask focused questions (1-3 rounds) to clarify exactly what to change. Prefer numbered options or yes/no.",
 		"- Do NOT call create_goal (a goal already exists).",
@@ -271,10 +264,6 @@ export function goalTweakDraftingPrompt(current: GoalRecord, hint: string): stri
 			? " === Sisyphus Goal === block (Objective / Success criteria / Boundaries / Constraints / If blocked / Sisyphus reminder)."
 			: " === Goal === block (Objective / Success criteria / Boundaries / Constraints / If blocked)."),
 		"   - changeSummary: one sentence describing what changed.",
-		"   - tasks (optional): an array of task objects to REPLACE the current goal's task list. If omitted,",
-		"     the existing task list is inherited as-is. If you need to add/remove/change tasks, pass the",
-		"     full updated task list here. Each task has {id, title, verificationContract?, lightweightSubtasks?, subtasks?}.",
-		"     Subtasks use the same shape recursively.",
 		"2. propose_goal_tweak opens the user's Confirm / Continue Chatting dialog.",
 		"   - Confirm applies the tweak. Stop; the next continuation will arrive automatically if the goal is active.",
 		"   - Continue Chatting means the drafting stays active — ask the user what they want changed, then revise and call propose_goal_tweak again.",

package/extensions/widgets/goal-widget.ts

@@ -179,7 +179,7 @@ export function renderAuditorWidgetLines(progress: AuditorWidgetProgress, theme:
 			? truncateText(progress.currentToolArgs, Math.max(10, safeWidth - 24))
 			: "";
 		const toolDuration = progress.currentToolStartedAt
-			? ` ${theme.fg("dim", formatDuration(Date.now() - progress.currentToolStartedAt))}`
+			? ` ${theme.fg("dim", formatDuration(Math.floor((Date.now() - progress.currentToolStartedAt) / 1000)))}`
 			: "";
 		lines.push(branchLine(
 			theme,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-goal-x",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "Goal mode extension for pi: persistent long-running objectives, /goal-set drafting, Sisyphus prompt style, autoContinue, and an above-editor status overlay. Fork of @capyup/pi-goal.",
   "license": "MIT",
   "author": "pi-goal-x contributors",