pi-goal-x 0.22.0 → 0.23.0

package/extensions/goal-auditor.ts

@@ -13,6 +13,7 @@ import {
 	type ResourceLoader,
 } from "@earendil-works/pi-coding-agent";
 import type { GoalRecord, GoalTask, GoalTaskList } from "./goal-record.ts";
+import { countTaskSubtree } from "./goal-task-count.ts";
 import { loadGoalSettings, type GoalSettings, type ThinkingLevel } from "./goal-settings.ts";
 
 export interface AuditorProgress {
@@ -84,27 +85,9 @@ function renderAuditorTaskTree(tasks: GoalTask[], indent: number): string[] {
 	return lines;
 }
 
-function countAuditorTasks(tasks: GoalTask[]): { total: number; complete: number; skipped: number; pending: number } {
-	let total = 0;
-	let complete = 0;
-	let skipped = 0;
-	for (const t of tasks) {
-		total++;
-		if (t.status === "complete") complete++;
-		else if (t.status === "skipped") skipped++;
-		if (t.subtasks && t.subtasks.length > 0) {
-			const child = countAuditorTasks(t.subtasks);
-			total += child.total;
-			complete += child.complete;
-			skipped += child.skipped;
-		}
-	}
-	return { total, complete, skipped, pending: total - complete - skipped };
-}
-
 function taskSummaryBlock(taskList?: GoalTaskList | null): string {
 	if (!taskList || taskList.tasks.length === 0) return "";
-	const { total, complete, skipped, pending } = countAuditorTasks(taskList.tasks);
+	const { total, complete, skipped, pending } = countTaskSubtree(taskList.tasks);
 	const lines: string[] = [`Tasks: ${complete}/${total} complete${skipped > 0 ? `, ${skipped} skipped` : ""}`];
 	lines.push(...renderAuditorTaskTree(taskList.tasks, 0));
 	const gate = taskList.blockCompletion && pending > 0 ? " | TASK GATE: pending tasks block completion" : "";
@@ -117,6 +100,9 @@ export function buildGoalAuditorPrompt(args: {
 	detailedSummary: string;
 	completionSummary?: string | null;
 	settings?: GoalSettings;
+	/** P1-6: parent-rendered evidence (ledger tail + turn trail) so the audit
+	 * starts warm instead of re-deriving what the parent session already holds. */
+	warmContext?: string | null;
 }): string {
 	return [
 		"You are the independent completion auditor for pi-goal.",
@@ -153,6 +139,13 @@ export function buildGoalAuditorPrompt(args: {
 			args.goal.verificationContract.trim(),
 			"</verification_contract>",
 		] : []),
+		...(args.warmContext?.trim() ? [
+			"",
+			"Warm parent context (already-rendered evidence from the executor session — inspect, do not re-derive):",
+			"<warm_context>",
+			args.warmContext.trim(),
+			"</warm_context>",
+		] : []),
 		"",
 		"Audit checklist:",
 		...[
@@ -272,6 +265,8 @@ export async function runGoalCompletionAuditor(args: {
 	detailedSummary: string;
 	completionSummary?: string | null;
 	settings?: GoalSettings;
+	/** P1-6: parent-rendered evidence (ledger tail + turn trail). */
+	warmContext?: string | null;
 	signal?: AbortSignal;
 	onProgress?: AuditorProgressCallback;
 	/**
@@ -333,12 +328,18 @@ export async function runGoalCompletionAuditor(args: {
 			},
 		});
 
+		const projectResources = args.settings?.auditorProjectResources === true;
 		const { session } = await createSession({
 			cwd: args.ctx.cwd,
 			model,
 			thinkingLevel,
 			...resolveAuditorSessionModelOptions(args.ctx),
-			resourceLoader: makeAuditorResourceLoader(),
+			// E3: default = the empty isolated loader (deliberate isolation);
+			// when auditorProjectResources is on, let the runtime build its own
+			// loader so the project's skills/extensions reach the auditor.
+			...(projectResources
+				? { resourceLoaderOptions: { noExtensions: false, noSkills: false, noPromptTemplates: false, noThemes: false, noContextFiles: false } }
+				: { 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],

package/extensions/goal-commands.ts

@@ -1,6 +1,6 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { extractVerificationContract, sisyphusObjectiveSufficient } from "./goal-contract.ts";
-import { detailedSummary, oneLineSummary } from "./goal-format.ts";
+import { buildGoalHistoryBlock, detailedSummary, oneLineSummary } from "./goal-format.ts";
 import {
 	goalSettingsPath,
 	loadGoalSettings,
@@ -15,6 +15,8 @@ import {
 	otherOpenGoalCount,
 } from "./goal-pool.ts";
 import { clearGoalCommandMessage, validateResumeGoal } from "./goal-policy.ts";
+import { readGoalLedger } from "./goal-ledger.ts";
+import { effectiveSettingsReport, envOverrideFor } from "./goal-settings.ts";
 import { mergeGoalPromptFromDisk } from "./storage/goal-files.ts";
 import { nowIso, type GoalMode, type GoalRecord } from "./goal-record.ts";
 import { clearGoalDrafting, hasActiveDraft, startGoalDrafting } from "./goal-drafting.ts";
@@ -158,7 +160,14 @@ export function registerGoalCommands(core: GoalCore): void {
 		const view = core.goalForDisplay() ?? core.state.goal;
 		const otherCount = otherOpenGoalCount(core.goalsById, core.focusedGoalId);
 		const extra = view && otherCount > 0 ? `\nOther open goals: ${otherCount} (run /goal-list or /goal-focus)` : "";
-		const text = view ? `${detailedSummary(view)}${extra}` : core.openGoals().length > 0 ? buildUnfocusedOpenGoalsSummary(core.openGoals().length) : detailedSummary(null);
+		let text = view ? `${detailedSummary(view)}${extra}` : core.openGoals().length > 0 ? buildUnfocusedOpenGoalsSummary(core.openGoals().length) : detailedSummary(null);
+		if (view) {
+			// E1: goal history (last audit verdict + recent lifecycle events).
+			const history = buildGoalHistoryBlock(view, readGoalLedger(ctx).events);
+			if (history) text += `\n\n${history}`;
+			// E2: effective settings with provenance.
+			text += `\n\n${effectiveSettingsReport(ctx.cwd).join("\n")}`;
+		}
 		ctx.ui.notify(text, "info");
 		core.updateUI(ctx);
 	}
@@ -249,6 +258,7 @@ export function registerGoalCommands(core: GoalCore): void {
 	const SETTING_ROWS: readonly SettingRow[] = [
 		{ key: "autoSelectSingleGoal", label: "autoSelectSingleGoal", section: "Goal behavior", kind: "boolean" },
 		{ key: "disableContracts", label: "disableContracts", section: "Goal behavior", kind: "boolean" },
+		{ key: "stallTimeoutMinutes", label: "stall timeout (minutes)", section: "Goal behavior", kind: "positiveInteger" },
 		{ key: "disableTasks", label: "disableTasks", section: "Task tracking", kind: "boolean" },
 		{ key: "subtaskDepth", label: "subtaskDepth", section: "Task tracking", kind: "positiveInteger" },
 		{ key: "disabled", label: "auditor disabled", section: "Completion auditor", kind: "boolean" },
@@ -258,10 +268,11 @@ export function registerGoalCommands(core: GoalCore): void {
 	];
 
 	function settingsValue(config: GoalSettings, key: keyof GoalSettings): string {
-		if (key === "disabled" || key === "disableTasks" || key === "disableContracts" || key === "autoSelectSingleGoal") {
+		if (key === "disabled" || key === "disableTasks" || key === "disableContracts" || key === "autoSelectSingleGoal" || key === "auditorProjectResources") {
 			return config[key] === true ? "true" : "false";
 		}
 		if (key === "subtaskDepth") return config.subtaskDepth !== undefined ? String(config.subtaskDepth) : "1";
+		if (key === "stallTimeoutMinutes") return config.stallTimeoutMinutes !== undefined ? String(config.stallTimeoutMinutes) : "0";
 		return config[key] ?? "(default)";
 	}
 
@@ -300,7 +311,8 @@ export function registerGoalCommands(core: GoalCore): void {
 						options.push(`─── ${row.section} ───`);
 						lastSection = row.section;
 					}
-					options.push(`  ${row.label}: ${settingsValue(config, row.key)}`);
+					const envVar = envOverrideFor(row.key);
+					options.push(envVar ? `  ${row.label}: ${settingsValue(config, row.key)} (env: ${envVar} — read-only)` : `  ${row.label}: ${settingsValue(config, row.key)}`);
 				}
 				options.push("Done");
 				const selected = await ctx.ui.select("Goal settings", options);
@@ -314,6 +326,10 @@ export function registerGoalCommands(core: GoalCore): void {
 			const row = SETTING_ROWS.find((r) => r.label === label);
 			if (!row) continue;
 			const key = row.key;
+			if (envOverrideFor(key)) {
+				ctx.ui.notify(`${row.label} is read-only: overridden by the ${envOverrideFor(key)} env var.`, "warning");
+				continue;
+			}
 			if (row.kind === "boolean") {
 				const next = { ...config, [key]: config[key] !== true };
 				saveSettings(next);

package/extensions/goal-completion.ts

@@ -9,6 +9,7 @@ import {
 import { loadGoalSettings, loadGoalSettingsFileConfig } from "./goal-settings.ts";
 import { runGoalCompletionAuditor } from "./goal-auditor.ts";
 import { nowIso, type GoalRecord } from "./goal-record.ts";
+import { latestEventsForGoal, readGoalLedger } from "./goal-ledger.ts";
 import { mergeGoalPromptFromDisk } from "./storage/goal-files.ts";
 import { showEscapeDialog, type EscapeDialogResult } from "./widgets/goal-escape-dialog.ts";
 import type { GoalCore } from "./goal-state.ts";
@@ -235,12 +236,21 @@ if (settings.disabled === true) {
 	const completionAuditController = new AbortController();
 	core.auditAbortController = completionAuditController;
 
+	// P1-6: warm start — seed the auditor with the parent-rendered ledger tail
+	// (recent lifecycle + task evidence) so it does not re-derive session facts.
+	const ledger = readGoalLedger(ctx).events;
+	const warmTail = latestEventsForGoal(ledger, auditTarget.id, 8);
+	const warmContext = warmTail.length > 0
+		? `Recent goal events (from the shared ledger):\n${warmTail.map((e) => `- ${e.at} ${e.type}${"taskId" in e ? ` (task ${e.taskId})` : ""}${"evidence" in e && e.evidence ? ` evidence: ${e.evidence}` : ""}`).join("\n")}`
+		: null;
+
 	const auditor = await (core.dependencies.runCompletionAuditor ?? runGoalCompletionAuditor)({
 		ctx,
 		goal: auditTarget,
 		detailedSummary: detailedSummary(auditTarget),
 		completionSummary: completionSummary?.trim() || undefined,
 		settings: loadGoalSettings(ctx.cwd),
+		warmContext,
 		signal: completionAuditController.signal,
 		onProgress: (progress) => {
 			core.auditProgress = {

package/extensions/goal-core-tools.ts

@@ -7,6 +7,10 @@ import { detailedSummary, goalDetails, renderGoalResult } from "./goal-format.ts
 import { budgetLine } from "./goal-accounting.ts";
 import { buildGoalCreatedReport, buildTaskSummary, validateGoalAgentPause, validateGoalBlock } from "./goal-policy.ts";
 import { buildUnfocusedOpenGoalsSummary, otherOpenGoalCount } from "./goal-pool.ts";
+import { readGoalLedger } from "./goal-ledger.ts";
+import { buildGoalHistoryBlock, buildGoalTaskDetailBlock } from "./goal-format.ts";
+import { sisyphusStepProgress } from "./goal-policy.ts";
+import { deriveTasksFromObjective } from "./goal-task-derive.ts";
 import { nowIso, validateTokenBudgetInput } from "./goal-record.ts";
 import type { GoalCore } from "./goal-state.ts";
 
@@ -47,13 +51,23 @@ pi.registerTool(defineTool({
 		const lines: string[] = [view.objective, ""];
 		lines.push(`Status: ${statusLabel(view)}`);
 		lines.push(`Mode: ${view.sisyphus ? "sisyphus" : "regular"}`);
+		if (view.sisyphus) {
+			// E6: sisyphus ordered-step progress.
+			const steps = sisyphusStepProgress(view);
+			if (steps) lines.push(`At step: ${steps.current} of ${steps.total}`);
+		}
 		const usageBits: string[] = [];
 		if (view.usage.activeSeconds > 0) usageBits.push(formatDuration(view.usage.activeSeconds));
 		if (view.usage.tokensUsed > 0) usageBits.push(formatTokenValue(view.usage.tokensUsed));
 		lines.push(`Usage: ${usageBits.length > 0 ? usageBits.join(" · ") : "none"}`);
 		const budget = budgetLine(view);
 		if (budget) lines.push(`Budget: ${budget}`);
-		if (view.taskList) lines.push(`Tasks: ${buildTaskSummary(view.taskList)}`);
+		if (view.taskList) {
+			lines.push(`Tasks: ${buildTaskSummary(view.taskList)}`);
+			// F1: task-detail block mirroring the widget.
+			const detail = buildGoalTaskDetailBlock(view);
+			if (detail) lines.push("", detail);
+		}
 		if (view.verificationContract?.trim()) lines.push(`Verification contract: ${view.verificationContract.trim()}`);
 		if (view.status === "paused" || view.status === "blocked") {
 			if (view.pauseReason) lines.push(`Blocker: ${view.pauseReason}`);
@@ -64,6 +78,9 @@ pi.registerTool(defineTool({
 		if (otherCount > 0) lines.push(`Other open goals: ${otherCount} (user can run /goal-list or /goal-focus)`);
 		lines.push("");
 		lines.push("Lifecycle: call update_goal({status: \"complete\"}) only when every requirement is satisfied — the independent auditor verifies from actual evidence. Call update_goal({status: \"blocked\"}) only after the same blocker recurs on three consecutive goal turns. User commands handle pause/resume/clear/focus.");
+		// E1: goal history (last audit verdict + recent lifecycle events).
+		const history = buildGoalHistoryBlock(view, readGoalLedger(ctx).events);
+		if (history) lines.push("", history);
 		return {
 			content: [{ type: "text", text: lines.join("\n") }],
 			details: goalDetails(view),
@@ -73,7 +90,7 @@ pi.registerTool(defineTool({
 		return new Text(theme.fg("toolTitle", "get_goal"), 0, 0);
 	},
 	renderResult(result, _options, theme) {
-		return renderGoalResult(result, theme);
+		return renderGoalResult(result, _options, theme);
 	},
 }));
 
@@ -129,8 +146,14 @@ pi.registerTool(defineTool({
 		const otherLine = otherCount > 0
 			? `\n${otherCount} other open goal${otherCount === 1 ? "" : "s"} remain in .pi/goals — this goal is now the session focus.`
 			: "";
+		// F2: the agent path stays tool-driven — surface the derivable task plan
+		// as guidance so the agent proposes it via set_goal_tasks.
+		const derived = !created?.taskList ? deriveTasksFromObjective(cleanedObjective) : null;
+		const bootstrapLine = derived && derived.length > 0
+			? `\n\nThe objective contains ${derived.length} ordered step${derived.length === 1 ? "" : "s"}; propose them as the task tree with set_goal_tasks if the user wants tracked milestones.`
+			: "";
 		return {
-			content: [{ type: "text", text: `${buildGoalCreatedReport({ objective: created?.objective ?? objective, detailedSummary: detailedSummary(created) })}${otherLine}` }],
+			content: [{ type: "text", text: `${buildGoalCreatedReport({ objective: created?.objective ?? objective, detailedSummary: detailedSummary(created) })}${bootstrapLine}${otherLine}` }],
 			details: goalDetails(created),
 			terminate: true,
 		};
@@ -140,7 +163,7 @@ pi.registerTool(defineTool({
 		return new Text(theme.fg("toolTitle", prefix) + theme.fg("muted", args?.objective ?? ""), 0, 0);
 	},
 	renderResult(result, _options, theme) {
-		return renderGoalResult(result, theme);
+		return renderGoalResult(result, _options, theme);
 	},
 }));
 
@@ -243,7 +266,7 @@ async function runGoalAgentPauseFlow(ctx: ExtensionContext, reason: string | und
 	const suggestion = trimmedAction ? ` Suggested next step: ${trimmedAction}` : "";
 	return {
 		content: [{ type: "text", text: `Goal paused by the agent: ${trimmedReason}.${suggestion} Stop now; the user can resume with /goal-resume or revise with /goal-tweak.` }],
-		details: goalDetails(core.state.goal),
+		details: goalDetails(core.state.goal, `Pause reason: ${trimmedReason}${trimmedAction ? `\nSuggested action: ${trimmedAction}` : ""}`), // E7
 		terminate: true,
 	};
 }
@@ -269,6 +292,9 @@ pi.registerTool(defineTool({
 	}, { additionalProperties: false }),
 	executionMode: "sequential",
 	async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+		// P1-3: persist any buffered in-turn mutations now so the auditor and
+		// status transitions observe the current task/state, not the stale disk.
+		core.flushGoalTransaction(ctx);
 		if (params.status === "blocked") {
 			return runGoalBlockedFlow(ctx);
 		}
@@ -281,7 +307,7 @@ pi.registerTool(defineTool({
 		return new Text(theme.fg("toolTitle", "update_goal ") + theme.fg("muted", args?.status ?? ""), 0, 0);
 	},
 	renderResult(result, _options, theme) {
-		return renderGoalResult(result, theme);
+		return renderGoalResult(result, _options, theme);
 	},
 }));
 }

package/extensions/goal-draft.ts

@@ -1,4 +1,6 @@
 import type { GoalTask } from "./goal-record.ts";
+import { promptSafeObjective } from "./goal-contract.ts";
+import { renderConfirmationTasks } from "./goal-task-confirmation.ts";
 
 export type GoalDraftingFocus = "goal" | "sisyphus";
 
@@ -25,7 +27,6 @@ export type ToolGateDecision =
 	| { block: true; reason: string };
 
 // ── Shared formatting helpers ──────────────────────────────────────────────
-
 function formatModeLabel(sisyphus: boolean): string {
 	return sisyphus ? "Sisyphus (prompt/criteria style)" : "Normal goal";
 }
@@ -49,75 +50,6 @@ function formatSection(title: string, content: string): string[] {
 	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;"));
-}
-
-const VERIFICATION_CONTRACT_RE = /^Verification contract:\s*(.+)$/im;
-
-const CONVENTIONAL_SECTION_NAMES = [
-	"success criteria",
-	"boundaries",
-	"constraints",
-	"if blocked",
-	"if blocked / unclear / failing",
-	"don'ts",
-	"sisyphus reminder",
-	"objective",
-	"目标",
-	"ordered steps",
-	"order rules",
-	"steps",
-];
-
-/**
- * Extract a `Verification contract:` section from a goal objective and return
- * the cleaned objective (without the contract section) and the contract text.
- *
- * The contract section is a single line matching:
- *   Verification contract: <text>
- *
- * It can appear anywhere in the objective, but by convention it goes after
- * the other sections (like Success criteria, Boundaries, Constraints).
- *
- * If no contract section is found, `verificationContract` is undefined.
- */
-export function extractVerificationContract(objective: string): { objective: string; verificationContract?: string } {
-	const lines = objective.replace(/\r/g, "").split("\n");
-	let contract: string | undefined;
-	const filtered: string[] = [];
-
-	for (const line of lines) {
-		const trimmed = line.trim();
-		const m = VERIFICATION_CONTRACT_RE.exec(trimmed);
-		if (m) {
-			contract = m[1].trim();
-			// Skip this line — don't add it to the cleaned objective
-		} else {
-			filtered.push(line);
-		}
-	}
-
-	return {
-		objective: filtered.join("\n"),
-		verificationContract: contract || undefined,
-	};
-}
-
 export function buildDraftConfirmationText(args: {
 	focus: GoalDraftingFocus;
 	originalTopic: string;

package/extensions/goal-drafting.ts

@@ -2,7 +2,9 @@ import { Type } from "@earendil-works/pi-ai";
 import { defineTool, type ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { extractVerificationContract, sisyphusObjectiveSufficient } from "./goal-contract.ts";
-import { buildDraftConfirmationText, buildTweakConfirmationText, goalDraftingPrompt, renderConfirmationTasks, type GoalDraftingFocus } from "./goal-draft.ts";
+import { buildDraftConfirmationText, buildTweakConfirmationText, goalDraftingPrompt, type GoalDraftingFocus } from "./goal-draft.ts";
+import { renderConfirmationTasks } from "./goal-task-confirmation.ts";
+import { deriveTasksFromObjective } from "./goal-task-derive.ts";
 import { goalDetails, renderGoalResult } from "./goal-format.ts";
 import { buildGoalCreatedReport } from "./goal-policy.ts";
 import { loadGoalSettings } from "./goal-settings.ts";
@@ -39,6 +41,8 @@ interface ActiveGoalDraft {
 	targetGoalId?: string;
 	startedAt: string;
 	auditorEnabled: boolean;
+	/** E5: formatted questionnaire Q&A to echo in the created-goal report. */
+	questionnaireEcho?: string;
 }
 
 const activeDrafts = new WeakMap<GoalCore, ActiveGoalDraft>();
@@ -183,7 +187,20 @@ function proposalText(draft: ActiveGoalDraft, objective: string, autoContinue: b
 	const base = draft.mode === "tweak" && current
 		? buildTweakConfirmationText({ currentObjective: current.objective, newObjective: objective, changeSummary: draft.originalTopic || "Goal revised through guided drafting.", sisyphus: current.sisyphus, tasks: taskList?.tasks })
 		: buildDraftConfirmationText({ focus: draft.mode === "sisyphus" ? "sisyphus" : "goal", originalTopic: draft.originalTopic, objective, autoContinue });
-	return !taskList || draft.mode === "tweak" ? base : base + "\n\nTasks proposed for confirmation:\n" + renderConfirmationTasks(taskList.tasks, 0).join("\n");
+	// F2 (option A, user-approved 2026-08-05): when a new draft has no proposed
+	// task list but the objective has ≥2 checklist/ordered markers, preview the
+	// derived tree in the confirmation so the human can adjust it before the
+	// goal exists. Plain objectives render byte-identical to 383ae52.
+	let tasksText = "";
+	if (taskList && taskList.tasks.length > 0) {
+		tasksText = "\n\nTasks proposed for confirmation:\n" + renderConfirmationTasks(taskList.tasks, 0).join("\n");
+	} else if (draft.mode !== "tweak") {
+		const derived = deriveTasksFromObjective(base);
+		if (derived && derived.length > 0) {
+			tasksText = "\n\nTasks derived from the objective (confirm or ask the agent to adjust):\n" + renderConfirmationTasks(derived, 0).join("\n");
+		}
+	}
+	return !taskList && draft.mode === "tweak" ? base : base + tasksText;
 }
 
 function flatTaskSchema() {
@@ -220,7 +237,7 @@ export function registerDraftingTools(core: GoalCore): void {
 			}
 		},
 		renderCall() { return new Text("goal_question", 0, 0); },
-		renderResult(result, _opts, theme) { return renderGoalResult(result, theme); },
+		renderResult(result, _opts, theme) { return renderGoalResult(result, _opts, theme); },
 	}));
 
 	pi.registerTool(defineTool({
@@ -244,13 +261,17 @@ export function registerDraftingTools(core: GoalCore): void {
 			core.enterGoalModal();
 			try {
 				const result = await runGoalQuestionnaire(ctx, questions);
+				if (!result.cancelled) {
+					const active = activeDraft(core);
+					if (active) active.questionnaireEcho = formatQuestionnaireAnswers(result); // E5
+				}
 				return { content: [{ type: "text", text: result.cancelled ? "The user cancelled the questionnaire. Continue drafting conversationally." : formatQuestionnaireAnswers(result) }], details: goalDetails(core.state.goal) };
 			} finally {
 				core.exitGoalModal();
 			}
 		},
 		renderCall() { return new Text("goal_questionnaire", 0, 0); },
-		renderResult(result, _opts, theme) { return renderGoalResult(result, theme); },
+		renderResult(result, _opts, theme) { return renderGoalResult(result, _opts, theme); },
 	}));
 
 	pi.registerTool(defineTool({
@@ -316,9 +337,18 @@ export function registerDraftingTools(core: GoalCore): void {
 			const settings = loadGoalSettings(ctx.cwd);
 			const extracted = settings.disableContracts ? { objective, verificationContract: undefined } : extractVerificationContract(objective);
 			if (draft.mode !== "tweak") {
-				core.replaceGoal({ objective: extracted.objective, autoContinue: params.auto_continue !== false, sisyphus: expectedSisyphus, taskList: taskResult.value, skipAuditor }, ctx, true, extracted.verificationContract);
+				// F2: if the confirmation carried no task plan but the objective has
+				// structure, bootstrap the derived tree so the goal starts trackable.
+				const effectiveTaskList: GoalTaskList | undefined = taskResult.value ?? (() => {
+					const derived = deriveTasksFromObjective(extracted.objective);
+					return derived && derived.length > 0 ? { tasks: derived, blockCompletion: false, proposedAt: nowIso() } : undefined;
+				})();
+				core.replaceGoal({ objective: extracted.objective, autoContinue: params.auto_continue !== false, sisyphus: expectedSisyphus, taskList: effectiveTaskList, skipAuditor }, ctx, true, extracted.verificationContract);
 				clearGoalDrafting(core, ctx);
-				return { content: [{ type: "text", text: buildGoalCreatedReport({ objective: extracted.objective }) }], details: goalDetails(core.state.goal), terminate: true };
+				// E5: echo the questionnaire Q&A in the created-goal report so the
+				// user can verify their input survived the clarification loop.
+				const qaEcho = activeDraft(core)?.questionnaireEcho;
+				return { content: [{ type: "text", text: buildGoalCreatedReport({ objective: extracted.objective, detailedSummary: qaEcho }) }], details: goalDetails(core.state.goal), terminate: true };
 			}
 			if (!target) return { content: [{ type: "text", text: "The goal changed while drafting; review it and start /goal-tweak again." }], details: goalDetails(core.state.goal) };
 			const token = core.focusedOperationToken(target.id);
@@ -335,6 +365,6 @@ export function registerDraftingTools(core: GoalCore): void {
 			return { content: [{ type: "text", text: "Goal tweak confirmed and applied." }], details: goalDetails(result.goal), terminate: true };
 		},
 		renderCall(args, theme) { return new Text(theme.fg("toolTitle", "propose_goal_draft ") + theme.fg("muted", args?.objective ?? ""), 0, 0); },
-		renderResult(result, _opts, theme) { return renderGoalResult(result, theme); },
+		renderResult(result, _opts, theme) { return renderGoalResult(result, _opts, theme); },
 	}));
 }

package/extensions/goal-events.ts

@@ -14,8 +14,9 @@ import {
 import { buildCompactionSummary } from "./goal-compaction.ts";
 import { latestAuditorResultForGoal, readGoalLedger } from "./goal-ledger.ts";
 import { shouldArmPostCompactReminder, shouldInjectPostCompactReminder } from "./goal-policy.ts";
+import { formatTokenValue } from "./goal-core.ts";
 import { loadGoalSettings } from "./goal-settings.ts";
-import { budgetLine } from "./goal-accounting.ts";
+import { budgetLine, budgetRemaining } from "./goal-accounting.ts";
 import { asRecord, nowIso, type AssistantMessageLike } from "./goal-record.ts";
 import { goalSelectorLabel } from "./goal-pool.ts";
 import {
@@ -79,6 +80,8 @@ export function registerGoalEvents(core: GoalCore): void {
 		core.advanceTurnSeq();
 		core.goalWorkToolCalledThisTurn = false;
 		core.beginAccounting();
+		core.goalService.beginTurn(ctx, core.focusedGoalId); // P1-3 transaction buffer
+		core.touchGoalActivity(); // F5
 		core.updateUI(ctx);
 	});
 
@@ -115,12 +118,14 @@ export function registerGoalEvents(core: GoalCore): void {
 	});
 
 	pi.on("tool_execution_end", async (_event, ctx) => {
+		core.touchGoalActivity(); // F5
 		core.accountProgress(ctx);
 	});
 
 	pi.on("turn_end", async (event, ctx) => {
 		const message = event.message as AssistantMessageLike;
 		const tokens = assistantTurnTokens(message);
+		core.touchGoalActivity(); // F5
 		core.accountProgress(ctx, { completedTurnTokens: tokens });
 
 		if (isAbortedAssistantMessage(message)) {
@@ -185,6 +190,7 @@ export function registerGoalEvents(core: GoalCore): void {
 		) {
 			core.queueContinuation(ctx);
 		}
+		core.goalService.endTurn(ctx); // P1-3: single flush (lock + write + ledger batch)
 	});
 
 	pi.on("message_end", async (event, ctx) => {
@@ -196,7 +202,8 @@ export function registerGoalEvents(core: GoalCore): void {
 	});
 
 	pi.on("session_start", async (event, ctx) => {
-		core.loadState(ctx);
+		core.goalService.flushTurn(ctx); // P1-3: persist any buffered transaction before reload
+		await core.loadState(ctx);
 		core.installGoalToolProfile(!loadGoalSettings(ctx.cwd).disableTasks);
 		rehydrateDraft(core, ctx);
 		syncTerminalInputPause(core, ctx);
@@ -234,6 +241,7 @@ export function registerGoalEvents(core: GoalCore): void {
 	});
 
 	pi.on("session_compact", async (_event, ctx) => {
+		core.goalService.flushTurn(ctx); // P1-3: persist any buffered transaction before reload
 		if (core.state.goal) core.persist(ctx);
 		core.beginAccounting();
 		// Arm a deterministic compaction summary for the next agent turn.
@@ -245,7 +253,8 @@ export function registerGoalEvents(core: GoalCore): void {
 	});
 
 	pi.on("session_tree", async (_event, ctx) => {
-		core.loadState(ctx);
+		core.goalService.flushTurn(ctx); // P1-3: persist any buffered transaction before reload
+		await core.loadState(ctx);
 		rehydrateDraft(core, ctx);
 		syncTerminalInputPause(core, ctx);
 		core.beginAccounting();
@@ -329,8 +338,15 @@ export function registerGoalEvents(core: GoalCore): void {
 		if (core.state.goal?.status === "budget_limited") {
 			const limitedGoal = core.state.goal;
 			const budgetText = budgetLine(limitedGoal);
+			// E4: surface the remaining-vs-overshoot fact in the wrap-up steering.
+			const remaining = budgetRemaining(limitedGoal);
+			const balanceText = typeof remaining === "number"
+				? remaining < 0
+					? ` — ${formatTokenValue(-remaining)} over the budget`
+					: ` — ${formatTokenValue(remaining)} remaining`
+				: "";
 			const reminder = core.runtime.consumePostBudgetReminder()
-				? `\n\n[TOKEN BUDGET REACHED goalId=${limitedGoal.id}]\nThe goal's token budget has been reached${budgetText ? ` (${budgetText})` : ""}. Wrap up the current work in one final response: summarize what was accomplished and what remains, do not start new substantive work, and do not claim the goal is complete unless it actually is. To continue, the user must raise or remove the budget and resume the goal.`
+				? `\n\n[TOKEN BUDGET REACHED goalId=${limitedGoal.id}]\nThe goal's token budget has been reached${budgetText ? ` (${budgetText}${balanceText})` : ""}. Wrap up the current work in one final response: summarize what was accomplished and what remains, do not start new substantive work, and do not claim the goal is complete unless it actually is. To continue, the user must raise or remove the budget and resume the goal.`
 				: "";
 			return {
 				systemPrompt: `${currentSystemPrompt()}\n\n[PI GOAL BUDGET LIMITED goalId=${limitedGoal.id}]\n${untrustedObjectiveBlock(limitedGoal)}${budgetText ? `\n${budgetText}` : ""}${reminder}`,
@@ -339,6 +355,9 @@ export function registerGoalEvents(core: GoalCore): void {
 		const activeGoal = core.state.goal;
 		const settings = loadGoalSettings(ctx.cwd);
 		let prompt = goalPrompt(activeGoal, settings);
+		// F5: [GOAL STALLED] steering note when the detector fired.
+		const stalledNote = core.checkStall(ctx);
+		if (stalledNote) prompt += stalledNote;
 		// Inject durable auditor feedback if the latest result was a rejection
 		try {
 			const ledger = readGoalLedger(ctx);