@yhong91/cpac 0.1.26 → 0.1.28

package/README.md

@@ -2,7 +2,7 @@
 
 CPAC 将 Codex 和 Claude Code 接入远端 CLIProxyAPI（CPA）：
 
-- **Codex**：注入模型目录和 loopback 网关，保留内置 `openai` provider，并可逐字节恢复原配置。
+- **Codex**：注入模型目录和 loopback 网关，保留内置 `openai` provider。无用户改动时逐字节恢复原配置；注入期间改过文件则只撤掉 CPAC 字段。
 - **Claude Code**：通过临时环境变量启动，不修改 Claude Code 配置。
 
 实现基于 TypeScript + Node.js，运行时零依赖。
@@ -41,15 +41,15 @@ cpac install --all                     # 注入所有检测到的目标（codex/
 cpac install --target codex            # 只注入 Codex（默认开启 multi-agent v2）
 cpac install --target codex --v2_models  # 先多选 spawn_agent 模型再注入
 cpac install --target codex --max_context  # 注入时把模型上下文提升到实测上限（opt-in，仅限 codex）
-cpac uninstall --target codex          # 字节级恢复原配置
+cpac restore --target codex            # 撤掉注入；注入期间的用户改动会留下
 
 # 4b. 临时接管（退出无痕，不写任何配置文件）
 cpac claude                            # Claude Code 走 CPA
 cpac opencode                          # opencode 走 CPA（模型选 cpac/<模型名>）
 
 # 5. 可选：Agent 配置向导与模型选择
-cpac codex setup                       # 进入 Codex 配置向导（Subagent 模型多选、最大上下文、Multi-Agent V2）
-cpac claude setup                      # 进入 Claude Code 模型向导（Sonnet、Haiku、Opus 槽位选择）
+cpac codex --setup                     # Codex 配置向导 → 注入 → 启动
+cpac claude --setup                    # Claude 模型向导 → 启动
 
 # 6. 升级（装上新版本后自动 sync 已接入的 agent）
 cpac upgrade
@@ -80,7 +80,7 @@ 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 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)。
+   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)。
 
 1. **持久注入**（只对检测到的目标；codex 会应用步骤 3 的 spawn_models）：
 
@@ -91,7 +91,7 @@ cpac status   # 验证：各 target 显示 ready/injected
 
 1. **统一启动与配置**：
    - 启动：`cpac <codex|claude|kimi|grok|pi|opencode> [args...]`（所有原生参数如 `-c` 等原样透明传递）
-   - 配置：`cpac <codex|claude> setup`（交互式配置模型与特性）
+   - 配置并启动：`cpac <codex|claude> --setup`（向导结束后注入并拉起）
    - 还原：`cpac <agent> clear`（还原或重置配置）
 
 2. **已安装后升级**：npm 发布新版本后，等 publish 成功再执行 `cpac upgrade`。它会按需 `npm install -g`，再对已接入的 Codex / Pi / Kimi / Grok 做 `sync`。不要拆成 `npm install -g @yhong91/cpac` 再手动 `cpac sync`。只刷新配置、不升 CLI 时才用 `cpac sync`。
@@ -112,7 +112,7 @@ Commands:
   cpac claude [args...]  Launch Claude Code through CPA
   cpac inject            Inject CPA into Codex
   cpac status            Show Codex injection status
-  cpac restore           Restore the original Codex config
+  cpac restore --target <id> | --all  Detach injected agents
   cpac --help            Show command usage
 ```
 
@@ -158,7 +158,7 @@ cpac
 cpac --help
 ```
 
-### 统一管理（detect / install / sync / uninstall / upgrade）
+### 统一管理（detect / install / sync / restore / uninstall / upgrade）
 
 参考 vibetime 的目标式命令，对 `codex`、`pi`、`kimi` 三个持久注入目标统一管理（claude/opencode 是临时接管，用 `cpac claude` / `cpac opencode` 启动，不属于 install 目标）：
 
@@ -166,9 +166,10 @@ cpac --help
 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 restore --target <id> | --all [--dry-run] [--home PATH]
+cpac uninstall [--dry-run]
 cpac upgrade [--check]
