@yhong91/cpac 0.1.42 → 0.1.44

package/README.md

@@ -178,7 +178,7 @@ cpac -v | --version
 - `models` 从远端 CPA 拉取 rich catalog，默认一行一个 slug；`--json` 输出 `cpa_url` 和模型字段（`slug` / `display_name` / `context_window`）。用来核对 catalog 里有没有某个模型（例如 `*-fast`），不写本地配置。
 - `detect` 列出每个目标是否被检测到、是否已接入 CPAC；`--json` 输出机器可读结果。
 - `install` 默认作用于检测到的目标；后面直接写 agent 名（`cpac install codex pi`），`--all` 全部。`codex` 写入 catalog 并拉起 loopback 代理；`pi`/`kimi`/`grok`/`zed`/`hermes` 写入各自配置。`--dry-run` 只打印将要做的事，`--force` 允许重装已安装目标。
-- `sync` 按当前 `cpa_url` 和 CPA 目录强制刷新**已经接入**的目标（Codex 重新注入、Pi 按 CLI 版本决定写入 packages / `pi update` / 跳过，并清理旧的 `extensions/pi-cpac.ts`、Kimi / Grok / Zed / Hermes 配置重写），用来在 CPA 地址或模型目录变化后一次对齐本地配置。不带参数只动已安装目标；`--all` 会对检测到的目标做同样的强制刷新（尚未安装的会装上）。`--max_context` 仍只对 `cpac install codex` 有效。
+- `sync` 按当前 `cpa_url` 和 CPA 目录强制刷新**已经接入**的目标（Codex 重新注入、Pi / Kimi / Grok / Zed / Hermes 配置重写），用来在 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` 时未安装的目标静默跳过。
@@ -255,7 +255,7 @@ Codex App 的长驻 `app-server` 可能缓存旧目录。注入会删除 `models
 
 `config.toml` 不存在时拒绝注入。当前是 native 时把原文件备份到 `state_dir/codex/config.toml`（覆盖更旧的 native 快照）；已注入后再装不覆盖备份。kimi/grok/zed/hermes/pi 同样：没有旧配置不写空备份，native 覆盖旧快照，已接入则保留。所有 target 的 restore 都按 Codex 规则：注入后记下文件 hash；相对注入未改则逐字节还原备份（没有备份则删除我们创建的文件）；注入后改过则只剥 CPAC 字段，用户改动留下。没有其它需要代理的 agent 时才关闭代理。
 
-loopback 代理是 detached 用户进程，不安装系统服务。机器重启或进程意外退出后，`cpac status` 会报告 `loopback proxy stopped`；重新执行 `cpac install codex` 或 `cpac kimi` / `cpac grok` / `cpac zed` / `cpac hermes` 即可恢复。
+loopback 代理是 detached 用户进程，不安装系统服务。机器重启或进程意外退出后，`cpac status` 会报告 `loopback proxy stopped`；重新执行 `cpac install codex` 或 `cpac pi` / `cpac kimi` / `cpac grok` / `cpac zed` / `cpac hermes` 即可恢复。
 
 默认路径：
 
@@ -268,7 +268,7 @@ CPAC state：~/.cpac/state.json（公用 proxy 字段 + 已接入 agent 记录
   Grok   ~/.cpac/grok/config.toml
   Zed    ~/.cpac/zed/settings.json
   Hermes ~/.cpac/hermes/config.yaml
-  Pi     ~/.cpac/pi/settings.json
+  Pi     ~/.cpac/pi/models.json
 restore / `<agent> clear` 会删掉该 agent 的备份目录和 state.json 里的对应记录
 ```
 
@@ -281,7 +281,7 @@ cpac install pi
 cpac 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/agent/models.json` 的 `providers.cpac` 写入 loopback `baseUrl`、占位 `apiKey`、`api: openai-responses`，以及 CPA catalog 的模型列表。不改当前默认模型；切换用 `/model`。密钥由 loopback 注入。旧的 `npm:@yhong91/cpac` package 和 `extensions/pi-cpac.ts` 会在 install / restore 时删掉。
 
 卸载：`cpac restore pi` 或 `cpac pi clear`。尊重 `PI_CODING_AGENT_DIR`。
 
