@yhong91/cpac 0.1.28 → 0.1.30

package/README.md

@@ -248,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`：若 `config.toml` 相对首次注入未改，按原 mode 逐字节还原备份；若用户在注入期间改过文件，只撤掉 CPAC 写入的 catalog、url 和标记。原先没有 `config.toml` 且撤掉后为空则删除文件。关闭 CPAC loopback 代理。
+第一次注入时，原文件按原始 bytes 备份到 `state_dir/codex/config.toml`。重复注入不会覆盖首次备份，并会保留 CPAC 管理字段之外的用户编辑。`restore`：若 `config.toml` 相对首次注入未改，按原 mode 逐字节还原备份；若用户在注入期间改过文件，只撤掉 CPAC 写入的 catalog、url 和标记。原先没有 `config.toml` 且撤掉后为空则删除文件。关闭 CPAC loopback 代理。
 
 loopback 代理是 detached 用户进程，不安装系统服务。机器重启或进程意外退出后，`cpac status` 会报告 `loopback proxy stopped`；重新执行 `cpac inject` 即可恢复。
 
@@ -265,6 +265,11 @@ cpac proxy
 ```text
 Codex 配置：$CODEX_HOME/config.toml，未设置 CODEX_HOME 时为 ~/.codex/config.toml
 CPAC state：~/.cpac
+各 agent 配置备份：~/.cpac/<agent>/<原文件名>
+  Codex  ~/.cpac/codex/config.toml
+  Pi     ~/.cpac/pi/pi-cpac.ts
+  Kimi   ~/.cpac/kimi/config.toml
+  Grok   ~/.cpac/grok/config.toml
 ```
 
 为防止误删或覆盖，`state_dir` 不能是文件系统根目录、用户 home、系统临时目录，也不能包含 Codex 配置文件。
@@ -285,7 +290,7 @@ cpac opencode [--] [opencode args...]
 cpac pi install
 ```
 
-它将生成 `cpac.ts` 写入 `~/.pi/agent/extensions/`，Pi 启动时自动加载并从 CPA 动态注册模型目录。卸载：
+它将生成 `pi-cpac.ts` 写入 `~/.pi/agent/extensions/`，Pi 启动时自动加载并从 CPA 动态注册模型目录。卸载：
 
 ```bash
 cpac restore --target pi
@@ -307,7 +312,7 @@ cpac kimi install
 cpac restore --target kimi
 ```
 
-Kimi Code 配置目录尊重 `KIMI_CODE_HOME` 环境变量。首次写入前若 `config.toml` 已存在，会在同目录保留一份原始快照 `config.toml.cpac-backup`（只存最早版本），万一文件损坏可手动复制回去。
+Kimi Code 配置目录尊重 `KIMI_CODE_HOME` 环境变量。首次写入前若 `config.toml` 已存在，会在 `state_dir/kimi/config.toml` 保留一份原始快照（只存最早版本），万一文件损坏可手动复制回去。
 
 ## 环境变量
 
@@ -326,7 +331,7 @@ CPAC CLI 可临时覆盖 CPA 地址：
 CPA_BASE_URL='https://cpa.example.com' cpac claude
 ```
 
-`pi-cpa.ts` 插件不读取此变量，固定连接远程 `http://124.223.178.52:8317`，并且只从 Pi 进程环境读取 `CPA_API_KEY`；不读取用户 home 中的私有文件。
+`pi-cpac.ts` 插件固定连接配置指定的 CPA 地址，并且只从 Pi 进程环境读取 `CPA_API_KEY`；不读取用户 home 中的私有文件。
 
 ## 可选 JSON 配置
 

package/dist/agents.js

