scalix 1.4.1 → 1.5.1

package/dist/cli.js

@@ -12,7 +12,7 @@ import fs from 'node:fs/promises';
 import { existsSync, readFileSync } from 'node:fs';
 import path from 'node:path';
 import SelectInput from 'ink-select-input';
-import { createAgent, messageContentToString } from './agent.js';
+import { createAgent, messageContentToString, REPORTED_ERROR } from './agent.js';
 import { defaultTools } from './tools.js';
 import { extraTools } from './tools-extra.js';
 import { webTools } from './tools-web.js';
@@ -25,9 +25,10 @@ import { renderMarkdown } from './markdown.js';
 import { costTracker } from './cost-tracker.js';
 import { saveSession, listSessions, loadSession, generateSessionId, saveCrashState, loadCrashState, clearCrashState, forkSession } from './sessions.js';
 import { logger } from './logger.js';
-import { VERSION, PRODUCT_NAME, DEFAULT_MODELS, DEFAULT_BASE_URL, DEFAULT_INSTRUCTIONS, ENV_API_KEY, ENV_MODEL, TOOL_DEFAULTS, HEADLESS_DEFAULTS, GIT_BOT_IDENTITY, fetchModelSpecs } from './constants.js';
+import { VERSION, PRODUCT_NAME, DEFAULT_MODELS, DEFAULT_BASE_URL, DEFAULT_INSTRUCTIONS, ENV_API_KEY, ENV_MODEL, TOOL_DEFAULTS, HEADLESS_DEFAULTS, GIT_BOT_IDENTITY, BYOK_DEFAULT_CONTEXT_TOKENS, BYOK_DEFAULT_MAX_OUTPUT_TOKENS, USER_CONFIG_DIR, getModelContextWindow, fetchModelSpecs, normalizeModelId, registerUserModels, hasExplicitModelSpec } from './constants.js';
 import { checkForUpdate, getUpdateBanner, performUpdate } from './update-checker.js';
-import { loadConfig, saveConfig, isConfigured, DEFAULT_LIMITS, THINKING_MODES } from './settings.js';
+import { loadConfig, loadGlobalConfig, saveConfig, isConfigured, resolveActiveProvider, DEFAULT_LIMITS, THINKING_MODES } from './settings.js';
+import { fetchByokModels } from './providers/openai.js';
 import { getModeDescription, PERMISSION_MODES, setSandboxRoot, checkScopedPermission, getScopedPermissionRules } from './sandbox.js';
 import { buildProjectIndex, indexToContext } from './project-index.js';
 import { collectGitInfo, gitInfoToContext } from './git-context.js';
@@ -41,11 +42,12 @@ import { createCheckpoint, undoLastCheckpoint, listCheckpoints } from './git-und
 import { loadScopedRules, rulesToContext } from './scoped-rules.js';
 import { loadSkills, skillsSummary, getSkillByTrigger, getSkillContent } from './skills.js';
 import { AgentRegistry } from './agent-registry.js';
+import { SLASH_COMMANDS, HELP_LINES } from './slash-commands.js';
 import { createWorktree, listWorktrees, removeWorktree, cleanupStaleWorktrees } from './worktree.js';
 import { sendNotification, getTerminalType } from './terminal-notify.js';
 import { stringWidth, truncateText } from './text-utils.js';
 import { isWorkspaceTrusted, trustWorkspace, hasProjectExecSurface } from './workspace-trust.js';
-import { fetchMe, fetchCloudTools, groupCloudTools, CONSOLE_KEYS_URL } from './cloud.js';
+import { fetchMe, fetchCloudTools, groupCloudTools, filterCatalogByScopes, cloudKeyRemedy, CONSOLE_KEYS_URL } from './cloud.js';
 logger.setLevel('silent');
 // Promisified async child_process helpers (keep the TUI responsive vs execSync).
 const execFileAsync = promisify(execFile);
@@ -145,39 +147,57 @@ let loadedSkills = [];
 // exec surface (plugins/hooks/rules/settings) that we skipped loading. The App
 // reads this on mount to inform the user they can run /trust to enable them.
 let workspaceUntrustedNotice = false;
-let cloudConnection = { connected: false, identity: null, toolCount: 0 };
+let cloudConnection = { connected: false, identity: null, toolCount: 0, reason: 'no-key' };
 // Set by the setup wizard when its Scalix Cloud validation step succeeded, so
 // the App shows the "Try:" teach-in exactly once after a wizard or /login
 // connect (not on every ordinary startup reconnect).
 let cloudTeachInPending = false;