@@ -341,7 +341,7 @@ cpac restore hermes
 | --- | --- | --- |
 | `CPA_API_KEY` | 无 | CPA Bearer key；可由 `cpac` 首次引导写入 shell 启动文件 |
 | `CPA_BASE_URL` | `http://124.223.178.52:8317` | 覆盖内置 CPA 地址 |
-| `PI_CODING_AGENT_DIR` | `~/.pi/agent` | 覆盖 Pi agent 目录（影响 `settings.json` 写入位置） |
+| `PI_CODING_AGENT_DIR` | `~/.pi/agent` | 覆盖 Pi agent 目录（影响 `models.json` 写入位置） |
 | `KIMI_CODE_HOME` | `~/.kimi-code` | 覆盖 Kimi Code 目录（影响 `cpac install kimi` 写入位置） |
 | `ZED_CONFIG_DIR` | `~/.config/zed` | 覆盖 Zed 配置目录（影响 `cpac install zed` 写入位置） |
 | `HERMES_HOME` | `~/.hermes` | 覆盖 Hermes 目录（影响 `cpac install hermes` 写入位置） |

package/dist/agents.js

@@ -7,7 +7,7 @@ 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, ensurePiExtension, isPiExtensionInstalled, piAgentDir, piSettingsPath, uninstallPiExtension, } from "./targets/pi.js";
+import { installPiConfig, isPiConfigInstalled, piAgentDir, piModelsPath, uninstallPiConfig, } from "./targets/pi.js";
 import { installZedConfig, isZedConfigInstalled, uninstallZedConfig, zedConfigPath, zedHome, } from "./targets/zed.js";
 import { hermesConfigPath, hermesHome, installHermesConfig, isHermesConfigInstalled, uninstallHermesConfig, } from "./targets/hermes.js";
 import { CPACError, atomicWrite, checkboxPicker, compareVersions, expandUserPath, objectValue, tabWizard, } from "./util.js";
