pi-ccswitch-auto-switch 0.1.3 → 0.1.4

package/README.md

@@ -14,7 +14,7 @@ The extension observes real Pi requests, records sanitized health signals, and
 - Endpoint platform isolation: when several models on the same endpoint (same BaseURL/provider) fail within one round, the whole endpoint is isolated so sibling models from the same platform are not tried one by one.
 - Model-only isolation for missing models and incompatible parameters.
 - Prefers a healthy model from another provider before considering a sibling model.
-  - Independent-provider semantics: a copied vendor (e.g. `b-ai-copy`) shares the BaseURL but is a distinct provider with its own endpoint key, so isolating one never blocks the other.
+  - Independent-provider semantics: a copied vendor (e.g. `my-provider-copy`) shares the BaseURL but is a distinct provider with its own endpoint key, so isolating one never blocks the other.
 - 90-second first-response and 120-second streaming-idle watchdogs.
 - Exponential cooldowns, `Retry-After` support, and one persisted half-open probe lease per provider.
 - Persistent, atomic, cross-process health state with error redaction and bounded logs.
@@ -61,22 +61,26 @@ Examples:
 
 ```text
 /ccswitch reactivate all
-/ccswitch disable openai/gpt-4.1
-/ccswitch reset anthropic/claude-sonnet-4
+/ccswitch disable my-provider/my-model-id
+/ccswitch reset my-provider/my-model-id
 ```
 
 ## Status bar
 
 ```text
-CCS ✓70/131 · ⏳61 · ⛔0
+CCS ✓70/131 · ⏳61 · ⛔0 · ⇄3 · provider/model-id
 ```
 
 - `✓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.
+- `⇄3`: **本次 pi session 成功切换的模型次数**（衡量扩展有效程度）。`/new`、`/fork`、`/resume` 等新 session 开始时归零；但**失败记录与冷却状态不重置**（它们是物理事实，跨 session 保留）。累计切换数（`state.switches`）与最近 20 条切换日志会持久化到状态文件，可在 `/ccswitch` 面板和 `/ccswitch-test` 中查看。
+- `provider/model-id`: 当前实际生效的模型（`provider/id`，切换后立即更新，长名自动截断）。
 - During a switch, `CCS ↻2/5 provider/model` means the second of at most five attempts is being made.
 
-When all unique models are healthy, the compact form is `CCS ✓131`. Use `/ccswitch` or `/ccswitch-test` to see Pi's raw scope entry count, the deduplicated model count, affected model counts, and the underlying breaker-record count.
+When all unique models are healthy, the compact form is `CCS ✓131 · provider/model-id`. Use `/ccswitch` or `/ccswitch-test` to see Pi's raw scope entry count, the deduplicated model count, affected model counts, and the underlying breaker-record count.
+
+切换成功后扩展还会通过 `appendEntry` 向会话注入一条 `ccswitch-switch` custom entry（不参与 LLM 上下文），触发 TUI 底栏重绘——这样 Pi 右下角的模型名显示也会同步为切换后的模型。
 
 ## Failover behavior
 

package/health.ts

@@ -30,6 +30,15 @@ export interface HealthState {
   models: Record<string, HealthRecord>
   providers: Record<string, HealthRecord>
   endpoints: Record<string, HealthRecord>
+  /** 累计成功切换次数（跨 session 持久化，用于衡量扩展有效程度） */
+  switches?: number
+  /** 最近成功切换日志（有限条，环形保留） */
+  switchLog?: Array<{
+    at: number
+    from: string
+    to: string
+    reason?: string
+  }>
 }
 
 export function agentDir(env = process.env, home = homedir()): string {
@@ -55,7 +64,7 @@ function safeEndpoint(value: string): string {
 }
 
 function blank(): HealthState {
-  return { schemaVersion: 2, updatedAt: Date.now(), models: {}, providers: {}, endpoints: {} }
+  return { schemaVersion: 2, updatedAt: Date.now(), models: {}, providers: {}, endpoints: {}, switches: 0, switchLog: [] }
 }
 
 function redact(text: string | undefined): string | undefined {
@@ -141,6 +150,18 @@ export class HealthStore {
     this.touch()
   }
 
+  /**
+   * 记录一次成功的模型切换：累计计数 + 环形保留最近 20 条切换日志。
+   * 用于衡量扩展有效程度，并在 /ccswitch status 面板展示。
+   */
+  recordSwitch(from: string, to: string, reason?: string): void {
+    this.state.switches = (this.state.switches ?? 0) + 1
+    const log = this.state.switchLog ?? []
+    log.push({ at: Date.now(), from, to, reason })
+    this.state.switchLog = log.slice(-20)
+    this.touch()
+  }
+
   private close(scope: HealthScope, key: string): void {
     const current = this.bucket(scope)[key]
     if (!current) return
@@ -287,5 +308,11 @@ function mergeBucket(a: Record<string, HealthRecord>, b: Record<string, HealthRe
 }
 
 function mergeState(a: HealthState, b: HealthState): HealthState {
-  return { schemaVersion: 2, updatedAt: Math.max(a.updatedAt ?? 0, b.updatedAt ?? 0), models: mergeBucket(a.models ?? {}, b.models ?? {}), providers: mergeBucket(a.providers ?? {}, b.providers ?? {}), endpoints: mergeBucket(a.endpoints ?? {}, b.endpoints ?? {}) }
+  const switches = Math.max(a.switches ?? 0, b.switches ?? 0)
+  // 取最近更新的 switchLog（按 at 去倒序合并，保留最新 20 条）
+  const log = [...(a.switchLog ?? []), ...(b.switchLog ?? [])]
+    .sort((x, y) => y.at - x.at)
+    .filter((entry, index, all) => index === 0 || all[index - 1].at !== entry.at || all[index - 1].from !== entry.from || all[index - 1].to !== entry.to)
+    .slice(0, 20)
+  return { schemaVersion: 2, updatedAt: Math.max(a.updatedAt ?? 0, b.updatedAt ?? 0), models: mergeBucket(a.models ?? {}, b.models ?? {}), providers: mergeBucket(a.providers ?? {}, b.providers ?? {}), endpoints: mergeBucket(a.endpoints ?? {}, b.endpoints ?? {}), switches, switchLog: log }
 }

package/index.ts

@@ -42,6 +42,8 @@ export default function (pi: ExtensionAPI) {
   let round: Round | undefined
   let timer: ReturnType<typeof setTimeout> | undefined
   let lastStatus: { status?: number, retryAfterMs?: number } = {}
+  // 本次 pi session 内成功切换的模型数量（用于衡量插件的有效程度）
+  let sessionSwitches = 0
 
   const clearWatchdog = () => { if (timer) clearTimeout(timer); timer = undefined }
   const armWatchdog = (ctx: ExtensionContext, ms: number, roundId: number) => {
@@ -54,15 +56,24 @@ export default function (pi: ExtensionAPI) {
     }, ms)
     timer.unref?.()
   }
+  // 当前生效模型名（provider/id）；过长时压缩，避免撑爆状态栏
+  const modelTag = (model: ModelRef | undefined) => {
+    if (!model) return ''
+    const full = modelKey(model)
+    return full.length > 30 ? `${model.provider}/${model.id?.slice(0, 24)}…` : full
+  }
   const status = (ctx: ExtensionContext) => {
     const state = health.snapshot
     const { models } = candidateSnapshot(ctx.scopedModels, ctx.modelRegistry.getAvailable())
     const counts = summarizeCandidateHealth(models, state)
-    const plain = round?.phase === 'switching' ? `CCS ↻${round.attempts}/${MAX_ATTEMPTS} ${round.model ? modelKey(round.model) : ''}` :
-      counts.cooling || counts.disabled ? `CCS ✓${counts.healthy}/${counts.total} · ⏳${counts.cooling} · ⛔${counts.disabled}` : `CCS ✓${counts.total}`
+    const activeModel = round?.model ?? ctx.model
+    const plain = round?.phase === 'switching' ? `CCS ↻${round.attempts}/${MAX_ATTEMPTS} ${modelTag(round.model)}` :
+      counts.cooling || counts.disabled ? `CCS ✓${counts.healthy}/${counts.total} · ⏳${counts.cooling} · ⛔${counts.disabled}${switchSuffix()} · ${modelTag(activeModel)}` : `CCS ✓${counts.total}${switchSuffix()} · ${modelTag(activeModel)}`
     const theme = ctx.ui.theme
     ctx.ui.setStatus('ccswitch-ha', theme ? theme.fg(counts.cooling || counts.disabled ? 'warning' : 'success', plain) : plain)
   }
+  // 本次 session 成功切换计数：⇄N（N>0 时显示）；累计切换数在面板/自检中可见
+  const switchSuffix = () => sessionSwitches > 0 ? ` · ⇄${sessionSwitches}` : ''
   const notify = (ctx: ExtensionContext, message: string, type: 'info' | 'warning' | 'error' = 'info') => {
     if (ctx.hasUI) ctx.ui.notify(message, type)
   }
@@ -97,11 +108,17 @@ export default function (pi: ExtensionAPI) {
     })
     if (!ctx.ui.select) {
       const source = snapshot.source === 'scoped' ? `Pi scope ${snapshot.sourceEntries} 条` : `Pi 注册表 ${snapshot.sourceEntries} 条`
-      notify(ctx, `CCSwitch：${source} · 唯一模型 ${counts.total} · 健康 ${counts.healthy} · 自动冷却 ${counts.cooling} · 手动禁用 ${counts.disabled}`, 'info')
+      notify(ctx, `CCSwitch：${source} · 唯一模型 ${counts.total} · 健康 ${counts.healthy} · 自动冷却 ${counts.cooling} · 手动禁用 ${counts.disabled} · 本session切换 ${sessionSwitches} · 累计切换 ${state.switches ?? 0}`, 'info')
       return
     }
     const scopeLabel = snapshot.source === 'scoped' ? `Pi scope：${snapshot.sourceEntries} 条` : `Pi 可用注册表：${snapshot.sourceEntries} 条`
-    const action = await ctx.ui.select(`CCSwitch 健康面板\n当前：${key(ctx.model) ?? '无'}\n${scopeLabel} · 唯一模型：${counts.total} · 健康：${counts.healthy} · 自动冷却：${counts.cooling} · 手动禁用：${counts.disabled}\n熔断记录：${counts.breakerRecords}\n${rows.join('\n') || '没有可用模型'}`, ['刷新', '重新激活当前模型', '禁用当前模型', '重置当前模型历史', '关闭'])
+    const switchSummary = `本session切换：${sessionSwitches} · 累计切换：${state.switches ?? 0}`
+    const recentSwitches = (state.switchLog ?? []).slice(0, 5).map(entry => {
+      const time = new Date(entry.at).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })
+      return `  ${time} ${entry.from} ⇄ ${entry.to}`
+    })
+    const switchPanel = recentSwitches.length ? `\n最近切换：\n${recentSwitches.join('\n')}` : ''
+    const action = await ctx.ui.select(`CCSwitch 健康面板\n当前：${key(ctx.model) ?? '无'}\n${scopeLabel} · 唯一模型：${counts.total} · 健康：${counts.healthy} · 自动冷却：${counts.cooling} · 手动禁用：${counts.disabled}\n熔断记录：${counts.breakerRecords}\n${switchSummary}${switchPanel}\n${rows.join('\n') || '没有可用模型'}`, ['刷新', '重新激活当前模型', '禁用当前模型', '重置当前模型历史', '关闭'])
     if (action === '刷新') await refresh(ctx)
     if (action === '重新激活当前模型' && ctx.model) { health.reactivate(ctx.model); await health.flush(); status(ctx); notify(ctx, '已重新激活当前模型') }
     if (action === '禁用当前模型' && ctx.model) { health.disable(modelKey(ctx.model), true); await health.flush(); status(ctx); notify(ctx, '已禁用当前模型', 'warning') }
@@ -155,7 +172,18 @@ export default function (pi: ExtensionAPI) {
       }
       round.model = next
       round.phase = 'redispatching'
+      // 本次 session 成功切换计数 + 持久化累计/日志（衡量扩展有效程度）
+      sessionSwitches += 1
+      const fromKey = key(round.model ?? ctx.model)
+      health.recordSwitch(fromKey ?? '', modelKey(next), classification.kind)
+      await health.flush()
       notify(ctx, `CCSwitch：已切换至 ${modelKey(next)}（${round.attempts}/${MAX_ATTEMPTS}）`, 'info')
+      // 触发 TUI 底栏/界面重绘：appendEntry 会发出 entry_appended 事件进入 session.subscribe 流，
+      // interactive-mode 收到后执行 footer.invalidate() + requestRender()，footer 从 session.state.model 重新读取，
+      // 从而让右下角模型名同步显示新模型（setModel 只改 state，不直接触发 footer 刷新）。
+      try {
+        pi.appendEntry?.('ccswitch-switch', { from: fromKey ?? '', to: modelKey(next), reason: classification.kind, sessionSwitches })
+      } catch { /* appendEntry 失败不影响切换 */ }
       const continuation = round.hadTool || round.hadOutput
         ? '请从当前会话状态继续完成上一条请求；不要重复已经完成的工具操作。'
         : round.images?.length ? [{ type: 'text', text: round.text }, ...round.images] : round.text
@@ -170,8 +198,8 @@ export default function (pi: ExtensionAPI) {
     await exhaust(ctx, '没有健康的候选模型')
   }
 
-  pi.on('session_start', async (_event, ctx) => { await health.load(); await refresh(ctx); await health.log('extension started') })
-  pi.on('session_shutdown', async (_event, ctx) => { clearWatchdog(); ctx.ui.setWorkingMessage(); await health.flush() })
+  pi.on('session_start', async (_event, ctx) => { await health.load(); sessionSwitches = 0; await refresh(ctx); await health.log('extension started') })
+  pi.on('session_shutdown', async (_event, ctx) => { clearWatchdog(); ctx.ui.setWorkingMessage(); if (sessionSwitches > 0) await health.log(`session ended with ${sessionSwitches} successful switches`); await health.flush() })
   pi.on('input', (event, ctx) => {
     if (event.source === 'extension') return { action: 'continue' }
     clearWatchdog()
@@ -255,7 +283,8 @@ export default function (pi: ExtensionAPI) {
     await refresh(ctx)
     const snapshot = candidateSnapshot(ctx.scopedModels, ctx.modelRegistry.getAvailable())
     const counts = summarizeCandidateHealth(snapshot.models, health.snapshot)
+    const state = health.snapshot
     const source = snapshot.source === 'scoped' ? `Pi scope ${snapshot.sourceEntries} 条` : `Pi 注册表 ${snapshot.sourceEntries} 条`
-    notify(ctx, `CCSwitch 自检：${source} · 唯一模型 ${counts.total} · 健康 ${counts.healthy} · 自动冷却 ${counts.cooling} · 手动禁用 ${counts.disabled} · 熔断记录 ${counts.breakerRecords}`, counts.total ? 'info' : 'warning')
+    notify(ctx, `CCSwitch 自检：${source} · 唯一模型 ${counts.total} · 健康 ${counts.healthy} · 自动冷却 ${counts.cooling} · 手动禁用 ${counts.disabled} · 熔断记录 ${counts.breakerRecords} · 本session切换 ${sessionSwitches} · 累计切换 ${state.switches ?? 0}`, counts.total ? 'info' : 'warning')
   }})
 }

package/package.json

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

package/types.ts

@@ -44,6 +44,12 @@ export interface ExtensionAPI {
     handler: (args: string, ctx: ExtensionContext) => Promise<void> | void
   }): void
   sendUserMessage(content: string | Array<Record<string, unknown>>): void
+  /**
+   * 追加一条不参与 LLM 上下文的 custom entry。
+   * appendEntry 会向 session.subscribe 流发出 entry_appended 事件，
+   * 从而触发 TUI footer/界面重绘——用于切换模型后强制底栏同步显示新模型名。
+   */
+  appendEntry?(customType: string, data: Record<string, unknown>): void
   setModel(model: ModelRef): Promise<boolean>
   setThinkingLevel?(level: string): void
 }