marifold 0.60.0

package/dist/commands/status.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerStatusCommand = registerStatusCommand;
+const ServiceProcess_1 = require("../service/ServiceProcess");
+const STATUS_LOG_LINES = 100;
+function registerStatusCommand(program, printer) {
+    program
+        .command('status')
+        .description('Show the managed Marifold service status.')
+        .option('--logs', `Show the most recent ${STATUS_LOG_LINES} daemon log lines.`)
+        .action((options) => {
+        try {
+            const paths = (0, ServiceProcess_1.serviceProcessPaths)();
+            const state = (0, ServiceProcess_1.getActiveServiceProcess)(paths);
+            if (state) {
+                process.stdout.write('Marifold service: running\n');
+                process.stdout.write(`PID:     ${state.pid}\n`);
+                process.stdout.write(`Mode:    ${state.mode}\n`);
+                process.stdout.write(`Started: ${state.startedAt}\n`);
+                if (state.address)
+                    process.stdout.write(`Address: ${state.address}\n`);
+                if (state.launch) {
+                    const loopback = ['127.0.0.1', 'localhost', '::1'].includes(state.launch.host);
+                    const access = state.launch.publicAccess ? 'legacy-public' : loopback ? 'loopback' : 'private';
+                    process.stdout.write(`Access:  ${access}\n`);
+                    if (state.launch.publicAccess) {
+                        process.stdout.write('Warning: restart this legacy service to enforce private-network-only access.\n');
+                    }
+                }
+                process.stdout.write(`Config:  ${state.configPath}\n`);
+            }
+            else {
+                process.stdout.write('Marifold service: stopped\n');
+                process.exitCode = 1;
+            }
+            process.stdout.write(`Log:     ${paths.log}\n`);
+            if (options.logs)
+                printLogs(paths.log);
+        }
+        catch (error) {
+            printer.printError(error);
+            process.exitCode = 1;
+        }
+    });
+}
+function printLogs(logPath) {
+    const logs = (0, ServiceProcess_1.readRecentServiceLog)(STATUS_LOG_LINES);
+    process.stdout.write(`\nRecent logs (last ${STATUS_LOG_LINES} lines):\n`);
+    if (logs === undefined) {
+        process.stdout.write(`No daemon log found at ${logPath}.\n`);
+    }
+    else if (logs.length === 0) {
+        process.stdout.write('(empty)\n');
+    }
+    else {
+        process.stdout.write(`${logs}\n`);
+    }
+}
+//# sourceMappingURL=status.js.map

package/dist/commands/status.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+export {};
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":""}

package/dist/index.js

