thincoder 0.12.74 → 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 +11 -0
  2. package/README.md +6 -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
@@ -0,0 +1,197 @@
1
+ /**
2
+ * status-line.mjs — 状态栏族(2026-10-15 · car2 批 · 台账 #1437 自 `render-frame.mjs` 拆出):
3
+ * `SLASH_HINTS` ∥ `QUIET_MS` ∥ `attentionKind` ∥ `renderStatus` ∥ `buildStatusLine` ∥
4
+ * `sessionTitleFallback` ∥ `teamSegmentHint` ∥ `teamServerHost`。
5
+ * 拆分 = 结构零语义(render-frame.mjs 495 近线 ⇒ 拆后两档均 <500):函数体逐字随迁,仅 import 面
6
+ * 归位;导出面(`QUIET_MS` ∥ `attentionKind` ∥ `renderStatus`)经 render-frame.mjs 转发再出口——
7
+ * 既有 import 面零破坏;render-frame 自引 `renderStatus`(renderRows 状态行 put)。
8
+ * 语义单源:停滞轻显形 = `docs/cli/design/TUI.md` §7.7 ∥ 注意力态 = §14.3 ∥ 团队状态段 = §7.8 ∥
9
+ * timer 段 = §7.6 ∥ D8 会话标题 = §7.4 ∥ LEDGER-SURFACE = `docs/core/design/SESSION.md` §2.30.3。
10
+ */
11
+ import { ansi, C } from "./ansi.mjs"
12
+ import { sliceByWidth, stringWidth } from "./render.mjs"
13
+ import { providerSpec } from "@thincoder/core/config.mjs"
14
+ import { t } from "@thincoder/core/i18n.mjs" // 停滞轻显形(TUI.md §7.7):句式键 status.quiet——词面单源(CLI 直取)
15
+ import { isRealUserMsg } from "@thincoder/core/history-window.mjs" // B6 回退链:首条真实 user 消息谓词(纯件单源)
16
+ import { isYesNoModal } from "./interaction.mjs" // X8 跟进①:y/n-only 族判据单源
17
+
18
+ // ---------- status bar slash-command hints ----------
19
+ const SLASH_HINTS = {
20
+ "/config": "open config menu",
21
+ "/model": "select model & manage providers",
22
+ "/think": "open thinking mode menu",
23
+ "/mcp": "open MCP management menu",
24
+ "/goal": "open goal management menu",
25
+ "/session": "select archived session",
26
+ "/restore": "select checkpoint to restore",
27
+ }
28
+
29
+ // ---------- 停滞轻显形阈值(docs/cli/design/TUI.md §7.7 · stall-indicator 批 2026-09-29)----------
30
+ /** 静默显示阈值(毫秒)——静默 ≥ 本值才注入读数(首显值 = 10s);跳秒 = 既有 1s 拍
31
+ * (agent-turn ticker——零新定时器);三端同值(VSC ∕ 桌面各自持有常量面)。 */
32
+ export const QUIET_MS = 10_000
33
+
34
+ /** 第 33 批(TUI §14.3(a)——纯函数派生,无副作用):blocked = 审批/提问卡挂起(实时派生,
35
+ * 提示消解即消失);awaiting = 回合结束等待输入(链尾置位——processing / 挂起两态期间不派生)。
36
+ * @returns {"blocked"|"awaiting"|null} */
37
+ export function attentionKind(state) {
38
+ // SSH 凭据窗(SSH-SESSION 批 §6.22 ⑧):与审批/提问同族——回合被用户面阻塞(chip 显「等待你的回答」)
39
+ if (state.permission || state.question || state.secretPrompt) return "blocked"
40
+ if (state.attentionAwaiting && !state.processing && !state.suspended && !state._suspPending) return "awaiting"
41
+ return null
42
+ }
43
+
44
+ /** Status bar (always 1 line). */
45
+ export function renderStatus(state, agent, cols, slashCommands) {
46
+ const statusLine = buildStatusLine(state, agent, { cols, slashCommands })
47
+ const autoBanner = agent.autoApprove ? `${C.warn} AUTO${ansi.reset}${ansi.dim}│` : ""
48
+ const planBanner = agent.planMode ? `${C.tool} PLAN${ansi.reset}${ansi.dim}│` : ""
49
+ const advisorBanner = agent.config?.advisor?.guard === true ? `${C.advisor} ADVISOR${ansi.reset}${ansi.dim}│` : ""
50
+ const engBanner = agent.config?.agent?.engineering ? `${C.advisor} ENG${ansi.reset}${ansi.dim}│` : ""
51
+ const bannerPrefix = (agent.planMode ? " PLAN│ " : "") + (agent.autoApprove ? " AUTO│ " : "") + (agent.config?.advisor?.guard === true ? " ADVISOR│ " : "") + (agent.config?.agent?.engineering ? " ENG│ " : "")
52
+ // 第 33 批(TUI §14.3(b)/(c)):attention 态 = chip 行首 + 整行注意力色对包裹(blocked >
53
+ // awaiting;blocked 内 permission > question——与按键分发优先级同序);平态零注入。
54
+ const kind = attentionKind(state)
55
+ const chip = kind === "blocked" ? (state.permission ? "⚠ 等待你的审批" : "⚠ 等待你的回答")
56
+ : kind === "awaiting" ? "⚠ 等待你的输入" : ""
57
+ const attentionPad = chip ? `${chip} │ ` : ""
58
+ // 宽度预算(N9④):chip 占位计入——整行仍 ≤ cols − 1(既有口径)。
59
+ const statusMax = cols - 1 - (bannerPrefix ? stringWidth(bannerPrefix) : 0) - (attentionPad ? stringWidth(attentionPad) : 0)
60
+ const inner = `${ansi.dim}${planBanner}${autoBanner}${advisorBanner}${engBanner}${sliceByWidth(statusLine, Math.max(10, statusMax))}`
61
+ // 负向锁(§14.3):attention 为 null ⇒ 半态路径逐字节等价(不经包裹 / 零字节注入)。
62
+ if (!chip) return `${inner}${ansi.reset}`
63
+ // 底色存活(§14.3):既有内容含内部 ansi.reset(banner / ctx 警示段)——每次内部复位后
64
+ // 重施加注意力色对,再整体包裹(内容零省略)。
65
+ return `${C.attention}${(chip + " │ " + inner).replaceAll(ansi.reset, ansi.reset + C.attention)}${ansi.reset}`
66
+ }
67
+
68
+ /** 标题回退链(B6 消 · #677——对位 VSC `panel-session.mjs` 链值 `title → "firstMessage" → "(empty)"`;
69
+ * 截断逐字同该链 `truncate(s, 40)`——生成前 ∕ 失败期两端同值)。首条真实 user 消息 = 活读单源:
70
+ * 绑定态取槽摘要字段(`counters().firstMessage`——与 VSC `listSlots` 同字段);未绑定回退内存人读线。 */
71
+ function sessionTitleFallback(agent) {
72
+ const fm = (agent?._recordStore?.counters?.().firstMessage ?? "")
73
+ || (agent?._fullHistory ?? agent?.history ?? []).find(isRealUserMsg)?.content
74
+ if (typeof fm !== "string" || fm === "") return "(empty)"
75
+ return `"${fm.length <= 40 ? fm : fm.slice(0, 39) + "…"}"`
76
+ }
77
+
78
+ function buildStatusLine(state, agent, { cols, slashCommands }) {
79
+ const scrollHint = state.scroll > 0 ? ` │ scrolled ${state.scroll}` : ""
80
+ const rawInput = state.input.join("")
81
+
82
+ if (state.question) {
83
+ const q = state.question
84
+ return q.options.length > 0
85
+ ? " ↑↓: select │ Enter: confirm │ Esc: cancel"
86
+ : " Type answer then Enter │ Esc: cancel"
87
+ }
88
+ if (state.permission) {
89
+ if (isYesNoModal(state.permission.name)) {
90
+ return state.permission.name === "continue" ? " y: continue │ n: stop" : " y: retry │ n: stop"
91
+ }
92
+ if (state.permission.batch) return " a: approve all │ o: one by one │ n: deny"
93
+ return " y: approve │ n: deny │ a: approve all (AUTO)"
94
+ }
95
+ if (state.picker) return " type: filter │ ↑↓/PgUp/PgDn: select │ Enter: confirm │ Esc: cancel"
96
+ // 团队问句面(模态族第三支——登录面补全批):主键面 = Esc 取消 ∥ Enter 提交(输入框编辑·零滚动)
97
+ if (state.teamAsk) return " Type then Enter │ Esc: cancel"
98
+ if (state.secretPrompt) return " Type then Enter │ Esc: cancel" // SSH 凭据窗(SSH-SESSION 批 §6.22 ⑧)
99
+ if (state.wizard) {
100
+ const w = state.wizard
101
+ // route 屏与 provider 步同为列表步;团队步焦点在回退行上时 Enter = 确认回退
102
+ if (w.step === "provider" || w.step === "route") return " ↑↓: select │ Enter: confirm │ Esc: skip"
103
+ if (w.teamFocusBack === true) return " ↑↓: select │ Enter: confirm │ Esc: cancel"
104
+ return " Type then Enter │ Esc: cancel"
105
+ }
106
+ if (rawInput.startsWith("/") && !state.processing && !state.permission) {
107
+ const [cmd] = rawInput.split(/\s+/)
108
+ const cmds = slashCommands.filter((c) => c.name.startsWith(cmd))
109
+ const match = cmds.length === 1 ? cmds[0] : null
110
+ if (match && SLASH_HINTS[match.name]) return ` ${match.name} ${SLASH_HINTS[match.name]}`
111
+ if (cmds.length > 0) {
112
+ if (cmds.length <= 4) return ` ${cmds.map((c) => `${c.name} ${c.desc}`).join(" │ ")}`
113
+ return ` ${cmds.map((c) => c.name).join(" ")} │ Tab complete`
114
+ }
115
+ return ` unknown command (/help for available commands)`
116
+ }
117
+
118
+ const taskHint = state.tasks.length > 0
119
+ ? ` │ ✓${state.tasks.filter((t) => t.status === "done").length}/${state.tasks.length}` : ""
120
+ const turnHint = agent._currentTurn > 0 && agent._maxTurns > 0
121
+ ? ` │ turn ${agent._currentTurn}/${agent._maxTurns}` : ""
122
+ const tk = state.tokens
123
+ const fmtK = (n) => (n >= 10000 ? `${Math.round(n / 1000)}k` : n >= 1000 ? `${(n / 1000).toFixed(1)}k` : `${n}`)
124
+ const cacheTotal = tk.cacheHit + tk.cacheMiss
125
+ const tokenHint = tk.prompt > 0
126
+ ? ` │ ↑${fmtK(tk.prompt)} ↓${fmtK(tk.completion)}${tk.reasoningTokens > 0 ? ` ✦${fmtK(tk.reasoningTokens)}` : ""}${cacheTotal > 0 ? ` hit${Math.round((tk.cacheHit / cacheTotal) * 100)}%` : ""}` : ""
127
+ const elapsed = state.processing ? ` ${Math.floor((Date.now() - state.processingStarted) / 1000)}s` : ""
128
+ const toolHint = state.currentTool ? ` ${state.currentTool}…` : ""
129
+ // 停滞轻显形(docs/cli/design/TUI.md §7.7 · stall-indicator 批 2026-09-29):显示位 = elapsed 之后;
130
+ // 静默 = 距最近一次可见输出(`state.lastOutputAt`——回合起刻为初始锚,重置点三类见 tool-events ∕
131
+ // subagent-blocks);非显示条件(未至阈值 ∕ 非在飞 ∕ 未起算)零注入(负向锁——逐字节等价);纯读数零警示色。
132
+ const lastOut = state.lastOutputAt ?? 0
133
+ const quietHint = state.processing && lastOut > 0 && Date.now() - lastOut >= QUIET_MS
134
+ ? ` ${t("status.quiet", { s: Math.floor((Date.now() - lastOut) / 1000) })}`
135
+ : ""
136
+ const statusText = state.processing ? `${state.status}${toolHint}${elapsed}${quietHint}` : state.status
137
+ // 2026-09-02 Q1(SESSION.md §6.8):provider 可为 null —— providerSpec(null) 保守 128K 不抛错
138
+ // 2026-09-02 §15:context 窗口跟随 providers[].context 覆盖(T-C6——百分比基于覆盖后的窗口)
139
+ const modelContext = providerSpec(agent.provider).context
140
+ const ctxPct = Math.round((state.ctxCache.tokens / modelContext) * 100)
141
+ const ctxTokensHint = state.ctxCache.tokens > 0 ? ` ${fmtK(state.ctxCache.tokens)}` : ""
142
+ const ctxHint = ctxPct > 0
143
+ ? ctxPct >= 80 ? ` │ ${ansi.reset}${C.warn}context ${ctxPct}%${ctxTokensHint}${ansi.reset}${ansi.dim}` : ` │ context ${ctxPct}%${ctxTokensHint}` : ""
144
+ // INPUT-LOCK-ASYNC(C'——F-3):busy(processing 含 digest)状态栏提示——取代旧排队提示
145
+ // (F-7 已删);F16(TUI.md §7.5)**四态分流**(queue-visible 批 2026-09-24):队列非空 ⇒
146
+ // 条数段(dim 段样式 · 零注意力色对——F13 豁免 · 消费即消失);队空 ⇒ 按 busy 面分排队句
147
+ // (普通 / 挂起内用户回合 = 步边界「当前步骤结束后自动发送」· 挂起内系统轮 = 轮末「本轮结束后
148
+ // 优先发送」)(判据同 TUI-INPUT-BOX.md §4.1;面感知 = `agent._inAutoTurn` 活读)。
149
+ const queuedN = state.pendingInput?.length ?? 0
150
+ const enterHint = state.processing
151
+ ? (queuedN > 0 ? `已排队 ${queuedN} 条消息`
152
+ : state.suspended || state._suspPending
153
+ ? (agent._inAutoTurn === true
154
+ ? `会话内回合处理中 — Enter 排队(本轮结束后优先发送)`
155
+ : `会话内回合处理中 — Enter 排队(当前步骤结束后自动发送)`)
156
+ : `主会话处理中 — Enter 排队(当前步骤结束后自动发送)`)
157
+ : "Enter: send"
158
+ // LEDGER-SURFACE(§2.30.3.3/§2.30.3.4):L1 常驻标记——状态段簇尾(scrollHint 后、键位组前);
159
+ // 空标记零注入(半态逐字节等价——同 :233-238 纪律);warn = 当前项目老化 > 0(警示色段包裹)
160
+ const lg = state.ledger
161
+ const ledgerHint = lg?.marker
162
+ ? ` │ ${lg.warn ? `${ansi.reset}${C.warn}${lg.marker}${ansi.reset}${ansi.dim}` : lg.marker}`
163
+ : ""
164
+ // timer 可见面(`docs/cli/design/TUI.md` §7.6 · timer-wake 批 2026-09-27):状态段簇尾(ledgerHint 后、
165
+ // titleHint 前)——取值 = `agent._pendingTimers` 活读(每帧 recompute / 零缓存副本 / 不显倒计时);
166
+ // 零在途 ⇒ 零注入(负向锁——半态逐字节等价);到期态(任一在途项已过期未送达)⇒ 同段警示色。
167
+ const timers = agent._pendingTimers ?? []
168
+ const timerHint = timers.length === 0 ? "" : ` │ ${timers.some((t) => t.expiresAt <= Date.now()) ? `${ansi.reset}${C.warn}⏰${timers.length}${ansi.reset}${ansi.dim}` : `⏰${timers.length}`}`
169
+ // D8(2026-09-21 块标题行对齐批——会话标题常显 · `docs/cli/design/TUI.md` §7.4):状态段簇尾
170
+ // (ledgerHint 后、键位组前);取值 = `agent.title` 活读(每帧 recompute)· 40 列截断。
171
+ // B6 消(#677):空白 ⇒ 回退链值(对位 VSC 顶栏——生成前 ∕ 失败期两端同值;值逐字,行级超宽走 statusMax)。
172
+ const titleRaw = typeof agent.title === "string" ? agent.title.trim() : ""
173
+ const titleShown = titleRaw ? (stringWidth(titleRaw) > 40 ? sliceByWidth(titleRaw, 39) + "…" : titleRaw) : sessionTitleFallback(agent)
174
+ const titleHint = ` │ ${titleShown}`
175
+ // 团队登录态段(登录面补全批 · `docs/cli/design/TUI.md` §7.8):簇尾末位(titleHint 后、`│ <enterHint>` 前)
176
+ const teamHint = teamSegmentHint(state.team)
177
+ return ` ${statusText}${taskHint}${turnHint}${tokenHint}${ctxHint}${scrollHint}${ledgerHint}${timerHint}${titleHint}${teamHint} │ ${enterHint} │ /: commands │ wheel/PgUp/PgDn: scroll │ Ctrl+I: inject │ Ctrl+C: exit (×2)`
178
+ }
179
+
180
+ /** 团队状态段(TUI.md §7.8——三态闭集):未登录 ⇒ `""`(**负控:零注入——整行逐字节等价**);
181
+ * 已登录 ⇒ ` │ <成员>@<主机>`(成员 = `member.name ?? member.username`;主机 = `URL.host`——不搬
182
+ * URL 全串);`verify === "invalid"` ⇒ ` │ ` + 核字典键词形(警示色包裹——同 timerHint 到期态形;
183
+ * `t()` 出词 ⇒ CLI 现渲缺省 en,沿 §7.7 同注)。成员 ∥ 主机两缺 ⇒ 零注入(防御位——不产空段)。 */
184
+ function teamSegmentHint(team) {
185
+ if (team == null || team.loggedIn !== true) return ""
186
+ if (team.verify === "invalid") return ` │ ${ansi.reset}${C.warn}${t("status.team.invalid")}${ansi.reset}${ansi.dim}`
187
+ const member = team.member?.name ?? team.member?.username ?? ""
188
+ const host = teamServerHost(team.server)
189
+ const text = member !== "" && host !== "" ? `${member}@${host}` : (member !== "" ? member : host)
190
+ return text === "" ? "" : ` │ ${text}`
191
+ }
192
+
193
+ /** 团队服务器主机名(段面只显 `<主机>`):`URL.host`(默认端口已去);不可解析 ⇒ `""`。 */
194
+ function teamServerHost(server) {
195
+ if (typeof server !== "string" || server === "") return ""
196
+ try { return new URL(server).host } catch { return "" }
197
+ }
@@ -47,11 +47,11 @@ export function computePanelBlocks(state) {
47
47
  * 先启动时 explore 完成会误冻其块)。评审 #4 路线定死:签名保留、函数体收窄为精确
