@yhong91/cpac 0.1.27 → 0.1.29

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,7 +41,7 @@ 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 restore --target codex            # 字节级恢复原配置
+cpac restore --target codex            # 撤掉注入；注入期间的用户改动会留下
 
 # 4b. 临时接管（退出无痕，不写任何配置文件）
 cpac claude                            # Claude Code 走 CPA
@@ -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` 按原 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` 即可恢复。
 
@@ -285,7 +285,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
@@ -326,7 +326,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

@@ -3,7 +3,7 @@ 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 { fetchCatalog, pickSpawnModels, proxyFingerprint, readState, saveSpawnModels, stateBytes, stateProxy, } from "./config.js";
+import { fetchCatalog, injectedOwnership, pickSpawnModels, proxyFingerprint, readState, saveSpawnModels, stateBytes, stateProxy, } from "./config.js";
 import { proxyIsHealthy, startProxyProcess, stopProxyProcess, } from "./proxy.js";
 import { MANAGED_MARKER, inject, restore } from "./targets/codex.js";
 import { grokConfigPath, grokHome, installGrokConfig, isGrokConfigInstalled, uninstallGrokConfig, } from "./targets/grok.js";
@@ -76,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 });
@@ -90,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);
@@ -206,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

@@ -31,6 +31,9 @@ const STATE_KEYS = new Set([
     "proxy_fingerprint",
     "proxy_pid",
     "proxy_port",
+    "injected_config_hash",
+    "injected_openai_base_url",
+    "injected_catalog_path",
 ]);
 export const STATE_FILES = [
     "state.json",
@@ -388,6 +391,21 @@ export function readState(stateDir) {
             !/^[a-f0-9]{64}$/.test(value.proxy_fingerprint))) {
         throw new CPACError("invalid loopback proxy fingerprint");
     }
