hoomanjs 1.43.1 → 1.45.0

package/dist/configure/app.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { z } from "zod";
 import { Box, Text, useApp, useInput } from "ink";
 import { LlmProvider, } from "../core/config.js";
 import { McpOAuthConfigSchema } from "../core/mcp/oauth/types.js";
@@ -58,7 +59,7 @@ const MCP_REMOTE_BASE_FIELDS = [
     },
     {
         key: "oauthEnabled",
-        label: "Enable OAuth? (yes/no)",
+        label: "Enable OAuth",
         placeholder: "no",
         note: "Choose yes for servers that use OAuth 2.0/2.1 or dynamic client registration.",
     },
@@ -270,7 +271,7 @@ const PROVIDER_FIELD_DEFINITIONS = {
             label: "Deployment-based URLs",
             kind: "optionalBoolean",
             placeholder: "false",
-            note: "Allowed: yes/no/true/false. Leave blank to use the AI SDK default.",
+            note: "Toggle between yes and no. Leave unset to use the AI SDK default.",
         },
         {
             key: "reasoningEffort",
@@ -739,6 +740,26 @@ function formatPromptCacheSummary(value) {
 }
 /** On/off display for tool rows (`Tool • Yes` / `Tool • No`). */
 const yesNo = (on) => (on ? "Yes" : "No");
+function formatMcpScope(scope) {
+    return scope === "global" ? "global" : "project";
+}
+function formatMcpWriteTargetLabel(path) {
+    return truncate(path, 72);
+}
+function formatMcpDeleteDescription(name, sourcePath, scope) {
+    return `Remove "${name}" from ${formatMcpScope(scope)} mcp.json (${truncate(sourcePath, 64)})? This cannot be undone from here.`;
+}
+function formatConfigureError(error) {
+    if (error instanceof z.ZodError) {
+        const issue = error.issues[0];
+        if (!issue) {
+            return "Invalid value.";
+        }
+        const path = issue.path.map(String).join(".");
+        return path ? `${path}: ${issue.message}` : issue.message;
+    }
+    return error instanceof Error ? error.message : String(error);
+}
 export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, }) {
     const { exit } = useApp();
     const [screen, setScreen] = useState({ kind: "home" });
@@ -747,27 +768,33 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
     const [busyMessage, setBusyMessage] = useState(null);
     const [revision, setRevision] = useState(0);
     const [mcpDraft, setMcpDraft] = useState(null);
+    const [providerDraft, setProviderDraft] = useState(null);
+    const [providerDraftType, setProviderDraftType] = useState(null);
+    const [llmDraft, setLlmDraft] = useState(null);
     const [installedSkills, setInstalledSkills] = useState([]);
     const [searchResults, setSearchResults] = useState([]);
     const [mcpAuthStatuses, setMcpAuthStatuses] = useState({});
     const refresh = useCallback(() => {
         setRevision((value) => value + 1);
     }, []);
+    const handleActionError = useCallback((error) => {
+        setNotice({
+            kind: "error",
+            text: formatConfigureError(error),
+        });
+    }, []);
     const runTask = useCallback(async (label, task) => {
         setBusyMessage(label);
         try {
             await task();
         }
         catch (error) {
-            setNotice({
-                kind: "error",
-                text: error instanceof Error ? error.message : String(error),
-            });
+            handleActionError(error);
         }
         finally {
             setBusyMessage(null);
         }
-    }, []);
+    }, [handleActionError]);
     const refreshSkills = useCallback(async (label = "Loading installed skills...") => {
         await runTask(label, async () => {
             const next = await skills.list();
@@ -808,7 +835,7 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
         compaction: config.compaction,
         reasoning: config.reasoning,
     }), [config, revision]);
-    const mcpServers = useMemo(() => mcpConfig.list(), [mcpConfig, revision]);
+    const mcpServers = useMemo(() => mcpConfig.listWithSources(), [mcpConfig, revision]);
     useInput((input, key) => {
         if (key.ctrl && input.toLowerCase() === "c") {
             onExit();
@@ -829,7 +856,27 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
             setScreen({ kind: "mcp" });
             return;
         }
-        if (screen.kind === "mcp-delete-confirm") {
+        if (screen.kind === "config-provider-create") {
+            setProviderDraft(null);
+            setProviderDraftType(null);
+            setScreen({ kind: "config-providers" });
+            return;
+        }
+        if (screen.kind === "config-provider-create-type") {
+            setScreen({ kind: "config-provider-create" });
+            return;
+        }
+        if (screen.kind === "config-llm-create") {
+            setLlmDraft(null);
+            setScreen({ kind: "config-llms" });
+            return;
+        }
+        if (screen.kind === "config-llm-create-provider") {
+            setScreen({ kind: "config-llm-create" });
+            return;
+        }
+        if (screen.kind === "mcp-delete-confirm" ||
+            screen.kind === "mcp-save-target") {
             setScreen({ kind: "mcp" });
             return;
         }
@@ -857,6 +904,10 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
             setScreen({ kind: "config-providers" });
             return;
         }
+        if (screen.kind === "config-providers" || screen.kind === "config-llms") {
+            setScreen({ kind: "config" });
+            return;
+        }
         if (screen.kind !== "home") {
             setScreen({ kind: "home" });
             return;
@@ -905,22 +956,8 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
         : m), [config]);
     const renameLlm = useCallback((oldName, newName) => config.llms.map((m) => m.name === oldName ? { ...m, name: newName } : m), [config]);
     const setDefaultLlm = useCallback((name) => config.llms.map((m) => ({ ...m, default: m.name === name })), [config]);
-    const addLlm = useCallback((name) => {
-        const providerName = config.providers[0]?.name ?? "llama.cpp";
-        const providerType = config.providers.find((provider) => provider.name === providerName)
-            ?.provider ?? LlmProvider.LlamaCpp;
-        return [
-            ...config.llms,
-            {
-                name,
-                provider: providerName,
-                options: {
-                    model: defaultModelForProviderType(providerType),
-                },
-                default: false,
-            },
-        ];
-    }, [config]);
+    const addLlmEntry = useCallback((entry) => [...config.llms, entry], [config]);
+    const addProviderEntry = useCallback((entry) => [...config.providers, entry], [config]);
     const removeLlm = useCallback((name) => config.llms.filter((m) => m.name !== name), [config]);
     const patchProvider = useCallback((name, patch) => config.providers.map((provider) => provider.name === name
         ? {
@@ -951,6 +988,12 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
         },
     ], [config]);
     const removeProvider = useCallback((name) => config.providers.filter((provider) => provider.name !== name), [config]);
+    const updateProviderDraftField = useCallback((key, value) => {
+        setProviderDraft((current) => current ? { ...current, [key]: value } : current);
+    }, []);
+    const updateLlmDraftField = useCallback((key, value) => {
+        setLlmDraft((current) => current ? { ...current, [key]: value } : current);
+    }, []);
     const promptValue = useCallback((state) => {
         setPrompt(state);
     }, []);
@@ -962,31 +1005,33 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
             await prompt.onSubmit(value);
         }
         catch (error) {
-            setNotice({
-                kind: "error",
-                text: error instanceof Error ? error.message : String(error),
-            });
+            handleActionError(error);
         }
-    }, [prompt]);
-    const persistMcpTransport = useCallback((currentName, nextName, transport) => {
+    }, [handleActionError, prompt]);
+    const persistMcpTransport = useCallback((currentName, nextName, transport, targetPath) => {
         if (!nextName) {
             throw new Error("Server name is required.");
         }
-        if (currentName && currentName !== nextName && mcpConfig.get(nextName)) {
-            throw new Error(`MCP server "${nextName}" already exists.`);
-        }
         if (!currentName) {
-            mcpConfig.add(nextName, transport);
+            if (!targetPath) {
+                throw new Error("Save target is required for a new MCP server.");
+            }
+            mcpConfig.addToPath(targetPath, nextName, transport);
             setSuccess(`Added MCP server "${nextName}".`);
         }
-        else if (currentName === nextName) {
-            mcpConfig.update(currentName, transport);
-            setSuccess(`Updated MCP server "${currentName}".`);
-        }
         else {
-            mcpConfig.add(nextName, transport);
-            mcpConfig.remove(currentName);
-            setSuccess(`Renamed MCP server "${currentName}" to "${nextName}".`);
+            const currentEntry = mcpConfig.getEntry(currentName);
+            if (!currentEntry) {
+                throw new Error(`MCP server "${currentName}" does not exist.`);
+            }
+            if (currentName === nextName) {
+                mcpConfig.updateInPath(currentEntry.sourcePath, currentName, transport);
+                setSuccess(`Updated MCP server "${currentName}".`);
+            }
+            else {
+                mcpConfig.renameInPath(currentEntry.sourcePath, currentName, nextName, transport);
+                setSuccess(`Renamed MCP server "${currentName}" to "${nextName}".`);
+            }
         }
         setMcpDraft(null);
         setScreen({ kind: "mcp" });
@@ -1046,7 +1091,32 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
             },
         });
     }, [promptValue, updateMcpDraftField]);
