akm-cli 0.9.0-rc.1 → 0.9.0-rc.13

package/dist/setup/steps/connection.js

@@ -7,10 +7,11 @@
  */
 import * as p from "../../cli/clack.js";
 import { detectAgentCliProfiles, pickDefaultAgentProfile } from "../../integrations/agent/index.js";
-import { probeLlmCapabilities } from "../../llm/client.js";
 import { detectLMStudio, detectOllama } from "../detect.js";
-import { cloneLlmConfig, getCurrentAgentBlock, getCurrentLlm } from "../legacy-config.js";
-import { prompt, promptOrBack } from "../prompt.js";
+import { verifyOpenAiCompatibleEndpoint } from "../detected-engines.js";
+import { cloneLlmConnection, readAgentEngineSelection, readCurrentLlmEngine, } from "../engine-config.js";
+import { prompt } from "../prompt.js";
+import { keepCurrentOption, llmConnection, lmStudioOptionHint, probeLlmConnection, promptApiKeyEnvVarName, promptEndpointUrl, promptLmStudioModel, promptModelName, } from "./connection-shared.js";
 export async function stepOllama(current) {
     const spin = p.spinner();
     spin.start("Checking for Ollama...");
@@ -148,19 +149,12 @@ export async function stepLlm(current, ollamaEndpoint, ollamaChatModels, lmStudi
             hint: ollamaChatModels?.[0] ?? "local",
         });
     }
-    const lmStudioHint = lmStudio?.available
-        ? `${lmStudio.models.length} model${lmStudio.models.length === 1 ? "" : "s"} detected`
-        : "http://localhost:1234";
-    options.push({ value: "lmstudio", label: "LM Studio / local server", hint: lmStudioHint });
+    options.push({ value: "lmstudio", label: "LM Studio / local server", hint: lmStudioOptionHint(lmStudio) });
     options.push({ value: "custom", label: "Custom OpenAI-compatible endpoint" });
     options.push({ value: "none", label: "Skip LLM", hint: "no metadata enhancement during indexing" });
-    const currentLlm = getCurrentLlm(current);
+    const currentLlm = readCurrentLlmEngine(current);
     if (currentLlm) {
-        options.push({
-            value: "keep",
-            label: `Keep current: ${currentLlm.provider ?? currentLlm.endpoint}`,
-            hint: currentLlm.model,
-        });
+        options.push(keepCurrentOption(currentLlm));
     }
     const initialValue = currentLlm ? "keep" : ollamaAvailable ? "ollama" : (LLM_PRESETS[0]?.value ?? "none");
     const choice = await prompt(() => p.select({
@@ -169,7 +163,7 @@ export async function stepLlm(current, ollamaEndpoint, ollamaChatModels, lmStudi
         initialValue,
     }));
     if (choice === "keep")
-        return cloneLlmConfig(currentLlm);
+        return cloneLlmConnection(currentLlm);
     if (choice === "none")
         return undefined;
     // Handle "Import from <Harness>" choices
@@ -180,16 +174,27 @@ export async function stepLlm(current, ollamaEndpoint, ollamaChatModels, lmStudi
         // Show a summary before accepting
         p.log.info(`Importing LLM config from ${harness.harnessName}: ` +
             [harness.provider, harness.model, harness.baseUrl].filter(Boolean).join(", "));
+        if (!harness.baseUrl || !harness.model) {
+            p.log.warn(`Skipping ${harness.harnessName}: no complete endpoint/model was detected.`);
+            return undefined;
+        }
+        const verified = await verifyOpenAiCompatibleEndpoint({
+            endpoint: harness.baseUrl,
+            model: harness.model,
+            apiKeyEnvVar: harness.apiKeyEnvVar,
+        });
+        if (!verified.ok) {
+            p.log.warn(`Skipping ${harness.harnessName}: ${verified.reason}. Fix its endpoint/credential and retry setup.`);
+            return undefined;
+        }
         const llmConfig = {
-            endpoint: harness.baseUrl ?? "",
+            endpoint: verified.endpoint,
             model: harness.model ?? "",
             temperature: 0.3,
-            maxTokens: 1024,
+            ...(harness.apiKeyEnvVar ? { apiKey: `\${${harness.apiKeyEnvVar}}` } : {}),
         };
         if (harness.provider)
             llmConfig.provider = harness.provider;
-        if (harness.baseUrl)
-            llmConfig.endpoint = harness.baseUrl;
         return llmConfig;
     }
     let llm;
@@ -199,118 +204,40 @@ export async function stepLlm(current, ollamaEndpoint, ollamaChatModels, lmStudi
             options: (ollamaChatModels ?? []).map((m) => ({ value: m, label: m })),
             initialValue: ollamaChatModels?.[0],
         }));
