@kkmila/cpc 1.0.1 → 1.0.5

package/src/commands/provider.mjs

@@ -4,7 +4,10 @@ import { existsSync, readFileSync, writeFileSync, mkdirSync } from "node:fs";
 import { resolve, join } from "node:path";
 import { homedir } from "node:os";
 import yaml from "js-yaml";
-import { loadRegistry, getAgents, resolveAgentPaths } from "../lib/agents.mjs";
+import { loadRegistry, getAgents, resolveAgentPaths, detectCurrentAgent } from "../lib/agents.mjs";
+import { enrichModelWithBaseline } from "../lib/baseline-models.mjs";
+import { persistEnvVar, envKeyNameForProvider } from "../lib/env.mjs";
+import { writeCodexProviderConfig, readCodexProviderInfo } from "../lib/codex-toml.mjs";
 
 /**
  * Get the config directory path (~/.config/cpc)
@@ -120,10 +123,10 @@ const MODEL_DEFAULTS = {
 	"gpt-4o": { contextWindow: 128000, maxTokens: 16384, reasoning: false },
 	"gpt-4o-mini": { contextWindow: 128000, maxTokens: 16384, reasoning: false },
 	"gpt-3.5-turbo": { contextWindow: 16385, maxTokens: 4096, reasoning: false },
-	o1: { contextWindow: 200000, maxTokens: 100000, reasoning: true },
-	"o1-mini": { contextWindow: 128000, maxTokens: 65536, reasoning: true },
-	"o1-preview": { contextWindow: 128000, maxTokens: 32768, reasoning: true },
-	"o3-mini": { contextWindow: 200000, maxTokens: 100000, reasoning: true },
+	o1: { contextWindow: 200000, maxTokens: 100000, reasoning: false },
+	"o1-mini": { contextWindow: 128000, maxTokens: 65536, reasoning: false },
+	"o1-preview": { contextWindow: 128000, maxTokens: 32768, reasoning: false },
+	"o3-mini": { contextWindow: 200000, maxTokens: 100000, reasoning: false },
 
 	// Anthropic
 	"claude-3-opus-20240229": {
@@ -158,7 +161,7 @@ const MODEL_DEFAULTS = {
 	"deepseek-reasoner": {
 		contextWindow: 65536,
 		maxTokens: 8192,
-		reasoning: true,
+		reasoning: false,
 	},
 
 	// Qwen
@@ -166,6 +169,10 @@ const MODEL_DEFAULTS = {
 	"qwen-plus": { contextWindow: 32768, maxTokens: 8192, reasoning: false },
 	"qwen-max": { contextWindow: 32768, maxTokens: 8192, reasoning: false },
 
+	// 智谱 GLM-5.2
+	"glm-5.2": { contextWindow: 1000000, maxTokens: 131072, reasoning: false },
+	"glm-5.2-anthropic": { contextWindow: 1000000, maxTokens: 131072, reasoning: false },
+
 	// 通用默认值
 	default: { contextWindow: 32768, maxTokens: 4096, reasoning: false },
 };
@@ -187,16 +194,9 @@ function getModelDefaults(modelId) {
 		}
 	}
 
-	// 检测是否是推理模型
-	const isReasoning =
-		lowerId.includes("reason") ||
-		lowerId.includes("o1") ||
-		lowerId.includes("o3") ||
-		lowerId.includes("think");
-
 	return {
 		...MODEL_DEFAULTS["default"],
-		reasoning: isReasoning,
+		reasoning: false,
 	};
 }
 
@@ -322,24 +322,26 @@ function getAgentProviderConfig(agentId, provider) {
 				},
 			};
 
-		case "codex":
+		case "codex": {
+			// codex 一次只能用一个模型（顶层 model + model_provider）。
+			// provider 段用 env_key 引用环境变量，key 本身由 cpc 跨平台落地。
+			const envKey = envKeyNameForProvider(provider.name);
 			return {
-				configToml: {
-					model_provider: provider.name,
+				codex: {
+					providerName: provider.name,
+					baseUrl: provider.baseUrl,
+					wireApi:
+						provider.api === "anthropic-messages"
+							? "chat_completions"
+							: provider.api === "openai-completions"
+								? "chat_completions"
+								: "responses",
+					envKey,
 					model: provider.models[0]?.id || "default",
-					model_providers: {
-						[provider.name]: {
-							name: provider.name,
-							base_url: provider.baseUrl,
-							wire_api:
-								provider.api === "anthropic-messages"
-									? "chat_completions"
-									: "responses",
-							requires_openai_auth: false,
-						},
-					},
+					apiKey: provider.apiKey,
 				},
 			};
+		}
 
 		case "openclaw":
 			return {
@@ -387,6 +389,27 @@ function getAgentProviderConfig(agentId, provider) {
 				},
 			};
 
+		case "opencode":
+			return {
+				opencodeJson: {
+					provider: {
+						[provider.name]: {
+							models: provider.models.reduce((acc, m) => {
+								acc[m.id] = {
+									name: m.name || m.id,
+								};
+								return acc;
+							}, {}),
+							npm: "@ai-sdk/openai-compatible",
+							options: {
+								apiKey: provider.apiKey,
+								baseURL: provider.baseUrl,
+							},
+						},
+					},
+				},
+			};
+
 		default:
 			return null;
 	}
@@ -395,7 +418,7 @@ function getAgentProviderConfig(agentId, provider) {
 /**
  * Install provider configuration to agent
  */
