@yhong91/cpac 0.1.23 → 0.1.25

package/README.md

@@ -47,9 +47,9 @@ cpac uninstall --target codex          # 字节级恢复原配置
 cpac claude                            # Claude Code 走 CPA
 cpac opencode                          # opencode 走 CPA（模型选 cpac/<模型名>）
 
-# 5. 可选：Claude 模型槽位覆盖（持久缓存；默认自动选择已覆盖多数场景，见下文）
-cpac claude-models                     # 查看当前覆盖
-cpac claude-models --haiku             # 下拉选择 haiku 槽模型
+# 5. 可选：Agent 配置向导与模型选择
+cpac codex setup                       # 进入 Codex 配置向导（Subagent 模型多选、最大上下文、Multi-Agent V2）
+cpac claude setup                      # 进入 Claude Code 模型向导（Sonnet、Haiku、Opus 槽位选择）
 
 # 6. 升级（装上新版本后自动 sync 已接入的 agent）
 cpac upgrade
@@ -59,7 +59,7 @@ cpac upgrade
 
 ## Agent 自动化安装指南
 
-本节面向 AI agent：按顺序执行即可完成安装与配置，**全程无交互**。注意：`--v2_models` 复选框和 `claude-models` 不带值的下拉选择是 TTY-only，agent 必须走下方直接写配置 JSON 的路径。
+本节面向 AI agent：按顺序执行即可完成安装与配置，**全程无交互**。注意：`cpac codex --config` 和 `cpac claude --config` 的交互向导是 TTY-only，agent 必须走下方直接写配置 JSON 的路径。
 
 1. **检查前置**：`node --version` ≥ 20；确认用户需要哪些 agent（`codex`/`claude`/`pi`/`kimi`/`opencode` 在 PATH 上）。向用户索取 CPA API key。
 
@@ -72,7 +72,7 @@ source ~/.zshrc
 cpac status   # 验证：CPA_API_KEY 应显示 configured
 ```
 
-3. **写入模型配置**（创建或合并 `~/.config/cpac/config.json`，已有键保留）：
+1. **写入模型配置**（创建或合并 `~/.config/cpac/config.json`，已有键保留）：
 
 ```json
 {
@@ -80,20 +80,23 @@ cpac status   # 验证：CPA_API_KEY 应显示 configured
 }
 ```
 
-   Claude 槽位（opus/sonnet/haiku）通常不用配：cpac 启动时自动选择——同家族 claude 模型优先，否则 gemini → grok → luna → 目录第一个；opus 无匹配则不设。这个链条在常见目录上正好给出理想结果：sonnet 落在 claude-sonnet-*（它同时充当 Auto mode 分类器的替身，避免分类请求失败后回退到昂贵的会话主模型），haiku 落在快的 gemini flash。只有目录奇怪时才用 `cpac claude-models --opus/--sonnet/--haiku <模型>` 显式覆盖。codex spawn subagent 取三个 GPT + gemini + grok 五席（顺序即优先级，Codex 只广告 catalog 前 5）。候选替换：`mimo-v2.5`（haiku）、`grok-4.5`（haiku）。若上述 slug 不在目录中（`curl -s -H "Authorization: Bearer $CPA_API_KEY" "$CPA_BASE_URL/v1/models"` 可查），按家族就近替换。分类器机制细节见 [docs/claude-auto-mode-classifier.md](docs/claude-auto-mode-classifier.md)。
+   Claude 槽位（opus/sonnet/haiku）通常不用配：cpac 启动时自动选择——同家族 claude 模型优先，否则 gemini → grok → luna → 目录第一个；opus 无匹配则不设。这个链条在常见目录上正好给出理想结果：sonnet 落在 claude-sonnet-*（它同时充当 Auto mode 分类器的替身，避免分类请求失败后回退到昂贵的会话主模型），haiku 落在快的 gemini flash。只有目录奇怪时才用 `cpac claude setup` 交互式配置。codex spawn subagent 取三个 GPT + gemini + grok 五席（顺序即优先级，Codex 只广告 catalog 前 5），可通过 `cpac codex setup` 交互式配置。候选替换：`mimo-v2.5`（haiku）、`grok-4.5`（haiku）。若上述 slug 不在目录中（`curl -s -H "Authorization: Bearer $CPA_API_KEY" "$CPA_BASE_URL/v1/models"` 可查），按家族就近替换。分类器机制细节见 [docs/claude-auto-mode-classifier.md](docs/claude-auto-mode-classifier.md)。
 
-4. **持久注入**（只对检测到的目标；codex 会应用步骤 3 的 spawn_models）：
+1. **持久注入**（只对检测到的目标；codex 会应用步骤 3 的 spawn_models）：
 
 ```bash
 cpac install --all
 cpac status   # 验证：各 target 显示 ready/injected
 ```
 
-5. **临时接管类 agent 无需安装**，直接告知用户用 `cpac claude` / `cpac opencode` 启动（步骤 3 的 claude_models 自动生效）。
+1. **统一启动与配置**：
+   - 启动：`cpac <codex|claude|kimi|grok|pi|opencode> [args...]`（所有原生参数如 `-c` 等原样透明传递）
+   - 配置：`cpac <codex|claude> setup`（交互式配置模型与特性）
+   - 还原：`cpac <agent> clear`（还原或重置配置）
 
-6. **已安装后升级**：npm 发布新版本后，等 publish 成功再执行 `cpac upgrade`。它会按需 `npm install -g`，再对已接入的 Codex / Pi / Kimi 做 `sync`。不要拆成 `npm install -g @yhong91/cpac` 再手动 `cpac sync`。只刷新配置、不升 CLI 时才用 `cpac sync`。
+2. **已安装后升级**：npm 发布新版本后，等 publish 成功再执行 `cpac upgrade`。它会按需 `npm install -g`，再对已接入的 Codex / Pi / Kimi / Grok 做 `sync`。不要拆成 `npm install -g @yhong91/cpac` 再手动 `cpac sync`。只刷新配置、不升 CLI 时才用 `cpac sync`。
 
-失败处理：任何一步报错时先跑 `cpac status`；密钥未配置回到步骤 2；注入后异常用 `cpac uninstall --target <id>` 恢复原配置。
+失败处理：任何一步报错时先跑 `cpac status`；密钥未配置回到步骤 2；注入后异常用 `cpac <agent> clear` 或 `cpac restore --target <id>` 恢复原配置。
 
 ## 首次引导
 
@@ -179,34 +182,20 @@ cpac version
 
 ### Claude Code
 
-通过 CPA 启动 Claude Code，后续参数原样传递：
+通过 CPA 启动 Claude Code，后续所有原生参数原样传递（如 `-c` 继续会话、`--model` 等）：
 
 ```bash
 cpac claude
