@yhong91/cpac 0.1.2 → 0.1.4

package/README.md

@@ -101,16 +101,20 @@ cpac claude --model claude-sonnet-4-5
 cpac claude -- -p "检查当前项目"
 ```
 
-`cpac claude` 会为 Claude Code 子进程设置：
+`cpac claude` 会在本地起一个临时 loopback 代理，并为 Claude Code 子进程设置：
 
 ```text
-ANTHROPIC_BASE_URL=<CPA 地址>
+ANTHROPIC_BASE_URL=http://127.0.0.1:<临时端口>
 ANTHROPIC_AUTH_TOKEN=<CPA_API_KEY>
+CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY=1
+CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST=1
 ```
 
 同时清除可能覆盖网关选择的 `ANTHROPIC_API_KEY` 和 Claude Code 云 provider 环境变量。它不会修改 `~/.claude/`，并原样返回 Claude Code 的退出码。
 
-> CPA 服务端必须支持 Claude Code 使用的 Anthropic Messages API（`/v1/messages`）。Claude 路径直接连接远端 CPA；CPAC 不负责协议转换。
+代理开启 Claude Code 的 gateway model discovery：`/model` 选择器会列出 CPA 目录里的全部模型。claude 系模型直接使用原 id；其它模型以 `claude-cpac--<模型名>` 别名出现（例如 `claude-cpac--gpt-5.6-sol`），请求发出时由代理还原为真实模型名。
+
+> CPA 服务端必须支持 Claude Code 使用的 Anthropic Messages API（`/v1/messages`）。
 
 ### Codex
 
@@ -175,12 +179,30 @@ CPAC state：~/.cpac
 
 为防止误删或覆盖，`state_dir` 不能是文件系统根目录、用户 home、系统临时目录，也不能包含 Codex 配置文件。
 
+### Pi
+
+安装 CPA provider 扩展到 Pi：
+
+```bash
+cpac pi install
+```
+
+它将生成 `cpac.ts` 写入 `~/.pi/agent/extensions/`，Pi 启动时自动加载并从 CPA 动态注册模型目录。卸载：
+
+```bash
+cpac pi uninstall
+cpac pi status
+```
+
+Pi 扩展尊重 `PI_CODING_AGENT_DIR` 环境变量。
+
 ## 环境变量
 
 | 变量 | 默认值 | 作用 |
 | --- | --- | --- |
 | `CPA_API_KEY` | 无 | CPA Bearer key；可由 `cpac` 首次引导写入 shell 启动文件 |
 | `CPA_BASE_URL` | `https://cpa.vibetime.cc` | 覆盖内置 CPA 地址 |
+| `PI_CODING_AGENT_DIR` | `~/.pi/agent` | 覆盖 Pi agent 目录（影响 `cpac pi install` 写入位置） |
 | `CPAC_CONFIG` | `~/.config/cpac/config.json` | 指定可选 JSON 配置路径 |
 | `CODEX_HOME` | `~/.codex` | Codex home 目录 |
 

package/dist/cpac.js

@@ -507,6 +507,134 @@ export async function createLoopbackProxy(cpaUrl, apiKey, proxyId, port) {
     }
     return { server, port: address.port };
 }