@@ -0,0 +1,74 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const commander_1 = require("commander");
+const agent_1 = require("./commands/agent");
+const ask_1 = require("./commands/ask");
+const chat_1 = require("./commands/chat");
+const channel_1 = require("./commands/channel");
+const config_1 = require("./commands/config");
+const doctor_1 = require("./commands/doctor");
+const init_1 = require("./commands/init");
+const model_1 = require("./commands/model");
+const profile_1 = require("./commands/profile");
+const provider_1 = require("./commands/provider");
+const schedule_1 = require("./commands/schedule");
+const service_1 = require("./commands/service");
+const session_1 = require("./commands/session");
+const status_1 = require("./commands/status");
+const ConsolePrinter_1 = require("./output/ConsolePrinter");
+const RuntimeFactory_1 = require("./commands/RuntimeFactory");
+const printer = new ConsolePrinter_1.ConsolePrinter();
+const program = new commander_1.Command()
+    .name('marifold')
+    .description('Marifold local-first AI workspace CLI.')
+    .version('0.60.0')
+    // Allow a root --profile (for the bare-`marifold` TUI launch) to coexist with
+    // subcommand options of the same name: root options must precede the
+    // subcommand, and options after the subcommand bind to it.
+    .enablePositionalOptions()
+    .option('--config <path>', 'Path to Marifold config.toml.')
+    .option('--profile <name>', 'Profile to launch the TUI with.')
+    .option('--resume [id]', 'Resume a session: bare --resume continues the most recent session for the profile; --resume <id> continues that specific session.');
+(0, init_1.registerInitCommand)(program, printer);
+(0, agent_1.registerAgentCommand)(program, printer);
+(0, ask_1.registerAskCommand)(program, printer);
+(0, chat_1.registerChatCommand)(program, printer);
+(0, channel_1.registerChannelCommand)(program, printer);
+(0, config_1.registerConfigCommand)(program, printer);
+(0, doctor_1.registerDoctorCommand)(program, printer);
+(0, model_1.registerModelCommand)(program, printer);
+(0, profile_1.registerProfileCommand)(program, printer);
+(0, provider_1.registerProviderCommand)(program, printer);
+(0, schedule_1.registerScheduleCommand)(program, printer);
+(0, service_1.registerServiceCommand)(program, printer);
+(0, session_1.registerSessionCommand)(program, printer);
+(0, status_1.registerStatusCommand)(program, printer);
+// Bare `marifold` (or `marifold --profile x`) launches the Ink TUI. The TUI is
+// an ESM-only package (Ink v7); the CLI is CommonJS, so import it through a
+// real dynamic import the TypeScript CommonJS emit will not downlevel into a
+// require() (which would throw ERR_REQUIRE_ESM).
+const importEsm = new Function('specifier', 'return import(specifier);');
+program.action(async () => {
+    // Only a bare `marifold` (optionally with root options) launches the TUI. A
+    // stray/unknown subcommand (e.g. `marifold frobnicate`) lands here too because
+    // this is the default action — reject it instead of silently opening the TUI.
+    if (program.args.length > 0) {
+        printer.printError(new Error(`unknown command '${program.args[0]}'. Run \`marifold --help\` to see available commands.`));
+        process.exitCode = 1;
+        return;
+    }
+    const options = program.opts();
+    const loadedConfig = (0, RuntimeFactory_1.loadConfig)(program);
+    const { runTui } = await importEsm('@marifold/tui');
+    await runTui({
+        loadedConfig,
+        ...(options.profile ? { profile: options.profile } : {}),
+        ...(options.resume !== undefined ? { resume: options.resume } : {}),
+    });
+});
+program.parseAsync(process.argv).catch(error => {
+    printer.printError(error);
+    process.exitCode = 1;
+});
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/input/InteractivePrompt.d.ts

@@ -0,0 +1,9 @@
+export declare class InteractivePrompt {
+    private readonly interface;
+    readUserMessage(label?: string, options?: {
+        onEscape?: 'cancel' | 'back';
+    }): Promise<string | undefined>;
+    readMultilineMessage(label?: string, continuationLabel?: string): Promise<string | undefined>;
+    close(): void;
+}
+//# sourceMappingURL=InteractivePrompt.d.ts.map

package/dist/input/InteractivePrompt.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"InteractivePrompt.d.ts","sourceRoot":"","sources":["../../src/input/InteractivePrompt.ts"],"names":[],"mappings":"AAIA,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAIvB;IAEG,eAAe,CACnB,KAAK,SAAW,EAChB,OAAO,GAAE;QAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAA;KAAO,GAC7C,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA2B7B;IAEK,oBAAoB,CAAC,KAAK,SAAY,EAAE,iBAAiB,SAAW,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgBvG;IAED,KAAK,IAAI,IAAI,CAEZ;CACF"}

package/dist/input/InteractivePrompt.js