@@ -209,14 +209,14 @@ const TARGETS = [
         version: () => detectClientVersion("pi"),
         install: async (config, dryRun) => {
             if (dryRun) {
-                console.log(`would write Pi extension: ${join(piExtensionsDir(), "cpac.ts")}`);
+                console.log(`would write Pi extension: ${join(piExtensionsDir(), "pi-cpac.ts")}`);
                 return;
             }
             await installPiExtension(config);
         },
         uninstall: async (_config, dryRun) => {
             if (dryRun) {
-                console.log(`would remove Pi extension: ${join(piExtensionsDir(), "cpac.ts")}`);
+                console.log(`would remove Pi extension: ${join(piExtensionsDir(), "pi-cpac.ts")}`);
                 return;
             }
             await uninstallPiExtension();

package/dist/config.js

@@ -452,7 +452,9 @@ export function originalBytes(stateDir, state, expectedPath) {
     if (!state.config_existed)
         return new Uint8Array();
     try {
-        return readFileSync(join(stateDir, "config.toml.backup"));
+        const next = join(stateDir, "codex", "config.toml");
+        const prev = join(stateDir, "config.toml.backup");
+        return readFileSync(existsSync(next) ? next : prev);
     }
     catch (error) {
         throw new CPACError(`cannot read original config backup: ${error instanceof Error ? error.message : String(error)}`);
@@ -461,6 +463,15 @@ export function originalBytes(stateDir, state, expectedPath) {
 export function cleanupStateFiles(stateDir) {
     for (const name of STATE_FILES)
         rmSync(join(stateDir, name), { force: true });
+    rmSync(join(stateDir, "codex", "config.toml"), { force: true });
+    try {
+        rmdirSync(join(stateDir, "codex"));
+    }
+    catch (error) {
+        const code = error.code;
+        if (code !== "ENOENT" && code !== "ENOTEMPTY" && code !== "EEXIST")
+            throw error;
+    }
     try {
         rmdirSync(stateDir);
     }

package/dist/pi-extension.template

@@ -1,4 +1,4 @@
-// CPAC Pi extension: register CPA models as Pi providers
+// Pi CPAC extension: register CPA models as Pi providers
 // Installed by: cpac pi install
 
 const CPA = "__CPA_URL__";
@@ -71,7 +71,7 @@ function intField(value) {
 export default async function (pi) {
   const apiKey = (process.env.CPA_API_KEY || "").trim();
   if (!apiKey) {
-    console.error("[cpac] CPA_API_KEY not set; skipping CPA providers");
+    console.error("[pi-cpac] CPA_API_KEY not set; skipping CPA providers");
     return;
   }
   let payload;
@@ -81,19 +81,19 @@ export default async function (pi) {
       signal: AbortSignal.timeout(10000),
     });
     if (!res.ok) {
-      console.error("[cpac] CPA models request failed: HTTP " + res.status);
+      console.error("[pi-cpac] CPA models request failed: HTTP " + res.status);
       return;
     }
     payload = await res.json();
   } catch (error) {
-    console.error("[cpac] CPA models request failed: " + (error && error.message || error));
+    console.error("[pi-cpac] CPA models request failed: " + (error && error.message || error));
     return;
   }
   const source = payload && Array.isArray(payload.models)
     ? payload.models
     : payload && Array.isArray(payload.data) ? payload.data : null;
   if (!source) {
-    console.error("[cpac] CPA models response has no models list");
+    console.error("[pi-cpac] CPA models response has no models list");
     return;
   }
   const rows = [];
@@ -110,7 +110,7 @@ export default async function (pi) {
     });
   }
   if (rows.length === 0) {
-    console.error("[cpac] CPA models response has no usable models");
+    console.error("[pi-cpac] CPA models response has no usable models");
     return;
   }
   const groups = new Map();

package/dist/targets/codex.js

@@ -286,7 +286,8 @@ export async function inject(config, v2Off = false, maxContext = false) {
         catalog.bytes = liftContextWindows(catalog.bytes);
     const stateDirExisted = existsSync(config.state_dir);
     if (!state &&
-        STATE_FILES.some((name) => existsSync(join(config.state_dir, name)))) {
+        (STATE_FILES.some((name) => existsSync(join(config.state_dir, name))) ||
+            existsSync(join(config.state_dir, "codex", "config.toml")))) {
         throw new CPACError("state_dir contains CPAC files without a valid state; refusing to overwrite them");
     }
     const fingerprint = proxyFingerprint(config, apiKey);
@@ -350,7 +351,7 @@ export async function inject(config, v2Off = false, maxContext = false) {
         let configWritten = false;
         try {
             if (existed)
-                atomicWrite(join(config.state_dir, "config.toml.backup"), original);
+                atomicWrite(join(config.state_dir, "codex", "config.toml"), original);
             atomicWrite(catalogPath, catalog.bytes);
             atomicWrite(config.codex_config, injected, originalMode);
             configWritten = true;

package/dist/targets/grok.js

@@ -93,7 +93,7 @@ export async function installGrokConfig(config) {
         lines.pop();
     lines.push(GROK_BLOCK_END);
     const target = grokConfigPath();
-    ensureCpacBackup(target);
+    ensureCpacBackup(config.state_dir, "grok", target);
     writeGrokBlock(target, lines.join("\n"));
     console.log(`Installed Grok Build provider config: ${target}`);
     if (!recorded || !(await proxyIsHealthy(recorded))) {

package/dist/targets/kimi.js

@@ -159,7 +159,7 @@ export async function installKimiConfig(config) {
     }
     lines.push(KIMI_BLOCK_END);
     const target = kimiConfigPath();
-    ensureCpacBackup(target);
+    ensureCpacBackup(config.state_dir, "kimi", target);
     writeKimiBlock(target, lines.join("\n"));
     console.log(`Installed Kimi Code provider config: ${target}`);
     if (!recorded || !(await proxyIsHealthy(recorded))) {

package/dist/targets/pi.js

@@ -7,7 +7,8 @@ export 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"));
+    const dir = piExtensionsDir();
+    return existsSync(join(dir, "pi-cpac.ts")) || existsSync(join(dir, "cpac.ts"));
 }
 function piTemplatePath() {
     return join(dirname(fileURLToPath(import.meta.url)), "..", "pi-extension.template");
@@ -18,15 +19,32 @@ function piExtensionContent(cpaUrl) {
 export async function installPiExtension(config) {
     const dir = piExtensionsDir();
     mkdirSync(dir, { recursive: true, mode: 0o700 });
-    const target = join(dir, "cpac.ts");
-    ensureCpacBackup(target);
+    const target = join(dir, "pi-cpac.ts");
+    ensureCpacBackup(config.state_dir, "pi", target);
     atomicWrite(target, Buffer.from(piExtensionContent(config.cpa_url)), 0o644);
+    for (const legacy of ["cpac.ts", "pi-cpa.ts"]) {
+        const legacyPath = join(dir, legacy);
+        if (existsSync(legacyPath) && legacyPath !== target) {
+            try {
+                unlinkSync(legacyPath);
+            }
+            catch { }
+        }
+    }
     console.log(`Installed Pi extension: ${target}`);
 }
 export async function uninstallPiExtension() {
-    const target = join(piExtensionsDir(), "cpac.ts");
-    if (!existsSync(target))
+    const dir = piExtensionsDir();
+    const target = join(dir, "pi-cpac.ts");
+    const legacyTargets = [join(dir, "cpac.ts"), join(dir, "pi-cpa.ts")];
+    let removed = false;
+    for (const file of [target, ...legacyTargets]) {
+        if (existsSync(file)) {
+            unlinkSync(file);
+            console.log(`Removed Pi extension: ${file}`);
+            removed = true;
+        }
+    }
+    if (!removed)
         throw new CPACError("Pi extension is not installed");
-    unlinkSync(target);
-    console.log(`Removed Pi extension: ${target}`);
 }

package/dist/util.js

@@ -1,6 +1,6 @@
 import { chmodSync, closeSync, copyFileSync, existsSync, fsyncSync, mkdirSync, openSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync, } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, join, parse } from "node:path";
+import { basename, dirname, join, parse } from "node:path";
 import { createInterface } from "node:readline/promises";
 import { Writable } from "node:stream";
 let atomicSequence = 0;
@@ -9,13 +9,28 @@ export class CPACError extends Error {
 export function objectValue(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-export function ensureCpacBackup(target) {
-    if (!existsSync(target))
-        return;
-    const backup = `${target}.cpac-backup`;
-    if (existsSync(backup))
-        return;
-    copyFileSync(target, backup);
+export function ensureCpacBackup(stateDir, agent, target) {
+    const dest = join(stateDir, agent, basename(target));
+    const sidecar = `${target}.cpac-backup`;
+    if (!existsSync(dest)) {
+        const source = existsSync(sidecar)
+            ? sidecar
+            : existsSync(target)
+                ? target
+                : null;
+        if (!source)
+            return;
+        mkdirSync(dirname(dest), { recursive: true, mode: 0o700 });
+        try {
+            chmodSync(stateDir, 0o700);
+        }
+        catch {
+            // Directory may already have the desired mode.
+        }
+        copyFileSync(source, dest);
+    }
+    if (existsSync(sidecar))
+        unlinkSync(sidecar);
 }
 export function expandUserPath(value) {
     if (value === "~")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yhong91/cpac",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "description": "Connect Codex and Claude Code to a remote CLIProxyAPI gateway",
   "type": "module",
   "bin": {
@@ -30,7 +30,6 @@
     "clean": "node -e \"for (const d of ['dist','dist-test']) require('fs').rmSync(d,{recursive:true,force:true})\"",
     "build": "npm run clean --if-present && tsc -p tsconfig.build.json && cp src/pi-extension.template dist/ && node -e \"const fs=require('fs');const p='dist/cpac.js';const s=fs.readFileSync(p,'utf8');if(!s.startsWith('#!'))fs.writeFileSync(p,'#!/usr/bin/env node\\n'+s);try{fs.chmodSync(p,0o755)}catch{}\"",
     "check": "tsc -p tsconfig.json --noEmit",
-    "check:pi": "tsc -p tsconfig.pi.json --noEmit",
     "test": "npm run clean && tsc -p tsconfig.test.json && cp src/pi-extension.template dist-test/src/ && node --test --test-reporter=spec dist-test/cpac.test.js",
     "pack:check": "npm pack --dry-run"
   },