@@ -222,17 +222,21 @@ const TARGETS = [
         id: "pi",
         home: () => piAgentDir(),
         detected: () => binaryOnPath("pi") || existsSync(piAgentDir()),
-        installed: () => isPiExtensionInstalled(),
+        installed: () => isPiConfigInstalled(),
         version: () => detectClientVersion("pi"),
         install: async (config, dryRun) => {
-            await ensurePiExtension(config, CPAC_VERSION, dryRun);
+            if (dryRun) {
+                console.log(`would write CPA provider: ${piModelsPath()}`);
+                return;
+            }
+            await installPiConfig(config);
         },
         uninstall: async (config, dryRun) => {
             if (dryRun) {
-                console.log(`would remove ${PI_PACKAGE} from ${piSettingsPath()}`);
+                console.log(`would remove CPA provider: ${piModelsPath()}`);
                 return;
             }
-            await uninstallPiExtension(config);
+            await uninstallPiConfig(config);
         },
     },
     {

package/dist/config.js

@@ -525,7 +525,7 @@ export function needsProxy(state) {
     if (state.config_path)
         return true;
     const agents = state.agents ?? {};
-    return Boolean(agents.codex || agents.kimi || agents.grok || agents.zed || agents.hermes);
+    return Boolean(agents.codex || agents.pi || agents.kimi || agents.grok || agents.zed || agents.hermes);
 }
 export function saveState(stateDir, state) {
     atomicWrite(join(stateDir, "state.json"), Buffer.from(`${JSON.stringify(state, null, 2)}\n`));

package/dist/cpac.js

@@ -8,7 +8,7 @@ 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 { isPiExtensionInstalled } from "./targets/pi.js";
+import { isPiConfigInstalled } from "./targets/pi.js";
 import { isZedConfigInstalled } from "./targets/zed.js";
 import { isHermesConfigInstalled } from "./targets/hermes.js";
 import { defaultConfigPath, loadConfig, originalBytes, pickSpawnModels, readState, saveSpawnModels, stateProxy, catalogMaxContextLive, catalogModelId, catalogModelRows, catalogSlugs, fetchCatalog, } from "./config.js";
@@ -22,7 +22,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 { ensurePiExtension, installPiExtension, isPiExtensionInstalled, piPackageAction, piPackageVersion, uninstallPiExtension, } from "./targets/pi.js";
+export { installPiConfig, isPiConfigInstalled, uninstallPiConfig, PI_PROVIDER_ID, } from "./targets/pi.js";
 export { installZedConfig, isZedConfigInstalled, uninstallZedConfig, ZED_PROVIDER_ID, } from "./targets/zed.js";
 export { installHermesConfig, isHermesConfigInstalled, uninstallHermesConfig, HERMES_PROVIDER_ID, } from "./targets/hermes.js";
 export async function status(config) {
@@ -70,8 +70,8 @@ export async function status(config) {
         console.log("codex: native");
     }
     console.log(`claude: ${keyConfigured ? "ready" : "not configured"}`);
-    const piInstalled = isPiExtensionInstalled();
-    console.log(`pi: ${keyConfigured ? (piInstalled ? "ready" : "extension not installed; run: cpac install pi") : "not configured"}`);
+    const piInstalled = isPiConfigInstalled();
+    console.log(`pi: ${keyConfigured ? (piInstalled ? "ready" : "config not installed; run: cpac install pi") : "not configured"}`);
     const kimiInstalled = isKimiConfigInstalled();
     console.log(`kimi: ${keyConfigured ? (kimiInstalled ? "ready" : "config not installed; run: cpac install kimi") : "not configured"}`);
     const grokInstalled = isGrokConfigInstalled();

package/dist/targets/hermes.js

@@ -76,10 +76,12 @@ function yamlKey(key) {
 }
 function cpacChildLines(port, rows, indent) {
     const pad = (n) => " ".repeat(n);
+    const host = ["127", "0", "0", "1"].join(".");
+    const url = `http://${host}:${port}/v1`;
     const lines = [
         `${pad(indent)}${HERMES_PROVIDER_ID}:`,
-        `${pad(indent + 2)}base_url: ${JSON.stringify(`http://[IP]:${port}/v1`)}`,
-        `${pad(indent + 2)}api: ${JSON.stringify(`http://[IP]:${port}/v1`)}`,
+        `${pad(indent + 2)}base_url: ${JSON.stringify(url)}`,
+        `${pad(indent + 2)}api: ${JSON.stringify(url)}`,
         `${pad(indent + 2)}api_key: cpac`,
         `${pad(indent + 2)}api_mode: responses`,
         `${pad(indent + 2)}discover_models: false`,

package/dist/targets/pi.js

@@ -1,16 +1,27 @@
-import { spawnSync } from "node:child_process";
-import { existsSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, statSync, unlinkSync } from "node:fs";
 import { homedir } from "node:os";
-import { join } from "node:path";
-import { dropAgent, recordWrittenConfig, restoreOwnedConfig, } from "../config.js";
-import { stopProxyProcess } from "../proxy.js";
-import { CPACError, atomicWrite, compareVersions, ensureCpacBackup, expandUserPath, objectValue, } from "../util.js";
-export const PI_PACKAGE = "npm:@yhong91/cpac";
+import { dirname, join } from "node:path";
+import { catalogModelId, catalogModelRows, dropAgent, fetchCatalog, recordWrittenConfig, restoreOwnedConfig, } from "../config.js";
+import { ensureLoopbackProxy, stopProxyProcess } from "../proxy.js";
+import { CPACError, atomicWrite, ensureCpacBackup, expandUserPath, objectValue, resolveApiKey, } from "../util.js";
+export const PI_PROVIDER_ID = "cpac";
 const PI_PACKAGE_NAME = "@yhong91/cpac";
 const LEGACY_EXTENSIONS = ["pi-cpac.ts", "cpac.ts", "pi-cpa.ts"];
+const PI_REASONING_EFFORTS = new Set([
+    "minimal",
+    "low",
+    "medium",
+    "high",
+    "xhigh",
+    "max",
+    "ultra",
+]);
 export function piAgentDir() {
     return expandUserPath(process.env.PI_CODING_AGENT_DIR?.trim() || join(homedir(), ".pi", "agent"));
 }
+export function piModelsPath() {
+    return join(piAgentDir(), "models.json");
+}
 export function piSettingsPath() {
     return join(piAgentDir(), "settings.json");
 }
@@ -37,38 +48,24 @@ function isCpacPackage(entry) {
     const source = packageSource(entry);
     return source !== undefined && specName(source) === PI_PACKAGE_NAME;
 }
-function isEnabledCpacPackage(entry) {
-    if (!isCpacPackage(entry))
-        return false;
-    if (typeof entry === "string")
-        return !entry.startsWith("-");
-    return !objectValue(entry) || entry.enabled !== false;
-}
-function readSettings(path) {
+function readJsonObject(path, label) {
+    if (!existsSync(path))
+        return {};
     let raw;
     try {
         raw = JSON.parse(readFileSync(path, "utf8"));
     }
-    catch (error) {
-        if (error.code === "ENOENT")
-            return {};
-        throw new CPACError(`cannot parse Pi settings: ${path}`);
-    }
-    if (!objectValue(raw)) {
-        throw new CPACError(`Pi settings must be a JSON object: ${path}`);
+    catch {
+        throw new CPACError(`cannot parse Pi ${label}: ${path}`);
     }
+    if (!objectValue(raw))
+        throw new CPACError(`Pi ${label} must be a JSON object: ${path}`);
     return raw;
 }
-function settingsPackages(settings, path) {
-    if (!Object.hasOwn(settings, "packages"))
-        return undefined;
-    if (!Array.isArray(settings.packages)) {
-        throw new CPACError(`Pi settings packages must be an array: ${path}`);
-    }
-    return settings.packages;
-}
-function writeSettings(path, value) {
-    atomicWrite(path, Buffer.from(`${JSON.stringify(value, null, 2)}\n`));
+function writeJson(path, value) {
+    mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
+    const mode = existsSync(path) ? statSync(path).mode & 0o7777 : 0o600;
+    atomicWrite(path, Buffer.from(`${JSON.stringify(value, null, 2)}\n`), mode);
 }
 function removeLeftovers() {
     const removed = [];
@@ -78,116 +75,206 @@ function removeLeftovers() {
     }
     return removed;
 }
-function isPiPackageEnabled() {
+function hasLeftoverPackage() {
+    try {
+        const settings = readJsonObject(piSettingsPath(), "settings.json");
+        const packages = settings.packages;
+        return Array.isArray(packages) && packages.some(isCpacPackage);
+    }
+    catch {
+        return false;
+    }
+}
+function stripLeftoverPackage() {
     const path = piSettingsPath();
     if (!existsSync(path))
         return false;
+    const settings = readJsonObject(path, "settings.json");
+    const packages = settings.packages;
+    if (!Array.isArray(packages) || !packages.some(isCpacPackage))
+        return false;
+    settings.packages = packages.filter((entry) => !isCpacPackage(entry));
+    writeJson(path, settings);
+    return true;
+}
+function hasCpacModels() {
     try {
-        const packages = settingsPackages(readSettings(path), path);
-        return packages?.some(isEnabledCpacPackage) ?? false;
+        const doc = readJsonObject(piModelsPath(), "models.json");
+        const providers = objectValue(doc.providers) ? doc.providers : null;
+        return Boolean(providers && objectValue(providers[PI_PROVIDER_ID]));
     }
     catch {
         return false;
     }
 }
-export function isPiExtensionInstalled() {
-    return leftoverExtensions().length > 0 || isPiPackageEnabled();
+export function isPiConfigInstalled() {
+    return hasCpacModels() || leftoverExtensions().length > 0 || hasLeftoverPackage();
 }
-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;
+function loopbackUrl(port) {
+    const host = ["127", "0", "0", "1"].join(".");
+    return `http://${host}:${port}/v1`;
+}
+function effortsFor(row) {
+    const levels = row.supported_reasoning_levels;
+    if (!Array.isArray(levels))
+        return undefined;
+    const efforts = [];
+    const seen = new Set();
+    for (const level of levels) {
+        const effort = typeof level === "string"
+            ? level.toLowerCase()
+            : objectValue(level) && typeof level.effort === "string"
+                ? level.effort.toLowerCase()
+                : undefined;
+        if (!effort || !PI_REASONING_EFFORTS.has(effort) || seen.has(effort))
+            continue;
+        seen.add(effort);
+        efforts.push(effort);
     }
-    catch {
+    return efforts.length > 0 ? efforts : undefined;
+}
+function thinkingLevelMapFor(efforts) {
+    if (!efforts)
         return undefined;
+    const available = new Set(efforts);
+    return {
+        minimal: available.has("minimal")
+            ? "minimal"
+            : available.has("low")
+                ? "low"
+                : null,
+        low: available.has("low") ? "low" : null,
+        medium: available.has("medium") ? "medium" : null,
+        high: available.has("high") ? "high" : null,
+        xhigh: available.has("xhigh") ? "xhigh" : null,
+        max: available.has("max") || available.has("ultra") ? "max" : null,
+    };
+}
+function inputFor(row) {
+    const modalities = row.input_modalities;
+    if (!Array.isArray(modalities))
+        return ["text", "image"];
+    return modalities.some((value) => value === "image")
+        ? ["text", "image"]
+        : ["text"];
+}
+function buildCpacProvider(port, rows) {
+    const models = [];
+    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 maxOut = typeof row.max_output_tokens === "number" && row.max_output_tokens > 0
+            ? Math.floor(row.max_output_tokens)
+            : 65536;
+        const efforts = effortsFor(row);
+        const thinkingLevelMap = thinkingLevelMapFor(efforts);
+        const model = {
+            id: slug,
+            name: typeof row.display_name === "string" && row.display_name.trim()
+                ? row.display_name.trim()
+                : slug,
+            reasoning: efforts === undefined || thinkingLevelMap !== undefined,
+            input: inputFor(row),
+            cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+            contextWindow: context,
+            maxTokens: maxOut,
+            compat: {
+                sendSessionAffinityHeaders: true,
+                sessionAffinityFormat: "openai-nosession",
+            },
+        };
+        if (thinkingLevelMap)
+            model.thinkingLevelMap = thinkingLevelMap;
+        models.push(model);
     }
+    if (models.length === 0)
+        throw new CPACError("CPA catalog contains no models");
+    return {
+        baseUrl: loopbackUrl(port),
+        api: "openai-responses",
+        apiKey: "cpac",
+        models,
+    };
+}
+function applyPiProvider(doc, provider) {
+    const providers = objectValue(doc.providers) ? { ...doc.providers } : {};
+    if (provider)
+        providers[PI_PROVIDER_ID] = provider;
+    else
+        delete providers[PI_PROVIDER_ID];
+    if (Object.keys(providers).length > 0)
+        doc.providers = providers;
+    else
+        delete doc.providers;
+    return doc;
+}
+function stripPiManaged(content) {
+    const doc = applyPiProvider(JSON.parse(new TextDecoder("utf-8").decode(content)), null);
+    return Buffer.from(`${JSON.stringify(doc, null, 2)}\n`);
+}
+function writePiProvider(path, provider) {
+    const doc = applyPiProvider(readJsonObject(path, "models.json"), provider);
+    writeJson(path, doc);
 }
-export function piPackageAction(desiredVersion) {
-    if (leftoverExtensions().length > 0 || !isPiExtensionInstalled()) {
-        return "install";
+export async function installPiConfig(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));
     }
-    const version = piPackageVersion();
-    if (version !== undefined && compareVersions(version, desiredVersion) < 0) {
-        return "upgrade";
+    catch {
+        throw new CPACError("invalid CPA catalog");
     }
-    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;
+    const rows = catalogModelRows(document) ?? [];
+    if (rows.length === 0)
+        throw new CPACError("CPA catalog contains no models");
+    const { proxy, fingerprint, started } = await ensureLoopbackProxy(config, apiKey);
+    const provider = buildCpacProvider(proxy.port, rows);
+    const target = piModelsPath();
+    const hadFile = existsSync(target);
+    try {
+        ensureCpacBackup(config.state_dir, "pi", target, !hasCpacModels());
+        writePiProvider(target, provider);
+        recordWrittenConfig(config.state_dir, "pi", target, {
+            id: proxy.id,
+            pid: proxy.pid,
+            port: proxy.port,
+            fingerprint,
+        }, hadFile);
     }
-    if (action === "install") {
-        await installPiExtension(config);
-        return;
+    catch (error) {
+        if (started)
+            await stopProxyProcess(proxy);
+        throw error;
     }
-    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`);
+    if (stripLeftoverPackage()) {
+        console.log(`Removed leftover Pi package npm:${PI_PACKAGE_NAME} from ${piSettingsPath()}`);
     }
-}
-function stripPiManaged(content) {
-    const settings = JSON.parse(new TextDecoder("utf-8").decode(content));
-    if (!objectValue(settings))
-        return content;
-    const packages = settings.packages;
-    if (!Array.isArray(packages) || !packages.some(isCpacPackage))
-        return Buffer.from(`${JSON.stringify(settings, null, 2)}\n`);
-    settings.packages = packages.filter((entry) => !isCpacPackage(entry));
-    return Buffer.from(`${JSON.stringify(settings, null, 2)}\n`);
-}
-export async function installPiExtension(config) {
-    const path = piSettingsPath();
-    mkdirSync(piAgentDir(), { recursive: true, mode: 0o700 });
-    const hadFile = existsSync(path);
-    ensureCpacBackup(config.state_dir, "pi", path, !isPiPackageEnabled());
-    const settings = hadFile ? readSettings(path) : {};
-    const packages = settingsPackages(settings, path) ?? [];
-    if (!packages.some(isEnabledCpacPackage)) {
-        settings.packages = [
-            ...packages.filter((entry) => !isCpacPackage(entry)),
-            PI_PACKAGE,
-        ];
-        writeSettings(path, settings);
-    }
-    recordWrittenConfig(config.state_dir, "pi", path, undefined, hadFile);
     for (const file of removeLeftovers()) {
         console.log(`Removed leftover Pi extension: ${file}`);
     }
-    console.log(`Installed Pi package ${PI_PACKAGE} in ${path}`);
+    console.log(`Installed Pi provider "${PI_PROVIDER_ID}": ${target}`);
 }
-export async function uninstallPiExtension(config) {
-    const path = piSettingsPath();
-    let removed = false;
+export async function uninstallPiConfig(config) {
+    const target = piModelsPath();
+    if (!hasCpacModels() && leftoverExtensions().length === 0 && !hasLeftoverPackage())
+        throw new CPACError("Pi CPAC provider is not installed");
+    if (hasCpacModels()) {
+        restoreOwnedConfig(config.state_dir, "pi", target, stripPiManaged);
+    }
+    if (stripLeftoverPackage()) {
+        console.log(`Removed leftover Pi package npm:${PI_PACKAGE_NAME} from ${piSettingsPath()}`);
+    }
     for (const file of removeLeftovers()) {
         console.log(`Removed leftover Pi extension: ${file}`);
-        removed = true;
-    }
-    if (isPiExtensionInstalled() || existsSync(path)) {
-        try {
-            if (existsSync(path)) {
-                restoreOwnedConfig(config.state_dir, "pi", path, stripPiManaged);
-                removed = true;
-                console.log(`Removed Pi package ${PI_PACKAGE} from ${path}`);
-            }
-        }
-        catch (error) {
-            if (!removed)
-                throw error;
-        }
-    }
-    if (!removed)
-        throw new CPACError("Pi extension is not installed");
+    }
     const { stopProxy } = dropAgent(config.state_dir, "pi");
     if (stopProxy)
         await stopProxyProcess(stopProxy);
+    console.log(`Removed Pi provider "${PI_PROVIDER_ID}": ${target}`);
 }

package/package.json

@@ -1,22 +1,13 @@
 {
   "name": "@yhong91/cpac",
-  "version": "0.1.42",
+  "version": "0.1.44",
   "description": "Connect Codex and Claude Code to a remote CLIProxyAPI gateway",
   "type": "module",
   "bin": {
     "cpac": "dist/cpac.js"
   },
-  "keywords": [
-    "pi-package"
-  ],
-  "pi": {
-    "extensions": [
-      "./extensions/pi-cpac.ts"
-    ]
-  },
   "files": [
     "dist",
-    "extensions",
     "cpac.example.json",
     "README.md"
   ],
@@ -43,8 +34,6 @@
     "pack:check": "npm pack --dry-run"
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "^0.84.1",
-    "@earendil-works/pi-coding-agent": "^0.84.1",
     "@types/node": "^22.13.10",
     "typescript": "~5.8.2"
   },

package/extensions/pi-cpac.ts

@@ -1,205 +0,0 @@
-// Pi CPAC extension: register CPA models as Pi providers
-// Loaded via package.json "pi.extensions" when settings include npm:@yhong91/cpac
-
-// keep in sync with src/config.ts DEFAULT_CPA_URL
-const CPA = (process.env.CPA_BASE_URL || "http://124.223.178.52:8317").replace(
-  /\/+$/,
-  "",
-);
-const BUILTIN = new Set([
-  "openai",
-  "github-copilot",
-  "xai",
-  "deepseek",
-  "anthropic",
-  "google",
-]);
-const VENDOR_PREFIXES = [
-  ["gpt-", "openai"],
-  ["o1-", "openai"],
-  ["o3-", "openai"],
-  ["o4-", "openai"],
-  ["gpt-image", "openai"],
-  ["claude-", "anthropic"],
-  ["gemini-", "google"],
-  ["grok-", "xai"],
-  ["deepseek-", "deepseek"],
-  ["glm-", "zhipu"],
-  ["kimi-", "moonshot"],
-  ["mimo-", "xiaomi"],
-  ["doubao-", "volcengine"],
-  ["ark-", "volcengine"],
-  ["minimax-", "minimax"],
-  ["step-", "stepfun"],
-  ["qwen-", "alibaba"],
-  ["hunyuan-", "tencent"],
-];
-const MAX_TOKENS = {
-  "gpt-5.6-sol": 128000,
-  "gpt-5.6-terra": 128000,
-  "gpt-5.6-luna": 128000,
-  "claude-opus-4-6-thinking": 128000,
-  "claude-sonnet-4-6": 64000,
-  "gemini-3.6-flash": 65536,
-  "gemini-3.6-flash-high": 65536,
-  "deepseek-v4-pro": 128000,
-  "deepseek-v4-flash": 128000,
-  "glm-5.3": 128000,
-  "kimi-k2.7-code": 128000,
-  "minimax-m3": 128000,
-  "mimo-v2.5": 131072,
-  "mimo-v2.5-pro": 131072,
-  "grok-4.5": 128000,
-  "doubao-seed-2.0-lite": 128000,
-  "doubao-seed-2.1-turbo": 128000,
-};
-const DEFAULT_MAX_TOKENS = 65536;
-const REASONING_EFFORTS = new Set([
-  "minimal",
-  "low",
-  "medium",
-  "high",
-  "xhigh",
-  "max",
-  "ultra",
-]);
-
-function vendorFor(slug) {
-  for (const [prefix, vendor] of VENDOR_PREFIXES) {
-    if (slug.startsWith(prefix)) return vendor;
-  }
-  return "misc";
-}
-
-function groupName(vendor) {
-  return BUILTIN.has(vendor) ? vendor + "-cpa" : vendor;
-}
-
-function effortsFor(row) {
-  const levels = row.supported_reasoning_levels;
-  if (!Array.isArray(levels)) return undefined;
-  const efforts = levels.flatMap((level) => {
-    if (!level || typeof level !== "object") return [];
-    const effort = level.effort;
-    return typeof effort === "string" && REASONING_EFFORTS.has(effort)
-      ? [effort]
-      : [];
-  });
-  return efforts.length > 0 ? efforts : undefined;
-}
-
-function thinkingLevelMapFor(efforts) {
-  if (!efforts || !efforts.some((effort) => REASONING_EFFORTS.has(effort))) {
-    return undefined;
-  }
-  const available = new Set(efforts);
-  return {
-    minimal: available.has("minimal")
-      ? "minimal"
-      : available.has("low")
-        ? "low"
-        : null,
-    low: available.has("low") ? "low" : null,
-    medium: available.has("medium") ? "medium" : null,
-    high: available.has("high") ? "high" : null,
-    xhigh: available.has("xhigh") ? "xhigh" : null,
-    max: available.has("max") || available.has("ultra") ? "max" : null,
-  };
-}
-
-function intField(value) {
-  return typeof value === "number" && Number.isFinite(value) && value > 0
-    ? Math.floor(value)
-    : undefined;
-}
-
-export default async function (pi) {
-  const apiKey = (process.env.CPA_API_KEY || "").trim();
-  if (!apiKey) {
-    console.error("[pi-cpac] CPA_API_KEY not set; skipping CPA providers");
-    return;
-  }
-  let payload;
-  try {
-    const res = await fetch(CPA + "/v1/models?client_version=1", {
-      headers: { Authorization: "Bearer " + apiKey },
-      signal: AbortSignal.timeout(10000),
-    });
-    if (!res.ok) {
-      console.error("[pi-cpac] CPA models request failed: HTTP " + res.status);
-      return;
-    }
-    payload = await res.json();
-  } catch (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("[pi-cpac] CPA models response has no models list");
-    return;
-  }
-  const rows = [];
-  for (const m of source) {
-    if (!m || typeof m !== "object") continue;
-    const slug =
-      typeof m.slug === "string" && m.slug.trim()
-        ? m.slug.trim()
-        : typeof m.id === "string" && m.id.trim()
-          ? m.id.trim()
-          : null;
-    if (slug)
-      rows.push({
-        slug: slug,
-        display_name: m.display_name,
-        supported_reasoning_levels: m.supported_reasoning_levels,
-        context_window: m.context_window,
-      });
-  }
-  if (rows.length === 0) {
-    console.error("[pi-cpac] CPA models response has no usable models");
-    return;
-  }
-  const groups = new Map();
-  for (const m of rows) {
-    const name = groupName(vendorFor(m.slug));
-    if (!groups.has(name)) groups.set(name, []);
-    groups.get(name).push(m);
-  }
-  for (const [provName, models] of groups) {
-    const vendor = provName.replace(/-cpa$/, "");
-    pi.registerProvider(provName, {
-      name: vendor + " (cpa)",
-      baseUrl: CPA + "/v1",
-      apiKey: apiKey,
-      api: "openai-responses",
-      models: models.map((m) => {
-        const efforts = effortsFor(m);
-        const thinkingLevelMap = thinkingLevelMapFor(efforts);
-        const modelObj = {
-          id: m.slug,
-          name: typeof m.display_name === "string" ? m.display_name : m.slug,
-          reasoning: efforts === undefined || thinkingLevelMap !== undefined,
-          input: ["text", "image"],
-          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-nosession",
-          },
-        };
-        if (thinkingLevelMap) modelObj.thinkingLevelMap = thinkingLevelMap;
-        return modelObj;
-      }),
-    });
-  }
-}