-    const saveMcpStdioDraft = useCallback((originalName) => {
+    const editProviderDraftField = useCallback((definition, initialValue) => {
+        promptValue({
+            title: `Update ${definition.label}`,
+            label: definition.label,
+            initialValue,
+            placeholder: definition.placeholder,
+            note: definition.note,
+            onSubmit: async (value) => {
+                updateProviderDraftField(definition.key, value);
+                setPrompt(null);
+            },
+        });
+    }, [promptValue, updateProviderDraftField]);
+    const editLlmDraftField = useCallback((label, key, initialValue, note) => {
+        promptValue({
+            title: `Update ${label}`,
+            label,
+            initialValue,
+            note,
+            onSubmit: async (value) => {
+                updateLlmDraftField(key, value);
+                setPrompt(null);
+            },
+        });
+    }, [promptValue, updateLlmDraftField]);
+    const buildMcpStdioDraft = useCallback(() => {
         const values = mcpDraft ?? {};
         const name = (values.name ?? "").trim();
         const command = (values.command ?? "").trim();
@@ -1066,9 +1136,9 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
             ...(env && Object.keys(env).length > 0 ? { env } : {}),
             ...(cwd ? { cwd } : {}),
         });
-        persistMcpTransport(originalName, name, transport);
-    }, [mcpDraft, persistMcpTransport]);
-    const saveMcpRemoteDraft = useCallback((transportType, originalName) => {
+        return { name, transport };
+    }, [mcpDraft]);
+    const buildMcpRemoteDraft = useCallback((transportType) => {
         const values = mcpDraft ?? {};
         const name = (values.name ?? "").trim();
         const url = (values.url ?? "").trim();
@@ -1133,8 +1203,24 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
             ...(headers && Object.keys(headers).length > 0 ? { headers } : {}),
             ...(oauth ? { oauth } : {}),
         });