-cpac version
+cpac -v | --version
 ```
 
 - `detect` 列出每个目标是否被检测到、是否已接入 CPAC；`--json` 输出机器可读结果。
@@ -176,7 +177,8 @@ cpac version
 - `sync` 按当前 `cpa_url` 和 CPA 目录强制刷新**已经接入**的目标（Codex 重新注入、Pi 扩展重写、Kimi 配置重写），用来在 CPA 地址或模型目录变化后一次对齐本地配置。不带参数只动已安装目标；`--all` 会对检测到的目标做同样的强制刷新（尚未安装的会装上）。`--max_context` 仍只对 `--target codex` 有效。
 - Codex 注入默认开启 multi-agent v2（写入 `[features.multi_agent_v2] enabled = true`）；`install --target codex --v2_off` 写入 `enabled = false`。服务端还需在 CPA 配置中开启 `codex.optimize-multi-agent-v2`。
 - `--v2_models` 进入 arrow-key 复选框选择最多 5 个 spawn_agent 模型（勾选顺序即推荐顺序），选择结果存入配置文件的 `spawn_models`，注入时把这些模型排到 `codex-models.json` 最前——Codex 客户端只把 catalog 前 5 个可见模型广告为 spawn 覆盖项。
-- `uninstall` 默认作用于已安装目标，映射到 `cpac restore` / `cpac pi uninstall` / `cpac kimi uninstall`。
+- `restore` 必须带 `--target` 或 `--all`，卸掉指定（或全部）已注入目标。`--all` 时未安装的目标静默跳过。
+- `uninstall` 先用和 `cpac codex --setup` 相同的方向键选择器确认（默认 Cancel），再 `restore --all`，最后 `npm uninstall -g @yhong91/cpac`。不要用 `--target`。非终端取消。`--dry-run` 跳过确认。
 - `--home PATH` 临时把 `HOME` 指向给定目录，便于在隔离环境中试验。
 - `upgrade` 是发布后更新本机的一次性入口：查 npm → 需要时 `npm install -g` → 对**已接入**的 Codex / Pi / Kimi 执行 `sync`。已是最新也会 sync。不要先手动 `npm install -g` 再 `cpac sync`。`--check` 只报告版本，不安装也不 sync。没有已安装目标时跳过 sync，不报错。只刷新配置、不升 CLI 时用 `cpac sync`。
 
@@ -194,7 +196,7 @@ cpac claude -- -p "检查当前项目"
 #### 配置与清除
 
 ```bash
-cpac claude setup                      # 交互式依次配置 Sonnet / Haiku / Opus
+cpac claude --setup                    # 交互式依次配置 Sonnet / Haiku / Opus，然后启动
 cpac claude clear                      # 重置所有覆盖，恢复自动选择
 ```
 
@@ -223,7 +225,7 @@ cpac codex exec "帮我写一个测试"
 #### 配置与清除
 
 ```bash
-cpac codex setup                       # 交互式配置 Subagent 候选模型、最大上下文和 Multi-Agent V2
+cpac codex --setup                     # 交互式配置后注入并启动 Codex
 cpac codex clear                       # 还原 Codex 原生配置并关闭代理
 ```
 
@@ -231,7 +233,7 @@ cpac codex clear                       # 还原 Codex 原生配置并关闭代
 
 ```bash
 cpac inject [--v2_off] [--v2_models] [--max_context] [--config PATH]
-cpac restore
+cpac restore --target codex
 ```
 
 `inject` 从远端 `/v1/models?client_version=1` 获取 Codex rich catalog，并启动只监听 `127.0.0.1` 的轻量转发代理。Codex 配置保留内置 `openai` provider，只写入根级 `model_catalog_json` 和：
@@ -246,7 +248,7 @@ Codex App 的长驻 `app-server` 可能缓存旧目录。`inject` 会删除 `mod
 
 注入命令可选 `--max_context`（`cpac inject --max_context` 或 `cpac install --target codex --max_context`，默认不带）：把 catalog 中 `max_context_window` 高于 `context_window` 的模型提升到上限，并把 `auto_compact_token_limit` 设为上限的 90%。Codex 把 `context_window` 当输入预算而非展示标签，上游默认保留保守运营值（如 GPT-5.6 家族 272k），带上该参数后可用到实测上限（约 921k，opencodex 实测）；90% 压缩线确保在硬上限前触发 auto-compact。不带参数注入的仍是原本上下文的目录。该参数仅限 codex，与其他 target 组合使用会直接报错。
 
