@yhong91/cpac 0.1.11 → 0.1.13

package/README.md

@@ -93,18 +93,18 @@ cpac --help
 
 ### 统一管理（detect / install / uninstall / upgrade）
 
-参考 vibetime 的目标式命令，对 `codex`、`claude`、`pi`、`kimi` 四个目标统一管理：
+参考 vibetime 的目标式命令，对 `codex`、`pi`、`kimi` 三个持久注入目标统一管理（claude/opencode 是临时接管，用 `cpac claude` / `cpac opencode` 启动，不属于 install 目标）：
 
 ```bash
 cpac detect [--json] [--home PATH]
-cpac install [--target codex,claude,pi,kimi] [--all] [--dry-run] [--force] [--v2_off] [--v2_models] [--home PATH]
-cpac uninstall [--target codex,claude,pi,kimi] [--all] [--dry-run] [--home PATH]
+cpac install [--target codex,pi,kimi] [--all] [--dry-run] [--force] [--v2_off] [--v2_models] [--home PATH]
+cpac uninstall [--target codex,pi,kimi] [--all] [--dry-run] [--home PATH]
 cpac upgrade [--check]
 cpac version
 ```
 
 - `detect` 列出每个目标是否被检测到、是否已接入 CPAC；`--json` 输出机器可读结果。
-- `install` 默认作用于检测到的目标；`--target` 指定目标、`--all` 全部。各目标映射到既有逻辑：`codex` → `cpac inject`，`pi` → `cpac pi install`，`kimi` → `cpac kimi install`；`claude` 无持久化安装（用 `cpac claude` 启动）。`--dry-run` 只打印将要做的事，`--force` 允许重装已安装目标。
+- `install` 默认作用于检测到的目标；`--target` 指定目标、`--all` 全部。各目标映射到既有逻辑：`codex` → `cpac inject`，`pi` → `cpac pi install`，`kimi` → `cpac kimi install`。`--dry-run` 只打印将要做的事，`--force` 允许重装已安装目标。
 - Codex 注入默认开启 multi-agent v2（写入 `[features.multi_agent_v2] enabled = true`）；`install --target codex --v2_off` 写入 `enabled = false`。服务端还需在 CPA 配置中开启 `codex.optimize-multi-agent-v2`。
 - `--v2_models` 进入 arrow-key 复选框选择最多 5 个 spawn_agent 模型（勾选顺序即推荐顺序），选择结果存入配置文件的 `spawn_models`，注入时把这些模型排到 `codex-models.json` 最前——Codex 客户端只把 catalog 前 5 个可见模型广告为 spawn 覆盖项。
 - `uninstall` 默认作用于已安装目标，映射到 `cpac restore` / `cpac pi uninstall` / `cpac kimi uninstall`。
@@ -157,7 +157,7 @@ Claude Code 的发现协议不携带 context 信息，claude 前缀的未知模
 注入 CPA 模型目录：
 
 ```bash
-cpac inject
+cpac inject [--v2_off] [--v2_models] [--config PATH]
 ```
 
 查看状态：

package/dist/cpac.js

@@ -734,6 +734,10 @@ export async function createLoopbackProxy(cpaUrl, apiKey, proxyId, port) {
                 response.end(JSON.stringify({ error: "CPA upstream request failed" }));
         });
         request.once("aborted", () => upstream.destroy());
+        response.once("close", () => {
+            if (!response.writableEnded)
+                upstream.destroy();
+        });
         request.pipe(upstream);
     });
     server.on("upgrade", (_request, socket) => {
@@ -941,6 +945,11 @@ export async function createClaudeProxy(cpaUrl, apiKey) {
                 if (!response.writableEnded)
                     response.end(JSON.stringify({ error: "CPA upstream request failed" }));
             });
+            request.once("aborted", () => upstream.destroy());
+            response.once("close", () => {
+                if (!response.writableEnded)
+                    upstream.destroy();
+            });
             upstream.end(body);
         });
     });
@@ -1835,20 +1844,6 @@ const TARGETS = [
             await restore(config);
         },
     },
