@north-light/crouter 0.3.173 → 0.3.175

package/dist/commands/sys/setup-core.js

@@ -306,15 +306,12 @@ export function detectPackageManager(platform = process.platform, commandExists
             return 'manual';
     }
 }
-export function buildSystemInstallPlan(tool, packageManager, installed) {
-    const label = `Install ${tool}`;
+export function buildSystemInstallPlan(tool, packageManager, commandExists = detectCommandOnPath) {
+    const installed = tool === 'nerd-font' ? detectNerdFont().installed : commandExists(tool);
     if (installed) {
         return {
             tool,
-            label,
             installed: true,
-            checked: false,
-            packageManager,
             command: null,
             hint: 'already installed',
             autoInstall: false,
@@ -324,10 +321,7 @@ export function buildSystemInstallPlan(tool, packageManager, installed) {
         const plan = nerdFontInstallCommand(packageManager);
         return {
             tool,
-            label,
             installed: false,
-            checked: plan.autoInstall,
-            packageManager,
             command: plan.command,
             hint: `${plan.hint} — ${NERD_FONT_SELECT_HINT}`,
             autoInstall: plan.autoInstall,
@@ -338,10 +332,7 @@ export function buildSystemInstallPlan(tool, packageManager, installed) {
         case 'brew':
             return {
                 tool,
-                label,
                 installed: false,
-                checked: true,
-                packageManager,
                 command: `brew install ${packageName}`,
                 hint: 'Homebrew install',
                 autoInstall: true,
@@ -349,10 +340,7 @@ export function buildSystemInstallPlan(tool, packageManager, installed) {
         case 'apt-get':
             return {
                 tool,
-                label,
                 installed: false,
-                checked: true,
-                packageManager,
                 command: `sudo apt-get update && sudo apt-get install -y ${packageName}`,
                 hint: 'apt-get install',
                 autoInstall: true,
@@ -360,10 +348,7 @@ export function buildSystemInstallPlan(tool, packageManager, installed) {
         case 'dnf':
             return {
                 tool,
-                label,
                 installed: false,
-                checked: true,
-                packageManager,
                 command: `sudo dnf install -y ${packageName}`,
                 hint: 'dnf install',
                 autoInstall: true,
@@ -371,10 +356,7 @@ export function buildSystemInstallPlan(tool, packageManager, installed) {
         case 'pacman':
             return {
                 tool,
-                label,
                 installed: false,
-                checked: true,
-                packageManager,
                 command: `sudo pacman -S --noconfirm ${packageName}`,
                 hint: 'pacman install',
                 autoInstall: true,
@@ -382,24 +364,13 @@ export function buildSystemInstallPlan(tool, packageManager, installed) {
         default:
             return {
                 tool,
-                label,
                 installed: false,
-                checked: false,
-                packageManager: 'manual',
                 command: null,
                 hint: `manual install required for ${tool}`,
                 autoInstall: false,
             };
     }
 }
-export function buildSystemToolState(tool, packageManager, commandExists = detectCommandOnPath) {
-    const installed = tool === 'nerd-font' ? detectNerdFont().installed : commandExists(tool);
-    return {
-        tool,
-        installed,
-        plan: buildSystemInstallPlan(tool, packageManager, installed),
-    };
-}
 export function resolveSettingsPath(homeDir = homedir()) {
     return join(homeDir, '.pi', 'agent', 'settings.json');
 }
@@ -429,49 +400,36 @@ export function buildSetupInitialState(opts = {}) {
         installedPackageIds.add(id);
     const commandExists = opts.commandExists ?? detectCommandOnPath;
     const packageManager = opts.packageManager ?? detectPackageManager(process.platform, commandExists);
-    const systemTools = ['tmux', 'nvim', 'nerd-font'].map((tool) => buildSystemToolState(tool, packageManager, commandExists));
-    return { manifest, installedPackageIds, systemTools, exaKeyPath: resolveExaKeyPath(homeDir) };
-}
-export function buildSetupStaticInstructions(opts) {
-    return {
-        headline: 'crtr sys setup (non-interactive)',
-        packageLines: opts.manifest.map((entry) => {
-            const installed = opts.installedPackageIds.has(entry.id) ? 'installed' : 'not installed';
-            return `- ${entry.name} — ${entry.shortDescription} (${installed})`;
-        }),
-        systemLines: opts.systemPlans.map((plan) => {
-            if (plan.installed)
-                return `- ${plan.tool}: ✓ installed`;
-            if (plan.command)
-                return `- ${plan.tool}: ${plan.command}`;
-            return `- ${plan.tool}: ${plan.hint}`;
-        }),
-        exaLine: `- Exa key: write to ${opts.exaKeyPath} or set EXA_API_KEY`,
-        footer: 'Run `crtr sys setup` in a TTY to open the wizard.',
-    };
+    const systemPlans = ['tmux', 'nvim', 'nerd-font'].map((tool) => buildSystemInstallPlan(tool, packageManager, commandExists));
+    return { manifest, installedPackageIds, systemPlans, exaKeyPath: resolveExaKeyPath(homeDir) };
 }
 export function renderSetupStaticInstructions(state) {
-    const instructions = buildSetupStaticInstructions({
-        manifest: state.manifest,
-        installedPackageIds: state.installedPackageIds,
-        systemPlans: state.systemTools.map((tool) => tool.plan),
-        exaKeyPath: state.exaKeyPath,
+    const packageLines = state.manifest.map((entry) => {
+        const installed = state.installedPackageIds.has(entry.id) ? 'installed' : 'not installed';
+        return `- ${entry.name} — ${entry.shortDescription} (${installed})`;
+    });
+    const systemLines = state.systemPlans.map((plan) => {
+        if (plan.installed)
+            return `- ${plan.tool}: ✓ installed`;
+        if (plan.command)
+            return `- ${plan.tool}: ${plan.command}`;
+        return `- ${plan.tool}: ${plan.hint}`;
     });
     return [
-        instructions.headline,
+        'crtr sys setup (non-interactive)',
         '',
         'Provider login: open the wizard in a TTY and use the Providers tab (same flow as /login) to authenticate a model provider.',
         '',
         'Packages:',
-        ...instructions.packageLines,
+        ...packageLines,
         '',
         'System deps:',
-        ...instructions.systemLines,
+        ...systemLines,
         '',
-        instructions.exaLine,
+        `- Exa key: write to ${state.exaKeyPath} or set EXA_API_KEY`,
         '',
-        `Inbox: the inbox-toggle key (${inboxShortcut() ?? 'disabled'}) is a crouter keybinding — view or rebind it in the \`crtr sys setup\` keybindings tab; it is installed on the same tmux server as every other crouter binding.`,
-        instructions.footer,
+        `Inbox: the inbox-toggle key (${inboxShortcut() ?? 'disabled'}) is a crouter keybinding — view or rebind it in \`crtr sys settings\`; it is installed on the same tmux server as every other crouter binding.`,
+        'Run `crtr sys setup` in a TTY to open the wizard.',
     ].join('\n') + '\n';
 }
 function runShellCommand(command) {
@@ -508,14 +466,6 @@ export async function reconcileInboxFrontDoor() {
     }
     catch { /* best-effort: no tmux server */ }
 }
-export function summarizeSetupExecution(result) {
-    return {
-        installed: [...result.installedPackages, ...result.installedSystemDeps],
-        skipped: [...result.skippedPackages, ...result.skippedSystemDeps],
-        exaKeyWritten: result.exaKeyWritten,
-        exaKeyPath: result.exaKeyPath,
-    };
-}
 export function formatSetupExecutionSummary(summary) {
     return [
         'crtr sys setup complete',
@@ -566,7 +516,7 @@ export async function executeSetupSubmission(submission) {
         installedPackages.push(entry.name);
     }
     for (const plan of submission.systemDeps) {
-        if (!plan.checked || plan.installed) {
+        if (plan.installed) {
             skippedSystemDeps.push(`${plan.tool} (already installed)`);
             continue;
         }
@@ -592,14 +542,13 @@ export async function executeSetupSubmission(submission) {
     if (exaKeyWritten) {
         await writeExaKey(submission.exaKeyPath, submission.exaKey);
     }
-    // Front-door reconciliation refreshes crouter-owned tmux bindings.
+    // A fresh-machine run can install tmux after preflight reconciliation, so
+    // refresh the front-door bindings once the setup transaction has completed.
     await reconcileInboxFrontDoor();
-    return summarizeSetupExecution({
-        installedPackages,
-        skippedPackages,
-        installedSystemDeps,
-        skippedSystemDeps,
+    return {
+        installed: [...installedPackages, ...installedSystemDeps],
+        skipped: [...skippedPackages, ...skippedSystemDeps],
         exaKeyWritten,
         exaKeyPath: submission.exaKeyPath,
-    });
+    };
 }

package/dist/commands/sys/setup-settings-runner.d.ts

@@ -0,0 +1,24 @@
+import { ModelRegistry, ModelRuntime } from "@earendil-works/pi-coding-agent";
+import { ProcessTerminal, TUI, type Component, type Focusable } from "@earendil-works/pi-tui";
+import { readRawScopeConfig } from "../../core/config.js";
+import { type BindingId, type BindingResolution } from "../../core/keybindings/index.js";
+type SetupSettingsSurface = Component & Focusable & {
+    dispose(): void;
+};
+type SetupSettingsProcessContext = {
+    tui: TUI;
+    terminal: ProcessTerminal;
+    agentDir: string;
+    runtime: ModelRuntime;
+    registry: ModelRegistry;
+    bindings: BindingResolution<BindingId>;
+    rawUserConfig: ReturnType<typeof readRawScopeConfig>;
+};
+type SetupSettingsProcessControl<Result> = {
+    submit(result: Result): void;
+    cancel(): void;
+};
+/** The process-level terminal host shared by setup and settings. Navigation,
+ * submission, and panel policy stay in their concrete surface factories. */
+export declare function runSetupSettingsProcess<Result>(createSurface: (context: SetupSettingsProcessContext, control: SetupSettingsProcessControl<Result>) => SetupSettingsSurface, interceptCancel?: (data: string, bindings: BindingResolution<BindingId>) => boolean): Promise<Result | undefined>;
+export {};

package/dist/commands/sys/setup-settings-runner.js

@@ -0,0 +1,63 @@
+import { ModelRegistry, ModelRuntime } from "@earendil-works/pi-coding-agent";
+import { ProcessTerminal, TUI, } from "@earendil-works/pi-tui";
+import { join } from "node:path";
+import { applyTheme, defaultAgentDir } from "../../clients/attach/config.js";
+import { readRawScopeConfig } from "../../core/config.js";
+import { resolveKeybindings, } from "../../core/keybindings/index.js";
+import { PoolCredentialStore } from "../../core/pool-credential-store.js";
+/** The process-level terminal host shared by setup and settings. Navigation,
+ * submission, and panel policy stay in their concrete surface factories. */
+export async function runSetupSettingsProcess(createSurface, interceptCancel) {
+    applyTheme({ cwd: process.cwd() });
+    const agentDir = defaultAgentDir();
+    const runtime = await ModelRuntime.create({
+        credentials: new PoolCredentialStore(join(agentDir, "auth.json")),
+        modelsPath: join(agentDir, "models.json"),
+    });
+    const registry = new ModelRegistry(runtime);
+    const rawUserConfig = readRawScopeConfig("user");
+    const bindings = resolveKeybindings(rawUserConfig?.keybindings);
+    const terminal = new ProcessTerminal();
+    const tui = new TUI(terminal, true);
+    return new Promise((resolve, reject) => {
+        let surface;
+        let restored = false;
+        const restore = () => {
+            if (restored)
+                return;
+            restored = true;
+            surface?.dispose();
+            try {
+                tui.stop();
+            }
+            catch {
+                /* terminal restore */
+            }
+        };
+        const finish = (result) => {
+            restore();
+            resolve(result);
+        };
+        try {
+            surface = createSurface({ tui, terminal, agentDir, runtime, registry, bindings, rawUserConfig }, { submit: finish, cancel: () => finish(undefined) });
+            tui.addChild(surface);
+            tui.setFocus(surface);
+            process.once("exit", restore);
+            for (const signal of ["SIGTERM", "SIGHUP", "SIGINT"])
+                process.once(signal, () => finish(undefined));
+            if (interceptCancel !== undefined) {
+                tui.addInputListener((data) => {
+                    if (!interceptCancel(data, bindings))
+                        return undefined;
+                    finish(undefined);
+                    return { consume: true };
+                });
+            }
+            tui.start();
+        }
+        catch (error) {
+            restore();
+            reject(error);
+        }
+    });
+}

package/dist/commands/sys/setup-wizard.d.ts

@@ -1,149 +1,50 @@
-import { TUI, type Component, type Focusable } from '@earendil-works/pi-tui';
-import { ModelRegistry, ModelRuntime } from '@earendil-works/pi-coding-agent';
-/** pi 0.82 keeps `AuthStatus` inside its unexported provider-composer module; the
- *  only public handle on the shape is the registry method that returns it. */
-type AuthStatus = ReturnType<ModelRegistry['getProviderAuthStatus']>;
-import { type BindingId, type BindingResolution } from '../../core/keybindings/index.js';
-import { type SetupPackageId, type SetupPackageManifestEntry, type SetupSubmission, type SetupSystemToolState } from './setup-core.js';
-/** Centered, selection-following [start, end) slice of `count` items that
- *  always includes `selected`, clamped to at most `capacity` entries. Mirrors
- *  the oauth/config/session selector formula used elsewhere in pi. Exported for
- *  direct unit coverage of the windowing math (see setup-providers-viewport.test.ts). */
-export declare function visibleRange(count: number, selected: number, capacity: number): {
-    start: number;
-    end: number;
-};
-type ProviderAuthType = 'oauth' | 'api_key';
-type ProviderRow = {
-    providerId: string;
-    name: string;
-    managed: boolean;
-    authType: ProviderAuthType;
-    label?: string;
-    preferred?: boolean;
-    cooldownUntil?: number;
-    configured?: boolean;
-    source?: AuthStatus['source'];
-    sourceLabel?: string;
-    accountId?: string;
-};
-/** Curated setup-catalog view over pi's OAuth providers + the model registry. */
-export declare function buildProviderCatalog(runtime: ModelRuntime, registry: ModelRegistry): ProviderRow[];
-/** Classifies a `startLogin` failure into a user-facing status line. */
-export declare function classifyLoginFailure(error: unknown, aborted: boolean): string;
+import { ModelRegistry, ModelRuntime } from "@earendil-works/pi-coding-agent";
+import { TUI, type Component, type Focusable } from "@earendil-works/pi-tui";
+import { type BindingId, type BindingResolution } from "../../core/keybindings/index.js";
+import { type SetupPackageId, type SetupPackageManifestEntry, type SetupSubmission, type SetupSystemInstallPlan } from "./setup-core.js";
+/** The host owns step navigation, focus, submission and composition. Each step
+ *  owns its own mutable UI state. */
 export declare class SetupWizard implements Component, Focusable {
-    private readonly manifest;
-    private readonly installedPackageIds;
-    private readonly systemTools;
-    private readonly exaInput;
-    private readonly keyInput;
-    private readonly brokerWarningInput;
-    private readonly brokerHardCapInput;
-    private readonly openingBindings;
-    private readonly keyDraft;
+    private readonly bindings;
     private readonly terminalRows;
-    private readonly selectedPackageIds;
-    private readonly selectedSystemTools;
     private readonly providers;
-    private readonly models;
-    private activeTab;
-    private pluginIndex;
-    private systemIndex;
-    private expandedPluginId;
+    private readonly plugins;
+    private readonly dependencies;
+    private readonly keys;
+    private step;
     private confirming;
-    private keyIndex;
-    private keyFieldIndex;
-    private keyScroll;
-    private keyFilter;
-    private filteringKeys;
-    private editingKey;
-    private keyEditError;
-    private keyDiagnostics;
-    private keyConfirm;
-    private keyNotice;
-    private keyTmuxOccupancy;
-    private brokerLimitIndex;
-    private brokerLimitNotice;
-    private settingsIndex;
-    private settingsNotice;
     private cachedWidth;
     private cachedHeight;
     private cachedLines;
     private _focused;
+    private readonly installedPackageIds;
     onSubmit?: (submission: SetupSubmission) => void;
     onCancel?: () => void;
-    constructor(manifest: SetupPackageManifestEntry[], installedPackageIds: Set<SetupPackageId>, systemTools: SetupSystemToolState[], tui: TUI, agentDir: string, runtime: ModelRuntime, registry: ModelRegistry, openingBindings: BindingResolution<BindingId>, rawKeybindings: unknown, terminalRows: () => number, rawTmuxPassthrough?: unknown);
+    constructor(manifest: SetupPackageManifestEntry[], installedPackageIds: Set<SetupPackageId>, systemPlans: SetupSystemInstallPlan[], tui: TUI, agentDir: string, runtime: ModelRuntime, registry: ModelRegistry, bindings: BindingResolution<BindingId>, terminalRows: () => number);
     set focused(value: boolean);
     get focused(): boolean;
     invalidate(): void;
-    private setTab;
-    private moveTab;
-    private moveSettingsRow;
-    /** Advance the selected preference and persist it immediately to user config.
-     *  The shared descriptor owns cycling, rendering, validation, and applicability,
-     *  so setup and `sys config set` cannot drift onto different setting catalogs. */
-    private cycleSetting;
-    private handleSettingsInput;
-    private cancel;
-    dispose(): void;
+    private syncFocus;
     private matches;
-    /** Human hint label for an action, derived from the opening snapshot so footers
-     *  reflect the effective (possibly remapped) gestures the wizard actually honors. */
     private label;
-    /** Like `label`, but drops gestures a focused pi text Input consumes as data
-     *  (single printable chars and the arrow keys), so the Exa footer does
-     *  not claim keys that never reach the wizard while a field owns focus. */
+    /** Gestures safe to advertise while a text field owns the keyboard. */
     private fieldSafeLabel;
-    private handleGlobalTabSwitch;
-    private selectedPackage;
-    private selectedSystem;
-    private movePlugin;
-    private moveSystem;
-    private togglePackage;
-    private toggleSystem;
-    private toggleDetails;
+    private setStep;
+    private moveStep;
+    /** Enter on a non-final step walks forward; on the last one it finishes. */
+    private advance;
+    private cancel;
+    dispose(): void;
     private hasPendingInstalls;
     private buildSubmission;
     private finalize;
-    private filteredKeybindings;
-    private selectedKeyRow;
-    private selectedKeybinding;
-    private tmuxPassthroughOffer;
-    private toggleTmuxPassthrough;
-    private moveKey;
-    private moveKeyField;
-    private keyViewportLines;
-    private keyPageSize;
-    private beginKeyEdit;
-    private commitKeyEdit;
-    private cancelKeyEdit;
-    private saveKeybindings;
-    private refreshTmuxBindingsAfterSave;
-    private confirmKeyAction;
-    private selectedBrokerLimitInput;
-    private moveBrokerLimit;
-    private saveBrokerLimits;
-    private handleBrokerLimitsInput;
-    private handleKeybindingsInput;
+    private currentPanel;
     handleInput(data: string): void;
-    private renderHeader;
-    private renderFooter;
-    private renderProviders;
-    private renderPlugins;
-    private renderSystems;
-    private renderExa;
+    /** `Providers › Plugins › Dependencies › Exa key`, active step lit, done
+     *  steps checked — a first run should always show how much is left. */
+    private renderTrail;
+    private footer;
     private renderConfirm;
-    private keyRowMessage;
-    /** Number of lines needed to keep the active paired field legible. A narrow
-     *  row stacks the action and field instead of sacrificing the action name,
-     *  selected-field identity, or value to fixed columns. */
-    private keyRowBodyLineCount;
-    private keyLineCost;
-    private renderKeybindings;
-    private renderModels;
-    private renderBrokerLimits;
-    private renderSettings;
     render(width: number): string[];
 }
 export declare function runSetup(): Promise<void>;
-export {};