thincoder 0.12.71 → 0.12.73

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,17 +2,47 @@
2
2
  * cmd-timers.mjs — `/timers`:在途 timer 只读列表(最薄)。
3
3
  *
4
4
  * 机制单源 = `docs/core/design/AGENT-LOOP-ASYNC-POOL.md` §6.30;显示形态单源 = `docs/cli/design/TUI.md`
5
- * §7.6(逐条 dim 行 `⏰<i> · 剩余 <mm:ss> · <message 首行(截断)>`;零在途 ⇒ 一行 `无在途 timer`)。
6
- * **取消面不做**(取消 = 控制面——门 / 回执 / 持久化语义;停轮 = Ctrl+C,停机制 = `agent.timerWake` 关)。
5
+ * §7.6(逐条 dim 行 `⏰<i> · <kind> · 剩余 <dur> · <message 首行(截断)>`;零在途 ⇒ 一行 `无在途 timer`)。
6
+ * **取消 = 模型工具 `timer` 的 `cancel` 动作**(§6.30.18——四端同得;`/timers` 保持只读;停轮 = Ctrl+C,
7
+ * 停机制 = `agent.timerWake` 关);不设端专属取消 UI。
7
8
  * 取值 = `agent._pendingTimers` 活读(每次调用现算——零缓存);剩余按 `expiresAt - now` 现算。
9
+ * kind 段仅非一次性项插入(`每 <N>m` 整分 ∕ `每 <N>s` 非整分 ∥ `每天 <HH:MM>` ∥ `于 <YYYY-MM-DD HH:MM>`);
10
+ * `<dur>` = `<mm:ss>`(< 1h)∥ `<h:mm:ss>`(≥ 1h——与模型 `list` 的 `next` 同形)。§6.30.18。
8
11
  */
9
12
  import { C } from "./ansi.mjs"
10
13
  import { sanitizeDisplay, sliceByWidth, stringWidth } from "./render.mjs"
11
14
 