-第一次注入时，原文件按原始 bytes 备份到 `state_dir/config.toml.backup`。重复注入不会覆盖首次备份，并会保留 CPAC 管理字段之外的用户编辑。`restore` 按原 mode 逐字节恢复首次备份、关闭 CPAC loopback 代理；若原文件不存在，则删除注入创建的 `config.toml`。
+第一次注入时，原文件按原始 bytes 备份到 `state_dir/config.toml.backup`。重复注入不会覆盖首次备份，并会保留 CPAC 管理字段之外的用户编辑。`restore`：若 `config.toml` 相对首次注入未改，按原 mode 逐字节还原备份；若用户在注入期间改过文件，只撤掉 CPAC 写入的 catalog、url 和标记。原先没有 `config.toml` 且撤掉后为空则删除文件。关闭 CPAC loopback 代理。
 
 loopback 代理是 detached 用户进程，不安装系统服务。机器重启或进程意外退出后，`cpac status` 会报告 `loopback proxy stopped`；重新执行 `cpac inject` 即可恢复。
 
@@ -286,8 +288,7 @@ cpac pi install
 它将生成 `cpac.ts` 写入 `~/.pi/agent/extensions/`，Pi 启动时自动加载并从 CPA 动态注册模型目录。卸载：
 
 ```bash
-cpac pi uninstall
-cpac pi status
+cpac restore --target pi
 ```
 
 Pi 扩展尊重 `PI_CODING_AGENT_DIR` 环境变量。
@@ -303,8 +304,7 @@ cpac kimi install
 它在 `~/.kimi-code/config.toml` 追加一个由 CPAC 管理的块，注册 `cpac` OpenAI 兼容 provider，并把 CPA 目录里的每个模型映射为一个 `cpac/<模型名>` 条目。带 `supported_reasoning_levels` 的模型会写入 `capabilities`、`support_efforts` 和 `default_effort`，否则 Kimi 只给 Claude 名套内置 thinking profile，其它模型会停在 thinking off 且无法改 effort。`base_url` 指向 Codex 注入使用的 loopback 代理，因此密钥不落盘；代理未运行时 install 会提示先执行 `cpac inject`。卸载与状态：
 
 ```bash
-cpac kimi uninstall
-cpac kimi status
+cpac restore --target kimi
 ```
 
 Kimi Code 配置目录尊重 `KIMI_CODE_HOME` 环境变量。首次写入前若 `config.toml` 已存在，会在同目录保留一份原始快照 `config.toml.cpac-backup`（只存最早版本），万一文件损坏可手动复制回去。

package/dist/agents.js

@@ -1,68 +1,15 @@
 import { spawn, spawnSync } from "node:child_process";
-import { copyFileSync, existsSync, mkdirSync, readFileSync, statSync, unlinkSync, } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
-import { apiBase, catalogModelId, catalogModelRows, fetchCatalog, pickSpawnModels, proxyFingerprint, readState, saveSpawnModels, stateBytes, stateProxy, } from "./config.js";
-import { MANAGED_MARKER, inject, restore } from "./codex.js";
+import { fetchCatalog, injectedOwnership, pickSpawnModels, proxyFingerprint, readState, saveSpawnModels, stateBytes, stateProxy, } from "./config.js";
 import { proxyIsHealthy, startProxyProcess, stopProxyProcess, } from "./proxy.js";
