pi-goal-x 0.27.5 → 0.28.0

package/README.md

@@ -400,12 +400,21 @@ the timestamped `.backup-*` file created next to the session.
 
 ## Configuration
 
-Settings are stored in:
+Settings resolve per setting in this order (highest wins):
 
 ```text
-.pi/pi-goal-x-settings.json
+environment > project layer > global layer > defaults
 ```
 
+Files:
+
+```text
+global:  ~/.pi/pi-goal-x-settings.json   (or $PI_CODING_AGENT_DIR, or $PI_GOAL_GLOBAL_SETTINGS_FILE)
+project: <cwd>/.pi/pi-goal-x-settings.json   (or $PI_GOAL_SETTINGS_FILE)
+```
+
+Define shared configuration once in the global file and override per project. Explicit `false`/`0` values in a lower layer override inherited values; nested `keybindings` inherit per key. `/goal-settings` shows each row's effective value and source, can switch the edited scope, and can remove a local override to return to inheritance.
+
 Use `/goal-settings` to configure task lists, verification contracts, subtask depth, automatic goal selection, and completion auditing. Goal objectives have no hard length limit by default; set `objectiveMaxChars` (or `PI_GOAL_OBJECTIVE_MAX_CHARS`, `0` = no limit) to cap objective length across `create_goal`, `propose_goal_draft`, and `/goal-tweak`.
 
 Configure the task shortcuts in the same file when the terminal captures the defaults:

package/extensions/goal-commands.ts