+        return { name, transport };
+    }, [mcpDraft]);
+    const saveMcpStdioDraft = useCallback((originalName) => {
+        const { name, transport } = buildMcpStdioDraft();
+        if (!originalName) {
+            setScreen({ kind: "mcp-save-target", transportType: "stdio" });
+            return;
+        }
         persistMcpTransport(originalName, name, transport);
-    }, [mcpDraft, persistMcpTransport]);
+    }, [buildMcpStdioDraft, persistMcpTransport]);
+    const saveMcpRemoteDraft = useCallback((transportType, originalName) => {
+        const { name, transport } = buildMcpRemoteDraft(transportType);
+        if (!originalName) {
+            setScreen({ kind: "mcp-save-target", transportType });
+            return;
+        }
+        persistMcpTransport(originalName, name, transport);
+    }, [buildMcpRemoteDraft, persistMcpTransport]);
     const llmSummary = useCallback((entry) => {
         const compactModelId = (model) => {
             if (model.length <= 23) {
@@ -1172,10 +1258,7 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
                         setSuccess("Updated instructions.md.");
                     }
                     catch (error) {
-                        setNotice({
-                            kind: "error",
-                            text: error instanceof Error ? error.message : String(error),
-                        });
+                        handleActionError(error);
                     }
                 },
             },
@@ -1199,7 +1282,7 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
                 },
             },
         ];
-        return (_jsx(MenuScreen, { title: configData.name, description: `models: ${llmSummary(config.llms.find((m) => m.default) ?? config.llms[0])}`, items: items, footerHint: "enter: select | esc: back" }));
+        return (_jsx(MenuScreen, { title: configData.name, description: `models: ${llmSummary(config.llms.find((m) => m.default) ?? config.llms[0])}`, items: items, footerHint: "enter: select | esc: back", onActionError: handleActionError }));
     };
     const renderGeneralMenu = () => {
         const enabledPrompts = Object.values(configData.prompts).filter(Boolean).length;
@@ -1287,7 +1370,7 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
                 value: () => setScreen({ kind: "home" }),
             },
         ];
