@astralyn/pi 0.84.6 → 0.84.8

package/dist/extensions/subagent/agents-command.js

@@ -1,4 +1,4 @@
-import { Container, Spacer, Text, TruncatedText, } from "@earendil-works/pi-tui";
+import { Container, isFocusable, Spacer, Text, TruncatedText, } from "@earendil-works/pi-tui";
 import { getAgentDir } from "../../config.js";
 import { DynamicBorder } from "../../modes/interactive/components/dynamic-border.js";
 import { keyLabel } from "../../modes/interactive/components/keybinding-hints.js";
@@ -27,6 +27,85 @@ function navigationHint(theme, keybindings) {
         .join("/");
     return keys ? `${theme.fg("dim", keys)}${theme.fg("muted", " navigate")}` : "";
 }
+/** Small Pi-native list page used inside the single /agents custom UI lifecycle. */
+class ChoiceMenuComponent extends Container {
+    get focused() {
+        return this._focused;
+    }
+    set focused(value) {
+        this._focused = value;
+    }
+    constructor(options) {
+        super();
+        this._focused = false;
+        this.theme = options.theme;
+        this.keybindings = options.keybindings;
+        this.choices = options.choices;
+        this.onDone = options.onDone;
+        this.title = options.title;
+        this.cancelDescription = options.cancelDescription;
+        this.selectedIndex = Math.min(Math.max(options.initialIndex ?? 0, 0), Math.max(0, options.choices.length - 1));
+        this.addChild(new DynamicBorder());
+        this.addChild(new Spacer(1));
+        this.titleText = new Text("", 1, 0);
+        this.addChild(this.titleText);
+        this.addChild(new Spacer(1));
+        this.listContainer = new Container();
+        this.addChild(this.listContainer);
+        this.addChild(new Spacer(1));
+        this.hintText = new Text("", 1, 0);
+        this.addChild(this.hintText);
+        this.addChild(new Spacer(1));
+        this.addChild(new DynamicBorder());
+        this.updateStaticText();
+        this.updateList();
+    }
+    updateStaticText() {
+        this.titleText.setText(this.theme.fg("accent", this.theme.bold(this.title)));
+        const hints = [
+            navigationHint(this.theme, this.keybindings),
+            hint(this.theme, this.keybindings, "tui.select.confirm", "select"),
+            hint(this.theme, this.keybindings, "tui.select.cancel", this.cancelDescription),
+        ].filter(Boolean);
+        this.hintText.setText(hints.join(this.theme.fg("muted", " • ")));
+    }
+    updateList() {
+        this.listContainer.clear();
+        for (const [index, choice] of this.choices.entries()) {
+            const selected = index === this.selectedIndex;
+            const prefix = selected ? this.theme.fg("accent", "→ ") : "  ";
+            const label = this.theme.fg(selected ? "accent" : "text", choice.label);
+            this.listContainer.addChild(new TruncatedText(`${prefix}${label}`, 1, 0));
+        }
+    }
+    moveSelection(offset) {
+        if (this.choices.length === 0)
+            return;
+        this.selectedIndex = (this.selectedIndex + offset + this.choices.length) % this.choices.length;
+        this.updateList();
+    }
+    invalidate() {
+        this.updateStaticText();
+        this.updateList();
+        super.invalidate();
+    }
+    handleInput(data) {
+        if (this.keybindings.matches(data, "tui.select.up")) {
+            this.moveSelection(-1);
+        }
+        else if (this.keybindings.matches(data, "tui.select.down")) {
+            this.moveSelection(1);
+        }
+        else if (this.keybindings.matches(data, "tui.select.confirm")) {
+            const choice = this.choices[this.selectedIndex];
+            if (choice)
+                this.onDone(choice);
+        }
+        else if (this.keybindings.matches(data, "tui.select.cancel")) {
+            this.onDone(undefined);
+        }
+    }
+}
 /** Compact Model/Thinking settings menu for one profile; every confirm persists immediately. */
 class ProfileSettingsMenuComponent extends Container {
     get focused() {
@@ -42,29 +121,48 @@ class ProfileSettingsMenuComponent extends Container {
         this.theme = options.theme;
         this.keybindings = options.keybindings;
         this.onDone = options.onDone;
+        this.title = AGENT_PROFILE_LABELS[options.profile.name];
+        this.status = options.status;
         this.rows = buildSettingsRows({
             override: options.override,
             models: options.models,
             currentSessionModel: options.currentSessionModel,
             currentThinking: options.currentThinking,
         });
+        this.selectedIndex = Math.max(0, this.rows.findIndex((row) => row.action === options.selectedAction));
         this.addChild(new DynamicBorder());
         this.addChild(new Spacer(1));
-        this.addChild(new Text(this.theme.fg("accent", this.theme.bold(AGENT_PROFILE_LABELS[options.profile.name])), 1, 0));
+        this.titleText = new Text("", 1, 0);
+        this.addChild(this.titleText);
         this.addChild(new Spacer(1));
         this.listContainer = new Container();
         this.addChild(this.listContainer);
         this.addChild(new Spacer(1));
-        const hints = [
-            navigationHint(this.theme, options.keybindings),
-            hint(this.theme, options.keybindings, "tui.select.confirm", "select"),
-            hint(this.theme, options.keybindings, "tui.select.cancel", "back"),
-        ].filter(Boolean);
-        this.addChild(new Text(hints.join(this.theme.fg("muted", " • ")), 1, 0));
+        if (this.status) {
+            this.statusText = new Text("", 1, 0);
+            this.addChild(this.statusText);
+            this.addChild(new Spacer(1));
+        }
+        else {
+            this.statusText = undefined;
+        }
+        this.hintText = new Text("", 1, 0);
+        this.addChild(this.hintText);
         this.addChild(new Spacer(1));
         this.addChild(new DynamicBorder());
+        this.updateStaticText();
         this.updateList();
     }
+    updateStaticText() {
+        this.titleText.setText(this.theme.fg("accent", this.theme.bold(this.title)));
+        this.statusText?.setText(this.theme.fg("muted", this.status ?? ""));
+        const hints = [
+            navigationHint(this.theme, this.keybindings),
+            hint(this.theme, this.keybindings, "tui.select.confirm", "select"),
+            hint(this.theme, this.keybindings, "tui.select.cancel", "back"),
+        ].filter(Boolean);
+        this.hintText.setText(hints.join(this.theme.fg("muted", " • ")));
+    }
     updateList() {
         this.listContainer.clear();
         for (const [index, row] of this.rows.entries()) {
@@ -80,6 +178,11 @@ class ProfileSettingsMenuComponent extends Container {
         this.selectedIndex = (this.selectedIndex + offset + this.rows.length) % this.rows.length;
         this.updateList();
     }
+    invalidate() {
+        this.updateStaticText();
+        this.updateList();
+        super.invalidate();
+    }
     handleInput(data) {
         if (this.keybindings.matches(data, "tui.select.up")) {
             this.moveSelection(-1);
@@ -95,7 +198,7 @@ class ProfileSettingsMenuComponent extends Container {
         }
     }
 }
-/** Standalone searchable model picker for one profile; confirm saves immediately. */
+/** Searchable model page for one profile; confirm saves immediately. */
 class ModelPickerComponent extends Container {
     get focused() {
         return this._focused;
@@ -112,9 +215,12 @@ class ModelPickerComponent extends Container {
         this.tui = options.tui;
         this.theme = options.theme;
         this.keybindings = options.keybindings;
+        this.title = `Model — ${AGENT_PROFILE_LABELS[options.profile.name]}`;
+        this.hasScopedModels = options.scopedModels.length > 0;
         this.addChild(new DynamicBorder());
         this.addChild(new Spacer(1));
-        this.addChild(new Text(this.theme.fg("accent", this.theme.bold(`Model — ${AGENT_PROFILE_LABELS[options.profile.name]}`)), 1, 0));
+        this.titleText = new Text("", 1, 0);
+        this.addChild(this.titleText);
         this.addChild(new Spacer(1));
         this.modelList = new ProfileModelListComponent({
             theme: options.theme,
@@ -127,15 +233,21 @@ class ModelPickerComponent extends Container {
         });
         this.addChild(this.modelList);
         this.addChild(new Spacer(1));
-        const hints = [
-            navigationHint(this.theme, options.keybindings),
-            options.scopedModels.length > 0 ? hint(this.theme, options.keybindings, "tui.input.tab", "scope") : "",
-            hint(this.theme, options.keybindings, "tui.select.confirm", "select"),
-            hint(this.theme, options.keybindings, "tui.select.cancel", "back"),
-        ].filter(Boolean);
-        this.addChild(new Text(hints.join(this.theme.fg("muted", " • ")), 1, 0));
+        this.hintText = new Text("", 1, 0);
+        this.addChild(this.hintText);
         this.addChild(new Spacer(1));
         this.addChild(new DynamicBorder());
+        this.updateStaticText();
+    }
+    updateStaticText() {
+        this.titleText.setText(this.theme.fg("accent", this.theme.bold(this.title)));
+        const hints = [
+            navigationHint(this.theme, this.keybindings),
+            this.hasScopedModels ? hint(this.theme, this.keybindings, "tui.input.tab", "scope") : "",
+            hint(this.theme, this.keybindings, "tui.select.confirm", "select"),
+            hint(this.theme, this.keybindings, "tui.select.cancel", "back"),
+        ].filter(Boolean);
+        this.hintText.setText(hints.join(this.theme.fg("muted", " • ")));
     }
     get refreshSignal() {
         return this.refreshAbortController.signal;
@@ -162,20 +274,22 @@ class ModelPickerComponent extends Container {
         this.modelList.setStatus(message, tone);
         this.tui.requestRender();
     }
+    invalidate() {
+        this.updateStaticText();
+        super.invalidate();
+    }
     handleInput(data) {
         this.modelList.handleInput(data);
     }
 }
 /** Persist a single override atomically; the UI only reflects the value on success. */
-async function persistOverride(ctx, profile, patch, current) {
-    const next = "model" in patch ? patch.model : patch.thinking;
-    if (next === current)
-        return;
+async function persistOverride(ctx, profile, patch) {
     try {
-        await updateProfileOverride(profile.name, patch, getAgentDir());
+        return await updateProfileOverride(profile.name, patch, getAgentDir());
     }
     catch (error) {
         ctx.ui.notify(`Could not save ${AGENT_PROFILE_LABELS[profile.name]} settings: ${error instanceof Error ? error.message : String(error)}`, "error");
+        return undefined;
     }
 }
 async function refreshPickerModels(ctx, picker) {
@@ -218,6 +332,194 @@ async function refreshPickerModels(ctx, picker) {
         clearTimeout(timeout);
     }
 }
+/** One mounted /agents TUI whose child pages switch without restoring the editor between them. */
+class AgentsMenuComponent extends Container {
+    get focused() {
+        return this._focused;
+    }
+    set focused(value) {
+        this._focused = value;
+        if (this.activeScreen && isFocusable(this.activeScreen))
+            this.activeScreen.focused = value;
+    }
+    constructor(options) {
+        super();
+        this.route = { kind: "profiles" };
+        this.selectedSettingsAction = "model";
+        this.saving = false;
+        this.closed = false;
+        this._focused = false;
+        this.tui = options.tui;
+        this.theme = options.theme;
+        this.keybindings = options.keybindings;
+        this.ctx = options.ctx;
+        this.currentThinking = options.currentThinking;
+        this.config = options.config;
+        this.onDone = options.onDone;
+        this.showProfiles();
+    }
+    disposeActiveScreen() {
+        const screen = this.activeScreen;
+        this.activeScreen = undefined;
+        if (!screen)
+            return;
+        const disposable = screen;
+        if (isFocusable(screen))
+            screen.focused = false;
+        disposable.dispose?.();
+    }
+    setActiveScreen(screen) {
+        this.disposeActiveScreen();
+        this.clear();
+        this.activeScreen = screen;
+        this.addChild(screen);
+        if (isFocusable(screen))
+            screen.focused = this._focused;
+        this.tui.requestRender();
+    }
+    showProfiles() {
+        this.route = { kind: "profiles" };
+        const choices = AGENT_PROFILES.map((profile) => ({
+            label: AGENT_PROFILE_LABELS[profile.name],
+            value: profile,
+        }));
+        const initialIndex = choices.findIndex((choice) => choice.value.name === this.selectedProfile?.name);
+        this.setActiveScreen(new ChoiceMenuComponent({
+            theme: this.theme,
+            keybindings: this.keybindings,
+            title: "Agents",
+            choices,
+            initialIndex,
+            cancelDescription: "close",
+            onDone: (choice) => {
+                if (!choice) {
+                    this.onDone();
+                    return;
+                }
+                this.selectedProfile = choice.value;
+                this.selectedSettingsAction = "model";
+                this.showSettings(choice.value);
+            },
+        }));
+    }
+    showSettings(profile, selectedAction = this.selectedSettingsAction) {
+        this.selectedProfile = profile;
+        this.selectedSettingsAction = selectedAction;
+        this.route = { kind: "settings", profile, selectedAction };
+        this.setActiveScreen(new ProfileSettingsMenuComponent({
+            theme: this.theme,
+            keybindings: this.keybindings,
+            profile,
+            override: this.config.profiles[profile.name],
+            models: this.ctx.modelRegistry.getAvailable(),
+            currentSessionModel: this.ctx.model,
+            currentThinking: this.currentThinking,
+            selectedAction,
+            status: this.saving ? "Saving…" : undefined,
+            onDone: (action) => {
+                if (!action) {
+                    this.showProfiles();
+                    return;
+                }
+                this.selectedSettingsAction = action;
+                if (action === "model")
+                    this.showModelPicker(profile);
+                else
+                    this.showThinkingPicker(profile);
+            },
+        }));
+    }
+    showModelPicker(profile) {
+        this.route = { kind: "model", profile };
+        const override = this.config.profiles[profile.name];
+        const picker = new ModelPickerComponent({
+            tui: this.tui,
+            theme: this.theme,
+            keybindings: this.keybindings,
+            profile,
+            savedModelId: override?.model,
+            models: this.ctx.modelRegistry.getAvailable(),
+            scopedModels: this.ctx.scopedModels,
+            currentSessionModel: this.ctx.model,
+            onDone: (choice) => {
+                if (!choice) {
+                    this.showSettings(profile, "model");
+                    return;
+                }
+                this.saveOverride(profile, { model: choice.modelId }, "model");
+            },
+        });
+        picker.setRefreshStatus("Refreshing model catalogs…");
+        this.setActiveScreen(picker);
+        void refreshPickerModels(this.ctx, picker);
+    }
+    showThinkingPicker(profile) {
+        this.route = { kind: "thinking", profile };
+        const override = this.config.profiles[profile.name];
+        const choices = [
+            ...buildThinkingChoices({
+                currentSessionModel: this.ctx.model,
+                models: this.ctx.modelRegistry.getAvailable(),
+                override,
+                currentThinking: this.currentThinking,
+            }).entries(),
+        ].map(([label, level]) => ({ label, value: level }));
+        const initialIndex = choices.findIndex((choice) => choice.label.endsWith(" ✓"));
+        this.setActiveScreen(new ChoiceMenuComponent({
+            theme: this.theme,
+            keybindings: this.keybindings,
+            title: `Thinking — ${AGENT_PROFILE_LABELS[profile.name]}`,
+            choices,
+            initialIndex,
+            cancelDescription: "back",
+            onDone: (choice) => {
+                if (!choice) {
+                    this.showSettings(profile, "thinking");
+                    return;
+                }
+                this.saveOverride(profile, { thinking: choice.value }, "thinking");
+            },
+        }));
+    }
+    saveOverride(profile, patch, returnAction) {
+        if (this.saving)
+            return;
+        this.saving = true;
+        this.showSettings(profile, returnAction);
+        void persistOverride(this.ctx, profile, patch)
+            .then((config) => this.completeSave(profile, config), () => this.completeSave(profile, undefined))
+            .catch(() => {
+            // A reload can stale the command context while the queued file write finishes.
+        });
+    }
+    completeSave(profile, config) {
+        if (this.closed)
+            return;
+        this.saving = false;
+        if (config)
+            this.config = config;
+        if (this.route.kind === "settings" && this.route.profile.name === profile.name) {
+            this.showSettings(profile, this.route.selectedAction);
+        }
+    }
+    handleInput(data) {
+        if (!this.saving) {
+            this.activeScreen?.handleInput?.(data);
+            return;
+        }
+        if (!this.keybindings.matches(data, "tui.select.cancel"))
+            return;
+        if (this.route.kind === "settings")
+            this.showProfiles();
+        else if (this.route.kind === "profiles")
+            this.onDone();
+    }
+    dispose() {
+        this.closed = true;
+        this.disposeActiveScreen();
+        this.clear();
+    }
+}
 async function selectProfile(ctx) {
     const labels = AGENT_PROFILES.map((profile) => AGENT_PROFILE_LABELS[profile.name]);
     const label = await ctx.ui.select("Agents", labels);
@@ -225,18 +527,6 @@ async function selectProfile(ctx) {
         ? undefined
         : AGENT_PROFILES.find((profile) => AGENT_PROFILE_LABELS[profile.name] === label);
 }
-async function showTuiSettingsMenu(ctx, profile, override, currentThinking) {
-    return ctx.ui.custom((_tui, theme, keybindings, done) => new ProfileSettingsMenuComponent({
-        theme,
-        keybindings,
-        profile,
-        override,
-        models: ctx.modelRegistry.getAvailable(),
-        currentSessionModel: ctx.model,
-        currentThinking,
-        onDone: done,
-    }));
-}
 async function showDialogSettingsMenu(ctx, profile, override, currentThinking) {
     const options = new Map();
     for (const row of buildSettingsRows({
@@ -250,25 +540,6 @@ async function showDialogSettingsMenu(ctx, profile, override, currentThinking) {
     const label = await ctx.ui.select(AGENT_PROFILE_LABELS[profile.name], [...options.keys()]);
     return label === undefined ? undefined : options.get(label);
 }
-async function showTuiModelPicker(ctx, profile, override) {
-    const chosen = await ctx.ui.custom((tui, theme, keybindings, done) => {
-        const picker = new ModelPickerComponent({
-            tui,
-            theme,
-            keybindings,
-            profile,
-            savedModelId: override?.model,
-            models: ctx.modelRegistry.getAvailable(),
-            scopedModels: ctx.scopedModels,
-            currentSessionModel: ctx.model,
-            onDone: done,
-        });
-        picker.setRefreshStatus("Refreshing model catalogs…");
-        void refreshPickerModels(ctx, picker);
-        return picker;
-    });
-    return chosen === undefined ? undefined : { modelId: chosen.modelId };
-}
 async function showDialogModelPicker(ctx, profile, override) {
     const models = [...ctx.modelRegistry.getAvailable()].sort(compareModels);
     const choices = buildModelChoices({
@@ -279,7 +550,7 @@ async function showDialogModelPicker(ctx, profile, override) {
     const label = await ctx.ui.select(`Model — ${AGENT_PROFILE_LABELS[profile.name]}`, [...choices.keys()]);
     return label === undefined ? undefined : { modelId: choices.get(label) };
 }
-async function showThinkingPicker(ctx, profile, override, currentThinking) {
+async function showDialogThinkingPicker(ctx, profile, override, currentThinking) {
     const choices = buildThinkingChoices({
         currentSessionModel: ctx.model,
         models: ctx.modelRegistry.getAvailable(),
@@ -289,43 +560,56 @@ async function showThinkingPicker(ctx, profile, override, currentThinking) {
     const label = await ctx.ui.select(`Thinking — ${AGENT_PROFILE_LABELS[profile.name]}`, [...choices.keys()]);
     return label === undefined ? undefined : { level: choices.get(label) };
 }
-async function runProfileSettings(ctx, profile, currentThinking) {
+async function runDialogProfileSettings(ctx, profile, currentThinking) {
     const agentDir = getAgentDir();
-    const isTui = ctx.mode === "tui";
     while (true) {
         const config = await loadSubagentConfig(agentDir);
         const override = config.profiles[profile.name];
-        const action = isTui
-            ? await showTuiSettingsMenu(ctx, profile, override, currentThinking)
-            : await showDialogSettingsMenu(ctx, profile, override, currentThinking);
+        const action = await showDialogSettingsMenu(ctx, profile, override, currentThinking);
         if (!action)
             return;
         if (action === "model") {
-            const chosen = isTui
-                ? await showTuiModelPicker(ctx, profile, override)
-                : await showDialogModelPicker(ctx, profile, override);
+            const chosen = await showDialogModelPicker(ctx, profile, override);
             if (!chosen)
                 continue;
-            await persistOverride(ctx, profile, { model: chosen.modelId }, override?.model);
+            await persistOverride(ctx, profile, { model: chosen.modelId });
         }
         else {
-            const chosen = await showThinkingPicker(ctx, profile, override, currentThinking);
+            const chosen = await showDialogThinkingPicker(ctx, profile, override, currentThinking);
             if (!chosen)
                 continue;
-            await persistOverride(ctx, profile, { thinking: chosen.level }, override?.thinking);
+            await persistOverride(ctx, profile, { thinking: chosen.level });
         }
     }
 }
-export async function showAgentsCommand(ctx, currentThinking) {
-    if (!ctx.hasUI) {
-        ctx.ui.notify("/agents requires an interactive UI.", "warning");
-        return;
-    }
+async function showTuiAgentsCommand(ctx, currentThinking) {
+    const config = await loadSubagentConfig(getAgentDir());
+    await ctx.ui.custom((tui, theme, keybindings, done) => new AgentsMenuComponent({
+        tui,
+        theme,
+        keybindings,
+        ctx,
+        currentThinking,
+        config,
+        onDone: () => done(),
+    }));
+}
+async function showDialogAgentsCommand(ctx, currentThinking) {
     while (true) {
         const profile = await selectProfile(ctx);
         if (!profile)
             return;
-        await runProfileSettings(ctx, profile, currentThinking);
+        await runDialogProfileSettings(ctx, profile, currentThinking);
+    }
+}
+export async function showAgentsCommand(ctx, currentThinking) {
+    if (!ctx.hasUI) {
+        ctx.ui.notify("/agents requires an interactive UI.", "warning");
+        return;
     }
+    if (ctx.mode === "tui")
+        await showTuiAgentsCommand(ctx, currentThinking);
+    else
+        await showDialogAgentsCommand(ctx, currentThinking);
 }
 //# sourceMappingURL=agents-command.js.map