-    {
-        id: "claude",
-        home: () => expandUserPath(process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), ".claude")),
-        detected: () => binaryOnPath("claude") || existsSync(join(homedir(), ".claude")),
-        installed: () => false,
-        install: async (_config, dryRun) => {
-            const message = "claude needs no install; launch it through CPA with: cpac claude";
-            console.log(dryRun ? `would do nothing: ${message}` : message);
-        },
-        uninstall: async (_config, dryRun) => {
-            const message = "claude keeps no persistent CPAC state; nothing to remove";
-            console.log(dryRun ? `would do nothing: ${message}` : message);
-        },
-    },
     {
         id: "pi",
         home: () => piExtensionsDir(),
@@ -1994,7 +1989,8 @@ export async function runUpgrade(checkOnly) {
 function usage() {
     return [
         "Usage: cpac",
-        "       cpac <inject|status|restore> [--config PATH]",
+        "       cpac inject [--v2_off] [--v2_models] [--config PATH]",
+        "       cpac <status|restore> [--config PATH]",
         "       cpac proxy [--config PATH]",
         "       cpac claude [--config PATH] [--] [claude args...]",
         "       cpac opencode [--config PATH] [--] [opencode args...]",
@@ -2002,10 +1998,13 @@ function usage() {
         "       cpac pi <install|uninstall|status> [--config PATH]",
         "       cpac kimi <install|uninstall|status> [--config PATH]",
         "       cpac detect [--json] [--home PATH]",
-        "       cpac install [--target codex,claude,pi,kimi] [--all] [--dry-run] [--force] [--v2_off] [--v2_models] [--home PATH]",
-        "       cpac uninstall [--target codex,claude,pi,kimi] [--all] [--dry-run] [--home PATH]",
+        "       cpac install [--target codex,pi,kimi] [--all] [--dry-run] [--force] [--v2_off] [--v2_models] [--home PATH]",
+        "       cpac uninstall [--target codex,pi,kimi] [--all] [--dry-run] [--home PATH]",
         "       cpac upgrade [--check]",
         "       cpac version",
+        "",
+        "install/uninstall manage persistent injections only; claude and opencode are",
+        "ephemeral — launch them with `cpac claude` / `cpac opencode` instead.",
     ].join("\n");
 }
 function parseArgs(args) {
@@ -2177,6 +2176,8 @@ function parseArgs(args) {
     }
     let configPath = defaultConfigPath();
     const positional = [];
+    let v2Off = false;
+    let v2Models = false;
     for (let index = 0; index < args.length; index += 1) {
         if (args[index] === "--config") {
             const value = args[++index];
@@ -2184,6 +2185,12 @@ function parseArgs(args) {
                 throw new CPACError("--config requires a path");
             configPath = resolve(expandUserPath(value));
         }
+        else if (args[index] === "--v2_off" || args[index] === "--v2-off") {
+            v2Off = true;
+        }
+        else if (args[index] === "--v2_models" || args[index] === "--v2-models") {
+            v2Models = true;
+        }
         else if (args[index].startsWith("-")) {
             throw new CPACError(`unknown option: ${args[index]}`);
         }
@@ -2194,6 +2201,12 @@ function parseArgs(args) {
         !["inject", "status", "restore", "proxy"].includes(positional[0])) {
         throw new CPACError(usage());
     }
+    if (positional[0] !== "inject" && (v2Off || v2Models)) {
+        throw new CPACError("--v2_off / --v2_models is only valid with inject or install");
+    }
+    if (positional[0] === "inject") {
+        return { command: "inject", configPath, v2Off, v2Models };
+    }
     return {
         command: positional[0],
         configPath,
@@ -2255,8 +2268,16 @@ export async function main(args = process.argv.slice(2)) {
             return await runPi(config, parsed.action);
         if (parsed.command === "kimi")
             return await runKimi(config, parsed.action);
-        if (parsed.command === "inject")
-            await inject(config);
+        if (parsed.command === "inject") {
+            let injectConfig = config;
+            if (parsed.v2Models) {
+                const picked = await pickSpawnModels(config);
+                saveSpawnModels(parsed.configPath, picked);
+                console.log(`spawn_models saved to ${parsed.configPath}: ${picked.join(", ")}`);
+                injectConfig = { ...config, spawn_models: picked };
+            }
+            await inject(injectConfig, parsed.v2Off);
+        }
         else if (parsed.command === "restore")
             await restore(config);
         else

package/dist/pi-extension.template

@@ -5,6 +5,7 @@ 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"],
+  ["gpt-image", "openai"],
   ["claude-", "anthropic"], ["gemini-", "google"], ["grok-", "xai"],
   ["deepseek-", "deepseek"], ["glm-", "zhipu"], ["kimi-", "moonshot"],
   ["mimo-", "xiaomi"], ["doubao-", "volcengine"], ["ark-", "volcengine"],
@@ -21,6 +22,9 @@ const MAX_TOKENS = {
   "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) {
@@ -33,6 +37,32 @@ 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(function (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(function (effort) { return 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;
@@ -72,7 +102,12 @@ export default async function (pi) {
     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 (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");
@@ -92,15 +127,19 @@ export default async function (pi) {
       apiKey: apiKey,
       api: "openai-responses",
       models: models.map(function (m) {
-        return {
+        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: Array.isArray(m.supported_reasoning_levels) && m.supported_reasoning_levels.length > 0,
+          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,
         };
+        if (thinkingLevelMap) modelObj.thinkingLevelMap = thinkingLevelMap;
+        return modelObj;
       }),
     });
   }

package/package.json

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