thincoder 0.12.73 → 0.12.75

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.
Files changed (46) hide show
  1. package/CHANGELOG.md +19 -0
  2. package/README.md +9 -0
  3. package/bin/thincoder.mjs +1 -0
  4. package/package.json +2 -2
  5. package/src/acp/bridge.mjs +14 -5
  6. package/src/acp/handlers-session.mjs +1 -1
  7. package/src/acp/handlers-slots.mjs +6 -4
  8. package/src/acp/read-data.mjs +4 -1
  9. package/src/acp/session.mjs +5 -4
  10. package/src/acp.mjs +7 -2
  11. package/src/cli/make-agent.mjs +1 -1
  12. package/src/cli/team-command.mjs +41 -8
  13. package/src/command-interactive.mjs +1 -1
  14. package/src/completions.mjs +4 -4
  15. package/src/prompt-injections.mjs +1 -1
  16. package/src/tui/agent-turn.mjs +5 -4
  17. package/src/tui/ask-steps.mjs +8 -0
  18. package/src/tui/cmd-advisor.mjs +3 -3
  19. package/src/tui/cmd-config.mjs +28 -3
  20. package/src/tui/cmd-eng.mjs +7 -5
  21. package/src/tui/cmd-session.mjs +7 -5
  22. package/src/tui/cmd-team.mjs +41 -9
  23. package/src/tui/cmd-think.mjs +3 -3
  24. package/src/tui/cmd-timers.mjs +9 -5
  25. package/src/tui/index.mjs +1 -1
  26. package/src/tui/interaction.mjs +13 -1
  27. package/src/tui/key-handler-modals.mjs +16 -1
  28. package/src/tui/key-handler-search.mjs +11 -1
  29. package/src/tui/key-handler.mjs +10 -1
  30. package/src/tui/layout.mjs +14 -6
  31. package/src/tui/lifecycle-records.mjs +9 -3
  32. package/src/tui/model-picker.mjs +1 -1
  33. package/src/tui/pickers.mjs +1 -1
  34. package/src/tui/provider-admin.mjs +2 -2
  35. package/src/tui/queued-pickup.mjs +1 -1
  36. package/src/tui/render-frame.mjs +17 -183
  37. package/src/tui/render-segments.mjs +19 -8
  38. package/src/tui/secret-prompt.mjs +202 -0
  39. package/src/tui/slash-commands.mjs +4 -2
  40. package/src/tui/status-line.mjs +197 -0
  41. package/src/tui/subagent-freeze.mjs +16 -10
  42. package/src/tui/suspension-drive.mjs +2 -2
  43. package/src/tui/timer-watch.mjs +1 -1
  44. package/src/tui/tool-events.mjs +19 -11
  45. package/src/tui/tui-state.mjs +1 -0
  46. package/src/tui/turn-face.mjs +6 -4
@@ -5,42 +5,33 @@
5
5
  * Panel render functions are exported individually for incremental rendering
6
6
  * (only changed panels are written to the terminal, eliminating flicker on Windows).
7
7
  * The legacy renderFrame() wrapper is kept for compatibility.