48
48
  * 匹配校验——本签名无 key 参数,无从精确归属 → 恒 no-op 返 null,不再猜任何块
49
49
  * (宁可 no-op 不误冻——被否决备选"保留兜底加告警日志":冻错块是错动作,日志救不回)。
50
- * finishSubTaskKey 为唯一完成路径;roles/lastError 仅签名兼容保留(老调用面 import
50
+ * finishSubTaskKey 为唯一完成路径;roles/note 仅签名兼容保留(老调用面 import
51
51
  * 不断——误冻面归零,无 key 窗口的块由回合尾 freezeAllSubTasks 兜底清场)。
52
52
  * @returns {null} 恒 null(无精确 key 命中面——无从归属不归属)。 */
53
- export function finishSubTask(state, roles, lastError = null) {
54
- void state; void roles; void lastError // 收窄后零副作用——参数仅签名兼容
53
+ export function finishSubTask(state, roles, note = null) {
54
+ void state; void roles; void note // 收窄后零副作用——参数仅签名兼容
55
55
  return null
56
56
  }
57
57
 
@@ -61,15 +61,18 @@ export function finishSubTask(state, roles, lastError = null) {
61
61
  * dispatch 沿 ctx._subagentKey(relayPrefix 去尾 = `role#N`)把 key 传进 onToolResult——
62
62
  * 有 key 即精确标 done(冻结载体进流 + 删条目由调用方 freezeDoneSubTasks 承接——与
63
63
  * finishSubTask 同一契约);无匹配块(已冻结 tombstone/不存在)返回 null——调用方不得
64
- * 落启发式兜底(精确 key 无匹配 = 无从归属——不误冻他块)。 */
65
- export function finishSubTaskKey(state, key, lastError = null) {
64
+ * 落启发式兜底(精确 key 无匹配 = 无从归属——不误冻他块)。
65
+ * #1175(2026-10-15 car2 批——SESSION.md §6.26):第三参 = **非错终结注记**(`note`)——
66
+ * interrupted ∥ turn-cap ∥ stopped-by-user 三类终结写面 = `status:"done"` + `note`(与 VSC
67
+ * 写面同形);真异常不走本参(块对象 `lastError` 自携)。 */
68
+ export function finishSubTaskKey(state, key, note = null) {
66
69
  const sub = state.subTasks?.[key]
67
70
  if (!sub) return null
68
71
  sub.done = true
69
72
  sub.doneAt = Date.now()
70
73
  sub.currentTool = null
71
74
  sub.approval = null
72
- if (lastError) sub.lastError = lastError
75
+ if (note) sub.note = note
73
76
  sub.blockEpoch = (sub.blockEpoch ?? 0) + 1
74
77
  return sub
75
78
  }
@@ -91,6 +94,8 @@ export function freezeSubTaskLines(state, sub, anchor = undefined) {
91
94
  // #821(跨端显示面差归一 · 2026-10-10):冻结单点补**错误面事实**(与写面 status 推导同式——
92
95
  // lifecycle-records.mjs `subagentRecord` `stopped ? stopped : lastError ? error : done`):非停止 ∧
93
96
  // 携 lastError ⇒ errored(显示面 `⏹` + `error` + 括号外注记;重建面 errored 同判 = `synthSubTask`)。
97
+ // #1175(car2 批):lastError 自此 = **真异常**专属面(非错终结三类——interrupted ∥ turn-cap ∥
98
+ // stopped-by-user——已改道 `note`——§6.26 判据①/②);本判据字面零改、语义随载体收窄。
94
99
  // 显示层瞬时事实(随冻结块对象生存)——记录形 ∥ 载荷零触(记录 status 仍由上式推导)。
95
100
  if (!sub.stopped && sub.lastError) sub.errored = true
96
101
  state._frozenSubKeys ??= new Set()
@@ -132,7 +137,7 @@ export function shiftFreezeAnchors(state, removedCount) {
132
137
  /** 存活查询(P0-a/P0-b 共用单点——与墓碑写点 `freezeSubTaskLines` 同址:墓碑条件 /
133
138
  * 墓碑写入 / 载体行增删单一权威)。key 形 = `role#id`(`_frozenSubKeys` / `subTasks`
134
139
  * 同命名空间);**存活判据(逐字 = §6.8.3.3)**:**条目在池 ∧ `entry.done !== true` ∧
135
- * `entry.cancelled !== true`(running/queued)**(判据先例 = `thincoder-core/agent-tools/async-discard.mjs:55`
140
+ * `entry.cancelled !== true`(running/queued)**(判据先例 = `thincoder-core/agent-tools/async-discard.mjs`
136
141
  * ——零新谓词;仅「键在池内」会把 done-in-pool 误判为存活)。
137
142
  * 映射(写死 = §6.8.3.3):最后 `#` 切分 → role + id;命中 = `pool.has(String(id))` ∧
138
143
  * `entry.role === role`;非池键(`compress#N` 等)恒 false(维持既有丢弃语义)。
@@ -149,7 +154,7 @@ export function livePoolHas(state, key) {
149
154
  const id = k.slice(i + 1)
150
155
  for (const pool of [agent._asyncSubagents, agent._asyncAdvisors]) {
151
156
  if (!(pool instanceof Map)) continue
152
- const entry = pool.get(id) // 池键 = String(id)(subagent-run.mjs:187 / advisor-async.mjs:410)
157
+ const entry = pool.get(id) // 池键 = String(id)(subagent-run.mjs / advisor-async.mjs)
153
158
  if (!entry || entry.role !== role) continue
154
159
  if (entry.done === true || entry.cancelled === true) continue // 已终态(含 done-in-pool)
155
160
  return true
@@ -197,7 +202,8 @@ export function freezeDoneSubTasks(state) {
197
202
 
198
203
  /** 回合尾/挂起退出清扫(runAgentTurn finally / suspensionSession finally):冻结全部
199
204
  * 剩余块——中断(Ctrl+C/错误)不留下钉住输入框的 ghost;未 done 者
200
- * lastError="interrupted"(Ready 态跳过)。AGENT-LOOP-ASYNC-POOL.md §6.8:挂起自然退出时本函数只兜底
205
+ * 记 note="interrupted"(非错终结 ⇒ 写面 done+note——SESSION.md §6.26 判据①;Ready 态跳过)。
206
+ * AGENT-LOOP-ASYNC-POOL.md §6.8:挂起自然退出时本函数只兜底
201
207
  * **未消化残项**(已消化块由 freezeReclaimDigestedBlocks 逐条先行回收——块回收与
202
208
  * 池空解耦)。锚点降序同 freezeDoneSubTasks(挂起期 settle 锚点交错批次各按其
203
209
  * settle 位置落位)。
@@ -213,7 +219,7 @@ export function freezeAllSubTasks(state) {
213
219
  if (!sub.done) {
214
220
  sub.done = true
215
221
  sub.doneAt = Date.now()
216
- if (!sub.lastError && state.status !== "Ready") sub.lastError = "interrupted"
222
+ if (!sub.lastError && !sub.note && state.status !== "Ready") sub.note = "interrupted"
217
223
  }
218
224
  freezeSubTaskLines(state, sub)
219
225
  delete state.subTasks[sub.key]
@@ -108,7 +108,7 @@ export async function digestTurn(ctx, upstream = false) {
108
108
  const tail = state.lines.length
109
109
  freezeStartSnapshot(state, agent, tail)
110
110
  const digestCtx = manual
111
- ? { ...ctx, askPermission: null, askBatchPermission: null, askQuestion: null }
111
+ ? { ...ctx, askPermission: null, askBatchPermission: null, askQuestion: null, askSecretInput: null }
112
112
  : ctx
113
113
  const d0 = Date.now()
114
114
  logEvent("digest:start", { pendingN: pend0, ...(upstream ? { upstream: true } : {}) })
@@ -159,7 +159,7 @@ function driveTurn(ctx, item, opts = {}) {
159
159
  }
160
160
 
161
161
  /** 取项缝(核 `ctx.takeInput`——缺省 shift):按合并计划取批 + 消费回执行(TUI.md §7.5);
162
- * `/cmd` 首动作 = 不可达支(斜杠 busy 禁发——`key-handler-busy.mjs:24` ∕ `key-handler-edit.mjs:59`
162
+ * `/cmd` 首动作 = 不可达支(斜杠 busy 禁发——`key-handler-busy.mjs` ∕ `key-handler-edit.mjs`
163
163
  * 双门禁)⇒ null 零动作(条目不消费,落核第 2 步)。 */
164
164
  function takeTurnInput(ctx, queue) {
165
165
  const action = planQueuedInput(queue)[0]
@@ -24,7 +24,7 @@ export function timerWakeArmed(agent) {
24
24
  }
25
25
 
26
26
  /** 触发落流形态(TUI.md §7.6):逐字 = 系统提醒原文;三行 + 省略号上限同既有提醒镜像口径
27
- * (`tool-events.mjs:434-441`,`REMINDER_CAP` 单源)。 */
27
+ * (`tool-events.mjs`,`REMINDER_CAP` 单源)。 */
28
28
  export function reminderDisplay(text) {
29
29
  const lines = String(text).split("\n")
30
30
  return lines.length > REMINDER_CAP ? lines.slice(0, REMINDER_CAP).join("\n") + "\n…" : text
@@ -29,6 +29,8 @@ import {
29
29
  // 第 27 批:前缀正则换名 + import 源改文法模块(纯换名——语义零改)。
30
30
  import { RELAY_PREFIX_RE } from "@thincoder/core/agent/relay-prefix.mjs"
31
31
  import { TURN_CAP_MARK, STOPPED_MARK } from "@thincoder/core/agent/spawn-child.mjs"
32
+ // SSH 凭据窗无 UI 拒件(SSH-SESSION 批 §6.22 ⑧/E6——端面单源单句)
33
+ import { refuseSecretInput } from "./secret-prompt.mjs"
32
34
  // 批 1 CORE-DEFECT-FIXES B3:onWait 相位值域 + 文案单源(消费面禁各自枚举——PROVIDER.md §6.20)
33
35
  import { waitStatusText } from "@thincoder/core/provider/wait-status.mjs"
34
36
  // 2026-09-05 module-split:ticks/maps/sweep/slim/settle/探测/find 族迁 tool-display.mjs——
@@ -57,9 +59,9 @@ function trimOutputChars(block) {
57
59
  }
58
60
 
59
61
  /** Build the agent callbacks + the shared flushStream for one turn.
60
- * askPermission, askQuestion, saveSessionImpl } */
62
+ * askPermission, askQuestion, askSecretInput, saveSessionImpl } */
61
63
  export function buildToolCallbacks(deps) {
62
- const { agent, state, pushLine, render, scheduleRender, ensureAssistantLabel, askPermission, askBatchPermission, askQuestion, saveSessionImpl } = deps
64
+ const { agent, state, pushLine, render, scheduleRender, ensureAssistantLabel, askPermission, askBatchPermission, askQuestion, askSecretInput, saveSessionImpl } = deps
63
65
  // 行集总量对账便捷式(§5.3——冻结锚点平移交 subagent 族函数)
64
66
  const budgetSync = () => syncLineBudget(state, { onTrim: (st, n) => shiftFreezeAnchors(st, n) })
65
67
  /** Advisor 有序块累积 + 额度(§5.1 ADVISOR_TEXT_MAX_CHARS——头 32K/尾 96K/中段标记)。 */
@@ -216,15 +218,17 @@ export function buildToolCallbacks(deps) {
216
218
  // ③ subKey undefined 非错误(老回调/测试直调——成功路径未知工具)→ 不冻结
217
219
  // 任何块(CLI-ACTIVITY-DEBLOAT F-2 收窄:finishSubTask 恒 no-op——无 key
218
220
  // 无从精确归属,宁可 no-op 不误冻;块由回合尾 freezeAllSubTasks 兜底清场)。
219
- // SYNC-CANCEL(R6):⏹ 折叠报告带 STOPPED_MARK——块冻结标 stopped 而非 done
220
- // (lastError 注记 + 事件定格——兜底竞态窗口的 dispatch 精确冻路径)
221
- const lastError = result.includes(TURN_CAP_MARK) ? "turn cap reached — work may be partial" : result.includes(STOPPED_MARK) ? "stopped by user — work may be partial" : null
221
+ // SYNC-CANCEL(R6)∥ #1175(car2 批 · SESSION.md §6.26):折叠报告带 TURN_CAP_MARK /
222
+ // STOPPED_MARK ⇒ **非错终结**——写面 done + `note`(文本 = 锚常量族原文;与 VSC
223
+ // `syncNoteOf` 同串同判——真异常不走本径);块冻结标 done 走精确 key 通道
224
+ // (事件定格——兜底竞态窗口的 dispatch 精确冻路径)
225
+ const note = result.includes(TURN_CAP_MARK) ? "turn cap reached — work may be partial" : result.includes(STOPPED_MARK) ? "stopped by user — work may be partial" : null
222
226
  const hasSubKey = subKey !== undefined && subKey !== null && subKey !== ""
223
227
  if (hasSubKey) {
224
- finishSubTaskKey(state, String(subKey), lastError)
228
+ finishSubTaskKey(state, String(subKey), note)
225
229
  freezeDoneSubTasks(state)
226
230
  } else if (!isSpawnErrorResult(result)) {
227
- finishSubTask(state, SUBAGENT_ROLES, lastError)
231
+ finishSubTask(state, SUBAGENT_ROLES, note)
228
232
  freezeDoneSubTasks(state)
229
233
  }
230
234
  // CLI-ACTIVITY-DEBLOAT F-1 (2026-09-10): the conversation-stream report
@@ -245,12 +249,12 @@ export function buildToolCallbacks(deps) {
245
249
  // 失败/老回调无 subKey → 不冻结任何块(F-2 收窄——finishSubTask 恒 no-op,
246
250
  // 块由回合尾 freezeAllSubTasks 兜底清场)。
247
251
  // SYNC-CANCEL(R6):同上——escalate 路径同款扩展(sync escalate 无 registry——
248
- // 恒不折叠——扩展仅口径一致——零行为变化)
249
- const lastError = result.includes(TURN_CAP_MARK) ? "turn cap reached — work may be partial" : result.includes(STOPPED_MARK) ? "stopped by user — work may be partial" : null
252
+ // 恒不折叠——扩展仅口径一致——零行为变化;#1175:同落 note 通道)
253
+ const note = result.includes(TURN_CAP_MARK) ? "turn cap reached — work may be partial" : result.includes(STOPPED_MARK) ? "stopped by user — work may be partial" : null
250
254
  if (subKey !== undefined && subKey !== null && subKey !== "") {
251
- finishSubTaskKey(state, String(subKey), lastError)
255
+ finishSubTaskKey(state, String(subKey), note)
252
256
  } else {
253
- finishSubTask(state, ["escalate"], lastError)
257
+ finishSubTask(state, ["escalate"], note)
254
258
  }
255
259
  freezeDoneSubTasks(state)
256
260
  }
@@ -375,6 +379,10 @@ export function buildToolCallbacks(deps) {
375
379
  // the verdict string; approveAll is batch-scope only, never the AUTO flag).
376
380
  ...(askBatchPermission ? { onBatchPermissionRequest: (req) => askBatchPermission(req) } : {}),
377
381
  ...(askQuestion ? { onQuestion: (text, options) => askQuestion(text, options) } : {}),
382
+ // SSH 凭据窗(SSH-SESSION 批 §6.22 ⑧):注入面 = 交互面 askSecretInput;未注入(无人值守档 /
383
+ // headless 装配)⇒ 端面显式拒(可读句 + 指引——不挂起、不静默;核工具侧同族兜底句单源 =
384
+ // secret-prompt.mjs `SECRET_NO_UI_TEXT`)。
385
+ onSecretInput: askSecretInput ? (payload) => askSecretInput(payload) : () => refuseSecretInput(),
378
386
  // Compression lifecycle (CONTEXT-COMPACTION.md §7 D-C2): the compression session
379
387
  // renders as a subagent-style panel block — start → running panel ("Compressing
380
388
  // context…" + "summarizing N messages" + elapsed ticker), fail → error text only,
@@ -31,6 +31,7 @@ export function createTuiState({ cols, rows, agent }) {
31
31
  pendingNotice: null, // 后台更新提示:有 picker 打开时挂起,picker 全部关闭后再弹
32
32
  wizard: null, // first-launch config wizard { step, index, scroll, selectedLine, fields, error, lines }——登录面补全批:step="route" 首屏 + 团队三问步(step = server/username/password)+ `team` 字段留存 + `teamFocusBack` 回退行焦点位 + `busy` 提交闸
33
33
  teamAsk: null, // 团队问句面(会话内 `/team login`——模态族第三支): { step, fields, error, busy, scroll, lines }——cmd-team.mjs 持有;overlay 第三支 ∥ 键面序 2b ∥ modalOpen 计入
34
+ secretPrompt: null, // SSH 凭据窗(SSH-SESSION 批 · TOOLS.md §6.22 ⑧——模态族第四支): { kind, sessionId, host, user, port, keys, fields, index, values, lines, scroll }——secret-prompt.mjs 持有;overlay 第四支 ∥ 键面序 2c;掩码值零留面体态(值只走回调返回路)
34
35
  team: { loggedIn: false, member: null, server: null, label: null, verify: null }, // 团队登录态切片(TUI.md §7.8 五键)——写者 = cmd-team.mjs(启动读 ∥ `/team` 成退复读 ∥ 活校验回填);render-frame 每帧活读零缓存
35
36
  tasks: agent.tasks ?? [], // task list from task tool (progress shown in status bar); carried over on session restore, auto-collapsed when all done
36
37
  dims: makeDimsState({ cols: startupCols, rows: startupRows }), // terminal dims single source (Windows ConPTY instability, 2026-08-30) — seeded pre-raw-mode, re-sampled by event hooks only (startup retry / resize / idle watchdog)
@@ -9,7 +9,8 @@ import { pasteClipboardImage as pasteClipboardImageImpl } from "./clipboard.mjs"
9
9
  * index.mjs 在命令层之后原址回填 `turnCtx.handleSlash`。
10
10
  * @param {object} ctx
11
11
  * @returns {{ submit: Function, turn: Function, turnCtx: object, askPermission: Function,
12
- * askQuestion: Function, askBatchPermission: Function, pasteClipboardImage: Function }} */
12
+ * askQuestion: Function, askBatchPermission: Function, askSecretInput: Function,
13
+ * pasteClipboardImage: Function }} */
13
14
  export function createTurnFace(ctx) {
14
15
  const { agent, state, pushLine, pushLabel, render, ensureAssistantLabel, summarize, handleSlash, conversation } = ctx
15
16
  async function submit() {
@@ -44,7 +45,8 @@ export function createTurnFace(ctx) {
44
45
  }
45
46
 
46
47
  // Interaction primitives: permission approval + Q&A input, implemented in interaction.mjs
47
- const { askPermission, askQuestion, askBatchPermission } = createInteraction({
48
+ // (SSH-SESSION 批:`askSecretInput` = 凭据窗——同族第五件)
49
+ const { askPermission, askQuestion, askBatchPermission, askSecretInput } = createInteraction({
48
50
  agent, state, pushLine, pushLabel, render, summarize,
49
51
  })
50
52
 
@@ -54,7 +56,7 @@ export function createTurnFace(ctx) {
54
56
  // Agent loop: implemented in agent-turn.mjs
55
57
  const turnCtx = {
56
58
  agent, state, pushLine, pushLabel, render, scheduleRender: render, ensureAssistantLabel,
57
- askPermission, askQuestion, askBatchPermission, handleSlash: null,
59
+ askPermission, askQuestion, askBatchPermission, askSecretInput, handleSlash: null,
58
60
  // AGENT-LOOP-ASYNC-POOL.md §6.30.5 载体②:空闲 idle deadline 闩(index.mjs 装配后回填——同 handleSlash 惰性回填法)
59
61
  timerWatch: null,
60
62
  get assistantLabeled() { return conversation.assistantLabeled },
@@ -63,5 +65,5 @@ export function createTurnFace(ctx) {
63
65
  // opts 透传(timer 空闲唤醒轮 = `{ autoTurn: true, timerTurn: true }`——§6.30.3 开轮两处①)
64
66
  const turn = (text, opts) => runAgentTurn(turnCtx, text, opts)
65
67
 
66
- return { submit, turn, turnCtx, askPermission, askQuestion, askBatchPermission, pasteClipboardImage }
68
+ return { submit, turn, turnCtx, askPermission, askQuestion, askBatchPermission, askSecretInput, pasteClipboardImage }
67
69
  }