@yhong91/cpac 0.1.30 → 0.1.32

package/README.md

@@ -248,9 +248,9 @@ 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/codex/config.toml`。重复注入不会覆盖首次备份，并会保留 CPAC 管理字段之外的用户编辑。`restore`：若 `config.toml` 相对首次注入未改，按原 mode 逐字节还原备份；若用户在注入期间改过文件，只撤掉 CPAC 写入的 catalog、url 和标记。原先没有 `config.toml` 且撤掉后为空则删除文件。关闭 CPAC loopback 代理。
+`config.toml` 不存在时拒绝注入。当前是 native 时把原文件备份到 `state_dir/codex/config.toml`（覆盖更旧的 native 快照）；已注入后再 inject 不覆盖备份。kimi/grok/pi 同样：没有旧配置不写空备份，native 覆盖旧快照，已接入则保留。`restore --target codex`：若 `config.toml` 相对注入未改，按原 mode 逐字节还原备份；若用户在注入期间改过文件，只撤掉 CPAC 写入的 catalog、url 和标记。没有其它需要代理的 agent 时才关闭代理。
 
-loopback 代理是 detached 用户进程，不安装系统服务。机器重启或进程意外退出后，`cpac status` 会报告 `loopback proxy stopped`；重新执行 `cpac inject` 即可恢复。
+loopback 代理是 detached 用户进程，不安装系统服务。机器重启或进程意外退出后，`cpac status` 会报告 `loopback proxy stopped`；重新执行 `cpac inject` 或 `cpac kimi` / `cpac grok` 即可恢复。
 
 需要由现有进程管理器监督时，可使用前台入口：
 
@@ -258,18 +258,19 @@ loopback 代理是 detached 用户进程，不安装系统服务。机器重启
 cpac proxy
 ```
 
-它复用当前注入记录的端口和实例身份；没有活动注入时会拒绝启动。
+它复用 `state.json` 里记录的端口和实例身份；没有 loopback 记录时会拒绝启动。
 
 默认路径：
 
 ```text
 Codex 配置：$CODEX_HOME/config.toml，未设置 CODEX_HOME 时为 ~/.codex/config.toml
-CPAC state：~/.cpac
+CPAC state：~/.cpac/state.json（公用 proxy 字段 + 已接入 agent 记录）
 各 agent 配置备份：~/.cpac/<agent>/<原文件名>
   Codex  ~/.cpac/codex/config.toml
   Pi     ~/.cpac/pi/pi-cpac.ts
   Kimi   ~/.cpac/kimi/config.toml
   Grok   ~/.cpac/grok/config.toml
+restore / `<agent> clear` 会删掉该 agent 的备份目录和 state.json 里的对应记录
 ```
 
 为防止误删或覆盖，`state_dir` 不能是文件系统根目录、用户 home、系统临时目录，也不能包含 Codex 配置文件。
@@ -306,7 +307,7 @@ Pi 扩展尊重 `PI_CODING_AGENT_DIR` 环境变量。
 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`。卸载与状态：
+它在 `~/.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` 指向共享 loopback 代理，因此密钥不落盘。install 会写入 `state.json` 并在需要时启动代理，不必先 `cpac inject`。卸载与状态：
 
 ```bash
 cpac restore --target kimi

package/dist/agents.js

@@ -1,15 +1,14 @@
 import { spawn, spawnSync } from "node:child_process";