+cpac claude -c                         # 继续上一次对话（原生 -c 原样直通）
 cpac claude --model claude-sonnet-4-5
 cpac claude -- -p "检查当前项目"
 ```
 
-`cpac claude` 会在本地起一个临时 loopback 代理，并为 Claude Code 子进程设置：
+#### 配置与清除
 
-```text
-ANTHROPIC_BASE_URL=http://127.0.0.1:<临时端口>
-ANTHROPIC_AUTH_TOKEN=<CPA_API_KEY>
-CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY=1
-CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST=1
-```
-
-同时清除可能覆盖网关选择的 `ANTHROPIC_API_KEY` 和 Claude Code 云 provider 环境变量。它不会修改 `~/.claude/`，并原样返回 Claude Code 的退出码。
-
-代理开启 Claude Code 的 gateway model discovery：`/model` 选择器会列出 CPA 目录里的全部模型。claude 系模型直接使用原 id；其它模型以 `claude-cpac--<模型名>` 别名出现（例如 `claude-cpac--gpt-5.6-sol`），请求发出时由代理还原为真实模型名。
-
-启动时还会把模型槽位（`ANTHROPIC_DEFAULT_OPUS/SONNET/HAIKU_MODEL` 及 `ANTHROPIC_SMALL_FAST_MODEL`）指向目录里的模型，避免 haiku/subagent 任务打到网关不认识的默认 id。默认自动选择（claude 系优先：按家族名匹配 opus/sonnet/haiku，否则最大窗口给 opus/sonnet、最小窗口给 haiku），可用命令覆盖：
-
-```sh
-cpac claude-models                                            # 查看当前覆盖
-cpac claude-models --opus claude-opus-4-8 --haiku glm-5.3     # 设置/合并
-cpac claude-models --haiku                                    # 不带值：arrow-key 下拉选择
-cpac claude-models --reset                                    # 恢复自动选择
+```bash
+cpac claude setup                      # 交互式依次配置 Sonnet / Haiku / Opus
+cpac claude clear                      # 重置所有覆盖，恢复自动选择
 ```
 
 未设置的槽位启动时自动选择：claude 池内同家族模型优先，否则按 gemini → grok → luna → 目录第一个回退；opus 无匹配则不设。
@@ -223,33 +212,25 @@ Claude Code 的发现协议不携带 context 信息，claude 前缀的未知模
 
 ### Codex
 
-注入 CPA 模型目录：
+启动 Codex，后续所有原生参数原样传递（如 `-c` 动态覆盖配置、`exec` 等）：
 
 ```bash
-cpac inject [--v2_off] [--v2_models] [--max_context] [--config PATH]
+cpac codex                             # 自动确保注入和代理后拉起 Codex
+cpac codex -c model="gpt-5"            # 动态覆盖 Codex 配置（原生 -c 原样直通）
+cpac codex exec "帮我写一个测试"
 ```
 
-查看状态：
+#### 配置与清除
 
 ```bash
-cpac status
+cpac codex setup                       # 交互式配置 Subagent 候选模型、最大上下文和 Multi-Agent V2
+cpac codex clear                       # 还原 Codex 原生配置并关闭代理
 ```
 
-`status` 列出所有支持的 agent 及当前状态：
-
-```text
-codex: injected proxy=http://127.0.0.1:10101/v1 sha256=...
-claude: ready
-pi: ready
-```
-
-- **codex**：`native`（未注入）、`injected`（已注入，附代理地址和配置摘要）、`injected (loopback proxy stopped)` 或 `injected (config missing)`
-- **claude**：`ready`（密钥已配置）或 `not configured`
-- **pi**：`ready`（密钥已配置）或 `not configured`
-
-恢复注入前的原配置：
+#### 传统注入命令
 
 ```bash
+cpac inject [--v2_off] [--v2_models] [--max_context] [--config PATH]
 cpac restore
 ```
 

package/dist/cpac.js

@@ -161,8 +161,7 @@ export function loadConfig(path, useDefaultsIfMissing = false) {
         });
     }
     const codexHome = expandUserPath(process.env.CODEX_HOME?.trim() || join(homedir(), ".codex"));