12
- /** 剩余 mm:ss(到期未送达 ⇒ 夹到 `00:00`——到期态另由状态行警示色承载,见 TUI.md §7.6)。 */
15
+ /** 日历式 `HH:MM` 形判据(与核同形——显示面只判形)。 */
16
+ const DAILY_RE = /^(?:[01]\d|2[0-3]):[0-5]\d$/
17
+
18
+ /** 剩余 `<mm:ss>`(< 1h)∥ `<h:mm:ss>`(≥ 1h——h 不补零);到期未送达 ⇒ 夹到零
19
+ *(到期态另由状态行警示色承载,见 TUI.md §7.6;与模型 `list` 的 `next <dur>` 同判——§6.30.18)。 */
13
20
  function remainText(expiresAt, now) {
14
21
  const sec = Math.max(0, Math.ceil((expiresAt - now) / 1000))
15
- return `${String(Math.floor(sec / 60)).padStart(2, "0")}:${String(sec % 60).padStart(2, "0")}`
22
+ const h = Math.floor(sec / 3600)
23
+ const mm = String(Math.floor((sec % 3600) / 60)).padStart(2, "0")
24
+ const ss = String(sec % 60).padStart(2, "0")
25
+ return h > 0 ? `${h}:${mm}:${ss}` : `${mm}:${ss}`
26
+ }
27
+
28
+ /** 本地刻 `YYYY-MM-DD HH:MM`(`于 <...>` 段——宿主本地时区)。 */
29
+ function stampText(ms) {
30
+ const d = new Date(ms)
31
+ const p = (n) => String(n).padStart(2, "0")
32
+ return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`
33
+ }
34
+
35
+ /** kind 段(非一次性项——§6.30.18 ∥ TUI.md §7.6):`每 <N>m`(整分)∥ `每 <N>s`(非整分)∥
36
+ * `每天 <HH:MM>` ∥ `于 <YYYY-MM-DD HH:MM>`(`at: true` 来源标记位——父侧裁定 2026-10-12);
37
+ * 一次性(三标识皆不在场)⇒ `null`(段不插——行逐字零变)。 */
38
+ function kindText(t) {
39
+ const everyMs = t?.everyMs
40
+ if (typeof everyMs === "number" && Number.isFinite(everyMs) && everyMs > 0) {
41
+ return everyMs % 60000 === 0 ? `每 ${everyMs / 60000}m` : `每 ${everyMs / 1000}s`
42
+ }
43
+ if (typeof t?.daily === "string" && DAILY_RE.test(t.daily)) return `每天 ${t.daily}`
44
+ if (t?.at === true) return `于 ${stampText(t.expiresAt)}`
45
+ return null
16
46
  }
17
47
 
18
48
  /** message 首行(截断——60 显示列 + `…`,同会话标题段口径)。 */
@@ -29,5 +59,8 @@ export async function handleTimersCommand(ctx) {
29
59
  return
30
60
  }
31
61
  const now = Date.now()
32
- timers.forEach((t, i) => pushLine(`⏰${i + 1} · 剩余 ${remainText(t.expiresAt, now)} · ${headText(t.message)}`, C.dim))
62
+ timers.forEach((t, i) => {
63
+ const kind = kindText(t)
64
+ pushLine(`⏰${i + 1}${kind === null ? "" : ` · ${kind}`} · 剩余 ${remainText(t.expiresAt, now)} · ${headText(t.message)}`, C.dim)
65
+ })
33
66
  }
package/src/tui/index.mjs CHANGED
@@ -43,6 +43,7 @@ import { createInputFace } from "./input-face.mjs"
43
43
  import { createConversationWriter } from "./conversation-writer.mjs"
44
44
  import { createTurnFace } from "./turn-face.mjs"
45
45
  import { createTimerWatch, fireTimerWake } from "./timer-watch.mjs"
46
+ import { initTeamState, teamAskCancel, teamAskSubmit } from "./cmd-team.mjs"
46
47
 
47
48
  export { upgradeFailureText, pendingNoticeReady } from "./update-notice.mjs"
48
49
 
@@ -191,8 +192,11 @@ export async function startTUI(agent, opts = {}) {
191
192
  })
192
193
 
193
194
  // First-launch config wizard: implemented in wizard.mjs, closure deps passed via ctx
194
- const { startWizard, renderWizard, wizardChooseProvider, wizardSubmitText, cancelWizard, wizardProviderItems } = createWizard({
195
+ // (登录面补全批:新增三个转口——route 屏两件 + 回退行一件——键面 ctx 同源)
196
+ const { startWizard, renderWizard, wizardChooseProvider, wizardSubmitText, cancelWizard, wizardProviderItems,
197
+ wizardRouteItems, wizardChooseRoute, wizardBackToRoute } = createWizard({
195
198
  agent, state, pushLine, pushLabel, render, persistRaw,
199
+ showPicker, // #1049 补步:向导末问「走 proxy」picker(装配处注入——随 openModelPicker 先例)
196
200
  openModelPicker: () => openModelPicker(),
197
201
  onModalClose: reevalTimerWake, // #448①「关闭后补评估」(wizard 退场点)
198
202
  })
@@ -211,6 +215,7 @@ export async function startTUI(agent, opts = {}) {
211
215
  setProviderKey,
212
216
  pickModelForSlot,
213
217
  runDistill,
218
+ onModalClose: reevalTimerWake, // `/team login` 问句面退场 ⇒ 闩重武装(#448①——模态族第三支)
214
219
  exit: () => {
215
220
  cleanup()
216
221
  // F-XR1 退出释放(EXIT-CLAIM-RELEASE · SESSION.md §6.18):同 key-handler 退出分支——
@@ -224,10 +229,14 @@ export async function startTUI(agent, opts = {}) {
224
229
 
225
230
  // ---------------------------------------------------------- Keyboard / Mouse
226
231
 
232
+ const teamCtx = { agent, state, pushLine, render, openModelPicker: () => openModelPicker(), onModalClose: reevalTimerWake }
233
+
227
234
  inputFace.mountKeys({
228
235
  agent, state, render, popPicker, renderPickerLines,
229
236
  handleSlash, handleTab, submit, pasteClipboardImage,
230
237
  wizardChooseProvider, wizardSubmitText, cancelWizard, wizardProviderItems,
238
+ wizardRouteItems, wizardChooseRoute, wizardBackToRoute,
239
+ teamAskSubmit: () => teamAskSubmit(teamCtx), teamAskCancel: () => teamAskCancel(teamCtx),
231
240
  renderWizard, pushLine, cleanup, showPicker, loadOlder,
232
241
  })
233
242
 
@@ -242,6 +251,9 @@ export async function startTUI(agent, opts = {}) {
242
251
  await promptProviderIfInvalid(agent, () => openModelPicker(), pushLine)
243
252
 
244
253
  showStartup({ agent, state, opts, pushLine, pushLabel, render, startWizard })
254
+ // 团队登录态切片(登录面补全批 · TUI.md §7.8 写者①+③):启动读(`teamStatus`——随装)+ token
255
+ // 在场 ⇒ `teamVerify()` 异步回填(零阻塞)
256
+ initTeamState({ state, render })
245
257
  // LEDGER-SURFACE:台账可见面——首扫(setImmediate)+ 周期;dispose 挂进程退出(同 cleanup 先例)
246
258
  const ledgerSurface = startLedgerSurface({ state, agent, render })
247
259
  // 端壳契约 = **恒同步返回 `{ dispose }`**(K-LX3 归核后与核形一致——核句柄异步就绪后桥接;
@@ -1,4 +1,6 @@
1
1
  import { computeLayout } from "./layout.mjs"
2
+ import { C } from "./ansi.mjs"
3
+ import { teamAskStepAt } from "./ask-steps.mjs"
2
4
 
3
5
  /** 模态族之一(2026-09-22 structure-debt §2.1 分族 2 · #226):通用列表 picker——
4
6
  * ↑↓/PgUp/PgDn/Home/End 导航 + 输入即过滤 + Enter 选中 + Esc 取消;块体自 key-handler.mjs
@@ -52,18 +54,47 @@ export function handlePickerKeys(str, key, ctx) {
52
54
  }
53
55
  }
54
56
 
57
+ /** 模态族之三(登录面补全批 · TUI-COMMANDS.md §5.5):会话内团队问句面——Esc 取消(退场)∥
58
+ * Enter 提交当前步;↑↓/PgUp/PgDn 吞(无历史 ∥ 无滚动穿透);可打印键回落编辑族(输入框编辑——
59
+ * 掩码回显走 `layout.mjs` `askMaskActive`)。路由 = 分派器 createKeyHandler(守卫 = 面在场 + 上列键)。 */
60
+ export function handleTeamAskKeys(str, key, ctx) {
61
+ const { state, teamAskSubmit, teamAskCancel } = ctx
62
+ if (state.teamAsk == null) return false
63
+ if (key.name === "escape") { teamAskCancel(); return true }
64
+ if (key.name === "return") {
65
+ Promise.resolve(teamAskSubmit()).catch((e) => ctx.pushLine(`[error] ${e?.message ?? e}`, C.error))
66
+ return true
67
+ }
68
+ return true // ↑↓/PgUp/PgDn:吞(面内无滚动/历史——PgUp 不触发 loadOlder)
69
+ }
70
+
55
71
  /** 模态族之二(分族 2 · #226):初始配置 wizard——menu step ↑↓/Enter/Esc;text step Enter 提交 /
56
72
  * Esc 取消,其余编辑键回落至编辑族(落空面由分派器守卫与块内返回点共同界定)。
57
73
  * 路由 = 分派器 createKeyHandler。 */
58
74
  export function handleWizardKeys(str, key, ctx) {
59
- const { state, renderWizard, cancelWizard, wizardProviderItems, wizardChooseProvider, wizardSubmitText } = ctx
60
- // initial config wizard: menu step ↑↓/Enter/Esc; text step Enter submit, Esc cancel, edit keys fall through to normal input
75
+ const { state, renderWizard, cancelWizard, wizardProviderItems, wizardChooseProvider, wizardSubmitText,
76
+ wizardRouteItems, wizardChooseRoute, wizardBackToRoute } = ctx
77
+ // initial config wizard: route/provider menu ↑↓/Enter/Esc; text step Enter submit, Esc cancel, edit keys fall through to normal input
61
78
  if (state.wizard) {
62
79
  const w = state.wizard
63
80
  if (key.name === "escape") {
64
81
  cancelWizard()
65
82
  return
66
83
  }
84
+ if (w.step === "route") {
85
+ // 首屏两路(登录面补全批 · §3.1):零预选(光标 = 首行);↑↓ 环绕导航;Enter 选中
86
+ const items = wizardRouteItems()
87
+ if (key.name === "up" && items.length) {
88
+ w.index = (w.index - 1 + items.length) % items.length
89
+ renderWizard()
90
+ } else if (key.name === "down" && items.length) {
91
+ w.index = (w.index + 1) % items.length
92
+ renderWizard()
93
+ } else if ((key.name === "return" || key.name === "enter" || str === "\r") && items.length) {
94
+ wizardChooseRoute(items[w.index])
95
+ }
96
+ return
97
+ }
67
98
  if (w.step === "provider") {
68
99
  const items = wizardProviderItems()
69
100
  if (key.name === "up" && items.length) {
@@ -77,6 +108,18 @@ export function handleWizardKeys(str, key, ctx) {
77
108
  }
78
109
  return
79
110
  }
111
+ if (teamAskStepAt(w.step) !== null) {
112
+ // 团队问句步(登录面补全批 · §3.1 键盘激活裁定):↑ 聚焦回退行;焦点在场 ⇒ 全键归本支
113
+ // (Enter 确认回退 ∥ ↓ 回输入框);未聚焦 ⇒ Enter 提交、编辑键回落编辑族。
114
+ if (w.teamFocusBack === true) {
115
+ if (key.name === "return") { wizardBackToRoute(); return }
116
+ if (key.name === "down") { w.teamFocusBack = false; renderWizard(); return }
117
+ return // ↑ ∥ PgUp/PgDn:焦点在行上——吞
118
+ }
119
+ if (key.name === "up") { w.teamFocusBack = true; renderWizard(); return }
120
+ if (key.name === "return") { wizardSubmitText(); return }
121
+ return // ↓ ∥ PgUp/PgDn:文本步吞(既有语义)
122
+ }
80
123
  if (key.name === "return") {
81
124
  wizardSubmitText()
82
125
  return
@@ -3,7 +3,7 @@ import { handleSearchKey } from "./key-handler-search.mjs"
3
3
  import { countConvLines } from "./render-conversation.mjs"
4
4
  import { handlePermissionMode, handleQuestionMode, handleInterruptMode } from "./key-modes.mjs"
5
5
  import { handleCtrlCFamily } from "./key-handler-ctrlc.mjs"
6
- import { handlePickerKeys, handleWizardKeys } from "./key-handler-modals.mjs"
6
+ import { handlePickerKeys, handleWizardKeys, handleTeamAskKeys } from "./key-handler-modals.mjs"
7
7
  import { handleScrollKeys, handleHistoryKeys, handleCursorKeys } from "./key-handler-scroll.mjs"
8
8
  import { handleBusyEnter } from "./key-handler-busy.mjs"
9
9
  import { handleEditKeys } from "./key-handler-edit.mjs"
@@ -36,6 +36,8 @@ export function convMaxScroll(state) {
36
36
  * ctx: { agent, state, render, renderPickerLines, popPicker,
37
37
  * handleSlash, handleTab, submit, pasteClipboardImage,
38
38
  * wizardChooseProvider, wizardSubmitText, cancelWizard, wizardProviderItems,
39
+ * wizardRouteItems, wizardChooseRoute, wizardBackToRoute,
40
+ * teamAskSubmit, teamAskCancel,
39
41
  * renderWizard, pushLine, cleanup, showPicker } */
40
42
  export function createKeyHandler(ctx) {
41
43
  const { agent, state, render, pushLine, showPicker } = ctx
@@ -91,18 +93,26 @@ export function createKeyHandler(ctx) {
91
93
  // key-modes.mjs handleInterruptMode(D-S4)
92
94
  if (handleInterruptMode(str, key, { state, pushLine, render })) return
93
95
 
94
- // 序 2:模态族(key-handler-modals.mjs)——picker 导航 / 初始配置 wizard
96
+ // 序 2:模态族(key-handler-modals.mjs)——picker 导航 / 初始配置 wizard / 团队问句面
95
97
  if (state.picker) { handlePickerKeys(str, key, ctx); return }
96
98
  if (state.wizard) {
97
- // 守卫 = wizard 块内返回分支(provider 步恒返回;文本步仅 escape / return / ↑↓ / PgUp·PgDn 返回,
98
- // 其余编辑键落空至编辑族 —— 守卫项与 key-handler-modals.mjs 块内返回点逐条对应)
99
+ // 守卫 = wizard 块内返回分支(route ∥ provider 列表步恒返回;团队步焦点在场恒返回(全键归面——
100
+ // 焦点在行上时零输入);文本步仅 escape / return / ↑↓ / PgUp·PgDn 返回,其余编辑键落空至编辑族)
99
101
  const w = state.wizard
100
- if (w.step === "provider" || key.name === "escape" || key.name === "return" ||
102
+ if (w.step === "provider" || w.step === "route" || w.teamFocusBack === true ||
103
+ key.name === "escape" || key.name === "return" ||
101
104
  key.name === "up" || key.name === "down" || key.name === "pageup" || key.name === "pagedown") {
102
105
  handleWizardKeys(str, key, ctx)
103
106
  return
104
107
  }
105
108
  }
109
+ // 序 2b:团队问句面(模态族第三支——登录面补全批 · TUI-COMMANDS.md §5.5):Esc 取消 ∥ Enter 提交;
110
+ // ↑↓/PgUp·PgDn 吞(面内零滚动/历史);可打印键落空至编辑族(输入框编辑)
111
+ if (state.teamAsk && (key.name === "escape" || key.name === "return" ||
112
+ key.name === "up" || key.name === "down" || key.name === "pageup" || key.name === "pagedown")) {
113
+ handleTeamAskKeys(str, key, ctx)
114
+ return
115
+ }
106
116
 
107
117
  // 序 3:scroll 族(key-handler-scroll.mjs)——PgUp/PgDn 翻页(含 loadOlder 边界加载)/
108
118
  // ↑↓ 三规则 + 历史导航 / ←→·Home·End 光标
@@ -14,6 +14,7 @@
14
14
  import { layoutInput, wrapText } from "./render.mjs"
15
15
  import { QUESTION_CUSTOM } from "./interaction.mjs"
16
16
  import { renderSubagentPanel } from "./subagent-panel.mjs"
17
+ import { askMaskActive, maskEcho } from "./ask-steps.mjs"
17
18
 
18
19
  /** 防御:question options 声明为 string[],但 LLM 可能误传对象;取 label/text/title 兜底,避免渲染 "[object Object]"。 */
19
20
  function optText(opt) {
@@ -52,7 +53,10 @@ export function computeLayout(state, { cols, rows }) {
52
53
  // --- input box ---
53
54
  // Ctrl+I 注入框(第 31 批):{ chars, cursor } codepoint 数组 + 光标——与主输入框同渲染路径(§8)。
54
55
  const ip = state.interruptPrompt
55
- const inputBuf = state.search ? [...state.search.query] : (ip ? ip.chars : state.input)
56
+ // 掩码步(登录面补全批 · TUI-COMMANDS.md §3.1 ∥ §5.5):向导团队 password 步 ∥ `/team login`
57
+ // password 步——回显每字符 `•`(显示层变换;提交值 = `state.input` 原值不动)。单源 = ask-steps.mjs。
58
+ const inputBuf = state.search ? [...state.search.query]
59
+ : (ip ? ip.chars : (askMaskActive(state) ? maskEcho(state.input) : state.input))
56
60
  const inputCursor = state.search ? inputBuf.length : (ip ? Math.max(0, Math.min(ip.cursor ?? inputBuf.length, inputBuf.length)) : state.cursor)
57
61
  const inputLayout = layoutInput(inputBuf, inputCursor, inputW)
58
62
  let inputOffset = 0
@@ -90,7 +94,9 @@ export function computeLayout(state, { cols, rows }) {
90
94
  const statusH = 1
91
95
 
92
96
  // --- conditional panels ---
93
- const overlay = state.picker ?? state.wizard
97
+ // overlay 三支(登录面补全批):picker ∥ wizard ∥ 团队问句面(`state.teamAsk`——模态族第三支;
98
+ // overlay 行契约 = { lines, scroll } 同前两支)
99
+ const overlay = state.picker ?? state.wizard ?? state.teamAsk
94
100
  const pickerH = overlay ? Math.min(overlay.lines.length + 1, Math.max(6, rows - 12)) : 0
95
101
 
96
102
  // Todo
@@ -130,7 +130,7 @@ export function digestTraceLines(rec, startN = null) {
130
130
  // ─── ③ 重建(读面):subagent 记录 ⇒ 合成件 ────────────────────────────────
131
131
 
132
132
  /** subagent 记录 ⇒ `_frozenSubTask` 合成件(重建面;渲染端零改消费——折叠头 + tail-3 原式)。
133
- * meta 块头事实逐项回填(渲染端读面:started→elapsed ∥ turn/maxTurns ∥ stopped ∥ error→errPart);
133
+ * meta 块头事实逐项回填(渲染端读面:started→elapsed ∥ turn/maxTurns ∥ stopped ∥ errored ∥ error→errPart);
134
134
  * #790:`pool`/`queued` ⇒ CLI 本地两事实(`async`/`queued`)∥ `key` 剥 `sub:` 前缀(显示 = 本地无前缀形)。 */
135
135
  export function synthSubTask(rec) {
136
136
  const meta = rec?.meta ?? {}
@@ -152,6 +152,9 @@ export function synthSubTask(rec) {
152
152
  // #795 残项批:停止面词集扩三词(stopped ∥ cancelled ∥ terminated——词面判据单源 = §6.26;VSC/桌面写 cancelled)。
153
153
  stopped: meta.status === "stopped" || meta.status === "cancelled"
154
154
  || meta.status === "terminated",
155
+ // #821(跨端显示面差归一 · 2026-10-10):错误面事实(词面判据单源 = §6.26 判据②——error ∥ failed;
156
+ // 缺 status ∥ 未知词照 done);显示面 = `⏹` + `error` + 括号外注记(与活流冻结面同判)。
157
+ errored: meta.status === "error" || meta.status === "failed",
155
158
  lastError: typeof meta.error === "string" ? meta.error : null,
156
159
  blocks,
157
160
  _charCount: blocks.reduce((n, b) => n + b.text.length, 0), // 行集字符和(§5.4 账实一致——恢复直算同源)
@@ -6,7 +6,8 @@
6
6
  * 会话级模型面**实变** ⇒ 同拍写回 config.defaultModel(判据句 6——写面单点 = `config-helpers.mjs`
7
7
  * `carryoverDefaultModel`;等值 ∕ 回声零写)。候选 = **运行期拉取**(`GET /models`——M2;
8
8
  * 拉到的行直接可选);显式 `provider:model` 一律放行(M4——仅[空值/裸值/未知 provider]无效)。
9
- * 切换成功回显规格来源(M6);渠道默认模型 = `providers[].model` 单值(M3——显示回退读取)。
9
+ * 切换成功回显规格来源(M6);渠道条目不携模型(单值 `providers[].model` 退场——2026-10-09 清除批;
10
+ * 渠道行显示回退 = 渠道 note 的 `baseURL`)。
10
11
  * 配置写入面(加渠道 / 设 key)探一次 `/models`(M9——探不通标「不可用」+ 明示原因,不阻断保存)。
11
12
  * 渠道管理流(add/remove/key/context)是 provider 级 config 写——语义不变;2026-09-29 结构拆分起
12
13
  * 四流居 provider-admin.mjs(本档装配 ∥ 尾同名再出口)。F-4 (ISSUE-FIX-BATCH):removeProviderFlow
@@ -19,14 +20,14 @@ import { providerSpec, specMatch } from "@thincoder/core/config.mjs"
19
20
  import { saveSession, loadSlotFile } from "@thincoder/core/session.mjs"
20
21
  import { carryoverDefaultModel } from "./config-helpers.mjs"
21
22
  import { getProviderModels, modelListFailureText, dedupeModels } from "./model-catalog.mjs"
22
- import { createProviderAdmin } from "./provider-admin.mjs"
23
+ import { createProviderAdmin, isDerivedProviderHidden } from "./provider-admin.mjs"
23
24
 
24
25
  /** createModelPicker(ctx) → { openModelPicker, selectModel, setProviderKey, setContextFlow, pickModelForSlot } */
25
26
  export function createModelPicker(ctx) {
26
27
  const { agent, state, pushLine, persistRaw, askQuestion, maskKey, showPicker, closePicker, renderPickerLines, confirmDelete = () => { throw new Error("ctx.confirmDelete missing — deletion refused (fail-closed)") } } = ctx
27
28
  const { ansi, C } = ctx
28
29
  // 渠道管理四流 + 级联清理(provider-admin.mjs——structure-split-2 迁出:本档装配 ∥ 尾同名再出口)
29
- const admin = createProviderAdmin({ agent, pushLine, persistRaw, askQuestion, maskKey, showPicker, confirmDelete, C, fmtContextK, defaultModelLabel })
30
+ const admin = createProviderAdmin({ agent, pushLine, persistRaw, askQuestion, maskKey, showPicker, confirmDelete, C, fmtContextK })
30
31
 
31
32
  /** entry 唯一标识:异步更新 entries 后按它恢复选中项 */
32
33
  function entryKey(e) {
@@ -45,11 +46,6 @@ export function createModelPicker(ctx) {
45
46
  return providerConfig.apiKey
46
47
  }
47
48
 
48
- /** 渠道默认模型显示值(M3③:无默认模型显 "(no default model)"——替代旧 "(no candidates)")。 */
49
- function defaultModelLabel(p) {
50
- return p?.model ? p.model : "(no default model)"
51
- }
52
-
53
49
  /** 异步更新 entries 后的选中项恢复(selKey 命中则回原位,否则钳位)。 */
54
50
  function restoreSelection(entries, selKey) {
55
51
  const pk = state.picker
@@ -111,12 +107,15 @@ export function createModelPicker(ctx) {
111
107
  return false
112
108
  }
113
109
 
114
- /** Build entries for Level 1: provider list(L1 = 渠道面——session 复合态随行显示) */
110
+ /** Build entries for Level 1: provider list(L1 = 渠道面——session 复合态随行显示)。
111
+ * 2026-10-09 清除批:渠道条目不携模型——模型段只显**会话槽**值(仅当前会话渠道),
112
+ * 其余显示回退 = 行 note 的 `baseURL`。 */
115
113
  function buildProviderEntries() {
116
114
  const entries = []
117
- for (const p of agent.providers) {
115
+ const providers = agent.providers.filter((p) => !isDerivedProviderHidden(p)) // 派生无 key ⇒ 隐藏(TEAM.md §2.4——模型候选面)
116
+ for (const p of providers) {
118
117
  const active = p.name === agent.activeProvider
119
- const shown = active ? (agent.activeModel ?? defaultModelLabel(p)) : defaultModelLabel(p)
118
+ const shown = active && agent.activeModel ? ` ${agent.activeModel}` : ""
120
119
  const marker = active ? "●" : ""
121
120
  // A1(第 20 批 §12.5):渠道警示((no key) / (不可用))上移 text——与既有状态标
122
121
  // ((ctx …) / ← session)同簇(先例 = provider-admin.mjs setKeyFlow / wizard 的 (added, no key)):
@@ -127,7 +126,7 @@ export function createModelPicker(ctx) {
127
126
  const ctxTag = ` (ctx ${fmtContextK(providerSpec(p).context)})`
128
127
  entries.push({
129
128
  type: "item",
130
- text: `${p.name.padEnd(12)} ${shown}${ctxTag}${keyStatus}${unavailable}${sessionNote}`,
129
+ text: `${p.name.padEnd(12)}${shown}${ctxTag}${keyStatus}${unavailable}${sessionNote}`,
131
130
  action: "open-models",
132
131
  provider: p.name,
133
132
  marker,
@@ -136,7 +135,7 @@ export function createModelPicker(ctx) {
136
135
  }
137
136
  entries.push({ type: "header", text: "Management" })
138
137
  entries.push({ type: "item", text: "Add provider…", action: "add" })
139
- if (agent.providers.length > 1) entries.push({ type: "item", text: "Remove provider…", action: "remove" })
138
+ if (providers.length > 1) entries.push({ type: "item", text: "Remove provider…", action: "remove" })
140
139
  entries.push({ type: "item", text: "Set / change API key…", action: "key" })
141
140
  entries.push({ type: "item", text: "Set context window (K units)…", action: "context" })
142
141
  return entries
@@ -269,11 +268,11 @@ export function createModelPicker(ctx) {
269
268
  * 或自由值——与 subagent 工具 model 参数同语义)。返回 { provider, model } 或 null。 */
270
269
  async function pickModelForSlot() {
271
270
  for (;;) {
272
- const providers = agent.providers
271
+ const providers = agent.providers.filter((p) => !isDerivedProviderHidden(p)) // 派生无 key ⇒ 隐藏(TEAM.md §2.4——槽位面同判据)
273
272
  if (!providers.length) return null
274
273
  const e = await showPicker("Select provider", providers.map((p) => ({
275
274
  type: "item",
276
- text: `${p.name.padEnd(12)} ${defaultModelLabel(p)}`,
275
+ text: `${p.name.padEnd(12)} ${p.baseURL}`,
277
276
  action: "open-models",
278
277
  provider: p.name,
279
278
  })))
@@ -322,4 +321,4 @@ export function createModelPicker(ctx) {
322
321
  return { openModelPicker, selectModel, setProviderKey: admin.setProviderKey, setContextFlow: admin.setContextFlow, pickModelForSlot }
323
322
  }
324
323
 
325
- export { cascadeRemoveProvider } from "./provider-admin.mjs"
324
+ export { cascadeRemoveProvider, isDerivedProviderHidden } from "./provider-admin.mjs"
@@ -123,7 +123,7 @@ export function createPickers(ctx) {
123
123
 
124
124
  // /model 两级面 + selectModel + 渠道管理 + pickModelForSlot —— 迁 model-picker.mjs
125
125
  // (2026-09-29 结构拆分:渠道管理四流再迁 provider-admin.mjs——本层与会话面转发零改。)
126
- // (MODEL-MERGE-SESSION——pick 后本文件 ≤450)。createModelPicker 返回同名单函数,
126
+ // (MODEL-MERGE-SESSION——pick 后本文件 ≤750)。createModelPicker 返回同名单函数,
127
127
  // 经本层原样转发(index.mjs/wizard/slash-commands 消费面零变化)。
128
128
  const modelPicker = createModelPicker({
129
129
  agent, state, render, ansi, C, pushLine, persistRaw, askQuestion, maskKey,
@@ -6,26 +6,37 @@
6
6
  * `docs/batches/2026-09-29-structure-split-2.md` §2.2-A。
7
7
  *
8
8
  * 装配 = `createProviderAdmin(ctx)`(ctx = `{ agent, showPicker, askQuestion, pushLine, persistRaw,
9
- * maskKey, confirmDelete, C, fmtContextK, defaultModelLabel }`——后两名 = 主档纯 helper,ctx 注入
9
+ * maskKey, confirmDelete, C, fmtContextK }`——`fmtContextK` = 主档纯 helper,ctx 注入
10
10
  * 同 `maskKey` 先例)→ `{ addProviderFlow, removeProviderFlow, setKeyFlow, setProviderKey,
11
11
  * setContextFlow }`;`cascadeRemoveProvider` 模块级导出(宿主 `model-picker.mjs` 尾同名再出口——
12
12
  * 历史导出面零改)。零环:本档不 import 主档(宿主 → 本档单向)。
