@yagr/agent 0.2.9 → 0.2.11

package/dist/setup/setup-wizard.js

@@ -1,20 +1,31 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text, render, useApp, useInput, useStdout } from 'ink';
 import { useCallback, useEffect, useRef, useState } from 'react';
+import { getProviderDisplayName, getProviderSetupHint, isExperimentalProvider, isOAuthAccountProvider, providerRequiresApiKey, YAGR_MODEL_PROVIDERS, } from '../llm/provider-registry.js';
 // ─── Palette ──────────────────────────────────────────────────────────────────
 const CURSOR = '▸';
 const CHECK = '✓';
 const DOT = '·';
 const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
-const VALID_PROVIDERS = [
-    'anthropic', 'openai', 'google', 'groq', 'mistral', 'openrouter',
+const PROVIDER_WIZARD_ORDER = [
+    'openai',
+    'openai-proxy',
+    'anthropic',
+    'anthropic-proxy',
+    'google',
+    'google-proxy',
+    'copilot-proxy',
+    'groq',
+    'mistral',
+    'openrouter',
 ];
+const VALID_PROVIDERS = PROVIDER_WIZARD_ORDER.filter((provider) => YAGR_MODEL_PROVIDERS.includes(provider));
 const SURFACE_OPTIONS = [
     { value: 'telegram', label: 'Telegram', hint: 'Bot-based chat gateway' },
 ];
-export function runSetupWizard(callbacks) {
+export function runSetupWizard(callbacks, options = {}) {
     return new Promise((resolve) => {
-        const { unmount } = render(_jsx(SetupWizard, { callbacks: callbacks, onDone: (result) => { unmount(); resolve(result); } }));
+        const { unmount } = render(_jsx(SetupWizard, { callbacks: callbacks, options: options, onDone: (result) => { unmount(); resolve(result); } }));
     });
 }
 function sectionFor(phase) {
@@ -33,15 +44,65 @@ function sectionIndex(phase) {
         return 2;
     return 3;
 }
+function getProviderAuthCopy(provider) {
+    if (provider === 'openai-proxy') {
+        return {
+            title: 'Connect OpenAI account',
+            body: [
+                'Yagr will open your browser to sign you in with your ChatGPT account.',
+                'This uses your ChatGPT subscription — no API credits are consumed.',
+            ],
+            continueLabel: 'Sign in with ChatGPT',
+        };
+    }
+    if (provider === 'anthropic-proxy') {
+        return {
+            title: 'Connect Claude token',
+            body: [
+                'Generate a setup-token on a machine where Claude CLI is installed and logged in:',
+                '`claude setup-token`',
+                'Paste the generated setup-token below.',
+            ],
+            continueLabel: 'Paste setup-token',
+        };
+    }
+    if (provider === 'google-proxy') {
+        return {
+            title: 'Connect Gemini account',
+            body: [
+                'Yagr runs a native Google OAuth flow for your Gemini account.',
+                'It will show a browser URL and ask you to paste the redirect URL back here.',
+            ],
+            continueLabel: 'Continue with Gemini sign-in',
+        };
+    }
+    if (provider === 'copilot-proxy') {
+        return {
+            title: 'Connect GitHub Copilot account',
+            body: [
+                'Yagr runs a native GitHub device login and exchanges it for a Copilot runtime token.',
+                'It will show a verification URL and code in the terminal.',
+            ],
+            continueLabel: 'Continue with GitHub sign-in',
+        };
+    }
+    return {
+        title: `Connect ${getProviderDisplayName(provider)}`,
+        body: ['Yagr will verify your account session before loading models.'],
+        continueLabel: 'Continue',
+    };
+}
 // ─── Primitive UI components ──────────────────────────────────────────────────
 function Rule() {
     return _jsx(Text, { dimColor: true, children: '─'.repeat(56) });
 }
-function Header({ phase }) {
+function Header({ phase, mode }) {
     const section = sectionFor(phase);
     const idx = sectionIndex(phase);
     const isDone = phase.kind === 'done' || phase.kind === 'cancelled' || phase.kind === 'error';
-    return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsx(Text, { color: "cyan", bold: true, children: "\u25C8  Yagr Setup" }), !isDone && (_jsx(Text, { dimColor: true, children: `${idx === 1 ? '●' : '○'}${idx === 2 ? '●' : '○'}${idx === 3 ? '●' : '○'}  step ${idx} / 3` }))] }), section ? (_jsx(Text, { color: "cyan", dimColor: true, children: section })) : null, _jsx(Rule, {})] }));
+    return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsx(Text, { color: "cyan", bold: true, children: "\u25C8  Yagr Setup" }), !isDone && (_jsx(Text, { dimColor: true, children: mode === 'llm-only'
+                            ? '●  step 1 / 1'
+                            : `${idx === 1 ? '●' : '○'}${idx === 2 ? '●' : '○'}${idx === 3 ? '●' : '○'}  step ${idx} / 3` }))] }), section ? (_jsx(Text, { color: "cyan", dimColor: true, children: section })) : null, _jsx(Rule, {})] }));
 }
 function HintBar({ hints }) {
     return (_jsxs(Box, { marginTop: 1, children: [_jsx(Rule, {}), _jsx(Box, { children: hints.map((hint, i) => (_jsxs(Text, { dimColor: true, children: [hint, i < hints.length - 1 ? '   ' : ''] }, i))) })] }));
@@ -165,11 +226,16 @@ function SelectList({ options, cursor, getLabel, getHint, maxVisibleRows, maxLin
                 const active = i === cursor;
                 const hint = getHint?.(opt);
                 const prefix = active ? `  ${CURSOR} ` : '    ';
-                const suffix = hint ? `  ${DOT}  ${hint}` : '';
-                const line = truncateTerminalLine(`${prefix}${getLabel(opt)}${suffix}`, availableWidth);
+                const line = truncateTerminalLine(formatOptionLineWithHint(prefix, getLabel(opt), hint, availableWidth), availableWidth);
                 return (_jsx(Box, { children: _jsx(Text, { color: active ? 'cyan' : undefined, bold: active, children: line }) }, i));
             }), end < options.length ? _jsx(Text, { dimColor: true, children: truncateTerminalLine(`  ↓  ${options.length - end} more`, availableWidth) }) : null] }));
 }