8
+ * 状态栏族已迁 `status-line.mjs`(2026-10-15 car2 批 · 台账 #1437——结构零语义):导出面
9
+ * (`QUIET_MS` ∥ `attentionKind` ∥ `renderStatus`)自本档转发再出口,既有 import 面零破坏。
8
10
  */
9
11
  import { ansi, C, ESC } from "./ansi.mjs"
10
12
  import { convCacheKey, renderConversation, countConvLines } from "./render-conversation.mjs"
11
13
  import { sliceByWidth, stringWidth } from "./render.mjs"
12
14
  import { providerSpec } from "@thincoder/core/config.mjs"
13
- import { t } from "@thincoder/core/i18n.mjs" // 停滞轻显形(TUI.md §7.7):句式键 status.quiet——词面单源(CLI 直取)
14
15
  // #363②(off 形族单源——MODEL-SPECS.md §16.2 / §16.4):顶栏 think 徽标的 off 判据引核(本档零副本)。
15
16
  import { thinkOffShape, thinkOffPath } from "@thincoder/core/think-off.mjs"
16
- import { isRealUserMsg } from "@thincoder/core/history-window.mjs" // B6 回退链:首条真实 user 消息谓词(纯件单源)
17
17
  import { computeLayout, subagentVisibleLines } from "./layout.mjs"
18
18
  import { basename } from "node:path"
19
19
  import { readFileSync } from "node:fs"
20
20
  import { isYesNoModal } from "./interaction.mjs" // X8 跟进①:y/n-only 族判据单源
21
+ // SSH 凭据窗标题(SSH-SESSION 批 §6.22 ⑧——overlay 标题行 keys.title 投影;面体单源 = secret-prompt.mjs)
22
+ import { secretPromptTitle } from "./secret-prompt.mjs"
23
+ // 状态栏(#1437 拆分——族体居 status-line.mjs;renderRows 状态行 put 走此引,导出面转发见下)
24
+ import { renderStatus } from "./status-line.mjs"
25
+ // 掩码面在场判据单源(#1437 显示面同归——框题侧消费;内容侧 = layout.mjs)
26
+ import { maskSurfacePresent } from "./ask-steps.mjs"
21
27
 
22
28
  export { convCacheKey, renderConversation, countConvLines } from "./render-conversation.mjs"
29
+ export { QUIET_MS, attentionKind, renderStatus } from "./status-line.mjs"
23
30
 
24
31
  // Module-load read, once per process (same pattern as cmd-upgrade.mjs): the
25
32
  // header shows the installed version next to the logo (user request 2026-08-31).
26
33
  const THINCODER_VERSION = JSON.parse(readFileSync(new URL("../../package.json", import.meta.url), "utf8")).version
27
34
 
28
- // ---------- status bar slash-command hints ----------
29
- const SLASH_HINTS = {
30
- "/config": "open config menu",
31
- "/model": "select model & manage providers",
32
- "/think": "open thinking mode menu",
33
- "/mcp": "open MCP management menu",
34
- "/goal": "open goal management menu",
35
- "/session": "select archived session",
36
- "/restore": "select checkpoint to restore",
37
- }
38
-
39
- // ---------- 停滞轻显形阈值(docs/cli/design/TUI.md §7.7 · stall-indicator 批 2026-09-29)----------
40
- /** 静默显示阈值(毫秒)——静默 ≥ 本值才注入读数(首显值 = 10s);跳秒 = 既有 1s 拍
41
- * (agent-turn ticker——零新定时器);三端同值(VSC ∕ 桌面各自持有常量面)。 */
42
- export const QUIET_MS = 10_000
43
-
44
35
  // ====================================================================
45
36
  // Panel render functions (exported for incremental rendering)
46
37
  // Each returns string[] — one element per screen row, ANSI-colored,
@@ -99,7 +90,9 @@ export function renderPicker(state, cols, panel, overlay) {
99
90
  const right = p && p.filteredItems?.length ? `${p.index + 1}/${p.filteredItems.length} ` : ""
100
91
  // 过滤提示:无filter时显示 "type to filter",有filter时显示输入内容
101
92
  const filterHint = p ? (p.filter ? `│ ${p.filter}` : "│ type to filter") : ""
102
- const rawLeft = p ? ` ❯ ${p.title} ${filterHint} ` : state.teamAsk != null ? " ❯ Team login " : " ❯ Setup "
93
+ // 标题左段(末支 = SSH 凭据窗 · SSH-SESSION 批 §6.22 ⑧——keys.title 核字典投影)
94
+ const rawLeft = p ? ` ❯ ${p.title} ${filterHint} ` : state.teamAsk != null ? " ❯ Team login "
95
+ : state.secretPrompt != null ? ` ❯ ${secretPromptTitle(state.secretPrompt)} ` : " ❯ Setup "
103
96
  // 2026-08-31 会诊(advisor round1 🔵):标题行与条目行一致留 8 格余量——Ambiguous 字符
104
97
  // (❯/│ 等)在 CJK 终端渲染 2 格,余量不足时右侧 n/m 位置指示会被截。
105
98
  const left = sliceByWidth(rawLeft, Math.max(1, cols - 8 - stringWidth(right)))
@@ -219,39 +212,6 @@ export function renderInputBox(state, W, boxLines, cols, inputLayout, inputOffse
219
212
  return out
220
213
  }
221
214
 
222
- /** 第 33 批(TUI §14.3(a)——纯函数派生,无副作用):blocked = 审批/提问卡挂起(实时派生,
223
- * 提示消解即消失);awaiting = 回合结束等待输入(链尾置位——processing / 挂起两态期间不派生)。
224
- * @returns {"blocked"|"awaiting"|null} */
225
- export function attentionKind(state) {
226
- if (state.permission || state.question) return "blocked"
227
- if (state.attentionAwaiting && !state.processing && !state.suspended && !state._suspPending) return "awaiting"
228
- return null
229
- }
230
-
231
- /** Status bar (always 1 line). */
232
- export function renderStatus(state, agent, cols, slashCommands) {
233
- const statusLine = buildStatusLine(state, agent, { cols, slashCommands })
234
- const autoBanner = agent.autoApprove ? `${C.warn} AUTO${ansi.reset}${ansi.dim}│` : ""
235
- const planBanner = agent.planMode ? `${C.tool} PLAN${ansi.reset}${ansi.dim}│` : ""
236
- const advisorBanner = agent.config?.advisor?.guard === true ? `${C.advisor} ADVISOR${ansi.reset}${ansi.dim}│` : ""
237
- const engBanner = agent.config?.agent?.engineering ? `${C.advisor} ENG${ansi.reset}${ansi.dim}│` : ""
238
- const bannerPrefix = (agent.planMode ? " PLAN│ " : "") + (agent.autoApprove ? " AUTO│ " : "") + (agent.config?.advisor?.guard === true ? " ADVISOR│ " : "") + (agent.config?.agent?.engineering ? " ENG│ " : "")
239
- // 第 33 批(TUI §14.3(b)/(c)):attention 态 = chip 行首 + 整行注意力色对包裹(blocked >
240
- // awaiting;blocked 内 permission > question——与按键分发优先级同序);平态零注入。
241
- const kind = attentionKind(state)
242
- const chip = kind === "blocked" ? (state.permission ? "⚠ 等待你的审批" : "⚠ 等待你的回答")
243
- : kind === "awaiting" ? "⚠ 等待你的输入" : ""
244
- const attentionPad = chip ? `${chip} │ ` : ""
245
- // 宽度预算(N9④):chip 占位计入——整行仍 ≤ cols − 1(既有口径)。
246
- const statusMax = cols - 1 - (bannerPrefix ? stringWidth(bannerPrefix) : 0) - (attentionPad ? stringWidth(attentionPad) : 0)
247
- const inner = `${ansi.dim}${planBanner}${autoBanner}${advisorBanner}${engBanner}${sliceByWidth(statusLine, Math.max(10, statusMax))}`
248
- // 负向锁(§14.3):attention 为 null ⇒ 半态路径逐字节等价(不经包裹 / 零字节注入)。
249
- if (!chip) return `${inner}${ansi.reset}`
250
- // 底色存活(§14.3):既有内容含内部 ansi.reset(banner / ctx 警示段)——每次内部复位后
251
- // 重施加注意力色对,再整体包裹(内容零省略)。
252
- return `${C.attention}${(chip + " │ " + inner).replaceAll(ansi.reset, ansi.reset + C.attention)}${ansi.reset}`
253
- }
254
-
255
215
  // ====================================================================
256
216
  // Frame composition
257
217
  // ====================================================================
@@ -329,7 +289,9 @@ export function renderFrame(state, agent, opts) {
329
289
  function inputBoxStyle(state) {
330
290
  let borderColor = C.tool
331
291
  let title
332
- if (state.search) {
292
+ // #1437(TUI.md §4 掩码守卫·显示面同归):掩码三面在场 ⇒ 框题归掩码面——搜索面让位
293
+ // (同判据单源 = ask-steps.mjs `maskSurfacePresent`;内容侧消费 = layout.mjs 输入框内容式)。
294
+ if (state.search && !maskSurfacePresent(state)) {
333
295
  borderColor = C.tool; title = ` Search ${state.search.matches.length > 0 ? `(${state.search.index + 1}/${state.search.matches.length})` : state.search.query ? "(no match)" : ""} `
334
296
  } else if (state.interruptPrompt) {
335
297
  borderColor = C.warn; title = " Inject Message "
@@ -348,6 +310,8 @@ function inputBoxStyle(state) {
348
310
  title = " Setup "
349
311
  } else if (state.teamAsk) {
350
312
  title = " Team login "
313
+ } else if (state.secretPrompt) { // SSH 凭据窗(SSH-SESSION 批 §6.22 ⑧——掩码输入面)
314
+ borderColor = C.warn; title = " SSH Credentials "
351
315
  } else if (state.processing) {
352
316
  title = " Processing... "
353
317
  } else {
@@ -355,133 +319,3 @@ function inputBoxStyle(state) {
355
319
  }
356
320
  return { borderColor, title }
357
321
  }
358
-
359
- /** 标题回退链(B6 消 · #677——对位 VSC `panel-session.mjs:243-247` 链值 `title → "firstMessage" → "(empty)"`;
360
- * 截断逐字同该链 `truncate(s, 40)`——生成前 ∕ 失败期两端同值)。首条真实 user 消息 = 活读单源:
361
- * 绑定态取槽摘要字段(`counters().firstMessage`——与 VSC `listSlots` 同字段);未绑定回退内存人读线。 */
362
- function sessionTitleFallback(agent) {
363
- const fm = (agent?._recordStore?.counters?.().firstMessage ?? "")
364
- || (agent?._fullHistory ?? agent?.history ?? []).find(isRealUserMsg)?.content
365
- if (typeof fm !== "string" || fm === "") return "(empty)"
366
- return `"${fm.length <= 40 ? fm : fm.slice(0, 39) + "…"}"`
367
- }
368
-
369
- function buildStatusLine(state, agent, { cols, slashCommands }) {
370
- const scrollHint = state.scroll > 0 ? ` │ scrolled ${state.scroll}` : ""
371
- const rawInput = state.input.join("")
372
-
373
- if (state.question) {
374
- const q = state.question
375
- return q.options.length > 0
376
- ? " ↑↓: select │ Enter: confirm │ Esc: cancel"
377
- : " Type answer then Enter │ Esc: cancel"
378
- }
379
- if (state.permission) {
380
- if (isYesNoModal(state.permission.name)) {
381
- return state.permission.name === "continue" ? " y: continue │ n: stop" : " y: retry │ n: stop"
382
- }
383
- if (state.permission.batch) return " a: approve all │ o: one by one │ n: deny"
384
- return " y: approve │ n: deny │ a: approve all (AUTO)"
385
- }
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"
389
- if (state.wizard) {
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"
395
- }
396
- if (rawInput.startsWith("/") && !state.processing && !state.permission) {
397
- const [cmd] = rawInput.split(/\s+/)
398
- const cmds = slashCommands.filter((c) => c.name.startsWith(cmd))
399
- const match = cmds.length === 1 ? cmds[0] : null
400
- if (match && SLASH_HINTS[match.name]) return ` ${match.name} ${SLASH_HINTS[match.name]}`
401
- if (cmds.length > 0) {
402
- if (cmds.length <= 4) return ` ${cmds.map((c) => `${c.name} ${c.desc}`).join(" │ ")}`
403
- return ` ${cmds.map((c) => c.name).join(" ")} │ Tab complete`
404
- }
405
- return ` unknown command (/help for available commands)`
406
- }
407
-
408
- const taskHint = state.tasks.length > 0
409
- ? ` │ ✓${state.tasks.filter((t) => t.status === "done").length}/${state.tasks.length}` : ""
410
- const turnHint = agent._currentTurn > 0 && agent._maxTurns > 0
411
- ? ` │ turn ${agent._currentTurn}/${agent._maxTurns}` : ""
412
- const tk = state.tokens
413
- const fmtK = (n) => (n >= 10000 ? `${Math.round(n / 1000)}k` : n >= 1000 ? `${(n / 1000).toFixed(1)}k` : `${n}`)
414
- const cacheTotal = tk.cacheHit + tk.cacheMiss
415
- const tokenHint = tk.prompt > 0
416
- ? ` │ ↑${fmtK(tk.prompt)} ↓${fmtK(tk.completion)}${tk.reasoningTokens > 0 ? ` ✦${fmtK(tk.reasoningTokens)}` : ""}${cacheTotal > 0 ? ` hit${Math.round((tk.cacheHit / cacheTotal) * 100)}%` : ""}` : ""
417
- const elapsed = state.processing ? ` ${Math.floor((Date.now() - state.processingStarted) / 1000)}s` : ""
418
- const toolHint = state.currentTool ? ` ${state.currentTool}…` : ""
419
- // 停滞轻显形(docs/cli/design/TUI.md §7.7 · stall-indicator 批 2026-09-29):显示位 = elapsed 之后;
420
- // 静默 = 距最近一次可见输出(`state.lastOutputAt`——回合起刻为初始锚,重置点三类见 tool-events ∕
421
- // subagent-blocks);非显示条件(未至阈值 ∕ 非在飞 ∕ 未起算)零注入(负向锁——逐字节等价);纯读数零警示色。
422
- const lastOut = state.lastOutputAt ?? 0
423
- const quietHint = state.processing && lastOut > 0 && Date.now() - lastOut >= QUIET_MS
424
- ? ` ${t("status.quiet", { s: Math.floor((Date.now() - lastOut) / 1000) })}`
425
- : ""
426
- const statusText = state.processing ? `${state.status}${toolHint}${elapsed}${quietHint}` : state.status
427
- // 2026-09-02 Q1(SESSION.md §6.8):provider 可为 null —— providerSpec(null) 保守 128K 不抛错
428
- // 2026-09-02 §15:context 窗口跟随 providers[].context 覆盖(T-C6——百分比基于覆盖后的窗口)
429
- const modelContext = providerSpec(agent.provider).context
430
- const ctxPct = Math.round((state.ctxCache.tokens / modelContext) * 100)
431
- const ctxTokensHint = state.ctxCache.tokens > 0 ? ` ${fmtK(state.ctxCache.tokens)}` : ""
432
- const ctxHint = ctxPct > 0
433
- ? ctxPct >= 80 ? ` │ ${ansi.reset}${C.warn}context ${ctxPct}%${ctxTokensHint}${ansi.reset}${ansi.dim}` : ` │ context ${ctxPct}%${ctxTokensHint}` : ""
434
- // INPUT-LOCK-ASYNC(C'——F-3):busy(processing 含 digest)状态栏提示——取代旧排队提示
435
- // (F-7 已删);F16(TUI.md §7.5)**四态分流**(queue-visible 批 2026-09-24):队列非空 ⇒
436
- // 条数段(dim 段样式 · 零注意力色对——F13 豁免 · 消费即消失);队空 ⇒ 按 busy 面分排队句
437
- // (普通 / 挂起内用户回合 = 步边界「当前步骤结束后自动发送」· 挂起内系统轮 = 轮末「本轮结束后
438
- // 优先发送」)(判据同 TUI-INPUT-BOX.md §4.1;面感知 = `agent._inAutoTurn` 活读)。
439
- const queuedN = state.pendingInput?.length ?? 0
440
- const enterHint = state.processing
441
- ? (queuedN > 0 ? `已排队 ${queuedN} 条消息`
442
- : state.suspended || state._suspPending
443
- ? (agent._inAutoTurn === true
444
- ? `会话内回合处理中 — Enter 排队(本轮结束后优先发送)`
445
- : `会话内回合处理中 — Enter 排队(当前步骤结束后自动发送)`)
446
- : `主会话处理中 — Enter 排队(当前步骤结束后自动发送)`)
447
- : "Enter: send"
448
- // LEDGER-SURFACE(§2.30.3.3/§2.30.3.4):L1 常驻标记——状态段簇尾(scrollHint 后、键位组前);
449
- // 空标记零注入(半态逐字节等价——同 :233-238 纪律);warn = 当前项目老化 > 0(警示色段包裹)
450
- const lg = state.ledger
451
- const ledgerHint = lg?.marker
452
- ? ` │ ${lg.warn ? `${ansi.reset}${C.warn}${lg.marker}${ansi.reset}${ansi.dim}` : lg.marker}`
453
- : ""
454
- // timer 可见面(`docs/cli/design/TUI.md` §7.6 · timer-wake 批 2026-09-27):状态段簇尾(ledgerHint 后、
455
- // titleHint 前)——取值 = `agent._pendingTimers` 活读(每帧 recompute / 零缓存副本 / 不显倒计时);
456
- // 零在途 ⇒ 零注入(负向锁——半态逐字节等价);到期态(任一在途项已过期未送达)⇒ 同段警示色。
457
- const timers = agent._pendingTimers ?? []
458
- const timerHint = timers.length === 0 ? "" : ` │ ${timers.some((t) => t.expiresAt <= Date.now()) ? `${ansi.reset}${C.warn}⏰${timers.length}${ansi.reset}${ansi.dim}` : `⏰${timers.length}`}`
459
- // D8(2026-09-21 块标题行对齐批——会话标题常显 · `docs/cli/design/TUI.md` §7.4):状态段簇尾
460
- // (ledgerHint 后、键位组前);取值 = `agent.title` 活读(每帧 recompute)· 40 列截断。
461
- // B6 消(#677):空白 ⇒ 回退链值(对位 VSC 顶栏——生成前 ∕ 失败期两端同值;值逐字,行级超宽走 statusMax)。
462
- const titleRaw = typeof agent.title === "string" ? agent.title.trim() : ""
463
- const titleShown = titleRaw ? (stringWidth(titleRaw) > 40 ? sliceByWidth(titleRaw, 39) + "…" : titleRaw) : sessionTitleFallback(agent)
464
- const titleHint = ` │ ${titleShown}`
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 "" }
487
- }
@@ -11,6 +11,7 @@ import {
11
11
  foldTailLines, isExpanded, renderBlockTimeline, renderExpandedBlock, renderFoldedHead, renderMathAndMarkdown,
12
12
  } from "./fold-block.mjs"
13
13
  import { SUBAGENT_ROLES } from "./subagent-blocks.mjs"
14
+ import { t } from "@thincoder/core/i18n.mjs" // 可见终结词面单源(SESSION.md §6.26):冻结头动词键——t() 出词(零自铸字面)
14
15
 
15
16
  const _toolSegCache = new WeakMap()
16
17
  const _frozenSubCache = new WeakMap()
@@ -67,6 +68,14 @@ export function toolSeg(state, l, i, cols, maxRows) {
67
68
  return rows
68
69
  }
69
70
 
71
+ /** done 面注记整形(#1188——跨端同式:空白折叠 + 140 上限;核件标尺 = `subblocks/activity-view.mjs`):
72
+ * 折叠后为空 ⇒ 零注记(负向锁——逐字节等价)。 */
73
+ function noteSuffix(note) {
74
+ const flat = typeof note === "string" ? note.replace(/\s+/g, " ").trim() : ""
75
+ if (flat === "") return ""
76
+ return ` — ${flat.length > 140 ? flat.slice(0, 139) + "…" : flat}`
77
+ }
78
+
70
79
  /** 冻结子agent 活动块渲染(docs/cli/design/TUI.md §6.8 D4):state.lines 载体 {_frozenSubTask: sub}(subagent-blocks.mjs
71
80
  * freezeSubTaskLines 推入)。折叠 = 身份头 + tail 3;展开 = 共享组件(60% 屏幕封顶 + 底部可达
72
81
  * 折叠控制)。折叠键 `sub-${key}`——与运行中面板区块同键,折叠态跨冻结边界无缝延续。
@@ -85,18 +94,20 @@ function frozenSubTaskLines(state, sub, cols, maxRows) {
85
94
  : ""
86
95
  const modelPart = sub.model ? ` · ${sub.model}` : ""
87
96
  const turnPart = sub.maxTurns > 0 ? ` · turn ${sub.turn}/${sub.maxTurns}` : ""
88
- const errPart = sub.lastError ? ` — ${sub.lastError}` : ""
89
97
  // 图标三态互斥(2026-09-20 端差·显示面消差批 M5):修前 stopped 冻结头 `✓` 与 verb 相抵
90
- // ⇒ 补齐 VSC `webview/activity-view.js:46-49` 已成的 cancelled → `⏹` 形态(VSC 标尺;#821 起
98
+ // ⇒ 补齐 VSC `webview/activity-view.js` 已成的 cancelled → `⏹` 形态(VSC 标尺;#821 起
91
99
  // error 面同归 `⏹`——见下)。
92
- // #821(跨端显示面差归一 · 2026-10-10):错误面并入 `⏹`(`errored` 事实两路同判——冻结单点 ∥
93
- // 合成件);verb 三词 stopped/error/done;错误面注记移出括号——与核件 `subblocks/activity-view.mjs:88-91`
94
- // 同形 `[…] — <err>`;stopped ∥ done ∥ queued 三面注记位逐字不变(负控)。
95
100
  const errored = sub.errored === true
96
101
  const icon = sub.approval ? "⏸" : (sub.stopped || errored) ? "⏹" : "✓"
97
- const verb = sub.stopped ? "stopped" : errored ? "error" : "done" // AGENT-LOOP-SUBAGENT.md §6.7.2: cancel 冻结标题 "stopped"
98
- const head = `[${icon} ${sub.key}${modePart}${modelPart} · ${verb} ${elapsed}s${turnPart}`
99
- const header = errored ? `${head}]${errPart}` : `${head}${errPart}]`
102
+ const verb = sub.stopped ? t("sub.stopped") : errored ? t("sub.error") : t("sub.done") // AGENT-LOOP-SUBAGENT.md §6.7.2: cancel 冻结标题 "stopped"(SESSION.md §6.26 词面单源——en 缺省逐字 = stopped/error/done)
103
+ const head = `[${icon} ${sub.key}${modePart}${modelPart} · ${verb} ${elapsed}s${turnPart}]`
104
+ // 注记整形(#1175 ∥ #1188 · SESSION.md §6.26 注记整形单源;核件标尺 = `thincoder-render-core/subblocks/activity-view.mjs`):
105
+ // ① error 面 = 尾接 ` — <error>`(过 `noteSuffix`——空白折叠 + trim + 140 上限,随本批由「原串·零折叠零截断」收正);
106
+ // ② done 面 = 尾接 ` — <note>`(同过 `noteSuffix`——error ∥ done 两类注记同式);
107
+ // ③ stopped 面 = **零注记**(原因词与 verb 重复——对齐核件 `cancelled` 面)。
108
+ const header = errored ? `${head}${noteSuffix(sub.lastError)}`
109
+ : sub.stopped ? head
110
+ : `${head}${noteSuffix(sub.note)}`
100
111
  const out = []
101
112
  if (isExpanded(state, foldKey)) {
102
113
  // Expanded: shared component renders blank + ▼ control + full timeline,
@@ -0,0 +1,202 @@
1
+ /**
2
+ * secret-prompt.mjs — CLI 面 SSH 凭据窗(SSH-SESSION 批 · 台账 #1436 · CLI 腿)。
3
+ *
4
+ * 设计单源 = `docs/core/design/TOOLS.md` §6.22:⑧ 三端弹窗载荷(`ctx.onSecretInput`)∥ ⑦ 凭据零入
5
+ * 上下文 ∥ ⑨ 非密字段预填。先例 = `ask-steps.mjs`(掩码回显 `maskEcho` 直取 ∥ 掩码步值零留存)∥
6
+ * `question.mjs` 无 UI 抛例(无 UI ⇒ 可读错误句——不挂起、不静默)。
7
+ *
8
+ * 面形态(模态族第四支——overlay 支 ∥ 键面序 2c):`state.secretPrompt` =
9
+ * { kind, sessionId, host, user, port, keys, fields, index, values, lines, scroll }
10
+ * 步进 = 一屏一字段(Enter 推进 / 末步提交 ∥ Esc 整窗取消);当前字段原文住输入框 `state.input`
11
+ * (同 `/team login` 掩码步口径——显示层变换,提交值取 `state.input` 原数组)。**值零留面体态**:
12
+ * 掩码字段值提交即交本档字段决议(`_resolveField` 一字段一决议)——不入 `state.secretPrompt` ∥
13
+ * 不入对话行 ∥ 不入日志(NS4);提交后输入框即清(面退场同清)。非密字段(user 类)留 `face.values`
14
+ * 供上下文行回显(形同 `teamAskLines` 已填行)。
15
+ * 无 UI(`onSecretInput` 未注入 ∥ ACP 通道):`refuseSecretInput()` 抛 `SECRET_NO_UI_TEXT`(核字典
16
+ * `ssh.no_ui` 投影——端零字面副本)——ACP 面经 `src/acp.mjs` 取本件(单源一档;工具本体不剔除
17
+ * ——密钥 / agent 径照常)。
18
+ * 词面 = i18n 键端投影(`t(key, vars)` 插值载荷三值 `host` / `user` / `port`;字段标签
19
+ * `ssh.field.<name>` 缺键回退原名——同批三端(VSC / 桌面 `fieldWord`)同式)。
20
+ */
21
+ import { ansi, C } from "./ansi.mjs"
22
+ import { t } from "@thincoder/core/i18n.mjs"
23
+
24
+ /** 无 UI 可读句(失败句 + 指引——设计 §6.22 ⑧/E6):**核字典投影**(键 `ssh.no_ui`——单源一档;
25
+ * 端零字面副本)。CLI 无交互面 ∥ ACP 通道共此一句。 */
26
+ export const SECRET_NO_UI_TEXT = t("ssh.no_ui")
27
+
28
+ /** 载荷无字段(成形外——核侧不产):可读句同族拒绝(fail-closed——不静默交空值)。 */
29
+ const SECRET_MALFORMED_TEXT = "ssh credential request carries no fields (malformed payload)"
30
+
31
+ /** 整窗取消哨兵(面内私有——与用户输入值不同域:空串是非必填字段的合法值)。 */
32
+ const CANCELLED = Symbol("secret-prompt-cancelled")
33
+
34
+ /** 无 UI 拒绝(`onSecretInput` 契约的失败面):同步抛——调用方(核工具)取回可读错误。 */
35
+ export function refuseSecretInput() {
36
+ throw new Error(SECRET_NO_UI_TEXT)
37
+ }
38
+
39
+ /** 面标题(overlay 标题行左段):`keys.title` = i18n 键(核字典 + 端投影——`t(key, vars)` 插值)。
40
+ * 键位缺(防御)⇒ `"Secret"`。 */
41
+ export function secretPromptTitle(face) {
42
+ const text = secretKeyText(face?.keys?.title, secretVars(face))
43
+ return text !== "" ? text : "Secret"
44
+ }
45
+
46
+ /** 当前字段(步位)。 */
47
+ export function secretCurrentField(face) {
48
+ return face?.fields?.[face.index ?? 0] ?? null
49
+ }
50
+
51
+ /** 掩码判据(显示层:`layout.mjs` 输入框 buf 构造消费——与 `askMaskActive` 同位,各面各判据)。 */
52
+ export function secretMaskActive(state) {
53
+ const face = state?.secretPrompt
54
+ return face != null && secretCurrentField(face)?.masked === true
55
+ }
56
+
57
+ /** 目标投影(`[user@]host[:port]`——三段皆缺 ⇒ `""`;缺一段省一段)。 */
58
+ export function secretTargetText(face) {
59
+ const host = typeof face?.host === "string" ? face.host.trim() : ""
60
+ const user = typeof face?.user === "string" ? face.user.trim() : ""
61
+ const port = face?.port
62
+ if (host === "") return user
63
+ const portPart = port === null || port === undefined || port === "" ? "" : `:${port}`
64
+ return `${user === "" ? "" : `${user}@`}${host}${portPart}`
65
+ }
66
+
67
+ /** 面体行(overlay 契约 `{ lines, scroll }`):目标行 ∥ 核 prompt 投影行(dim 上下文行族)∥ 已填
68
+ * 非密字段行(掩码值恒不示)∥ 当前字段问句行(bold)∥ 输入提示行(同 `teamAskLines` 行形)。
69
+ * 字段标签 = `ssh.field.<name>` 端投影(缺键回退原名——同批三端同式)。 */
70
+ export function secretPromptFaceLines(face) {
71
+ const lines = []
72
+ const target = secretTargetText(face)
73
+ if (target !== "") lines.push({ text: ` ${target}`, color: C.dim })
74
+ const prompt = secretKeyText(face?.keys?.prompt, secretVars(face))
75
+ if (prompt !== "") lines.push({ text: ` ${prompt}`, color: C.dim })
76
+ for (const f of face.fields ?? []) {
77
+ if (f?.masked === true) continue
78
+ const v = face.values?.[f.name]
79
+ if (typeof v === "string" && v !== "") lines.push({ text: ` ${fieldWord(f.name)}: ${v}`, color: C.dim })
80
+ }
81
+ const field = secretCurrentField(face)
82
+ if (field) lines.push({ text: ` \u276f ${fieldWord(field.name)}:`, color: ansi.bold + C.text })
83
+ lines.push({ text: " (type in input box below)", color: C.dim })
84
+ return lines
85
+ }
86
+
87
+ /** 步入场:当前字段行 + 输入框预填(**仅非掩码字段**——密码零预填(设计 ⑨);掩码步恒空)。 */
88
+ function enterSecretField(ctx, face, index) {
89
+ const { state } = ctx
90
+ const field = face.fields[index]
91
+ face.index = index
92
+ face.lines = secretPromptFaceLines(face)
93
+ const prefill = field?.masked === true ? "" : String(field?.prefill ?? "")
94
+ state.input = [...prefill]
95
+ state.cursor = state.input.length
96
+ ctx.render()
97
+ }
98
+
99
+ /** Enter(键面转口):当前字段决议。必填且空 ⇒ 驻留(零推进零提交——零新文案);取值口径同
100
+ * `/team login`:掩码字段原样(密码零裁剪)∥ 非掩码字段 trim(账号 / 地址同族)。 */
101
+ export function secretPromptSubmit(ctx) {
102
+ const { state } = ctx
103
+ const face = state.secretPrompt
104
+ const field = secretCurrentField(face)
105
+ const resolve = face?._resolveField
106
+ if (field == null || typeof resolve !== "function") return
107
+ const raw = state.input.join("")
108
+ const value = field.masked === true ? raw : raw.trim()
109
+ if (field.required === true && value === "") return
110
+ face._resolveField = null
111
+ resolve(value)
112
+ }
113
+
114
+ /** Esc(键面转口):整窗取消——面退场 + 输入框归还(清空 + 光标归零)+ 字段决议交哨兵;零行
115
+ * (同 `/team login` 口径——零新文案;工具面自出可读句)。 */
116
+ export function secretPromptCancel(ctx) {
117
+ const { state } = ctx
118
+ const face = state.secretPrompt
119
+ if (face == null) return
120
+ state.secretPrompt = null
121
+ state.input = []
122
+ state.cursor = 0
123
+ const resolve = face._resolveField
124
+ face._resolveField = null
125
+ if (typeof resolve === "function") resolve(CANCELLED)
126
+ ctx.render()
127
+ }
128
+
129
+ /** 开窗(`onSecretInput` 的 CLI 面实现——`interaction.mjs` `askSecretInput` 直取):
130
+ * `Promise<{<name>:<值>} | null>`——提交 = 值映射(字段序)∥ 取消 = null。 */
131
+ export async function runSecretPrompt(ctx, payload) {
132
+ const fields = normalizeSecretFields(payload)
133
+ if (fields.length === 0) throw new Error(SECRET_MALFORMED_TEXT)
134
+ const { state } = ctx
135
+ const face = {
136
+ kind: payload?.kind ?? null,
137
+ sessionId: payload?.sessionId ?? null,
138
+ host: payload?.host ?? null,
139
+ user: payload?.user ?? null,
140
+ port: payload?.port ?? null,
141
+ keys: payload?.keys ?? null,
142
+ fields,
143
+ index: 0,
144
+ values: {}, // 非密字段已填值(上下文行回显——掩码值恒不入)
145
+ lines: [],
146
+ scroll: 0, // overlay 契约位(layout/renderPicker 读)
147
+ }
148
+ const out = {}
149
+ for (let i = 0; i < fields.length; i++) {
150
+ state.secretPrompt = face
151
+ const value = await new Promise((resolve) => {
152
+ face._resolveField = resolve
153
+ enterSecretField(ctx, face, i)
154
+ })
155
+ if (value === CANCELLED || state.secretPrompt !== face) return null
156
+ out[fields[i].name] = value
157
+ if (fields[i].masked !== true) face.values[fields[i].name] = value
158
+ // 提交值已取走 ⇒ 输入框即清(掩码步零留存;非掩码步下一步自预填)
159
+ state.input = []
160
+ state.cursor = 0
161
+ }
162
+ state.secretPrompt = null
163
+ ctx.render()
164
+ return out
165
+ }
166
+
167
+ /** 载荷字段归一(成形外条目丢弃——空集 ⇒ `runSecretPrompt` 拒绝)。 */
168
+ function normalizeSecretFields(payload) {
169
+ const raw = Array.isArray(payload?.fields) ? payload.fields : []
170
+ return raw
171
+ .filter((f) => f != null && typeof f.name === "string" && f.name !== "")
172
+ .map((f) => ({
173
+ name: f.name,
174
+ masked: f.masked === true,
175
+ required: f.required === true,
176
+ prefill: typeof f.prefill === "string" ? f.prefill : "",
177
+ }))
178
+ }
179
+
180
+ /** i18n 键投影(词面单源 = 核字典——`t(key, vars)` 插值;缺键回键名本身、不抛;非字符串键 ⇒ 零文本)。 */
181
+ function secretKeyText(key, vars) {
182
+ return typeof key === "string" && key !== "" ? t(key, vars) : ""
183
+ }
184
+
185
+ /** 插值面(沿同批三端同式:载荷三值 `host` / `user` / `port`;缺值不传——不让 `${port}` 落成 `"null"`)。 */
186
+ function secretVars(face) {
187
+ const vars = {}
188
+ for (const name of ["host", "user", "port"]) {
189
+ const v = face?.[name]
190
+ if (v !== null && v !== undefined && v !== "") vars[name] = v
191
+ }
192
+ return vars
193
+ }
194
+
195
+ /** 字段标签词(端投影——与 VSC `secret-input.js` / 桌面 `secret-prompt.mjs` `fieldWord` 同式):
196
+ * `ssh.field.<name>` 命中 ⇒ 该词;缺键 ⇒ 字段原名(不空标)。 */
197
+ function fieldWord(name) {
198
+ const raw = String(name ?? "")
199
+ const key = `ssh.field.${raw}`
200
+ const word = t(key)
201
+ return word === key ? raw : word
202
+ }
@@ -37,6 +37,8 @@ import { handleFoldCommand } from "./cmd-fold.mjs"
37
37
  import { handleUndoCommand } from "./cmd-undo.mjs"
38
38
  import { handleEngCommand } from "./cmd-eng.mjs"
39
39
  import { handleTeamCommand } from "./cmd-team.mjs" // 团队登录(登录面补全批——/team login ∥ logout ∥ status)
40
+ // 派生条目隐藏判据单源(TEAM.md §2.4——#1223:/model·/submodel Tab 补全面过滤)
41
+ import { isDerivedProviderHidden } from "./provider-admin.mjs"
40
42
 
41
43
  export const SLASH_COMMANDS = [
42
44
  { name: "/plan", group: "Agent", desc: "toggle plan mode (design first, then implement)" },
@@ -148,10 +150,10 @@ export function createSlashCommands(ctx) {
148
150
  const head = parts.slice(0, -1).join(" ")
149
151
  const argIndex = parts.length - 2 // which parameter is being typed (0-based)
150
152
  const match = (cands) => cands.filter((c) => c.startsWith(last)).map((c) => `${head} ${c}`)
151
- if (cmd === "/model" && argIndex === 0) return match(agent.providers.map((p) => p.name))
153
+ if (cmd === "/model" && argIndex === 0) return match(agent.providers.filter((p) => !isDerivedProviderHidden(p)).map((p) => p.name)) // 派生无 key ⇒ 隐藏(TEAM.md §2.4)
152
154
  if (cmd === "/submodel") {
153
155
  if (argIndex === 0) return match(["explore", "plan", "coder", "eng-coder", "eng-designer", "reset"])
154
- if (parts[1] && !["reset"].includes(parts[1]) && argIndex === 1) return match(agent.providers.map((p) => p.name))
156
+ if (parts[1] && !["reset"].includes(parts[1]) && argIndex === 1) return match(agent.providers.filter((p) => !isDerivedProviderHidden(p)).map((p) => p.name)) // 派生无 key ⇒ 隐藏(TEAM.md §2.4)
155
157
  }
156
158
  if (cmd === "/think") {
157
159
  if (argIndex === 0) return match(["on", "off", "effort"])