Iterator/safe role model handoff

extensions/iterator.js

@@ -53,6 +53,7 @@ import {
 	actionToCommand,
 	activityTextFromMessage,
 	attributionFromInput,
+	autoCompleteMessage,
 	AUTO_PHASE_FOR_STEP,
 	bundleExists,
 	featuresDirEntries,
@@ -821,11 +822,7 @@ export default function iteratorExtension(pi) {
 				});
 				autoSteps = 0;
 				await restoreModel();
-				notifyUi(
-					sess.settings?.auto_retire_prompt === "on"
-						? "auto mode: plan complete — every feature landed. Consider retiring the plan from the dashboard."
-						: "auto mode: plan complete — every feature landed.",
-				);
+				notifyUi(autoCompleteMessage(sess.settings));
 				await refreshHub(cwd);
 				return;
 			}
@@ -1161,7 +1158,7 @@ export default function iteratorExtension(pi) {
 					}
 					const cmd = actionToCommand(result);
 					if (!cmd) return;
-					session.showWorking(`Dispatched ${cmd} — Claude is working…`);
+					session.showWorking(`Dispatched ${cmd} — Agent is working…`);
 					dispatch(cmd);
 				},
 				onControl,
@@ -1411,6 +1408,17 @@ export default function iteratorExtension(pi) {
 					// Work so their paths and target state are immediately visible.
 					void refreshHub(ctx.cwd, { activateWork: true });
 				}
+				if (result?.autoCompleted) {
+					// The agent plan-review writer already made the terminal state
+					// durable. Converge the local UI now instead of waiting for an
+					// agent-end callback that may race an iframe refresh.
+					autoSteps = 0;
+					await restoreModel();
+					session?.clearWorking?.();
+					const { settings } = await gatherSession(ctx.cwd);
+					notifyUi(autoCompleteMessage(settings));
+					await refreshHub(ctx.cwd, { activateWork: true });
+				}
 				if (approved) {
 					void refreshHub(ctx.cwd, { activateWork: true });
 					try {

lib/gather.mjs

@@ -38,7 +38,7 @@
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { isAbsolute, join, relative, resolve } from "node:path";
 import { git } from "./git.mjs";
-import { effectiveSettings, parseState } from "./settings.mjs";
+import { effectiveSettings, parseState, SETTINGS_DEFS } from "./settings.mjs";
 import { planStage, readiness, satisfiedSet } from "./status.mjs";
 import {
 	backlogItems,
@@ -934,7 +934,9 @@ export function gatherUsage(startDir) {
 	const b = loadBundle(startDir);
 	const data = usageDataAt(join(b.memDir, "usage.md"));
 	const totals = data?.totals || { steps: {}, features: {}, featureModels: {} };
-	const prices = data?.prices || {};
+	// A non-null project catalog is authoritative, including an explicit empty
+	// table. Older active ledgers keep working only until Budget saves a catalog.
+	const prices = b.settings.usage_prices ?? data?.prices ?? {};
 	return {
 		step: "usage",
 		branch: b.branch,
@@ -1068,7 +1070,9 @@ export function gatherSettings(startDir) {
 		plan: b.plan?.fm.title || null,
 		// Effective values (defaults merged) — the view renders and edits these;
 		// `defined` says whether memory/settings.md exists yet.
-		settings: b.settings,
+		settings: Object.fromEntries(
+			Object.entries(b.settings).filter(([key]) => !SETTINGS_DEFS[key]?.hidden),
+		),
 		defined: b.settingsDefined,
 		state: b.state,
 	};

lib/pi-tools.mjs

@@ -268,6 +268,13 @@ export const AUTO_PHASE_FOR_STEP = {
 	"plan-review": "reviewing",
 };
 
+/** The shared terminal notification for both normal and immediate auto completion. */
+export function autoCompleteMessage(settings) {
+	return settings?.auto_retire_prompt === "on"
+		? "auto mode: plan complete — every feature landed. Consider retiring the plan from the dashboard."
+		: "auto mode: plan complete — every feature landed.";
+}
+
 /** Preserve the active item when a ready wave is paused mid-turn. */
 export function pauseFeatureWave(wave) {
 	if (!wave || !Array.isArray(wave.queue) || !Array.isArray(wave.results))