+function formatOptionLineWithHint(prefix, label, hint, width) {
+    if (!hint) {
+        return `${prefix}${label}`;
+    }
+    return `${prefix}${label}  ${DOT}  ${hint}`;
+}
 function MultiSelectList({ options, cursor, selected, maxVisibleRows, maxLineWidth, }) {
     const visibleRows = Math.max(1, maxVisibleRows ?? options.length);
     const { start, end } = getVisibleWindow(options.length, cursor, visibleRows);
@@ -186,21 +252,41 @@ function MultiSelectList({ options, cursor, selected, maxVisibleRows, maxLineWid
             }), end < options.length ? _jsx(Text, { dimColor: true, children: truncateTerminalLine(`  ↓  ${options.length - end} more`, availableWidth) }) : null] }));
 }
 // ─── Main wizard component ────────────────────────────────────────────────────
-function SetupWizard({ callbacks, onDone }) {
+function SetupWizard({ callbacks, options, onDone }) {
     const app = useApp();
     const { stdout } = useStdout();
     const n8nDef = callbacks.getN8nDefaults();
     const llmDef = callbacks.getLlmDefaults();
     const surfDef = callbacks.getSurfaceDefaults();
-    const [phase, setPhase] = useState({ kind: 'n8n-url', def: n8nDef.url });
-    const [textValue, setTextValue] = useState(n8nDef.url);
+    const mode = options?.mode ?? 'full';
+    const [phase, setPhase] = useState(() => {
+        if (mode === 'llm-only') {
+            const llmProvider = llmDef.provider;
+            if (llmProvider) {
+                const existingApiKey = llmDef.getApiKey(llmProvider);
+                const existingModel = llmDef.getDefaultModel(llmProvider);
+                if (existingModel && (existingApiKey || !providerRequiresApiKey(llmProvider))) {
+                    return { kind: 'llm-reuse-config', provider: llmProvider, apiKey: existingApiKey ?? '', model: existingModel, cursor: 0 };
+                }
+                return {
+                    kind: 'llm-provider',
+                    initial: llmProvider,
+                    cursor: Math.max(0, VALID_PROVIDERS.indexOf(llmProvider)),
+                };
+            }
+            return { kind: 'llm-provider', cursor: 0 };
+        }
+        return { kind: 'n8n-mode', cursor: 0 };
+    });
+    const [textValue, setTextValue] = useState('');
     const [spinnerFrame, setSpinnerFrame] = useState(0);
     const asyncGuard = useRef(0);
     const llmApiKeyDraftsRef = useRef({});
+    const llmBaseUrlDraftsRef = useRef({});
     const terminalRows = stdout?.rows ?? process.stdout.rows ?? 24;
     const terminalColumns = stdout?.columns ?? process.stdout.columns ?? 80;
     const listLineWidth = Math.max(12, terminalColumns - 6);
-    const isLoading = phase.kind === 'n8n-connecting' || phase.kind === 'n8n-saving'
+    const isLoading = phase.kind === 'n8n-connecting' || phase.kind === 'n8n-saving' || phase.kind === 'n8n-local-installing'
         || phase.kind === 'llm-models-loading' || phase.kind === 'telegram-connecting';
     useEffect(() => {
         if (!isLoading)
@@ -217,6 +303,45 @@ function SetupWizard({ callbacks, onDone }) {
             cancel('Setup cancelled.');
         }
     });
+    useEffect(() => {
+        if (phase.kind !== 'n8n-local-installing')
+            return;
+        const guard = ++asyncGuard.current;
+        void (async () => {
+            try {
+                const state = await callbacks.installManagedLocalN8n(phase.strategy);
+                if (guard !== asyncGuard.current)
+                    return;
+                const bootstrap = await callbacks.bootstrapManagedLocalN8n(state.url);
+                if (guard !== asyncGuard.current)
+                    return;
+                if (bootstrap.mode === 'silent' && bootstrap.apiKey) {
+                    setPhase({ kind: 'n8n-connecting', url: state.url, apiKey: bootstrap.apiKey, runtimeSource: 'managed-local' });
+                    return;
+                }
+                const existing = callbacks.getN8nDefaults(state.url).apiKey;
+                if (existing) {
+                    setPhase({ kind: 'n8n-connecting', url: state.url, apiKey: existing, runtimeSource: 'managed-local' });
+                    return;
+                }
+                setPhase({
+                    kind: 'n8n-local-ready',
+                    url: state.url,
+                    cursor: 0,
+                    note: bootstrap.reason ? `Silent bootstrap fallback: ${bootstrap.reason}` : undefined,
+                });
+            }
+            catch (err) {
+                if (guard !== asyncGuard.current)
+                    return;
+                setPhase({
+                    kind: 'n8n-mode',
+                    cursor: phase.strategy === 'docker' ? 0 : 1,
+                    err: err instanceof Error ? err.message : String(err),
+                });
+            }
+        })();
+    }, [phase.kind]); // eslint-disable-line react-hooks/exhaustive-deps
     useEffect(() => {
         if (phase.kind !== 'n8n-connecting')
             return;
@@ -229,14 +354,14 @@ function SetupWizard({ callbacks, onDone }) {
                 if (projects.length === 1) {
                     setPhase({
                         kind: 'n8n-syncfolder',
-                        url: phase.url, apiKey: phase.apiKey,
+                        url: phase.url, apiKey: phase.apiKey, runtimeSource: phase.runtimeSource,
                         project: projects[0],
                         def: n8nDef.syncFolder ?? 'workflows',
                     });
                     setTextValue(n8nDef.syncFolder ?? 'workflows');
                 }
                 else {
-                    setPhase({ kind: 'n8n-project', url: phase.url, apiKey: phase.apiKey, projects, cursor: 0 });
+                    setPhase({ kind: 'n8n-project', url: phase.url, apiKey: phase.apiKey, runtimeSource: phase.runtimeSource, projects, cursor: 0 });
                 }
             }
             catch (err) {
@@ -253,15 +378,15 @@ function SetupWizard({ callbacks, onDone }) {
         const guard = ++asyncGuard.current;
         void (async () => {
             try {
-                await callbacks.saveN8nConfig({ url: phase.url, apiKey: phase.apiKey, project: phase.project, syncFolder: phase.syncFolder });
+                await callbacks.saveN8nConfig({ url: phase.url, apiKey: phase.apiKey, project: phase.project, syncFolder: phase.syncFolder, runtimeSource: phase.runtimeSource });
                 if (guard !== asyncGuard.current)
                     return;
                 const llmProvider = llmDef.provider;
                 if (llmProvider) {
                     const existingApiKey = llmDef.getApiKey(llmProvider);
                     const existingModel = llmDef.getDefaultModel(llmProvider);
-                    if (existingApiKey && existingModel) {
-                        setPhase({ kind: 'llm-reuse-config', provider: llmProvider, apiKey: existingApiKey, model: existingModel, cursor: 0 });
+                    if (existingModel && (existingApiKey || !providerRequiresApiKey(llmProvider))) {
+                        setPhase({ kind: 'llm-reuse-config', provider: llmProvider, apiKey: existingApiKey ?? '', model: existingModel, cursor: 0 });
                         return;
                     }
                 }
@@ -281,16 +406,56 @@ function SetupWizard({ callbacks, onDone }) {
         const guard = ++asyncGuard.current;
         void (async () => {
             try {
-                const models = await callbacks.fetchModels(phase.provider, phase.apiKey);
+                let models = [];
+                let resolvedApiKey = phase.apiKey;
+                let note = phase.note;
+                const prepared = await callbacks.prepareProvider(phase.provider, phase.apiKey || undefined);
+                if (guard !== asyncGuard.current)
+                    return;
+                if (prepared.ready) {
+                    if (prepared.baseUrl) {
+                        llmBaseUrlDraftsRef.current[phase.provider] = prepared.baseUrl;
+                    }
+                    if (prepared.apiKey !== undefined) {
+                        resolvedApiKey = prepared.apiKey;
+                        llmApiKeyDraftsRef.current[phase.provider] = prepared.apiKey;
+                    }
+                    if (prepared.notes && prepared.notes.length > 0) {
+                        note = prepared.notes.join(' ');
+                    }
+                    models = prepared.models ?? [];
+                }
+                else if (isOAuthAccountProvider(phase.provider)) {
+                    const preparedError = prepared.error?.toLowerCase() ?? '';
+                    if (preparedError.includes('insufficient authentication scopes') || preparedError.includes('http 403')) {
+                        setTextValue('');
+                        setPhase({ kind: 'llm-account-auth', provider: phase.provider, cursor: 0 });
+                        return;
+                    }
+                    setPhase({
+                        kind: 'llm-model',
+                        provider: phase.provider,
+                        apiKey: phase.apiKey,
+                        models: [],
+                        defModel: phase.defModel,
+                        cursor: 0,
+                        note: prepared.error || note,
+                    });
+                    return;
+                }
+                if (models.length === 0) {
+                    models = await callbacks.fetchModels(phase.provider, resolvedApiKey || undefined);
+                }
                 if (guard !== asyncGuard.current)
                     return;
                 const displayedOptions = getDisplayedModelOptions(models);
                 const idx = phase.defModel ? displayedOptions.indexOf(phase.defModel) : -1;
                 setPhase({
                     kind: 'llm-model',
-                    provider: phase.provider, apiKey: phase.apiKey,
+                    provider: phase.provider, apiKey: resolvedApiKey,
                     models, defModel: phase.defModel,
                     cursor: idx >= 0 ? idx : 0,
+                    note,
                 });
             }
             catch {
@@ -299,7 +464,7 @@ function SetupWizard({ callbacks, onDone }) {
                 setPhase({
                     kind: 'llm-model',
                     provider: phase.provider, apiKey: phase.apiKey,
-                    models: [], defModel: phase.defModel, cursor: 0,
+                    models: [], defModel: phase.defModel, cursor: 0, note: phase.note,
                 });
             }
         })();
@@ -357,26 +522,16 @@ function SetupWizard({ callbacks, onDone }) {
             setPhase((p) => ({ ...p, err: 'API key is required.' }));
             return;
         }
-        setPhase({ kind: 'n8n-connecting', url, apiKey: key });
+        setPhase({ kind: 'n8n-connecting', url, apiKey: key, runtimeSource: 'external' });
     }, []);
-    const handleSyncFolderSubmit = useCallback((url, apiKey, project) => (value) => {
+    const handleSyncFolderSubmit = useCallback((url, apiKey, runtimeSource, project) => (value) => {
         const folder = value.trim();
         if (!folder) {
             setPhase((p) => ({ ...p, err: 'Sync folder is required.' }));
             return;
         }
-        setPhase({ kind: 'n8n-saving', url, apiKey, project, syncFolder: folder });
+        setPhase({ kind: 'n8n-saving', url, apiKey, runtimeSource, project, syncFolder: folder });
     }, []);
-    const handleLlmApiKeySubmit = useCallback((provider) => (value) => {
-        const key = value.trim();
-        if (!key) {
-            setPhase((p) => ({ ...p, err: 'API key is required.' }));
-            return;
-        }
-        llmApiKeyDraftsRef.current[provider] = key;
-        const defModel = llmDef.getDefaultModel(provider);
-        setPhase({ kind: 'llm-models-loading', provider, apiKey: key, defModel });
-    }, [llmDef]);
     const handleBaseUrlSubmit = useCallback((provider, apiKey, model) => (value) => {
         const url = value.trim();
         if (url) {
@@ -400,15 +555,125 @@ function SetupWizard({ callbacks, onDone }) {
         }
         setPhase({ kind: 'telegram-connecting', surfaces, token });
     }, []);
+    const transitionToLlmModelsLoading = useCallback((provider, apiKey, defModel, note) => {
+        setTextValue('');
+        setPhase({
+            kind: 'llm-models-loading',
+            provider,
+            apiKey,
+            defModel,
+            ...(note ? { note } : {}),
+        });
+    }, []);
+    const handleLlmApiKeySubmit = useCallback((provider) => (value) => {
+        const key = value.trim();
+        if (!key && providerRequiresApiKey(provider)) {
+            setPhase((p) => ({ ...p, err: 'API key is required.' }));
+            return;
+        }
+        llmApiKeyDraftsRef.current[provider] = key;
+        const defModel = llmDef.getDefaultModel(provider);
+        transitionToLlmModelsLoading(provider, key, defModel);
+    }, [llmDef, transitionToLlmModelsLoading]);
+    const handleAccountAuthSubmit = useCallback((provider, state) => (value) => {
+        void (async () => {
+            try {
+                const result = await callbacks.completeAccountAuth(provider, value, state);
+                if (!result.ok) {
+                    setPhase((current) => current.kind === 'llm-account-input'
+                        ? { ...current, err: result.error || 'Authentication failed.' }
+                        : current);
+                    return;
+                }
+                const defModel = llmDef.getDefaultModel(provider);
+                transitionToLlmModelsLoading(provider, result.apiKey ?? '', defModel);
+            }
+            catch (error) {
+                setPhase((current) => current.kind === 'llm-account-input'
+                    ? { ...current, err: error instanceof Error ? error.message : String(error) }
+                    : current);
+            }
+        })();
+    }, [callbacks, llmDef, transitionToLlmModelsLoading]);
+    const saveLlmAndContinue = useCallback((provider, apiKey, model, note) => {
+        const draftedBaseUrl = llmBaseUrlDraftsRef.current[provider];
+        callbacks.saveLlmConfig({ provider, apiKey, model, baseUrl: draftedBaseUrl || undefined });
+        setTextValue('');
+        if (mode === 'llm-only') {
+            setPhase({ kind: 'done', n8nHost: '', n8nProject: '', provider, model, surfaces: surfDef.surfaces });
+            setTimeout(() => { onDone({ ok: true }); app.exit(); }, 250);
+            return;
+        }
+        setPhase({ kind: 'surfaces', cursor: 0, selected: surfDef.surfaces });
+    }, [app, callbacks, mode, onDone, surfDef]);
     const handleSelectKey = useCallback((input, key) => {
-        if (phase.kind === 'n8n-reuse-apikey') {
+        if (phase.kind === 'n8n-mode') {
+            if (key.upArrow)
+                setPhase({ ...phase, cursor: Math.max(0, phase.cursor - 1), err: undefined });
+            else if (key.downArrow)
+                setPhase({ ...phase, cursor: Math.min(2, phase.cursor + 1), err: undefined });
+            else if (key.return) {
+                if (phase.cursor === 0) {
+                    setPhase({ kind: 'n8n-local-installing', startedAt: Date.now(), strategy: 'docker' });
+                }
+                else if (phase.cursor === 1) {
+                    setPhase({ kind: 'n8n-local-installing', startedAt: Date.now(), strategy: 'direct' });
+                }
+                else {
+                    setPhase({ kind: 'n8n-url', def: n8nDef.url });
+                    setTextValue(n8nDef.url);
+                }
+            }
+            else if (key.escape)
+                cancel('Setup cancelled.');
+        }
+        else if (phase.kind === 'n8n-local-ready') {
+            if (key.upArrow)
+                setPhase({ ...phase, cursor: Math.max(0, phase.cursor - 1) });
+            else if (key.downArrow)
+                setPhase({ ...phase, cursor: Math.min(1, phase.cursor + 1) });
+            else if (key.return) {
+                if (phase.cursor === 0) {
+                    void (async () => {
+                        try {
+                            await callbacks.openUrl(phase.url);
+                        }
+                        catch {
+                            // Leave the flow available even if browser opening fails.
+                        }
+                        const existing = callbacks.getN8nDefaults(phase.url).apiKey;
+                        if (existing) {
+                            setPhase({ kind: 'n8n-connecting', url: phase.url, apiKey: existing, runtimeSource: 'managed-local' });
+                            return;
+                        }
+                        setPhase({
+                            kind: 'n8n-local-auth',
+                            url: phase.url,
+                            message: 'The local n8n editor is ready. Create the owner account, then open Settings > n8n API, generate a key for Yagr, and paste it here.',
+                        });
+                        setTextValue('');
+                    })();
+                }
+                else {
+                    setPhase({
+                        kind: 'n8n-local-auth',
+                        url: phase.url,
+                        message: 'Open the local n8n URL in your browser, create the owner account, then generate a key in Settings > n8n API and paste it here.',
+                    });
+                    setTextValue('');
+                }
+            }
+            else if (key.escape)
+                cancel('Setup cancelled.');
+        }
+        else if (phase.kind === 'n8n-reuse-apikey') {
             if (key.upArrow)
                 setPhase({ ...phase, cursor: Math.max(0, phase.cursor - 1) });
             else if (key.downArrow)
                 setPhase({ ...phase, cursor: Math.min(1, phase.cursor + 1) });
             else if (key.return) {
                 if (phase.cursor === 0) {
-                    setPhase({ kind: 'n8n-connecting', url: phase.url, apiKey: phase.existing });
+                    setPhase({ kind: 'n8n-connecting', url: phase.url, apiKey: phase.existing, runtimeSource: 'external' });
                 }
                 else {
                     setPhase({ kind: 'n8n-apikey', url: phase.url });
@@ -425,7 +690,7 @@ function SetupWizard({ callbacks, onDone }) {
                 setPhase({ ...phase, cursor: Math.min(phase.projects.length - 1, phase.cursor + 1) });
             else if (key.return) {
                 const project = phase.projects[phase.cursor];
-                setPhase({ kind: 'n8n-syncfolder', url: phase.url, apiKey: phase.apiKey, project, def: n8nDef.syncFolder ?? 'workflows' });
+                setPhase({ kind: 'n8n-syncfolder', url: phase.url, apiKey: phase.apiKey, runtimeSource: phase.runtimeSource, project, def: n8nDef.syncFolder ?? 'workflows' });
                 setTextValue(n8nDef.syncFolder ?? 'workflows');
             }
             else if (key.escape)
@@ -439,10 +704,13 @@ function SetupWizard({ callbacks, onDone }) {
             else if (key.return) {
                 if (phase.cursor === 0) {
                     llmApiKeyDraftsRef.current[phase.provider] = phase.apiKey;
-                    callbacks.saveLlmConfig({ provider: phase.provider, apiKey: phase.apiKey, model: phase.model, baseUrl: llmDef.getBaseUrl(phase.provider) });
+                    const draftedBaseUrl = llmBaseUrlDraftsRef.current[phase.provider] ?? llmDef.getBaseUrl(phase.provider);
+                    callbacks.saveLlmConfig({ provider: phase.provider, apiKey: phase.apiKey, model: phase.model, baseUrl: draftedBaseUrl });
+                    setTextValue('');
                     setPhase({ kind: 'surfaces', cursor: 0, selected: surfDef.surfaces });
                 }
                 else {
+                    setTextValue('');
                     setPhase({ kind: 'llm-provider', initial: phase.provider, cursor: VALID_PROVIDERS.indexOf(phase.provider) });
                 }
             }
@@ -457,7 +725,16 @@ function SetupWizard({ callbacks, onDone }) {
             else if (key.return) {
                 const provider = VALID_PROVIDERS[phase.cursor];
                 const existing = llmApiKeyDraftsRef.current[provider] ?? llmDef.getApiKey(provider);
-                if (existing) {
+                if (isOAuthAccountProvider(provider)) {
+                    setTextValue('');
+                    setPhase({ kind: 'llm-account-auth', provider, cursor: 0 });
+                }
+                else if (!providerRequiresApiKey(provider)) {
+                    const defModel = llmDef.getDefaultModel(provider);
+                    transitionToLlmModelsLoading(provider, existing ?? '', defModel);
+                }
+                else if (existing) {
+                    setTextValue('');
                     setPhase({ kind: 'llm-reuse-apikey', provider, existing, cursor: 0 });
                 }
                 else {
@@ -468,6 +745,81 @@ function SetupWizard({ callbacks, onDone }) {
             else if (key.escape)
                 cancel('Setup cancelled.');
         }
+        else if (phase.kind === 'llm-account-auth') {
+            const maxCursor = 1;
+            if (key.upArrow)
+                setPhase({ ...phase, cursor: Math.max(0, phase.cursor - 1) });
+            else if (key.downArrow)
+                setPhase({ ...phase, cursor: Math.min(maxCursor, phase.cursor + 1) });
+            else if (key.return) {
+                if (phase.provider === 'anthropic-proxy' && phase.cursor === 0) {
+                    setPhase({
+                        kind: 'llm-account-input',
+                        provider: 'anthropic-proxy',
+                        title: 'Claude setup-token',
+                        instructions: [
+                            'On a machine where Claude CLI is installed and logged in, run:',
+                            'claude setup-token',
+                            'Copy the generated setup-token and paste it below.',
+                        ],
+                        placeholder: 'Paste setup-token',
+                        submitLabel: 'Continue with setup-token',
+                        state: 'anthropic:setup-token',
+                    });
+                    setTextValue('');
+                }
+                else if (phase.cursor === 0) {
+                    void (async () => {
+                        try {
+                            const authStep = await callbacks.startAccountAuth(phase.provider);
+                            const authUrl = (authStep.instructions ?? [])
+                                .map((line) => line.match(/https?:\/\/\S+/)?.[0])
+                                .find(Boolean);
+                            if (authUrl) {
+                                void callbacks.openUrl(authUrl).catch(() => {
+                                    // Browser auto-open is best effort only.
+                                });
+                            }
+                            if (authStep.kind === 'input') {
+                                setPhase({
+                                    kind: 'llm-account-input',
+                                    provider: phase.provider,
+                                    title: authStep.title ?? getProviderAuthCopy(phase.provider).title,
+                                    instructions: authStep.instructions ?? [],
+                                    placeholder: authStep.placeholder,
+                                    submitLabel: authStep.submitLabel ?? 'Continue',
+                                    state: authStep.state,
+                                });
+                                setTextValue('');
+                                return;
+                            }
+                            const defModel = llmDef.getDefaultModel(phase.provider);
+                            const authCopy = getProviderAuthCopy(phase.provider);
+                            transitionToLlmModelsLoading(phase.provider, '', defModel, authCopy.body.join(' '));
+                        }
+                        catch (error) {
+                            setPhase({
+                                kind: 'llm-account-input',
+                                provider: phase.provider,
+                                title: getProviderAuthCopy(phase.provider).title,
+                                instructions: getProviderAuthCopy(phase.provider).body,
+                                submitLabel: 'Continue',
+                                err: error instanceof Error ? error.message : String(error),
+                            });
+                        }
+                    })();
+                }
+                else {
+                    setPhase({ kind: 'llm-provider', initial: phase.provider, cursor: VALID_PROVIDERS.indexOf(phase.provider) });
+                }
+            }
+            else if (key.escape)
+                cancel('Setup cancelled.');
+        }
+        else if (phase.kind === 'llm-account-input') {
+            if (key.escape)
+                cancel('Setup cancelled.');
+        }
         else if (phase.kind === 'llm-reuse-apikey') {
             if (key.upArrow)
                 setPhase({ ...phase, cursor: Math.max(0, phase.cursor - 1) });
@@ -477,7 +829,7 @@ function SetupWizard({ callbacks, onDone }) {
                 if (phase.cursor === 0) {
                     const defModel = llmDef.getDefaultModel(phase.provider);
                     llmApiKeyDraftsRef.current[phase.provider] = phase.existing;
-                    setPhase({ kind: 'llm-models-loading', provider: phase.provider, apiKey: phase.existing, defModel });
+                    transitionToLlmModelsLoading(phase.provider, phase.existing, defModel);
                 }
                 else {
                     setPhase({ kind: 'llm-apikey', provider: phase.provider });
@@ -501,14 +853,18 @@ function SetupWizard({ callbacks, onDone }) {
                     return;
                 }
                 const model = selected;
+                const draftedBaseUrl = llmBaseUrlDraftsRef.current[phase.provider];
+                const defaultBaseUrl = draftedBaseUrl ?? llmDef.getBaseUrl(phase.provider);
                 const needsUrl = llmDef.needsBaseUrl(phase.provider);
-                if (needsUrl || llmDef.getBaseUrl(phase.provider)) {
-                    setPhase({ kind: 'llm-baseurl', provider: phase.provider, apiKey: phase.apiKey, model, def: llmDef.getBaseUrl(phase.provider) ?? '' });
-                    setTextValue(llmDef.getBaseUrl(phase.provider) ?? '');
+                if (draftedBaseUrl) {
+                    saveLlmAndContinue(phase.provider, phase.apiKey, model, phase.note);
+                }
+                else if (needsUrl || defaultBaseUrl) {
+                    setPhase({ kind: 'llm-baseurl', provider: phase.provider, apiKey: phase.apiKey, model, def: defaultBaseUrl ?? '' });
+                    setTextValue(defaultBaseUrl ?? '');
                 }
                 else {
-                    callbacks.saveLlmConfig({ provider: phase.provider, apiKey: phase.apiKey, model });
-                    setPhase({ kind: 'surfaces', cursor: 0, selected: surfDef.surfaces });
+                    saveLlmAndContinue(phase.provider, phase.apiKey, model, phase.note);
                 }
             }
             else if (key.escape)
@@ -568,7 +924,7 @@ function SetupWizard({ callbacks, onDone }) {
                 cancel('Setup cancelled.');
         }
     }, [phase, cancel, callbacks, llmDef, surfDef, n8nDef.syncFolder, app, onDone]);
-    const isSelectPhase = ['n8n-reuse-apikey', 'n8n-project', 'llm-provider', 'llm-reuse-config', 'llm-reuse-apikey', 'surfaces', 'telegram-reuse-token'].includes(phase.kind)
+    const isSelectPhase = ['n8n-mode', 'n8n-local-ready', 'n8n-reuse-apikey', 'n8n-project', 'llm-provider', 'llm-account-auth', 'llm-reuse-config', 'llm-reuse-apikey', 'surfaces', 'telegram-reuse-token'].includes(phase.kind)
         || (phase.kind === 'llm-model' && phase.models.length > 0);
     useInput((input, key) => {
         if (key.ctrl && input === 'c')
@@ -576,9 +932,23 @@ function SetupWizard({ callbacks, onDone }) {
         if (isSelectPhase)
             handleSelectKey(input, key);
     }, { isActive: isSelectPhase });
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [_jsx(Header, { phase: phase }), renderPhase()] }));
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [_jsx(Header, { phase: phase, mode: mode }), renderPhase()] }));
     function renderPhase() {
         switch (phase.kind) {
+            case 'n8n-mode':
+                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: "n8n setup path" }), _jsx(Text, { dimColor: true, children: "  Choose the lowest-friction way to connect Yagr to n8n." }), _jsx(SelectList, { options: [
+                                'Install a Yagr-managed n8n with Docker',
+                                'Install a Yagr-managed local n8n',
+                                'Use an existing n8n instance and API key',
+                            ], cursor: phase.cursor, getLabel: (v) => v, getHint: (v) => {
+                                if (v === 'Install a Yagr-managed n8n with Docker') {
+                                    return 'Recommended if Docker is installed and running';
+                                }
+                                if (v === 'Install a Yagr-managed local n8n') {
+                                    return 'Managed local runtime without Docker';
+                                }
+                                return 'Cloud or self-managed n8n';
+                            }, maxVisibleRows: getListViewportHeight(terminalRows, 13), maxLineWidth: listLineWidth }), phase.err ? _jsx(ErrorLine, { message: phase.err }) : null, _jsx(HintBar, { hints: ['↑↓  move', 'Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
             case 'n8n-url':
                 return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: "Instance URL" }), _jsx(Box, { marginLeft: 2, children: _jsx(WizardTextInput, { value: textValue, onChange: setTextValue, onSubmit: handleN8nUrlSubmit, placeholder: "https://your-n8n.example.com" }) }), phase.err ? _jsx(ErrorLine, { message: phase.err }) : null, _jsx(HintBar, { hints: ['Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
             case 'n8n-reuse-apikey':
@@ -587,44 +957,82 @@ function SetupWizard({ callbacks, onDone }) {
                 return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: "n8n API key" }), _jsx(Box, { marginLeft: 2, children: _jsx(WizardTextInput, { value: textValue, onChange: setTextValue, onSubmit: handleN8nApiKeySubmit(phase.url), mask: "\u25CF", placeholder: "your-api-key" }) }), phase.err ? _jsx(ErrorLine, { message: phase.err }) : null, _jsx(HintBar, { hints: ['Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
             case 'n8n-connecting':
                 return (_jsx(Box, { flexDirection: "column", children: _jsx(SpinnerDisplay, { message: `Connecting to ${phase.url}…`, frame: spinnerFrame }) }));
+            case 'n8n-local-installing':
+                {
+                    const elapsedSeconds = Math.max(0, Math.round((Date.now() - phase.startedAt) / 1000));
+                    const elapsedLabel = elapsedSeconds < 60
+                        ? `${elapsedSeconds}s`
+                        : `${Math.floor(elapsedSeconds / 60)}m ${String(elapsedSeconds % 60).padStart(2, '0')}s`;
+                    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(SpinnerDisplay, { message: "Installing and starting a Yagr-managed local n8n instance\u2026", frame: spinnerFrame }), _jsx(Text, { dimColor: true, children: "  Yagr is waiting for the n8n API and editor to become ready before continuing." }), _jsx(Text, { dimColor: true, children: "  First run can take 1 to 3 minutes depending on Docker, npm downloads, and machine speed." }), _jsxs(Text, { dimColor: true, children: ["  Elapsed: ", elapsedLabel] })] }));
+                }
+            case 'n8n-local-ready':
+                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: "Local n8n is ready" }), _jsxs(Text, { dimColor: true, children: ["  Instance URL: ", phase.url] }), _jsx(Text, { dimColor: true, children: "  Yagr waited for the n8n editor to finish starting before showing this step." }), _jsx(Text, { dimColor: true, children: "  Yagr attempted a silent owner/API bootstrap first." }), phase.note ? _jsxs(Text, { dimColor: true, children: ["  ", phase.note] }) : null, _jsx(Text, { dimColor: true, children: "  You will first create the owner account, then create an API key for Yagr." }), _jsx(SelectList, { options: ['Open n8n in the browser', 'I will open it myself'], cursor: phase.cursor, getLabel: (v) => v, getHint: (v) => v.startsWith('Open') ? 'recommended' : phase.url, maxVisibleRows: getListViewportHeight(terminalRows, 12), maxLineWidth: listLineWidth }), _jsx(HintBar, { hints: ['↑↓  move', 'Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
+            case 'n8n-local-auth':
+                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: "Local n8n API key" }), _jsxs(Text, { dimColor: true, children: ["  Local instance URL: ", phase.url] }), _jsxs(Text, { dimColor: true, children: ["  ", phase.message] }), _jsx(Text, { dimColor: true, children: "  If the browser is not already open, run `yagr n8n local open` or open the URL manually." }), _jsx(Box, { marginLeft: 2, marginTop: 1, children: _jsx(WizardTextInput, { value: textValue, onChange: setTextValue, onSubmit: handleN8nApiKeySubmit(phase.url), mask: "\u25CF", placeholder: "Paste the new n8n API key" }) }), _jsx(HintBar, { hints: ['Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
             case 'n8n-project':
                 return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: "n8n project" }), _jsxs(Text, { dimColor: true, children: ["  ", phase.projects.length, " project(s) found"] }), _jsx(SelectList, { options: phase.projects, cursor: phase.cursor, getLabel: (p) => p.name ?? p.id, getHint: (p) => p.id, maxVisibleRows: getListViewportHeight(terminalRows, 11), maxLineWidth: listLineWidth }), _jsx(HintBar, { hints: ['↑↓  move', 'Enter ↵  select', 'Ctrl+C  cancel'] })] }));
             case 'n8n-syncfolder':
-                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: "Local workflow sync folder" }), _jsx(Box, { marginLeft: 2, children: _jsx(WizardTextInput, { value: textValue, onChange: setTextValue, onSubmit: handleSyncFolderSubmit(phase.url, phase.apiKey, phase.project), placeholder: "workflows" }) }), phase.err ? _jsx(ErrorLine, { message: phase.err }) : null, _jsx(HintBar, { hints: ['Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
+                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: "Local workflow sync folder" }), _jsx(Box, { marginLeft: 2, children: _jsx(WizardTextInput, { value: textValue, onChange: setTextValue, onSubmit: handleSyncFolderSubmit(phase.url, phase.apiKey, phase.runtimeSource, phase.project), placeholder: "workflows" }) }), phase.err ? _jsx(ErrorLine, { message: phase.err }) : null, _jsx(HintBar, { hints: ['Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
             case 'n8n-saving':
                 return (_jsx(Box, { flexDirection: "column", children: _jsx(SpinnerDisplay, { message: "Saving n8n configuration and refreshing workspace\u2026", frame: spinnerFrame }) }));
             case 'llm-reuse-config':
-                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: "LLM configuration" }), _jsxs(Text, { dimColor: true, children: ["  Currently configured: ", phase.provider, " / ", phase.model] }), _jsx(SelectList, { options: ['Keep current configuration', 'Change provider or model'], cursor: phase.cursor, getLabel: (v) => v, maxVisibleRows: getListViewportHeight(terminalRows, 11), maxLineWidth: listLineWidth }), _jsx(HintBar, { hints: ['↑↓  move', 'Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
+                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: "LLM configuration" }), _jsxs(Text, { dimColor: true, children: ["  Currently configured: ", getProviderDisplayName(phase.provider), " / ", phase.model] }), _jsx(SelectList, { options: ['Keep current configuration', 'Change provider or model'], cursor: phase.cursor, getLabel: (v) => v, maxVisibleRows: getListViewportHeight(terminalRows, 11), maxLineWidth: listLineWidth }), _jsx(HintBar, { hints: ['↑↓  move', 'Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
             case 'llm-provider':
-                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: "Default LLM provider" }), _jsx(SelectList, { options: VALID_PROVIDERS, cursor: phase.cursor, getLabel: (v) => v, getHint: (v) => v === phase.initial ? 'currently configured' : undefined, maxVisibleRows: getListViewportHeight(terminalRows, 10), maxLineWidth: listLineWidth }), _jsx(HintBar, { hints: ['↑↓  move', 'Enter ↵  select', 'Ctrl+C  cancel'] })] }));
+                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: "Default LLM provider" }), _jsx(SelectList, { options: VALID_PROVIDERS, cursor: phase.cursor, getLabel: (v) => getProviderDisplayName(v), getHint: (v) => {
+                                const parts = [
+                                    getProviderSetupHint(v),
+                                    isExperimentalProvider(v) ? 'experimental' : undefined,
+                                    v === phase.initial ? 'currently configured' : undefined,
+                                ].filter(Boolean);
+                                return parts.length > 0 ? parts.join(' · ') : undefined;
+                            }, maxVisibleRows: getListViewportHeight(terminalRows, 10), maxLineWidth: listLineWidth }), _jsx(HintBar, { hints: ['↑↓  move', 'Enter ↵  select', 'Ctrl+C  cancel'] })] }));
+            case 'llm-account-auth':
+                {
+                    const authCopy = getProviderAuthCopy(phase.provider);
+                    const authOptions = [authCopy.continueLabel, 'Back to providers'];
+                    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: authCopy.title }), authCopy.body.map((line) => (_jsxs(Text, { dimColor: true, children: ["  ", line] }, line))), _jsx(SelectList, { options: authOptions, cursor: phase.cursor, getLabel: (v) => v, getHint: (v) => {
+                                    return (v.startsWith('Continue') || v.startsWith('Paste')) ? 'recommended' : undefined;
+                                }, maxVisibleRows: getListViewportHeight(terminalRows, 11), maxLineWidth: listLineWidth }), _jsx(HintBar, { hints: ['↑↓  move', 'Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
+                }
+            case 'llm-account-input':
+                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: phase.title }), phase.instructions.map((line, index) => (_jsxs(Text, { dimColor: true, children: ["  ", line] }, `${index}-${line}`))), _jsx(Box, { marginLeft: 2, marginTop: 1, children: _jsx(WizardTextInput, { value: textValue, onChange: setTextValue, onSubmit: handleAccountAuthSubmit(phase.provider, phase.state), placeholder: phase.placeholder }) }), phase.err ? _jsx(ErrorLine, { message: phase.err }) : null, _jsx(HintBar, { hints: [`${phase.submitLabel}  (Enter ↵)`, 'Ctrl+C  cancel'] })] }));
             case 'llm-reuse-apikey':
-                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: `${phase.provider} API key` }), _jsxs(Text, { dimColor: true, children: ["  A saved key exists for ", phase.provider] }), _jsx(SelectList, { options: ['Keep the saved key', 'Enter a new key'], cursor: phase.cursor, getLabel: (v) => v, maxVisibleRows: getListViewportHeight(terminalRows, 11), maxLineWidth: listLineWidth }), _jsx(HintBar, { hints: ['↑↓  move', 'Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
+                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: `${getProviderDisplayName(phase.provider)} API key` }), _jsxs(Text, { dimColor: true, children: ["  A saved key exists for ", getProviderDisplayName(phase.provider)] }), _jsx(SelectList, { options: ['Keep the saved key', 'Enter a new key'], cursor: phase.cursor, getLabel: (v) => v, maxVisibleRows: getListViewportHeight(terminalRows, 11), maxLineWidth: listLineWidth }), _jsx(HintBar, { hints: ['↑↓  move', 'Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
             case 'llm-apikey':
-                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: `${phase.provider} API key` }), _jsx(Box, { marginLeft: 2, children: _jsx(WizardTextInput, { value: textValue, onChange: (nextValue) => {
+                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: `${getProviderDisplayName(phase.provider)} API key` }), !providerRequiresApiKey(phase.provider) ? (_jsx(Text, { dimColor: true, children: "  Optional for local proxy providers. Leave empty if your proxy handles account auth." })) : null, _jsx(Box, { marginLeft: 2, children: _jsx(WizardTextInput, { value: textValue, onChange: (nextValue) => {
                                     setTextValue(nextValue);
                                     llmApiKeyDraftsRef.current[phase.provider] = nextValue;
-                                }, onSubmit: handleLlmApiKeySubmit(phase.provider), mask: "\u25CF", placeholder: "your-api-key" }) }), phase.err ? _jsx(ErrorLine, { message: phase.err }) : null, _jsx(HintBar, { hints: ['Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
+                                }, onSubmit: handleLlmApiKeySubmit(phase.provider), mask: "\u25CF", placeholder: providerRequiresApiKey(phase.provider) ? 'your-api-key' : 'optional' }) }), phase.err ? _jsx(ErrorLine, { message: phase.err }) : null, _jsx(HintBar, { hints: ['Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
             case 'llm-models-loading':
-                return (_jsx(Box, { flexDirection: "column", children: _jsx(SpinnerDisplay, { message: `Fetching available models for ${phase.provider}…`, frame: spinnerFrame }) }));
+                const loadingMessage = isOAuthAccountProvider(phase.provider)
+                    ? `Finalizing ${getProviderDisplayName(phase.provider)} account and fetching models…`
+                    : `Fetching available models for ${getProviderDisplayName(phase.provider)}…`;
+                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(SpinnerDisplay, { message: loadingMessage, frame: spinnerFrame }), phase.note ? _jsxs(Text, { dimColor: true, children: ["  ", phase.note] }) : null] }));
             case 'llm-model': {
                 const modelOptions = getDisplayedModelOptions(phase.models);
-                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: `Default model  ·  ${phase.provider}` }), phase.models.length === 0 ? (_jsx(Box, { marginLeft: 2, children: _jsx(WizardTextInput, { value: textValue, onChange: setTextValue, onSubmit: (v) => {
+                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: `Default model  ·  ${getProviderDisplayName(phase.provider)}` }), phase.note ? _jsxs(Text, { dimColor: true, children: ["  ", phase.note] }) : null, phase.models.length === 0 ? (_jsx(Box, { marginLeft: 2, children: _jsx(WizardTextInput, { value: textValue, onChange: setTextValue, onSubmit: (v) => {
                                     const m = v.trim() || phase.defModel || '';
                                     if (!m)
                                         return;
+                                    const draftedBaseUrl = llmBaseUrlDraftsRef.current[phase.provider];
+                                    const defaultBaseUrl = draftedBaseUrl ?? llmDef.getBaseUrl(phase.provider);
                                     const needsUrl = llmDef.needsBaseUrl(phase.provider);
-                                    if (needsUrl || llmDef.getBaseUrl(phase.provider)) {
-                                        setPhase({ kind: 'llm-baseurl', provider: phase.provider, apiKey: phase.apiKey, model: m, def: llmDef.getBaseUrl(phase.provider) ?? '' });
-                                        setTextValue(llmDef.getBaseUrl(phase.provider) ?? '');
+                                    if (draftedBaseUrl) {
+                                        saveLlmAndContinue(phase.provider, phase.apiKey, m, phase.note);
+                                    }
+                                    else if (needsUrl || defaultBaseUrl) {
+                                        setPhase({ kind: 'llm-baseurl', provider: phase.provider, apiKey: phase.apiKey, model: m, def: defaultBaseUrl ?? '' });
+                                        setTextValue(defaultBaseUrl ?? '');
                                     }
                                     else {
-                                        callbacks.saveLlmConfig({ provider: phase.provider, apiKey: phase.apiKey, model: m });
-                                        setPhase({ kind: 'surfaces', cursor: 0, selected: surfDef.surfaces });
+                                        saveLlmAndContinue(phase.provider, phase.apiKey, m, phase.note);
                                     }
-                                }, placeholder: phase.defModel }) })) : (_jsx(SelectList, { options: modelOptions, cursor: phase.cursor, getLabel: (v) => v === '__custom__' ? '⌨  enter manually…' : v, getHint: (v) => (phase.defModel && v === phase.defModel) ? 'previously selected' : undefined, maxVisibleRows: getListViewportHeight(terminalRows, 10), maxLineWidth: listLineWidth })), _jsx(HintBar, { hints: phase.models.length > 0 ? ['↑↓  move', 'Enter ↵  select', 'Ctrl+C  cancel'] : ['Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
+                                }, placeholder: phase.defModel }) })) : (_jsx(SelectList, { options: modelOptions, cursor: phase.cursor, getLabel: (v) => v === '__custom__' ? '⌨  enter manually…' : v, getHint: (v) => (phase.defModel && v === phase.defModel) ? 'previously selected' : undefined, maxVisibleRows: getListViewportHeight(terminalRows, 10), maxLineWidth: listLineWidth })), _jsx(HintBar, { hints: phase.models.length > 0
+                                ? ['↑↓  move', 'Enter ↵  select', 'Ctrl+C  cancel']
+                                : ['Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
             }
             case 'llm-baseurl':
-                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: `${phase.provider} base URL` }), _jsx(Text, { dimColor: true, children: "  Leave empty to use the default endpoint" }), _jsx(Box, { marginLeft: 2, children: _jsx(WizardTextInput, { value: textValue, onChange: setTextValue, onSubmit: handleBaseUrlSubmit(phase.provider, phase.apiKey, phase.model), placeholder: phase.def || 'https://api.example.com/v1' }) }), phase.err ? _jsx(ErrorLine, { message: phase.err }) : null, _jsx(HintBar, { hints: ['Enter ↵  confirm  (empty = default)', 'Ctrl+C  cancel'] })] }));
+                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: `${getProviderDisplayName(phase.provider)} base URL` }), _jsx(Text, { dimColor: true, children: "  Leave empty to use the default endpoint" }), _jsx(Box, { marginLeft: 2, children: _jsx(WizardTextInput, { value: textValue, onChange: setTextValue, onSubmit: handleBaseUrlSubmit(phase.provider, phase.apiKey, phase.model), placeholder: phase.def || 'https://api.example.com/v1' }) }), phase.err ? _jsx(ErrorLine, { message: phase.err }) : null, _jsx(HintBar, { hints: ['Enter ↵  confirm  (empty = default)', 'Ctrl+C  cancel'] })] }));
             case 'surfaces':
                 return (_jsxs(Box, { flexDirection: "column", children: [_jsx(FieldLabel, { label: "Optional messaging gateways" }), _jsx(Text, { dimColor: true, children: "  These enable Yagr to receive work from external channels" }), _jsx(Box, { marginTop: 1, children: _jsx(MultiSelectList, { options: SURFACE_OPTIONS, cursor: phase.cursor, selected: phase.selected, maxVisibleRows: getListViewportHeight(terminalRows, 11), maxLineWidth: listLineWidth }) }), _jsx(HintBar, { hints: ['↑↓  move', 'Space  toggle', 'Enter ↵  confirm', 'Ctrl+C  cancel'] })] }));
             case 'telegram-reuse-token':