@@ -0,0 +1,101 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InteractivePrompt = void 0;
+const readline = __importStar(require("readline/promises"));
+const process_1 = require("process");
+const PromptAbort_1 = require("./PromptAbort");
+class InteractivePrompt {
+    interface = readline.createInterface({
+        input: process_1.stdin,
+        output: process_1.stdout,
+        terminal: Boolean(process_1.stdin.isTTY && process_1.stdout.isTTY),
+    });
+    async readUserMessage(label = 'user> ', options = {}) {
+        // readline does not treat a lone Esc as cancel. When asked, wire a keypress
+        // listener to an AbortController so Esc rejects the question — letting callers
+        // either cancel the command or step back a wizard stage. (readline emits
+        // 'keypress' on the input in terminal mode; arrow keys carry names like 'up',
+        // so only a bare Esc matches 'escape'.)
+        const controller = options.onEscape && process_1.stdin.isTTY ? new AbortController() : undefined;
+        const onKeypress = (_str, key) => {
+            if (key?.name === 'escape')
+                controller?.abort();
+        };
+        if (controller)
+            process_1.stdin.on('keypress', onKeypress);
+        try {
+            return await (controller
+                ? this.interface.question(label, { signal: controller.signal })
+                : this.interface.question(label));
+        }
+        catch (error) {
+            // Esc fired our controller → distinguish "step back" from a hard cancel.
+            if (error instanceof Error && error.name === 'AbortError') {
+                if (options.onEscape === 'back')
+                    throw new PromptAbort_1.PromptBackError();
+                return undefined;
+            }
+            // Ctrl+C / Ctrl+D close the interface → always a cancel.
+            if (error instanceof Error && error.message === 'readline was closed')
+                return undefined;
+            throw error;
+        }
+        finally {
+            if (controller)
+                process_1.stdin.off('keypress', onKeypress);
+        }
+    }
+    async readMultilineMessage(label = 'user > ', continuationLabel = '... > ') {
+        const lines = [];
+        let prompt = label;
+        while (true) {
+            const line = await this.readUserMessage(prompt);
+            if (line === undefined)
+                return lines.length > 0 ? lines.join('\n') : undefined;
+            if (!line.endsWith('\\')) {
+                lines.push(line);
+                return lines.join('\n');
+            }
+            lines.push(line.slice(0, -1));
+            prompt = continuationLabel;
+        }
+    }
+    close() {
+        this.interface.close();
+    }
+}
+exports.InteractivePrompt = InteractivePrompt;
+//# sourceMappingURL=InteractivePrompt.js.map

package/dist/input/InteractivePrompt.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"InteractivePrompt.js","sourceRoot":"","sources":["../../src/input/InteractivePrompt.ts"],"names":[],"mappings":"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"}

package/dist/input/ModelPicker.d.ts

@@ -0,0 +1,34 @@
+import { LoadedMarifoldConfig, MarifoldProviderConfig, ProviderRegistryEntry } from '@marifold/core';
+import { InteractivePrompt } from './InteractivePrompt';
+import { TerminalStyle } from '../output/TerminalStyle';
+/** Lazily-created prompt, so an interactive picker only opens stdin when a
+ * fallback line read is actually needed. Shared by `model add` and `init`. */
+export type PromptFactory = () => InteractivePrompt;
+/** The provider-setup flags `model add` accepts; the picker reads only these. */
+export interface ModelAddSetupOptions {
+    providerType?: string;
+    baseUrl?: string;
+    apiKeyEnv?: string;
+}
+/**
+ * Resolve a provider/model pair for `marifold model add` (and `marifold init`'s
+ * model step). Falls back to interactive provider/model pickers when an argument
+ * is omitted, prompting for OAuth credentials when the chosen provider needs them.
+ */
+export declare function resolveModelAddTarget(loadedConfig: LoadedMarifoldConfig, getPrompt: PromptFactory, style: TerminalStyle, providerArg?: string, modelArg?: string, options?: ModelAddSetupOptions): Promise<{
+    provider: string;
+    model: string;
+}>;
+/** Read a numbered choice (or custom name when allowed) from a text prompt —
+ * the keyboard-less fallback when an arrow-key selector is unavailable. */
+export declare function readChoice(prompt: InteractivePrompt, style: TerminalStyle, label: string, values: string[], options?: {
+    defaultIndex?: number;
+    allowCustom?: boolean;
+}): Promise<string>;
+/** Force a fresh credential flow for a registry-managed OAuth provider while
+ * preserving its non-credential settings (for example proxy and base URL). */
+export declare function reauthenticateOAuthProvider(loadedConfig: LoadedMarifoldConfig, getPrompt: PromptFactory, style: TerminalStyle, provider: string): Promise<MarifoldProviderConfig>;
+/** Pure credential replacement used by setup and explicit re-authentication. */
+export declare function applyOAuthCredentials(current: MarifoldProviderConfig, entry: ProviderRegistryEntry, credentials: Partial<MarifoldProviderConfig>): MarifoldProviderConfig;
+export declare function providerHasUsableCredential(provider: MarifoldProviderConfig | undefined, options: ModelAddSetupOptions): boolean;
+//# sourceMappingURL=ModelPicker.d.ts.map