+/**
+ * Set by the setup wizard when the OS keychain refused the write and the key
+ * had to stay in config.json. Surfaced once on the first render of the app —
+ * a secret quietly landing in a plaintext file is not something to swallow.
+ */
+let plaintextKeyPending = false;
 // Validate the key against /v1/me, then fetch the account's tool catalog and
 // register it on the agent. One attempt, no retry loop: failure leaves the
 // agent with local tools only and carries the server's own error message.
 async function connectCloud(targetAgent) {
-    if (!targetAgent.getApiKey()) {
-        cloudConnection = { connected: false, identity: null, toolCount: 0, error: 'no API key configured' };
+    // On BYOK the base URL is a third-party host — OpenRouter, Ollama, vLLM —
+    // that has no /v1/me. Probing it sent the user's provider key to a route
+    // that does not exist and turned the 404 body into a "Scalix Cloud
+    // unavailable" banner on a session that never asked for Scalix Cloud.
+    // refreshCloudTools() already refuses the catalog fetch for these providers;
+    // the identity probe has to refuse it too.
+    const cloudKey = targetAgent.getCloudApiKey();
+    if (!cloudKey) {
+        cloudConnection = targetAgent.getProvider() === 'scalix'
+            ? { connected: false, identity: null, toolCount: 0, reason: 'no-key', error: 'no API key configured' }
+            : { connected: false, identity: null, toolCount: 0, reason: 'byok' };
         return cloudConnection;
     }
     try {
-        const identity = await fetchMe(targetAgent.getBaseUrl() || DEFAULT_BASE_URL, targetAgent.getApiKey());
-        const status = await targetAgent.refreshCloudTools();
+        const identity = await fetchMe(targetAgent.getCloudBaseUrl() || DEFAULT_BASE_URL, cloudKey);
+        // Hand the identity over so the catalog is scope-filtered without a
+        // second /v1/me round-trip.
+        const status = await targetAgent.refreshCloudTools(identity);
         if (status.state === 'connected') {
-            cloudConnection = { connected: true, identity, toolCount: status.toolCount };
+            cloudConnection = { connected: true, identity, toolCount: status.toolCount, totalCount: status.totalCount, note: status.note };
         }
         else {
-            cloudConnection = { connected: false, identity, toolCount: 0, error: status.error };
+            cloudConnection = { connected: false, identity, toolCount: 0, reason: 'failed', error: status.error, remedy: status.remedy };
         }
     }
     catch (err) {
-        // /v1/me failed. Run the catalog fetch anyway: on failure it clears any
-        // stale platform tools from a previous connect; in the rare case it
-        // succeeds, the tools genuinely work and we say so (identity unavailable).
-        const status = await targetAgent.refreshCloudTools().catch(() => null);
+        // /v1/me failed. Run the catalog fetch anyway (null = don't re-probe
+        // /v1/me): on failure it clears any stale platform tools from a previous
+        // connect; in the rare case it succeeds, the tools genuinely work and we
+        // say so (identity unavailable, catalog unfiltered).
+        const status = await targetAgent.refreshCloudTools(null).catch(() => null);
         if (status?.state === 'connected') {
-            cloudConnection = { connected: true, identity: null, toolCount: status.toolCount, error: err?.message || String(err) };
+            cloudConnection = { connected: true, identity: null, toolCount: status.toolCount, totalCount: status.totalCount, error: err?.message || String(err) };
         }
         else {
-            cloudConnection = { connected: false, identity: null, toolCount: 0, error: err?.message || String(err) };
+            cloudConnection = { connected: false, identity: null, toolCount: 0, reason: 'failed', error: err?.message || String(err), remedy: status?.remedy ?? cloudKeyRemedy(err) };
         }
     }
     return cloudConnection;
@@ -245,18 +265,49 @@ async function buildEnhancedInstructions() {
     }
     return instructions;
 }
+/** The config the current agent was initialized from — lets command handlers
+ *  (e.g. the /model picker's BYOK discovery) resolve provider/endpoint without
+ *  threading the config through every component. */
+let activeAgentConfig = null;
+/** Under BYOK a model without a registered spec sends no max_tokens, and
+ *  gateways such as OpenRouter then 400 every request — a "successful" switch
+ *  that can never answer. Ensure any model activated from the TUI has a spec:
+ *  the catalog-reported window when known, the standard fallbacks otherwise.
+ *  Explicit user specs are never overwritten. */
+function ensureByokSpec(config, model, contextWindow) {
+    if (!config || resolveActiveProvider(config).provider !== 'openai')
+        return;
+    if (hasExplicitModelSpec(model))
+        return;
+    const spec = {
+        contextWindow: contextWindow && contextWindow > 0 ? contextWindow : BYOK_DEFAULT_CONTEXT_TOKENS,
+        maxOutputTokens: BYOK_DEFAULT_MAX_OUTPUT_TOKENS,
+    };
+    registerUserModels({ [model]: spec });
+    loadGlobalConfig().then((cfg) => {
+        cfg.customModels = { ...cfg.customModels, [model]: spec };
+        return saveConfig(cfg);
+    }).catch((err) => { logger.warn('Failed to persist model spec', { error: err.message }); });
+}
 function initAgent(config) {
     const envModels = process.env[ENV_MODEL]
-        ? process.env[ENV_MODEL].split(',').map((m) => m.trim()).filter(Boolean)
+        ? process.env[ENV_MODEL].split(',').map((m) => m.trim()).filter(Boolean).map(normalizeModelId)
         : null;
-    const models = envModels || config.models;
+    // length check, not truthiness: SCALIX_MODEL="," parses to [] which is
+    // truthy — the other entry points fall back to config models, so must we.
+    const models = envModels && envModels.length > 0 ? envModels : config.models;
+    activeAgentConfig = config;
     if (models.length === 0) {
         throw new Error('No models configured. Please add at least one model in setup.');
     }
     const limits = config.limits || DEFAULT_LIMITS;
+    const active = resolveActiveProvider(config);
     agent = createAgent({
-        apiKey: config.apiKey,
-        baseUrl: config.baseUrl,
+        apiKey: active.apiKey,
+        baseUrl: active.baseUrl,
+        provider: active.provider,
+        cloudApiKey: active.cloudApiKey,
+        cloudBaseUrl: active.cloudBaseUrl,
         model: models.length === 1 ? models[0] : models,
         instructions: baseInstructions,
         tools: allTools,
@@ -339,6 +390,54 @@ function truncate(s, max) {
     const lastBreak = Math.max(cut.lastIndexOf(','), cut.lastIndexOf(' '), cut.lastIndexOf('\n'));
     return (lastBreak > max * 0.5 ? cut.slice(0, lastBreak) : cut) + '\u2026';
 }
+/**
+ * Collapse a tool result to one readable transcript line.
+ *
+ * The transcript used to print `JSON.stringify(result)` verbatim, so a
+ * successful `echo hello` read as
+ *   ● run_command: {"stdout":"hello-from-tool\n","stderr":"","exitCode":0…
+ * — the output buried inside its own envelope, and the part that actually
+ * matters on a bad run (a non-zero exit, an error string) pushed past the
+ * truncation point. This is display only; the model still receives the whole
+ * result object. Shapes below are the ones the tool layer really returns
+ * (tools.ts run_command/read_file, tools-extra.ts search_files).
+ */
+function summarizeToolResult(result) {
+    const oneLine = (s) => s.replace(/\s*\r?\n\s*/g, ' ').trim();
+    if (typeof result === 'string')
+        return oneLine(result);
+    if (result === null || typeof result !== 'object')
+        return String(result);
+    const r = result;
+    const plural = (n, word) => `${n} ${word}${n === 1 ? '' : 's'}`;
+    if (typeof r.error === 'string')
+        return oneLine(r.error);
+    if ('exitCode' in r || 'stdout' in r) {
+        const out = oneLine(String(r.stdout ?? ''));
+        const err = oneLine(String(r.stderr ?? ''));
+        const code = r.exitCode;
+        if (code)
+            return `exit ${code}${err || out ? ` — ${err || out}` : ''}`;
+        return out || err || 'no output';
+    }
+    if (typeof r.matchCount === 'number')
+        return plural(r.matchCount, 'match');
+    if (Array.isArray(r.files))
+        return plural(r.files.length, 'file');
+    if (Array.isArray(r.entries))
+        return plural(r.entries.length, 'file');
+    if (typeof r.content === 'string') {
+        const lines = typeof r.totalLines === 'number' ? r.totalLines : r.content.split('\n').length;
+        return plural(lines, 'line');
+    }
+    if (typeof r.message === 'string')
+        return oneLine(r.message);
+    if (r.success === true)
+        return 'done';
+    if (r.success === false)
+        return 'failed';
+    return oneLine(JSON.stringify(result));
+}
 function formatTokens(n) {
     if (n >= 1000000)
         return `${(n / 1000000).toFixed(1)}M`;
@@ -347,7 +446,18 @@ function formatTokens(n) {
     return String(n);
 }
 // ─── Components ───
+// BigText wraps at narrow widths — "scalix coder" is 5 rows at 80 columns but
+// 9 at 40 — while the layout budget in App assumes a flat 5. Below these bounds
+// the logo is dropped rather than allowed to wrap or be sliced: in a 12-row
+// terminal it rendered as one half-height row of glyphs with the status bar
+// drawn over the rest of it.
+const BANNER_MIN_COLS = 62;
+const BANNER_MIN_ROWS = 20;
+const bannerFits = (cols, rows) => cols >= BANNER_MIN_COLS && rows >= BANNER_MIN_ROWS;
 const Banner = memo(function Banner() {
+    const { cols, rows } = useTermSize();
+    if (!bannerFits(cols, rows))
+        return null;
     return (_jsx(Box, { flexDirection: "column", alignItems: "center", marginBottom: 0, children: _jsx(Gradient, { name: "teen", children: _jsx(BigText, { text: PRODUCT_NAME.toLowerCase(), font: "tiny" }) }) }));
 });
 // Strip bracketed paste markers and control chars that leak through ink's parser.
@@ -450,18 +560,50 @@ function formatContextSize(tokens) {
         return `${(tokens / 1_000).toFixed(tokens % 1_000 === 0 ? 0 : 1)}K`;
     return String(tokens);
 }
+/**
+ * What to pre-fill the context-window box with.
+ *
+ * Which number is honest depends on where inference is going. Scalix Cloud
+ * publishes a per-model limit and 1M is a real ceiling there; for an arbitrary
+ * OpenAI-compatible endpoint — most self-hosted models run 8K–128K — it is a
+ * figure we invented, and inventing it high defers auto-compression past the
+ * point where the endpoint starts rejecting the request. A limit the user has
+ * already chosen always wins over both.
+ */
+function defaultContextTokens(p, existing) {
+    if (existing && existing !== DEFAULT_LIMITS.maxContextTokens)
+        return existing;
+    return p === 'openai' ? BYOK_DEFAULT_CONTEXT_TOKENS : DEFAULT_LIMITS.maxContextTokens;
+}
 function SetupScreen({ onComplete, existingConfig }) {
-    const STEPS = ['api-key', 'base-url', 'cloud', 'models', 'context-window'];
-    const [step, setStep] = useState('api-key');
+    const [provider, setProvider] = useState(existingConfig?.provider === 'openai' ? 'openai' : 'scalix');
+    // Scalix = zero-config default; BYOK (OpenAI-compatible) skips the
+    // Scalix-only cloud step and enters models manually.
+    const STEPS = provider === 'openai'
+        ? ['provider', 'api-key', 'base-url', 'models', 'context-window']
+        : ['provider', 'api-key', 'base-url', 'cloud', 'models', 'context-window'];
+    const [step, setStep] = useState('provider');
     const [apiKey, setApiKey] = useState(existingConfig?.apiKey || process.env[ENV_API_KEY] || '');
     const [baseUrl, setBaseUrl] = useState(existingConfig?.baseUrl || DEFAULT_BASE_URL);
+    const [baseUrlError, setBaseUrlError] = useState(false);
     const [models, setModels] = useState(existingConfig?.models?.length ? [...existingConfig.models] : [...DEFAULT_MODELS]);
     const [modelsMode, setModelsMode] = useState('custom');
     const [modelInput, setModelInput] = useState('');
-    const [contextInput, setContextInput] = useState(String(existingConfig?.limits?.maxContextTokens ?? DEFAULT_LIMITS.maxContextTokens));
+    // Only true once the user has actually submitted an empty box. The warning
+    // used to be tied to models.length === 0, which is the state every user
+    // arrives in — so the step opened with a yellow "At least one model is
+    // required" before they had typed a character, reading as a failure.
+    const [modelsWarned, setModelsWarned] = useState(false);
+    const [contextInput, setContextInput] = useState(String(defaultContextTokens(existingConfig?.provider === 'openai' ? 'openai' : 'scalix', existingConfig?.limits?.maxContextTokens)));
     const [apiKeyError, setApiKeyError] = useState(false);
+    /** True while saveConfig() is in flight — see the context-window submit. */
+    const [saving, setSaving] = useState(false);
     const [fetchedModels, setFetchedModels] = useState([]);
     const [fetchingModels, setFetchingModels] = useState(false);
+    /** Context windows a BYOK endpoint reported for its own models, by id. Only
+     *  the ones it actually sent — a model missing here has no entry, never a
+     *  borrowed default. */
+    const [byokContextWindows, setByokContextWindows] = useState({});
     const [cloudCheck, setCloudCheck] = useState({ phase: 'checking' });
     const { exit } = useApp();
     // Validate the key against Scalix Cloud when the cloud step is entered:
@@ -474,7 +616,10 @@ function SetupScreen({ onComplete, existingConfig }) {
         (async () => {
             const identity = await fetchMe(baseUrl, apiKey);
             const catalog = await fetchCloudTools(baseUrl, apiKey, process.env.SCALIX_PROJECT);
-            return { identity, toolCount: catalog.tools.length };
+            // Count what will actually register for this key, not the raw catalog —
+            // the wizard's "N tools unlocked" must match the session that follows.
+            const visible = filterCatalogByScopes(catalog.tools, identity.permissions.scopes);
+            return { identity, toolCount: visible.length };
         })().then((result) => {
             if (cancelled)
                 return;
@@ -483,12 +628,30 @@ function SetupScreen({ onComplete, existingConfig }) {
         }).catch((err) => {
             if (cancelled)
                 return;
-            setCloudCheck({ phase: 'fail', error: err?.message || String(err) });
+            setCloudCheck({ phase: 'fail', error: err?.message || String(err), remedy: cloudKeyRemedy(err) });
         });
         return () => { cancelled = true; };
         // apiKey/baseUrl are intentionally not deps: they are frozen once the user
         // advances past base-url, and the step transition is the trigger.
     }, [step]);
+    // The smallest window across the picked models, because compression has to
+    // fit the tightest one — a session that fits the 128K model and not the 8K
+    // fallback fails the moment it falls back. null when the endpoint reported
+    // nothing for any of them.
+    const reportedContextWindow = useMemo(() => {
+        const reported = models.map((m) => byokContextWindows[m]).filter((n) => !!n);
+        return reported.length > 0 ? Math.min(...reported) : null;
+    }, [models, byokContextWindows]);
+    // Fill the box with the reported window when the step opens, but never
+    // overwrite a number the user typed themselves.
+    const contextPrefilled = useRef(false);
+    useEffect(() => {
+        if (step !== 'context-window' || contextPrefilled.current)
+            return;
+        contextPrefilled.current = true;
+        if (reportedContextWindow !== null)
+            setContextInput(String(reportedContextWindow));
+    }, [step, reportedContextWindow]);
     const totalSteps = STEPS.length;
     const stepNumber = STEPS.indexOf(step) + 1;
     const goBack = useCallback(() => {
@@ -500,11 +663,18 @@ function SetupScreen({ onComplete, existingConfig }) {
         }
     }, [step]);
     useInput((_ch, key) => {
+        // Once the save is in flight the config is already being written; letting
+        // Escape kill the process or Backspace walk back a step from here just
+        // races the write.
+        if (saving)
+            return;
         if (key.escape)
             exit();
         if (key.backspace || key.delete) {
-            if (step === 'api-key' && apiKey === '')
+            if (step === 'api-key' && apiKey === '') {
+                goBack();
                 return;
+            }
             if (step === 'base-url' && baseUrl === '') {
                 goBack();
                 return;
@@ -515,7 +685,32 @@ function SetupScreen({ onComplete, existingConfig }) {
             }
         }
     });
-    return (_jsxs(Box, { flexDirection: "column", width: "100%", children: [_jsx(Banner, {}), _jsxs(Box, { flexDirection: "column", paddingX: 3, paddingY: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: "#20a0a0", bold: true, children: ['\u2501'.repeat(4), " First-time Setup ", '\u2501'.repeat(4)] }) }), _jsxs(Box, { marginBottom: 1, gap: 1, children: [_jsx(Text, { color: "#20a0a0", children: STEPS.map((_, i) => i < stepNumber ? '\u25CF' : '\u25CB').join('') }), _jsxs(Text, { dimColor: true, children: ["Step ", stepNumber, " of ", totalSteps] })] }), step === 'api-key' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, color: "white", children: "API Key" }), _jsx(Text, { dimColor: true, children: "Paste your API key and press Enter." }), _jsxs(Box, { marginTop: 1, children: [_jsxs(Text, { color: "#20a0a0", bold: true, children: ['\u276F', " "] }), _jsx(LongTextInput, { value: apiKey, onChange: (v) => { setApiKey(v); setApiKeyError(false); }, onSubmit: (v) => {
+    return (_jsxs(Box, { flexDirection: "column", width: "100%", children: [_jsx(Banner, {}), _jsxs(Box, { flexDirection: "column", paddingX: 3, paddingY: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: "#20a0a0", bold: true, children: ['\u2501'.repeat(4), " First-time Setup ", '\u2501'.repeat(4)] }) }), _jsxs(Box, { marginBottom: 1, gap: 1, children: [_jsx(Text, { color: "#20a0a0", children: STEPS.map((_, i) => i < stepNumber ? '\u25CF' : '\u25CB').join('') }), _jsxs(Text, { dimColor: true, children: ["Step ", stepNumber, " of ", totalSteps] })] }), step === 'provider' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, color: "white", children: "Provider" }), _jsx(Text, { dimColor: true, children: "Where should the agent send inference?" }), _jsx(Box, { marginTop: 1, children: _jsx(SelectInput, { items: [
+                                        { label: 'Scalix Cloud (recommended) \u2014 api.scalix.world, platform tools included', value: 'scalix' },
+                                        { label: 'OpenAI-compatible endpoint \u2014 bring your own key (OpenAI, OpenRouter, Ollama, vLLM, ...)', value: 'openai' },
+                                    ], onSelect: (item) => {
+                                        const p = item.value === 'openai' ? 'openai' : 'scalix';
+                                        setProvider(p);
+                                        if (p === 'openai') {
+                                            setApiKey(existingConfig?.providers?.openai?.apiKey || '');
+                                            setBaseUrl(existingConfig?.providers?.openai?.baseUrl || '');
+                                        }
+                                        else {
+                                            setApiKey(existingConfig?.apiKey || process.env[ENV_API_KEY] || '');
+                                            setBaseUrl(existingConfig?.baseUrl || DEFAULT_BASE_URL);
+                                        }
+                                        // Model ids do not transfer between endpoints: keeping the
+                                        // configured list after a switch pre-fills the next step with
+                                        // ids the new endpoint has never heard of, and the wizard
+                                        // finishes "successfully" onto a 404 on the first turn.
+                                        const configured = (existingConfig?.provider === 'openai' ? 'openai' : 'scalix') === p;
+                                        setModels(configured && existingConfig?.models?.length ? [...existingConfig.models] : []);
+                                        setModelsMode('custom');
+                                        setFetchedModels([]);
+                                        setByokContextWindows({});
+                                        setContextInput(String(defaultContextTokens(p, existingConfig?.limits?.maxContextTokens)));
+                                        setStep('api-key');
+                                    } }) })] })), step === 'api-key' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, color: "white", children: "API Key" }), _jsx(Text, { dimColor: true, children: provider === 'openai' ? 'The API key for your endpoint. Press Enter to continue.' : 'Paste your Scalix API key (console.scalix.world/org/keys) and press Enter. Use a project-scoped key — the default all-scopes project key unlocks the platform tools.' }), _jsxs(Box, { marginTop: 1, children: [_jsxs(Text, { color: "#20a0a0", bold: true, children: ['\u276F', " "] }), _jsx(LongTextInput, { value: apiKey, onChange: (v) => { setApiKey(v); setApiKeyError(false); }, onSubmit: (v) => {
                                             const cleaned = v.trim();
                                             if (cleaned) {
                                                 setApiKey(cleaned);
@@ -524,8 +719,35 @@ function SetupScreen({ onComplete, existingConfig }) {
                                             else {
                                                 setApiKeyError(true);
                                             }
-                                        }, placeholder: "sk-or-v1-..." })] }), apiKeyError && (_jsx(Box, { marginTop: 0, paddingLeft: 2, children: _jsx(Text, { color: "yellow", dimColor: true, children: "API key is required." }) }))] })), step === 'base-url' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, color: "white", children: "Base URL" }), _jsx(Text, { dimColor: true, children: "Scalix API endpoint (or any compatible URL)" }), _jsxs(Box, { marginTop: 1, children: [_jsxs(Text, { color: "#20a0a0", bold: true, children: ['\u276F', " "] }), _jsx(TextInput, { value: baseUrl, onChange: (v) => setBaseUrl(sanitizeInput(v)), onSubmit: (v) => {
-                                            const url = sanitizeInput(v).trim() || baseUrl;
+                                        }, placeholder: provider === 'openai' ? 'sk-...' : 'scalix_sk_...' })] }), apiKeyError && (_jsx(Box, { marginTop: 0, paddingLeft: 2, children: _jsx(Text, { color: "yellow", dimColor: true, children: "API key is required." }) }))] })), step === 'base-url' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, color: "white", children: provider === 'openai' ? 'Endpoint URL' : 'Base URL' }), _jsx(Text, { dimColor: true, children: provider === 'openai' ? 'Your OpenAI-compatible endpoint root, with or without /v1 (required).' : 'Scalix API endpoint (or your self-hosted gateway)' }), _jsxs(Box, { marginTop: 1, children: [_jsxs(Text, { color: "#20a0a0", bold: true, children: ['\u276F', " "] }), _jsx(TextInput, { value: baseUrl, onChange: (v) => { setBaseUrl(sanitizeInput(v)); setBaseUrlError(false); }, onSubmit: (v) => {
+                                            const typed = sanitizeInput(v).trim();
+                                            if (provider === 'openai') {
+                                                // BYOK has no default third-party URL \u2014 the endpoint is required.
+                                                const url = typed || baseUrl;
+                                                if (!url) {
+                                                    setBaseUrlError(true);
+                                                    return;
+                                                }
+                                                setBaseUrl(url);
+                                                // Ask the endpoint what it serves. Without this the next
+                                                // step can only tell the user to go read GET /v1/models
+                                                // themselves, and one mistyped id fails the first turn
+                                                // with nothing pointing at the id as the cause.
+                                                setFetchingModels(true);
+                                                fetchByokModels(url, apiKey).then((found) => {
+                                                    setFetchedModels(found.map((m) => ({ id: m.id })));
+                                                    setByokContextWindows(Object.fromEntries(found.filter((m) => m.contextWindow).map((m) => [m.id, m.contextWindow])));
+                                                }).catch((err) => { logger.warn('Failed to list endpoint models', { error: err.message }); })
+                                                    .finally(() => { setFetchingModels(false); });
+                                                setStep('models');
+                                                return;
+                                            }
+                                            // Backspacing the pre-filled default away leaves the box
+                                            // showing a greyed https://api.scalix.world \u2014 the placeholder.
+                                            // Enter on that used to save an empty base URL, and every
+                                            // later request failed with a bare "fetch failed". Honour
+                                            // what the placeholder promises.
+                                            const url = typed || baseUrl || DEFAULT_BASE_URL;
                                             setBaseUrl(url);
                                             // Model list loads in the background while the cloud step
                                             // validates the key via /v1/me + the tool catalog.
@@ -538,7 +760,7 @@ function SetupScreen({ onComplete, existingConfig }) {
                                                 setFetchingModels(false);
                                             });
                                             setStep('cloud');
-                                        }, placeholder: DEFAULT_BASE_URL })] }), fetchingModels && (_jsx(Box, { paddingLeft: 2, marginTop: 1, children: _jsx(Text, { color: "#20a0a0", dimColor: true, children: "Fetching available models..." }) }))] })), step === 'cloud' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, color: "white", children: "Scalix Cloud" }), cloudCheck.phase === 'checking' && (_jsxs(Box, { marginTop: 1, gap: 1, children: [_jsx(Text, { color: "#20a0a0", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { dimColor: true, children: "Validating your API key with Scalix Cloud..." })] })), cloudCheck.phase === 'ok' && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "#30c090", paddingX: 2, marginTop: 1, alignSelf: "flex-start", children: [_jsxs(Text, { color: "#30c090", bold: true, children: ['✓', " Connected to Scalix Cloud"] }), _jsxs(Text, { children: ["Org:        ", _jsx(Text, { color: "#20a0a0", children: cloudCheck.identity.identity.orgId })] }), _jsxs(Text, { children: ["Project:    ", _jsx(Text, { color: "#20a0a0", children: cloudCheck.identity.identity.projectId || 'org-wide' })] }), _jsxs(Text, { children: ["Plan:       ", _jsx(Text, { color: "#20a0a0", children: cloudCheck.identity.limits.plan })] }), _jsxs(Text, { children: ["Rate limit: ", _jsxs(Text, { color: "#20a0a0", children: [cloudCheck.identity.limits.rateLimitRps, " req/s"] })] }), _jsxs(Text, { color: "#30c090", bold: true, children: ['●', " ", cloudCheck.toolCount, " platform tools unlocked"] })] }), _jsx(Box, { marginTop: 1, children: _jsx(SelectInput, { items: [{ label: '→ Continue', value: '__continue__' }], onSelect: () => setStep('models') }) })] })), cloudCheck.phase === 'fail' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "red", children: ['✘', " ", cloudCheck.error] }) }), _jsxs(Text, { dimColor: true, children: ["Create or check your key at ", CONSOLE_KEYS_URL] }), _jsx(Box, { marginTop: 1, children: _jsx(SelectInput, { items: [
+                                        }, placeholder: provider === 'openai' ? 'e.g. http://localhost:11434/v1' : DEFAULT_BASE_URL })] }), baseUrlError && (_jsx(Box, { marginTop: 0, paddingLeft: 2, children: _jsx(Text, { color: "yellow", dimColor: true, children: "An endpoint URL is required for a BYOK provider." }) })), fetchingModels && (_jsx(Box, { paddingLeft: 2, marginTop: 1, children: _jsx(Text, { color: "#20a0a0", dimColor: true, children: "Fetching available models..." }) }))] })), step === 'cloud' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, color: "white", children: "Scalix Cloud" }), cloudCheck.phase === 'checking' && (_jsxs(Box, { marginTop: 1, gap: 1, children: [_jsx(Text, { color: "#20a0a0", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { dimColor: true, children: "Validating your API key with Scalix Cloud..." })] })), cloudCheck.phase === 'ok' && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "#30c090", paddingX: 2, marginTop: 1, alignSelf: "flex-start", children: [_jsxs(Text, { color: "#30c090", bold: true, children: ['✓', " Connected to Scalix Cloud"] }), _jsxs(Text, { children: ["Org:        ", _jsx(Text, { color: "#20a0a0", children: cloudCheck.identity.identity.orgId })] }), _jsxs(Text, { children: ["Project:    ", _jsx(Text, { color: "#20a0a0", children: cloudCheck.identity.identity.projectId || 'org-wide' })] }), _jsxs(Text, { children: ["Plan:       ", _jsx(Text, { color: "#20a0a0", children: cloudCheck.identity.limits.plan })] }), _jsxs(Text, { children: ["Rate limit: ", _jsxs(Text, { color: "#20a0a0", children: [cloudCheck.identity.limits.rateLimitRps, " req/s"] })] }), _jsxs(Text, { color: "#30c090", bold: true, children: ['●', " ", cloudCheck.toolCount, " platform tools unlocked"] })] }), _jsx(Box, { marginTop: 1, children: _jsx(SelectInput, { items: [{ label: '→ Continue', value: '__continue__' }], onSelect: () => setStep('models') }) })] })), cloudCheck.phase === 'fail' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "red", children: ['✘', " ", cloudCheck.error] }) }), cloudCheck.remedy && (_jsx(Text, { dimColor: true, children: cloudCheck.remedy })), !cloudCheck.remedy && !cloudCheck.error.includes(CONSOLE_KEYS_URL) && (_jsxs(Text, { dimColor: true, children: ["Create or check your key at ", CONSOLE_KEYS_URL] })), _jsx(Box, { marginTop: 1, children: _jsx(SelectInput, { items: [
                                                 { label: 'Re-enter API key', value: '__reenter__' },
                                                 { label: 'Skip — continue without Scalix Cloud (local tools only)', value: '__skip__' },
                                             ], onSelect: (item) => {
@@ -548,7 +770,7 @@ function SetupScreen({ onComplete, existingConfig }) {
                                                 else {
                                                     setStep('models');
                                                 }
-                                            } }) })] }))] })), step === 'models' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, color: "white", children: "Models" }), fetchedModels.length > 0 && modelsMode === 'custom' && models.length === 0 ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: "Select models from your API or type a custom model ID." }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(SelectInput, { items: [
+                                            } }) })] }))] })), step === 'models' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, color: "white", children: "Models" }), fetchingModels && fetchedModels.length === 0 && models.length === 0 ? (_jsxs(Box, { marginTop: 1, gap: 1, children: [_jsx(Text, { color: "#20a0a0", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { dimColor: true, children: "Asking your endpoint which models it serves..." })] })) : fetchedModels.length > 0 && modelsMode === 'custom' ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: "Select models from your API or type a custom model ID." }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(SelectInput, { items: [
                                                 ...fetchedModels.filter((fm) => !models.includes(fm.id)).map((fm) => ({
                                                     label: `  ${fm.name || fm.id}`,
                                                     value: fm.id,
@@ -569,7 +791,23 @@ function SetupScreen({ onComplete, existingConfig }) {
                                                         setModels((prev) => [...prev, item.value]);
                                                     }
                                                 }
-                                            } }) }), models.length > 0 && (_jsxs(Box, { flexDirection: "column", paddingLeft: 2, marginTop: 1, children: [_jsx(Text, { dimColor: true, bold: true, children: "Selected:" }), models.map((m) => (_jsxs(Text, { color: "#30c090", children: ['\u25CF', " ", m] }, m)))] }))] })) : (_jsxs(_Fragment, { children: [_jsx(Text, { dimColor: true, children: "Type a model ID and press Enter to add. Add at least one." }), models.length > 0 && modelsMode === 'list' ? (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { dimColor: true, children: "Added models (Enter to remove, \u2191/\u2193 to navigate):" }), _jsx(SelectInput, { items: [
+                                            } }) }), models.length > 0 && (_jsxs(Box, { flexDirection: "column", paddingLeft: 2, marginTop: 1, children: [_jsx(Text, { dimColor: true, bold: true, children: "Selected:" }), models.map((m) => (_jsxs(Text, { color: "#30c090", children: ['\u25CF', " ", m] }, m)))] }))] })) : (_jsxs(_Fragment, { children: [_jsx(Text, { dimColor: true, children: "Type a model ID and press Enter to add. Add at least one." }), models.length > 0 && modelsMode === 'list' ? (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { dimColor: true, children: ["Added models (", '↑', "/", '↓', " to navigate, Enter on a model removes it):"] }), _jsx(SelectInput
+                                            // Open on Continue. The list's first entries are the
+                                            // models themselves and choosing one deletes it, so the
+                                            // cursor used to start on a destructive action: the
+                                            // previous screen says "press Enter (empty) to review &
+                                            // continue", and a second Enter — the obvious way to
+                                            // move on — wiped the only model and dropped the user
+                                            // back to an empty box with a warning.
+                                            , { 
+                                                // Open on Continue. The list's first entries are the
+                                                // models themselves and choosing one deletes it, so the
+                                                // cursor used to start on a destructive action: the
+                                                // previous screen says "press Enter (empty) to review &
+                                                // continue", and a second Enter — the obvious way to
+                                                // move on — wiped the only model and dropped the user
+                                                // back to an empty box with a warning.
+                                                initialIndex: models.length + 1, items: [
                                                     ...models.map((m) => ({
                                                         label: `\u25CF ${m}`,
                                                         value: m,
@@ -599,35 +837,83 @@ function SetupScreen({ onComplete, existingConfig }) {
                                                                     setModels((prev) => [...prev, trimmed]);
                                                                 }
                                                                 setModelInput('');
+                                                                setModelsWarned(false);
                                                             }
                                                             else if (models.length > 0) {
                                                                 setModelsMode('list');
                                                             }
-                                                        }, placeholder: "model-id (from your API provider)" })] }), _jsx(Box, { paddingLeft: 2, marginTop: 0, children: models.length === 0 ? (_jsx(Text, { color: "yellow", dimColor: true, children: "At least one model is required." })) : (_jsx(Text, { dimColor: true, children: "Enter another model or press Enter (empty) to review & continue" })) })] }))] }))] })), step === 'context-window' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, color: "white", children: "Context Window Size" }), _jsx(Text, { dimColor: true, children: "Enter the max token count your model supports." }), _jsx(Text, { dimColor: true, children: "Check your model provider's docs for the exact limit." }), _jsx(Text, { dimColor: true, children: "This controls when the agent auto-compresses conversation context." }), (() => {
+                                                            else {
+                                                                setModelsWarned(true);
+                                                            }
+                                                        }, placeholder: "model-id (from your API provider)" })] }), _jsx(Box, { paddingLeft: 2, marginTop: 0, children: models.length === 0 ? (modelsWarned ? (_jsx(Text, { color: "yellow", dimColor: true, children: "At least one model is required." })) : provider === 'openai' && fetchedModels.length === 0 ? (_jsx(Text, { dimColor: true, children: "Your endpoint didn't return a model list \u2014 type the id it serves." })) : (_jsx(Text, { dimColor: true, children: "Use the exact id your endpoint serves \u2014 the values under GET /v1/models." }))) : (_jsx(Text, { dimColor: true, children: "Enter another model or press Enter (empty) to review & continue" })) })] }))] }))] })), step === 'context-window' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, color: "white", children: "Context Window Size" }), _jsx(Text, { dimColor: true, children: "Enter the max token count your model supports." }), _jsx(Text, { dimColor: true, children: "Check your model provider's docs for the exact limit." }), _jsx(Text, { dimColor: true, children: "This controls when the agent auto-compresses conversation context." }), provider === 'openai' && (
+                            // Say where the pre-filled number came from either way. A user who
+                            // takes a guessed default on trust for an 8K local model gets
+                            // rejected requests, and one who is told a real reported limit is
+                            // a guess will second-guess a correct number.
+                            reportedContextWindow !== null ? (_jsxs(Text, { dimColor: true, children: ["Pre-filled with ", formatContextSize(reportedContextWindow), " \u2014 reported by your endpoint", models.length > 1 ? ', the smallest across the models you picked' : '', "."] })) : (_jsxs(Text, { dimColor: true, children: ["Pre-filled with a safe ", formatContextSize(BYOK_DEFAULT_CONTEXT_TOKENS), " \u2014 we can't read your endpoint's real limit."] }))), (() => {
                                 const parsed = parseInt(contextInput, 10);
                                 const valid = parsed > 0;
                                 return valid ? (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "#30c090", children: ['\u25CF', " ", formatContextSize(parsed), " tokens (", parsed.toLocaleString(), ")"] }) })) : null;
                             })(), _jsxs(Box, { marginTop: 1, children: [_jsxs(Text, { color: "#20a0a0", bold: true, children: ['\u276F', " "] }), _jsx(TextInput, { value: contextInput, onChange: setContextInput, onSubmit: (v) => {
+                                            // saveConfig() writes the key to the OS keychain, and that
+                                            // subprocess is not always quick — a locked keychain or a
+                                            // pending "allow access?" dialog made one measured save take
+                                            // 19.6s. Without this flag the final Enter looked like a dead
+                                            // key, and a second Enter re-entered the same handler.
+                                            if (saving)
+                                                return;
+                                            setSaving(true);
                                             const parsed = parseInt(v.trim(), 10);
-                                            const tokens = parsed > 0 ? parsed : DEFAULT_LIMITS.maxContextTokens;
-                                            const limits = { ...DEFAULT_LIMITS, maxContextTokens: tokens };
+                                            const tokens = parsed > 0 ? parsed : defaultContextTokens(provider, existingConfig?.limits?.maxContextTokens);
+                                            // Preserve the user's /settings customizations — building
+                                            // from DEFAULT_LIMITS alone silently wiped every other
+                                            // limit each time the wizard was re-run.
+                                            const limits = { ...DEFAULT_LIMITS, ...(existingConfig?.limits || {}), maxContextTokens: tokens };
+                                            // BYOK: the endpoint's catalog told us per-model context
+                                            // windows during discovery. Persist them as specs — they
+                                            // used to be thrown away here, leaving every model
+                                            // spec-less, so no max_tokens was sent and OpenRouter-class
+                                            // gateways rejected every request with a 400. Existing
+                                            // explicit specs win.
+                                            const customModels = { ...(existingConfig?.customModels || {}) };
+                                            if (provider === 'openai') {
+                                                for (const m of models) {
+                                                    if (!customModels[m]) {
+                                                        customModels[m] = {
+                                                            contextWindow: byokContextWindows[m] && byokContextWindows[m] > 0
+                                                                ? byokContextWindows[m]
+                                                                : BYOK_DEFAULT_CONTEXT_TOKENS,
+                                                            maxOutputTokens: BYOK_DEFAULT_MAX_OUTPUT_TOKENS,
+                                                        };
+                                                    }
+                                                }
+                                            }
+                                            // BYOK: openai creds live under providers.openai; the
+                                            // top-level apiKey/baseUrl stay reserved for Scalix so
+                                            // switching back never loses the Scalix connection.
                                             const newConfig = {
-                                                apiKey,
-                                                baseUrl,
+                                                apiKey: provider === 'openai' ? (existingConfig?.apiKey || '') : apiKey,
+                                                baseUrl: provider === 'openai' ? (existingConfig?.baseUrl || DEFAULT_BASE_URL) : baseUrl,
                                                 models,
-                                                customModels: existingConfig?.customModels || {},
+                                                customModels,
                                                 limits,
                                                 permissionMode: existingConfig?.permissionMode || 'default',
                                                 thinkingMode: existingConfig?.thinkingMode || 'off',
                                                 security: existingConfig?.security || {},
                                                 injectionDetection: existingConfig?.injectionDetection || { enabled: true, sensitivity: 'medium' },
+                                                provider,
+                                                providers: provider === 'openai'
+                                                    ? { ...existingConfig?.providers, openai: { apiKey, baseUrl } }
+                                                    : existingConfig?.providers,
                                             };
-                                            saveConfig(newConfig).then(() => {
+                                            saveConfig(newConfig).then((result) => {
+                                                if (result?.plaintextSecret)
+                                                    plaintextKeyPending = true;
                                                 onComplete(newConfig);
                                             }).catch(() => {
                                                 onComplete(newConfig);
                                             });
-                                        }, placeholder: String(DEFAULT_LIMITS.maxContextTokens) })] })] })), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { dimColor: true, italic: true, children: [stepNumber > 1 ? 'Backspace (empty) to go back \u2022 ' : '', "ESC to quit"] }) })] })] }));
+                                        }, placeholder: String(defaultContextTokens(provider, existingConfig?.limits?.maxContextTokens)), focus: !saving })] }), saving && (_jsxs(Box, { marginTop: 1, gap: 1, children: [_jsx(Text, { color: "#20a0a0", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { dimColor: true, children: "Saving configuration (storing your key in the OS keychain)..." })] }))] })), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { dimColor: true, italic: true, children: [stepNumber > 1 ? 'Backspace (empty) to go back \u2022 ' : '', "ESC to quit"] }) })] })] }));
 }
 const StatusBar = memo(function StatusBar({ status, model, toolCount, thinkStart, tokens, mode, contextPercent, rateLimitWarn }) {
     const { cols } = useTermSize();
@@ -658,35 +944,119 @@ const StatusBar = memo(function StatusBar({ status, model, toolCount, thinkStart
             registry.off('agent:completed', refresh);
         };
     }, []);
-    const leftParts = [];
-    leftParts.push(shortModel(model));
+    const leftSegs = [{ id: 'model', text: shortModel(model) }];
     if (tokens > 0)
-        leftParts.push(`${formatTokens(tokens)} tok`);
-    leftParts.push(`${toolCount} tools`);
+        leftSegs.push({ id: 'tok', text: `${formatTokens(tokens)} tok` });
+    leftSegs.push({ id: 'tools', text: `${toolCount} tools` });
     if (activeAgents > 0)
-        leftParts.push(`${activeAgents} agent${activeAgents > 1 ? 's' : ''}`);
+        leftSegs.push({ id: 'agents', text: `${activeAgents} agent${activeAgents > 1 ? 's' : ''}` });
     if (contextPercent > 50)
-        leftParts.push(`ctx ${contextPercent}%`);
-    const leftText = leftParts.join(' \u00B7 ');
-    const warnText = rateLimitWarn ? ' \u26A0 Rate limited' : '';
-    const rightLen = mode.length + VERSION.length + 6 + (elapsedStr ? elapsedStr.length + 3 : 0) + warnText.length;
-    const gap = Math.max(cols - leftText.length - rightLen - 8, 2);
-    return (_jsxs(Box, { paddingX: 2, children: [_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: statusColor, children: statusIcon }), _jsx(Text, { dimColor: true, children: leftText })] }), _jsx(Text, { children: ' '.repeat(gap) }), _jsxs(Box, { gap: 1, children: [rateLimitWarn && _jsxs(Text, { color: "red", bold: true, children: ['\u26A0', " Rate limited"] }), _jsx(Text, { color: modeColor, bold: true, children: mode }), elapsedStr ? _jsxs(Text, { dimColor: true, children: ['\u00B7', " ", elapsedStr] }) : null, _jsxs(Text, { dimColor: true, children: ['\u00B7', " v", VERSION] })] })] }));
+        leftSegs.push({ id: 'ctx', text: `ctx ${contextPercent}%` });
+    // Ink shrinks and wraps overflowing Text nodes rather than dropping them, so
+    // a status bar that does not fit its terminal doesn't degrade \u2014 it shatters.
+    // At 40 columns this rendered as "\u00B7 1 agent            lt      5.0": model
+    // name gone, "default" chewed down to "lt", "v1.5.0" to "5.0". Shed whole
+    // segments instead, cheapest first. The permission mode is a safety signal
+    // and the model name answers "what am I even talking to", so those two are
+    // the last things standing.
+    const interior = Math.max(cols - 4, 0); // paddingX={2} on both sides
+    const hidden = new Set();
+    const warnWidth = rateLimitWarn ? 15 : 0; // gap + "\u26A0 Rate limited"
+    const leftWidth = () => 2 + leftSegs.filter((s) => !hidden.has(s.id)).map((s) => s.text).join(' \u00B7 ').length;
+    const rightWidth = () => mode.length + warnWidth
+        + (elapsedStr && !hidden.has('elapsed') ? elapsedStr.length + 3 : 0)
+        + (hidden.has('version') ? 0 : VERSION.length + 4);
+    for (const id of ['version', 'tools', 'tok', 'elapsed', 'ctx', 'agents']) {
+        if (leftWidth() + 1 + rightWidth() <= interior)
+            break;
+        hidden.add(id);
+    }
+    let leftText = leftSegs.filter((s) => !hidden.has(s.id)).map((s) => s.text).join(' \u00B7 ');
+    const rightLen = rightWidth();
+    const overflow = 2 + leftText.length + 1 + rightLen - interior;
+    if (overflow > 0)
+        leftText = leftText.slice(0, Math.max(0, leftText.length - overflow));
+    const gap = Math.max(interior - 2 - leftText.length - rightLen, 1);
+    return (_jsxs(Box, { paddingX: 2, children: [_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: statusColor, children: statusIcon }), _jsx(Text, { dimColor: true, children: leftText })] }), _jsx(Text, { children: ' '.repeat(gap) }), _jsxs(Box, { gap: 1, children: [rateLimitWarn && _jsxs(Text, { color: "red", bold: true, children: ['\u26A0', " Rate limited"] }), _jsx(Text, { color: modeColor, bold: true, children: mode }), elapsedStr && !hidden.has('elapsed') ? _jsxs(Text, { dimColor: true, children: ['\u00B7', " ", elapsedStr] }) : null, hidden.has('version') ? null : _jsxs(Text, { dimColor: true, children: ['\u00B7', " v", VERSION] })] })] }));
 });
