@gavin-hu/my-pi-agent 0.13.1 → 0.15.0

package/extensions/bytefly/notify/config.ts

@@ -14,11 +14,11 @@
  * flags then narrow what is announced.
  */
 
-import { cleanString, loadConfigSection } from "../../../lib/config.ts";
+import { asBoolean, cleanString, loadConfigSection } from "../../../lib/config.ts";
 import { NOTIFY_METHODS, type NotifyConfig, type NotifyMethod } from "./types.ts";
 
 /** A notification title longer than this is clamped; it is a label, not a message. */
-const MAX_TITLE_LENGTH = 40;
+export const MAX_TITLE_LENGTH = 40;
 
 export const DEFAULT_NOTIFY_CONFIG: NotifyConfig = {
 	enabled: false,
@@ -30,11 +30,6 @@ export const DEFAULT_NOTIFY_CONFIG: NotifyConfig = {
 	title: "Pi",
 };
 
-/** A boolean, or the fallback. */
-function bool(value: unknown, fallback: boolean): boolean {
-	return typeof value === "boolean" ? value : fallback;
-}
-
 /** One of the known methods, or the fallback. */
 function method(value: unknown, fallback: NotifyMethod): NotifyMethod {
 	return typeof value === "string" && (NOTIFY_METHODS as readonly string[]).includes(value)
@@ -46,11 +41,11 @@ function method(value: unknown, fallback: NotifyMethod): NotifyMethod {
 export function normalizeNotifyConfig(raw: Record<string, unknown> | undefined, base: NotifyConfig): NotifyConfig {
 	if (!raw) return base;
 	return {
-		enabled: bool(raw.enabled, base.enabled),
-		turnFinished: bool(raw.turnFinished, base.turnFinished),
-		needsInput: bool(raw.needsInput, base.needsInput),
-		jobFinished: bool(raw.jobFinished, base.jobFinished),
-		matchFound: bool(raw.matchFound, base.matchFound),
+		enabled: asBoolean(raw.enabled, base.enabled),
+		turnFinished: asBoolean(raw.turnFinished, base.turnFinished),
+		needsInput: asBoolean(raw.needsInput, base.needsInput),
+		jobFinished: asBoolean(raw.jobFinished, base.jobFinished),
+		matchFound: asBoolean(raw.matchFound, base.matchFound),
 		method: method(raw.method, base.method),
 		title: cleanString(raw.title, base.title).slice(0, MAX_TITLE_LENGTH),
 	};

package/extensions/bytefly/notify/dispatch.ts

@@ -14,7 +14,7 @@
  * to smuggle a control character into an escape sequence or a shell argument.
  */
 
-import { execFile } from "node:child_process";
+import { spawn } from "node:child_process";
 import { sanitizeLine } from "../../../lib/format.ts";
 import type { NotifyConfig, NotifyMethod } from "./types.ts";
 
@@ -30,7 +30,7 @@ export interface NotifySeams {
 	run(command: string, args: string[]): void;
 }
 
-/** The production seams: this process's platform, environment, stdout, and `execFile`. */
+/** The production seams: this process's platform, environment, stdout, and a detached notifier. */
 export function defaultSeams(): NotifySeams {
 	return {
 		platform: process.platform,
@@ -38,9 +38,14 @@ export function defaultSeams(): NotifySeams {
 		stdout: process.stdout,
 		run: (command, args) => {
 			try {
-				execFile(command, args, { windowsHide: true }, () => {});
+				// No pipes and unref'd: the notifier is best-effort and must not keep
+				// Pi alive, which `/quit` right after a turn would otherwise wait out
+				// (PowerShell's cold start alone is a second).
+				const child = spawn(command, args, { windowsHide: true, stdio: "ignore" });
+				child.on("error", () => {});
+				child.unref();
 			} catch {
-				// The notifier is best-effort; a missing command must not break a turn.
+				// A missing command must not break a turn.
 			}
 		},
 	};
@@ -89,7 +94,10 @@ function windowsToastScript(title: string, body: string): string {
 	return [
 		`${mgr} > $null`,
 		`$xml = [${type}.ToastNotificationManager]::GetTemplateContent(${template})`,
-		`$xml.GetElementsByTagName('text')[0].AppendChild($xml.CreateTextNode('${powershellLiteral(body)}')) > $null`,
+		`$nodes = $xml.GetElementsByTagName('text')`,
+		// PowerShell 5.1 cannot index the live node list with `[0]`; `.Item(0)`
+		// reads the single node without enumerating a collection AppendChild mutates.
+		`$nodes.Item(0).AppendChild($xml.CreateTextNode('${powershellLiteral(body)}')) > $null`,
 		`[${type}.ToastNotificationManager]::CreateToastNotifier('${powershellLiteral(title)}').Show(${toast})`,
 	].join("; ");
 }

package/extensions/bytefly/panel/commands.ts

@@ -29,6 +29,7 @@ import type { Discovery } from "../picker/types.ts";
 import { formatListing, formatSettingsListing } from "./format.ts";
 import { buildPanelModel, extensionName } from "./join.ts";
 import { createSettingsRuntime, type SettingsRuntime, type SettingsRuntimeDeps } from "./settings-runtime.ts";
+import { shippedThemeNames } from "./themes.ts";
 import { PanelComponent } from "./tui.ts";
 import type { PanelSection } from "./types.ts";
 
@@ -130,6 +131,19 @@ function notifyExtension(
 	);
 }
 
+/**
+ * Theme names the row offers: the host's resolved list, narrowed to this
+ * package's own palettes. The list is empty outside the TUI (RPC, print, JSON),
+ * where the row still shows the stored value.
+ */
+function settingsThemeNames(ctx: ExtensionCommandContext): string[] {
+	try {
+		return shippedThemeNames(ctx.ui.getAllThemes());
+	} catch {
+		return [];
+	}
+}
+
 /** Register the single `/bytefly` command. */
 export function registerPanel(pi: ExtensionAPI, deps: PanelCommandDeps): void {
 	const discover = deps.discover ?? discoverExtensions;
@@ -146,6 +160,7 @@ export function registerPanel(pi: ExtensionAPI, deps: PanelCommandDeps): void {
 		const cwd = ctx.cwd ?? process.cwd();
 		const agentDir = getAgentDir();
 		const trusted = ctx.isProjectTrusted();
+		const themes = settingsThemeNames(ctx);
 		// The mounted screen owns its feedback: a refusal or a failed write belongs in
 		// the frame, not appended to the transcript behind it. Before the screen
 		// exists (the non-TUI settings path, a pre-mount failure) the transcript is
@@ -171,8 +186,8 @@ export function registerPanel(pi: ExtensionAPI, deps: PanelCommandDeps): void {
 		// packages or probing the doctor.
 		if (section === "settings" && ctx.mode !== "tui") {
 			const stores = createSettingsStores(cwd, agentDir, trusted);
-			const settings = makeSettings({ stores, cwd, agentDir, trusted, onError: settingsNotice });
-			ctx.ui.notify(formatSettingsListing(settings.views("global"), "global"), "info");
+			const settings = makeSettings({ stores, cwd, agentDir, trusted, themes, onError: settingsNotice });
+			ctx.ui.notify(formatSettingsListing(settings.views("global")), "info");
 			return;
 		}
 
@@ -189,6 +204,7 @@ export function registerPanel(pi: ExtensionAPI, deps: PanelCommandDeps): void {
 			cwd,
 			agentDir,
 			trusted: discovery.trusted,
+			themes,
 			onError: settingsNotice,
 		});
 
@@ -236,6 +252,9 @@ export function registerPanel(pi: ExtensionAPI, deps: PanelCommandDeps): void {
 		await withRailsSuppressed(pi, () =>
 			ctx.ui.custom<void>((tui, theme, _keybindings, done) => {
 				const unsubscribe = runtime.onChange(() => tui.requestRender());
+				// The settings runtime re-reads its snapshot after a write; without a
+				// subscriber that repaint depends on every write chain's own callback.
+				const unsubscribeSettings = settings.onChange(() => tui.requestRender());
 				const component = new PanelComponent({
 					runtime,
 					reports: () => reports,
@@ -257,6 +276,7 @@ export function registerPanel(pi: ExtensionAPI, deps: PanelCommandDeps): void {
 						// A late error falls back to the transcript, never a disposed screen.
 						panel = undefined;
 						unsubscribe();
+						unsubscribeSettings();
 						done();
 					},
 				});

package/extensions/bytefly/panel/format.ts

@@ -31,7 +31,7 @@ export interface SummarySegment {
 }
 
 /** Row and problem counts over a model. */
-export interface PanelCounts {
+interface PanelCounts {
 	extensions: number;
 	/** Rows switched off in settings (the picker's checkbox), not the env flag. */
 	off: number;
@@ -113,28 +113,21 @@ export function sectionSegments(active: PanelSection): SummarySegment[] {
 export function settingsSummarySegments(scope: PanelScope, count: number): SummarySegment[] {
 	return [
 		{ text: scope === "global" ? "Global" : "Project", color: "accent" },
-		{ text: `${count} ${count === 1 ? "setting" : "settings"}`, color: "meta" },
+		{ text: `${count} settings`, color: "meta" },
 	];
 }
 
-/** The Settings headline for non-TUI modes, e.g. `bytefly: Settings · Global · 5 settings`. */
-export function formatSettingsHeadline(scope: PanelScope, count: number): string {
-	return `bytefly: Settings · ${settingsSummarySegments(scope, count)
-		.map((segment) => segment.text)
-		.join(" · ")}`;
-}
-
 /**
- * The grouped Settings listing for non-TUI modes. The project form names the
- * missing app rows rather than leaving their absence unexplained.
+ * The Settings headline for non-TUI modes, e.g. `bytefly: Settings · Global · 16 settings`.
+ * The listing only ever reads the personal document, so the scope is not a parameter.
  */
-export function formatSettingsListing(views: readonly SettingView[], scope: PanelScope): string {
-	const lines = [formatSettingsHeadline(scope, views.length)];
-	if (scope === "project") lines.push("", "  App settings are Global only.");
-	if (views.length === 0) {
-		lines.push("", "No settings found.");
-		return lines.join("\n");
-	}
+export function formatSettingsHeadline(count: number): string {
+	return `bytefly: Settings · Global · ${count} settings`;
+}
+
+/** The grouped Settings listing for non-TUI modes. */
+export function formatSettingsListing(views: readonly SettingView[]): string {
+	const lines = [formatSettingsHeadline(views.length)];
 	for (const group of groupViews(views)) {
 		lines.push("", `${group.label} (${group.views.length})`);
 		for (const view of group.views) {
@@ -152,7 +145,7 @@ export function formatHeadline(model: PanelModel, scope: PanelScope, options: Pa
 }
 
 /** A row's glyph and verdict, drawn from its enablement and health axes. */
-export interface RowBadge {
+interface RowBadge {
 	/** The status glyph, or `undefined` when the row has nothing to say. */
 	glyph?: string;
 	/** The role the glyph is painted in. */
@@ -165,8 +158,10 @@ export interface RowBadge {
  * The row's badge. Settings is the enablement axis the checkbox already shows,
  * so an off extension gets one verdict (`off`) instead of a health word that
  * contradicts it. `PI_DISABLED_EXTENSIONS` is a different axis, so it is named
- * rather than sharing the word: `env disabled`. A row without a report leaves
- * the glyph and the word blank instead of claiming `ok`.
+ * rather than sharing the word: `env disabled`. The glyph marks what needs
+ * attention — a warning, a miss, a disable — so a row with nothing to report
+ * carries no glyph at all, and the column reads as one shape instead of a
+ * checkmark that comes and goes.
  */
 export function rowBadge(row: PanelRow): RowBadge {
 	if (row.item && !row.item.enabled) return { glyph: GLYPHS.disabled, role: "faint", text: "off" };
@@ -174,6 +169,7 @@ export function rowBadge(row: PanelRow): RowBadge {
 	if (!report) return { role: "faint" };
 	if (!report.enabled) return { glyph: GLYPHS.disabled, role: "faint", text: "env disabled" };
 	const severity = reportSeverity(report);
+	if (severity === "ok") return { role: "faint", text: reportSummary(report) };
 	return { glyph: severityGlyphChar(severity), role: severityRole(severity), text: reportSummary(report) };
 }
 

package/extensions/bytefly/panel/settings-runtime.ts

@@ -1,20 +1,28 @@
 /**
  * The stateful Settings section: one snapshot of the two config documents and
- * the personal settings, the dirty flag, and the two write paths.
+ * the personal settings, the dirty flag, and the writes it offers.
  *
  * App rows are written through Pi's `SettingsStore` (personal file only), and
- * `bytefly.json` rows through the per-key writer, so an edit cannot disturb a
- * sibling key or another extension's section. A failed write leaves the
- * snapshot untouched and reports through `onError`; the screen never shows a
- * value the file did not accept.
+ * `bytefly.json` rows through the per-key writers, so an edit cannot disturb a
+ * sibling key or another extension's section. A reset deletes one leaf through the
+ * same path, and the JSON pane reads the section the row belongs to. A failed
+ * write leaves the snapshot untouched and reports through `onError`; the screen
+ * never shows a value the file did not accept.
  */
 
 import { join } from "node:path";
 import { CONFIG_DIR_NAME, type QuietStartup } from "@earendil-works/pi-coding-agent";
-import { readJson, SHARED_CONFIG_FILE, writeConfigValueAt } from "../../../lib/config.ts";
+import {
+	configSection,
+	configValueAt,
+	readJson,
+	SHARED_CONFIG_FILE,
+	unsetConfigValueAt,
+	writeConfigValuesAt,
+} from "../../../lib/config.ts";
 import type { SettingsStore, WriteScope } from "../picker/types.ts";
 import {
-	countSettings,
+	type ConfigSectionName,
 	nextValue,
 	type SettingDescriptor,
 	type SettingsSnapshot,
@@ -23,7 +31,7 @@ import {
 	settingViews,
 	storedValue,
 	textError,
-	validValue,
+	UNTRUSTED_SETTINGS_NOTE,
 } from "./settings.ts";
 
 /** Host seams for the Settings runtime. */
@@ -35,16 +43,21 @@ export interface SettingsRuntimeDeps {
 	trusted: boolean;
 	/** Report a refused or failed write to the screen. */
 	onError?: (message: string) => void;
+	/** Theme names for the Theme row, already narrowed to this package's palettes; empty outside the TUI. */
+	themes?: readonly string[];
 }
 
 /** What the panel needs from the runtime. */
 export interface SettingsSurface {
 	views(scope: WriteScope): SettingView[];
-	count(scope: WriteScope): number;
 	/** Cycle an enum or toggle a boolean. */
 	change(scope: WriteScope, id: string): Promise<void>;
 	/** Store a value the user typed; `false` when the row refused it. */
 	setValue(scope: WriteScope, id: string, raw: string): Promise<boolean>;
+	/** Delete the focused row's leaf so its default applies; `false` when nothing changed. */
+	reset(scope: WriteScope, id: string): Promise<boolean>;
+	/** The raw `bytefly.json` section for `scope`, for the JSON pane. */
+	sectionDocument(scope: WriteScope, section: ConfigSectionName): unknown;
 	isDirty(): boolean;
 }
 
@@ -62,8 +75,9 @@ export function configPath(scope: WriteScope, cwd: string, agentDir: string): st
 function readSnapshot(deps: SettingsRuntimeDeps): SettingsSnapshot {
 	return {
 		app: deps.stores.global.globalSettings(),
-		global: readJson(join(deps.agentDir, SHARED_CONFIG_FILE)) ?? {},
-		project: deps.trusted ? (readJson(join(deps.cwd, CONFIG_DIR_NAME, SHARED_CONFIG_FILE)) ?? {}) : {},
+		global: readJson(configPath("global", deps.cwd, deps.agentDir)) ?? {},
+		project: deps.trusted ? (readJson(configPath("project", deps.cwd, deps.agentDir)) ?? {}) : {},
+		themes: deps.themes ?? [],
 	};
 }
 
@@ -80,6 +94,9 @@ function applyAppSetting(store: SettingsStore, row: SettingDescriptor, raw: stri
 		case "showHardwareCursor":
 			store.setShowHardwareCursor(value as boolean);
 			return;
+		case "theme":
+			store.setTheme(value as string);
+			return;
 		default:
 			throw new Error(`Unknown app setting ${row.id}`);
 	}
@@ -88,7 +105,7 @@ function applyAppSetting(store: SettingsStore, row: SettingDescriptor, raw: stri
 /** Why `row` cannot be written in `scope`, or `undefined` when it can. */
 function refusal(row: SettingDescriptor, scope: WriteScope, trusted: boolean): string | undefined {
 	if (scope === "project" && !trusted) {
-		return "Project is not trusted; settings can only be changed in Global scope.";
+		return UNTRUSTED_SETTINGS_NOTE;
 	}
 	if (row.source === "app" && scope !== "global") return `${row.label} is a Global setting.`;
 	return undefined;
@@ -120,8 +137,12 @@ export function createSettingsRuntime(deps: SettingsRuntimeDeps): SettingsRuntim
 		const config = row.config;
 		if (!config) throw new Error(`Setting ${row.id} has no config section`);
 		const path = configPath(scope, deps.cwd, deps.agentDir);
-		writeConfigValueAt(path, config.section, config.path, storedValue(row, raw));
-		for (const leaf of row.also?.(raw) ?? []) writeConfigValueAt(path, leaf.section, leaf.path, leaf.value);
+		// One document pass for the row and every companion leaf it declares, so a
+		// failure cannot leave the row written and its companion not.
+		writeConfigValuesAt(path, [
+			{ section: config.section, path: config.path, value: storedValue(row, raw) },
+			...(row.also?.(raw) ?? []),
+		]);
 	};
 
 	/** Take a completed write: re-read the snapshot, mark it dirty, repaint. */
@@ -133,10 +154,15 @@ export function createSettingsRuntime(deps: SettingsRuntimeDeps): SettingsRuntim
 
 	return {
 		views: (scope) => settingViews(snapshot, scope),
-		count: (scope) => countSettings(scope),
 		change: async (scope, id) => {
 			const row = SETTING_ROWS.find((entry) => entry.id === id);
 			if (!row) return;
+			// Only a boolean or an enum cycles; a text row is stored from its editor,
+			// so refusing here keeps `nextValue`'s cycle contract honest.
+			if (row.kind === "text") {
+				deps.onError?.(`${row.label} is edited as text, not cycled.`);
+				return;
+			}
 			const refused = refusal(row, scope, deps.trusted);
 			if (refused !== undefined) {
 				deps.onError?.(refused);
@@ -144,11 +170,9 @@ export function createSettingsRuntime(deps: SettingsRuntimeDeps): SettingsRuntim
 			}
 			const current = settingViews(snapshot, scope).find((entry) => entry.id === id);
 			if (!current) return;
-			const next = nextValue(row, current.value);
-			if (!validValue(row, next.value)) {
-				deps.onError?.(`Cannot save ${row.label}: unknown value.`);
-				return;
-			}
+			// Use the view's options: the Theme row's list comes from the host, not
+			// from the static descriptor.
+			const next = nextValue(current, current.value);
 			try {
 				await write(scope, row, next.value);
 			} catch (error) {
@@ -159,8 +183,8 @@ export function createSettingsRuntime(deps: SettingsRuntimeDeps): SettingsRuntim
 		},
 		async setValue(scope, id, raw) {
 			const row = SETTING_ROWS.find((entry) => entry.id === id);
-			if (!row || row.kind !== "text") {
-				deps.onError?.(`${row?.label ?? id} cannot be edited as text.`);
+			if (!row) {
+				deps.onError?.(`${id} is not a setting.`);
 				return false;
 			}
 			const refused = refusal(row, scope, deps.trusted);
@@ -182,6 +206,46 @@ export function createSettingsRuntime(deps: SettingsRuntimeDeps): SettingsRuntim
 			committed();
 			return true;
 		},
+		async reset(scope, id) {
+			const row = SETTING_ROWS.find((entry) => entry.id === id);
+			if (!row) {
+				deps.onError?.(`${id} is not a setting.`);
+				return false;
+			}
+			if (row.source === "app") {
+				deps.onError?.(`${row.label} is a Pi setting; Pi has no unset, so set the value instead.`);
+				return false;
+			}
+			const refused = refusal(row, scope, deps.trusted);
+			if (refused !== undefined) {
+				deps.onError?.(refused);
+				return false;
+			}
+			const config = row.config;
+			if (!config) return false;
+			const document = scope === "global" ? snapshot.global : snapshot.project;
+			if (configValueAt(configSection(document, config.section), config.path) === undefined) {
+				const inherited =
+					scope === "project" &&
+					configValueAt(configSection(snapshot.global, config.section), config.path) !== undefined;
+				deps.onError?.(
+					inherited
+						? `${row.label} is inherited from Global; there is nothing to reset in Project.`
+						: `${row.label} is already at its default.`,
+				);
+				return false;
+			}
+			try {
+				unsetConfigValueAt(configPath(scope, deps.cwd, deps.agentDir), config.section, config.path);
+			} catch (error) {
+				deps.onError?.(`Could not reset ${row.label}: ${error instanceof Error ? error.message : String(error)}`);
+				return false;
+			}
+			committed();
+			return true;
+		},
+		sectionDocument: (scope, section) =>
+			configSection(scope === "global" ? snapshot.global : snapshot.project, section),
 		isDirty: () => dirty,
 		onChange: (listener) => {
 			listeners.add(listener);