package/dist/input/ModelPicker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelPicker.d.ts","sourceRoot":"","sources":["../../src/input/ModelPicker.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EAEpB,sBAAsB,EAEtB,qBAAqB,EAGtB,MAAM,gBAAgB,CAAC;AAQxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAIxD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD;8EAC8E;AAC9E,MAAM,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC;AAEpD,iFAAiF;AACjF,MAAM,WAAW,oBAAoB;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAaD;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,oBAAoB,EAClC,SAAS,EAAE,aAAa,EACxB,KAAK,EAAE,aAAa,EACpB,WAAW,CAAC,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAU9C;AA6ED;2EAC2E;AAC3E,wBAAsB,UAAU,CAC9B,MAAM,EAAE,iBAAiB,EACzB,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EAAE,EAChB,OAAO,GAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GAC7D,OAAO,CAAC,MAAM,CAAC,CAYjB;AAiED;8EAC8E;AAC9E,wBAAsB,2BAA2B,CAC/C,YAAY,EAAE,oBAAoB,EAClC,SAAS,EAAE,aAAa,EACxB,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,sBAAsB,CAAC,CAgBjC;AAED,gFAAgF;AAChF,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE,qBAAqB,EAC5B,WAAW,EAAE,OAAO,CAAC,sBAAsB,CAAC,GAC3C,sBAAsB,CAoBxB;AAsID,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,sBAAsB,GAAG,SAAS,EAC5C,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAWT"}

package/dist/input/ModelPicker.js