-        llm = {
-            provider: "ollama",
-            endpoint: `${ollamaEndpoint}/v1/chat/completions`,
-            model: modelChoice,
-            temperature: 0.3,
-            maxTokens: 1024,
-        };
+        llm = llmConnection("ollama", `${ollamaEndpoint}/v1/chat/completions`, modelChoice);
     }
     else if (choice === "lmstudio") {
         const currentLmsLlm = currentLlm?.provider === "lmstudio" ? currentLlm : undefined;
         const defaultEndpoint = currentLmsLlm?.endpoint ??
             (lmStudio?.endpoint ? `${lmStudio.endpoint}/v1/chat/completions` : "http://localhost:1234/v1/chat/completions");
-        const endpoint = await prompt(() => p.text({
-            message: "Endpoint URL:",
-            placeholder: defaultEndpoint,
-            defaultValue: defaultEndpoint,
-            validate: (v) => {
-                if (!v?.trim())
-                    return "Endpoint cannot be empty";
-                if (!v.startsWith("http://") && !v.startsWith("https://"))
-                    return "Must start with http:// or https://";
-            },
-        }));
-        let model;
-        const lmsModels = lmStudio?.available && lmStudio.models.length > 0 ? lmStudio.models : [];
-        if (lmsModels.length > 0) {
-            const modelChoice = await prompt(() => p.select({
-                message: "Model name:",
-                options: [
-                    ...lmsModels.map((m) => ({ value: m, label: m })),
-                    { value: "__manual__", label: "Enter manually..." },
-                ],
-                initialValue: currentLmsLlm?.model && lmsModels.includes(currentLmsLlm.model) ? currentLmsLlm.model : lmsModels[0],
-            }));
-            if (modelChoice === "__manual__") {
-                model = await prompt(() => p.text({
-                    message: "Model name:",
-                    placeholder: currentLmsLlm?.model ?? "local-model",
-                    ...(currentLmsLlm?.model ? { defaultValue: currentLmsLlm.model } : {}),
-                    validate: (v) => (!v?.trim() ? "Model name cannot be empty" : undefined),
-                }));
-            }
-            else {
-                model = modelChoice;
-            }
-        }
-        else {
-            model = await prompt(() => p.text({
-                message: "Model name:",
-                placeholder: currentLmsLlm?.model ?? "local-model",
-                ...(currentLmsLlm?.model ? { defaultValue: currentLmsLlm.model } : {}),
-                validate: (v) => (!v?.trim() ? "Model name cannot be empty" : undefined),
-            }));
-        }
-        llm = {
-            provider: "lmstudio",
-            endpoint: endpoint.trim(),
-            model: model.trim(),
-            temperature: 0.3,
-            maxTokens: 1024,
-        };
+        const endpoint = await promptEndpointUrl({ placeholder: defaultEndpoint, defaultValue: defaultEndpoint });
+        const model = await promptLmStudioModel(lmStudio, currentLmsLlm?.model);
+        llm = llmConnection("lmstudio", endpoint.trim(), model.trim());
     }
     else if (choice === "custom") {
         const currentCustomLlm = currentLlm?.provider === "custom" ? currentLlm : undefined;
-        const endpoint = await prompt(() => p.text({
+        const endpoint = await promptEndpointUrl({
             message: "OpenAI-compatible chat completions endpoint:",
             placeholder: currentCustomLlm?.endpoint ?? "https://your-host/v1/chat/completions",
-            ...(currentCustomLlm?.endpoint ? { defaultValue: currentCustomLlm.endpoint } : {}),
-            validate: (v) => {
-                if (!v?.trim())
-                    return "Endpoint cannot be empty";
-                if (!v.startsWith("http://") && !v.startsWith("https://"))
-                    return "Endpoint must start with http:// or https://";
-            },
-        }));
-        const model = await prompt(() => p.text({
-            message: "Model name:",
+            defaultValue: currentCustomLlm?.endpoint,
+            schemeMessage: "Endpoint must start with http:// or https://",
+        });
+        const model = await promptModelName({
             placeholder: currentCustomLlm?.model ?? "gpt-4o-mini",
-            ...(currentCustomLlm?.model ? { defaultValue: currentCustomLlm.model } : {}),
-            validate: (v) => {
-                if (!v?.trim())
-                    return "Model name cannot be empty";
-            },
-        }));
-        llm = {
-            provider: "custom",
-            endpoint: endpoint.trim(),
-            model: model.trim(),
-            temperature: 0.3,
-            maxTokens: 1024,
-        };
+            defaultValue: currentCustomLlm?.model,
+        });
+        llm = llmConnection("custom", endpoint.trim(), model.trim());
     }
     else {
         const preset = LLM_PRESETS.find((p) => p.value === choice);
         if (!preset)
             return undefined;
-        const model = await prompt(() => p.text({
+        const model = await promptModelName({
             message: `Model for ${preset.label}:`,
             placeholder: preset.defaultModel,
             defaultValue: preset.defaultModel,
-            validate: (v) => {
-                if (!v?.trim())
-                    return "Model name cannot be empty";
-            },
-        }));
-        llm = {
-            provider: preset.value,
-            endpoint: preset.endpoint,
-            model: model.trim() || preset.defaultModel,
-            temperature: 0.3,
-            maxTokens: 1024,
-        };
+        });
+        llm = llmConnection(preset.value, preset.endpoint, model.trim() || preset.defaultModel);
     }
     // Remind the user about API key placement. We do not offer a "store in config"
     // option because saveConfig() strips apiKey fields before writing — persisting
