@yhong91/cpac 0.1.36 → 0.1.38

package/README.md

@@ -10,7 +10,7 @@ CPAC 将 Codex 和 Claude Code 接入远端 CLIProxyAPI（CPA）：
 ## 要求
 
 - [Node.js](https://nodejs.org/) 20 或更新版本（npm 随 Node 安装）
-- 已安装需要使用的 agent：`codex`、`claude`、`pi`、`kimi` 或 `opencode`
+- 已安装需要使用的 agent：`codex`、`claude`、`pi`、`kimi` 或 `grok`
 - 有权访问的 CPA API key
 
 ## 安装
@@ -45,7 +45,6 @@ cpac restore codex                     # 撤掉注入；注入期间的用户改
 
 # 4b. 临时接管（退出无痕，不写任何配置文件）
 cpac claude                            # Claude Code 走 CPA
-cpac opencode                          # opencode 走 CPA（模型选 cpac/<模型名>）
 
 # 5. 可选：Agent 配置向导与模型选择（只写配置，不启动）
 cpac setup codex                       # Codex 配置向导 → 注入
@@ -62,7 +61,7 @@ cpac upgrade
 
 本节面向 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。
+1. **检查前置**：`node --version` ≥ 20；确认用户需要哪些 agent（`codex`/`claude`/`pi`/`kimi`/`grok` 在 PATH 上）。向用户索取 CPA API key。
 
 2. **安装与密钥**：
 
@@ -91,7 +90,7 @@ cpac status   # 验证：各 target 显示 ready/injected
 ```
 
 1. **统一启动与配置**：
-   - 启动：`cpac <codex|claude|kimi|grok|pi|opencode> [args...]`（所有原生参数如 `-c` 等原样透明传递）
+   - 启动：`cpac <codex|claude|kimi|grok|pi> [args...]`（所有原生参数如 `-c` 等原样透明传递）
      - `setup` / `--setup`：配置 Codex/Claude，然后启动
      - `clear`：还原原生配置
    - 只写配置、不启动：`cpac setup [claude|codex]`；查看当前：`cpac setup`
@@ -162,7 +161,7 @@ cpac --help
 
 ### 统一管理（detect / install / sync / restore / uninstall / upgrade）
 
-参考 vibetime 的目标式命令，对 `codex`、`pi`、`kimi` 三个持久注入目标统一管理（claude/opencode 是临时接管，用 `cpac claude` / `cpac opencode` 启动，不属于 install 目标）：
+参考 vibetime 的目标式命令，对 `codex`、`pi`、`kimi`、`grok` 四个持久注入目标统一管理（claude 是临时接管，用 `cpac claude` 启动，不属于 install 目标）：
 
 ```bash
 cpac detect [--json]
@@ -176,7 +175,7 @@ cpac -v | --version
 
 - `detect` 列出每个目标是否被检测到、是否已接入 CPAC；`--json` 输出机器可读结果。
 - `install` 默认作用于检测到的目标；后面直接写 agent 名（`cpac install codex pi`），`--all` 全部。`codex` 写入 catalog 并拉起 loopback 代理；`pi`/`kimi`/`grok` 写入各自配置。`--dry-run` 只打印将要做的事，`--force` 允许重装已安装目标。
-- `sync` 按当前 `cpa_url` 和 CPA 目录强制刷新**已经接入**的目标（Codex 重新注入、Pi 确认 `npm:@yhong91/cpac` 并清理旧的 `extensions/pi-cpac.ts`、Kimi 配置重写），用来在 CPA 地址或模型目录变化后一次对齐本地配置。不带参数只动已安装目标；`--all` 会对检测到的目标做同样的强制刷新（尚未安装的会装上）。`--max_context` 仍只对 `cpac install codex` 有效。
+- `sync` 按当前 `cpa_url` 和 CPA 目录强制刷新**已经接入**的目标（Codex 重新注入、Pi 按 CLI 版本决定写入 packages / `pi update` / 跳过，并清理旧的 `extensions/pi-cpac.ts`、Kimi 配置重写），用来在 CPA 地址或模型目录变化后一次对齐本地配置。不带参数只动已安装目标；`--all` 会对检测到的目标做同样的强制刷新（尚未安装的会装上）。`--max_context` 仍只对 `cpac install codex` 有效。
 - Codex 注入默认开启 multi-agent v2（写入 `[features.multi_agent_v2] enabled = true`，catalog 行打 `multi_agent_version: "v2"`）；`install codex --v2_off` 关掉 toml 并去掉 catalog 戳。v2 开着时会剥掉 `[agents] max_threads`（Codex 否则拒启动）。`cpac status` 对照 config 里的 `v2_off` / `max_context` 和 live toml / catalog。服务端还需在 CPA 配置中开启 `codex.optimize-multi-agent-v2`。
 - `--v2_models` 进入 arrow-key 复选框选择最多 5 个 spawn_agent 模型（勾选顺序即推荐顺序），选择结果存入配置文件的 `spawn_models`，注入时把这些模型排到 `codex-models.json` 最前——Codex 客户端只把 catalog 前 5 个可见模型广告为 spawn 覆盖项。
 - `restore` 必须带 agent 名或 `--all`，卸掉指定（或全部）已注入目标。`--all` 时未安装的目标静默跳过。
@@ -269,29 +268,16 @@ restore / `<agent> clear` 会删掉该 agent 的备份目录和 state.json 里
 
 为防止误删或覆盖，`state_dir` 不能是文件系统根目录、用户 home、系统临时目录，也不能包含 Codex 配置文件。
 
-### OpenCode（临时接管）
-
-```bash
-cpac opencode [--] [opencode args...]
-```
-
-通过 `OPENCODE_CONFIG_CONTENT` 内联注入一个 `cpac` OpenAI 兼容 provider（baseURL 直指 CPA，模型列表来自 CPA 目录），不触碰任何 opencode 配置文件，退出即无痕。首次使用时 opencode 会自行安装 `@ai-sdk/openai-compatible` 适配器。模型选择用 `cpac/<模型名>`。
-
 ### Pi
 
-安装 CPA provider 扩展到 Pi：
-
 ```bash
-cpac pi install
+cpac install pi
+cpac pi
 ```
 
-在 `~/.pi/agent/settings.json` 的 `packages` 中加入 `npm:@yhong91/cpac`。Pi 启动时按 npm 包加载 `extensions/pi-cpac.ts`，从 CPA 动态注册模型。旧版写入的 `~/.pi/agent/extensions/pi-cpac.ts` 会在 install / restore 时删掉。卸载：
-
-```bash
-cpac restore pi
-```
+未接入时把 `npm:@yhong91/cpac` 写入 `~/.pi/agent/settings.json` 的 `packages`。已接入则比较 `~/.pi/agent/npm/node_modules/@yhong91/cpac` 与当前 CLI 版本：落后则 `pi update npm:@yhong91/cpac`，已是最新（或尚未下载副本）则跳过。`cpac pi` 启动前走同一套判断。Pi 启动时加载 `extensions/pi-cpac.ts` 从 CPA 动态注册模型。旧版 `~/.pi/agent/extensions/pi-cpac.ts` 会在 install / restore 时删掉。
 
-尊重 `PI_CODING_AGENT_DIR`。扩展代码随 npm 包更新，已装过的副本用 `pi update npm:@yhong91/cpac`（或 `pi update --extensions`）。
+卸载：`cpac restore pi` 或 `cpac pi clear`。尊重 `PI_CODING_AGENT_DIR`。
 
 ### Kimi Code
 

package/dist/agents.js

@@ -7,8 +7,8 @@ import { MAX_SPAWN_MODELS, loadCatalogSlugs, pickSpawnModels, saveCodexSetup, sa
 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 { PI_PACKAGE, installPiExtension, isPiExtensionInstalled, piAgentDir, piSettingsPath, uninstallPiExtension, } from "./targets/pi.js";
-import { CPACError, atomicWrite, checkboxPicker, expandUserPath, objectValue, tabWizard, } from "./util.js";
+import { PI_PACKAGE, ensurePiExtension, isPiExtensionInstalled, piAgentDir, piSettingsPath, uninstallPiExtension, } from "./targets/pi.js";
+import { CPACError, atomicWrite, checkboxPicker, compareVersions, expandUserPath, objectValue, tabWizard, } from "./util.js";
 const CODEX_CTX_STD = "Standard (default input budget, e.g. 200K~272K)";
 const CODEX_CTX_MAX = "Max Context Window (lift to full upper bound, e.g. 921K~1M, 90% auto-compact limit)";
 const CODEX_V2_ON = "Enabled (Default)";
@@ -220,11 +220,7 @@ const TARGETS = [
         installed: () => isPiExtensionInstalled(),
         version: () => detectClientVersion("pi"),
         install: async (config, dryRun) => {
-            if (dryRun) {
-                console.log(`would add ${PI_PACKAGE} to ${piSettingsPath()}`);
-                return;
-            }
-            await installPiExtension(config);
+            await ensurePiExtension(config, CPAC_VERSION, dryRun);
         },
         uninstall: async (config, dryRun) => {
             if (dryRun) {
@@ -321,7 +317,7 @@ export async function runInstall(config, requested, options) {
         throw new CPACError("--max_context is only valid with codex");
     }
     for (const target of selected) {
-        if (target.installed(config) && !options.force) {
+        if (target.installed(config) && !options.force && target.id !== "pi") {
             console.log(`${target.id}: already installed; use --force to reinstall`);
             continue;
         }
@@ -398,17 +394,6 @@ export async function runUninstall(config, options) {
     }
     return 0;
 }
-function compareVersions(a, b) {
-    const left = a.split(".").map(Number);
-    const right = b.split(".").map(Number);
-    for (let index = 0; index < Math.max(left.length, right.length); index++) {
-        const l = left[index] ?? 0;
-        const r = right[index] ?? 0;
-        if (l !== r)
-            return l > r ? 1 : -1;
-    }
-    return 0;
-}
 export async function runUpgrade(config, checkOnly) {
     console.log(`Current version: ${CPAC_VERSION}`);
     let latest;

package/dist/cpac.js

@@ -8,7 +8,6 @@ import { runClaude, runClaudeConfig } from "./targets/claude.js";
 import { multiAgentV2Enabled } from "./targets/codex.js";
 import { isGrokConfigInstalled } from "./targets/grok.js";
 import { isKimiConfigInstalled } from "./targets/kimi.js";
-import { runOpencode } from "./targets/opencode.js";
 import { isPiExtensionInstalled } from "./targets/pi.js";
 import { defaultConfigPath, loadConfig, originalBytes, pickSpawnModels, readState, saveSpawnModels, stateProxy, catalogMaxContextLive, } from "./config.js";
 import { proxyIsHealthy, runProxyChild } from "./proxy.js";
@@ -21,8 +20,7 @@ export { claudeTierSlots, createClaudeProxy, runClaude, } from "./targets/claude
 export { detectClientVersion, detectTargets, runInstall, runRestore, runSync, runTargetLauncher, } from "./agents.js";
 export { installGrokConfig, isGrokConfigInstalled, uninstallGrokConfig, } from "./targets/grok.js";
 export { installKimiConfig, isKimiConfigInstalled, uninstallKimiConfig, } from "./targets/kimi.js";
-export { runOpencode } from "./targets/opencode.js";
-export { installPiExtension, isPiExtensionInstalled, uninstallPiExtension, } from "./targets/pi.js";
+export { ensurePiExtension, installPiExtension, isPiExtensionInstalled, piPackageAction, piPackageVersion, uninstallPiExtension, } from "./targets/pi.js";
 export async function status(config) {
     const apiKey = process.env[config.api_key_env]?.trim();
     const keyConfigured = !!apiKey;
@@ -82,7 +80,7 @@ export async function status(config) {
     return 0;
 }
 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 <agent> [args...] Launch an agent (codex, kimi, grok, pi, claude, opencode) through CPA\n  cpac setup            Show current Codex/Claude setup; cpac setup <codex|claude> to change\n  cpac status            Show agent support status (Codex, Claude, Pi, Kimi, Grok)\n  cpac restore <codex|pi|kimi|grok> | --all  Detach injected agents
+    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) through CPA\n  cpac setup            Show current Codex/Claude setup; cpac setup <codex|claude> to change\n  cpac status            Show agent support status (Codex, Claude, Pi, Kimi, Grok)\n  cpac restore <codex|pi|kimi|grok> | --all  Detach injected agents
   cpac detect            Show supported targets and install status
   cpac install [codex|pi|kimi|grok...]  Install CPA into detected targets, or named agents
   cpac sync              Refresh installed Codex/Pi/Kimi/Grok injections from CPA
@@ -96,12 +94,10 @@ async function guide(config) {
     console.log(`\nSaved ${config.api_key_env} to ${profile}. Open a new terminal or run:\n  source ${profile}`);
     return 0;
 }
-// opencode's config schema rejects a limit block with context but no output;
-// the catalog has no output field, so a safe budget stands in, clamped to the
 function usage() {
     return [
         "Usage: cpac",
-        "       cpac <codex|kimi|grok|pi|claude|opencode> [args...]",
+        "       cpac <codex|kimi|grok|pi|claude> [args...]",
         "              setup|--setup     configure Codex/Claude, then launch",
         "              clear             restore native config",
         "       cpac setup     Show current Codex/Claude setup",
@@ -225,7 +221,7 @@ function parseArgs(args) {
         }
         return parsed;
     }
-    if (["codex", "kimi", "grok", "pi", "claude", "opencode"].includes(args[0])) {
+    if (["codex", "kimi", "grok", "pi", "claude"].includes(args[0])) {
         const targetId = args[0];
         let configPath = defaultConfigPath();
         const raw = args.slice(1);
@@ -610,8 +606,6 @@ export async function main(args = process.argv.slice(2)) {
                 return code;
             return await runTargetLauncher(loadConfig(parsed.configPath, true), "codex", parsed.args ?? [], "codex", { skipSync: true });
         }
-        if (parsed.command === "opencode")
-            return await runOpencode(config, parsed.args);
         if (parsed.command === "codex") {
             let launcherConfig = config;
             if (parsed.v2Models) {

package/dist/targets/pi.js

@@ -1,9 +1,10 @@
+import { spawnSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { dropAgent, recordAgent } from "../config.js";
 import { stopProxyProcess } from "../proxy.js";
-import { CPACError, atomicWrite, expandUserPath, objectValue, } from "../util.js";
+import { CPACError, atomicWrite, compareVersions, expandUserPath, objectValue, } from "../util.js";
 export const PI_PACKAGE = "npm:@yhong91/cpac";
 const PI_PACKAGE_NAME = "@yhong91/cpac";
 const LEGACY_EXTENSIONS = ["pi-cpac.ts", "cpac.ts", "pi-cpa.ts"];
@@ -91,6 +92,48 @@ export function isPiExtensionInstalled() {
         return false;
     }
 }
+export function piPackageVersion() {
+    const pkg = join(piAgentDir(), "npm", "node_modules", "@yhong91", "cpac", "package.json");
+    try {
+        const version = JSON.parse(readFileSync(pkg, "utf8")).version;
+        return typeof version === "string" ? version : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+export function piPackageAction(desiredVersion) {
+    if (leftoverExtensions().length > 0 || !isPiExtensionInstalled()) {
+        return "install";
+    }
+    const version = piPackageVersion();
+    if (version !== undefined && compareVersions(version, desiredVersion) < 0) {
+        return "upgrade";
+    }
+    return "none";
+}
+export async function ensurePiExtension(config, desiredVersion, dryRun = false) {
+    const action = piPackageAction(desiredVersion);
+    if (action === "none")
+        return;
+    if (dryRun) {
+        console.log(action === "install"
+            ? `would add ${PI_PACKAGE} to ${piSettingsPath()}`
+            : `would update ${PI_PACKAGE}`);
+        return;
+    }
+    if (action === "install") {
+        await installPiExtension(config);
+        return;
+    }
+    const result = spawnSync("pi", ["update", PI_PACKAGE], {
+        stdio: "inherit",
+        env: { ...process.env, PI_CODING_AGENT_DIR: piAgentDir() },
+    });
+    if (result.error || (result.status ?? 1) !== 0) {
+        console.warn(`warning: pi update ${PI_PACKAGE} failed`);
+    }
+}
 export async function installPiExtension(config) {
     const path = piSettingsPath();
     mkdirSync(piAgentDir(), { recursive: true, mode: 0o700 });

package/dist/util.js

@@ -205,9 +205,7 @@ export async function tabWizard(tabs) {
     };
     const resultOf = () => Object.fromEntries(state.map((tab) => [
         tab.id,
-        [...tab.selected]
-            .sort((a, b) => a - b)
-            .map((i) => tab.items[i]),
+        [...tab.selected].sort((a, b) => a - b).map((i) => tab.items[i]),
     ]));
     const goNext = () => {
         if (index < state.length && state[index].selected.size === 0)
@@ -385,3 +383,14 @@ export function saveApiKeyExport(profile, name, apiKey) {
     const mode = existsSync(profile) ? statSync(profile).mode & 0o7777 : 0o600;
     atomicWrite(profile, Buffer.from(content), mode);
 }
+export function compareVersions(a, b) {
+    const left = a.split(".").map(Number);
+    const right = b.split(".").map(Number);
+    for (let index = 0; index < Math.max(left.length, right.length); index++) {
+        const l = left[index] ?? 0;
+        const r = right[index] ?? 0;
+        if (l !== r)
+            return l > r ? 1 : -1;
+    }
+    return 0;
+}

package/package.json

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

package/dist/targets/opencode.js

@@ -1,59 +0,0 @@
-import { spawn } from "node:child_process";
-import { apiBase, catalogModelId, fetchCatalog, } from "../config.js";
-import { CPACError } 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));
-    });
-}