+    if (value.injected_config_hash !== undefined &&
+        (typeof value.injected_config_hash !== "string" ||
+            !/^[a-f0-9]{64}$/.test(value.injected_config_hash))) {
+        throw new CPACError("invalid injected_config_hash in state");
+    }
+    if (value.injected_openai_base_url !== undefined &&
+        (typeof value.injected_openai_base_url !== "string" ||
+            !value.injected_openai_base_url.trim())) {
+        throw new CPACError("invalid injected_openai_base_url in state");
+    }
+    if (value.injected_catalog_path !== undefined &&
+        (typeof value.injected_catalog_path !== "string" ||
+            !value.injected_catalog_path.trim())) {
+        throw new CPACError("invalid injected_catalog_path in state");
+    }
     return value;
 }
 export function stateProxy(state) {
@@ -395,7 +413,21 @@ export function stateProxy(state) {
         ? { id: state.proxy_id, pid: state.proxy_pid, port: state.proxy_port }
         : null;
 }
-export function stateBytes(config, existed, mode, proxy, proxyFingerprint) {
+export function injectedOwnership(state) {
+    if (!state?.injected_config_hash ||
+        !state.injected_openai_base_url ||
+        !state.injected_catalog_path)
+        return undefined;
+    return {
+        hash: state.injected_config_hash,
+        openaiBaseUrl: state.injected_openai_base_url,
+        catalogPath: state.injected_catalog_path,
+    };
+}
+export function sha256Hex(bytes) {
+    return createHash("sha256").update(bytes).digest("hex");
+}
+export function stateBytes(config, existed, mode, proxy, proxyFingerprint, injected) {
     return Buffer.from(`${JSON.stringify({
         config_path: config.codex_config,
         config_existed: existed,
@@ -404,6 +436,13 @@ export function stateBytes(config, existed, mode, proxy, proxyFingerprint) {
         proxy_fingerprint: proxyFingerprint,
         proxy_pid: proxy.pid,
         proxy_port: proxy.port,
+        ...(injected
+            ? {
+                injected_config_hash: injected.hash,
+                injected_openai_base_url: injected.openaiBaseUrl,
+                injected_catalog_path: injected.catalogPath,
+            }
+            : {}),
     }, null, 2)}\n`);
 }
 export function originalBytes(stateDir, state, expectedPath) {

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/proxy.js

@@ -5,7 +5,7 @@ import { createServer, request as httpRequest, } from "node:http";
 import { request as httpsRequest } from "node:https";
 import { join } from "node:path";
 import { fileURLToPath } from "node:url";
-import { apiBase, originalBytes, proxyFingerprint, readState, stateBytes, stateProxy, } from "./config.js";
+import { apiBase, injectedOwnership, originalBytes, proxyFingerprint, readState, stateBytes, stateProxy, } from "./config.js";
 import { CPACError, atomicWrite, objectValue, resolveApiKey } from "./util.js";
 const HOP_BY_HOP_HEADERS = new Set([
     "connection",
@@ -322,7 +322,7 @@ export async function runProxy(config) {
     }
     const proxy = await createLoopbackProxy(config.cpa_url, apiKey, recorded.id, recorded.port);
     try {
-        atomicWrite(join(config.state_dir, "state.json"), stateBytes(config, state.config_existed, state.config_mode, { id: recorded.id, pid: process.pid, port: proxy.port }, proxyFingerprint(config, apiKey)));
+        atomicWrite(join(config.state_dir, "state.json"), stateBytes(config, state.config_existed, state.config_mode, { id: recorded.id, pid: process.pid, port: proxy.port }, proxyFingerprint(config, apiKey), injectedOwnership(state)));
     }
     catch (error) {
         proxy.server.closeAllConnections?.();

package/dist/targets/codex.js

@@ -1,6 +1,6 @@
 import { chmodSync, existsSync, mkdirSync, readFileSync, rmSync, statSync, } from "node:fs";
 import { dirname, join } from "node:path";
-import { PROVIDER, STATE_FILES, cleanupStateFiles, fetchCatalog, liftContextWindows, originalBytes, proxyFingerprint, readState, reorderCatalog, stateBytes, stateProxy, } from "../config.js";
+import { PROVIDER, STATE_FILES, cleanupStateFiles, fetchCatalog, injectedOwnership, liftContextWindows, originalBytes, proxyFingerprint, readState, reorderCatalog, sha256Hex, stateBytes, stateProxy, } from "../config.js";
 import { proxyIsHealthy, startProxyProcess, stopProxyProcess, } from "../proxy.js";
 import { CPACError, atomicWrite, dominantEol, tomlString } from "../util.js";
 const MODEL_PROVIDER_KEY = /^\s*(?:model_provider|"model_provider"|'model_provider')\s*=/;
@@ -8,6 +8,37 @@ const MODEL_CATALOG_KEY = /^\s*(?:model_catalog_json|"model_catalog_json"|'model
 const OPENAI_BASE_URL_KEY = /^\s*(?:openai_base_url|"openai_base_url"|'openai_base_url')\s*=/;
 const ROOT_KEY = new RegExp(`(?:${MODEL_PROVIDER_KEY.source}|${MODEL_CATALOG_KEY.source}|${OPENAI_BASE_URL_KEY.source})`);
 export const MANAGED_MARKER = "# CPAC managed; run CPAC 'restore' to restore the original file.";
+function tomlQuotedValue(line) {
+    const eq = line.indexOf("=");
+    if (eq === -1)
+        return undefined;
+    const rest = line.slice(eq + 1).trimStart();
+    if (rest.startsWith('"')) {
+        const match = /^(?:"(?:\\.|[^"\\])*")/.exec(rest);
+        if (!match)
+            return undefined;
+        try {
+            return JSON.parse(match[0]);
+        }
+        catch {
+            return undefined;
+        }
+    }
+    if (rest.startsWith("'")) {
+        const end = rest.indexOf("'", 1);
+        return end === -1 ? undefined : rest.slice(1, end);
+    }
+    return undefined;
+}
+function ownedRootLine(line, owned) {
+    if (!owned)
+        return false;
+    const value = tomlQuotedValue(line);
+    if (value === undefined)
+        return false;
+    return ((MODEL_CATALOG_KEY.test(line) && value === owned.catalogPath) ||
+        (OPENAI_BASE_URL_KEY.test(line) && value === owned.openaiBaseUrl));
+}
 function providerPatterns(provider = PROVIDER) {
     const escaped = provider.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     const modelProviders = `(?:model_providers|"model_providers"|'model_providers')`;
@@ -41,7 +72,7 @@ export function hasProviderTable(content, provider = PROVIDER) {
     }
     return false;
 }
-function stripManagedConfig(content) {
+function stripManagedConfig(content, owned) {
     let text;
     try {
         text = new TextDecoder("utf-8", { fatal: true }).decode(content);
@@ -75,6 +106,8 @@ function stripManagedConfig(content) {
             managedRootKeys -= 1;
             continue;
         }
+        if (inRoot && ownedRootLine(line, owned))
+            continue;
         kept.push(line);
     }
     const output = kept.join("\n");
@@ -225,7 +258,7 @@ export async function inject(config, v2Off = false, maxContext = false) {
         const backup = originalBytes(config.state_dir, state, config.codex_config);
         try {
             original = existsSync(config.codex_config)
-                ? stripManagedConfig(readFileSync(config.codex_config))
+                ? stripManagedConfig(readFileSync(config.codex_config), injectedOwnership(state))
                 : backup;
         }
         catch (error) {
@@ -293,6 +326,11 @@ export async function inject(config, v2Off = false, maxContext = false) {
             await stopProxyProcess(proxy);
         throw error;
     }
+    const ownership = {
+        hash: state?.injected_config_hash ?? sha256Hex(injected),
+        openaiBaseUrl: `http://127.0.0.1:${proxy.port}/v1`,
+        catalogPath,
+    };
     mkdirSync(config.state_dir, { recursive: true, mode: 0o700 });
     if (!stateDirExisted)
         chmodSync(config.state_dir, 0o700);
@@ -300,7 +338,7 @@ export async function inject(config, v2Off = false, maxContext = false) {
         try {
             atomicWrite(catalogPath, catalog.bytes);
             atomicWrite(config.codex_config, injected, originalMode);
-            atomicWrite(join(config.state_dir, "state.json"), stateBytes(config, existed, originalMode, proxy, fingerprint));
+            atomicWrite(join(config.state_dir, "state.json"), stateBytes(config, existed, originalMode, proxy, fingerprint, ownership));
         }
         catch (error) {
             if (startedProxy)
@@ -316,7 +354,7 @@ export async function inject(config, v2Off = false, maxContext = false) {
             atomicWrite(catalogPath, catalog.bytes);
             atomicWrite(config.codex_config, injected, originalMode);
             configWritten = true;
-            atomicWrite(join(config.state_dir, "state.json"), stateBytes(config, existed, originalMode, proxy, fingerprint));
+            atomicWrite(join(config.state_dir, "state.json"), stateBytes(config, existed, originalMode, proxy, fingerprint, ownership));
         }
         catch (error) {
             if (configWritten) {
@@ -361,10 +399,25 @@ export async function restore(config) {
     if (!state)
         throw new CPACError("no active CPAC injection");
     const original = originalBytes(config.state_dir, state, config.codex_config);
-    if (state.config_existed)
-        atomicWrite(config.codex_config, original, state.config_mode);
-    else
-        rmSync(config.codex_config, { force: true });
+    const current = existsSync(config.codex_config)
+        ? readFileSync(config.codex_config)
+        : null;
+    const unchanged = !state.injected_config_hash ||
+        (current !== null && sha256Hex(current) === state.injected_config_hash);
+    if (!current || unchanged) {
+        if (state.config_existed)
+            atomicWrite(config.codex_config, original, state.config_mode);
+        else
+            rmSync(config.codex_config, { force: true });
+    }
+    else {
+        const stripped = stripManagedConfig(current, injectedOwnership(state));
+        const empty = new TextDecoder("utf-8").decode(stripped).trim() === "";
+        if (!state.config_existed && empty)
+            rmSync(config.codex_config, { force: true });
+        else
+            atomicWrite(config.codex_config, stripped, state.config_mode);
+    }
     const proxy = stateProxy(state);
     if (proxy)
         await stopProxyProcess(proxy);

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");
+    const target = join(dir, "pi-cpac.ts");
     ensureCpacBackup(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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yhong91/cpac",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "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"
   },