@@ -320,21 +247,7 @@ export async function stepLlm(current, ollamaEndpoint, ollamaChatModels, lmStudi
         p.log.info("This provider requires an API key. Set AKM_LLM_API_KEY in your shell (e.g. `export AKM_LLM_API_KEY=...`) before running `akm index`.");
     }
     // Capability probe — best-effort, never blocks setup.
-    const probeSpin = p.spinner();
-    probeSpin.start("Probing LLM (structured-output round-trip)...");
-    const probe = await probeLlmCapabilities(llm);
-    if (probe.reachable && probe.structuredOutput) {
-        probeSpin.stop("LLM reachable; structured output verified.");
-        llm.capabilities = { ...(llm.capabilities ?? {}), structuredOutput: true };
-    }
-    else if (probe.reachable) {
-        probeSpin.stop("LLM reachable but structured-output probe failed.");
-        llm.capabilities = { ...(llm.capabilities ?? {}), structuredOutput: false };
-    }
-    else {
-        probeSpin.stop("LLM not reachable.");
-        p.log.warn(`Could not reach the LLM endpoint${probe.error ? ` (${probe.error})` : ""}. Configuration was saved; verify your endpoint and API key, then retry.`);
-    }
+    await probeLlmConnection(llm);
     return llm;
 }
 /**
@@ -348,9 +261,8 @@ export async function stepSmallModelConnection(current) {
     p.note([
         "This connection is used for background processing:",
         "  • akm index           (metadata enhancement)",
-        "  • akm distill         (lesson distillation)",
+        "  • akm improve         (lesson distillation)",
         "  • akm remember --enrich (memory compression)",
-        "  • akm curate --rerank   (search reranking)",
     ].join("\n"));
     // Probe for Ollama and LM Studio in the background while showing the note.
     const spin = p.spinner();
@@ -372,17 +284,10 @@ export async function stepSmallModelConnection(current) {
             hint: `detected at ${ollama.endpoint}`,
         });
     }
-    const lmStudioHint = lmStudio.available
-        ? `${lmStudio.models.length} model${lmStudio.models.length === 1 ? "" : "s"} detected`
-        : "http://localhost:1234";
-    providerOptions.push({ value: "openai", label: "OpenAI", hint: "requires AKM_LLM_API_KEY" }, { value: "lmstudio", label: "LM Studio / local server", hint: lmStudioHint }, { value: "custom", label: "Custom OpenAI-compatible endpoint" }, { value: "skip", label: "Skip — disable enrichment features" });
-    const currentLlmSmall = getCurrentLlm(current);
+    providerOptions.push({ value: "openai", label: "OpenAI", hint: "requires AKM_LLM_API_KEY" }, { value: "lmstudio", label: "LM Studio / local server", hint: lmStudioOptionHint(lmStudio) }, { value: "custom", label: "Custom OpenAI-compatible endpoint" }, { value: "skip", label: "Skip — disable enrichment features" });
+    const currentLlmSmall = readCurrentLlmEngine(current);
     if (currentLlmSmall) {
-        providerOptions.push({
-            value: "keep",
-            label: `Keep current: ${currentLlmSmall.provider ?? currentLlmSmall.endpoint}`,
-            hint: currentLlmSmall.model,
-        });
+        providerOptions.push(keepCurrentOption(currentLlmSmall));
     }
     const initialValue = currentLlmSmall ? "keep" : ollama.available ? "ollama" : "openai";
     const providerChoice = await prompt(() => p.select({
@@ -391,15 +296,14 @@ export async function stepSmallModelConnection(current) {
         initialValue,
     }));
     if (providerChoice === "keep") {
-        return { llm: cloneLlmConfig(currentLlmSmall), skipped: false, ollamaEndpoint };
+        return { llm: cloneLlmConnection(currentLlmSmall), skipped: false, ollamaEndpoint };
     }
     if (providerChoice === "skip") {
         p.note([
             "Enrichment features disabled:",
             "  • akm index           — metadata enhancement disabled",
-            "  • akm distill         — lesson generation",
+            "  • akm improve         — lesson generation",
             "  • akm remember --enrich",
-            "  • akm curate --rerank",
             "",
             "You can configure this later with `akm setup`.",
         ].join("\n"), "Warning");
@@ -419,154 +323,54 @@ export async function stepSmallModelConnection(current) {
                 initialValue: ollamaChatModels[0],
             }));
             if (model === "__custom__") {
-                model = await prompt(() => p.text({
-                    message: "Model name:",
-                    placeholder: "llama3.2",
-                    validate: (v) => (!v?.trim() ? "Model name cannot be empty" : undefined),
-                }));
+                model = await promptModelName({ placeholder: "llama3.2" });
             }
         }
         else {
             const currentOllamaModel = currentLlmSmall?.provider === "ollama" ? (currentLlmSmall.model ?? "llama3.2") : "llama3.2";
-            model = await prompt(() => p.text({
+            model = await promptModelName({
                 message: "Model name (e.g. llama3.2):",
                 placeholder: currentOllamaModel,
                 defaultValue: currentOllamaModel,
-                validate: (v) => (!v?.trim() ? "Model name cannot be empty" : undefined),
-            }));
+            });
         }
-        llm = {
-            provider: "ollama",
-            endpoint: `${ollama.endpoint}/v1/chat/completions`,
-            model: model.trim(),
-            temperature: 0.3,
-            maxTokens: 1024,
-        };
+        llm = llmConnection("ollama", `${ollama.endpoint}/v1/chat/completions`, model.trim());
     }
     else if (providerChoice === "openai") {
         const currentOpenAiModel = currentLlmSmall?.provider === "openai" ? (currentLlmSmall.model ?? "gpt-4o-mini") : "gpt-4o-mini";
-        const model = await prompt(() => p.text({
-            message: "Model name:",
-            placeholder: currentOpenAiModel,
-            defaultValue: currentOpenAiModel,
-            validate: (v) => (!v?.trim() ? "Model name cannot be empty" : undefined),
-        }));
+        const model = await promptModelName({ placeholder: currentOpenAiModel, defaultValue: currentOpenAiModel });
         if (!process.env.AKM_LLM_API_KEY) {
             p.log.info("Set AKM_LLM_API_KEY in your shell before running `akm index`.");
         }
-        llm = {
-            provider: "openai",
-            endpoint: "https://api.openai.com/v1/chat/completions",
-            model: model.trim() || currentOpenAiModel,
-            temperature: 0.3,
-            maxTokens: 1024,
-        };
+        llm = llmConnection("openai", "https://api.openai.com/v1/chat/completions", model.trim() || currentOpenAiModel);
     }
     else if (providerChoice === "lmstudio") {
         const currentLmsEndpoint = currentLlmSmall?.provider === "lmstudio"
             ? (currentLlmSmall.endpoint ?? `${lmStudio.endpoint}/v1/chat/completions`)
             : `${lmStudio.endpoint}/v1/chat/completions`;
         const currentLmsModel = currentLlmSmall?.provider === "lmstudio" ? currentLlmSmall.model : undefined;
-        const endpoint = await prompt(() => p.text({
-            message: "Endpoint URL:",
-            placeholder: currentLmsEndpoint,
-            defaultValue: currentLmsEndpoint,
-            validate: (v) => {
-                if (!v?.trim())
-                    return "Endpoint cannot be empty";
-                if (!v.startsWith("http://") && !v.startsWith("https://"))
-                    return "Must start with http:// or https://";
-            },
-        }));
-        let model;
-        const lmsModels = lmStudio.available && lmStudio.models.length > 0 ? lmStudio.models : [];
-        if (lmsModels.length > 0) {
-            const modelChoice = await prompt(() => p.select({
-                message: "Model name:",
-                options: [
-                    ...lmsModels.map((m) => ({ value: m, label: m })),
-                    { value: "__manual__", label: "Enter manually..." },
-                ],
-                initialValue: currentLmsModel && lmsModels.includes(currentLmsModel) ? currentLmsModel : lmsModels[0],
-            }));
-            if (modelChoice === "__manual__") {
-                model = await prompt(() => p.text({
-                    message: "Model name:",
-                    placeholder: currentLmsModel ?? "local-model",
-                    ...(currentLmsModel ? { defaultValue: currentLmsModel } : {}),
-                    validate: (v) => (!v?.trim() ? "Model name cannot be empty" : undefined),
-                }));
-            }
-            else {
-                model = modelChoice;
-            }
-        }
-        else {
-            model = await prompt(() => p.text({
-                message: "Model name:",
-                placeholder: currentLmsModel ?? "local-model",
-                ...(currentLmsModel ? { defaultValue: currentLmsModel } : {}),
-                validate: (v) => (!v?.trim() ? "Model name cannot be empty" : undefined),
-            }));
-        }
-        llm = {
-            provider: "lmstudio",
-            endpoint: endpoint.trim(),
-            model: model.trim(),
-            temperature: 0.3,
-            maxTokens: 1024,
-        };
+        const endpoint = await promptEndpointUrl({ placeholder: currentLmsEndpoint, defaultValue: currentLmsEndpoint });
+        const model = await promptLmStudioModel(lmStudio, currentLmsModel);
+        llm = llmConnection("lmstudio", endpoint.trim(), model.trim());
     }
     else {
         // custom
         const currentCustomEndpoint = currentLlmSmall?.provider === "custom" ? currentLlmSmall.endpoint : undefined;
         const currentCustomModel = currentLlmSmall?.provider === "custom" ? currentLlmSmall.model : undefined;
-        const endpoint = await prompt(() => p.text({
+        const endpoint = await promptEndpointUrl({
             message: "OpenAI-compatible chat completions endpoint:",
             placeholder: currentCustomEndpoint ?? "https://your-host/v1/chat/completions",
-            ...(currentCustomEndpoint ? { defaultValue: currentCustomEndpoint } : {}),
-            validate: (v) => {
-                if (!v?.trim())
-                    return "Endpoint cannot be empty";
-                if (!v.startsWith("http://") && !v.startsWith("https://"))
-                    return "Must start with http:// or https://";
-            },
-        }));
-        const model = await prompt(() => p.text({
-            message: "Model name:",
+            defaultValue: currentCustomEndpoint,
+        });
+        const model = await promptModelName({
             placeholder: currentCustomModel ?? "gpt-4o-mini",
-            ...(currentCustomModel ? { defaultValue: currentCustomModel } : {}),
-            validate: (v) => (!v?.trim() ? "Model name cannot be empty" : undefined),
-        }));
-        const apiKeyInput = await promptOrBack(() => p.text({
-            message: "API key (optional — press Enter to skip):",
-            placeholder: "",
-        }));
-        llm = {
-            provider: "custom",
-            endpoint: endpoint.trim(),
-            model: model.trim(),
-            temperature: 0.3,
-            maxTokens: 1024,
-            ...(apiKeyInput?.trim() ? { apiKey: apiKeyInput.trim() } : {}),
-        };
+            defaultValue: currentCustomModel,
+        });
+        const apiKeyInput = await promptApiKeyEnvVarName();
+        llm = llmConnection("custom", endpoint.trim(), model.trim(), apiKeyInput?.trim() ? { apiKey: `\${${apiKeyInput.trim()}}` } : {});
     }
     // Best-effort probe — never blocks setup.
-    const probeSpin = p.spinner();
-    probeSpin.start("Probing LLM (structured-output round-trip)...");
-    const probe = await probeLlmCapabilities(llm);
-    if (probe.reachable && probe.structuredOutput) {
-        probeSpin.stop("LLM reachable; structured output verified.");
-        llm.capabilities = { ...(llm.capabilities ?? {}), structuredOutput: true };
-    }
-    else if (probe.reachable) {
-        probeSpin.stop("LLM reachable but structured-output probe failed.");
-        llm.capabilities = { ...(llm.capabilities ?? {}), structuredOutput: false };
-    }
-    else {
-        probeSpin.stop("LLM not reachable.");
-        p.log.warn(`Could not reach the LLM endpoint${probe.error ? ` (${probe.error})` : ""}. Configuration was saved; verify your endpoint and API key, then retry.`);
-    }
+    await probeLlmConnection(llm);
     return { llm, skipped: false, ollamaEndpoint };
 }
 /**
@@ -578,13 +382,13 @@ export async function stepAgentConnection(current, smallModel) {
     p.log.step("Step 2/2: Configure your agent connection");
     p.note([
         "This connection is used for agentic commands:",
-        "  • akm propose   (generate improvement proposals)",
-        "  • akm improve   (run the reflect/distill/consolidate self-improvement pipeline)",
-        "  • akm tasks run (run automated task prompts)",
+        "  • akm proposal new (generate improvement proposals)",
+        "  • akm improve       (run the reflect/distill/consolidate self-improvement pipeline)",
+        "  • akm task run     (run automated task prompts)",
     ].join("\n"));
     // Detect available CLI agents.
     const detections = detectAgentCliProfiles(current);
-    const currentAgentBlock = getCurrentAgentBlock(current);
+    const currentAgentBlock = readAgentEngineSelection(current);
     const availableClis = detections.filter((d) => d.available);
     const agentOptions = [];
     if (!smallModel.skipped && smallModel.llm) {
@@ -606,8 +410,8 @@ export async function stepAgentConnection(current, smallModel) {
     if (currentAgentBlock) {
         const currentDesc = currentAgentBlock.default
             ? `CLI: ${currentAgentBlock.default}`
-            : currentAgentBlock.profiles?.default?.model
-                ? `SDK: ${currentAgentBlock.profiles.default.model}`
+            : currentAgentBlock.engines?.default?.model
+                ? `SDK: ${currentAgentBlock.engines.default.model}`
                 : "configured";
         agentOptions.push({ value: "keep", label: `Keep current: ${currentDesc}` });
     }
@@ -631,13 +435,13 @@ export async function stepAgentConnection(current, smallModel) {
     if (agentChoice === "none") {
         p.note([
             "Agentic features disabled:",
-            '  • akm propose — will show "no agent configured" error',
+            '  • akm proposal new — will show "no agent configured" error',
             '  • akm improve — will show "no agent configured" error',
-            '  • akm tasks run — will show "no agent configured" error',
+            '  • akm task run — will show "no agent configured" error',
             "",
             "You can configure this later with `akm setup`.",
         ].join("\n"), "Warning");
-        return undefined;
+        return { disabled: true };
     }
     if (agentChoice === "same-connection") {
         if (smallModel.skipped || !smallModel.llm) {
@@ -647,24 +451,24 @@ export async function stepAgentConnection(current, smallModel) {
         else {
             const baseEndpoint = smallModel.llm.endpoint.replace("/v1/chat/completions", "");
             p.log.info(`Endpoint: ${baseEndpoint} (from Step 1)`);
-            const profileName = smallModel.llm.provider ?? "default";
+            const profileName = `${smallModel.llm.provider ?? "default"}-agent`;
             // Pre-populate from existing agent profile for this provider, if any.
-            const existingAgentModel = currentAgentBlock?.profiles?.[profileName]?.model ?? smallModel.llm.model ?? undefined;
-            const agentModel = await prompt(() => p.text({
+            const existingAgentModel = currentAgentBlock?.engines?.[profileName]?.model ?? smallModel.llm.model ?? undefined;
+            const agentModel = await promptModelName({
                 message: "Model to use for agent tasks (same model is fine, larger models work better):",
                 placeholder: existingAgentModel ?? "qwen2.5-coder:32b",
-                ...(existingAgentModel ? { defaultValue: existingAgentModel } : {}),
-                validate: (v) => (!v?.trim() ? "Model name cannot be empty" : undefined),
-            }));
+                defaultValue: existingAgentModel,
+            });
             return {
                 ...(currentAgentBlock ?? {}),
-                profiles: {
-                    ...(currentAgentBlock?.profiles ?? {}),
+                engines: {
+                    ...(currentAgentBlock?.engines ?? {}),
                     [profileName]: {
-                        ...(currentAgentBlock?.profiles?.[profileName] ?? {}),
-                        sdkMode: true,
+                        ...(currentAgentBlock?.engines?.[profileName] ?? {}),
+                        kind: "agent",
+                        platform: "opencode-sdk",
                         model: agentModel.trim(),
-                        endpoint: smallModel.llm.endpoint,
+                        ...(current.defaults?.llmEngine ? { llmEngine: current.defaults.llmEngine } : {}),
                     },
                 },
                 default: profileName,
@@ -693,42 +497,41 @@ export async function stepAgentConnection(current, smallModel) {
     }
     // "new-connection" (also fall-through from "same-provider" when Step 1 was skipped)
     // Pre-populate from current "custom" agent profile if available.
-    const currentCustomAgentProfile = currentAgentBlock?.profiles?.custom;
-    const currentNewEndpoint = currentCustomAgentProfile?.endpoint ?? undefined;
+    const currentCustomAgentProfile = currentAgentBlock?.engines?.["custom-agent"];
+    const currentNewEndpoint = undefined;
     const currentNewModel = currentCustomAgentProfile?.model ?? undefined;
-    const newEndpoint = await prompt(() => p.text({
+    const newEndpoint = await promptEndpointUrl({
         message: "OpenAI-compatible chat completions endpoint:",
         placeholder: currentNewEndpoint ?? "https://your-host/v1/chat/completions",
-        ...(currentNewEndpoint ? { defaultValue: currentNewEndpoint } : {}),
-        validate: (v) => {
-            if (!v?.trim())
-                return "Endpoint cannot be empty";
-            if (!v.startsWith("http://") && !v.startsWith("https://"))
-                return "Must start with http:// or https://";
-        },
-    }));
-    const newApiKeyInput = await promptOrBack(() => p.text({
-        message: "API key (optional — press Enter to skip):",
-        placeholder: "",
-    }));
-    const newModel = await prompt(() => p.text({
+        defaultValue: currentNewEndpoint,
+    });
+    const newApiKeyInput = await promptApiKeyEnvVarName();
+    const newModel = await promptModelName({
         message: "Model name (larger is better, e.g. gpt-4o):",
         placeholder: currentNewModel ?? "gpt-4o",
-        ...(currentNewModel ? { defaultValue: currentNewModel } : {}),
-        validate: (v) => (!v?.trim() ? "Model name cannot be empty" : undefined),
-    }));
+        defaultValue: currentNewModel,
+    });
+    const llmEngineName = "custom-llm";
+    const agentEngineName = "custom-agent";
     const customProfile = {
-        sdkMode: true,
-        endpoint: newEndpoint.trim(),
+        kind: "agent",
+        platform: "opencode-sdk",
+        llmEngine: llmEngineName,
         model: newModel.trim(),
-        ...(newApiKeyInput?.trim() ? { apiKey: newApiKeyInput.trim() } : {}),
     };
     return {
         ...(currentAgentBlock ?? {}),
-        profiles: {
-            ...(currentAgentBlock?.profiles ?? {}),
-            custom: customProfile,
+        engines: {
+            ...(currentAgentBlock?.engines ?? {}),
+            [llmEngineName]: {
+                kind: "llm",
+                provider: "custom",
+                endpoint: newEndpoint.trim(),
+                model: newModel.trim(),
+                ...(newApiKeyInput?.trim() ? { apiKey: `\${${newApiKeyInput.trim()}}` } : {}),
+            },
+            [agentEngineName]: customProfile,
         },
-        default: "custom",
+        default: agentEngineName,
     };
 }