+const CLAUDE_ALIAS_PREFIX = "claude-cpac--";
+function catalogModelRows(document) {
+    if (!objectValue(document))
+        return undefined;
+    const source = Array.isArray(document.models)
+        ? document.models
+        : Array.isArray(document.data)
+            ? document.data
+            : undefined;
+    if (!source)
+        return undefined;
+    return source.filter(objectValue);
+}
+function catalogModelId(model) {
+    if (typeof model.slug === "string" && model.slug.trim())
+        return model.slug.trim();
+    if (typeof model.id === "string" && model.id.trim())
+        return model.id.trim();
+    return undefined;
+}
+async function claudeModelList(cpaUrl, apiKey, response) {
+    let rows;
+    try {
+        const catalog = await fetch(`${apiBase(cpaUrl)}/models?client_version=1`, {
+            headers: { Authorization: `Bearer ${apiKey}`, Accept: "application/json" },
+            signal: AbortSignal.timeout(20_000),
+        });
+        if (catalog.ok)
+            rows = catalogModelRows(await catalog.json());
+    }
+    catch {
+        rows = undefined;
+    }
+    if (!rows) {
+        response.writeHead(502, { "content-type": "application/json" });
+        response.end(JSON.stringify({ error: "CPA catalog request failed" }));
+        return;
+    }
+    // Claude Code's /model picker only lists ids starting with claude/anthropic;
+    // expose every other catalog model as claude-cpac--<id>.
+    const data = [];
+    for (const model of rows) {
+        const id = catalogModelId(model);
+        if (!id)
+            continue;
+        const alias = id.startsWith("claude") ? id : `${CLAUDE_ALIAS_PREFIX}${id}`;
+        data.push({
+            type: "model",
+            id: alias,
+            display_name: typeof model.display_name === "string" && model.display_name.trim()
+                ? model.display_name
+                : id,
+        });
+    }
+    response.writeHead(200, { "content-type": "application/json" });
+    response.end(JSON.stringify({
+        data,
+        has_more: false,
+        first_id: data.length > 0 ? data[0].id : null,
+        last_id: data.length > 0 ? data[data.length - 1].id : null,
+    }));
+}
+export async function createClaudeProxy(cpaUrl, apiKey) {
+    const server = createServer((request, response) => {
+        const requestUrl = request.url ?? "/";
+        if (request.method === "GET" && requestUrl.startsWith("/v1/models")) {
+            void claudeModelList(cpaUrl, apiKey, response);
+            return;
+        }
+        let target;
+        try {
+            target = upstreamUrl(cpaUrl, requestUrl);
+        }
+        catch {
+            response.writeHead(400).end("invalid request URL");
+            return;
+        }
+        const chunks = [];
+        request.on("data", (chunk) => chunks.push(chunk));
+        request.once("error", () => response.destroy());
+        request.once("end", () => {
+            let body = Buffer.concat(chunks);
+            if (body.length > 0) {
+                try {
+                    const parsed = JSON.parse(body.toString("utf8"));
+                    if (objectValue(parsed) &&
+                        typeof parsed.model === "string" &&
+                        parsed.model.startsWith(CLAUDE_ALIAS_PREFIX)) {
+                        parsed.model = parsed.model.slice(CLAUDE_ALIAS_PREFIX.length);
+                        body = Buffer.from(JSON.stringify(parsed));
+                    }
+                }
+                catch {
+                    // not JSON; forward unchanged
+                }
+            }
+            const headers = proxyHeaders(request.headers, apiKey);
+            headers["content-length"] = String(body.length);
+            const send = target.protocol === "https:" ? httpsRequest : httpRequest;
+            const upstream = send(target, { method: request.method, headers }, (upstreamResponse) => {
+                response.writeHead(upstreamResponse.statusCode ?? 502, responseHeaders(upstreamResponse.headers));
+                upstreamResponse.pipe(response);
+            });
+            upstream.once("error", () => {
+                if (!response.headersSent) {
+                    response.writeHead(502, { "content-type": "application/json" });
+                }
+                if (!response.writableEnded)
+                    response.end(JSON.stringify({ error: "CPA upstream request failed" }));
+            });
+            upstream.end(body);
+        });
+    });
+    server.on("clientError", (_error, socket) => socket.destroy());
+    await new Promise((resolveListen, rejectListen) => {
+        server.once("error", rejectListen);
+        server.listen(0, "127.0.0.1", () => {
+            server.off("error", rejectListen);
+            resolveListen();
+        });
+    });
+    const address = server.address();
+    if (!address || typeof address === "string") {
+        server.close();
+        throw new CPACError("cannot determine Claude proxy port");
+    }
+    return { server, port: address.port };
+}
 async function runProxyChild(port) {
     const cpaUrl = process.env.CPAC_PROXY_UPSTREAM;
     const apiKey = process.env.CPAC_PROXY_API_KEY;
@@ -886,7 +1014,8 @@ export async function status(config) {
         }
     }
     console.log(`claude: ${keyConfigured ? "ready" : "not configured"}`);