13
13
  * 语义(迁出原文照录):四流 = provider 级 config 写——M9 配置阶段准入探一次 `/models`(不阻断保存)
14
14
  * ∥ F-4 (IKCDMR):removeProviderFlow 级联清理悬挂引用(consultModels ∕ subagentModels ∕ advisor.provider)。
15
+ * 2026-10-07 三端对齐批(#1027):添加流两支 +走 proxy 问句(写同一键 `providers[].proxy`);
16
+ * 三端探针目标构造收敛核 `probeTargetOf`(③′)。
15
17
  */
16
18
  import { PROVIDER_PRESETS as PRESETS, providerSpec } from "@thincoder/core/config.mjs"
19
+ import { hasKey } from "@thincoder/core/model-ref.mjs"
20
+ import { probeTargetOf } from "@thincoder/core/provider-flows.mjs"
17
21
  import { probeChannelModels } from "./model-catalog.mjs"
18
22
 
23
+ /** 派生条目隐藏判据(TEAM.md §2.4 ∥ PROVIDER.md §6.25):`derived === true` ∧ 无 key ⇒ 列表/候选面
24
+ * 隐藏(四消费面各一处过滤——CLI 模型候选 ∥ CLI provider-admin ∥ VSC ∥ 桌面);登录态(有 key)在场。
25
+ * 「持 key」判据单源 = 核 `model-ref.mjs` `hasKey`(PROVIDER.md §6.22——trim 非空)。 */
26
+ export function isDerivedProviderHidden(provider) {
27
+ return provider?.derived === true && !hasKey(provider)
28
+ }
29
+
19
30
  /** createProviderAdmin(ctx) → { addProviderFlow, removeProviderFlow, setKeyFlow, setProviderKey, setContextFlow } */
20
31
  export function createProviderAdmin(ctx) {
21
- const { agent, showPicker, askQuestion, pushLine, persistRaw, maskKey, confirmDelete, C, fmtContextK, defaultModelLabel } = ctx
32
+ const { agent, showPicker, askQuestion, pushLine, persistRaw, maskKey, confirmDelete, C, fmtContextK } = ctx
22
33
 
23
34
  // ═══ 渠道管理流(provider 级 config 写——语义不变——与 /model 会话选择分离)═══
24
35
 
25
36
  /** M9 配置阶段准入探:探通 → 清标记;探不通 → 会话内存标「不可用」+ 明示原因(绝不落 config;
26
37
  * 不阻断保存——条目已保存,仅标注)。 */
27
38
  async function probeChannelFlow(cfg, label) {
28
- const r = await probeChannelModels(cfg)
39
+ const r = await probeChannelModels(probeTargetOf(cfg)) // 探针目标构造收敛核判据(③′——三端同判定;执行体零改)
29
40
  if (r.ok) {
30
41
  delete cfg._unavailable
31
42
  pushLine(`${label}: /models 可用(${r.list.length} 个模型可候选)`, C.tool)
@@ -40,7 +51,7 @@ export function createProviderAdmin(ctx) {
40
51
  const entries = [
41
52
  { type: "header", text: "Select a preset provider" },
42
53
  ...Object.entries(PRESETS).filter(([name]) => !agent.providers.some((p) => p.name === name))
43
- .map(([name, p]) => ({ type: "item", text: `${name.padEnd(10)} ${p.desc ?? ""} (${p.model ?? ""})`, name, kind: "preset" })),
54
+ .map(([name, p]) => ({ type: "item", text: `${name.padEnd(10)} ${p.desc ?? ""}`, name, kind: "preset" })),
44
55
  { type: "header", text: "Other" },
45
56
  { type: "item", text: "Custom (manual config)", name: "__custom__", kind: "custom" },
46
57
  ]
@@ -52,27 +63,38 @@ export function createProviderAdmin(ctx) {
52
63
  if (agent.providers.some((p) => p.name === name)) return
53
64
  const baseURL = (await askQuestion("Enter baseURL:")).replace(/\/+$/, "")
54
65
  if (!baseURL) return
55
- const model = await askQuestion("Enter model name:")
56
- if (!model) return
57
66
  const format = await showPicker("API format", [
58
67
  { type: "item", text: "openai", name: "openai" },
59
68
  { type: "item", text: "anthropic", name: "anthropic" },
60
69
  { type: "item", text: "google", name: "google" },
61
70
  ])
62
71
  if (!format) return // Esc/取消 → 中止流程
63
- const cfg = { name, baseURL, model }
72
+ const cfg = { name, baseURL } // 2026-10-09 清除批:渠道条目不携 `model`(表单不设 model 输入件)
64
73
  if (format.name === "anthropic" || format.name === "google") cfg.format = format.name
65
74
  else if (format.name !== "openai") return // 防御:未知格式(理论不可达——picker 枚举)
66
75
  await persistRaw((raw) => { raw.providers ??= []; raw.providers.push(cfg) }) // D-F5a 先盘后存
67
76
  agent.providers.push(cfg)
68
77
  const key = await askQuestion(`Enter API key for ${name} (skip if none):`)
69
78
  if (key) await setProviderKey(name, key, { probe: false }) // 探统一在流尾(M9——精确一次)
79
+ // #1027 走 proxy 问句(key 后、流尾探针前——写同一键 providers[].proxy;No/Esc ⇒ 零键零写)
80
+ const route = await showPicker("Route this provider's model requests through the proxy", [
81
+ { type: "item", text: "No (direct)", name: "no" },
82
+ { type: "item", text: "Yes (proxy)", name: "yes" },
83
+ ])
84
+ if (route?.name === "yes") {
85
+ await persistRaw((raw) => { // D-F5a 先盘后存(代理单键补丁——不取内存 providers 整数组)
86
+ raw.providers ??= []
87
+ const t = raw.providers.find((p) => p?.name === name)
88
+ if (t) t.proxy = true
89
+ })
90
+ cfg.proxy = true // 会话内存镜像(cfg = agent.providers 内同一对象)
91
+ }
70
92
  await probeChannelFlow(cfg, name) // M9 准入探(加渠道配置写入面;保存已落——不阻断)
71
93
  return
72
94
  }
73
95
  const preset = PRESETS[se.name]
74
96
  if (!preset || agent.providers.some((p) => p.name === se.name)) return
75
- const cfg = { name: se.name, baseURL: preset.baseURL, model: preset.model }
97
+ const cfg = { name: se.name, baseURL: preset.baseURL } // 2026-10-09 清除批:渠道条目不携 `model`(零播种)
76
98
  if (preset.thinking) cfg.thinking = preset.thinking
77
99
  if (preset.reasoningEffort) cfg.reasoningEffort = preset.reasoningEffort
78
100
  if (preset.maxTokens) cfg.maxTokens = preset.maxTokens
@@ -82,15 +104,28 @@ export function createProviderAdmin(ctx) {
82
104
  agent.providers.push(cfg)
83
105
  const key = await askQuestion(`Enter API key for ${se.name} (skip if none):`)
84
106
  if (key) await setProviderKey(se.name, key, { probe: false }) // 探统一在流尾(M9——精确一次)
107
+ // #1027 走 proxy 问句(key 后、流尾探针前——写同一键 providers[].proxy;No/Esc ⇒ 零键零写)
108
+ const route = await showPicker("Route this provider's model requests through the proxy", [
109
+ { type: "item", text: "No (direct)", name: "no" },
110
+ { type: "item", text: "Yes (proxy)", name: "yes" },
111
+ ])
112
+ if (route?.name === "yes") {
113
+ await persistRaw((raw) => { // D-F5a 先盘后存(代理单键补丁——不取内存 providers 整数组)
114
+ raw.providers ??= []
115
+ const t = raw.providers.find((p) => p?.name === se.name)
116
+ if (t) t.proxy = true
117
+ })
118
+ cfg.proxy = true // 会话内存镜像(cfg = agent.providers 内同一对象)
119
+ }
85
120
  await probeChannelFlow(cfg, se.name) // M9 准入探(加渠道配置写入面;保存已落——不阻断)
86
121
  }
87
122
 
88
123
  async function removeProviderFlow() {
89
- const candidates = agent.providers.filter((p) => p.name !== agent.activeProvider)
124
+ const candidates = agent.providers.filter((p) => p.name !== agent.activeProvider && !isDerivedProviderHidden(p)) // 派生无 key ⇒ 隐藏(TEAM.md §2.4)
90
125
  if (!candidates.length) return
91
126
  const se = await showPicker("Remove Provider", [
92
127
  { type: "header", text: "Select provider to remove" },
93
- ...candidates.map((p) => ({ type: "item", text: `${p.name} (${defaultModelLabel(p)})`, name: p.name })),
128
+ ...candidates.map((p) => ({ type: "item", text: `${p.name} (${p.baseURL})`, name: p.name })),
94
129
  ])
95
130
  if (!se) return
96
131
  if (!(await confirmDelete(`Remove provider ${se.name}?`))) return
@@ -113,7 +148,7 @@ export function createProviderAdmin(ctx) {
113
148
  async function setKeyFlow() {
114
149
  const se = await showPicker("Configure API Key", [
115
150
  { type: "header", text: "Select provider" },
116
- ...agent.providers.map((p) => ({ type: "item", text: `${p.name} ${p.apiKey ? `(has key: ${maskKey(p.apiKey)})` : "(no key)"}`, name: p.name })),
151
+ ...agent.providers.filter((p) => !isDerivedProviderHidden(p)).map((p) => ({ type: "item", text: `${p.name} ${p.apiKey ? `(has key: ${maskKey(p.apiKey)})` : "(no key)"}`, name: p.name })),
117
152
  ])
118
153
  if (!se) return
119
154
  const key = await askQuestion(`Enter API key for ${se.name}:`)
@@ -140,7 +175,7 @@ export function createProviderAdmin(ctx) {
140
175
  async function setContextFlow() {
141
176
  const se = await showPicker("Set Context Window", [
142
177
  { type: "header", text: "Select provider" },
143
- ...agent.providers.map((p) => ({
178
+ ...agent.providers.filter((p) => !isDerivedProviderHidden(p)).map((p) => ({
144
179
  type: "item",
145
180
  text: `${p.name} (ctx ${fmtContextK(providerSpec(p).context)})`,
146
181
  name: p.name,
@@ -189,7 +224,7 @@ export function createProviderAdmin(ctx) {
189
224
 
190
225
  /** F-4 (IKCDMR) 级联清理(删渠道共享写点):raw/merged config 移除 name 渠道后清悬挂引用——
191
226
  * agent.consultModels 条目 / agent.subagentModels 角色值(=== name 或 "name:…" 前缀——
192
- * 角色值是 "provider:model" | 裸渠道名 | 裸模型名)/ agent.advisor.provider。
227
+ * 角色值是 "provider:model" | 裸渠道名(遗留值——清除批起解析层拒) | 裸模型名)/ agent.advisor.provider。
193
228
  * 纯 mutate(removeProviderFlow persistRaw 的 D-F5 新鲜 raw 上调用;agent.config 内存镜像
194
229
  * 子树与 raw.agent 同构可复用)。空数组/空对象键删除(规范形态)。 */
195
230
  export function cascadeRemoveProvider(raw, name) {
@@ -99,7 +99,7 @@ export function renderPicker(state, cols, panel, overlay) {
99
99
  const right = p && p.filteredItems?.length ? `${p.index + 1}/${p.filteredItems.length} ` : ""
100
100
  // 过滤提示:无filter时显示 "type to filter",有filter时显示输入内容
101
101
  const filterHint = p ? (p.filter ? `│ ${p.filter}` : "│ type to filter") : ""
102
- const rawLeft = p ? ` ❯ ${p.title} ${filterHint} ` : " ❯ Setup "
102
+ const rawLeft = p ? ` ❯ ${p.title} ${filterHint} ` : state.teamAsk != null ? " ❯ Team login " : " ❯ Setup "
103
103
  // 2026-08-31 会诊(advisor round1 🔵):标题行与条目行一致留 8 格余量——Ambiguous 字符
104
104
  // (❯/│ 等)在 CJK 终端渲染 2 格,余量不足时右侧 n/m 位置指示会被截。
105
105
  const left = sliceByWidth(rawLeft, Math.max(1, cols - 8 - stringWidth(right)))
@@ -346,6 +346,8 @@ function inputBoxStyle(state) {
346
346
  title = " Select "
347
347
  } else if (state.wizard) {
348
348
  title = " Setup "
349
+ } else if (state.teamAsk) {
350
+ title = " Team login "
349
351
  } else if (state.processing) {
350
352
  title = " Processing... "
351
353
  } else {
@@ -382,10 +384,14 @@ function buildStatusLine(state, agent, { cols, slashCommands }) {
382
384
  return " y: approve │ n: deny │ a: approve all (AUTO)"
383
385
  }
384
386
  if (state.picker) return " type: filter │ ↑↓/PgUp/PgDn: select │ Enter: confirm │ Esc: cancel"
387
+ // 团队问句面(模态族第三支——登录面补全批):主键面 = Esc 取消 ∥ Enter 提交(输入框编辑·零滚动)
388
+ if (state.teamAsk) return " Type then Enter │ Esc: cancel"
385
389
  if (state.wizard) {
386
- return state.wizard.step === "provider"
387
- ? " ↑↓: select │ Enter: confirm │ Esc: skip"
388
- : " Type then Enter │ Esc: cancel"
390
+ const w = state.wizard
391
+ // route 屏与 provider 步同为列表步;团队步焦点在回退行上时 Enter = 确认回退
392
+ if (w.step === "provider" || w.step === "route") return " ↑↓: select │ Enter: confirm │ Esc: skip"
393
+ if (w.teamFocusBack === true) return " ↑↓: select │ Enter: confirm │ Esc: cancel"
394
+ return " Type then Enter │ Esc: cancel"
389
395
  }
390
396
  if (rawInput.startsWith("/") && !state.processing && !state.permission) {
391
397
  const [cmd] = rawInput.split(/\s+/)
@@ -456,5 +462,26 @@ function buildStatusLine(state, agent, { cols, slashCommands }) {
456
462
  const titleRaw = typeof agent.title === "string" ? agent.title.trim() : ""
457
463
  const titleShown = titleRaw ? (stringWidth(titleRaw) > 40 ? sliceByWidth(titleRaw, 39) + "…" : titleRaw) : sessionTitleFallback(agent)
458
464
  const titleHint = ` │ ${titleShown}`
459
- return ` ${statusText}${taskHint}${turnHint}${tokenHint}${ctxHint}${scrollHint}${ledgerHint}${timerHint}${titleHint} │ ${enterHint} │ /: commands │ wheel/PgUp/PgDn: scroll │ Ctrl+I: inject │ Ctrl+C: exit (×2)`
465
+ // 团队登录态段(登录面补全批 · `docs/cli/design/TUI.md` §7.8):簇尾末位(titleHint 后、`│ <enterHint>` 前)
466
+ const teamHint = teamSegmentHint(state.team)
467
+ return ` ${statusText}${taskHint}${turnHint}${tokenHint}${ctxHint}${scrollHint}${ledgerHint}${timerHint}${titleHint}${teamHint} │ ${enterHint} │ /: commands │ wheel/PgUp/PgDn: scroll │ Ctrl+I: inject │ Ctrl+C: exit (×2)`
468
+ }
469
+
470
+ /** 团队状态段(TUI.md §7.8——三态闭集):未登录 ⇒ `""`(**负控:零注入——整行逐字节等价**);
471
+ * 已登录 ⇒ ` │ <成员>@<主机>`(成员 = `member.name ?? member.username`;主机 = `URL.host`——不搬
472
+ * URL 全串);`verify === "invalid"` ⇒ ` │ ` + 核字典键词形(警示色包裹——同 timerHint 到期态形;
473
+ * `t()` 出词 ⇒ CLI 现渲缺省 en,沿 §7.7 同注)。成员 ∥ 主机两缺 ⇒ 零注入(防御位——不产空段)。 */
474
+ function teamSegmentHint(team) {
475
+ if (team == null || team.loggedIn !== true) return ""
476
+ if (team.verify === "invalid") return ` │ ${ansi.reset}${C.warn}${t("status.team.invalid")}${ansi.reset}${ansi.dim}`
477
+ const member = team.member?.name ?? team.member?.username ?? ""
478
+ const host = teamServerHost(team.server)
479
+ const text = member !== "" && host !== "" ? `${member}@${host}` : (member !== "" ? member : host)
480
+ return text === "" ? "" : ` │ ${text}`
481
+ }
482
+
483
+ /** 团队服务器主机名(段面只显 `<主机>`):`URL.host`(默认端口已去);不可解析 ⇒ `""`。 */
484
+ function teamServerHost(server) {
485
+ if (typeof server !== "string" || server === "") return ""
486
+ try { return new URL(server).host } catch { return "" }
460
487
  }