@@ -5,10 +5,15 @@ import { extractVerificationContract, sisyphusObjectiveSufficient } from "./goal
 import { detailedSummary, oneLineSummary } from "./goal-format.ts";
 import {
 	goalSettingsPath,
+	goalGlobalSettingsPath,
 	loadGoalSettings,
-	loadGoalSettingsFileConfig,
-	saveGoalSettingsFileConfig,
+	loadSettingsSnapshot,
+	mutateSettingsLayer,
+	readSettingsLayer,
+	envOverrideFor,
 	type GoalSettings,
+	type SettingsMutation,
+	type SettingsScope,
 } from "./goal-settings.ts";
 import {
 	buildGoalListText,
@@ -19,7 +24,7 @@ import {
 import { clearGoalCommandMessage, validateResumeGoal } from "./goal-policy.ts";
 import { invalidateGoalLedgerCache, readGoalLedger } from "./goal-ledger.ts";
 import { buildGoalStatusText } from "./goal-status.ts";
-import { effectiveSettingsReport, envOverrideFor, invalidateGoalSettingsCache } from "./goal-settings.ts";
+import { effectiveSettingsReport, invalidateGoalSettingsCache, loadGoalSettingsFileConfig } from "./goal-settings.ts";
 import { invalidateGoalPoolCache, mergeGoalPromptFromDisk, readActiveGoalPool } from "./storage/goal-files.ts";
 import { nowIso, type GoalMode, type GoalRecord } from "./goal-record.ts";
 import { clearGoalDrafting, hasActiveDraft, startGoalDrafting } from "./goal-drafting.ts";
@@ -383,6 +388,7 @@ export function registerGoalCommands(core: GoalCore): void {
 
 	const SETTING_ROWS: readonly SettingRow[] = [
 		{ key: "autoSelectSingleGoal", label: "autoSelectSingleGoal", section: "Goal behavior", kind: "boolean" },
+		{ key: "hideUnfocusedBanner", label: "hideUnfocusedBanner", 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: "objectiveMaxChars", label: "max objective length (0 = none)", section: "Goal behavior", kind: "positiveInteger" },
@@ -395,7 +401,7 @@ export function registerGoalCommands(core: GoalCore): void {
 	];
 
 	function settingsValue(config: GoalSettings, key: keyof GoalSettings): string {
-		if (key === "disabled" || key === "disableTasks" || key === "disableContracts" || key === "autoSelectSingleGoal" || key === "auditorProjectResources") {
+		if (key === "disabled" || key === "disableTasks" || key === "disableContracts" || key === "autoSelectSingleGoal" || key === "auditorProjectResources" || key === "hideUnfocusedBanner") {
 			return config[key] === true ? "true" : "false";
 		}
 		if (key === "subtaskDepth") return config.subtaskDepth !== undefined ? String(config.subtaskDepth) : "1";
@@ -412,29 +418,52 @@ export function registerGoalCommands(core: GoalCore): void {
 
 	async function handleSettingsMenu(ctx: ExtensionContext): Promise<void> {
 		if (!ctx.hasUI) {
-			ctx.ui.notify(`Settings file: ${goalSettingsPath(ctx.cwd)}`, "info");
+			// Headless: read-only report of both layer paths.
+			ctx.ui.notify(
+				`Settings — project file: ${goalSettingsPath(ctx.cwd)}\nGlobal file: ${goalGlobalSettingsPath()}`,
+				"info",
+			);
 			return;
 		}
+
 		/**
-		 * Persist a settings edit, then reinstall the fixed three/five profile
-		 * when the effective disableTasks value changed since the last install.
-		 * core.tasksEnabled tracks the last profile actually installed (updated
-		 * by installGoalToolProfile), so toggling task availability off, on, and
-		 * off within one menu session reinstalls on every real change instead of
-		 * comparing against the value captured when the menu opened.
+		 * After any mutation: reinstall the fixed three/five tool profile when
+		 * the effective disableTasks value changed since the last install, and
+		 * refresh the UI. This is the central settings side-effect hook — no
+		 * ad hoc per-row refresh code.
 		 */
-		const saveSettings = (next: GoalSettings): void => {
-			saveGoalSettingsFileConfig(ctx.cwd, next);
+		const applyEffectiveSettings = (): void => {
 			const tasksEnabledNow = !loadGoalSettings(ctx.cwd).disableTasks;
 			if (tasksEnabledNow !== core.tasksEnabled) {
 				core.installGoalToolProfile(tasksEnabledNow);
 			}
+			// PR #29: settings changes must be visible immediately — the banner
+			// hide/restore happens through this coalesced UI refresh.
+			core.updateUI(ctx);
+		};
+
+		const applyMutation = (scope: SettingsScope, mutation: SettingsMutation): boolean => {
+			try {
+				mutateSettingsLayer({ scope, cwd: ctx.cwd, mutation });
+				applyEffectiveSettings();
+				return true;
+			} catch (err) {
+				ctx.ui.notify(`Settings change failed: ${err instanceof Error ? err.message : String(err)}`, "warning");
+				return false;
+			}
 		};
+
+		const scopePath = (scope: SettingsScope): string =>
+			scope === "global" ? goalGlobalSettingsPath() : goalSettingsPath(ctx.cwd);
+
 		core.enterGoalModal();
 		try {
+			let scope: SettingsScope = "project";
 			while (true) {
-				const config = loadGoalSettingsFileConfig(ctx.cwd);
+				const snapshot = loadSettingsSnapshot(ctx.cwd);
+				const localLayer = snapshot[scope].layer as Record<string, unknown>;
 				const options: string[] = [];
+				options.push(`─── Editing: ${scope} (${scopePath(scope)}) ───`);
 				let lastSection: string | null = null;
 				for (const row of SETTING_ROWS) {
 					if (row.section !== lastSection) {
@@ -442,109 +471,147 @@ export function registerGoalCommands(core: GoalCore): void {
 						lastSection = row.section;
 					}
 					const envVar = envOverrideFor(row.key);
-					options.push(envVar ? `  ${row.label}: ${settingsValue(config, row.key)} (env: ${envVar} — read-only)` : `  ${row.label}: ${settingsValue(config, row.key)}`);
+					if (envVar) {
+						options.push(`  ${row.label}: ${settingsValue(snapshot.value, row.key)} (environment; read-only)`);
+						continue;
+					}
+					const provenance = snapshot.provenance.get(String(row.key));
+					let source: string;
+					if (provenance?.source === "global") source = scope === "project" ? "(inherited from global)" : "(global override)";
+					else if (provenance?.source === "project") source = scope === "project" ? "(project override)" : "(project; edit via project scope)";
+					else source = "(default)";
+					const hasLocalOverride = localLayer[row.key] !== undefined;
+					if (hasLocalOverride && provenance?.source === scope) source = `(${scope} override)`;
+					options.push(`  ${row.label}: ${settingsValue(snapshot.value, row.key)} ${source}`);
 				}
 				options.push("Done");
 				const selected = await ctx.ui.select("Goal settings", options);
 				if (!selected || selected === "Done") break;
-				if (selected.startsWith("───")) continue; // section headers are not rows
-				// Strip leading spaces and resolve the row from the display label.
-				const selectedTrimmed = selected.trim();
-				const colon = selectedTrimmed.indexOf(":");
+				if (selected.startsWith("───")) continue; // headers are not rows
+				const trimmed = selected.trim();
+				if (trimmed.startsWith("Scope:")) {
+					scope = scope === "project" ? "global" : "project";
+					continue;
+				}
+				const colon = trimmed.indexOf(":");
 				if (colon === -1) continue;
-			const label = selectedTrimmed.slice(0, colon).trim();
-			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);
-				ctx.ui.notify(`Settings saved:\n${settingsLines(loadGoalSettingsFileConfig(ctx.cwd)).join("\n")}`, "info");
-				continue;
-			}
-			if (row.kind === "positiveInteger") {
-				const input = await ctx.ui.input(`Set ${row.label}`, settingsValue(config, key));
-				if (input === undefined) continue;
-				// Row-driven lower bound: subtaskDepth is a nesting depth (min 1);
-				// stallTimeoutMinutes and objectiveMaxChars default to 0 meaning
-				// "off / no limit".
-				const min = (row.key === "stallTimeoutMinutes" || row.key === "objectiveMaxChars") ? 0 : 1;
-				// Full-string decimal validation: no partial parseInt. Rejects
-				// 1.5, 1x, negatives, infinity, and unsafe integers alike.
-				const trimmed = input.trim();
-				if (!/^[0-9]+$/.test(trimmed) || !Number.isSafeInteger(Number(trimmed)) || Number(trimmed) < min) {
-					ctx.ui.notify(`${row.label} must be an integer >= ${min} (e.g. ${min}, ${min + 1}, ${min + 2})`, "warning");
+				const label = trimmed.slice(0, colon).trim();
+				const row = SETTING_ROWS.find((r) => r.label === label);
+				if (!row) continue;
+				if (envOverrideFor(row.key)) {
+					ctx.ui.notify(`${row.label} is read-only: overridden by the ${envOverrideFor(row.key)} env var.`, "warning");
 					continue;
 				}
-				const next = { ...config, [key]: Number(trimmed) };
-				saveSettings(next);
-				ctx.ui.notify(`Settings saved:\n${settingsLines(loadGoalSettingsFileConfig(ctx.cwd)).join("\n")}`, "info");
-				continue;
-			}
-			if (row.kind === "thinking") {
-				const currentValue = settingsValue(config, key);
-				const levels = thinkingLevelChoices(currentValue === "(default)" ? undefined : currentValue);
-				const picked = await ctx.ui.select(`Set ${row.label}`, levels);
-				if (!picked) continue;
-				const trimmed = picked.trim().replace(/^\u2713\s+/, "");
-				const next: GoalSettings = { ...config };
-				if (trimmed === "(default)") {
-					delete next.thinkingLevel;
-				} else if ((AUDITOR_THINKING_LEVELS as readonly string[]).includes(trimmed)) {
-					next.thinkingLevel = trimmed as GoalSettings["thinkingLevel"];
-				} else {
-					ctx.ui.notify(`thinking_level must be one of: ${AUDITOR_THINKING_LEVELS.join(", ")} (or "(default)")`, "warning");
+
+				const inheritLabel = scope === "project" ? "Use inherited value" : "Use default (delete global override)";
+				const hasLocalOverride = localLayer[row.key] !== undefined;
+
+				if (row.kind === "boolean") {
+					const effective = snapshot.provenance.get(String(row.key))?.value === true;
+					const actions = [
+						`Set ${scope} override to true`,
+						`Set ${scope} override to false`,
+					];
+					if (hasLocalOverride) actions.push(inheritLabel);
+					actions.push("Cancel");
+					const action = await ctx.ui.select(`${row.label} (${scope})`, actions);
+					if (!action || action === "Cancel") continue;
+					if (action === inheritLabel) {
+						applyMutation(scope, { op: "unset", path: [row.key] });
+						continue;
+					}
+					const value = action.endsWith("true");
+					if (value !== effective || !hasLocalOverride) {
+						applyMutation(scope, { op: "set", path: [row.key], value });
+					}
 					continue;
 				}
-				saveSettings(next);
-				ctx.ui.notify(`Settings saved:\n${settingsLines(loadGoalSettingsFileConfig(ctx.cwd)).join("\n")}`, "info");
-				continue;
-			}
-			// modelSelector rows (provider, model): searchable auditor model
-			// picker with current-session/default, authenticated models (\u2713
-			// marker on the exact current selection), and a manual
-			// provider/model entry (ll01 pattern). Either row applies the same
-			// provider+model pair.
-			const configured = configuredAuditorModelKey(config);
-			const session = ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined;
-			const choices = buildAuditorModelChoices(ctx.modelRegistry.getAvailable(), configured, session);
-			const filter = await ctx.ui.input("Filter auditor models (provider/id/name; blank = all)", "");
-			if (filter === undefined) continue;
-			const filtered = filterAuditorModelChoices(choices, filter);
-			const picked = await ctx.ui.select("Select auditor model", filtered.map((choice) => choice.label));
-			if (!picked) continue;
-			const choice = filtered.find((candidate: AuditorChoice) => candidate.label === picked);
-			if (!choice) continue;
-			const next: GoalSettings = { ...config };
-			if (choice.kind === "default") {
-				delete next.provider;
-				delete next.model;
-			} else if (choice.kind === "manual") {
-				const input = await ctx.ui.input("Set auditor provider/model", configured ?? "provider/model");
-				if (input === undefined) continue;
-				const parsed = parseManualAuditorModel(input);
-				if ("error" in parsed) {
-					ctx.ui.notify(parsed.error, "warning");
+
+				if (row.kind === "positiveInteger") {
+					const min = (row.key === "stallTimeoutMinutes" || row.key === "objectiveMaxChars") ? 0 : 1;
+					const actions = [`Set ${scope} override...`];
+					if (hasLocalOverride) actions.push(inheritLabel);
+					actions.push("Cancel");
+					const action = await ctx.ui.select(`${row.label} (${scope})`, actions);
+					if (!action || action === "Cancel") continue;
+					if (action === inheritLabel) {
+						applyMutation(scope, { op: "unset", path: [row.key] });
+						continue;
+					}
+					const input = await ctx.ui.input(`Set ${row.label}`, String(snapshot.provenance.get(String(row.key))?.value ?? min));
+					if (input === undefined) continue;
+					// Full-string decimal validation: rejects 1.5, 1x, negatives,
+					// infinity, and unsafe integers alike.
+					const value = input.trim();
+					if (!/^[0-9]+$/.test(value) || !Number.isSafeInteger(Number(value)) || Number(value) < min) {
+						ctx.ui.notify(`${row.label} must be an integer >= ${min} (e.g. ${min}, ${min + 1}, ${min + 2})`, "warning");
+						continue;
+					}
+					applyMutation(scope, { op: "set", path: [row.key], value: Number(value) });
 					continue;
 				}
-				next.provider = parsed.provider;
-				next.model = parsed.model;
-			} else {
-				next.provider = choice.provider;
-				next.model = choice.model;
-			}
-			saveSettings(next);
-			ctx.ui.notify(`Settings saved:\n${settingsLines(loadGoalSettingsFileConfig(ctx.cwd)).join("\n")}`, "info");
+
+				if (row.kind === "thinking") {
+					const currentValue = settingsValue(snapshot.value, row.key);
+					const levels = thinkingLevelChoices(currentValue === "(default)" ? undefined : currentValue);
+					const picked = await ctx.ui.select(`Set ${row.label} (${scope})`, levels);
+					if (!picked) continue;
+					const choice = picked.trim().replace(/^\u2713\s+/, "");
+					if (choice === "(default)") {
+						if (hasLocalOverride) applyMutation(scope, { op: "unset", path: ["thinkingLevel"] });
+						continue;
+					}
+					if (!(AUDITOR_THINKING_LEVELS as readonly string[]).includes(choice)) {
+						ctx.ui.notify(`thinking_level must be one of: ${AUDITOR_THINKING_LEVELS.join(", ")} (or "(default)")`, "warning");
+						continue;
+					}
+					applyMutation(scope, { op: "set", path: ["thinkingLevel"], value: choice });
+					continue;
+				}
+
+				// modelSelector rows (provider, model): searchable auditor model
+				// picker with explicit inherit/default handling. Either row applies
+				// the same provider+model pair.
+				const configured = configuredAuditorModelKey(snapshot.value as GoalSettings);
+				const session = ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined;
+				const choices = buildAuditorModelChoices(ctx.modelRegistry.getAvailable(), configured, session);
+				const filter = await ctx.ui.input("Filter auditor models (provider/id/name; blank = all)", "");
+				if (filter === undefined) continue;
+				const filtered = filterAuditorModelChoices(choices, filter);
+				const picked = await ctx.ui.select("Select auditor model", filtered.map((choice: AuditorChoice) => choice.label));
+				if (!picked) continue;
+				const choice = filtered.find((candidate: AuditorChoice) => candidate.label === picked);
+				if (!choice) continue;
+				if (choice.kind === "default") {
+					for (const key of ["provider", "model"] as const) {
+						if (localLayer[key] !== undefined) applyMutation(scope, { op: "unset", path: [key] });
+					}
+					continue;
+				}
+				let providerValue: string;
+				let modelValue: string;
+				if (choice.kind === "manual") {
+					const input = await ctx.ui.input("Set auditor provider/model", configured ?? "provider/model");
+					if (input === undefined) continue;
+					const parsed = parseManualAuditorModel(input);
+					if ("error" in parsed) {
+						ctx.ui.notify(parsed.error, "warning");
+						continue;
+					}
+					providerValue = parsed.provider;
+					modelValue = parsed.model;
+				} else {
+					providerValue = choice.provider;
+					modelValue = choice.model;
+				}
+				if (applyMutation(scope, { op: "set", path: ["provider"], value: providerValue })) {
+					applyMutation(scope, { op: "set", path: ["model"], value: modelValue });
+				}
 			}
 		} finally {
 			core.exitGoalModal();
 		}
 	}
-
 	async function handleGoalClear(ctx: ExtensionContext): Promise<void> {
 		core.reconcileFocusedGoalFromDisk(ctx);
 		if (!core.state.goal && core.openGoals().length > 0) {