-function installProviderToAgent(agentId, provider, agentHome) {
+function installProviderToAgent(agentId, provider, agentHome, opts = {}) {
 	const config = getAgentProviderConfig(agentId, provider);
 	if (!config) {
 		console.log(chalk.yellow(`  ⚠ 未知 agent: ${agentId}`));
@@ -420,7 +443,13 @@ function installProviderToAgent(agentId, provider, agentHome) {
 				const modelsPath = join(agentHome, "models.json");
 				let models = { providers: {} };
 				if (existsSync(modelsPath)) {
-					models = JSON.parse(readFileSync(modelsPath, "utf8"));
+					try {
+						const content = readFileSync(modelsPath, "utf8").trim();
+						if (content) models = JSON.parse(content);
+					} catch {
+						// 空文件或损坏的 JSON，重置为默认值
+						models = { providers: {} };
+					}
 				}
 				models.providers = {
 					...models.providers,
@@ -445,38 +474,55 @@ function installProviderToAgent(agentId, provider, agentHome) {
 
 			case "codex": {
 				const configPath = join(agentHome, "config.toml");
-				let configContent = "";
-				if (existsSync(configPath)) {
-					configContent = readFileSync(configPath, "utf8");
-				}
-
-				const providerSection = `\n[model_providers.${provider.name}]\nname = "${provider.name}"\nbase_url = "${provider.baseUrl}"\nwire_api = "${provider.api === "anthropic-messages" ? "chat_completions" : "responses"}"\nrequires_openai_auth = false\n`;
-
-				const modelLine = `model_provider = "${provider.name}"\n`;
-				const modelIdLine = `model = "${provider.models[0]?.id || "default"}"\n`;
+				const c = config.codex;
 
-				if (configContent.includes("model_provider =")) {
-					configContent = configContent.replace(
-						/model_provider = .*\n/,
-						modelLine,
+				// 1) 跨平台落地 API key 到环境变量
+				let envResult;
+				try {
+					envResult = persistEnvVar(c.envKey, c.apiKey);
+				} catch (err) {
+					console.error(
+						chalk.red(`  ✗ 落地环境变量 ${c.envKey} 失败: ${err.message}`),
 					);
-				} else {
-					configContent = modelLine + configContent;
-				}
-
-				if (configContent.includes("model =")) {
-					configContent = configContent.replace(/model = .*\n/, modelIdLine);
-				} else {
-					configContent = modelIdLine + configContent;
+					return false;
 				}
 
-				if (!configContent.includes(`[model_providers.${provider.name}]`)) {
-					configContent += providerSection;
+				// 2) 稳健写入 config.toml（顶层 + provider 段，备份原文件）
+				try {
+					const { backed } = writeCodexProviderConfig(configPath, {
+						providerName: c.providerName,
+						baseUrl: c.baseUrl,
+						wireApi: opts.wireApi || c.wireApi,
+						envKey: c.envKey,
+						model: c.model,
+						modelReasoningEffort: opts.modelReasoningEffort,
+					});
+					console.log(chalk.green(`  ✓ 更新 Codex config.toml`));
+					if (backed) {
+						console.log(chalk.dim(`  • 备份: ${backed}`));
+					}
+					console.log(
+						chalk.dim(
+							`  • env_key=$${c.envKey}  (${envResult.method}${envResult.target ? ": " + envResult.target : ""}${envResult.created ? ", 新增" : ", 已存在"})`,
+						),
+					);
+					if (process.platform !== "win32") {
+						console.log(
+							chalk.dim(
+								`  • 新终端自动加载; 当前终端需执行: source ${envResult.target}`,
+							),
+						);
+					}
+					console.log(
+						chalk.dim(`  • 启动: codex  (全局默认即 ${c.providerName}/${c.model})`),
+					);
+					return true;
+				} catch (err) {
+					console.error(
+						chalk.red(`  ✗ 更新 ${agentId} 失败: ${err.message}`),
+					);
+					return false;
 				}
-
-				writeFileSync(configPath, configContent);
-				console.log(chalk.green(`  ✓ 更新 Codex config.toml`));
-				return true;
 			}
 
 			case "openclaw": {
@@ -511,6 +557,22 @@ function installProviderToAgent(agentId, provider, agentHome) {
 				return true;
 			}
 
+			case "opencode": {
+				const configPath = join(agentHome, "opencode.json");
+				let configData = {};
+				if (existsSync(configPath)) {
+					configData = JSON.parse(readFileSync(configPath, "utf8"));
+				}
+				if (!configData.provider) configData.provider = {};
+				configData.provider = {
+					...configData.provider,
+					...config.opencodeJson.provider,
+				};
+				writeFileSync(configPath, JSON.stringify(configData, null, 2));
+				console.log(chalk.green(`  ✓ 更新 OpenCode opencode.json`));
+				return true;
+			}
+
 			default:
 				console.log(chalk.yellow(`  ⚠ 未知 agent: ${agentId}`));
 				return false;
@@ -521,6 +583,15 @@ function installProviderToAgent(agentId, provider, agentHome) {
 	}
 }
 
+/**
+ * Check if an agent is installed by looking at its home directory
+ */
+function isAgentInstalled(agentId, agents) {
+	const agent = resolveAgentPaths(agents[agentId]);
+	if (!agent || !agent.home) return false;
+	return existsSync(agent.home);
+}
+
 export function registerProvider(program, repoRoot) {
 	// ── cpc add ──────────────────────────────────────────────────
 	program
@@ -647,14 +718,23 @@ export function registerProvider(program, repoRoot) {
 					for (const modelId of selected) {
 						const model = result.models.find((m) => m.id === modelId);
 						const defaults = getModelDefaults(modelId);
-						const configured = {
+						// 先用 baseline 字典补全 contextWindow / input / description,
+						// 未命中时回退到 API 响应与 MODEL_DEFAULTS
+						const configured = enrichModelWithBaseline({
 							id: modelId,
 							name: model?.name || modelId,
 							contextWindow: model?.contextWindow || defaults.contextWindow,
 							maxTokens: model?.maxTokens || defaults.maxTokens,
 							reasoning: model?.reasoning || defaults.reasoning,
 							input: model?.input || ["text"],
-						};
+						});
+						if (configured.description) {
+							console.log(
+								chalk.dim(
+									`  ↪ ${modelId}: 命中 baseline, 已注入 contextWindow=${configured.contextWindow}, input=[${configured.input.join(",")}]`,
+								),
+							);
+						}
 						models.push(configured);
 					}
 				} else {
@@ -976,14 +1056,23 @@ export function registerProvider(program, repoRoot) {
 			for (const modelId of selected) {
 				const model = result.models.find((m) => m.id === modelId);
 				const defaults = getModelDefaults(modelId);
-				const configured = {
+				// 先用 baseline 字典补全 contextWindow / input / description,
+				// 未命中时回退到 API 响应与 MODEL_DEFAULTS
+				const configured = enrichModelWithBaseline({
 					id: modelId,
 					name: model?.name || modelId,
 					contextWindow: model?.contextWindow || defaults.contextWindow,
 					maxTokens: model?.maxTokens || defaults.maxTokens,
 					reasoning: model?.reasoning || defaults.reasoning,
 					input: model?.input || ["text"],
-				};
+				});
+				if (configured.description) {
+					console.log(
+						chalk.dim(
+							`  ↪ ${modelId}: 命中 baseline, 已注入 contextWindow=${configured.contextWindow}, input=[${configured.input.join(",")}]`,
+						),
+					);
+				}
 
 				if (opts.merge) {
 					config.models = config.models || [];
@@ -1005,6 +1094,192 @@ export function registerProvider(program, repoRoot) {
 			);
 		});
 
+	// ── cpc update ───────────────────────────────────────────────
+	program
+		.command("update [providerName]")
+		.description("重新从 API 拉取模型并更新 providers.json + 已安装的 agent")
+		.option("--all", "选择全部模型")
+		.option("--agent <agent>", "指定目标 agent")
+		.action(async (providerName, opts) => {
+			const providersData = loadProviders();
+			const providers = Object.entries(providersData.providers);
+
+			if (providers.length === 0) {
+				console.log(chalk.yellow("No providers configured."));
+				console.log(chalk.dim("Use `cpc add` to add a new provider first."));
+				return;
+			}
+
+			// Step 1: 选择 provider
+			if (!providerName) {
+				providerName = await select({
+					message: "Select provider to update:",
+					choices: providers.map(([name, config]) => ({
+						name: `${name.padEnd(20)} (${config.models?.length || 0} models)`,
+						value: name,
+					})),
+				});
+			}
+
+			const provider = providersData.providers[providerName];
+			if (!provider) {
+				console.error(chalk.red(`Provider "${providerName}" not found.`));
+				process.exit(1);
+			}
+
+			// Step 2: 从 API 拉取模型
+			console.log(chalk.dim(`\nFetching models from ${provider.baseUrl}...`));
+			const result = await fetchModelsFromAPI(provider.baseUrl, provider.apiKey, provider.api);
+
+			if (!result.success) {
+				console.log(chalk.red(`✗ Failed to fetch models: ${result.error}`));
+				return;
+			}
+
+			console.log(chalk.green(`✓ Found ${result.models.length} models from API`));
+
+			// Step 3: 选择模型
+			const oldIds = (provider.models || []).map((m) => m.id);
+			const newIds = result.models.map((m) => m.id);
+
+			// 报告新增和移除的模型
+			const addedIds = newIds.filter((id) => !oldIds.includes(id));
+			const removedIds = oldIds.filter((id) => !newIds.includes(id));
+			const keptIds = oldIds.filter((id) => newIds.includes(id));
+
+			if (addedIds.length > 0) {
+				console.log(chalk.cyan(`  + ${addedIds.length} new model(s): ${addedIds.join(", ")}`));
+			}
+			if (removedIds.length > 0) {
+				console.log(chalk.yellow(`  - ${removedIds.length} removed model(s): ${removedIds.join(", ")}`));
+			}
+			if (keptIds.length > 0) {
+				console.log(chalk.dim(`  = ${keptIds.length} kept model(s): ${keptIds.join(", ")}`));
+			}
+
+			// 让用户选择要安装的模型
+			let selectedIds;
+			if (opts.all) {
+				selectedIds = result.models.map((m) => m.id);
+				console.log(chalk.dim(`Auto-selected all ${selectedIds.length} models`));
+			} else {
+				selectedIds = await checkbox({
+					message: "Select models to install:",
+					choices: result.models.map((m) => {
+						const isNew = !oldIds.includes(m.id);
+						return {
+							name: `${isNew ? chalk.cyan("+ ") : chalk.dim("  ")}${m.id.padEnd(40)} ctx:${m.contextWindow || "?"}`,
+							value: m.id,
+							checked: true,
+						};
+					}),
+					instructions: {
+						navigator: "↑↓ navigate",
+						select: "space select",
+						all: "a toggle all",
+						},
+				});
+			}
+
+			if (selectedIds.length === 0) {
+				console.log(chalk.yellow("No models selected. Cancelled."));
+				return;
+			}
+
+			// Step 4: 用 baseline + MODEL_DEFAULTS 补全模型属性
+			const updatedModels = [];
+			for (const modelId of selectedIds) {
+				const apiModel = result.models.find((m) => m.id === modelId);
+				const defaults = getModelDefaults(modelId);
+				const configured = enrichModelWithBaseline({
+					id: modelId,
+					name: apiModel?.name || modelId,
+					contextWindow: apiModel?.contextWindow || defaults.contextWindow,
+					maxTokens: apiModel?.maxTokens || defaults.maxTokens,
+					reasoning: false,
+					input: apiModel?.input || defaults.input || ["text"],
+				});
+				if (configured.description) {
+					console.log(chalk.dim(`  ↪ ${modelId}: baseline 命中, contextWindow=${configured.contextWindow}, input=[${configured.input.join(",")}]`));
+				}
+				updatedModels.push(configured);
+			}
+
+			// Step 5: 更新 providers.json
+			provider.models = updatedModels;
+			provider.updatedAt = new Date().toISOString();
+			saveProviders(providersData);
+			console.log(chalk.green(`\n✓ Provider "${providerName}" updated: ${updatedModels.length} model(s)`));
+
+			// Step 6: 更新已安装的 agent
+			const registry = loadRegistry(repoRoot);
+			const agents = getAgents(registry);
+			const resolvedAgents = Object.fromEntries(
+				Object.entries(agents).map(([id, a]) => [id, resolveAgentPaths(a)]),
+			);
+			const installProvider = { ...provider, models: updatedModels };
+
+			// 找出哪些 agent 之前安装过这个 provider
+			let agentIds;
+			if (opts.agent) {
+				agentIds = opts.agent === "all" ? Object.keys(agents) : [opts.agent];
+			} else {
+				// 只显示 pi 和 opencode，默认不勾选
+				const visibleAgentIds = Object.keys(resolvedAgents)
+					.filter((id) => id === "pi" || id === "opencode");
+
+				if (visibleAgentIds.length === 0) {
+					console.log(chalk.dim("\nNo pi or opencode agents found. Skipping agent update."));
+					return;
+				}
+
+				agentIds = await checkbox({
+					message: "Select target agents to update:",
+					choices: visibleAgentIds.map((id) => {
+						const a = resolvedAgents[id];
+						const installed = isAgentInstalled(id, resolvedAgents);
+						const mark = installed ? " (installed)" : "";
+						return {
+							name: `${id.padEnd(14)} ${a.description || ""}${mark}`,
+							value: id,
+							checked: false,
+						};
+					}),
+					instructions: {
+						navigator: "↑↓ navigate",
+						select: "space select",
+						all: "a toggle all",
+						},
+				});
+			}
+
+			if (agentIds.length === 0) {
+				console.log(chalk.yellow("No agents selected. Skipping agent update."));
+				return;
+			}
+
+			console.log();
+			let successCount = 0;
+			for (const aid of agentIds) {
+				const agent = resolvedAgents[aid];
+				if (!agent) {
+					console.log(chalk.red(`Unknown agent: ${aid}`));
+					continue;
+				}
+				console.log(chalk.bold(`→ ${aid}`));
+				console.log(chalk.dim(`  ${updatedModels.length} model(s)`));
+				const success = installProviderToAgent(aid, installProvider, agent.home);
+				if (success) successCount++;
+				console.log();
+			}
+
+			if (successCount > 0) {
+				console.log(chalk.green.bold(`✓ Provider updated in ${successCount} agent(s)!`));
+				} else {
+				console.log(chalk.yellow("No agents were updated."));
+				}
+			});
+
 	// ── cpc remove ───────────────────────────────────────────────
 	program
 		.command("remove [name]")
@@ -1057,6 +1332,8 @@ export function registerProvider(program, repoRoot) {
 		.option("--model <model>", "Install only specific model")
 		.option("--all", "Install all models")
 		.option("--first", "Install only first model")
+		.option("--wire-api <api>", "Codex wire_api (responses | chat_completions)")
+		.option("--reasoning-effort <level>", "Codex model_reasoning_effort (minimal|low|medium|high)")
 		.action(async (providerName, opts) => {
 			const registry = loadRegistry(repoRoot);
 			const agents = getAgents(registry);
@@ -1134,44 +1411,132 @@ export function registerProvider(program, repoRoot) {
 			}
 
 			// Step 3: Select agent(s)
-			let agentId;
+			let agentIds;
 			if (opts.agent) {
-				agentId = opts.agent;
+				agentIds = opts.agent === "all" ? Object.keys(agents) : [opts.agent];
 			} else {
-				agentId = await select({
-					message: "Select target agent:",
+				// Auto-detect: 只显示 pi 和 opencode，默认不勾选
+				const visibleAgentIds = Object.keys(agents)
+					.filter((id) => id === "pi" || id === "opencode");
+				const currentAgent = detectCurrentAgent(agents);
+				const selected = await checkbox({
+					message: "Select target agents:",
 					choices: [
-						...Object.entries(agents).map(([id, a]) => ({
-							name: `${id.padEnd(14)} ${a.description || ""}`,
-							value: id,
-						})),
-						{ name: "─────────", value: "__separator__", disabled: true },
-						{ name: "all agents", value: "all" },
+						...visibleAgentIds.map((id) => {
+							const a = agents[id];
+							const mark = id === currentAgent ? " ← current" : "";
+							return {
+								name: `${id.padEnd(14)} ${a.description || ""}${mark}`,
+								value: id,
+								checked: false,
+							};
+						}),
 					],
+					instructions: {
+						navigator: "↑↓ navigate",
+						select: "space select",
+						all: "a toggle all",
+					},
 				});
-			}
 
-			const agentIds = agentId === "all" ? Object.keys(agents) : [agentId];
+				if (selected.length === 0) {
+					console.log(chalk.yellow("No agents selected. Cancelled."));
+					return;
+				}
+
+				agentIds = selected;
+			}
 
 			// Step 4: Install provider to agents
 			console.log();
 			let successCount = 0;
 
+			// codex 特殊处理：全局只能用一个 model，需确定 wire_api（协议）。
+			// 如果目标含 codex 且选了多个模型，先让用户挑一个作为默认。
+			const hasCodex = agentIds.includes("codex");
+			let codexDefaultModel = null;
+			let codexWireApi = opts.wireApi || null;
+			let codexReasoningEffort = opts.reasoningEffort || null;
+			if (hasCodex) {
+				let codexModels = installProvider.models;
+				if (codexModels.length > 1) {
+					console.log(
+						chalk.yellow(
+							`⚠ codex 一次只能用一个模型（顶层 model），多模型时仅生效默认这一个`,
+						),
+					);
+					const picked = await select({
+						message: "选择 codex 的默认 model:",
+						choices: codexModels.map((m) => ({
+							name: `${m.id}${m.description ? " — " + m.description : ""}`,
+							value: m.id,
+						})),
+					});
+					codexDefaultModel = picked;
+				} else {
+					codexDefaultModel = codexModels[0]?.id;
+				}
+				// wire_api 选择（未传 --wire-api 时交互确认）
+				if (!codexWireApi) {
+					const inferred =
+						installProvider.api === "responses"
+							? "responses"
+							: installProvider.api === "anthropic-messages"
+								? "chat_completions"
+								: "chat_completions";
+					codexWireApi = await select({
+						message: `codex wire_api（与 ${installProvider.name} 通信协议）:`,
+						choices: [
+							{
+								name: `responses  — Codex Responses 原生协议（CCX 网关用这个）${inferred === "responses" ? "  [推断]" : ""}`,
+								value: "responses",
+							},
+							{
+								name: `chat_completions  — 标准 OpenAI 兼容协议（多数网关用这个）${inferred === "chat_completions" ? "  [推断]" : ""}`,
+								value: "chat_completions",
+							},
+						],
+					});
+				}
+			}
+
 			for (const aid of agentIds) {
 				const agentDef = agents[aid];
 				if (!agentDef) {
 					console.log(chalk.red(`Unknown agent: ${aid}`));
 					continue;
-				}
+			}
 
 				const agent = resolveAgentPaths(agentDef);
 				console.log(chalk.bold(`→ ${aid}`));
-				console.log(chalk.dim(`  ${installProvider.models.length} model(s)`));
+
+				let targetProvider = installProvider;
+				let targetOpts = {};
+				if (aid === "codex") {
+					const picked =
+						installProvider.models.find(
+							(m) => m.id === codexDefaultModel,
+						) || installProvider.models[0];
+					targetProvider = { ...installProvider, models: [picked] };
+					targetOpts = {
+						wireApi: codexWireApi,
+						modelReasoningEffort: codexReasoningEffort,
+					};
+					console.log(
+						chalk.dim(`  model: ${picked.id}  (codex 全局默认, 单模型)`),
+					);
+					console.log(chalk.dim(`  wire_api: ${codexWireApi}`));
+				} else {
+					console.log(
+						chalk.dim(`  ${targetProvider.models.length} model(s)`),
+					);
+				}
 
 				const success = installProviderToAgent(
 					aid,
-					installProvider,
+					targetProvider,
 					agent.home,
+					targetOpts,
 				);
 				if (success) successCount++;
 				console.log();
@@ -1445,7 +1810,13 @@ export function registerProvider(program, repoRoot) {
 						case "pi": {
 							const modelsPath = join(agent.home, "models.json");
 							if (existsSync(modelsPath)) {
-								const models = JSON.parse(readFileSync(modelsPath, "utf8"));
+								let models = { providers: {} };
+								try {
+									const content = readFileSync(modelsPath, "utf8").trim();
+									if (content) models = JSON.parse(content);
+								} catch {
+									models = { providers: {} };
+								}
 								if (
 									models.providers &&
 									Object.keys(models.providers).length > 0
@@ -1494,20 +1865,15 @@ export function registerProvider(program, repoRoot) {
 
 						case "codex": {
 							const configPath = join(agent.home, "config.toml");
-							if (existsSync(configPath)) {
-								const content = readFileSync(configPath, "utf8");
-								const providerMatch = content.match(/model_provider = "(.*?)"/);
-								const modelMatch = content.match(/model = "(.*?)"/);
-								if (providerMatch) {
-									console.log(`  Provider: ${chalk.dim(providerMatch[1])}`);
-									console.log(
-										`  Model:    ${chalk.dim(modelMatch ? modelMatch[1] : "not set")}`,
-									);
-								} else {
-									console.log(chalk.dim("  No provider configured"));
-								}
+							const info = readCodexProviderInfo(configPath);
+							if (info.provider) {
+								console.log(`  Provider: ${chalk.dim(info.provider)}`);
+								console.log(`  Model:    ${chalk.dim(info.model || "not set")}`);
+								console.log(`  Base URL: ${chalk.dim(info.baseUrl || "not set")}`);
+								console.log(`  Wire API: ${chalk.dim(info.wireApi || "not set")}`);
+								console.log(`  Env Key:  ${chalk.dim(info.envKey || "(none)")}`);
 							} else {
-								console.log(chalk.dim("  Config file not found"));
+								console.log(chalk.dim("  No provider configured"));
 							}
 							break;
 						}
@@ -1563,6 +1929,29 @@ export function registerProvider(program, repoRoot) {
 							break;
 						}
 
+						case "opencode": {
+							const configPath = join(agent.home, "opencode.json");
+							if (existsSync(configPath)) {
+								const configData = JSON.parse(readFileSync(configPath, "utf8"));
+								if (configData.provider && Object.keys(configData.provider).length > 0) {
+									for (const [name, config] of Object.entries(
+										configData.provider,
+									)) {
+										console.log(`  ${chalk.blue(name)}`);
+										console.log(`    URL:    ${chalk.dim(config.options?.baseURL || "not set")}`);
+										console.log(
+											`    Models: ${chalk.dim(Object.keys(config.models || {}).length)}`,
+										);
+									}
+								} else {
+									console.log(chalk.dim("  No providers configured"));
+								}
+							} else {
+								console.log(chalk.dim("  Config file not found"));
+							}
+							break;
+						}
+
 						default:
 							console.log(chalk.dim("  Unsupported agent"));
 					}
@@ -1570,7 +1959,88 @@ export function registerProvider(program, repoRoot) {
 					console.log(chalk.red(`  Error reading config: ${err.message}`));
 				}
 
-				console.log();
+			console.log();
+		}
+	});
+
+	// ── cpc doctor ───────────────────────────────────────────────
+	program
+		.command("doctor")
+		.description("Check if cpc is properly configured and working")
+		.action(() => {
+			console.log(chalk.bold("\n🔍 CPC Doctor\n"));
+			
+			let issues = 0;
+			
+			// Check Node.js version
+			const nodeVersion = process.version;
+			const requiredVersion = "18.0.0";
+			const nodeOk = compareVersions(nodeVersion.slice(1), requiredVersion) >= 0;
+			console.log(`${nodeOk ? "✅" : "❌"} Node.js version: ${nodeVersion} (required: >=${requiredVersion})`);
+			if (!nodeOk) issues++;
+			
+			// Check registry.yaml
+			try {
+				const registry = loadRegistry(repoRoot);
+				const agents = getAgents(registry);
+				const agentCount = Object.keys(agents).length;
+				console.log(`✅ registry.yaml: ${agentCount} agents defined`);
+			} catch (err) {
+				console.log(`❌ registry.yaml: ${err.message}`);
+				issues++;
+			}
+			
+			// Check config directory
+			const configDir = getConfigDir();
+			if (existsSync(configDir)) {
+				console.log(`✅ Config directory: ${configDir}`);
+				
+				// Check providers.json
+				try {
+					const providers = loadProviders();
+					const providerCount = Object.keys(providers.providers).length;
+					console.log(`✅ providers.json: ${providerCount} provider(s) configured`);
+				} catch (err) {
+					console.log(`❌ providers.json: ${err.message}`);
+					issues++;
+				}
+			} else {
+				console.log(`⚠️  Config directory: ${configDir} (will be created on first use)`);
+			}
+			
+			// Check installed agents
+			console.log(chalk.bold("\nInstalled Agents:"));
+			try {
+				const registry = loadRegistry(repoRoot);
+				const agents = getAgents(registry);
+				for (const [id, agent] of Object.entries(agents)) {
+					const installed = isAgentInstalled(id, agents);
+					console.log(`${installed ? "✅" : "⬜"} ${id.padEnd(14)} ${agent.description || ""}`);
+				}
+			} catch (err) {
+				console.log(chalk.red(`  Error: ${err.message}`));
 			}
+			
+			// Summary
+			console.log(chalk.bold(`\n${"═".repeat(40)}`));
+			if (issues === 0) {
+				console.log(chalk.green.bold("✅ All checks passed! CPC is ready to use."));
+			} else {
+				console.log(chalk.red.bold(`❌ Found ${issues} issue(s). Please fix them before using CPC.`));
+			}
+			console.log();
 		});
 }
+
+/**
+ * Compare semver versions
+ */
+function compareVersions(a, b) {
+	const pa = a.split(".").map(Number);
+	const pb = b.split(".").map(Number);
+	for (let i = 0; i < 3; i++) {
+		if (pa[i] > pb[i]) return 1;
+		if (pa[i] < pb[i]) return -1;
+	}
+	return 0;
+}