+/**
+ * The single sentence the UI uses for a Scalix Cloud connection that is not
+ * up. Shared by the welcome screen, /status and /cloud so all three say the
+ * same thing about the same state.
+ */
+/**
+ * @param detail  Include the server's own reason for a failed connect. The
+ *   welcome header passes false: the startup transcript already carries the
+ *   full sentence, and both were on screen at once — the same "API key
+ *   rejected — create one at <url>" printed twice, three lines apart.
+ */
+function cloudStatusLine(cloud, detail = true) {
+    if (cloud.connected) {
+        const plan = cloud.identity ? `${cloud.identity.limits.plan} · ` : '';
+        return `☁ Scalix Cloud · ${plan}${cloud.toolCount} platform tools`;
+    }
+    if (cloud.reason === 'byok') {
+        return '☁ Scalix Cloud not in use — this session runs on your own provider (local tools only)';
+    }
+    if (cloud.reason === 'failed') {
+        const extra = detail
+            ? `${cloud.error ? ` · ${cloud.error}` : ''}${cloud.remedy ? ` · ${cloud.remedy}` : ''}`
+            : '';
+        return `☁ Scalix Cloud unavailable — local tools only${extra}`;
+    }
+    return '☁ not connected — /login to link your Scalix account';
+}
+/**
+ * Real tool names, as many as fit on one line.
+ *
+ * This line used to be nine hand-written nicknames — shell, read, write, edit,
+ * search, find, git, web, tree — and none of them was a tool the model can
+ * call. `tree` was the only one that even looked like a name, and there is no
+ * `tree` tool. It also never moved when the tool set did, so a session with
+ * plugins or MCP servers loaded advertised the same nine words as a bare one.
+ */
+function toolNamePreview(cols) {
+    const names = [...allTools, ...pluginTools]
+        .map((t) => t?.function?.name ?? t?.name)
+        .filter((n) => typeof n === 'string' && n.length > 0);
+    if (names.length === 0)
+        return 'none loaded';
+    // paddingX={2} on the screen (4) + paddingLeft={2} on the row (2) + the
+    // gap space (1) + "Tools:" (6), and room for the "+N more" tail so the
+    // count is never the thing that gets truncated away.
+    const budget = Math.max(cols - 13 - `+${names.length} more`.length, 20);
+    const shown = [];
+    let used = 0;
+    for (const n of names) {
+        if (used + n.length + (shown.length ? 1 : 0) > budget)
+            break;
+        used += n.length + (shown.length ? 1 : 0);
+        shown.push(n);
+    }
+    const rest = names.length - shown.length;
+    return rest > 0 ? `${shown.join(' ')} +${rest} more` : shown.join(' ');
+}
 const WelcomeScreen = memo(function WelcomeScreen({ cloud }) {
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 0, children: [_jsx(Text, { dimColor: true, children: "  Type a message or use /help for commands. Press Esc to exit." }), _jsxs(Box, { marginTop: 0, paddingLeft: 2, gap: 1, flexWrap: "wrap", children: [_jsx(Text, { dimColor: true, children: "Tools:" }), ['shell', 'read', 'write', 'edit', 'search', 'find', 'git', 'web', 'tree'].map((t) => (_jsx(Text, { dimColor: true, bold: true, children: t }, t)))] }), _jsx(Box, { paddingLeft: 2, children: cloud.connected ? (_jsxs(Text, { color: "#20a0a0", children: ['☁', " Scalix Cloud ", '·', " ", cloud.identity ? `${cloud.identity.limits.plan} ${'·'} ` : '', cloud.toolCount, " platform tools"] })) : (_jsxs(Text, { dimColor: true, children: ['☁', " not connected ", '—', " /login to link your Scalix account"] })) })] }));
+    const { cols } = useTermSize();
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 0, children: [_jsx(Text, { dimColor: true, children: "  Type a message or use /help for commands. Press Esc to exit." }), _jsxs(Box, { marginTop: 0, paddingLeft: 2, gap: 1, children: [_jsx(Text, { dimColor: true, children: "Tools:" }), _jsx(Text, { dimColor: true, bold: true, wrap: "truncate-end", children: toolNamePreview(cols) })] }), _jsx(Box, { paddingLeft: 2, children: cloud.connected ? (_jsxs(Text, { color: "#20a0a0", children: ['☁', " Scalix Cloud ", '·', " ", cloud.identity ? `${cloud.identity.limits.plan} ${'·'} ` : '', cloud.toolCount, " platform tools"] })) : (_jsx(Text, { dimColor: true, children: cloudStatusLine(cloud, false) })) })] }));
 });
 const UserMessage = memo(function UserMessage({ text }) {
-    return (_jsxs(Box, { paddingX: 2, marginTop: 1, gap: 1, children: [_jsx(Text, { color: "magentaBright", bold: true, children: '\u276F' }), _jsx(Text, { wrap: "wrap", bold: true, children: text })] }));
+    return (_jsx(Box, { paddingX: 2, marginTop: 1, children: _jsxs(Text, { wrap: "wrap", bold: true, children: [_jsx(Text, { color: "magentaBright", children: '\u276F ' }), text] }) }));
 });
 const AssistantMessage = memo(function AssistantMessage({ text }) {
-    const rendered = renderMarkdown(text);
+    // Width has to come from useTermSize, not from renderMarkdown's
+    // process.stdout.columns fallback. This component is memo'd on `text`, so
+    // without a prop that changes on resize it never re-renders — every reply
+    // already on screen stayed wrapped to the width it was first drawn at.
+    const { cols } = useTermSize();
+    const rendered = renderMarkdown(text, cols);
     return (_jsx(Box, { paddingLeft: 3, paddingRight: 2, flexDirection: "column", marginTop: 1, children: _jsx(Text, { wrap: "wrap", children: rendered }) }));
 });
 const ErrorMessage = memo(function ErrorMessage({ text, hint }) {
-    return (_jsxs(Box, { paddingLeft: 3, paddingRight: 2, flexDirection: "column", marginTop: 0, children: [_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: "red", children: '\u2718' }), _jsx(Text, { wrap: "wrap", color: "red", children: text })] }), hint && (_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { wrap: "wrap", color: "yellow", dimColor: true, children: hint }) }))] }));
+    return (_jsxs(Box, { paddingLeft: 3, paddingRight: 2, flexDirection: "column", marginTop: 0, children: [_jsx(Box, { children: _jsx(Text, { wrap: "wrap", color: "red", children: `\u2718 ${text}` }) }), hint && (_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { wrap: "wrap", color: "yellow", dimColor: true, children: hint }) }))] }));
 });
 const ToolCallMessage = memo(function ToolCallMessage({ name, args }) {
+    const { cols } = useTermSize();
     let summary = '';
     try {
         const parsed = JSON.parse(args);
@@ -699,22 +1069,35 @@ const ToolCallMessage = memo(function ToolCallMessage({ name, args }) {
         else if (parsed.query)
             summary = parsed.query;
         else
-            summary = truncate(args, 80);
+            summary = args;
     }
     catch {
-        summary = truncate(args, 80);
+        summary = args;
     }
-    return (_jsxs(Box, { paddingLeft: 3, paddingRight: 2, gap: 1, marginTop: 1, children: [_jsx(Text, { color: "cyan", children: '\u25CB' }), _jsx(Text, { color: "cyan", bold: true, children: name }), _jsx(Text, { dimColor: true, children: summary })] }));
+    // paddingLeft 3 + bullet + two gap spaces + paddingRight 2 = 8 columns of
+    // chrome. This row used to clip at a flat 80 regardless of terminal width,
+    // which leaves Ink to shrink and wrap the flex line instead of clipping it:
+    // at 30 columns "run_command echo hello-from-tool" came out as
+    // "\u25CBrun_commaecho" / "nd       hello-from-tool".
+    const room = Math.max(cols - 8 - stringWidth(name), 12);
+    return (_jsxs(Box, { paddingLeft: 3, paddingRight: 2, gap: 1, marginTop: 1, children: [_jsx(Text, { color: "cyan", children: '\u25CB' }), _jsx(Text, { color: "cyan", bold: true, wrap: "truncate-end", children: name }), _jsx(Text, { dimColor: true, wrap: "truncate-end", children: truncate(summary, room) })] }));
 });
 const ToolResultMessage = memo(function ToolResultMessage({ name, result }) {
     const { cols } = useTermSize();
-    const maxLen = Math.max(cols - name.length - 10, 40);
-    return (_jsxs(Box, { paddingLeft: 3, paddingRight: 2, gap: 1, children: [_jsx(Text, { color: "green", children: '\u25CF' }), _jsxs(Text, { dimColor: true, children: [name, ":"] }), _jsx(Text, { dimColor: true, children: truncate(result, maxLen) })] }));
+    // Floor at 12, not 40: a 40-column floor on a 30-column terminal guarantees
+    // the flex line overflows, and Ink answers that by shrinking and wrapping
+    // every cell rather than clipping the one that is too long.
+    const maxLen = Math.max(cols - name.length - 10, 12);
+    return (_jsxs(Box, { paddingLeft: 3, paddingRight: 2, gap: 1, children: [_jsx(Text, { color: "green", children: '\u25CF' }), _jsxs(Text, { dimColor: true, wrap: "truncate-end", children: [name, ":"] }), _jsx(Text, { dimColor: true, wrap: "truncate-end", children: truncate(result, maxLen) })] }));
 });
 const ToolBlockedMessage = memo(function ToolBlockedMessage({ text }) {
     return (_jsxs(Box, { paddingLeft: 3, paddingRight: 2, gap: 1, children: [_jsx(Text, { color: "red", children: '\u25CF' }), _jsx(Text, { color: "red", children: text })] }));
 });
-const ToolGroupMessage = memo(function ToolGroupMessage({ count, children, collapsed }) {
+const ToolGroupMessage = memo(function ToolGroupMessage({ children, collapsed }) {
+    // Count calls, not display rows. `children` holds one 'tool-call' and one
+    // 'tool-result' per tool, and this used to be handed children.length — so a
+    // turn that ran two tools announced "Ran 4 tools".
+    const count = children?.filter((c) => c.kind === 'tool-call').length || children?.length || 0;
     if (collapsed || !children) {
         return (_jsxs(Box, { paddingLeft: 3, paddingRight: 2, gap: 1, marginTop: 1, children: [_jsx(Text, { color: "cyan", children: '○' }), _jsxs(Text, { dimColor: true, children: ["Ran ", count, " tools"] }), _jsx(Text, { dimColor: true, italic: true, children: "(Ctrl+O to expand)" })] }));
     }
@@ -745,7 +1128,7 @@ const DiffMessage = memo(function DiffMessage({ text, meta }) {
                 }) })] }));
 });
 const SystemMessage = memo(function SystemMessage({ text }) {
-    return (_jsxs(Box, { paddingX: 2, paddingLeft: 3, marginY: 0, gap: 1, children: [_jsx(Text, { dimColor: true, children: '\u2500' }), _jsx(Text, { dimColor: true, wrap: "wrap", children: text })] }));
+    return (_jsx(Box, { paddingX: 2, paddingLeft: 3, marginY: 0, children: _jsx(Text, { dimColor: true, wrap: "wrap", children: `\u2500 ${text}` }) }));
 });
 const RenderItem = memo(function RenderItem({ item }) {
     switch (item.kind) {
@@ -755,12 +1138,12 @@ const RenderItem = memo(function RenderItem({ item }) {
         case 'tool-call': return _jsx(ToolCallMessage, { name: item.meta ?? '', args: item.text });
         case 'tool-result': return _jsx(ToolResultMessage, { name: item.meta ?? '', result: item.text });
         case 'tool-blocked': return _jsx(ToolBlockedMessage, { text: item.text });
-        case 'tool-group': return _jsx(ToolGroupMessage, { count: item.children?.length ?? 0, children: item.children, collapsed: item.collapsed });
+        case 'tool-group': return _jsx(ToolGroupMessage, { children: item.children, collapsed: item.collapsed });
         case 'diff': return _jsx(DiffMessage, { text: item.text, meta: item.meta });
         case 'system': return _jsx(SystemMessage, { text: item.text });
     }
 });
-const StreamingArea = memo(function StreamingArea({ text, reasoning, model, maxLines }) {
+const StreamingArea = memo(function StreamingArea({ text, reasoning, model, maxLines, waiting }) {
     const { rows } = useTermSize();
     const limit = maxLines ?? Math.floor(rows * 0.5);
     const displayText = useMemo(() => {
@@ -779,7 +1162,7 @@ const StreamingArea = memo(function StreamingArea({ text, reasoning, model, maxL
             return reasoning;
         return lines.slice(-3).join('\n');
     }, [reasoning]);
-    return (_jsxs(Box, { flexDirection: "column", paddingLeft: 3, paddingRight: 2, marginTop: 1, children: [displayReasoning.length > 0 && (_jsx(Box, { paddingLeft: 0, marginBottom: 0, children: _jsxs(Text, { color: "magenta", dimColor: true, italic: true, wrap: "wrap", children: ['\u2502', " ", displayReasoning] }) })), displayText.length > 0 ? (_jsxs(Text, { wrap: "wrap", children: [renderMarkdown(displayText), _jsx(Text, { color: "magentaBright", children: '\u258E' })] })) : displayReasoning.length === 0 ? (_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: "magentaBright", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { dimColor: true, children: ["Thinking", model ? ` (${model})` : '', "..."] })] })) : null] }));
+    return (_jsxs(Box, { flexDirection: "column", paddingLeft: 3, paddingRight: 2, marginTop: 1, children: [displayReasoning.length > 0 && (_jsx(Box, { paddingLeft: 0, marginBottom: 0, children: _jsxs(Text, { color: "magenta", dimColor: true, italic: true, wrap: "wrap", children: ['\u2502', " ", displayReasoning] }) })), displayText.length > 0 ? (_jsxs(Text, { wrap: "wrap", children: [renderMarkdown(displayText), _jsx(Text, { color: "magentaBright", children: '\u258E' })] })) : displayReasoning.length === 0 ? (_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: "magentaBright", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { dimColor: true, wrap: "truncate-end", children: waiting ? 'Waiting for your approval...' : `Thinking${model ? ` (${model})` : ''}...` })] })) : null] }));
 });
 function ConfirmPrompt({ toolName, args, onRespond, onScrollUp, onScrollDown }) {
     const { cols } = useTermSize();
@@ -825,15 +1208,15 @@ function ConfirmPrompt({ toolName, args, onRespond, onScrollUp, onScrollDown })
     // (stringWidth), so wide/CJK chars keep the right border aligned. `used` is the
     // display width already emitted between the two \u2502 borders.
     const pad = (used) => ' '.repeat(Math.max(0, boxWidth - 2 - used));
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsxs(Text, { color: "yellow", children: ['\u250C', border, '\u2510'] }), _jsxs(Text, { color: "yellow", children: ['\u2502', " ", _jsxs(Text, { color: "yellow", bold: true, children: ['\u26A0', " Permission Required"] }), _jsx(Text, { children: ' '.repeat(Math.max(0, boxWidth - 24)) }), '\u2502'] }), _jsxs(Text, { color: "yellow", children: ['\u2502', " ", _jsx(Text, { dimColor: true, children: "Tool:" }), " ", _jsx(Text, { color: "cyan", bold: true, children: toolName }), _jsx(Text, { children: pad(7 + stringWidth(toolName)) }), '\u2502'] }), highlightStr && (() => {
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsxs(Text, { color: "yellow", children: ['\u250C', border, '\u2510'] }), _jsxs(Text, { color: "yellow", children: ['\u2502', " ", _jsxs(Text, { color: "yellow", bold: true, children: ['\u26A0', " Permission Required"] }), _jsx(Text, { children: pad(22) }), '\u2502'] }), _jsxs(Text, { color: "yellow", children: ['\u2502', " ", _jsx(Text, { dimColor: true, children: "Tool:" }), " ", _jsx(Text, { color: "cyan", bold: true, children: toolName }), _jsx(Text, { children: pad(7 + stringWidth(toolName)) }), '\u2502'] }), highlightStr && (() => {
                 const shown = truncateText(highlightStr, boxWidth - highlightLabel.length - 6);
                 return (_jsxs(Text, { color: "yellow", children: ['\u2502', " ", _jsxs(Text, { dimColor: true, children: [highlightLabel, ":"] }), " ", _jsx(Text, { color: "white", bold: true, children: shown }), _jsx(Text, { children: pad(highlightLabel.length + 3 + stringWidth(shown)) }), '\u2502'] }));
             })(), extraFields.slice(0, 3).map(([k, v]) => {
                 const val = truncateText(flatten(String(v)), boxWidth - k.length - 6);
                 return (_jsxs(Text, { color: "yellow", children: ['\u2502', " ", _jsxs(Text, { dimColor: true, children: [k, ":"] }), " ", _jsx(Text, { children: val }), _jsx(Text, { children: pad(k.length + 3 + stringWidth(val)) }), '\u2502'] }, k));
-            }), _jsxs(Text, { color: "yellow", children: ['\u251C', border, '\u2524'] }), _jsxs(Text, { color: "yellow", children: ['\u2502', " ", _jsx(Text, { color: "green", bold: true, children: "[Y]" }), _jsx(Text, { children: " Allow  " }), _jsx(Text, { color: "cyan", bold: true, children: "[A]" }), _jsx(Text, { children: " Always  " }), _jsx(Text, { color: "red", bold: true, children: "[N]" }), _jsx(Text, { children: " Deny  " }), _jsx(Text, { dimColor: true, children: "ESC deny" }), _jsx(Text, { children: ' '.repeat(Math.max(0, boxWidth - 42)) }), '\u2502'] }), _jsxs(Text, { color: "yellow", children: ['\u2514', border, '\u2518'] })] }));
+            }), _jsxs(Text, { color: "yellow", children: ['\u251C', border, '\u2524'] }), boxWidth - 2 >= 42 ? (_jsxs(Text, { color: "yellow", children: ['\u2502', " ", _jsx(Text, { color: "green", bold: true, children: "[Y]" }), _jsx(Text, { children: " Allow  " }), _jsx(Text, { color: "cyan", bold: true, children: "[A]" }), _jsx(Text, { children: " Always  " }), _jsx(Text, { color: "red", bold: true, children: "[N]" }), _jsx(Text, { children: " Deny  " }), _jsx(Text, { dimColor: true, children: "ESC deny" }), _jsx(Text, { children: pad(42) }), '\u2502'] })) : (_jsxs(Text, { color: "yellow", children: ['\u2502', " ", _jsx(Text, { color: "green", bold: true, children: "[Y]" }), _jsx(Text, { children: "es " }), _jsx(Text, { color: "cyan", bold: true, children: "[A]" }), _jsx(Text, { children: "lways " }), _jsx(Text, { color: "red", bold: true, children: "[N]" }), _jsx(Text, { children: "o" }), _jsx(Text, { children: pad(20) }), '\u2502'] })), _jsxs(Text, { color: "yellow", children: ['\u2514', border, '\u2518'] })] }));
 }