-    console.log(`pi: ${keyConfigured ? "ready" : "not configured"}`);
+    const piInstalled = isPiExtensionInstalled();
+    console.log(`pi: ${keyConfigured ? (piInstalled ? "ready" : "extension not installed; run: cpac pi install") : "not configured"}`);
     if (!state)
         return 1;
     const proxy = stateProxy(state);
@@ -894,9 +1023,6 @@ export async function status(config) {
         return 2;
     return 0;
 }
-function claudeBaseUrl(cpaUrl) {
-    return cpaUrl.replace(/\/v1$/, "");
-}
 async function promptSecret(name) {
     if (!process.stdin.isTTY || !process.stderr.isTTY) {
         throw new CPACError(`environment variable ${name} is not set; run: export ${name}="..."`);
@@ -952,7 +1078,7 @@ export function saveApiKeyExport(profile, name, apiKey) {
     atomicWrite(profile, Buffer.from(content), mode);
 }
 async function guide(config) {
-    console.log(`CPA Companion\n\nCPA: ${config.cpa_url}\nCPA_API_KEY: ${process.env[config.api_key_env]?.trim() ? "configured" : "not configured"}\n\nCommands:\n  cpac claude [args...]  Launch Claude Code through CPA\n  cpac inject            Inject CPA into Codex and start its loopback proxy\n  cpac proxy             Run the injected loopback proxy in the foreground\n  cpac status            Show agent support status (Codex, Claude, Pi)\n  cpac restore           Restore the original Codex config\n  cpac --help            Show command usage`);
+    console.log(`CPA Companion\n\nCPA: ${config.cpa_url}\nCPA_API_KEY: ${process.env[config.api_key_env]?.trim() ? "configured" : "not configured"}\n\nCommands:\n  cpac claude [args...]  Launch Claude Code through CPA\n  cpac inject            Inject CPA into Codex and start its loopback proxy\n  cpac proxy             Run the injected loopback proxy in the foreground\n  cpac status            Show agent support status (Codex, Claude, Pi)\n  cpac restore           Restore the original Codex config\n  cpac pi install        Install CPA provider extension for Pi\n  cpac pi uninstall      Remove the Pi CPA provider extension\n  cpac pi status         Show Pi extension install status\n  cpac --help            Show command usage`);
     if (process.env[config.api_key_env]?.trim())
         return 0;
     const apiKey = await promptSecret(config.api_key_env);
@@ -964,10 +1090,17 @@ async function guide(config) {
 }
 export async function runClaude(config, args, executable = "claude") {
     const apiKey = await resolveApiKey(config.api_key_env);
+    const proxy = await createClaudeProxy(config.cpa_url, apiKey);
+    const stopProxy = () => {
+        proxy.server.closeAllConnections?.();
+        proxy.server.close();
+    };
     const env = {
         ...process.env,
-        ANTHROPIC_BASE_URL: claudeBaseUrl(config.cpa_url),
+        ANTHROPIC_BASE_URL: `http://127.0.0.1:${proxy.port}`,
         ANTHROPIC_AUTH_TOKEN: apiKey,
+        CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY: "1",
+        CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST: "1",
     };
     delete env.ANTHROPIC_API_KEY;
     delete env.CLAUDE_CODE_USE_ANTHROPIC_AWS;
@@ -977,11 +1110,15 @@ export async function runClaude(config, args, executable = "claude") {
     return await new Promise((resolve, reject) => {
         const child = spawn(executable, args, { env, stdio: "inherit" });
         child.once("error", (error) => {
+            stopProxy();
             reject(new CPACError(error instanceof Error && "code" in error && error.code === "ENOENT"
                 ? `${executable} not found`
                 : `cannot start ${executable}: ${error.message}`));
         });
-        child.once("close", (code) => resolve(code ?? 1));
+        child.once("close", (code) => {
+            stopProxy();
+            resolve(code ?? 1);
+        });
     });
 }
 export async function runProxy(config) {
@@ -1016,18 +1153,74 @@ export async function runProxy(config) {
     await new Promise((resolveClose) => proxy.server.once("close", resolveClose));
     return 0;
 }
+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"));
+}
+function piTemplatePath() {
+    return join(dirname(fileURLToPath(import.meta.url)), "pi-extension.template");
+}
+function piExtensionContent(cpaUrl) {
+    return readFileSync(piTemplatePath(), "utf8").replace("__CPA_URL__", cpaUrl);
+}
+export async function installPiExtension(config) {
+    const dir = piExtensionsDir();
+    mkdirSync(dir, { recursive: true, mode: 0o700 });
+    const target = join(dir, "cpac.ts");
+    atomicWrite(target, Buffer.from(piExtensionContent(config.cpa_url)), 0o644);
+    console.log(`Installed Pi extension: ${target}`);
+}
+export async function uninstallPiExtension() {
+    const target = join(piExtensionsDir(), "cpac.ts");
+    if (!existsSync(target))
+        throw new CPACError("Pi extension is not installed");
+    unlinkSync(target);
+    console.log(`Removed Pi extension: ${target}`);
+}
+export async function runPi(config, action) {
+    if (action === "install") {
+        await installPiExtension(config);
+        return 0;
+    }
+    if (action === "uninstall") {
+        await uninstallPiExtension();
+        return 0;
+    }
+    if (action === "status") {
+        const installed = isPiExtensionInstalled();
+        console.log(`Pi extension: ${installed ? "installed" : "not installed"}`);
+        return installed ? 0 : 1;
+    }
+    throw new CPACError(`unknown pi action: ${action}; use install, uninstall, or status`);
+}
 function usage() {
     return [
         "Usage: cpac",
         "       cpac <inject|status|restore> [--config PATH]",
         "       cpac proxy [--config PATH]",
         "       cpac claude [--config PATH] [--] [claude args...]",
+        "       cpac pi <install|uninstall|status> [--config PATH]",
     ].join("\n");
 }
 function parseArgs(args) {
     if (args.length === 0) {
         return { command: "guide", configPath: defaultConfigPath() };
     }
+    if (args[0] === "pi") {
+        let configPath = defaultConfigPath();
+        let index = 1;
+        if (args[index] === "--config") {
+            const value = args[++index];
+            if (!value)
+                throw new CPACError("--config requires a path");
+            configPath = resolve(expandUserPath(value));
+            index += 1;
+        }
+        const action = args[index] || "status";
+        return { command: "pi", configPath, action };
+    }
     if (args[0] === "claude") {
         let configPath = defaultConfigPath();
         let index = 1;
@@ -1088,6 +1281,8 @@ export async function main(args = process.argv.slice(2)) {
             return await runClaude(config, parsed.args);
         if (parsed.command === "proxy")
             return await runProxy(config);
+        if (parsed.command === "pi")
+            return await runPi(config, parsed.action);
         if (parsed.command === "inject")
             await inject(config);
         else if (parsed.command === "restore")

package/dist/pi-extension.template

@@ -0,0 +1,107 @@
+// CPAC Pi extension: register CPA models as Pi providers
+// Installed by: cpac pi install
+
+const CPA = "__CPA_URL__";
+const BUILTIN = new Set(["openai", "github-copilot", "xai", "deepseek", "anthropic", "google"]);
+const VENDOR_PREFIXES = [
+  ["gpt-", "openai"], ["o1-", "openai"], ["o3-", "openai"], ["o4-", "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.2": 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;
+
+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 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("[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("[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));
+    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");
+    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("[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(function (m) {
+        return {
+          id: m.slug,
+          name: typeof m.display_name === "string" ? m.display_name : m.slug,
+          reasoning: Array.isArray(m.supported_reasoning_levels) && m.supported_reasoning_levels.length > 0,
+          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,
+        };
+      }),
+    });
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yhong91/cpac",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Connect Codex and Claude Code to a remote CLIProxyAPI gateway",
   "type": "module",
   "bin": {
@@ -8,6 +8,7 @@
   },
   "files": [
     "dist/cpac.js",
+    "dist/pi-extension.template",
     "cpac.example.json",
     "README.md"
   ],
@@ -28,10 +29,10 @@
   },
   "scripts": {
     "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 && 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{}\"",
+    "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 && node --test --test-reporter=spec dist-test/cpac.test.js",
+    "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"
   },
   "devDependencies": {