@yhong91/cpac 0.1.8 → 0.1.9

package/README.md

@@ -134,14 +134,18 @@ CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST=1
 
 代理开启 Claude Code 的 gateway model discovery：`/model` 选择器会列出 CPA 目录里的全部模型。claude 系模型直接使用原 id；其它模型以 `claude-cpac--<模型名>` 别名出现（例如 `claude-cpac--gpt-5.6-sol`），请求发出时由代理还原为真实模型名。
 
-启动时还会把模型槽位（`ANTHROPIC_DEFAULT_OPUS/SONNET/HAIKU_MODEL` 及 `ANTHROPIC_SMALL_FAST_MODEL`）指向目录里的模型，避免 haiku/subagent 任务打到网关不认识的默认 id。默认自动选择（claude 系优先：最大窗口给 opus/sonnet，最小窗口给 haiku），可用命令覆盖：
+启动时还会把模型槽位（`ANTHROPIC_DEFAULT_OPUS/SONNET/HAIKU_MODEL` 及 `ANTHROPIC_SMALL_FAST_MODEL`）指向目录里的模型，避免 haiku/subagent 任务打到网关不认识的默认 id。默认自动选择（claude 系优先：按家族名匹配 opus/sonnet/haiku，否则最大窗口给 opus/sonnet、最小窗口给 haiku），可用命令覆盖：
 
 ```sh
 cpac claude-models                                            # 查看当前覆盖
 cpac claude-models --opus claude-opus-4-8 --haiku glm-5.3     # 设置/合并
+cpac claude-models --haiku                                    # 不带值：arrow-key 下拉选择
+cpac claude-models --classifier claude-sonnet-4-6             # Auto mode 审批分类器模型
 cpac claude-models --reset                                    # 恢复自动选择
 ```
 
+所有设定写入配置文件持久缓存，每次 `cpac claude` 启动自动生效。`--classifier` 对应 `CLAUDE_CODE_AUTO_MODE_MODEL`（Auto mode 的审批分类器，默认跟随 Claude Code 内置选择）；不设置则不注入。
+
 你自己 export 同名环境变量时以你为准。
 
 Claude Code 的发现协议不携带 context 信息，claude 前缀的未知模型默认按 200K 记账，且 `CLAUDE_CODE_MAX_CONTEXT_TOKENS` 对 claude 前缀的名字不生效。cpac 采用与 opencodex 相同的机制：目录里窗口足够大的别名模型会带 `[1m]` 标记出现在选择器中（Claude Code 按 1M 记账，发请求前自己剥掉标记），同时 `cpac claude` 注入 `CLAUDE_CODE_AUTO_COMPACT_WINDOW`（默认 350K，与 opencodex 一致，接受范围 100K–1M）作为压缩阈值。你自己 export 该变量时以你为准。claude 系模型如需 1M 窗口，在模型名后加 `[1m]`（如 `cpac claude --model claude-sonnet-4-6[1m]`）。

package/cpac.example.json

@@ -5,7 +5,8 @@
   "claude_models": {
     "opus": "claude-opus-4-8",
     "sonnet": "claude-sonnet-4-6",
-    "haiku": "glm-5.3"
+    "haiku": "glm-5.3",
+    "classifier": "claude-sonnet-4-6"
   },
   "spawn_models": ["gpt-5.5", "claude-opus-4-8"]
 }

package/dist/cpac.js