-function ModelPicker({ currentModels, onSelect, onCancel }) {
+function ModelPicker({ currentModels, availableModels = [], onSelect, onCancel }) {
     const [customInput, setCustomInput] = useState('');
     const [showCustom, setShowCustom] = useState(false);
     useInput((_ch, key) => { if (key.escape) {
@@ -850,11 +1233,16 @@ function ModelPicker({ currentModels, onSelect, onCancel }) {
                                     setShowCustom(false);
                             }, placeholder: "provider/model-name" })] }), _jsx(Text, { dimColor: true, children: "ESC to go back" })] }));
     }
+    const catalogOnly = availableModels.filter((m) => !currentModels.includes(m));
     const items = [
         ...currentModels.map((m) => ({
             label: `\u25CF ${shortModel(m)}`,
             value: m,
         })),
+        ...catalogOnly.map((m) => ({
+            label: `\u25CB ${shortModel(m)}`,
+            value: m,
+        })),
         { label: '+ Add new model...', value: '__custom__' },
         { label: '  Cancel', value: '__cancel__' },
     ];
@@ -1033,6 +1421,12 @@ const InputSection = memo(function InputSection({ onSubmit, disabled, onAbort, o
     const ctrlXPending = useRef(false);
     const valueRef = useRef('');
     const [imageChips, setImageChips] = useState([]);
+    // Whether a picker was on screen for the frame the user is currently looking
+    // at. TextInput is unfocused exactly when one is (focus={!pickerActive}), so
+    // this is the single source of truth for who owns the next keystroke. It has
+    // to be a post-render mirror rather than a live read: see the ownership note
+    // in useInput below.
+    const pickerRenderedRef = useRef(false);
     const onChange = useCallback((v) => {
         setValue(v);
         valueRef.current = v;
@@ -1251,11 +1645,20 @@ const InputSection = memo(function InputSection({ onSubmit, disabled, onAbort, o
                 exit();
             return;
         }
-        // ── When command picker is open, handle input manually since TextInput is unfocused ──
-        const pickerOpen = !disabled && val.startsWith('/') && !val.includes(' ');
-        if (pickerOpen) {
+        // ── A picker is on screen, so TextInput is unfocused and this handler owns
+        //    the keystroke. Ownership must be read from what was rendered
+        //    (pickerRenderedRef), never recomputed from valueRef.current: every
+        //    active useInput handler gets the same key in one dispatch, and when
+        //    TextInput is focused its handler runs first and has already written
+        //    the new character into the ref. Deciding from the mutated ref made
+        //    this branch fire on top of TextInput and double every character, so
+        //    "/status" arrived as "/status/status", matched no command, and went
+        //    to the model as chat. The mirror case was just as bad: the old
+        //    condition required a leading "/", so while the @-file picker held
+        //    focus neither side handled typing and the keys were dropped. ──
+        if (pickerRenderedRef.current && !disabled) {
             if (key.upArrow || key.downArrow || key.return)
-                return;
+                return; // SelectInput's
             if (key.backspace || key.delete) {
                 onChange(val.slice(0, -1));
                 return;
@@ -1308,57 +1711,7 @@ const InputSection = memo(function InputSection({ onSubmit, disabled, onAbort, o
         }
     });
     const commands = useMemo(() => [
-        { cmd: '/help', desc: 'Show all commands' },
-        { cmd: '/clear', desc: 'Reset conversation' },
-        { cmd: '/models', desc: 'List active models' },
-        { cmd: '/model', desc: 'Switch model' },
-        { cmd: '/mode', desc: 'Permission mode (plan/default/auto/yolo)' },
-        { cmd: '/thinking', desc: 'Thinking mode (off/low/medium/high)' },
-        { cmd: '/plan', desc: 'Enter plan mode (read-only)' },
-        { cmd: '/compact', desc: 'Compress conversation context' },
-        { cmd: '/context', desc: 'Show context usage & token count' },
-        { cmd: '/cost', desc: 'Show token usage & cost' },
-        { cmd: '/diff', desc: 'Show uncommitted changes' },
-        { cmd: '/copy', desc: 'Copy last response to clipboard' },
-        { cmd: '/save', desc: 'Save current session' },
-        { cmd: '/load', desc: 'Resume a saved session' },
-        { cmd: '/resume', desc: 'Resume from crash recovery or saved session' },
-        { cmd: '/fork', desc: 'Fork conversation from a point in history' },
-        { cmd: '/export', desc: 'Export conversation as text' },
-        { cmd: '/index', desc: 'Scan & index project files' },
-        { cmd: '/init', desc: 'Initialize project config (SCALIX.md)' },
-        { cmd: '/git', desc: 'Show git context' },
-        { cmd: '/memory', desc: 'Show project memory' },
-        { cmd: '/remember', desc: 'Save a note about this project' },
-        { cmd: '/replay', desc: 'Show session timeline' },
-        { cmd: '/plugins', desc: 'Show loaded plugins' },
-        { cmd: '/trust', desc: 'Trust this workspace (load project plugins/hooks/rules)' },
-        { cmd: '/router', desc: 'Show model routing status' },
-        { cmd: '/status', desc: 'Version, model & connection info' },
-        { cmd: '/doctor', desc: 'Diagnose installation' },
-        { cmd: '/mcp', desc: 'Add MCP server' },
-        { cmd: '/cloud', desc: 'Scalix Cloud status, platform tools & refresh' },
-        { cmd: '/login', desc: 'Link your Scalix account (API key)' },
-        { cmd: '/setup', desc: 'Reconfigure API key, URL & models' },
-        { cmd: '/settings', desc: 'View & configure limits' },
-        { cmd: '/permissions', desc: 'View permission rules & recent denials' },
-        { cmd: '/shortcuts', desc: 'Keyboard shortcuts' },
-        { cmd: '/hooks', desc: 'Show lifecycle hooks' },
-        { cmd: '/commands', desc: 'Show custom commands' },
-        { cmd: '/skills', desc: 'List available skills' },
-        { cmd: '/delegate', desc: 'Run task with sub-agent' },
-        { cmd: '/agents', desc: 'Show active agents & usage' },
-        { cmd: '/checkpoint', desc: 'Create git checkpoint' },
-        { cmd: '/undo', desc: 'Undo last checkpoint' },
-        { cmd: '/checkpoints', desc: 'List recent checkpoints' },
-        { cmd: '/commit', desc: 'Auto-generate commit message & commit' },
-        { cmd: '/review', desc: 'AI code review of current changes' },
-        { cmd: '/watch', desc: 'Run command, auto-fix on failure' },
-        { cmd: '/create', desc: 'Scaffold a new project' },
-        { cmd: '/worktree', desc: 'Manage git worktrees for isolated work' },
-        { cmd: '/plugin', desc: 'Install/enable/disable/uninstall plugins' },
-        { cmd: '/notify', desc: 'Test terminal notification' },
-        { cmd: '/exit', desc: 'Save & exit' },
+        ...SLASH_COMMANDS,
         ...customCommands.map((c) => ({ cmd: `/${c.name}`, desc: c.description })),
     ], [customCommands]);
     const prefix = value.split(' ')[0].toLowerCase();
@@ -1384,7 +1737,11 @@ const InputSection = memo(function InputSection({ onSubmit, disabled, onAbort, o
         })
             .slice(0, 10);
     }, [showFilePicker, atQuery]);
-    const pickerActive = (showCommandPicker && filteredCommands.length > 0) || (showFilePicker && filteredFiles.length > 0);
+    const pickerActive = (showCommandPicker && filteredCommands.length > 0) || !!(showFilePicker && filteredFiles.length > 0);
+    // Mirror the rendered picker state for useInput. This runs after commit and
+    // before any keystroke reaches the handler, so it always describes the frame
+    // the user is actually typing against.
+    useEffect(() => { pickerRenderedRef.current = pickerActive; }, [pickerActive]);
     useEffect(() => {
         if (!onHeightChange)
             return;
@@ -1415,7 +1772,15 @@ const InputSection = memo(function InputSection({ onSubmit, disabled, onAbort, o
                             // Replace @query with the selected file path
                             const newValue = value.replace(/@\S*$/, '@' + item.value + ' ');
                             onChange(newValue);
-                        }, limit: 10 }), _jsxs(Text, { dimColor: true, italic: true, children: ['↑↓', " navigate ", '•', " Enter select ", '•', " keep typing to filter"] })] })), searchMode && (_jsxs(Box, { paddingX: 3, children: [_jsxs(Text, { color: "cyan", dimColor: true, children: ['🔍', " reverse-i-search: "] }), _jsx(Text, { color: "cyan", bold: true, children: searchQuery || '' }), _jsx(Text, { dimColor: true, children: " (Enter to select, Esc to cancel)" })] })), imageChips.length > 0 && !disabled && (_jsxs(Box, { paddingX: 3, gap: 1, children: [imageChips.map((_, i) => (_jsxs(Text, { color: "blue", bold: true, children: ["[Image #", i + 1, "]"] }, i))), _jsxs(Text, { dimColor: true, children: ["(", imageChips.length, " pasted)"] })] })), stash.length > 0 && !disabled && !searchMode && (_jsxs(Box, { paddingX: 3, children: [_jsxs(Text, { color: "magenta", dimColor: true, children: ['⚑', " Stashed: ", truncate(stash, 40), " "] }), _jsx(Text, { dimColor: true, children: "(Ctrl+S to restore)" })] })), _jsx(Box, { paddingX: 2, children: _jsxs(Box, { flexGrow: 1, children: [_jsx(Box, { flexShrink: 0, width: 2, children: disabled ? (_jsx(Text, { color: "magentaBright", children: _jsx(Spinner, { type: "dots" }) })) : (_jsx(Text, { color: "magentaBright", bold: true, children: '❯' })) }), _jsx(Box, { flexGrow: 1, children: _jsx(TextInput, { value: value, onChange: onChange, onSubmit: handleSubmit, placeholder: disabled ? 'Queue a message... (sent after current task)' : 'Type a message...', showCursor: true, focus: !pickerActive }) }), disabled && (_jsx(Box, { flexShrink: 0, children: _jsx(Text, { dimColor: true, children: " ^C interrupt" }) }))] }) })] }));
+                        }, limit: 10 }), _jsxs(Text, { dimColor: true, italic: true, children: ['↑↓', " navigate ", '•', " Enter select ", '•', " keep typing to filter"] })] })), searchMode && (_jsxs(Box, { paddingX: 3, children: [_jsxs(Text, { color: "cyan", dimColor: true, children: ['🔍', " reverse-i-search: "] }), _jsx(Text, { color: "cyan", bold: true, children: searchQuery || '' }), _jsx(Text, { dimColor: true, children: " (Enter to select, Esc to cancel)" })] })), imageChips.length > 0 && !disabled && (_jsxs(Box, { paddingX: 3, gap: 1, children: [imageChips.map((_, i) => (_jsxs(Text, { color: "blue", bold: true, children: ["[Image #", i + 1, "]"] }, i))), _jsxs(Text, { dimColor: true, children: ["(", imageChips.length, " pasted)"] })] })), stash.length > 0 && !disabled && !searchMode && (_jsxs(Box, { paddingX: 3, children: [_jsxs(Text, { color: "magenta", dimColor: true, children: ['⚑', " Stashed: ", truncate(stash, 40), " "] }), _jsx(Text, { dimColor: true, children: "(Ctrl+S to restore)" })] })), _jsx(Box, { paddingX: 2, children: _jsxs(Box, { flexGrow: 1, children: [_jsx(Box, { flexShrink: 0, width: 2, children: disabled ? (_jsx(Text, { color: "magentaBright", children: _jsx(Spinner, { type: "dots" }) })) : (_jsx(Text, { color: "magentaBright", bold: true, children: '❯' })) }), _jsx(Box, { flexGrow: 1, children: _jsx(TextInput
+                            // Remount across picker transitions so the caret lands at the end
+                            // of the text. TextInput owns its cursor offset and only re-syncs
+                            // it while focused, but the picker branch above edits the value
+                            // while it is unfocused — so on the way back the caret was left
+                            // wherever the picker opened, and backspace on "see @noz" deleted
+                            // the "@" instead of the "z". Remounting re-derives the offset
+                            // from the current value; nothing else here is stateful.
+                            , { value: value, onChange: onChange, onSubmit: handleSubmit, placeholder: disabled ? 'Queue a message... (sent after current task)' : 'Type a message...', showCursor: true, focus: !pickerActive }, pickerActive ? 'picker' : 'typing') }), disabled && (_jsx(Box, { flexShrink: 0, children: _jsx(Text, { dimColor: true, children: " ^C interrupt" }) }))] }) })] }));
 });
 // ─── App ───
 function estimateLines(item, cols) {
@@ -1479,8 +1844,12 @@ function useScrollableItems(items, availableHeight, cols, isLoading, streamLineC
         setScrollOffset(0);
         autoScroll.current = true;
     }, []);