-import { CPACError, atomicWrite, checkboxPicker, expandUserPath, objectValue, resolveApiKey, tomlString, tomlStringArray, } from "./util.js";
-const OPENCODE_OUTPUT_BUDGET = 32_000;
-// Ephemeral takeover: inline a CPA provider via OPENCODE_CONFIG_CONTENT so no
-// opencode config file is touched; the session ends with zero residue.
-export async function runOpencode(config, args, executable = "opencode") {
-    const apiKey = process.env[config.api_key_env]?.trim();
-    if (!apiKey)
-        throw new CPACError(`environment variable ${config.api_key_env} is not set`);
-    const catalog = await fetchCatalog(config.cpa_url, apiKey);
-    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);
-        if (!id)
-            continue;
-        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),
-                    },
-                }
-                : {};
-    }
-    const content = JSON.stringify({
-        provider: {
-            cpac: {
-                npm: "@ai-sdk/openai-compatible",
-                options: { baseURL: apiBase(config.cpa_url), apiKey },
-                models,
-            },
-        },
-    });
-    const env = {
-        ...process.env,
-        OPENCODE_CONFIG_CONTENT: content,
-    };
-    return await new Promise((resolve, reject) => {
-        const child = spawn(executable, args, { env, stdio: "inherit" });
-        child.once("error", (error) => {
-            reject(new CPACError(error instanceof Error && "code" in error && error.code === "ENOENT"
-                ? `${executable} not found`
-                : `cannot start ${executable}: ${error.message}`));
-        });
-        child.once("close", (code) => resolve(code ?? 1));
-    });
-}
+import { MANAGED_MARKER, inject, restore } from "./targets/codex.js";
+import { grokConfigPath, grokHome, installGrokConfig, isGrokConfigInstalled, uninstallGrokConfig, } from "./targets/grok.js";
+import { installKimiConfig, isKimiConfigInstalled, kimiConfigPath, uninstallKimiConfig, } from "./targets/kimi.js";
+import { installPiExtension, isPiExtensionInstalled, piExtensionsDir, uninstallPiExtension, } from "./targets/pi.js";
+import { CPACError, atomicWrite, checkboxPicker, expandUserPath, objectValue, resolveApiKey, } from "./util.js";
 export async function runCodexConfig(config, configPath, options = {}) {
     if (options.reset) {
         let raw = {};
@@ -129,13 +76,16 @@ export async function runTargetLauncher(config, targetId, args, executable = tar
     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 fingerprint = proxyFingerprint(config, apiKey);
+        const reuse = proxy !== null &&
+            state?.proxy_fingerprint === fingerprint &&
+            (await proxyIsHealthy(proxy));
+        if (!reuse) {
             if (proxy)
                 await stopProxyProcess(proxy);
-            const apiKey = await resolveApiKey(config.api_key_env);
             const started = await startProxyProcess(config, apiKey);
             try {
-                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 });
@@ -143,7 +93,7 @@ export async function runTargetLauncher(config, targetId, args, executable = tar
                 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));
+                atomicWrite(join(config.state_dir, "state.json"), stateBytes(config, state ? state.config_existed : false, state ? state.config_mode : originalMode, started, fingerprint, injectedOwnership(state)));
             }
             catch (error) {
                 await stopProxyProcess(started);
@@ -151,22 +101,24 @@ export async function runTargetLauncher(config, targetId, args, executable = tar
             }
         }
     }