-        return (_jsx(MenuScreen, { title: "General", description: "Manage app-wide settings loaded from ~/.hooman/config.json.", items: items }));
+        return (_jsx(MenuScreen, { title: "General", description: "Manage app-wide settings loaded from ~/.hooman/config.json.", items: items, onActionError: handleActionError }));
     };
     const renderConfigMenu = () => {
         const defaultLlm = config.llms.find((m) => m.default) ?? config.llms[0];
@@ -1421,30 +1504,145 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
         const items = [
             {
                 label: "Add provider",
-                value: () => promptValue({
-                    title: "Add a new provider",
+                value: () => {
+                    setProviderDraft({ name: "" });
+                    setProviderDraftType(SUPPORTED_PROVIDER_TYPES[0]);
+                    setScreen({ kind: "config-provider-create" });
+                },
+            },
+            ...providerItems,
+            {
+                label: "Back",
+                value: () => setScreen({ kind: "config" }),
+            },
+        ];
+        return (_jsx(MenuScreen, { title: "Providers", description: "Configure reusable provider credentials and shared params.", items: items }));
+    };
+    const renderProviderCreateMenu = () => {
+        if (screen.kind !== "config-provider-create" || !providerDraft) {
+            return null;
+        }
+        const providerType = providerDraftType ?? SUPPORTED_PROVIDER_TYPES[0];
+        const providerFields = PROVIDER_FIELD_DEFINITIONS[providerType];
+        const items = [
+            {
+                label: `Name • ${providerDraft.name?.trim() ? providerDraft.name : "not set"}`,
+                value: () => editProviderDraftField({
+                    key: "name",
                     label: "Name",
+                    kind: "string",
                     placeholder: "openai-prod",
-                    onSubmit: async (value) => {
-                        const name = value.trim();
-                        if (!name) {
-                            throw new Error("Name is required.");
+                }, providerDraft.name ?? ""),
+            },
+            {
+                label: `Type • ${providerType}`,
+                value: () => setScreen({ kind: "config-provider-create-type" }),
+            },
+            ...providerFields.map((definition) => ({
+                key: `provider-create-field:${definition.key}`,
+                label: `${definition.label} • ${formatDraftFieldValue({
+                    key: definition.key,
+                    label: definition.label,
+                    placeholder: definition.placeholder,
+                    note: definition.note,
+                }, providerDraft[definition.key])}`,
+                value: () => {
+                    if (definition.kind === "optionalBoolean") {
+                        updateProviderDraftField(definition.key, isTruthyToggle(providerDraft[definition.key]) ? "no" : "yes");
+                        return;
+                    }
+                    editProviderDraftField(definition, providerDraft[definition.key] ?? "");
+                },
+            })),
+            {
+                label: "Save",
+                value: () => {
+                    const name = (providerDraft.name ?? "").trim();
+                    if (!name) {
+                        throw new Error("Name is required.");
+                    }
+                    if (config.providers.some((provider) => provider.name === name)) {
+                        throw new Error(`A provider named "${name}" already exists.`);
+                    }
+                    const options = providerOptionsTemplate(providerType);
+                    for (const definition of providerFields) {
+                        if (definition.key === "openaiApi") {
+                            const nextValue = parseTypedFieldValue(providerDraft[definition.key] ?? "", definition);
+                            options.api = nextValue;
+                            continue;
                         }
-                        if (config.providers.some((provider) => provider.name === name)) {
-                            throw new Error(`A provider named "${name}" already exists.`);
+                        if (definition.kind === "reasoningEffort") {
+                            const effort = parseTypedFieldValue(providerDraft[definition.key] ?? "", definition);
+                            const reasoning = {
+                                ...(options.reasoning ?? {}),
+                                effort,
+                            };
+                            options.reasoning = Object.values(reasoning).some((value) => value !== undefined)
+                                ? reasoning
+                                : undefined;
+                            continue;
                         }
-                        setPrompt(null);
-                        setScreen({ kind: "config-provider-add-type", name });
-                    },
-                }),
+                        if (definition.kind === "reasoningSummary") {
+                            const summary = parseTypedFieldValue(providerDraft[definition.key] ?? "", definition);
+                            const reasoning = {
+                                ...(options.reasoning ?? {}),
+                                summary,
+                            };
+                            options.reasoning = Object.values(reasoning).some((value) => value !== undefined)
+                                ? reasoning
+                                : undefined;
+                            continue;
+                        }
+                        if (definition.kind === "reasoningDisplay") {
+                            const display = parseTypedFieldValue(providerDraft[definition.key] ?? "", definition);
+                            const reasoning = {
+                                ...(options.reasoning ?? {}),
+                                display,
+                            };
+                            options.reasoning = Object.values(reasoning).some((value) => value !== undefined)
+                                ? reasoning
+                                : undefined;
+                            continue;
+                        }
+                        if (definition.kind === "bedrockCredentials") {
+                            const accessKeyId = normalizeOptional(providerDraft.accessKeyId ?? "");
+                            const secretAccessKey = normalizeOptional(providerDraft.secretAccessKey ?? "");
+                            if ((accessKeyId === undefined) !==
+                                (secretAccessKey === undefined)) {
+                                throw new Error("Access key ID and secret access key must be provided together.");
+                            }
+                            options.accessKeyId = accessKeyId;
+                            options.secretAccessKey = secretAccessKey;
+                            continue;
+                        }
+                        if (definition.kind === "promptCache") {
+                            continue;
+                        }
+                        options[definition.key] = parseTypedFieldValue(providerDraft[definition.key] ?? "", definition);
+                    }
+                    if (updateConfig({
+                        providers: addProviderEntry({
+                            name,
+                            provider: providerType,
+                            options: options,
+                        }),
+                    }, `Added provider "${name}" as "${providerType}".`)) {
+                        setProviderDraft(null);
+                        setProviderDraftType(null);
+                        setScreen({ kind: "config-provider-edit", name });
+                    }
+                },
             },
-            ...providerItems,
             {
                 label: "Back",
-                value: () => setScreen({ kind: "config" }),
+                value: () => {
+                    setProviderDraft(null);
+                    setProviderDraftType(null);
+                    setScreen({ kind: "config-providers" });
+                },
             },
         ];
-        return (_jsx(MenuScreen, { title: "Providers", description: "Configure reusable provider credentials and shared params.", items: items }));
+        return (_jsx(MenuScreen, { title: "Add a new provider", description: "Select a field to edit, then save when you're done.", items: items, onActionError: handleActionError }));
     };
     const renderProviderEditMenu = () => {
         if (screen.kind !== "config-provider-edit") {
@@ -1537,6 +1735,16 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
                         });
                         return;
                     }
+                    if (definition.kind === "optionalBoolean") {
+                        const currentValue = providerOptions[definition.key];
+                        const nextValue = currentValue === true ? false : true;
+                        updateConfig({
+                            providers: patchProvider(entry.name, {
+                                [definition.key]: nextValue,
+                            }),
+                        }, `Updated ${definition.label.toLowerCase()} for "${entry.name}" to ${nextValue ? "yes" : "no"}.`);
+                        return;
+                    }
                     if (definition.kind === "bedrockCredentials") {
                         promptValue({
                             title: "Update static credentials",
@@ -1858,27 +2066,22 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
         const items = [
             {
                 label: "Add LLM",
-                value: () => promptValue({
-                    title: "Add a new LLM",
-                    label: "Name",
-                    placeholder: "Gemma 27B",
-                    onSubmit: async (value) => {
-                        const name = value.trim();
-                        if (!name) {
-                            throw new Error("Name is required.");
-                        }
-                        if (config.llms.some((m) => m.name === name)) {
-                            throw new Error(`An LLM named "${name}" already exists.`);
-                        }
-                        if (config.providers.length === 0) {
-                            throw new Error("Add at least one provider first so the model can reference it.");
-                        }
-                        if (updateConfig({ llms: addLlm(name) }, `Added LLM "${name}".`)) {
-                            setPrompt(null);
-                            setScreen({ kind: "config-llm-edit", name });
-                        }
-                    },
-                }),
+                value: () => {
+                    if (config.providers.length === 0) {
+                        throw new Error("Add at least one provider first so the model can reference it.");
+                    }
+                    const providerName = config.providers[0].name;
+                    const providerType = config.providers[0].provider;
+                    setLlmDraft({
+                        name: "",
+                        provider: providerName,
+                        model: defaultModelForProviderType(providerType),
+                        temperature: "",
+                        maxTokens: "",
+                        context: "",
+                    });
+                    setScreen({ kind: "config-llm-create" });
+                },
             },
             ...llmItems,
             {
@@ -1888,6 +2091,86 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
         ];
         return (_jsx(MenuScreen, { title: "LLMs", description: "Add, edit, or remove named LLM configurations. The default is used for new sessions.", items: items }));
     };
+    const renderLlmCreateMenu = () => {
+        if (screen.kind !== "config-llm-create" || !llmDraft) {
+            return null;
+        }
+        const provider = config.providers.find((candidate) => candidate.name === llmDraft.provider);
+        const providerType = provider?.provider;
+        const items = [
+            {
+                label: `Name • ${llmDraft.name?.trim() ? llmDraft.name : "not set"}`,
+                value: () => editLlmDraftField("Name", "name", llmDraft.name ?? ""),
+            },
+            {
+                label: `Provider • ${llmDraft.provider ?? "not set"}`,
+                value: () => setScreen({ kind: "config-llm-create-provider" }),
+            },
+            {
+                label: `Model • ${llmDraft.model?.trim() ? llmDraft.model : "not set"}`,
+                value: () => editLlmDraftField("Model", "model", llmDraft.model ?? "", providerType
+                    ? `Suggested default for ${providerType}: ${defaultModelForProviderType(providerType)}`
+                    : undefined),
+            },
+            ...LLM_FIELD_DEFINITIONS.map((definition) => ({
+                key: `llm-create-field:${definition.key}`,
+                label: `${definition.label} • ${formatDraftFieldValue({
+                    key: definition.key,
+                    label: definition.label,
+                    placeholder: definition.placeholder,
+                    note: definition.note,
+                }, llmDraft[definition.key])}`,
+                value: () => editLlmDraftField(definition.label, definition.key, llmDraft[definition.key] ?? "", definition.note),
+            })),
+            {
+                label: "Save",
+                value: () => {
+                    const name = (llmDraft.name ?? "").trim();
+                    if (!name) {
+                        throw new Error("Name is required.");
+                    }
+                    if (config.llms.some((llm) => llm.name === name)) {
+                        throw new Error(`An LLM named "${name}" already exists.`);
+                    }
+                    const providerName = (llmDraft.provider ?? "").trim();
+                    if (!providerName) {
+                        throw new Error("Provider is required.");
+                    }
+                    const selectedProvider = config.providers.find((candidate) => candidate.name === providerName);
+                    if (!selectedProvider) {
+                        throw new Error(`Provider "${providerName}" does not exist.`);
+                    }
+                    const model = (llmDraft.model ?? "").trim();
+                    if (!model) {
+                        throw new Error("Model is required.");
+                    }
+                    const options = { model };
+                    for (const definition of LLM_FIELD_DEFINITIONS) {
+                        options[definition.key] = parseTypedFieldValue(llmDraft[definition.key] ?? "", definition);
+                    }
+                    if (updateConfig({
+                        llms: addLlmEntry({
+                            name,
+                            provider: providerName,
+                            options: options,
+                            default: false,
+                        }),
+                    }, `Added LLM "${name}".`)) {
+                        setLlmDraft(null);
+                        setScreen({ kind: "config-llm-edit", name });
+                    }
+                },
+            },
+            {
+                label: "Back",
+                value: () => {
+                    setLlmDraft(null);
+                    setScreen({ kind: "config-llms" });
+                },
+            },
+        ];
+        return (_jsx(MenuScreen, { title: "Add a new LLM", description: "Select a field to edit, then save when you're done.", items: items, onActionError: handleActionError }));
+    };
     const renderLlmEditMenu = () => {
         if (screen.kind !== "config-llm-edit") {
             return null;
@@ -2008,6 +2291,33 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
                     ? "This is the default LLM. Set another as default to enable deletion."
                     : "Edit fields, set as default, or delete this LLM.", items: items }));
     };
+    const renderLlmCreateProviderMenu = () => {
+        if (screen.kind !== "config-llm-create-provider" || !llmDraft) {
+            return null;
+        }
+        const items = [
+            ...config.providers.map((provider) => ({
+                label: provider.name === llmDraft.provider
+                    ? `${provider.name} • current`
+                    : `${provider.name} • ${provider.provider}`,
+                value: () => {
+                    setLlmDraft((current) => current
+                        ? {
+                            ...current,
+                            provider: provider.name,
+                            model: defaultModelForProviderType(provider.provider),
+                        }
+                        : current);
+                    setScreen({ kind: "config-llm-create" });
+                },
+            })),
+            {
+                label: "Back",
+                value: () => setScreen({ kind: "config-llm-create" }),
+            },
+        ];
+        return (_jsx(MenuScreen, { title: "Choose provider", description: "Pick which shared provider config this LLM should use.", items: items, onActionError: handleActionError }));
+    };
     const renderLlmProviderMenu = () => {
         if (screen.kind !== "config-llm-provider") {
             return null;
@@ -2254,7 +2564,7 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
                 },
             },
         ];
-        return (_jsx(MenuScreen, { title: `${screen.originalName ? "Edit" : "Add"} stdio server`, description: "Select a field to edit, then save when you're done.", items: items }));
+        return (_jsx(MenuScreen, { title: `${screen.originalName ? "Edit" : "Add"} stdio server`, description: "Select a field to edit, then save when you're done.", items: items, onActionError: handleActionError }));
     };
     const renderMcpRemoteEditMenu = () => {
         if (screen.kind !== "mcp-remote-edit" || !mcpDraft) {
@@ -2268,7 +2578,13 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
             ...fields.map((field) => ({
                 key: `mcp-remote:${field.key}`,
                 label: `${field.label} • ${formatDraftFieldValue(field, mcpDraft[field.key])}`,
-                value: () => editMcpDraftField(field, mcpDraft[field.key] ?? ""),
+                value: () => {
+                    if (field.key === "oauthEnabled") {
+                        updateMcpDraftField(field.key, isTruthyToggle(mcpDraft[field.key]) ? "no" : "yes");
+                        return;
+                    }
+                    editMcpDraftField(field, mcpDraft[field.key] ?? "");
+                },
             })),
             {
                 label: "Save",
@@ -2282,14 +2598,47 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
                 },
             },
         ];