-    const reservedForStream = isLoading ? Math.max(4, Math.min(streamLineCount + 3, Math.floor(availableHeight * 0.5))) : 0;
-    const effectiveHeight = Math.max(availableHeight - reservedForStream, 4);
+    // The reservation can't exceed what there is to reserve from, or a short
+    // terminal ends up selecting items for a negative-height window and falling
+    // back on the floor, which puts more rows in the tree than the terminal has.
+    const wanted = Math.max(4, Math.min(streamLineCount + 3, Math.floor(availableHeight * 0.5)));
+    const reservedForStream = isLoading ? Math.min(wanted, Math.max(availableHeight - 1, 0)) : 0;
+    const effectiveHeight = Math.max(availableHeight - reservedForStream, 1);
     const visibleItems = [];
     let usedLines = 0;
     const endIdx = items.length - scrollOffset;
@@ -1504,6 +1873,9 @@ function App({ config }) {
     const [streamText, setStreamText] = useState('');
     const [reasoningText, setReasoningText] = useState('');
     const [selectingModel, setSelectingModel] = useState(false);
+    /** BYOK catalog fetched when the /model picker opens (ids + context windows). */
+    const [pickerCatalog, setPickerCatalog] = useState([]);
+    const [pickerWindows, setPickerWindows] = useState({});
     const [confirmInfo, setConfirmInfo] = useState(null);
     const [thinkStart, setThinkStart] = useState(null);
     const [showBanner, setShowBanner] = useState(true);
@@ -1537,21 +1909,30 @@ function App({ config }) {
     const collapseToolGroups = useCallback(() => {
         setItems(prev => {
             const isToolItem = (k) => k === 'tool-call' || k === 'tool-result';
-            let i = prev.length - 1;
-            while (i >= 0 && isToolItem(prev[i].kind))
-                i--;
-            const toolStart = i + 1;
-            const toolItems = prev.slice(toolStart);
-            if (toolItems.length < TOOL_GROUP_THRESHOLD)
+            let start = prev.length;
+            while (start > 0 && isToolItem(prev[start - 1].kind))
+                start--;
+            // Tool results land on the step after their calls, and this runs once per
+            // step — so one turn of three tools built two separate "Ran N tools" rows,
+            // the first holding the calls and the second the results. Absorb the group
+            // from the previous step instead of stacking another one beside it, and
+            // carry its collapsed flag over so Ctrl+O doesn't undo itself.
+            const absorb = start > 0 && prev[start - 1].kind === 'tool-group';
+            if (absorb && start === prev.length)
+                return prev; // nothing new to fold in
+            const previous = absorb ? prev[start - 1] : null;
+            const toolItems = [...(previous?.children ?? []), ...prev.slice(start)];
+            const calls = toolItems.filter((t) => t.kind === 'tool-call').length;
+            if ((calls || toolItems.length) < TOOL_GROUP_THRESHOLD)
                 return prev;
             const group = {
-                id: nextId(),
+                id: previous?.id ?? nextId(),
                 kind: 'tool-group',
-                text: `Ran ${Math.ceil(toolItems.length / 2)} tools`,
+                text: `Ran ${calls} tools`,
                 children: toolItems,
-                collapsed: true,
+                collapsed: previous?.collapsed ?? true,
             };
-            return [...prev.slice(0, toolStart), group];
+            return [...prev.slice(0, absorb ? start - 1 : start), group];
         });
     }, []);
     const toggleToolGroups = useCallback(() => {
@@ -1664,12 +2045,10 @@ function App({ config }) {
                 add('tool-result', summary, name);
                 return;
             }
-            let text = typeof result === 'string' ? result : JSON.stringify(result);
+            let text = summarizeToolResult(result);
             const MAX_DISPLAY = 2000;
-            if (text.length > MAX_DISPLAY) {
-                const truncated = text.length - MAX_DISPLAY;
-                text = text.slice(0, MAX_DISPLAY) + `\n... (${truncated.toLocaleString()} chars hidden)`;
-            }
+            if (text.length > MAX_DISPLAY)
+                text = text.slice(0, MAX_DISPLAY) + '…';
             add('tool-result', text, name);
         };
         const onToolBlocked = (name, reason) => {
@@ -1710,6 +2089,18 @@ function App({ config }) {
             }
             add('error', msg, undefined, hint);
         };
+        const onRetry = (info) => {
+            // Not every retry is a failed request — an empty assistant turn is
+            // re-asked immediately with no status and no backoff, and labelling
+            // that "Request failed — retrying in 0ms" is wrong twice over.
+            const what = info.status === 429 ? 'Rate limited'
+                : info.status ? `Request failed (${info.status})`
+                    : info.reason ? truncate(info.reason.split('\n')[0], 80)
+                        : 'Request failed';
+            const secs = info.delayMs >= 1000 ? `${Math.round(info.delayMs / 1000)}s` : `${info.delayMs}ms`;
+            const when = info.delayMs > 0 ? ` in ${secs}` : '';
+            add('system', `${what} — retrying${when} (attempt ${info.attempt}/${info.maxAttempts})`);
+        };
         const onContextCompress = (info) => {
             add('system', `Context compressed: ${formatTokens(info.saved)} tokens saved (${formatTokens(info.before)} \u2192 ${formatTokens(info.after)})`);
         };
@@ -1735,6 +2126,7 @@ function App({ config }) {
         agent.on('verify:pass', onVerifyPass);
         agent.on('verify:fail', onVerifyFail);
         agent.on('file:modified', onFileModified);
+        agent.on('retry', onRetry);
         agent.on('context:compress', onContextCompress);
         agent.on('context:usage', onContextUsage);
         const currentAgent = agent;
@@ -1758,6 +2150,7 @@ function App({ config }) {
             currentAgent.off('verify:pass', onVerifyPass);
             currentAgent.off('verify:fail', onVerifyFail);
             currentAgent.off('file:modified', onFileModified);
+            currentAgent.off('retry', onRetry);
             currentAgent.off('context:compress', onContextCompress);
             currentAgent.off('context:usage', onContextUsage);
         };
@@ -1782,7 +2175,6 @@ function App({ config }) {
     useEffect(() => {
         if (!agent)
             return;
-        const hasKey = !!agent.getApiKey();
         let cancelled = false;
         connectCloud(agent).then((state) => {
             if (cancelled)
@@ -1798,12 +2190,24 @@ function App({ config }) {
                     add('system', `Try:\n${CLOUD_TRY_PROMPTS.map((p) => `  ❯ ${p}`).join('\n')}`);
                 }
             }
-            else if (hasKey) {
-                add('system', `☁ Scalix Cloud unavailable — running with local tools only. ${state.error ?? ''}`.trimEnd());
+            else if (state.reason === 'failed') {
+                // Only when we actually tried and were refused. `hasKey` used to gate
+                // this, which fired on BYOK too (the provider key counts as a key) and
+                // announced a Scalix Cloud outage to a session that never dialled it.
+                add('system', cloudStatusLine(state));
             }
         });
         return () => { cancelled = true; };
     }, [add, agentVersion]);
+    // A key the keychain refused is now sitting in config.json as plaintext.
+    // saveConfig() prefers that over losing the key, but the user gets told —
+    // a secret landing in a readable file is not a detail to swallow.
+    useEffect(() => {
+        if (!plaintextKeyPending)
+            return;
+        plaintextKeyPending = false;
+        add('system', `⚠ Your API key could not be stored in the OS keychain — it was written to ~/${USER_CONFIG_DIR}/config.json instead (file mode 600, but plaintext). Re-run /setup once the keychain is reachable to move it.`);
+    }, [add]);
     // Idle session nudge: suggest /clear after 75+ minutes of inactivity
     const lastActivityRef = useRef(Date.now());
     const idleNudgedRef = useRef(false);
@@ -1877,71 +2281,7 @@ function App({ config }) {
     const handleCommand = useCallback((text) => {
         const cmd = text.split(' ')[0].toLowerCase();
         if (cmd === '/help') {
-            const helpLines = [
-                'Session & Navigation:',
-                '  /help         \u2014 show commands',
-                '  /shortcuts    \u2014 keyboard shortcuts',
-                '  /clear        \u2014 reset conversation',
-                '  /save [name]  \u2014 save current session',
-                '  /load         \u2014 resume a saved session',
-                '  /export [f]   \u2014 export conversation as text',
-                '  /exit         \u2014 save & exit',
-                '',
-                'Model & Mode:',
-                '  /models       \u2014 list active models',
-                '  /model        \u2014 switch model',
-                '  /mode [m]     \u2014 permission mode (plan/default/auto/yolo)',
-                '  /thinking [m] \u2014 thinking mode (off/low/medium/high)',
-                '  /plan         \u2014 enter plan mode (read-only)',
-                '',
-                'Context & Cost:',
-                '  /compact      \u2014 compress conversation context',
-                '  /context      \u2014 show context usage & token count',
-                '  /cost         \u2014 show token usage & cost',
-                '',
-                'Code & Git:',
-                '  /diff         \u2014 show uncommitted changes',
-                '  /commit       \u2014 auto-generate commit message & commit',
-                '  /review       \u2014 AI code review of current changes',
-                '  /checkpoint   \u2014 create git checkpoint',
-                '  /undo         \u2014 undo last checkpoint',
-                '  /checkpoints  \u2014 list recent checkpoints',
-                '  /worktree     \u2014 manage git worktrees (list/create/remove/cleanup)',
-                '  /git          \u2014 show git context',
-                '',
-                'Project:',
-                '  /init         \u2014 initialize project config (SCALIX.md)',
-                '  /index        \u2014 scan & index project files',
-                '  /memory       \u2014 show project memory',
-                '  /remember <n> \u2014 save a note about this project',
-                '  /watch <cmd>  \u2014 run command, auto-fix on failure',
-                '  /create <d>   \u2014 scaffold a new project',
-                '  /delegate <t> \u2014 run task with sub-agent',
-                '  /agents       \u2014 show active agents & usage',
-                '',
-                'Tools & Config:',
-                '  /copy         \u2014 copy last response to clipboard',
-                '  /cloud        \u2014 Scalix Cloud status (/cloud tools, /cloud refresh)',
-                '  /login        \u2014 link your Scalix account (API key)',
-                '  /status       \u2014 show version, model & connection info',
-                '  /update       \u2014 check for and install updates',
-                '  /doctor       \u2014 diagnose installation',
-                '  /settings     \u2014 view & configure limits',
-                '  /setup        \u2014 reconfigure API key, URL & models',
-                '  /mcp <l> <u>  \u2014 add MCP server',
-                '  /plugins      \u2014 show loaded plugins',
-                '  /plugin       \u2014 install/enable/disable/uninstall plugins',
-                '  /trust        \u2014 trust workspace (load project plugins/hooks/rules)',
-                '  /notify       \u2014 test terminal notification',
-                '  /router       \u2014 show model routing status',
-                '  /replay       \u2014 show session timeline',
-                '  /hooks        \u2014 show lifecycle hooks',
-                '  /commands     \u2014 show custom commands',
-                '',
-                'Input modes:',
-                '  !<cmd>        \u2014 run shell command (e.g. !ls -la)',
-                '  text\\         \u2014 multiline input (end with \\ to continue)',
-            ];
+            const helpLines = [...HELP_LINES];
             if (customCommands.length > 0) {
                 helpLines.push('', 'Custom commands:');
                 for (const c of customCommands)
@@ -1982,6 +2322,18 @@ function App({ config }) {
         }
         if (cmd === '/model') {
             setSelectingModel(true);
+            // BYOK: the picker used to show only the already-configured list — no
+            // way to discover what the endpoint actually serves. Fetch its catalog
+            // in the background; the picker grows when (if) the list lands.
+            if (activeAgentConfig && resolveActiveProvider(activeAgentConfig).provider === 'openai') {
+                const activeNow = resolveActiveProvider(activeAgentConfig);
+                fetchByokModels(activeNow.baseUrl, activeNow.apiKey).then((found) => {
+                    if (found.length === 0)
+                        return;
+                    setPickerCatalog(found.map((f) => f.id));
+                    setPickerWindows(Object.fromEntries(found.filter((f) => f.contextWindow && f.contextWindow > 0).map((f) => [f.id, f.contextWindow])));
+                }).catch(() => { });
+            }
             return true;
         }
         if (cmd === '/compact') {
@@ -2004,7 +2356,7 @@ function App({ config }) {
             return true;
         }
         if (cmd === '/cost') {
-            add('system', costTracker.summary());
+            add('system', costTracker.summary(resolveActiveProvider(config).provider));
             return true;
         }
         if (cmd === '/save') {
@@ -2168,12 +2520,17 @@ function App({ config }) {
                     else {
                         add('system', `Identity unavailable: ${s.error ?? 'unknown error'}`);
                     }
-                    add('system', `Platform tools: ${s.toolCount} registered ${'—'} /cloud tools to list them`);
+                    const ofTotal = s.totalCount && s.totalCount > s.toolCount ? ` of ${s.totalCount} in the catalog (this key's scopes unlock ${s.toolCount})` : '';
+                    add('system', `Platform tools: ${s.toolCount} registered${ofTotal} ${'—'} /cloud tools to list them`);
+                    if (s.note)
+                        add('system', s.note);
+                    const cloudActiveModel = agent.getModels()[0];
+                    if (cloudActiveModel && !hasExplicitModelSpec(cloudActiveModel)) {
+                        add('system', `Model spec: assumed (${formatTokens(getModelContextWindow(cloudActiveModel))} context) ${'—'} the API did not report one for ${shortModel(cloudActiveModel)}. Set the real value in /setup's context-window step.`);
+                    }
                 }
                 else {
-                    add('system', `☁ not connected ${'—'} /login to link your Scalix account`);
-                    if (s.error)
-                        add('system', `Last error: ${s.error}`);
+                    add('system', cloudStatusLine(s));
                 }
                 return true;
             }
@@ -2182,7 +2539,7 @@ function App({ config }) {
                 if (tools.length === 0) {
                     add('system', cloudConnection.connected
                         ? 'No platform tools are registered for this key (its scopes unlock none).'
-                        : `☁ not connected ${'—'} /login to link your Scalix account`);
+                        : cloudStatusLine(cloudConnection));
                     return true;
                 }
                 add('system', `Platform tools (${tools.length}):`);
@@ -2200,7 +2557,7 @@ function App({ config }) {
                         add('system', `☁ Connected ${'—'} ${plan}${state.toolCount} platform tools`);
                     }
                     else {
-                        add('error', `☁ Scalix Cloud unavailable: ${state.error ?? 'unknown error'}`);
+                        add('error', cloudStatusLine(state));
                     }
                 });
                 return true;
@@ -2213,9 +2570,9 @@ function App({ config }) {
             if (arg && PERMISSION_MODES.includes(arg)) {
                 agent.setPermissionMode(arg);
                 setCurrentMode(arg);
-                loadConfig().then(cfg => {
+                loadGlobalConfig().then(cfg => {
                     cfg.permissionMode = arg;
-                    saveConfig(cfg);
+                    return saveConfig(cfg);
                 }).catch((err) => { logger.warn('Failed to save config', { error: err.message }); });
                 add('system', `Mode: ${arg.toUpperCase()} \u2014 ${getModeDescription(arg)}`);
             }
@@ -2228,9 +2585,9 @@ function App({ config }) {
             const arg = text.split(' ')[1]?.toLowerCase();
             if (arg && THINKING_MODES.includes(arg)) {
                 agent.setThinking(arg);
-                loadConfig().then(cfg => {
+                loadGlobalConfig().then(cfg => {
                     cfg.thinkingMode = arg;
-                    saveConfig(cfg);
+                    return saveConfig(cfg);
                 }).catch((err) => { logger.warn('Failed to save config', { error: err.message }); });
                 add('system', `Thinking: ${arg.toUpperCase()}${arg === 'off' ? '' : ' \u2014 model will reason before responding'}`);
             }
@@ -2805,13 +3162,25 @@ function App({ config }) {
             const ctx = agent.getContextUsage();
             const msgCount = agent.getMessages().length;
             add('system', `${PRODUCT_NAME} v${VERSION}`);
-            add('system', `Model: ${modelsStr}`);
+            const activeProv = resolveActiveProvider(config);
+            add('system', `Provider: ${activeProv.provider === 'openai' ? 'OpenAI-compatible (BYOK)' : 'Scalix Cloud'}`);
+            add('system', `Model: ${modelsStr}${process.env[ENV_MODEL] ? ' (set by SCALIX_MODEL env — overrides saved config)' : ''}`);
             add('system', `API: ${baseUrl}`);
-            add('system', cloudConnection.connected
-                ? `Cloud: ☁ Scalix Cloud ${'·'} ${cloudConnection.identity ? `${cloudConnection.identity.limits.plan} ${'·'} ` : ''}${cloudConnection.toolCount} platform tools`
-                : `Cloud: ☁ not connected ${'—'} /login to link your Scalix account`);
+            if (activeProv.provider === 'scalix') {
+                add('system', `Cloud: ${cloudStatusLine(cloudConnection)}`);
+            }
+            else {
+                add('system', `Cloud: platform tools are Scalix-only ${'—'} /setup to switch provider`);
+            }
             add('system', `Mode: ${mode}`);
             add('system', `Context: ${ctx.percentage}% (${formatTokens(ctx.tokens)} / ${formatTokens(ctx.maxTokens)})`);
+            // Honesty over silence: when neither the user nor the API supplied a
+            // spec for the active model, the context window above is our guess, and
+            // saying so beats letting it read as a reported fact.
+            const activeModel = agent.getModels()[0];
+            if (activeModel && !hasExplicitModelSpec(activeModel)) {
+                add('system', `Model spec: assumed (${formatTokens(getModelContextWindow(activeModel))} context) ${'—'} the API did not report one for ${shortModel(activeModel)}. Set the real value in /setup's context-window step or via customModels in ~/${USER_CONFIG_DIR}/config.json.`);
+            }
             add('system', `Messages: ${msgCount}`);
             add('system', `Session: ${sessionId}`);
             add('system', `CWD: ${process.cwd()}`);
@@ -2899,9 +3268,9 @@ function App({ config }) {
         if (cmd === '/plan') {
             agent.setPermissionMode('plan');
             setCurrentMode('plan');
-            loadConfig().then(cfg => {
+            loadGlobalConfig().then(cfg => {
                 cfg.permissionMode = 'plan';
-                saveConfig(cfg);
+                return saveConfig(cfg);
             }).catch((err) => { logger.warn('Failed to save config', { error: err.message }); });
             add('system', `Mode: PLAN — ${getModeDescription('plan')}`);
             return true;
@@ -3037,13 +3406,24 @@ function App({ config }) {
         setStatus('thinking');
         setThinkStart(Date.now());
         try {
-            const result = await agent.send(finalText, images);
-            if (!result || !result.trim()) {
-                add('system', 'Agent returned no response.');
+            const result = (await agent.send(finalText, images))?.trim() ?? '';
+            // send() answers with a sentinel rather than throwing when the model
+            // gives back nothing at all — five empty turns in a row come back as
+            // '[no response]', which is non-empty and so slipped past the old
+            // check. Nothing else renders it either, so the whole turn was silence:
+            // the prompt echoed and then no output, indistinguishable from a hang.
+            // '[interrupted]' is deliberately excluded — the Ctrl+C path already
+            // prints its own note and would otherwise double up.
+            if (!result || result === '[no response]') {
+                add('system', 'The model returned an empty response. Try rephrasing, or switch models with /model.');
             }
         }
         catch (e) {
-            add('error', e.message || 'Unknown error');
+            // agent.send() emits 'error' before it rethrows, and onError renders that
+            // with the model name and a recovery hint. Printing here as well gave
+            // every failed turn two entries, the second one strictly worse.
+            if (!e?.[REPORTED_ERROR])
+                add('error', e.message || 'Unknown error');
         }
     }, [add, handleCommand]);
     const handleSubmit = useCallback(async (text) => {
@@ -3053,8 +3433,11 @@ function App({ config }) {
         // Reset idle nudge on any user activity
         lastActivityRef.current = Date.now();
         idleNudgedRef.current = false;
-        // Allow /mode even while the agent is working
-        if (isLoadingRef.current && trimmed.startsWith('/mode')) {
+        // Allow /mode even while the agent is working. Exact match only —
+        // startsWith('/mode') also matched /model and /models, letting the model
+        // picker run (and switch the LIVE response's model) mid-stream while the
+        // queue guard below thought it was protecting them.
+        if (isLoadingRef.current && (trimmed === '/mode' || trimmed.startsWith('/mode '))) {
             handleCommand(trimmed);
             return;
         }
@@ -3120,8 +3503,13 @@ function App({ config }) {
         loadSession(session.id).then((data) => {
             agent.loadMessages(data.messages);
             sessionId = session.id;
-            setModels([session.model]);
-            agent.setModel(session.model);
+            const resumeModel = normalizeModelId(session.model);
+            agent.setModel(resumeModel);
+            setModels(agent.getModels());
+            // The session may have been recorded under another provider/spec —
+            // without this a BYOK resume reactivates a spec-less model (no
+            // max_tokens sent → gateways 400 every request).
+            ensureByokSpec(activeAgentConfig, resumeModel);
             if (data.costState) {
                 costTracker.restore(data.costState);
                 setTotalTokens(data.costState.totalTokens);
@@ -3198,7 +3586,7 @@ function App({ config }) {
     }, [add]);
     const [inputSectionHeight, setInputSectionHeight] = useState(3);
     const handleInputHeightChange = useCallback((h) => setInputSectionHeight(h), []);
-    const bannerHeight = showBanner ? 5 : 0;
+    const bannerHeight = showBanner && bannerFits(cols, rows) ? 5 : 0;
     const statusBarHeight = 1;
     const bottomHeight = useMemo(() => {
         if (confirmInfo) {
@@ -3211,7 +3599,12 @@ function App({ config }) {
             }
             const extraCount = Math.min(Object.keys(parsed).filter(k => !['command', 'filePath', 'file_path', 'notebook_path', 'message', 'content', 'oldString', 'newString', 'old_string', 'new_string'].includes(k)).length, 3);
             const hasHighlight = !!(parsed.command ?? parsed.filePath ?? parsed.file_path ?? parsed.notebook_path ?? parsed.message);
-            return 5 + (hasHighlight ? 1 : 0) + extraCount;
+            // 6 fixed rows: top border, title, Tool:, divider, key hints, bottom
+            // border. This said 5, so with the dialog up the tree was always one row
+            // taller than the budget — invisible on a big terminal, but at 12 rows it
+            // pushed the closing border off the screen and left the status bar with
+            // the scroll hint overdrawn on top of it.
+            return 6 + (hasHighlight ? 1 : 0) + extraCount;
         }
         if (selectingModel)
             return 6 + Math.min(models.length + 2, 12);
@@ -3224,7 +3617,13 @@ function App({ config }) {
         return inputSectionHeight;
     }, [confirmInfo, selectingModel, selectingMode, editingSettings, sessionList, models.length, rows, inputSectionHeight]);
     const chromeHeight = bannerHeight + statusBarHeight + bottomHeight;
-    const chatHeight = Math.max(rows - chromeHeight, 6);
+    // Floor at 1, not 6. On a short terminal the floor is exactly what breaks the
+    // frame: at 12 rows with the permission dialog open the chrome needs 7, and a
+    // 6-row floor made the tree 13 rows tall inside a 12-row terminal. Ink drives
+    // redraws with cursor-up sequences counted against its own frame height, so
+    // once the frame is taller than the terminal the erase desyncs — the dialog's
+    // closing border scrolled away and the banner got overdrawn by the status bar.
+    const chatHeight = Math.max(rows - chromeHeight, 1);
     const streamLineCount = useMemo(() => {
         if (!isLoading)
             return 0;
@@ -3244,26 +3643,36 @@ function App({ config }) {
     if (showSetup) {
         return _jsx(SetupScreen, { onComplete: handleSetupDone, existingConfig: config });
     }
-    return (_jsxs(Box, { flexDirection: "column", width: "100%", height: rows, children: [showBanner && _jsx(Banner, {}), _jsx(StatusBar, { status: status, model: models[0] || 'no model', toolCount: allTools.length + pluginTools.length + cloudInfo.toolCount, thinkStart: thinkStart, tokens: totalTokens, mode: currentMode, contextPercent: contextPercent, rateLimitWarn: rateLimitWarn }), _jsxs(Box, { flexDirection: "column", flexGrow: 1, flexShrink: 1, minHeight: 6, overflowY: "hidden", children: [showBanner && !isLoading && _jsx(WelcomeScreen, { cloud: cloudInfo }), !isAtTop && !showBanner && (_jsx(Box, { justifyContent: "center", children: _jsxs(Text, { dimColor: true, children: [" ", '\u2191', " more above ", '\u2014', " Shift+Up "] }) })), visibleItems.map((item) => _jsx(RenderItem, { item: item }, item.id)), isLoading && _jsx(StreamingArea, { text: streamText, reasoning: reasoningText, model: shortModel(models[0] || '') }), !isAtBottom && (_jsx(Box, { justifyContent: "center", children: _jsxs(Text, { dimColor: true, children: [" ", '\u2193', " more below ", '\u2014', " Shift+Down "] }) }))] }), _jsx(Box, { flexShrink: 0, flexDirection: "column", children: confirmInfo ? (_jsx(ConfirmPrompt, { toolName: confirmInfo.toolName, args: confirmInfo.args, onRespond: handleConfirm, onScrollUp: scrollUp, onScrollDown: scrollDown })) : selectingModel ? (_jsx(ModelPicker, { currentModels: models, onSelect: (v) => {
+    return (_jsxs(Box, { flexDirection: "column", width: "100%", height: rows, children: [showBanner && _jsx(Banner, {}), _jsx(StatusBar, { status: status, model: models[0] || 'no model', toolCount: allTools.length + pluginTools.length + cloudInfo.toolCount, thinkStart: thinkStart, tokens: totalTokens, mode: currentMode, contextPercent: contextPercent, rateLimitWarn: rateLimitWarn }), _jsxs(Box, { flexDirection: "column", flexGrow: 1, flexShrink: 1, minHeight: Math.min(6, chatHeight), overflowY: "hidden", children: [showBanner && !isLoading && _jsx(WelcomeScreen, { cloud: cloudInfo }), !isAtTop && !showBanner && (_jsx(Box, { justifyContent: "center", children: _jsxs(Text, { dimColor: true, children: [" ", '\u2191', " more above ", '\u2014', " Shift+Up "] }) })), visibleItems.map((item) => _jsx(RenderItem, { item: item }, item.id)), isLoading && _jsx(StreamingArea, { text: streamText, reasoning: reasoningText, model: shortModel(models[0] || ''), waiting: !!confirmInfo }), !isAtBottom && (_jsx(Box, { justifyContent: "center", children: _jsxs(Text, { dimColor: true, children: [" ", '\u2193', " more below ", '\u2014', " Shift+Down "] }) }))] }), _jsx(Box, { flexShrink: 0, flexDirection: "column", children: confirmInfo ? (_jsx(ConfirmPrompt, { toolName: confirmInfo.toolName, args: confirmInfo.args, onRespond: handleConfirm, onScrollUp: scrollUp, onScrollDown: scrollDown })) : selectingModel ? (_jsx(ModelPicker, { currentModels: models, availableModels: pickerCatalog, onSelect: (picked) => {
+                        const v = normalizeModelId(picked);
                         agent.setModel(v);
-                        setModels([v]);
+                        // Keep the whole failover chain visible, not just the pick —
+                        // setModel moves the model to the front and preserves the rest.
+                        setModels(agent.getModels());
                         setSelectingModel(false);
-                        loadConfig().then(cfg => {
-                            cfg.models = [v];
-                            saveConfig(cfg);
+                        ensureByokSpec(activeAgentConfig, v, pickerWindows[v]);
+                        // Global config only (loadConfig() merges project-local overrides
+                        // and round-tripping them through saveConfig laundered them into
+                        // ~/.scalix-coder). Chain-preserving, and the saveConfig promise
+                        // is returned so its failure actually hits the catch.
+                        loadGlobalConfig().then(cfg => {
+                            cfg.models = [v, ...cfg.models.filter(m => m !== v)];
+                            return saveConfig(cfg);
                         }).catch((err) => { logger.warn('Failed to save config', { error: err.message }); });
-                        add('system', `Model switched to ${shortModel(v)}`);
+                        add('system', `Model switched to ${shortModel(v)}${process.env[ENV_MODEL] ? ' — note: SCALIX_MODEL is set and overrides this on next launch' : ''}`);
                     }, onCancel: () => setSelectingModel(false) })) : selectingMode ? (_jsx(ModePicker, { currentMode: currentMode, onSelect: (mode) => {
                         agent.setPermissionMode(mode);
                         setCurrentMode(mode);
                         setSelectingMode(false);
-                        loadConfig().then(cfg => {
+                        loadGlobalConfig().then(cfg => {
                             cfg.permissionMode = mode;
-                            saveConfig(cfg);
+                            return saveConfig(cfg);
                         }).catch((err) => { logger.warn('Failed to save config', { error: err.message }); });
                         add('system', `Mode: ${mode.toUpperCase()} \u2014 ${getModeDescription(mode)}`);
                     }, onCancel: () => setSelectingMode(false) })) : editingSettings ? (_jsx(SettingsEditor, { onSave: (key, value) => {
-                        loadConfig().then((c) => {
+                        // Global config only — round-tripping the override-merged view
+                        // laundered project-local settings into ~/.scalix-coder.
+                        loadGlobalConfig().then((c) => {
                             const limits = { ...(c.limits || DEFAULT_LIMITS) };
                             const floatKeys = new Set([
                                 'compressionThreshold', 'messageKeepRatio', 'subAgentCompressionThreshold',
@@ -3274,8 +3683,13 @@ function App({ config }) {
                                 limits[key] = parsed;
                                 const newConfig = { ...c, limits };
                                 saveConfig(newConfig).then(() => {
-                                    agent?.updateLimit(key, parsed);
-                                    add('system', `Setting updated: ${key} = ${parsed}`);
+                                    // updateLimit says whether the RUNNING agent honors the new
+                                    // value — claiming "updated" for keys that only apply on
+                                    // the next launch was a lie the user had no way to detect.
+                                    const live = agent?.updateLimit(key, parsed) ?? false;
+                                    add('system', live
+                                        ? `Setting updated: ${key} = ${parsed}`
+                                        : `Setting saved: ${key} = ${parsed} — takes effect on the next launch`);
                                 }).catch(() => {
                                     add('error', `Failed to save setting: ${key}`);
                                 });
@@ -3300,8 +3714,13 @@ function Root() {
                 c.apiKey = envKey;
             setConfig(c);
             if (isConfigured(c)) {
-                // Fetch model specs from API in background (uses user-defined/built-in as fallback)
-                fetchModelSpecs(c.baseUrl, c.apiKey).catch((err) => { logger.warn('Failed to fetch model specs', { error: err.message }); });
+                // Fetch model specs from API in background (uses user-defined/built-in
+                // as fallback). Scalix-shaped endpoint only — BYOK models are entered
+                // manually with their own specs.
+                const activeStart = resolveActiveProvider(c);
+                if (activeStart.provider === 'scalix') {
+                    fetchModelSpecs(activeStart.baseUrl, activeStart.apiKey).catch((err) => { logger.warn('Failed to fetch model specs', { error: err.message }); });
+                }
                 if (!process.env.NO_UPDATE_NOTIFIER && !c.disableUpdateCheck) {
                     checkForUpdate().catch(() => { });
                 }