-    if (target.installed(config)) {
-        try {
-            await runSync(config, [targetId], {
-                all: false,
-                dryRun: false,
-                v2Off: options.v2Off,
-                maxContext: options.maxContext,
-            });
+    if (!options.skipSync) {
+        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`);
+            }
         }
-        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);
         }
     }
-    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) => {
@@ -177,315 +129,6 @@ export async function runTargetLauncher(config, targetId, args, executable = tar
         child.once("close", (code) => resolvePromise(code ?? 1));
     });
 }
-function piExtensionsDir() {
-    return join(expandUserPath(process.env.PI_CODING_AGENT_DIR?.trim() || join(homedir(), ".pi", "agent")), "extensions");
-}
-export function isPiExtensionInstalled() {
-    return existsSync(join(piExtensionsDir(), "cpac.ts"));
-}
-function piTemplatePath() {
-    return join(dirname(fileURLToPath(import.meta.url)), "pi-extension.template");
-}
-function piExtensionContent(cpaUrl) {
-    return readFileSync(piTemplatePath(), "utf8").replace("__CPA_URL__", cpaUrl);
-}
-export async function installPiExtension(config) {
-    const dir = piExtensionsDir();
-    mkdirSync(dir, { recursive: true, mode: 0o700 });
-    const target = join(dir, "cpac.ts");
-    ensureCpacBackup(target);
-    atomicWrite(target, Buffer.from(piExtensionContent(config.cpa_url)), 0o644);
-    console.log(`Installed Pi extension: ${target}`);
-}
-export async function uninstallPiExtension() {
-    const target = join(piExtensionsDir(), "cpac.ts");
-    if (!existsSync(target))
-        throw new CPACError("Pi extension is not installed");
-    unlinkSync(target);
-    console.log(`Removed Pi extension: ${target}`);
-}
-// 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) {
-    if (!existsSync(target))
-        return;
-    const backup = `${target}.cpac-backup`;
-    if (existsSync(backup))
-        return;
-    copyFileSync(target, backup);
-}
-function kimiConfigPath() {
-    const home = process.env.KIMI_CODE_HOME?.trim() || join(homedir(), ".kimi-code");
-    return join(expandUserPath(home), "config.toml");
-}
-const KIMI_BLOCK_START = "# >>> CPAC Kimi >>>";
-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 {
-        const content = readFileSync(kimiConfigPath(), "utf8");
-        return (kimiBlockRegex.test(content) || /^\s*\[providers\.cpac\]\s*$/m.test(content));
-    }
-    catch {
-        return false;
-    }
-}
-function isCpacTableHeader(line) {
-    const header = line.match(/^\[([^\]]+)\]\s*$/);
-    if (!header)
-        return false;
-    const name = header[1];
-    return (name === "providers.cpac" ||
-        name.startsWith("providers.cpac.") ||
-        /^models\.(?:"cpac\/|'cpac\/)/.test(name));
-}
-// Kimi may rewrite config.toml and drop our comment markers, leaving the
-// [providers.cpac] / [models."cpac/..."] tables behind. A later install would
-// then append a second copy and make the file invalid TOML.
-function stripOrphanCpacTables(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 = isCpacTableHeader(line);
-        if (!skipping)
-            out.push(line);
-    }
-    return out.join(eol).replace(/(?:\r?\n){3,}/g, `${eol}${eol}`);
-}
-function writeKimiBlock(path, block) {
-    let content = existsSync(path) ? readFileSync(path, "utf8") : "";
-    content = content.replace(kimiBlockRegex, "");
-    // A truncated managed block (start marker without the end marker) leaves its
-    // tables behind; appending again would duplicate [providers.cpac], make the
-    // file invalid TOML, and block `kimi login`. The block is always appended
-    // last, so dropping from an orphaned start marker to EOF is safe.
-    const orphan = content.indexOf(KIMI_BLOCK_START);
-    if (orphan !== -1)
-        content = content.slice(0, orphan);
-    content = stripOrphanCpacTables(content);
-    if (block) {
-        content = `${content}${content && !content.endsWith("\n") ? "\n" : ""}${block}\n`;
-    }
-    mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
-    const mode = existsSync(path) ? statSync(path).mode & 0o7777 : 0o600;
-    atomicWrite(path, Buffer.from(content), mode);
-}
-const KIMI_REASONING_EFFORTS = new Set([
-    "minimal",
-    "low",
-    "medium",
-    "high",
-    "xhigh",
-    "max",
-    "ultra",
-]);
-function kimiSupportEfforts(row) {
-    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.toLowerCase()
-            : objectValue(level) && typeof level.effort === "string"
-                ? level.effort.toLowerCase()
-                : undefined;
-        if (!effort || !KIMI_REASONING_EFFORTS.has(effort) || seen.has(effort))
-            continue;
-        seen.add(effort);
-        efforts.push(effort);
-    }
-    return efforts;
-}
-function kimiInputHasImage(row) {
-    const modalities = row.input_modalities;
-    if (!Array.isArray(modalities))
-        return true;
-    return modalities.some((value) => value === "image");
-}
-export async function installKimiConfig(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 = [
-        KIMI_BLOCK_START,
-        "[providers.cpac]",
-        'type = "openai"',
-        `base_url = "http://127.0.0.1:${port}/v1"`,
-        '# Placeholder: the CPAC loopback proxy replaces it with the CPA key; run "cpac inject" to start the proxy.',
-        'api_key = "cpac-loopback"',
-    ];
-    for (const row of rows) {
-        const slug = catalogModelId(row);
-        if (!slug)
-            continue;
-        // ponytail: Kimi requires max_context_size; default 200000 when the catalog omits it.
-        const context = typeof row.context_window === "number" && row.context_window > 0
-            ? Math.floor(row.context_window)
-            : 200000;
-        const efforts = kimiSupportEfforts(row);
-        const capabilities = [
-            ...(efforts.length > 0 ? ["thinking"] : []),
-            "tool_use",
-            ...(kimiInputHasImage(row) ? ["image_in"] : []),
-        ];
-        lines.push("", `[models."cpac/${slug}"]`, 'provider = "cpac"', `model = ${tomlString(slug)}`, `max_context_size = ${context}`, `capabilities = ${tomlStringArray(capabilities)}`);
-        if (typeof row.display_name === "string" && row.display_name.trim()) {
-            lines.push(`display_name = ${tomlString(row.display_name)}`);
-        }
-        if (efforts.length > 0) {
-            lines.push(`support_efforts = ${tomlStringArray(efforts)}`);
-            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)}`);
-        }
-    }
-    lines.push(KIMI_BLOCK_END);
-    const target = kimiConfigPath();
-    ensureCpacBackup(target);
-    writeKimiBlock(target, lines.join("\n"));
-    console.log(`Installed Kimi Code provider config: ${target}`);
-    if (!recorded || !(await proxyIsHealthy(recorded))) {
-        console.log("Loopback proxy is not running; run: cpac inject");
-    }
-}
-export async function uninstallKimiConfig() {
-    const target = kimiConfigPath();
-    if (!isKimiConfigInstalled())
-        throw new CPACError("Kimi Code config is not installed");
-    writeKimiBlock(target, null);
-    console.log(`Removed Kimi Code provider config: ${target}`);
-}
-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));
-    }
-    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);
-    }
-    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`;
-    }
-    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 {
         const raw = readFileSync(join(dirname(fileURLToPath(import.meta.url)), "..", "package.json"), "utf8");
@@ -696,30 +339,51 @@ export async function runSync(config, requested, options) {
         maxContext: options.maxContext,
     });
 }
-export async function runUninstall(config, requested, options) {
+export async function runRestore(config, requested, options) {
+    if (requested.length === 0 && !options.all) {
+        throw new CPACError("restore requires --target <id> or --all");
+    }
     const eligible = TARGETS.filter((target) => target.installed(config)).map((target) => target.id);
     const selected = selectTargets(requested, options.all, eligible);
-    if (selected.length === 0) {
-        throw new CPACError("no installed CPAC integrations found; use --target <id> or --all");
-    }
     for (const target of selected) {
         if (!target.installed(config)) {
-            console.log(`${target.id}: not installed`);
+            if (requested.length > 0)
+                console.log(`${target.id}: not installed`);
             continue;
         }
         await target.uninstall(config, options.dryRun);
     }
     return 0;
 }
-export async function runRestore(config, requested, options) {
-    if (requested.length > 0 || options.all) {
-        return runUninstall(config, requested, options);
+async function confirmUninstall() {
+    let choice;
+    try {
+        [choice] = await checkboxPicker("This will restore all agents and run npm uninstall -g @yhong91/cpac.", ["Cancel", "Uninstall"], 1);
+    }
+    catch (error) {
+        if (error instanceof CPACError)
+            throw new CPACError("uninstall cancelled");
+        throw error;
     }
+    if (choice !== "Uninstall")
+        throw new CPACError("uninstall cancelled");
+}
+export async function runUninstall(config, options) {
+    if (!options.dryRun)
+        await confirmUninstall();
+    await runRestore(config, [], { all: true, dryRun: options.dryRun });
     if (options.dryRun) {
-        console.log("would restore the original Codex config");
+        console.log("would uninstall @yhong91/cpac");
         return 0;
     }
-    await restore(config);
+    console.log("Uninstalling @yhong91/cpac");
+    const result = spawnSync("npm", ["uninstall", "-g", "@yhong91/cpac"], {
+        stdio: "inherit",
+    });
+    if (result.status !== 0) {
+        console.error("npm uninstall failed");
+        return result.status ?? 1;
+    }
     return 0;
 }
 function compareVersions(a, b) {