-    const codexConfig = resolve(expandUserPath(value.codex_config ||
-        join(codexHome, "config.toml")));
+    const codexConfig = resolve(expandUserPath(value.codex_config || join(codexHome, "config.toml")));
     const stateDir = resolve(expandUserPath(value.state_dir || join(homedir(), ".cpac")));
     const stateToConfig = relative(stateDir, codexConfig);
     if ([parse(stateDir).root, resolve(homedir()), resolve(tmpdir())].includes(stateDir) ||
@@ -248,9 +247,7 @@ export async function fetchCatalog(cpaUrl, apiKey) {
     if (!Array.isArray(models) || models.length === 0) {
         throw new CPACError("CPA rich catalog must contain a non-empty models array");
     }
-    if (models.some((model) => !objectValue(model) ||
-        typeof model.slug !== "string" ||
-        !model.slug.trim())) {
+    if (models.some((model) => !objectValue(model) || typeof model.slug !== "string" || !model.slug.trim())) {
         throw new CPACError("CPA catalog contains a model without a slug");
     }
     return {
@@ -265,10 +262,15 @@ export async function fetchCatalog(cpaUrl, apiKey) {
 // set auto_compact_token_limit at 90% (Codex's own convention), keeping
 // compaction ahead of the hard ceiling.
 export function liftContextWindows(bytes) {
-    const document = JSON.parse(new TextDecoder("utf-8", { fatal: true }).decode(bytes));
+    let document;
+    try {
+        document = JSON.parse(new TextDecoder("utf-8", { fatal: true }).decode(bytes));
+    }
+    catch {
+        throw new CPACError("invalid CPA catalog");
+    }
     for (const model of document.models) {
-        const maxWindow = typeof model.max_context_window === "number" &&
-            model.max_context_window > 0
+        const maxWindow = typeof model.max_context_window === "number" && model.max_context_window > 0
             ? Math.floor(model.max_context_window)
             : 0;
         const window = typeof model.context_window === "number"
@@ -284,7 +286,13 @@ export function liftContextWindows(bytes) {
 // Move `order` slugs to the front of the rich catalog (stable for the rest),
 // so the Codex client's first-5 spawn_agent advertisement picks them.
 export function reorderCatalog(bytes, order) {
-    const document = JSON.parse(new TextDecoder("utf-8", { fatal: true }).decode(bytes));
+    let document;
+    try {
+        document = JSON.parse(new TextDecoder("utf-8", { fatal: true }).decode(bytes));
+    }
+    catch {
+        throw new CPACError("invalid CPA catalog");
+    }
     const rank = new Map(order.map((slug, index) => [slug, index]));
     const models = document.models.map((model, index) => ({ model, index }));
     models.sort((left, right) => {
@@ -304,7 +312,13 @@ export function reorderCatalog(bytes, order) {
 export function saveSpawnModels(configPath, models) {
     let document = {};
     if (existsSync(configPath)) {
-        const parsed = JSON.parse(readFileSync(configPath, "utf8"));
+        let parsed;
+        try {
+            parsed = JSON.parse(readFileSync(configPath, "utf8"));
+        }
+        catch {
+            throw new CPACError("config must be a valid JSON object");
+        }
         if (!objectValue(parsed))
             throw new CPACError("config must be a JSON object");
         document = parsed;
@@ -360,6 +374,9 @@ async function checkboxPicker(title, items, max) {
                 return;
             }
             if (key === "\r" || key === "\n") {
+                if (max === 1 && selected.size === 0) {
+                    selected.add(cursor);
+                }
                 finish();
                 return;
             }
@@ -392,7 +409,13 @@ export async function pickSpawnModels(config) {
     if (!apiKey)
         throw new CPACError(`environment variable ${config.api_key_env} is not set`);
     const catalog = await fetchCatalog(config.cpa_url, apiKey);
-    const document = JSON.parse(new TextDecoder().decode(catalog.bytes));
+    let document;
+    try {
+        document = JSON.parse(new TextDecoder().decode(catalog.bytes));
+    }
+    catch {
+        throw new CPACError("invalid CPA catalog");
+    }
     const slugs = document.models.map((model) => model.slug);
     const picked = await checkboxPicker("Select spawn_agent models", slugs, MAX_SPAWN_MODELS);
     if (picked.length === 0)
@@ -604,7 +627,8 @@ function hasAgentsMaxThreads(content) {
         }
         if (table === "agents" && /^\s*max_threads\s*=/.test(line))
             return true;
-        if (table === "root" && /^\s*(?:agents|"agents"|'agents')\s*\.\s*max_threads\s*=/.test(line))
+        if (table === "root" &&
+            /^\s*(?:agents|"agents"|'agents')\s*\.\s*max_threads\s*=/.test(line))
             return true;
     }
     return false;
@@ -672,7 +696,7 @@ function localBrowserOrigin(value) {
         return true;
     try {
         const hostname = new URL(value).hostname.toLowerCase();
-        return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1";
+        return (hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1");
     }
     catch {
         return false;
@@ -702,13 +726,18 @@ function responseHeaders(headers) {
     return forwarded;
 }
 function upstreamUrl(cpaUrl, requestUrl) {
-    const incoming = new URL(requestUrl, "http://127.0.0.1");
-    const suffix = incoming.pathname === "/v1"
-        ? ""
-        : incoming.pathname.startsWith("/v1/")
-            ? incoming.pathname.slice(3)
-            : incoming.pathname;
-    return new URL(`${apiBase(cpaUrl)}${suffix}${incoming.search}`);
+    try {
+        const incoming = new URL(requestUrl, "http://127.0.0.1");
+        const suffix = incoming.pathname === "/v1"
+            ? ""
+            : incoming.pathname.startsWith("/v1/")
+                ? incoming.pathname.slice(3)
+                : incoming.pathname;
+        return new URL(`${apiBase(cpaUrl)}${suffix}${incoming.search}`);
+    }
+    catch {
+        throw new CPACError(`invalid upstream request URL: ${requestUrl}`);
+    }
 }
 export async function createLoopbackProxy(cpaUrl, apiKey, proxyId, port) {
     const server = createServer((request, response) => {
@@ -804,7 +833,7 @@ function shouldMarkOneMillion(id, window, compactWindow) {
         return false;
     if (window >= ONE_MILLION)
         return true;
-    return compactWindow !== undefined && window > 200_000 && window >= compactWindow;
+    return (compactWindow !== undefined && window > 200_000 && window >= compactWindow);
 }
 // Auto tier defaults. Within the claude-family pool (whole catalog when no
 // claude model exists), opus matches its family name or stays unset; sonnet
@@ -1091,7 +1120,7 @@ async function startProxyProcess(config, apiKey) {
         });
     });
 }
-async function stopProxyProcess(proxy) {
+export async function stopProxyProcess(proxy) {
     if (!(await proxyIsHealthy(proxy)))
         return;
     try {
@@ -1105,7 +1134,7 @@ async function stopProxyProcess(proxy) {
         // The server may close the connection while shutting down.
     }
 }
-function readState(stateDir) {
+export function readState(stateDir) {
     const path = join(stateDir, "state.json");
     if (!existsSync(path))
         return null;
@@ -1151,7 +1180,7 @@ function readState(stateDir) {
     }
     return value;
 }
-function stateProxy(state) {
+export function stateProxy(state) {
     return state.proxy_id && state.proxy_pid && state.proxy_port
         ? { id: state.proxy_id, pid: state.proxy_pid, port: state.proxy_port }
         : null;
@@ -1226,9 +1255,7 @@ export async function inject(config, v2Off = false, maxContext = false) {
         existed = existsSync(config.codex_config);
         try {
             original = existed ? readFileSync(config.codex_config) : new Uint8Array();
-            originalMode = existed
-                ? statSync(config.codex_config).mode & 0o7777
-                : 0o600;
+            originalMode = existed ? statSync(config.codex_config).mode & 0o7777 : 0o600;
         }
         catch (error) {
             throw new CPACError(`cannot read Codex config: ${error instanceof Error ? error.message : String(error)}`);
@@ -1368,15 +1395,9 @@ export async function status(config) {
     const apiKey = process.env[config.api_key_env]?.trim();
     const keyConfigured = !!apiKey;
     const state = readState(config.state_dir);
-    if (!state) {
-        console.log("codex: native");
-    }
-    else {
+    if (state) {
         originalBytes(config.state_dir, state, config.codex_config);
-        if (!existsSync(config.codex_config)) {
-            console.log(`codex: injected (config missing: ${config.codex_config})`);
-        }
-        else {
+        if (existsSync(config.codex_config)) {
             const proxy = stateProxy(state);
             if (!proxy || !(await proxyIsHealthy(proxy))) {
                 console.log(`codex: injected (loopback proxy stopped: ${config.codex_config})`);
@@ -1395,12 +1416,20 @@ export async function status(config) {
                 // Unreadable config: the injected line above already reports it.
             }
         }
+        else {
+            console.log(`codex: injected (config missing: ${config.codex_config})`);
+        }
+    }
+    else {
+        console.log("codex: native");
     }
     console.log(`claude: ${keyConfigured ? "ready" : "not configured"}`);
     const piInstalled = isPiExtensionInstalled();
-    console.log(`pi: ${keyConfigured ? (piInstalled ? "ready" : "extension not installed; run: cpac pi install") : "not configured"}`);
+    console.log(`pi: ${keyConfigured ? (piInstalled ? "ready" : "extension not installed; run: cpac install --target pi") : "not configured"}`);
     const kimiInstalled = isKimiConfigInstalled();
-    console.log(`kimi: ${keyConfigured ? (kimiInstalled ? "ready" : "config not installed; run: cpac kimi install") : "not configured"}`);
+    console.log(`kimi: ${keyConfigured ? (kimiInstalled ? "ready" : "config not installed; run: cpac install --target kimi") : "not configured"}`);
+    const grokInstalled = isGrokConfigInstalled();
+    console.log(`grok: ${keyConfigured ? (grokInstalled ? "ready" : "config not installed; run: cpac install --target grok") : "not configured"}`);
     if (!state)
         return 1;
     const proxy = stateProxy(state);
@@ -1463,7 +1492,7 @@ export function saveApiKeyExport(profile, name, apiKey) {
     atomicWrite(profile, Buffer.from(content), mode);
 }
 async function guide(config) {
-    console.log(`CPA Companion\n\nCPA: ${config.cpa_url}\nCPA_API_KEY: ${process.env[config.api_key_env]?.trim() ? "configured" : "not configured"}\n\nCommands:\n  cpac claude [args...]  Launch Claude Code through CPA\n  cpac inject            Inject CPA into Codex and start its loopback proxy\n  cpac proxy             Run the injected loopback proxy in the foreground\n  cpac status            Show agent support status (Codex, Claude, Pi, Kimi)\n  cpac restore           Restore the original Codex config\n  cpac pi install        Install CPA provider extension for Pi\n  cpac pi uninstall      Remove the Pi CPA provider extension\n  cpac pi status         Show Pi extension install status\n  cpac kimi install      Write CPA provider config for Kimi Code\n  cpac kimi uninstall    Remove the Kimi Code CPA provider config\n  cpac kimi status       Show Kimi Code config install status\n  cpac detect            Show supported targets and install status\n  cpac install           Install CPA integration into detected targets\n  cpac sync              Refresh installed Codex/Pi/Kimi injections from the current CPA\n  cpac uninstall         Remove CPA integration from installed targets\n  cpac upgrade           Update cpac from npm and sync installed agents\n  cpac --help            Show command usage`);
+    console.log(`CPA Companion\n\nCPA: ${config.cpa_url}\nCPA_API_KEY: ${process.env[config.api_key_env]?.trim() ? "configured" : "not configured"}\n\nCommands:\n  cpac <agent> [args...] Launch an agent (codex, kimi, grok, pi, claude, opencode) through CPA\n  cpac inject            Inject CPA into Codex and start its loopback proxy\n  cpac proxy             Run the injected loopback proxy in the foreground\n  cpac status            Show agent support status (Codex, Claude, Pi, Kimi, Grok)\n  cpac restore           Restore the original Codex config\n  cpac detect            Show supported targets and install status\n  cpac install           Install CPA integration into detected targets\n  cpac sync              Refresh installed Codex/Pi/Kimi/Grok injections from CPA\n  cpac uninstall         Remove CPA integration from installed targets\n  cpac upgrade           Update cpac from npm and sync installed agents\n  cpac --help            Show command usage`);
     if (process.env[config.api_key_env]?.trim())
         return 0;
     const apiKey = await promptSecret(config.api_key_env);
@@ -1484,7 +1513,13 @@ export async function runOpencode(config, args, executable = "opencode") {
     if (!apiKey)
         throw new CPACError(`environment variable ${config.api_key_env} is not set`);
     const catalog = await fetchCatalog(config.cpa_url, apiKey);
-    const document = JSON.parse(new TextDecoder().decode(catalog.bytes));
+    let document;
+    try {
+        document = JSON.parse(new TextDecoder().decode(catalog.bytes));
+    }
+    catch {
+        throw new CPACError("invalid CPA catalog");
+    }
     const models = {};
     for (const row of document.models) {
         const id = catalogModelId(row);
@@ -1493,14 +1528,15 @@ export async function runOpencode(config, args, executable = "opencode") {
         const window = typeof row.context_window === "number" && row.context_window > 0
             ? Math.floor(row.context_window)
             : 0;
-        models[id] = window > 0
-            ? {
-                limit: {
-                    context: window,
-                    output: Math.min(OPENCODE_OUTPUT_BUDGET, window),
-                },
-            }
-            : {};
+        models[id] =
+            window > 0
+                ? {
+                    limit: {
+                        context: window,
+                        output: Math.min(OPENCODE_OUTPUT_BUDGET, window),
+                    },
+                }
+                : {};
     }
     const content = JSON.stringify({
         provider: {
@@ -1525,24 +1561,119 @@ export async function runOpencode(config, args, executable = "opencode") {
         child.once("close", (code) => resolve(code ?? 1));
     });
 }
-export async function runClaudeModels(parsed) {
-    if (parsed.pick.length) {
-        const config = loadConfig(parsed.configPath, true);
-        const apiKey = process.env[config.api_key_env]?.trim();
-        if (!apiKey)
-            throw new CPACError(`environment variable ${config.api_key_env} is not set`);
+export async function runCodexConfig(config, configPath, options = {}) {
+    if (options.reset) {
+        let raw = {};
+        try {
+            const file = JSON.parse(readFileSync(configPath, "utf8"));
+            if (!objectValue(file))
+                throw new CPACError("config must be a JSON object");
+            raw = file;
+        }
+        catch (error) {
+            if (error.code !== "ENOENT") {
+                if (error instanceof CPACError)
+                    throw error;
+                throw new CPACError(`cannot read config: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        }
+        delete raw.spawn_models;
+        atomicWrite(configPath, Buffer.from(`${JSON.stringify(raw, null, 2)}\n`));
+        await runRestore(config, ["codex"], { all: false, dryRun: false });
+        console.log("Codex configuration reset to default");
+        return 0;
+    }
+    if (options.interactive && (!process.stdin.isTTY || !process.stderr.isTTY)) {
+        console.log(config.spawn_models
+            ? JSON.stringify(config.spawn_models, null, 2)
+            : "spawn_models not set");
+        return 0;
+    }
+    let spawnModels = config.spawn_models;
+    let v2Off = options.v2Off ?? false;
+    let maxContext = options.maxContext ?? false;
+    if (options.interactive || options.v2Models) {
+        const picked = await pickSpawnModels(config);
+        if (picked.length > 0) {
+            spawnModels = picked;
+            saveSpawnModels(configPath, picked);
+            console.log(`spawn_models saved to ${configPath}: ${picked.join(", ")}`);
+        }
+        if (options.interactive) {
+            const [maxCtxChoice] = await checkboxPicker("Codex Context Window Size:", [
+                "Standard (default input budget, e.g. 200K~272K)",
+                "Max Context Window (lift to full upper bound, e.g. 921K~1M, 90% auto-compact limit)",
+            ], 1);
+            maxContext = maxCtxChoice?.startsWith("Max Context") ?? false;
+            const [v2Choice] = await checkboxPicker("Codex Multi-Agent V2 mode:", ["Enabled (Default)", "Disabled (--v2_off)"], 1);
+            v2Off = v2Choice === "Disabled (--v2_off)";
+        }
+    }
+    const updatedConfig = { ...config, spawn_models: spawnModels };
+    await runInstall(updatedConfig, ["codex"], {
+        all: false,
+        dryRun: false,
+        force: true,
+        v2Off,
+        maxContext,
+    });
+    console.log("Codex configuration updated and synced.");
+    return 0;
+}
+export async function runClaudeConfig(config, configPath, options = {}) {
+    if (options.reset) {
+        let raw = {};
+        try {
+            const file = JSON.parse(readFileSync(configPath, "utf8"));
+            if (!objectValue(file))
+                throw new CPACError("config must be a JSON object");
+            raw = file;
+        }
+        catch (error) {
+            if (error.code !== "ENOENT") {
+                if (error instanceof CPACError)
+                    throw error;
+                throw new CPACError(`cannot read config: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        }
+        delete raw.claude_models;
+        atomicWrite(configPath, Buffer.from(`${JSON.stringify(raw, null, 2)}\n`));
+        console.log("Claude Code tier models reset to CPA catalog auto-selection");
+        return 0;
+    }
+    if (options.interactive && (!process.stdin.isTTY || !process.stderr.isTTY)) {
+        console.log(config.claude_models
+            ? JSON.stringify(config.claude_models, null, 2)
+            : "claude_models not set; cpac claude auto-picks tier models from the CPA catalog");
+        return 0;
+    }
+    const models = { ...(options.models || {}) };
+    const shouldPick = options.interactive || (options.pick && options.pick.length > 0);
+    if (shouldPick) {
+        const apiKey = await resolveApiKey(config.api_key_env);
         const catalog = await fetchCatalog(config.cpa_url, apiKey);
-        const document = JSON.parse(new TextDecoder().decode(catalog.bytes));
-        const slugs = document.models.map((model) => model.slug);
-        for (const slot of parsed.pick) {
-            const [picked] = await checkboxPicker(`Select ${slot} model`, slugs, 1);
-            if (!picked)
-                throw new CPACError("no model selected");
-            parsed.models[slot] = picked;
+        let document;
+        try {
+            document = JSON.parse(new TextDecoder().decode(catalog.bytes));
+        }
+        catch {
+            throw new CPACError("CPA catalog response is not valid JSON");
+        }
+        const slugs = (document.models ?? [])
+            .map((model) => (typeof model?.slug === "string" ? model.slug : ""))
+            .filter(Boolean);
+        const slotsToPick = options.pick && options.pick.length > 0
+            ? options.pick
+            : ["sonnet", "haiku", "opus"];
+        for (const slot of slotsToPick) {
+            const choices = slot === "sonnet" ? slugs : ["(auto-select from catalog)", ...slugs];
+            const [picked] = await checkboxPicker(`Select Claude Code ${slot.toUpperCase()} tier model:`, choices, 1);
+            if (picked && picked !== "(auto-select from catalog)") {
+                models[slot] = picked;
+            }
         }
     }
-    if (!parsed.reset && !Object.keys(parsed.models).length) {
-        const config = loadConfig(parsed.configPath, true);
+    if (!Object.keys(models).length && !shouldPick) {
         console.log(config.claude_models
             ? JSON.stringify(config.claude_models, null, 2)
             : "claude_models not set; cpac claude auto-picks tier models from the CPA catalog");
@@ -1550,7 +1681,7 @@ export async function runClaudeModels(parsed) {
     }
     let raw = {};
     try {
-        const file = JSON.parse(readFileSync(parsed.configPath, "utf8"));
+        const file = JSON.parse(readFileSync(configPath, "utf8"));
         if (!objectValue(file))
             throw new CPACError("config must be a JSON object");
         raw = file;
@@ -1562,23 +1693,25 @@ export async function runClaudeModels(parsed) {
             throw new CPACError(`cannot read config: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
-    if (parsed.reset) {
-        delete raw.claude_models;
-    }
-    else {
-        const existing = objectValue(raw.claude_models)
-            ? { ...raw.claude_models }
-            : {};
-        Object.assign(existing, parsed.models);
-        raw.claude_models = existing;
-    }
-    atomicWrite(parsed.configPath, Buffer.from(`${JSON.stringify(raw, null, 2)}\n`));
-    loadConfig(parsed.configPath);
-    console.log(parsed.reset
-        ? "claude_models cleared"
-        : `claude_models updated: ${JSON.stringify(raw.claude_models)}`);
+    const existing = objectValue(raw.claude_models)
+        ? { ...raw.claude_models }
+        : {};
+    Object.assign(existing, models);
+    raw.claude_models = existing;
+    atomicWrite(configPath, Buffer.from(`${JSON.stringify(raw, null, 2)}\n`));
+    loadConfig(configPath);
+    console.log(`Claude Code tier models updated in ${configPath}:\n${JSON.stringify(raw.claude_models, null, 2)}`);
     return 0;
 }
+export async function runClaudeModels(parsed) {
+    const config = loadConfig(parsed.configPath, true);
+    return await runClaudeConfig(config, parsed.configPath, {
+        models: parsed.models,
+        pick: parsed.pick,
+        reset: parsed.reset,
+        interactive: false,
+    });
+}
 export async function runClaude(config, args, executable = "claude") {
     const apiKey = await resolveApiKey(config.api_key_env);
     const proxy = await createClaudeProxy(config.cpa_url, apiKey);
@@ -1618,7 +1751,8 @@ export async function runClaude(config, args, executable = "claude") {
         CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY: "1",
         CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST: "1",
     };
-    if (compactWindow !== undefined && !(Number(process.env.CLAUDE_CODE_AUTO_COMPACT_WINDOW) > 0)) {
+    if (compactWindow !== undefined &&
+        !(Number(process.env.CLAUDE_CODE_AUTO_COMPACT_WINDOW) > 0)) {
         env.CLAUDE_CODE_AUTO_COMPACT_WINDOW = String(compactWindow);
     }
     const setSlot = (name, value) => {
@@ -1654,6 +1788,53 @@ export async function runClaude(config, args, executable = "claude") {
         });
     });
 }
+export async function runTargetLauncher(config, targetId, args, executable = targetId, options = {}) {
+    const target = TARGETS.find((t) => t.id === targetId);
+    if (!target)
+        throw new CPACError(`unknown target: ${targetId}`);
+    if (["kimi", "grok"].includes(targetId)) {
+        const state = readState(config.state_dir);
+        const proxy = state ? stateProxy(state) : null;
+        if (!proxy || !(await proxyIsHealthy(proxy))) {
+            const apiKey = await resolveApiKey(config.api_key_env);
+            const started = await startProxyProcess(config, apiKey);
+            const fingerprint = proxyFingerprint(config, apiKey);
+            const catalog = await fetchCatalog(config.cpa_url, apiKey);
+            const catalogPath = join(config.state_dir, "codex-models.json");
+            mkdirSync(config.state_dir, { recursive: true, mode: 0o700 });
+            atomicWrite(catalogPath, catalog.bytes);
+            const originalMode = existsSync(config.codex_config)
+                ? statSync(config.codex_config).mode & 0o7777
+                : 0o600;
+            atomicWrite(join(config.state_dir, "state.json"), stateBytes(config, state ? state.config_existed : false, state ? state.config_mode : originalMode, started, fingerprint));
+        }
+    }
+    if (target.installed(config)) {
+        try {
+            await runSync(config, [targetId], {
+                all: false,
+                dryRun: false,
+                v2Off: options.v2Off,
+                maxContext: options.maxContext,
+            });
+        }
+        catch (error) {
+            console.warn(`warning: auto-sync failed (${error instanceof Error ? error.message : String(error)}); launching with existing config`);
+        }
+    }
+    else {
+        await target.install(config, false, options.v2Off, options.maxContext);
+    }
+    return await new Promise((resolvePromise, rejectPromise) => {
+        const child = spawn(executable, args, { stdio: "inherit" });
+        child.once("error", (error) => {
+            rejectPromise(new CPACError(error instanceof Error && "code" in error && error.code === "ENOENT"
+                ? `${executable} not found`
+                : `cannot start ${executable}: ${error.message}`));
+        });
+        child.once("close", (code) => resolvePromise(code ?? 1));
+    });
+}
 export async function runProxy(config) {
     const apiKey = await resolveApiKey(config.api_key_env);
     const state = readState(config.state_dir);
@@ -1713,22 +1894,6 @@ export async function uninstallPiExtension() {
     unlinkSync(target);
     console.log(`Removed Pi extension: ${target}`);
 }
-export async function runPi(config, action) {
-    if (action === "install") {
-        await installPiExtension(config);
-        return 0;
-    }
-    if (action === "uninstall") {
-        await uninstallPiExtension();
-        return 0;
-    }
-    if (action === "status") {
-        const installed = isPiExtensionInstalled();
-        console.log(`Pi extension: ${installed ? "installed" : "not installed"}`);
-        return installed ? 0 : 1;
-    }
-    throw new CPACError(`unknown pi action: ${action}; use install, uninstall, or status`);
-}
 // Pre-write snapshot kept at <target>.cpac-backup (first version only) so a
 // damaged config can be restored by hand even if uninstall cannot parse it.
 function ensureCpacBackup(target) {
@@ -1748,7 +1913,8 @@ const KIMI_BLOCK_END = "# <<< CPAC Kimi <<<";
 const kimiBlockRegex = new RegExp(`${KIMI_BLOCK_START.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[\\s\\S]*?${KIMI_BLOCK_END.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\n?`);
 export function isKimiConfigInstalled() {
     try {
-        return kimiBlockRegex.test(readFileSync(kimiConfigPath(), "utf8"));
+        const content = readFileSync(kimiConfigPath(), "utf8");
+        return (kimiBlockRegex.test(content) || /^\s*\[providers\.cpac\]\s*$/m.test(content));
     }
     catch {
         return false;
@@ -1806,16 +1972,18 @@ const KIMI_REASONING_EFFORTS = new Set([
     "ultra",
 ]);
 function kimiSupportEfforts(row) {
-    const levels = row.supported_reasoning_levels;
+    const levels = row.supported_reasoning_levels ??
+        row.reasoning_effort_levels ??
+        row.reasoning_levels;
     if (!Array.isArray(levels))
         return [];
     const seen = new Set();
     const efforts = [];
     for (const level of levels) {
         const effort = typeof level === "string"
-            ? level
+            ? level.toLowerCase()
             : objectValue(level) && typeof level.effort === "string"
-                ? level.effort
+                ? level.effort.toLowerCase()
                 : undefined;
         if (!effort || !KIMI_REASONING_EFFORTS.has(effort) || seen.has(effort))
             continue;
@@ -1833,7 +2001,13 @@ function kimiInputHasImage(row) {
 export async function installKimiConfig(config) {
     const apiKey = await resolveApiKey(config.api_key_env);
     const catalog = await fetchCatalog(config.cpa_url, apiKey);
-    const document = JSON.parse(new TextDecoder("utf-8").decode(catalog.bytes));
+    let document;
+    try {
+        document = JSON.parse(new TextDecoder("utf-8").decode(catalog.bytes));
+    }
+    catch {
+        throw new CPACError("invalid CPA catalog");
+    }
     const rows = catalogModelRows(document) ?? [];
     if (rows.length === 0)
         throw new CPACError("CPA catalog contains no models");
@@ -1871,9 +2045,13 @@ export async function installKimiConfig(config) {
         }
         if (efforts.length > 0) {
             lines.push(`support_efforts = ${tomlStringArray(efforts)}`);
-            const defaultEffort = typeof row.default_reasoning_level === "string" &&
-                efforts.includes(row.default_reasoning_level)
-                ? row.default_reasoning_level
+            const rawDefaultEffort = (typeof row.default_reasoning_level === "string" &&
+                row.default_reasoning_level) ||
+                (typeof row.default_reasoning_effort === "string" &&
+                    row.default_reasoning_effort) ||
+                (typeof row.default_effort === "string" && row.default_effort);
+            const defaultEffort = rawDefaultEffort && efforts.includes(rawDefaultEffort.toLowerCase())
+                ? rawDefaultEffort.toLowerCase()
                 : undefined;
             if (defaultEffort)
                 lines.push(`default_effort = ${tomlString(defaultEffort)}`);
@@ -1895,21 +2073,108 @@ export async function uninstallKimiConfig() {
     writeKimiBlock(target, null);
     console.log(`Removed Kimi Code provider config: ${target}`);
 }
-export async function runKimi(config, action) {
-    if (action === "install") {
-        await installKimiConfig(config);
-        return 0;
+function grokHome() {
+    const home = process.env.GROK_HOME?.trim() || join(homedir(), ".grok");
+    return expandUserPath(home);
+}
+function grokConfigPath() {
+    return join(grokHome(), "config.toml");
+}
+const GROK_BLOCK_START = "# >>> CPAC Grok >>>";
+const GROK_BLOCK_END = "# <<< CPAC Grok <<<";
+const grokBlockRegex = new RegExp(`${GROK_BLOCK_START.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[\\s\\S]*?${GROK_BLOCK_END.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\n?`);
+export function isGrokConfigInstalled() {
+    try {
+        const content = readFileSync(grokConfigPath(), "utf8");
+        return (grokBlockRegex.test(content) ||
+            /^\s*\[model\.(?:"cpac\/|'cpac\/|cpac-)/m.test(content));
     }
-    if (action === "uninstall") {
-        await uninstallKimiConfig();
-        return 0;
+    catch {
+        return false;
+    }
+}
+function isCpacGrokTableHeader(line) {
+    const header = line.match(/^\[([^\]]+)\]\s*$/);
+    if (!header)
+        return false;
+    const name = header[1];
+    return /^model\.(?:"cpac\/|'cpac\/|cpac-)/.test(name);
+}
+function stripOrphanCpacGrokTables(content) {
+    const eol = content.includes("\r\n") ? "\r\n" : "\n";
+    const out = [];
+    let skipping = false;
+    for (const line of content.split(/\r?\n/)) {
+        if (/^\[[^\]]+\]\s*$/.test(line))
+            skipping = isCpacGrokTableHeader(line);
+        if (!skipping)
+            out.push(line);
     }
-    if (action === "status") {
-        const installed = isKimiConfigInstalled();
-        console.log(`Kimi Code config: ${installed ? "installed" : "not installed"}`);
-        return installed ? 0 : 1;
+    return out.join(eol).replace(/(?:\r?\n){3,}/g, `${eol}${eol}`);
+}
+function writeGrokBlock(path, block) {
+    let content = existsSync(path) ? readFileSync(path, "utf8") : "";
+    content = content.replace(grokBlockRegex, "");
+    const orphan = content.indexOf(GROK_BLOCK_START);
+    if (orphan !== -1)
+        content = content.slice(0, orphan);
+    content = stripOrphanCpacGrokTables(content);
+    if (block) {
+        content = `${content}${content && !content.endsWith("\n") ? "\n" : ""}${block}\n`;
     }
-    throw new CPACError(`unknown kimi action: ${action}; use install, uninstall, or status`);
+    mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
+    const mode = existsSync(path) ? statSync(path).mode & 0o7777 : 0o600;
+    atomicWrite(path, Buffer.from(content), mode);
+}
+export async function installGrokConfig(config) {
+    const apiKey = await resolveApiKey(config.api_key_env);
+    const catalog = await fetchCatalog(config.cpa_url, apiKey);
+    let document;
+    try {
+        document = JSON.parse(new TextDecoder("utf-8").decode(catalog.bytes));
+    }
+    catch {
+        throw new CPACError("invalid CPA catalog");
+    }
+    const rows = catalogModelRows(document) ?? [];
+    if (rows.length === 0)
+        throw new CPACError("CPA catalog contains no models");
+    const state = readState(config.state_dir);
+    const recorded = state ? stateProxy(state) : null;
+    const port = recorded?.port ?? config.codex_proxy_port;
+    if (!port) {
+        throw new CPACError("loopback proxy port unknown; run cpac inject first");
+    }
+    const lines = [GROK_BLOCK_START];
+    for (const row of rows) {
+        const slug = catalogModelId(row);
+        if (!slug)
+            continue;
+        const context = typeof row.context_window === "number" && row.context_window > 0
+            ? Math.floor(row.context_window)
+            : 200000;
+        const name = typeof row.display_name === "string" && row.display_name.trim()
+            ? `${row.display_name.trim()} (CPAC)`
+            : `CPAC ${slug}`;
+        lines.push(`[model."cpac/${slug}"]`, `model = ${tomlString(slug)}`, `base_url = "http://127.0.0.1:${port}/v1"`, 'api_backend = "responses"', '# Placeholder: the CPAC loopback proxy replaces it with the CPA key; run "cpac inject" to start the proxy.', 'api_key = "cpac-loopback"', `name = ${tomlString(name)}`, `context_window = ${context}`, "");
+    }
+    if (lines[lines.length - 1] === "")
+        lines.pop();
+    lines.push(GROK_BLOCK_END);
+    const target = grokConfigPath();
+    ensureCpacBackup(target);
+    writeGrokBlock(target, lines.join("\n"));
+    console.log(`Installed Grok Build provider config: ${target}`);
+    if (!recorded || !(await proxyIsHealthy(recorded))) {
+        console.log("Loopback proxy is not running; run: cpac inject");
+    }
+}
+export async function uninstallGrokConfig() {
+    const target = grokConfigPath();
+    if (!isGrokConfigInstalled())
+        throw new CPACError("Grok Build config is not installed");
+    writeGrokBlock(target, null);
+    console.log(`Removed Grok Build provider config: ${target}`);
 }
 function readPackageVersion() {
     try {
@@ -1922,11 +2187,31 @@ function readPackageVersion() {
     }
 }
 const CPAC_VERSION = readPackageVersion();
+export function detectClientVersion(binary) {
+    if (!/^[\w.-]+$/.test(binary))
+        return undefined;
+    try {
+        const res = spawnSync(binary, ["--version"], {
+            encoding: "utf8",
+            timeout: 2000,
+            stdio: ["ignore", "pipe", "ignore"],
+        });
+        if (res.status === 0 && typeof res.stdout === "string") {
+            const match = res.stdout.match(/v?(\d+\.\d+\.\d+(?:-[\w.]+)?)/);
+            return match ? match[1] : res.stdout.trim().split(/\s+/)[0] || undefined;
+        }
+    }
+    catch {
+        // ignored
+    }
+    return undefined;
+}
 function binaryOnPath(name) {
     if (!/^[\w.-]+$/.test(name))
         return false;
     try {
-        return spawnSync(`command -v ${name}`, { stdio: "ignore", shell: true }).status === 0;
+        return (spawnSync(`command -v ${name}`, { stdio: "ignore", shell: true }).status ===
+            0);
     }
     catch {
         return false;
@@ -1947,6 +2232,7 @@ const TARGETS = [
                 return false;
             }
         },
+        version: () => detectClientVersion("codex"),
         install: async (config, dryRun, v2Off, maxContext) => {
             if (dryRun) {
                 console.log("would inject CPA catalog and loopback proxy into Codex");
@@ -1967,6 +2253,7 @@ const TARGETS = [
         home: () => piExtensionsDir(),
         detected: () => binaryOnPath("pi") || existsSync(piExtensionsDir()),
         installed: () => isPiExtensionInstalled(),
+        version: () => detectClientVersion("pi"),
         install: async (config, dryRun) => {
             if (dryRun) {
                 console.log(`would write Pi extension: ${join(piExtensionsDir(), "cpac.ts")}`);
@@ -1987,6 +2274,7 @@ const TARGETS = [
         home: () => dirname(kimiConfigPath()),
         detected: () => binaryOnPath("kimi") || existsSync(dirname(kimiConfigPath())),
         installed: () => isKimiConfigInstalled(),
+        version: () => detectClientVersion("kimi"),
         install: async (config, dryRun) => {
             if (dryRun) {
                 console.log(`would write CPA provider block: ${kimiConfigPath()}`);
@@ -2002,6 +2290,27 @@ const TARGETS = [
             await uninstallKimiConfig();
         },
     },
+    {
+        id: "grok",
+        home: () => grokHome(),
+        detected: () => binaryOnPath("grok") || existsSync(grokHome()),
+        installed: () => isGrokConfigInstalled(),
+        version: () => detectClientVersion("grok"),
+        install: async (config, dryRun) => {
+            if (dryRun) {
+                console.log(`would write CPA provider block: ${grokConfigPath()}`);
+                return;
+            }
+            await installGrokConfig(config);
+        },
+        uninstall: async (_config, dryRun) => {
+            if (dryRun) {
+                console.log(`would remove CPA provider block: ${grokConfigPath()}`);
+                return;
+            }
+            await uninstallGrokConfig();
+        },
+    },
 ];
 export async function detectTargets(config) {
     return TARGETS.map((target) => ({
@@ -2009,6 +2318,7 @@ export async function detectTargets(config) {
         detected: target.detected(),
         installed: target.installed(config),
         path: target.home(),
+        version: target.version?.(),
     }));
 }
 export async function runDetect(config, asJson) {
@@ -2027,7 +2337,11 @@ function selectTargets(requested, all, eligible) {
     if (unknown.length > 0) {
         throw new CPACError(`unknown target(s): ${unknown.join(", ")}; use ${TARGETS.map((target) => target.id).join(",")}`);
     }
-    const ids = requested.length > 0 ? requested : all ? TARGETS.map((target) => target.id) : eligible;
+    const ids = requested.length > 0
+        ? requested
+        : all
+            ? TARGETS.map((target) => target.id)
+            : eligible;
     return TARGETS.filter((target) => ids.includes(target.id));
 }
 export async function runInstall(config, requested, options) {
@@ -2087,6 +2401,17 @@ export async function runUninstall(config, requested, options) {
     }
     return 0;
 }
+export async function runRestore(config, requested, options) {
+    if (requested.length > 0 || options.all) {
+        return runUninstall(config, requested, options);
+    }
+    if (options.dryRun) {
+        console.log("would restore the original Codex config");
+        return 0;
+    }
+    await restore(config);
+    return 0;
+}
 function compareVersions(a, b) {
     const left = a.split(".").map(Number);
     const right = b.split(".").map(Number);
@@ -2128,7 +2453,10 @@ export async function runUpgrade(config, checkOnly) {
             console.log("Update available. Run: cpac upgrade");
         return 0;
     }
-    if (!upToDate) {
+    if (upToDate) {
+        console.log("Already up to date.");
+    }
+    else {
         console.log(`Installing @yhong91/cpac@${latest}`);
         const result = spawnSync("npm", ["install", "-g", `@yhong91/cpac@${latest}`], { stdio: "inherit" });
         if (result.status !== 0) {
@@ -2136,9 +2464,6 @@ export async function runUpgrade(config, checkOnly) {
             return result.status ?? 1;
         }
     }
-    else {
-        console.log("Already up to date.");
-    }
     const installed = TARGETS.filter((target) => target.installed(config)).map((target) => target.id);
     if (installed.length === 0) {
         console.log("No installed agents to sync.");
@@ -2150,23 +2475,21 @@ export async function runUpgrade(config, checkOnly) {
 function usage() {
     return [
         "Usage: cpac",
+        "       cpac <codex|kimi|grok|pi|claude|opencode> [args...]",
+        "       cpac <codex|claude> setup",
+        "       cpac <codex|claude|kimi|grok|pi> clear",
         "       cpac inject [--v2_off] [--v2_models] [--max_context] [--config PATH]",
-        "       cpac <status|restore> [--config PATH]",
+        "       cpac restore [--target codex,pi,kimi,grok] [--all] [--dry-run] [--config PATH]",
+        "       cpac status [--config PATH]",
         "       cpac proxy [--config PATH]",
-        "       cpac claude [--config PATH] [--] [claude args...]",
-        "       cpac opencode [--config PATH] [--] [opencode args...]",
-        "       cpac claude-models [--opus [M]] [--sonnet [M]] [--haiku [M]] [--reset] [--config PATH]",
-        "       cpac pi <install|uninstall|status> [--config PATH]",
-        "       cpac kimi <install|uninstall|status> [--config PATH]",
         "       cpac detect [--json] [--home PATH]",
-        "       cpac install [--target codex,pi,kimi] [--all] [--dry-run] [--force] [--v2_off] [--v2_models] [--max_context] [--home PATH]",
-        "       cpac sync [--target codex,pi,kimi] [--all] [--dry-run] [--v2_off] [--v2_models] [--max_context] [--home PATH]",
-        "       cpac uninstall [--target codex,pi,kimi] [--all] [--dry-run] [--home PATH]",
+        "       cpac install [--target codex,pi,kimi,grok] [--all] [--dry-run] [--force] [--v2_off] [--v2_models] [--max_context] [--home PATH]",
+        "       cpac sync [--target codex,pi,kimi,grok] [--all] [--dry-run] [--v2_off] [--v2_models] [--max_context] [--home PATH]",
         "       cpac upgrade [--check]",
         "       cpac version",
         "",
-        "install/uninstall manage persistent injections only; claude and opencode are",
-        "ephemeral — launch them with `cpac claude` / `cpac opencode` instead.",
+        "launch an agent directly with `cpac <agent> [args...]` (all args forwarded).",
+        "configure an agent with `cpac <agent> setup` or restore with `cpac <agent> clear`.",
     ].join("\n");
 }
 function parseArgs(args) {
@@ -2177,6 +2500,7 @@ function parseArgs(args) {
         args[0] === "install" ||
         args[0] === "sync" ||
         args[0] === "uninstall" ||
+        args[0] === "restore" ||
         args[0] === "upgrade" ||
         args[0] === "version") {
         const parsed = {
@@ -2240,23 +2564,100 @@ function parseArgs(args) {
         }
         return parsed;
     }
-    if (args[0] === "pi" || args[0] === "kimi") {
+    if (["codex", "kimi", "grok", "pi", "claude", "opencode"].includes(args[0])) {
+        const targetId = args[0];
         let configPath = defaultConfigPath();
-        let index = 1;
-        if (args[index] === "--config") {
-            const value = args[++index];
-            if (!value)
-                throw new CPACError("--config requires a path");
-            configPath = resolve(expandUserPath(value));
-            index += 1;
-        }
-        const action = args[index] || "status";
-        return { command: args[0], configPath, action };
+        if (args[1] === "clear" || args[1] === "--clear") {
+            for (let i = 2; i < args.length; i++) {
+                if (args[i] === "--config") {
+                    const val = args[++i];
+                    if (val)
+                        configPath = resolve(expandUserPath(val));
+                }
+            }
+            if (targetId === "claude") {
+                return {
+                    command: "claude-config",
+                    configPath,
+                    models: {},
+                    pick: [],
+                    reset: true,
+                    interactive: false,
+                };
+            }
+            return {
+                command: "restore",
+                configPath,
+                json: false,
+                targets: [targetId],
+                all: false,
+                dryRun: false,
+                force: false,
+                check: false,
+                v2Off: false,
+                v2Models: false,
+                maxContext: false,
+            };
+        }
+        if (args[1] === "setup" || args[1] === "--setup") {
+            for (let i = 2; i < args.length; i++) {
+                if (args[i] === "--config") {
+                    const val = args[++i];
+                    if (val)
+                        configPath = resolve(expandUserPath(val));
+                }
+            }
+            if (targetId === "codex") {
+                return {
+                    command: "codex-config",
+                    configPath,
+                    v2Off: false,
+                    v2Models: false,
+                    maxContext: false,
+                    reset: false,
+                    interactive: true,
+                };
+            }
+            if (targetId === "claude") {
+                return {
+                    command: "claude-config",
+                    configPath,
+                    models: {},
+                    pick: [],
+                    reset: false,
+                    interactive: true,
+                };
+            }
+            throw new CPACError(`${targetId} does not require setup (all CPA models are auto-synced). Run 'cpac ${targetId}' or 'cpac install --target ${targetId}'.`);
+        }
+        const passArgs = args.slice(1);
+        if (targetId === "codex") {
+            return {
+                command: "codex",
+                configPath,
+                args: passArgs,
+                v2Off: false,
+                v2Models: false,
+                maxContext: false,
+            };
+        }
+        if (targetId === "claude") {
+            return {
+                command: "claude",
+                configPath,
+                args: passArgs,
+            };
+        }
+        return {
+            command: targetId,
+            configPath,
+            args: passArgs,
+        };
     }
     if (args[0] === "claude-models") {
         if (args.includes("-h") || args.includes("--help")) {
             console.log([
-                "Usage: cpac claude-models [--opus [M]] [--sonnet [M]] [--haiku [M]] [--reset] [--config PATH]",
+                "Usage: cpac claude --config [--opus [M]] [--sonnet [M]] [--haiku [M]] [--reset] [--config PATH]",
                 "",
                 "Sets the model Claude Code uses per task tier. Saved to the config file",
                 "and applied on every `cpac claude` launch:",
@@ -2288,9 +2689,7 @@ function parseArgs(args) {
             else if (arg === "--reset") {
                 reset = true;
             }
-            else if (arg === "--opus" ||
-                arg === "--sonnet" ||
-                arg === "--haiku") {
+            else if (arg === "--opus" || arg === "--sonnet" || arg === "--haiku") {
                 const slot = arg.slice(2);
                 const value = args[index + 1];
                 if (value !== undefined && !value.startsWith("-")) {
@@ -2307,35 +2706,14 @@ function parseArgs(args) {
                 throw new CPACError(`unknown option: ${arg}`);
             }
         }
-        return { command: "claude-models", configPath, models, pick, reset };
-    }
-    if (args[0] === "claude") {
-        let configPath = defaultConfigPath();
-        let index = 1;
-        if (args[index] === "--config") {
-            const value = args[++index];
-            if (!value)
-                throw new CPACError("--config requires a path");
-            configPath = resolve(expandUserPath(value));
-            index += 1;
-        }
-        if (args[index] === "--")
-            index += 1;
-        return { command: "claude", configPath, args: args.slice(index) };
-    }
-    if (args[0] === "opencode") {
-        let configPath = defaultConfigPath();
-        let index = 1;
-        if (args[index] === "--config") {
-            const value = args[++index];
-            if (!value)
-                throw new CPACError("--config requires a path");
-            configPath = resolve(expandUserPath(value));
-            index += 1;
-        }
-        if (args[index] === "--")
-            index += 1;
-        return { command: "opencode", configPath, args: args.slice(index) };
+        return {
+            command: "claude-config",
+            configPath,
+            models,
+            pick,
+            reset,
+            interactive: !reset && Object.keys(models).length === 0 && pick.length === 0,
+        };
     }
     if (args.includes("-h") || args.includes("--help")) {
         console.log(usage());
@@ -2359,7 +2737,8 @@ function parseArgs(args) {
         else if (args[index] === "--v2_models" || args[index] === "--v2-models") {
             v2Models = true;
         }
-        else if (args[index] === "--max_context" || args[index] === "--max-context") {
+        else if (args[index] === "--max_context" ||
+            args[index] === "--max-context") {
             maxContext = true;
         }
         else if (args[index].startsWith("-")) {
@@ -2369,7 +2748,7 @@ function parseArgs(args) {
             positional.push(args[index]);
     }
     if (positional.length !== 1 ||
-        !["inject", "status", "restore", "proxy"].includes(positional[0])) {
+        !["inject", "status", "proxy"].includes(positional[0])) {
         throw new CPACError(usage());
     }
     if (positional[0] !== "inject" && (v2Off || v2Models || maxContext)) {
@@ -2432,8 +2811,8 @@ export async function main(args = process.argv.slice(2)) {
                 maxContext: parsed.maxContext,
             });
         }
-        if (parsed.command === "uninstall")
-            return await runUninstall(config, parsed.targets, {
+        if (parsed.command === "uninstall" || parsed.command === "restore")
+            return await runRestore(config, parsed.targets, {
                 all: parsed.all,
                 dryRun: parsed.dryRun,
             });
@@ -2445,16 +2824,42 @@ export async function main(args = process.argv.slice(2)) {
         }
         if (parsed.command === "claude")
             return await runClaude(config, parsed.args);
+        if (parsed.command === "claude-config")
+            return await runClaudeConfig(config, parsed.configPath, {
+                models: parsed.models,
+                pick: parsed.pick,
+                reset: parsed.reset,
+                interactive: parsed.interactive,
+            });
+        if (parsed.command === "codex-config")
+            return await runCodexConfig(config, parsed.configPath, {
+                v2Off: parsed.v2Off,
+                v2Models: parsed.v2Models,
+                maxContext: parsed.maxContext,
+                reset: parsed.reset,
+                interactive: parsed.interactive,
+            });
         if (parsed.command === "opencode")
             return await runOpencode(config, parsed.args);
+        if (parsed.command === "codex") {
+            let launcherConfig = config;
+            if (parsed.v2Models) {
+                const picked = await pickSpawnModels(config);
+                saveSpawnModels(parsed.configPath, picked);
+                console.log(`spawn_models saved to ${parsed.configPath}: ${picked.join(", ")}`);
+                launcherConfig = { ...config, spawn_models: picked };
+            }
+            return await runTargetLauncher(launcherConfig, "codex", parsed.args, "codex", { v2Off: parsed.v2Off, maxContext: parsed.maxContext });
+        }
+        if (parsed.command === "kimi" ||
+            parsed.command === "grok" ||
+            parsed.command === "pi") {
+            return await runTargetLauncher(config, parsed.command, parsed.args);
+        }
         if (parsed.command === "claude-models")
             return await runClaudeModels(parsed);
         if (parsed.command === "proxy")
             return await runProxy(config);
-        if (parsed.command === "pi")
-            return await runPi(config, parsed.action);
-        if (parsed.command === "kimi")
-            return await runKimi(config, parsed.action);
         if (parsed.command === "inject") {
             let injectConfig = config;
             if (parsed.v2Models) {
@@ -2465,8 +2870,6 @@ export async function main(args = process.argv.slice(2)) {
             }
             await inject(injectConfig, parsed.v2Off, parsed.maxContext);
         }
-        else if (parsed.command === "restore")
-            await restore(config);
         else
             return await status(config);
         return 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yhong91/cpac",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Connect Codex and Claude Code to a remote CLIProxyAPI gateway",
   "type": "module",
   "bin": {