-        return (_jsx(MenuScreen, { title: `${screen.originalName ? "Edit" : "Add"} ${screen.transportType} server`, description: "Select a field to edit, then save when you're done.", items: items }));
+        return (_jsx(MenuScreen, { title: `${screen.originalName ? "Edit" : "Add"} ${screen.transportType} server`, description: "Select a field to edit, then save when you're done.", items: items, onActionError: handleActionError }));
+    };
+    const renderMcpSaveTargetMenu = () => {
+        if (screen.kind !== "mcp-save-target") {
+            return null;
+        }
+        const targets = mcpConfig.writableTargets();
+        const saveToTarget = (path) => {
+            try {
+                if (screen.transportType === "stdio") {
+                    const { name, transport } = buildMcpStdioDraft();
+                    persistMcpTransport(undefined, name, transport, path);
+                }
+                else {
+                    const { name, transport } = buildMcpRemoteDraft(screen.transportType);
+                    persistMcpTransport(undefined, name, transport, path);
+                }
+            }
+            catch (error) {
+                handleActionError(error);
+            }
+        };
+        const items = [
+            ...targets.map((target) => ({
+                key: `mcp-save-target:${target.path}`,
+                label: `${target.scope === "global" ? "Global" : "Project"} • ${formatMcpWriteTargetLabel(target.path)}`,
+                value: () => saveToTarget(target.path),
+            })),
+            {
+                label: "Back",
+                value: () => setScreen({ kind: "mcp" }),
+            },
+        ];
+        return (_jsx(MenuScreen, { title: "Choose save target", description: "Select where to save this new MCP server.", items: items, onActionError: handleActionError }));
     };
     const renderMcpMenu = () => {
         const serverItems = mcpServers.map((server) => {
             const oauthStatus = mcpAuthStatuses[server.name];
             return {
                 key: `mcp-server:${server.name}`,
-                label: `Edit ${server.name} • ${formatMcpServerLabel(server.transport, oauthStatus)}`,
+                label: `Edit ${server.name} • ${formatMcpServerLabel(server.transport, oauthStatus)} • ${formatMcpScope(server.scope)}`,
                 boldSubstring: server.name,
                 oauthStatus: oauthStatus === "authenticated" ||
                     oauthStatus === "expired" ||
@@ -2325,7 +2674,10 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
                 value: () => {
                     mcpConfig.reload();
                     refresh();
-                    setNotice({ kind: "info", text: "Reloaded MCP config from disk." });
+                    setNotice({
+                        kind: "info",
+                        text: "Reloaded merged MCP config from disk.",
+                    });
                 },
             },
             {
@@ -2333,7 +2685,7 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
                 value: () => setScreen({ kind: "home" }),
             },
         ];
-        return (_jsx(MenuScreen, { title: "MCP Servers", description: "Add, edit, or remove named MCP transports from ~/.hooman/mcp.json.", items: items, footerHint: (item) => formatMcpFooterHint(item, mcpServers, mcpAuthStatuses), onShortcut: async (input, item) => {
+        return (_jsx(MenuScreen, { title: "MCP Servers", description: "Add, edit, or remove named MCP transports from merged MCP config (global + project overlays).", items: items, footerHint: (item) => formatMcpFooterHint(item, mcpServers, mcpAuthStatuses), onActionError: handleActionError, onShortcut: async (input, item) => {
                 const server = findMcpServerFromMenuItem(item, mcpServers);
                 if (!server) {
                     return;
@@ -2341,7 +2693,12 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
                 const status = mcpAuthStatuses[server.name];
                 const key = input.toLowerCase();
                 if (key === "d") {
-                    setScreen({ kind: "mcp-delete-confirm", name: server.name });
+                    setScreen({
+                        kind: "mcp-delete-confirm",
+                        name: server.name,
+                        sourcePath: server.sourcePath,
+                        scope: server.scope,
+                    });
                     return;
                 }
                 if (key === "r" &&
@@ -2433,7 +2790,7 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
         if (screen.kind !== "mcp-delete-confirm") {
             return null;
         }
-        const { name } = screen;
+        const { name, sourcePath, scope } = screen;
         const items = [
             {
                 key: `mcp-del-cancel:${name}`,
@@ -2442,24 +2799,21 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
             },
             {
                 key: `mcp-del-confirm:${name}`,
-                label: "Yes — remove from mcp.json",
+                label: `Yes — remove from ${formatMcpScope(scope)} mcp.json`,
                 value: () => {
                     try {
-                        mcpConfig.remove(name);
+                        mcpConfig.removeFromPath(sourcePath, name);
                         refresh();
-                        setSuccess(`Deleted MCP server "${name}".`);
+                        setSuccess(`Deleted MCP server "${name}" from ${formatMcpScope(scope)} mcp.json.`);
                     }
                     catch (error) {
-                        setNotice({
-                            kind: "error",
-                            text: error instanceof Error ? error.message : String(error),
-                        });
+                        handleActionError(error);
                     }
                     setScreen({ kind: "mcp" });
                 },
             },
         ];
-        return (_jsx(MenuScreen, { title: "Delete MCP server?", description: `Remove "${name}" from ~/.hooman/mcp.json? This cannot be undone from here.`, items: items }));
+        return (_jsx(MenuScreen, { title: "Delete MCP server?", description: formatMcpDeleteDescription(name, sourcePath, scope), items: items, onActionError: handleActionError }));
     };
     const renderSkillsDeleteConfirm = () => {
         if (screen.kind !== "skills-delete-confirm") {
@@ -2525,6 +2879,10 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
                 return renderConfigMenu();
             case "config-providers":
                 return renderProvidersMenu();
+            case "config-provider-create":
+                return renderProviderCreateMenu();
+            case "config-provider-create-type":
+                return renderProviderAddTypeMenu();
             case "config-provider-add-type":
                 return renderProviderAddTypeMenu();
             case "config-provider-edit":
@@ -2545,6 +2903,10 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
                 return renderProviderDeleteConfirm();
             case "config-llms":
                 return renderLlmsMenu();
+            case "config-llm-create":
+                return renderLlmCreateMenu();
+            case "config-llm-create-provider":
+                return renderLlmCreateProviderMenu();
             case "config-llm-edit":
                 return renderLlmEditMenu();
             case "config-llm-provider":
@@ -2561,6 +2923,8 @@ export function ConfigureApp({ config, mcpConfig, mcpManager, skills, onExit, })
                 return renderSearchProviderMenu();
             case "mcp":
                 return renderMcpMenu();
+            case "mcp-save-target":
+                return renderMcpSaveTargetMenu();
             case "mcp-stdio-edit":
                 return renderMcpStdioEditMenu();
             case "mcp-remote-edit":