@@ -25,7 +25,7 @@ const CONFIG_KEYS = new Set([
 // Codex advertises only the first 5 picker-visible catalog models as
 // spawn_agent overrides (codex-rs MAX_SPAWN_AGENT_MODEL_OVERRIDES).
 const MAX_SPAWN_MODELS = 5;
-const CLAUDE_SLOT_KEYS = ["opus", "sonnet", "haiku"];
+const CLAUDE_SLOT_KEYS = ["opus", "sonnet", "haiku", "classifier"];
 const REQUIRED_STATE_KEYS = new Set([
     "config_path",
     "config_existed",
@@ -343,6 +343,12 @@ async function checkboxPicker(title, items, max) {
             else if (key === "\x1b[B")
                 cursor = (cursor + 1) % items.length;
             else if (key === " ") {
+                if (max === 1) {
+                    selected.clear();
+                    selected.add(cursor);
+                    finish();
+                    return;
+                }
                 if (selected.has(cursor))
                     selected.delete(cursor);
                 else if (selected.size < max)
@@ -768,8 +774,10 @@ function shouldMarkOneMillion(id, window, compactWindow) {
         return true;
     return compactWindow !== undefined && window > 200_000 && window >= compactWindow;
 }
-// Auto tier defaults: prefer claude-family models; biggest window serves
-// opus/sonnet, smallest known window serves haiku.
+// Auto tier defaults: prefer claude-family models; within the pool match by
+// family keyword first (opus/sonnet/haiku) so equal context windows don't
+// collapse every slot onto the first catalog entry, then fall back to
+// biggest-window (opus/sonnet) and smallest-window (haiku).
 function defaultClaudeSlots(models) {
     if (!models.length)
         return undefined;
@@ -779,10 +787,11 @@ function defaultClaudeSlots(models) {
     const smallest = pool
         .filter((model) => model.window > 0)
         .sort((a, b) => a.window - b.window)[0];
+    const family = (keyword) => pool.find((model) => model.id.includes(keyword));
     return {
-        opus: biggest.id,
-        sonnet: biggest.id,
-        haiku: (smallest ?? biggest).id,
+        opus: (family("opus") ?? biggest).id,
+        sonnet: (family("sonnet") ?? biggest).id,
+        haiku: (family("haiku") ?? smallest ?? biggest).id,
     };
 }
 // Resolve the tier-model env values: config overrides win over catalog
@@ -1418,7 +1427,22 @@ async function guide(config) {
     console.log(`\nSaved ${config.api_key_env} to ${profile}. Open a new terminal or run:\n  source ${profile}`);
     return 0;
 }
-export function runClaudeModels(parsed) {
+export async function runClaudeModels(parsed) {
+    if (parsed.pick.length) {
+        const config = loadConfig(parsed.configPath);
+        const apiKey = process.env[config.api_key_env]?.trim();
+        if (!apiKey)
+            throw new CPACError(`environment variable ${config.api_key_env} is not set`);
+        const catalog = await fetchCatalog(config.cpa_url, apiKey);
+        const document = JSON.parse(new TextDecoder().decode(catalog.bytes));
+        const slugs = document.models.map((model) => model.slug);
+        for (const slot of parsed.pick) {
+            const [picked] = await checkboxPicker(`Select ${slot} model`, slugs, 1);
+            if (!picked)
+                throw new CPACError("no model selected");
+            parsed.models[slot] = picked;
+        }
+    }
     if (!parsed.reset && !Object.keys(parsed.models).length) {
         const config = loadConfig(parsed.configPath);
         console.log(config.claude_models
@@ -1499,18 +1523,20 @@ export async function runClaude(config, args, executable = "claude") {
     if (compactWindow !== undefined && !(Number(process.env.CLAUDE_CODE_AUTO_COMPACT_WINDOW) > 0)) {
         env.CLAUDE_CODE_AUTO_COMPACT_WINDOW = String(compactWindow);
     }
+    const setSlot = (name, value) => {
+        if (process.env[name] === undefined)
+            env[name] = value;
+    };
     if (slots) {
         // Route haiku/subagent tier traffic at catalog models instead of the
         // stock claude-haiku-* ids the gateway does not carry.
-        const setSlot = (name, value) => {
-            if (process.env[name] === undefined)
-                env[name] = value;
-        };
         setSlot("ANTHROPIC_DEFAULT_OPUS_MODEL", slots.opus);
         setSlot("ANTHROPIC_DEFAULT_SONNET_MODEL", slots.sonnet);
         setSlot("ANTHROPIC_DEFAULT_HAIKU_MODEL", slots.haiku);
         setSlot("ANTHROPIC_SMALL_FAST_MODEL", slots.haiku);
     }
+    if (config.claude_models?.classifier)
+        setSlot("CLAUDE_CODE_AUTO_MODE_MODEL", config.claude_models.classifier);
     delete env.ANTHROPIC_API_KEY;
     delete env.CLAUDE_CODE_USE_ANTHROPIC_AWS;
     delete env.CLAUDE_CODE_USE_BEDROCK;
@@ -1919,7 +1945,7 @@ function usage() {
         "       cpac <inject|status|restore> [--config PATH]",
         "       cpac proxy [--config PATH]",
         "       cpac claude [--config PATH] [--] [claude args...]",
-        "       cpac claude-models [--opus M] [--sonnet M] [--haiku M] [--reset] [--config PATH]",
+        "       cpac claude-models [--opus [M]] [--sonnet [M]] [--haiku [M]] [--classifier [M]] [--reset] [--config PATH]",
         "       cpac pi <install|uninstall|status> [--config PATH]",
         "       cpac kimi <install|uninstall|status> [--config PATH]",
         "       cpac detect [--json] [--home PATH]",
@@ -2009,8 +2035,27 @@ function parseArgs(args) {
         return { command: args[0], configPath, action };
     }
     if (args[0] === "claude-models") {
+        if (args.includes("-h") || args.includes("--help")) {
+            console.log([
+                "Usage: cpac claude-models [--opus [M]] [--sonnet [M]] [--haiku [M]] [--classifier [M]] [--reset] [--config PATH]",
+                "",
+                "Sets the model Claude Code uses per task tier. Saved to the config file",
+                "and applied on every `cpac claude` launch:",
+                "  --opus        heavy reasoning / planning fallback tier (ANTHROPIC_DEFAULT_OPUS_MODEL)",
+                "  --sonnet      main conversation default tier (ANTHROPIC_DEFAULT_SONNET_MODEL)",
+                "  --haiku       high-frequency small tasks: titles, summaries, background",
+                "                (ANTHROPIC_DEFAULT_HAIKU_MODEL + ANTHROPIC_SMALL_FAST_MODEL)",
+                "  --classifier  auto-mode approval classifier (CLAUDE_CODE_AUTO_MODE_MODEL);",
+                "                unset follows Claude Code's built-in default",
+                "",
+                "A slot without a value opens an arrow-key picker over the CPA catalog;",
+                "--reset clears all overrides back to catalog auto-selection.",
+            ].join("\n"));
+            return null;
+        }
         let configPath = defaultConfigPath();
         const models = {};
+        const pick = [];
         let reset = false;
         for (let index = 1; index < args.length; index += 1) {
             const arg = args[index];
@@ -2023,17 +2068,27 @@ function parseArgs(args) {
             else if (arg === "--reset") {
                 reset = true;
             }
-            else if (arg === "--opus" || arg === "--sonnet" || arg === "--haiku") {
-                const value = args[++index];
-                if (typeof value !== "string" || !value.trim())
-                    throw new CPACError(`${arg} requires a model id`);
-                models[arg.slice(2)] = value.trim();
+            else if (arg === "--opus" ||
+                arg === "--sonnet" ||
+                arg === "--haiku" ||
+                arg === "--classifier") {
+                const slot = arg.slice(2);
+                const value = args[index + 1];
+                if (value !== undefined && !value.startsWith("-")) {
+                    index += 1;
+                    if (!value.trim())
+                        throw new CPACError(`${arg} requires a model id`);
+                    models[slot] = value.trim();
+                }
+                else {
+                    pick.push(slot);
+                }
             }
             else {
                 throw new CPACError(`unknown option: ${arg}`);
             }
         }
-        return { command: "claude-models", configPath, models, reset };
+        return { command: "claude-models", configPath, models, pick, reset };
     }
     if (args[0] === "claude") {
         let configPath = defaultConfigPath();
@@ -2124,7 +2179,7 @@ export async function main(args = process.argv.slice(2)) {
         if (parsed.command === "claude")
             return await runClaude(config, parsed.args);
         if (parsed.command === "claude-models")
-            return runClaudeModels(parsed);
+            return await runClaudeModels(parsed);
         if (parsed.command === "proxy")
             return await runProxy(config);
         if (parsed.command === "pi")

package/package.json

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