@@ -0,0 +1,327 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveModelAddTarget = resolveModelAddTarget;
+exports.readChoice = readChoice;
+exports.reauthenticateOAuthProvider = reauthenticateOAuthProvider;
+exports.applyOAuthCredentials = applyOAuthCredentials;
+exports.providerHasUsableCredential = providerHasUsableCredential;
+const core_1 = require("@marifold/core");
+const ChatGptAuth_1 = require("../auth/ChatGptAuth");
+const XaiAuth_1 = require("../auth/XaiAuth");
+const GitHubCopilotAuth_1 = require("../auth/GitHubCopilotAuth");
+const PromptAbort_1 = require("./PromptAbort");
+const SecretPrompt_1 = require("./SecretPrompt");
+const TerminalSelect_1 = require("./TerminalSelect");
+/**
+ * Resolve a provider/model pair for `marifold model add` (and `marifold init`'s
+ * model step). Falls back to interactive provider/model pickers when an argument
+ * is omitted, prompting for OAuth credentials when the chosen provider needs them.
+ */
+async function resolveModelAddTarget(loadedConfig, getPrompt, style, providerArg, modelArg, options = {}) {
+    const providerWasPicked = providerArg === undefined;
+    const provider = providerArg ?? await selectProvider(loadedConfig, getPrompt, style);
+    if (providerWasPicked)
+        process.stdout.write('\n');
+    const shouldPromptProviderSetup = providerWasPicked || modelArg === undefined;
+    if (shouldPromptProviderSetup) {
+        await promptProviderSetupIfNeeded(loadedConfig, getPrompt, style, provider, options);
+    }
+    const model = modelArg ?? await selectModel(loadedConfig, getPrompt, style, provider);
+    return { provider, model };
+}
+async function selectProvider(loadedConfig, getPrompt, style) {
+    const providers = modelAddProviderChoices(loadedConfig);
+    if (providers.length === 0) {
+        throw core_1.MarifoldError.configInvalid('No providers are available. Run marifold init or pass provider/model explicitly.');
+    }
+    const defaultIndex = providers.findIndex(provider => provider.isDefault);
+    const selected = await (0, TerminalSelect_1.selectTerminalOption)('Select provider:', providers.map(provider => ({
+        label: formatProvider(provider),
+        value: provider.name,
+    })), {
+        defaultIndex: defaultIndex >= 0 ? defaultIndex : 0,
+    });
+    if (selected !== undefined)
+        return selected;
+    process.stdout.write('Select provider:\n');
+    providers.forEach((provider, index) => {
+        process.stdout.write(`  ${index + 1}. ${formatProvider(provider)}\n`);
+    });
+    return readChoice(getPrompt(), style, 'Provider', providers.map(provider => provider.name), {
+        defaultIndex: defaultIndex >= 0 ? defaultIndex : 0,
+    });
+}
+async function selectModel(loadedConfig, getPrompt, style, provider) {
+    const inspector = new core_1.ProviderInspector(loadedConfig);
+    const result = await inspector.listModels(provider);
+    const savedModels = savedModelsForProvider(loadedConfig, provider);
+    const models = uniqueSorted([...result.models, ...savedModels]);
+    if (models.length > 0) {
+        process.stdout.write(style.dim(`${result.message}\n`));
+        const customValue = Symbol('custom model');
+        const selected = await (0, TerminalSelect_1.selectTerminalOption)(`Select model for ${provider}:`, [
+            ...models.map(model => ({
+                label: model,
+                value: model,
+            })),
+            {
+                label: 'Custom model...',
+                value: customValue,
+            },
+        ], {
+            defaultIndex: 0,
+        });
+        if (selected !== undefined) {
+            if (selected === customValue)
+                return readRequiredLine(getPrompt(), style, `Model for ${provider}: `);
+            return selected;
+        }
+        process.stdout.write(`Select model for ${provider}:\n`);
+        models.forEach((model, index) => {
+            process.stdout.write(`  ${index + 1}. ${model}\n`);
+        });
+        return readChoice(getPrompt(), style, 'Model', models, {
+            defaultIndex: 0,
+            allowCustom: true,
+        });
+    }
+    if (result.message)
+        process.stdout.write(style.dim(`${result.message}\n`));
+    return readRequiredLine(getPrompt(), style, `Model for ${provider}: `);
+}
+/** Read a numbered choice (or custom name when allowed) from a text prompt —
+ * the keyboard-less fallback when an arrow-key selector is unavailable. */
+async function readChoice(prompt, style, label, values, options = {}) {
+    const defaultSuffix = options.defaultIndex !== undefined ? ` [${options.defaultIndex + 1}]` : '';
+    const customSuffix = options.allowCustom ? ' (number or custom name)' : '';
+    const answer = await prompt.readUserMessage(style.bold(`${label}${customSuffix}${defaultSuffix}: `));
+    if (answer === undefined)
+        throw new PromptAbort_1.PromptAbortError();
+    const raw = answer.trim();
+    if (!raw && options.defaultIndex !== undefined)
+        return values[options.defaultIndex];
+    const index = Number(raw);
+    if (Number.isInteger(index) && index >= 1 && index <= values.length)
+        return values[index - 1];
+    if (options.allowCustom && raw)
+        return raw;
+    throw core_1.MarifoldError.configInvalid(`Invalid ${label.toLowerCase()} selection.`);
+}
+async function readRequiredLine(prompt, style, label) {
+    const answer = await prompt.readUserMessage(style.bold(label));
+    if (answer === undefined)
+        throw new PromptAbort_1.PromptAbortError();
+    const value = answer.trim();
+    if (!value)
+        throw core_1.MarifoldError.configInvalid(`${label.replace(/:\s*$/, '')} cannot be empty.`);
+    return value;
+}
+function modelAddProviderChoices(loadedConfig) {
+    const configured = loadedConfig.config.providers;
+    const registry = (0, core_1.listProviderRegistry)();
+    const registryNames = new Set(registry.map(provider => provider.name));
+    const choices = registry.map(entry => providerChoiceFromRegistry(entry, loadedConfig));
+    const extraConfigured = Object.entries(configured)
+        .filter(([name]) => !registryNames.has(name))
+        .sort(([a], [b]) => a.localeCompare(b))
+        .map(([name, provider]) => ({
+        name,
+        label: name,
+        kind: 'configured',
+        type: provider.type,
+        baseUrl: provider.baseUrl,
+        apiKeyEnv: provider.apiKeyEnv,
+        isDefault: name === loadedConfig.config.default.provider,
+        configured: true,
+    }));
+    return [...choices, ...extraConfigured];
+}
+function providerChoiceFromRegistry(entry, loadedConfig) {
+    const configured = loadedConfig.config.providers[entry.name];
+    return {
+        name: entry.name,
+        label: entry.label,
+        kind: entry.kind,
+        type: configured?.type ?? entry.type,
+        baseUrl: configured?.baseUrl ?? entry.defaultBaseUrl,
+        apiKeyEnv: configured?.apiKeyEnv ?? entry.apiKeyEnv,
+        isDefault: entry.name === loadedConfig.config.default.provider,
+        configured: Boolean(configured),
+    };
+}
+function formatProvider(provider) {
+    return `${provider.name}  —  ${provider.label}`;
+}
+async function promptProviderSetupIfNeeded(loadedConfig, getPrompt, style, provider, options) {
+    const entry = (0, core_1.listProviderRegistry)().find(item => item.name === provider);
+    if (entry?.kind !== 'oauth')
+        return;
+    if (providerHasUsableCredential(loadedConfig.config.providers[provider], options))
+        return;
+    await reauthenticateOAuthProvider(loadedConfig, getPrompt, style, provider);
+}
+/** Force a fresh credential flow for a registry-managed OAuth provider while
+ * preserving its non-credential settings (for example proxy and base URL). */
+async function reauthenticateOAuthProvider(loadedConfig, getPrompt, style, provider) {
+    const entry = (0, core_1.listProviderRegistry)().find(item => item.name === provider);
+    if (!entry) {
+        throw core_1.MarifoldError.configInvalid(`Unknown provider '${provider}'.`);
+    }
+    if (entry.kind !== 'oauth') {
+        throw core_1.MarifoldError.configInvalid(`Provider '${provider}' does not use Marifold-managed OAuth. Update its API key or API key environment variable instead.`);
+    }
+    const current = loadedConfig.config.providers[provider] ?? { type: entry.type };
+    const credentials = await promptOAuthCredentials(getPrompt, style, entry, current.proxy);
+    const updated = applyOAuthCredentials(current, entry, credentials);
+    loadedConfig.config.providers[provider] = updated;
+    return updated;
+}
+/** Pure credential replacement used by setup and explicit re-authentication. */
+function applyOAuthCredentials(current, entry, credentials) {
+    const updated = {
+        ...current,
+        type: entry.type,
+        baseUrl: credentials.baseUrl ?? current.baseUrl ?? entry.defaultBaseUrl,
+        apiKeyEnv: current.apiKeyEnv ?? entry.apiKeyEnv,
+        apiKey: credentials.apiKey,
+        oauthToken: credentials.oauthToken,
+        apiKeyExpiresAt: credentials.apiKeyExpiresAt,
+        accountId: credentials.accountId,
+    };
+    // Keep the in-memory config as clean as the serialized TOML: switching from
+    // OAuth to a manual credential must not retain an obsolete refresh token,
+    // expiry, or ChatGPT account id.
+    if (!updated.apiKeyEnv)
+        delete updated.apiKeyEnv;
+    if (!updated.apiKey)
+        delete updated.apiKey;
+    if (!updated.oauthToken)
+        delete updated.oauthToken;
+    if (updated.apiKeyExpiresAt === undefined)
+        delete updated.apiKeyExpiresAt;
+    if (!updated.accountId)
+        delete updated.accountId;
+    return updated;
+}
+async function promptOAuthCredentials(getPrompt, style, provider, proxy) {
+    if (provider.name === 'github_copilot')
+        return promptGitHubCopilotCredentials(getPrompt, style, provider);
+    if (provider.name === 'chatgpt')
+        return promptChatGptCredentials(getPrompt, style, provider);
+    if (provider.name === 'xai')
+        return promptXaiCredentials(getPrompt, style, provider, proxy);
+    const token = await readRequiredSecret(getPrompt, style, 'OAuth token: ');
+    return {
+        apiKey: token,
+        baseUrl: provider.defaultBaseUrl,
+    };
+}
+async function promptGitHubCopilotCredentials(getPrompt, style, provider) {
+    const method = await selectLabeledChoice(getPrompt, style, 'GitHub Copilot authorization:', [
+        { label: 'Authorize with GitHub device code (OAuth)', value: 'device' },
+        { label: 'Paste token manually', value: 'manual' },
+    ]);
+    if (method === 'device')
+        return (0, GitHubCopilotAuth_1.authorizeGitHubCopilotWithDevice)();
+    const tokenType = await selectLabeledChoice(getPrompt, style, 'Token type:', [
+        { label: 'GitHub OAuth/PAT token (exchange now)', value: 'github' },
+        { label: 'Copilot IDE token (starts with tid=)', value: 'copilot' },
+    ]);
+    const token = await readRequiredSecret(getPrompt, style, 'Token: ');
+    if (tokenType === 'copilot') {
+        if (!(0, GitHubCopilotAuth_1.looksLikeCopilotIdeToken)(token)) {
+            process.stderr.write(style.yellow('Token does not look like a Copilot IDE token; saving it anyway.\n'));
+        }
+        return {
+            apiKey: token,
+            baseUrl: provider.defaultBaseUrl,
+        };
+    }
+    const copilot = await (0, GitHubCopilotAuth_1.exchangeGitHubTokenForCopilotToken)(token);
+    return {
+        apiKey: copilot.token,
+        baseUrl: copilot.baseUrl,
+        oauthToken: token,
+        apiKeyExpiresAt: copilot.expiresAt,
+    };
+}
+async function promptChatGptCredentials(getPrompt, style, provider) {
+    const method = await selectLabeledChoice(getPrompt, style, 'ChatGPT credential:', [
+        { label: 'Sign in with ChatGPT in browser (OAuth)', value: 'oauth' },
+        { label: 'Paste OpenAI API key', value: 'api_key' },
+    ]);
+    if (method === 'oauth') {
+        const tokens = await (0, ChatGptAuth_1.authorizeChatGptWithBrowser)();
+        return {
+            // The OAuth access token is the Codex-backend bearer credential; ChatGPT
+            // subscription accounts have no platform API key to exchange for.
+            apiKey: tokens.accessToken,
+            baseUrl: provider.defaultBaseUrl,
+            oauthToken: tokens.refreshToken,
+            apiKeyExpiresAt: tokens.expiresAt,
+            accountId: tokens.accountId,
+        };
+    }
+    return {
+        apiKey: await readRequiredSecret(getPrompt, style, 'OpenAI API key: '),
+        baseUrl: provider.defaultBaseUrl,
+    };
+}
+async function promptXaiCredentials(getPrompt, style, provider, proxy) {
+    // SuperGrok / X Premium+ subscription OAuth is the intended path. A raw key is
+    // still honored via the XAI_API_KEY env var (apiKeyEnv), so the picker stays
+    // OAuth-only rather than prompting for a key to store in config. The paste
+    // callback lets the user finish when xAI shows a code instead of redirecting.
+    const tokens = await (0, XaiAuth_1.authorizeXaiWithBrowser)(text => process.stdout.write(text), async (label) => getPrompt().readUserMessage(style.bold(label)), { proxy });
+    return {
+        // api.x.ai is plain OpenAI-compatible: the OAuth access token is the Bearer
+        // credential directly, refreshed from the stored refresh token.
+        apiKey: tokens.accessToken,
+        baseUrl: provider.defaultBaseUrl,
+        oauthToken: tokens.refreshToken,
+        apiKeyExpiresAt: tokens.expiresAt,
+    };
+}
+async function selectLabeledChoice(getPrompt, style, message, options) {
+    const selected = await (0, TerminalSelect_1.selectTerminalOption)(message, options);
+    if (selected !== undefined)
+        return selected;
+    process.stdout.write(`${message}\n`);
+    options.forEach((option, index) => {
+        process.stdout.write(`  ${index + 1}. ${option.label}\n`);
+    });
+    return readChoice(getPrompt(), style, message.replace(/:\s*$/, ''), options.map(option => option.value), {
+        defaultIndex: 0,
+    });
+}
+async function readRequiredSecret(getPrompt, style, label) {
+    const value = await (0, SecretPrompt_1.readSecretLine)(style.bold(label), getPrompt);
+    if (!value)
+        throw core_1.MarifoldError.configInvalid(`${label.replace(/:\s*$/, '')} cannot be empty.`);
+    return value;
+}
+function providerHasUsableCredential(provider, options) {
+    if (options.apiKeyEnv)
+        return true;
+    if (!provider)
+        return false;
+    if (provider.apiKeyEnv && process.env[provider.apiKeyEnv])
+        return true;
+    if (provider.apiKey) {
+        const refreshWindowSeconds = 60;
+        const nowSeconds = Math.floor(Date.now() / 1000);
+        return provider.apiKeyExpiresAt === undefined
+            || provider.apiKeyExpiresAt > nowSeconds + refreshWindowSeconds;
+    }
+    return false;
+}
+function savedModelsForProvider(loadedConfig, provider) {
+    return loadedConfig.config.models.options
+        .filter(option => option.startsWith(`${provider}/`))
+        .map(option => option.slice(provider.length + 1))
+        .filter(model => model.length > 0);
+}
+function uniqueSorted(values) {
+    return [...new Set(values)].sort();
+}
+//# sourceMappingURL=ModelPicker.js.map