pi-ccswitch-auto-switch 0.3.4 → 0.3.5

package/README.md

@@ -38,7 +38,7 @@ All knobs below are optional and have sensible defaults:
 | Setting | Scope | Default | Notes |
 | --- | --- | --- | --- |
 | `PI_CODING_AGENT_DIR` | Extension state | `~/.pi/agent` | Where health state, logs, and failure reports are stored. Only relevant if you relocated your Pi agent directory; the extension follows Pi's own convention. |
-| `PI_BIN` | Headless runner only | `pi` on `PATH` | Must point to the real `pi` executable, never to `pi-ccswitch-run`. |
+| `PI_BIN` | Headless runner only | `pi` on `PATH` | Must point to the real `pi` executable. Legacy self-references to `pi-ccswitch-run` or `ccswitch-run` are ignored with a warning and fall back to `pi`; other invalid commands remain configuration errors. |
 | Model scope (`/model` etc.) | Failover candidates | Full registry | When Pi has an active model scope, failover only considers models inside that scope; otherwise the full registry is used. The status bar shows which source is active. |
 | `baseUrl` metadata | Endpoint isolation | provider key | Endpoint-level platform isolation groups models by `baseUrl` (provided by CC Switch `3.20+`). Without it, isolation degrades to provider-level grouping, which still works. |
 
@@ -93,7 +93,7 @@ cd ~/.pi/agent/npm && npm install pi-ccswitch-auto-switch@latest
 pi-ccswitch-run --no-tools --no-context-files @prompt.md "Summarize the attached text"
 ```
 
-The runner starts one `pi --mode rpc --no-session --no-extensions --extension <this package>/index.ts` process, so only CCSwitch is loaded. `PI_BIN` may point to the real Pi executable; it must not point to `pi-ccswitch-run`. The default deadline is ten minutes and can be changed with `--timeout-ms`.
+The runner starts one `pi --mode rpc --no-session --no-extensions --extension <this package>/index.ts` process, so only CCSwitch is loaded. `PI_BIN` may point to the real Pi executable. For migration safety, an old `PI_BIN=pi-ccswitch-run` or `PI_BIN=ccswitch-run` value emits a warning and falls back to `pi` on `PATH` instead of recursing or terminating every downstream job. Arbitrary commands are still rejected. The default deadline is ten minutes and can be changed with `--timeout-ms`.
 
 Exit codes are `0` for success, `1` when candidates are exhausted, `2` for invocation/RPC configuration failures, `124` for timeout, and `130`/`143` for interruption. Text `@files` are supported in the first release; images and stdin input are intentionally not.
 
@@ -121,10 +121,10 @@ Examples:
 ## Status bar
 
 ```text
-CCS v0.3.1 ✓70/131 · ⏳61 · ⛔0 · 🔄3 · provider/model-id
+CCS v0.3.5 ✓70/131 · ⏳61 · ⛔0 · 🔄3 · provider/model-id
 ```
 
-- `v0.3.1`: the installed CCSwitch extension version.
+- `v0.3.5`: the installed CCSwitch extension version.
 - `✓70/131`: 70 healthy models out of 131 unique `provider/model` combinations in Pi's effective scope. Duplicate scoped entries are counted once.
 - `⏳61`: 61 models are currently affected by automatic model, provider, or endpoint cooldowns. One provider breaker can account for many affected models.
 - `⛔0`: no manually disabled models.

package/README.zh-CN.md

@@ -36,7 +36,7 @@
 | 设置项 | 作用域 | 默认值 | 说明 |
 | --- | --- | --- | --- |
 | `PI_CODING_AGENT_DIR` | 扩展状态 | `~/.pi/agent` | 健康状态、日志与失败报告的存放目录；仅在你迁移了 Pi agent 目录时需要，插件跟随 Pi 自身约定。 |
-| `PI_BIN` | 仅 headless runner | `PATH` 中的 `pi` | 必须指向真实 `pi` 可执行文件，不能指向 `pi-ccswitch-run`。 |
+| `PI_BIN` | 仅 headless runner | `PATH` 中的 `pi` | 必须指向真实 `pi` 可执行文件。历史自引用值 `pi-ccswitch-run` 或 `ccswitch-run` 会警告并降级到 `pi`；其他非法命令仍按配置错误处理。 |
 | 模型 scope（`/model` 等） | 故障转移候选 | 全量注册表 | Pi 启用了 model scope 时，只在 scope 内模型间切换；否则使用全量注册表。状态栏会显示当前数据源。 |
 | `baseUrl` 元数据 | 端点隔离 | provider key | 端点级平台隔离按 `baseUrl` 分组模型（由 CC Switch `3.20+` 提供）；缺失时退化为 provider 级分组，仍然可用。 |
 
@@ -89,7 +89,7 @@ cd ~/.pi/agent/npm && npm install pi-ccswitch-auto-switch@latest
 pi-ccswitch-run --no-tools --no-context-files @prompt.md "请总结附件"
 ```
 
