feat(auth): add ollama to onboard provider selection UI

This commit is contained in:
Baek, JH 2026-01-26 22:25:08 -08:00
parent ab6d4c529a
commit 8a0c42433a
6 changed files with 76 additions and 1 deletions

View File

@ -20,7 +20,8 @@ export type AuthChoiceGroupId =
| "minimax" | "minimax"
| "synthetic" | "synthetic"
| "venice" | "venice"
| "qwen"; | "qwen"
| "ollama";
export type AuthChoiceGroup = { export type AuthChoiceGroup = {
value: AuthChoiceGroupId; value: AuthChoiceGroupId;
@ -113,6 +114,12 @@ const AUTH_CHOICE_GROUP_DEFS: {
hint: "API key", hint: "API key",
choices: ["opencode-zen"], choices: ["opencode-zen"],
}, },
{
value: "ollama",
label: "Ollama",
hint: "Local LLM (API key)",
choices: ["ollama-api-key"],
},
]; ];
export function buildAuthChoiceOptions(params: { export function buildAuthChoiceOptions(params: {
@ -177,6 +184,11 @@ export function buildAuthChoiceOptions(params: {
label: "OpenCode Zen (multi-model proxy)", label: "OpenCode Zen (multi-model proxy)",
hint: "Claude, GPT, Gemini via opencode.ai/zen", hint: "Claude, GPT, Gemini via opencode.ai/zen",
}); });
options.push({
value: "ollama-api-key",
label: "Ollama (local LLM)",
hint: "Requires Ollama running locally",
});
options.push({ value: "minimax-api", label: "MiniMax M2.1" }); options.push({ value: "minimax-api", label: "MiniMax M2.1" });
options.push({ options.push({
value: "minimax-api-lightning", value: "minimax-api-lightning",

View File

@ -37,6 +37,7 @@ import {
setGeminiApiKey, setGeminiApiKey,
setKimiCodeApiKey, setKimiCodeApiKey,
setMoonshotApiKey, setMoonshotApiKey,
setOllamaApiKey,
setOpencodeZenApiKey, setOpencodeZenApiKey,
setOpenrouterApiKey, setOpenrouterApiKey,
setSyntheticApiKey, setSyntheticApiKey,
@ -83,6 +84,8 @@ export async function applyAuthChoiceApiProviders(
authChoice = "synthetic-api-key"; authChoice = "synthetic-api-key";
} else if (params.opts.tokenProvider === "venice") { } else if (params.opts.tokenProvider === "venice") {
authChoice = "venice-api-key"; authChoice = "venice-api-key";
} else if (params.opts.tokenProvider === "ollama") {
authChoice = "ollama-api-key";
} else if (params.opts.tokenProvider === "opencode") { } else if (params.opts.tokenProvider === "opencode") {
authChoice = "opencode-zen"; authChoice = "opencode-zen";
} }
@ -522,6 +525,51 @@ export async function applyAuthChoiceApiProviders(
return { config: nextConfig, agentModelOverride }; return { config: nextConfig, agentModelOverride };
} }
if (authChoice === "ollama-api-key") {
let hasCredential = false;
if (!hasCredential && params.opts?.token && params.opts?.tokenProvider === "ollama") {
await setOllamaApiKey(normalizeApiKeyInput(params.opts.token), params.agentDir);
hasCredential = true;
}
if (!hasCredential) {
await params.prompter.note(
[
"Ollama runs LLMs locally on your machine.",
"Make sure Ollama is running: ollama serve",
"The API key can be any non-empty string (e.g. 'ollama').",
].join("\n"),
"Ollama",
);
}
const envKey = resolveEnvApiKey("ollama");
if (envKey) {
const useExisting = await params.prompter.confirm({
message: `Use existing OLLAMA_API_KEY (${envKey.source}, ${formatApiKeyPreview(envKey.apiKey)})?`,
initialValue: true,
});
if (useExisting) {
await setOllamaApiKey(envKey.apiKey, params.agentDir);
hasCredential = true;
}
}
if (!hasCredential) {
const key = await params.prompter.text({
message: "Enter Ollama API key (any non-empty string)",
initialValue: "ollama",
validate: validateApiKeyInput,
});
await setOllamaApiKey(normalizeApiKeyInput(String(key)), params.agentDir);
}
nextConfig = applyAuthProfileConfig(nextConfig, {
profileId: "ollama:default",
provider: "ollama",
mode: "api_key",
});
return { config: nextConfig, agentModelOverride };
}
if (authChoice === "opencode-zen") { if (authChoice === "opencode-zen") {
let hasCredential = false; let hasCredential = false;
if (!hasCredential && params.opts?.token && params.opts?.tokenProvider === "opencode") { if (!hasCredential && params.opts?.token && params.opts?.tokenProvider === "opencode") {

View File

@ -28,6 +28,7 @@ const PREFERRED_PROVIDER_BY_AUTH_CHOICE: Partial<Record<AuthChoice, string>> = {
minimax: "lmstudio", minimax: "lmstudio",
"opencode-zen": "opencode", "opencode-zen": "opencode",
"qwen-portal": "qwen-portal", "qwen-portal": "qwen-portal",
"ollama-api-key": "ollama",
}; };
export function resolvePreferredProviderForAuthChoice(choice: AuthChoice): string | undefined { export function resolvePreferredProviderForAuthChoice(choice: AuthChoice): string | undefined {

View File

@ -153,6 +153,18 @@ export async function setVercelAiGatewayApiKey(key: string, agentDir?: string) {
}); });
} }
export async function setOllamaApiKey(key: string, agentDir?: string) {
upsertAuthProfile({
profileId: "ollama:default",
credential: {
type: "api_key",
provider: "ollama",
key,
},
agentDir: resolveAuthAgentDir(agentDir),
});
}
export async function setOpencodeZenApiKey(key: string, agentDir?: string) { export async function setOpencodeZenApiKey(key: string, agentDir?: string) {
upsertAuthProfile({ upsertAuthProfile({
profileId: "opencode:default", profileId: "opencode:default",

View File

@ -39,6 +39,7 @@ export {
setKimiCodeApiKey, setKimiCodeApiKey,
setMinimaxApiKey, setMinimaxApiKey,
setMoonshotApiKey, setMoonshotApiKey,
setOllamaApiKey,
setOpencodeZenApiKey, setOpencodeZenApiKey,
setOpenrouterApiKey, setOpenrouterApiKey,
setSyntheticApiKey, setSyntheticApiKey,

View File

@ -31,6 +31,7 @@ export type AuthChoice =
| "github-copilot" | "github-copilot"
| "copilot-proxy" | "copilot-proxy"
| "qwen-portal" | "qwen-portal"
| "ollama-api-key"
| "skip"; | "skip";
export type GatewayAuthChoice = "token" | "password"; export type GatewayAuthChoice = "token" | "password";
export type ResetScope = "config" | "config+creds+sessions" | "full"; export type ResetScope = "config" | "config+creds+sessions" | "full";