-import { existsSync, mkdirSync, readFileSync, statSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
-import { fetchCatalog, injectedOwnership, pickSpawnModels, proxyFingerprint, readState, saveSpawnModels, stateBytes, stateProxy, } from "./config.js";
-import { proxyIsHealthy, startProxyProcess, stopProxyProcess, } from "./proxy.js";
+import { pickSpawnModels, saveSpawnModels } from "./config.js";
 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";
+import { CPACError, atomicWrite, checkboxPicker, expandUserPath, objectValue, } from "./util.js";
 export async function runCodexConfig(config, configPath, options = {}) {
     if (options.reset) {
         let raw = {};
@@ -73,34 +72,6 @@ export async function runTargetLauncher(config, targetId, args, executable = tar
     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;
-        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 started = await startProxyProcess(config, apiKey);
-            try {
-                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, injectedOwnership(state)));
-            }
-            catch (error) {
-                await stopProxyProcess(started);
-                throw error;
-            }
-        }
-    }
     if (!options.skipSync) {
         if (target.installed(config)) {
             try {
@@ -214,12 +185,12 @@ const TARGETS = [
             }
             await installPiExtension(config);
         },
-        uninstall: async (_config, dryRun) => {
+        uninstall: async (config, dryRun) => {
             if (dryRun) {
                 console.log(`would remove Pi extension: ${join(piExtensionsDir(), "pi-cpac.ts")}`);
                 return;
             }
-            await uninstallPiExtension();
+            await uninstallPiExtension(config);
         },
     },
     {
@@ -235,12 +206,12 @@ const TARGETS = [
             }
             await installKimiConfig(config);
         },
-        uninstall: async (_config, dryRun) => {
+        uninstall: async (config, dryRun) => {
             if (dryRun) {
                 console.log(`would remove CPA provider block: ${kimiConfigPath()}`);
                 return;
             }
-            await uninstallKimiConfig();
+            await uninstallKimiConfig(config);
         },
     },
     {
@@ -256,12 +227,12 @@ const TARGETS = [
             }
             await installGrokConfig(config);
         },
-        uninstall: async (_config, dryRun) => {
+        uninstall: async (config, dryRun) => {
             if (dryRun) {
                 console.log(`would remove CPA provider block: ${grokConfigPath()}`);
                 return;
             }
-            await uninstallGrokConfig();
+            await uninstallGrokConfig(config);
         },
     },
 ];

package/dist/config.js

@@ -20,13 +20,12 @@ const CONFIG_KEYS = new Set([
 // spawn_agent overrides (codex-rs MAX_SPAWN_AGENT_MODEL_OVERRIDES).
 const MAX_SPAWN_MODELS = 5;
 export const CLAUDE_SLOT_KEYS = ["opus", "sonnet", "haiku"];
-const REQUIRED_STATE_KEYS = new Set([
+export const AGENT_IDS = ["codex", "pi", "kimi", "grok"];
+const AGENT_ID_SET = new Set(AGENT_IDS);
+const STATE_KEYS = new Set([
     "config_path",
     "config_existed",
     "config_mode",
-]);
-const STATE_KEYS = new Set([
-    ...REQUIRED_STATE_KEYS,
     "proxy_id",
     "proxy_fingerprint",
     "proxy_pid",
@@ -34,6 +33,7 @@ const STATE_KEYS = new Set([
     "injected_config_hash",
     "injected_openai_base_url",
     "injected_catalog_path",
+    "agents",
 ]);
 export const STATE_FILES = [
     "state.json",
@@ -359,19 +359,37 @@ export function readState(stateDir) {
         throw new CPACError(`cannot read state: ${error instanceof Error ? error.message : String(error)}`);
     }
     if (!objectValue(value) ||
-        Object.keys(value).some((key) => !STATE_KEYS.has(key)) ||
-        [...REQUIRED_STATE_KEYS].some((key) => !(key in value))) {
+        Object.keys(value).some((key) => !STATE_KEYS.has(key))) {
         throw new CPACError("invalid state file");
     }
-    if (typeof value.config_path !== "string" || !isAbsolute(value.config_path)) {
-        throw new CPACError("invalid config path in state");
+    const hasCodex = value.config_path !== undefined ||
+        value.config_existed !== undefined ||
+        value.config_mode !== undefined;
+    if (hasCodex) {
+        if (typeof value.config_path !== "string" || !isAbsolute(value.config_path))
+            throw new CPACError("invalid config path in state");
+        if (typeof value.config_existed !== "boolean")
+            throw new CPACError("invalid config_existed value in state");
+        if (!Number.isInteger(value.config_mode) ||
+            value.config_mode < 0 ||
+            value.config_mode > 0o7777) {
+            throw new CPACError("invalid config_mode value in state");
+        }
     }
-    if (typeof value.config_existed !== "boolean")
-        throw new CPACError("invalid config_existed value in state");
-    if (!Number.isInteger(value.config_mode) ||
-        value.config_mode < 0 ||
-        value.config_mode > 0o7777) {
-        throw new CPACError("invalid config_mode value in state");
+    if (value.agents !== undefined) {
+        if (!objectValue(value.agents))
+            throw new CPACError("invalid agents in state");
+        for (const [id, rec] of Object.entries(value.agents)) {
+            if (!AGENT_ID_SET.has(id))
+                throw new CPACError(`unknown agent in state: ${id}`);
+            if (!objectValue(rec) ||
+                typeof rec.path !== "string" ||
+                !rec.path ||
+                (rec.existed !== undefined && typeof rec.existed !== "boolean") ||
+                Object.keys(rec).some((key) => key !== "path" && key !== "existed")) {
+                throw new CPACError(`invalid agent record: ${id}`);
+            }
+        }
     }
     const proxyKeys = ["proxy_id", "proxy_pid", "proxy_port"];
     const proxyKeyCount = proxyKeys.filter((key) => key in value).length;
@@ -413,6 +431,90 @@ export function stateProxy(state) {
         ? { id: state.proxy_id, pid: state.proxy_pid, port: state.proxy_port }
         : null;
 }
+export function needsProxy(state) {
+    if (state.config_path)
+        return true;
+    const agents = state.agents ?? {};
+    return Boolean(agents.codex || agents.kimi || agents.grok);
+}
+export function saveState(stateDir, state) {
+    atomicWrite(join(stateDir, "state.json"), Buffer.from(`${JSON.stringify(state, null, 2)}\n`));
+}
+export function recordAgent(stateDir, id, path, proxy, existed) {
+    const current = readState(stateDir) ?? {};
+    const prev = current.agents?.[id];
+    const record = { path };
+    if (!(prev?.existed ?? existed ?? true))
+        record.existed = false;
+    const next = {
+        ...current,
+        agents: { ...current.agents, [id]: record },
+    };
+    if (proxy) {
+        next.proxy_id = proxy.id;
+        next.proxy_pid = proxy.pid;
+        next.proxy_port = proxy.port;
+        next.proxy_fingerprint = proxy.fingerprint;
+    }
+    saveState(stateDir, next);
+    return next;
+}
+export function removeCreatedTarget(stateDir, id, target) {
+    if (readState(stateDir)?.agents?.[id]?.existed === false)
+        rmSync(target, { force: true });
+}
+export function dropAgent(stateDir, id) {
+    rmSync(join(stateDir, id), { recursive: true, force: true });
+    const current = readState(stateDir);
+    if (!current) {
+        try {
+            rmdirSync(stateDir);
+        }
+        catch (error) {
+            const code = error.code;
+            if (code !== "ENOENT" && code !== "ENOTEMPTY" && code !== "EEXIST")
+                throw error;
+        }
+        return { state: null, stopProxy: null };
+    }
+    const proxy = stateProxy(current);
+    const agents = { ...current.agents };
+    delete agents[id];
+    const next = { ...current, agents };
+    if (id === "codex") {
+        delete next.config_path;
+        delete next.config_existed;
+        delete next.config_mode;
+        delete next.injected_config_hash;
+        delete next.injected_openai_base_url;
+        delete next.injected_catalog_path;
+    }
+    if (Object.keys(agents).length === 0)
+        delete next.agents;
+    const leftover = Boolean(next.config_path) ||
+        (next.agents && Object.keys(next.agents).length > 0);
+    const stopProxy = proxy && !needsProxy(next) ? proxy : null;
+    if (stopProxy) {
+        delete next.proxy_id;
+        delete next.proxy_pid;
+        delete next.proxy_port;
+        delete next.proxy_fingerprint;
+    }
+    if (!leftover) {
+        rmSync(join(stateDir, "state.json"), { force: true });
+        try {
+            rmdirSync(stateDir);
+        }
+        catch (error) {
+            const code = error.code;
+            if (code !== "ENOENT" && code !== "ENOTEMPTY" && code !== "EEXIST")
+                throw error;
+        }
+        return { state: null, stopProxy };
+    }
+    saveState(stateDir, next);
+    return { state: next, stopProxy };
+}
 export function injectedOwnership(state) {
     if (!state?.injected_config_hash ||
         !state.injected_openai_base_url ||
@@ -427,7 +529,7 @@ export function injectedOwnership(state) {
 export function sha256Hex(bytes) {
     return createHash("sha256").update(bytes).digest("hex");
 }
-export function stateBytes(config, existed, mode, proxy, proxyFingerprint, injected) {
+export function stateBytes(config, existed, mode, proxy, proxyFingerprint, injected, existing) {
     return Buffer.from(`${JSON.stringify({
         config_path: config.codex_config,
         config_existed: existed,
@@ -443,9 +545,19 @@ export function stateBytes(config, existed, mode, proxy, proxyFingerprint, injec
                 injected_catalog_path: injected.catalogPath,
             }
             : {}),
+        agents: {
+            ...existing?.agents,
+            codex: {
+                path: config.codex_config,
+                ...(existed ? {} : { existed: false }),
+            },
+        },
     }, null, 2)}\n`);
 }
 export function originalBytes(stateDir, state, expectedPath) {
+    if (!state.config_path) {
+        throw new CPACError("no Codex injection in state");
+    }
     if (state.config_path !== expectedPath) {
         throw new CPACError(`active injection belongs to ${state.config_path}; restore it first`);
     }

package/dist/cpac.js

@@ -27,7 +27,7 @@ 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) {
+    if (state?.config_path) {
         originalBytes(config.state_dir, state, config.codex_config);
         if (existsSync(config.codex_config)) {
             const proxy = stateProxy(state);
@@ -65,7 +65,7 @@ export async function status(config) {
     if (!state)
         return 1;
     const proxy = stateProxy(state);
-    if (!proxy || !(await proxyIsHealthy(proxy)))
+    if (proxy && !(await proxyIsHealthy(proxy)))
         return 2;
     return 0;
 }

package/dist/pi-extension.template

@@ -137,6 +137,10 @@ export default async function (pi) {
           cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
           contextWindow: intField(m.context_window) || 200000,
           maxTokens: MAX_TOKENS[m.slug] || DEFAULT_MAX_TOKENS,
+          compat: {
+            sendSessionAffinityHeaders: true,
+            sessionAffinityFormat: "openai",
+          },
         };
         if (thinkingLevelMap) modelObj.thinkingLevelMap = thinkingLevelMap;
         return modelObj;

package/dist/proxy.js

@@ -3,10 +3,9 @@ import { randomBytes } from "node:crypto";
 import { existsSync, readFileSync } from "node:fs";
 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, injectedOwnership, originalBytes, proxyFingerprint, readState, stateBytes, stateProxy, } from "./config.js";
-import { CPACError, atomicWrite, objectValue, resolveApiKey } from "./util.js";
+import { apiBase, proxyFingerprint, readState, saveState, stateProxy, } from "./config.js";
+import { CPACError, objectValue, resolveApiKey } from "./util.js";
 const HOP_BY_HOP_HEADERS = new Set([
     "connection",
     "keep-alive",
@@ -307,22 +306,43 @@ export async function stopProxyProcess(proxy) {
     await new Promise((resolveWait) => setTimeout(resolveWait, 200));
     killCpacProxy(proxy.pid, "SIGKILL");
 }
+export async function ensureLoopbackProxy(config, apiKey) {
+    const fingerprint = proxyFingerprint(config, apiKey);
+    const recorded = readState(config.state_dir);
+    const existing = recorded ? stateProxy(recorded) : null;
+    if (existing &&
+        recorded?.proxy_fingerprint === fingerprint &&
+        (config.codex_proxy_port === 0 ||
+            config.codex_proxy_port === existing.port) &&
+        (await proxyIsHealthy(existing))) {
+        return { proxy: existing, fingerprint, started: false };
+    }
+    if (existing)
+        await stopProxyProcess(existing);
+    const proxy = await startProxyProcess(config, apiKey);
+    return { proxy, fingerprint, started: true };
+}
 export async function runProxy(config) {
     const apiKey = await resolveApiKey(config.api_key_env);
     const state = readState(config.state_dir);
     if (!state)
-        throw new CPACError("no active CPAC injection; run cpac inject first");
-    originalBytes(config.state_dir, state, config.codex_config);
+        throw new CPACError("no active CPAC state; run cpac inject or install an agent first");
     const recorded = stateProxy(state);
     if (!recorded) {
-        throw new CPACError("injection has no loopback proxy state; run cpac inject to migrate it");
+        throw new CPACError("state has no loopback proxy; run cpac inject or install kimi/grok first");
     }
     if (await proxyIsHealthy(recorded)) {
         throw new CPACError(`loopback proxy is already running on 127.0.0.1:${recorded.port}`);
     }
     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), injectedOwnership(state)));
+        saveState(config.state_dir, {
+            ...state,
+            proxy_id: recorded.id,
+            proxy_pid: process.pid,
+            proxy_port: proxy.port,
+            proxy_fingerprint: proxyFingerprint(config, apiKey),
+        });
     }
     catch (error) {
         proxy.server.closeAllConnections?.();

package/dist/targets/codex.js

@@ -1,7 +1,7 @@
 import { chmodSync, existsSync, mkdirSync, readFileSync, rmSync, statSync, } from "node:fs";
 import { dirname, join } from "node:path";
-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 { PROVIDER, STATE_FILES, cleanupStateFiles, dropAgent, fetchCatalog, injectedOwnership, liftContextWindows, originalBytes, readState, reorderCatalog, saveState, sha256Hex, stateBytes, } from "../config.js";
+import { ensureLoopbackProxy, stopProxyProcess } from "../proxy.js";
 import { CPACError, atomicWrite, dominantEol, tomlString } from "../util.js";
 const MODEL_PROVIDER_KEY = /^\s*(?:model_provider|"model_provider"|'model_provider')\s*=/;
 const MODEL_CATALOG_KEY = /^\s*(?:model_catalog_json|"model_catalog_json"|'model_catalog_json')\s*=/;
@@ -251,10 +251,14 @@ export async function inject(config, v2Off = false, maxContext = false) {
     if (!apiKey)
         throw new CPACError(`environment variable ${config.api_key_env} is not set`);
     const state = readState(config.state_dir);
+    const prior = state;
+    if (!state?.config_path && !existsSync(config.codex_config)) {
+        throw new CPACError(`Codex config not found at ${config.codex_config}. Is Codex installed?`);
+    }
     let existed;
     let original;
     let originalMode;
-    if (state) {
+    if (state?.config_path) {
         const backup = originalBytes(config.state_dir, state, config.codex_config);
         try {
             original = existsSync(config.codex_config)
@@ -286,31 +290,20 @@ 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))) ||
-            existsSync(join(config.state_dir, "codex", "config.toml")))) {
+        STATE_FILES.some((name) => existsSync(join(config.state_dir, name)))) {
         throw new CPACError("state_dir contains CPAC files without a valid state; refusing to overwrite them");
     }
-    const fingerprint = proxyFingerprint(config, apiKey);
-    const previousProxy = state ? stateProxy(state) : null;
     let proxy;
+    let fingerprint;
     let startedProxy = false;
-    if (previousProxy &&
-        state?.proxy_fingerprint === fingerprint &&
-        (config.codex_proxy_port === 0 ||
-            config.codex_proxy_port === previousProxy.port) &&
-        (await proxyIsHealthy(previousProxy))) {
-        proxy = previousProxy;
+    try {
+        const ensured = await ensureLoopbackProxy(config, apiKey);
+        proxy = ensured.proxy;
+        fingerprint = ensured.fingerprint;
+        startedProxy = ensured.started;
     }
-    else {
-        if (previousProxy)
-            await stopProxyProcess(previousProxy);
-        try {
-            proxy = await startProxyProcess(config, apiKey);
-            startedProxy = true;
-        }
-        catch (error) {
-            throw new CPACError(`${error instanceof Error ? error.message : String(error)}; choose another codex_proxy_port if the port is occupied`);
-        }
+    catch (error) {
+        throw new CPACError(`${error instanceof Error ? error.message : String(error)}; choose another codex_proxy_port if the port is occupied`);
     }
     const catalogPath = join(config.state_dir, "codex-models.json");
     let injected;
@@ -335,11 +328,11 @@ export async function inject(config, v2Off = false, maxContext = false) {
     mkdirSync(config.state_dir, { recursive: true, mode: 0o700 });
     if (!stateDirExisted)
         chmodSync(config.state_dir, 0o700);
-    if (state) {
+    if (state?.config_path) {
         try {
             atomicWrite(catalogPath, catalog.bytes);
             atomicWrite(config.codex_config, injected, originalMode);
-            atomicWrite(join(config.state_dir, "state.json"), stateBytes(config, existed, originalMode, proxy, fingerprint, ownership));
+            atomicWrite(join(config.state_dir, "state.json"), stateBytes(config, existed, originalMode, proxy, fingerprint, ownership, prior));
         }
         catch (error) {
             if (startedProxy)
@@ -350,12 +343,11 @@ export async function inject(config, v2Off = false, maxContext = false) {
     else {
         let configWritten = false;
         try {
-            if (existed)
-                atomicWrite(join(config.state_dir, "codex", "config.toml"), original);
+            atomicWrite(join(config.state_dir, "codex", "config.toml"), original);
             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, ownership));
+            atomicWrite(join(config.state_dir, "state.json"), stateBytes(config, existed, originalMode, proxy, fingerprint, ownership, prior));
         }
         catch (error) {
             if (configWritten) {
@@ -371,7 +363,10 @@ export async function inject(config, v2Off = false, maxContext = false) {
             }
             let cleanupError;
             try {
-                cleanupStateFiles(config.state_dir);
+                if (prior)
+                    saveState(config.state_dir, prior);
+                else
+                    cleanupStateFiles(config.state_dir);
             }
             catch (caught) {
                 cleanupError = caught;
@@ -397,8 +392,8 @@ export async function inject(config, v2Off = false, maxContext = false) {
 }
 export async function restore(config) {
     const state = readState(config.state_dir);
-    if (!state)
-        throw new CPACError("no active CPAC injection");
+    if (!state?.config_path)
+        throw new CPACError("no active CPAC Codex injection");
     const original = originalBytes(config.state_dir, state, config.codex_config);
     const current = existsSync(config.codex_config)
         ? readFileSync(config.codex_config)
@@ -419,11 +414,18 @@ export async function restore(config) {
         else
             atomicWrite(config.codex_config, stripped, state.config_mode);
     }
-    const proxy = stateProxy(state);
-    if (proxy)
-        await stopProxyProcess(proxy);
+    const { stopProxy } = dropAgent(config.state_dir, "codex");
+    if (stopProxy)
+        await stopProxyProcess(stopProxy);
     try {
-        cleanupStateFiles(config.state_dir);
+        if (readState(config.state_dir)) {
+            rmSync(join(config.state_dir, "codex", "config.toml"), { force: true });
+            rmSync(join(config.state_dir, "config.toml.backup"), { force: true });
+            rmSync(join(config.state_dir, "codex-models.json"), { force: true });
+        }
+        else {
+            cleanupStateFiles(config.state_dir);
+        }
     }
     catch (error) {
         throw new CPACError(`config restored, but state cleanup failed: ${error instanceof Error ? error.message : String(error)}`);

package/dist/targets/grok.js

@@ -1,8 +1,8 @@
 import { existsSync, mkdirSync, readFileSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
-import { catalogModelId, catalogModelRows, fetchCatalog, readState, stateProxy, } from "../config.js";
-import { proxyIsHealthy } from "../proxy.js";
+import { catalogModelId, catalogModelRows, dropAgent, fetchCatalog, recordAgent, removeCreatedTarget, } from "../config.js";
+import { ensureLoopbackProxy, stopProxyProcess } from "../proxy.js";
 import { CPACError, atomicWrite, ensureCpacBackup, expandUserPath, resolveApiKey, tomlString, } from "../util.js";
 export function grokHome() {
     const home = process.env.GROK_HOME?.trim() || join(homedir(), ".grok");
@@ -70,12 +70,8 @@ export async function installGrokConfig(config) {
     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 { proxy, fingerprint, started } = await ensureLoopbackProxy(config, apiKey);
+    const port = proxy.port;
     const lines = [GROK_BLOCK_START];
     for (const row of rows) {
         const slug = catalogModelId(row);
@@ -87,23 +83,38 @@ export async function installGrokConfig(config) {
         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}`, "");
+        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.", '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(config.state_dir, "grok", 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");
+    const hadFile = existsSync(target);
+    try {
+        ensureCpacBackup(config.state_dir, "grok", target, !isGrokConfigInstalled());
+        writeGrokBlock(target, lines.join("\n"));
+        recordAgent(config.state_dir, "grok", target, {
+            id: proxy.id,
+            pid: proxy.pid,
+            port: proxy.port,
+            fingerprint,
+        }, hadFile);
     }
+    catch (error) {
+        if (started)
+            await stopProxyProcess(proxy);
+        throw error;
+    }
+    console.log(`Installed Grok Build provider config: ${target}`);
 }
-export async function uninstallGrokConfig() {
+export async function uninstallGrokConfig(config) {
     const target = grokConfigPath();
     if (!isGrokConfigInstalled())
         throw new CPACError("Grok Build config is not installed");
     writeGrokBlock(target, null);
+    removeCreatedTarget(config.state_dir, "grok", target);
+    const { stopProxy } = dropAgent(config.state_dir, "grok");
+    if (stopProxy)
+        await stopProxyProcess(stopProxy);
     console.log(`Removed Grok Build provider config: ${target}`);
 }

package/dist/targets/kimi.js

@@ -1,8 +1,8 @@
 import { existsSync, mkdirSync, readFileSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
-import { catalogModelId, catalogModelRows, fetchCatalog, readState, stateProxy, } from "../config.js";
-import { proxyIsHealthy } from "../proxy.js";
+import { catalogModelId, catalogModelRows, dropAgent, fetchCatalog, recordAgent, removeCreatedTarget, } from "../config.js";
+import { ensureLoopbackProxy, stopProxyProcess } from "../proxy.js";
 import { CPACError, atomicWrite, ensureCpacBackup, expandUserPath, objectValue, resolveApiKey, tomlString, tomlStringArray, } from "../util.js";
 export function kimiConfigPath() {
     const home = process.env.KIMI_CODE_HOME?.trim() || join(homedir(), ".kimi-code");
@@ -111,18 +111,14 @@ export async function installKimiConfig(config) {
     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 { proxy, fingerprint, started } = await ensureLoopbackProxy(config, apiKey);
+    const port = proxy.port;
     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.',
+        "# Placeholder: the CPAC loopback proxy replaces it with the CPA key.",
         'api_key = "cpac-loopback"',
     ];
     for (const row of rows) {
@@ -159,17 +155,32 @@ export async function installKimiConfig(config) {
     }
     lines.push(KIMI_BLOCK_END);
     const target = kimiConfigPath();
-    ensureCpacBackup(config.state_dir, "kimi", 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");
+    const hadFile = existsSync(target);
+    try {
+        ensureCpacBackup(config.state_dir, "kimi", target, !isKimiConfigInstalled());
+        writeKimiBlock(target, lines.join("\n"));
+        recordAgent(config.state_dir, "kimi", target, {
+            id: proxy.id,
+            pid: proxy.pid,
+            port: proxy.port,
+            fingerprint,
+        }, hadFile);
     }
+    catch (error) {
+        if (started)
+            await stopProxyProcess(proxy);
+        throw error;
+    }
+    console.log(`Installed Kimi Code provider config: ${target}`);
 }
-export async function uninstallKimiConfig() {
+export async function uninstallKimiConfig(config) {
     const target = kimiConfigPath();
     if (!isKimiConfigInstalled())
         throw new CPACError("Kimi Code config is not installed");
     writeKimiBlock(target, null);
+    removeCreatedTarget(config.state_dir, "kimi", target);
+    const { stopProxy } = dropAgent(config.state_dir, "kimi");
+    if (stopProxy)
+        await stopProxyProcess(stopProxy);
     console.log(`Removed Kimi Code provider config: ${target}`);
 }

package/dist/targets/pi.js

@@ -2,6 +2,8 @@ import { existsSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
+import { dropAgent, recordAgent } from "../config.js";
+import { stopProxyProcess } from "../proxy.js";
 import { CPACError, atomicWrite, ensureCpacBackup, expandUserPath, } from "../util.js";
 export function piExtensionsDir() {
     return join(expandUserPath(process.env.PI_CODING_AGENT_DIR?.trim() || join(homedir(), ".pi", "agent")), "extensions");
@@ -20,8 +22,9 @@ export async function installPiExtension(config) {
     const dir = piExtensionsDir();
     mkdirSync(dir, { recursive: true, mode: 0o700 });
     const target = join(dir, "pi-cpac.ts");
-    ensureCpacBackup(config.state_dir, "pi", target);
+    ensureCpacBackup(config.state_dir, "pi", target, !isPiExtensionInstalled());
     atomicWrite(target, Buffer.from(piExtensionContent(config.cpa_url)), 0o644);
+    recordAgent(config.state_dir, "pi", target);
     for (const legacy of ["cpac.ts", "pi-cpa.ts"]) {
         const legacyPath = join(dir, legacy);
         if (existsSync(legacyPath) && legacyPath !== target) {
@@ -33,7 +36,7 @@ export async function installPiExtension(config) {
     }
     console.log(`Installed Pi extension: ${target}`);
 }
-export async function uninstallPiExtension() {
+export async function uninstallPiExtension(config) {
     const dir = piExtensionsDir();
     const target = join(dir, "pi-cpac.ts");
     const legacyTargets = [join(dir, "cpac.ts"), join(dir, "pi-cpa.ts")];
@@ -47,4 +50,7 @@ export async function uninstallPiExtension() {
     }
     if (!removed)
         throw new CPACError("Pi extension is not installed");
+    const { stopProxy } = dropAgent(config.state_dir, "pi");
+    if (stopProxy)
+        await stopProxyProcess(stopProxy);
 }

package/dist/util.js

@@ -9,17 +9,16 @@ export class CPACError extends Error {
 export function objectValue(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-export function ensureCpacBackup(stateDir, agent, target) {
+export function ensureCpacBackup(stateDir, agent, target, native = false) {
     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;
+    if (existsSync(dest) && !native) {
+        if (existsSync(sidecar))
+            unlinkSync(sidecar);
+        return;
+    }
+    const source = native && existsSync(target) ? target : existsSync(sidecar) ? sidecar : null;
+    if (source) {
         mkdirSync(dirname(dest), { recursive: true, mode: 0o700 });
         try {
             chmodSync(stateDir, 0o700);

package/package.json

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