@@ -634,7 +1042,7 @@ function SetupWizard({ callbacks, onDone }) {
             case 'telegram-connecting':
                 return (_jsx(Box, { flexDirection: "column", children: _jsx(SpinnerDisplay, { message: "Verifying Telegram bot token\u2026", frame: spinnerFrame }) }));
             case 'done':
-                return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "green", bold: true, children: [CHECK, "  Setup complete"] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [phase.n8nHost ? _jsxs(Text, { dimColor: true, children: ["  n8n    ", DOT, "  ", phase.n8nHost] }) : null, phase.provider ? _jsxs(Text, { dimColor: true, children: ["  LLM    ", DOT, "  ", phase.provider, phase.model ? ` / ${phase.model}` : ''] }) : null, phase.surfaces.length > 0
+                return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "green", bold: true, children: [CHECK, "  Setup complete"] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [phase.n8nHost ? _jsxs(Text, { dimColor: true, children: ["  n8n    ", DOT, "  ", phase.n8nHost] }) : null, phase.provider ? _jsxs(Text, { dimColor: true, children: ["  LLM    ", DOT, "  ", getProviderDisplayName(phase.provider), phase.model ? ` / ${phase.model}` : ''] }) : null, phase.surfaces.length > 0
                                     ? _jsxs(Text, { dimColor: true, children: ["  Gates  ", DOT, "  ", phase.surfaces.join(', ')] })
                                     : _jsxs(Text, { dimColor: true, children: ["  Gates  ", DOT, "  none"] })] }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { dimColor: true, children: "Next: " }), _jsx(Text, { color: "cyan", children: "yagr start" })] })] }));
             case 'cancelled':