-runner 内部只显式加载本扩展并启动一次 Pi RPC；`PI_BIN` 只能指定内部真实 `pi`，不能指向 runner。默认总超时为 10 分钟，可用 `--timeout-ms` 调整。退出码：成功 `0`、候选耗尽 `1`、参数/RPC 配置错误 `2`、超时 `124`、中断 `130/143`。首版只支持文本 `@文件`，不支持图片和 stdin。
+runner 内部只显式加载本扩展并启动一次 Pi RPC；`PI_BIN` 应指定内部真实 `pi`。为兼容旧配置，`PI_BIN=pi-ccswitch-run` 或 `PI_BIN=ccswitch-run` 会输出警告并降级到 `PATH` 中的 `pi`，避免递归和长驻消费方连续失败；其他任意命令仍会被拒绝。默认总超时为 10 分钟，可用 `--timeout-ms` 调整。退出码：成功 `0`、候选耗尽 `1`、参数/RPC 配置错误 `2`、超时 `124`、中断 `130/143`。首版只支持文本 `@文件`，不支持图片和 stdin。
 
 正常使用 CC Switch 配置 Provider 即可；本插件不会修改 Pi 模型设置或 CC Switch 数据。
 
@@ -109,10 +109,10 @@ runner 内部只显式加载本扩展并启动一次 Pi RPC；`PI_BIN` 只能指
 ## 状态栏
 
 ```text
-CCS v0.3.1 ✓70/131 · ⏳61 · ⛔0 · 🔄3 · provider/model-id
+CCS v0.3.5 ✓70/131 · ⏳61 · ⛔0 · 🔄3 · provider/model-id
 ```
 
-- `v0.3.1`：当前安装的 CCSwitch 扩展版本。
+- `v0.3.5`：当前安装的 CCSwitch 扩展版本。
 - `✓70/131`：Pi 有效范围内共有 131 个去重后的 `provider/model` 组合，其中 70 个健康；重复的 scope 条目只计一次。
 - `⏳61`：有 61 个模型正受模型、Provider 或端点自动冷却影响；一条 Provider 熔断记录可能同时影响许多模型。
 - `⛔0`：没有被手动禁用的模型。

package/index.ts

@@ -13,7 +13,7 @@ const STREAM_IDLE_TIMEOUT = 120_000
 const MAX_ATTEMPTS = 5
 const ROUND_LIMIT = 8 * 60_000
 const RPC_PROTOCOL_VERSION = 1
-const EXTENSION_VERSION = '0.3.4'
+const EXTENSION_VERSION = '0.3.5'
 // 同端点（BaseURL 相同）连续失败达到该次数即隔离该端点，避免同一个平台的多个模型逐个试错耗尽本轮切换
 const ENDPOINT_FAIL_THRESHOLD = 3
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-ccswitch-auto-switch",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Provider-first automatic model failover extension for Pi and CC Switch",
   "license": "MIT",
   "keywords": [

package/runner.mjs

@@ -7,7 +7,7 @@ import { spawn } from 'node:child_process'
 import { access, readFile, stat } from 'node:fs/promises'
 import { existsSync } from 'node:fs'
 import { fileURLToPath } from 'node:url'
-import { basename, delimiter, dirname, extname, isAbsolute, join, resolve } from 'node:path'
+import { delimiter, dirname, extname, isAbsolute, join, resolve } from 'node:path'
 
 export const EXIT = Object.freeze({ SUCCESS: 0, EXHAUSTED: 1, CONFIG: 2, TIMEOUT: 124, INTERRUPTED: 130, TERMINATED: 143 })
 export const DEFAULT_TIMEOUT_MS = 600_000
@@ -87,9 +87,24 @@ export function buildMessage(fileText, prompt) {
   return fileText ? `${fileText}\n${prompt}` : prompt
 }
 
+const LEGACY_RUNNER_STEMS = new Set(['pi-ccswitch-run', 'ccswitch-run'])
+
+function executableStem(value) {
+  return String(value).split(/[\\/]/).pop().toLowerCase().replace(/\.(cmd|exe|bat)$/, '')
+}
+
 function validPiBinary(value) {
-  const normalized = basename(value).toLowerCase().replace(/\.(cmd|exe|bat)$/, '')
-  return normalized === 'pi'
+  return executableStem(value) === 'pi'
+}
+
+export function selectPiBinary(configured, warn = () => {}) {
+  if (!configured) return 'pi'
+  if (validPiBinary(configured)) return configured
+  if (LEGACY_RUNNER_STEMS.has(executableStem(configured))) {
+    warn("PI_BIN points to a legacy runner wrapper; ignoring it and falling back to 'pi' on PATH")
+    return 'pi'
+  }
+  throw new Error('PI_BIN must name the real pi executable, not an arbitrary command')
 }
 
 async function resolveWindowsShim(command) {
@@ -115,8 +130,7 @@ async function resolveWindowsShim(command) {
 
 async function resolvePiCommand() {
   const configured = String(process.env.PI_BIN || '').trim()
-  if (configured && !validPiBinary(configured)) throw new Error('PI_BIN must name the real pi executable, not an arbitrary command')
-  const command = configured || 'pi'
+  const command = selectPiBinary(configured, message => process.stderr.write(`pi-ccswitch-run: warning: ${message}\n`))
   if (process.platform === 'win32') return resolveWindowsShim(command)
   return { command, prefix: [] }
 }