thincoder 0.12.70 → 0.12.72

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 (40) hide show
  1. package/CHANGELOG.md +33 -0
  2. package/README.md +14 -2
  3. package/bin/disk-root-gate.mjs +35 -0
  4. package/bin/node-version-gate.cjs +1 -1
  5. package/bin/thincoder.mjs +12 -2
  6. package/package.json +2 -2
  7. package/src/acp/bridge.mjs +4 -0
  8. package/src/acp/resource-link.mjs +1 -1
  9. package/src/cli/setup-wizard.mjs +30 -10
  10. package/src/cli/team-command.mjs +246 -0
  11. package/src/command-interactive.mjs +9 -0
  12. package/src/command-table.mjs +11 -2
  13. package/src/completions.mjs +15 -2
  14. package/src/prompt-injections.mjs +21 -4
  15. package/src/tui/agent-turn.mjs +1 -1
  16. package/src/tui/ask-steps.mjs +61 -0
  17. package/src/tui/cmd-advisor.mjs +6 -11
  18. package/src/tui/cmd-config.mjs +18 -19
  19. package/src/tui/cmd-mcp-form.mjs +66 -43
  20. package/src/tui/cmd-submodel.mjs +2 -2
  21. package/src/tui/cmd-team.mjs +235 -0
  22. package/src/tui/cmd-timers.mjs +38 -5
  23. package/src/tui/index.mjs +13 -1
  24. package/src/tui/key-handler-modals.mjs +45 -2
  25. package/src/tui/key-handler.mjs +15 -5
  26. package/src/tui/layout.mjs +8 -2
  27. package/src/tui/lifecycle-records.mjs +16 -5
  28. package/src/tui/model-picker.mjs +15 -16
  29. package/src/tui/pickers.mjs +1 -1
  30. package/src/tui/provider-admin.mjs +48 -13
  31. package/src/tui/render-frame.mjs +32 -5
  32. package/src/tui/render-segments.mjs +10 -4
  33. package/src/tui/slash-commands.mjs +3 -0
  34. package/src/tui/startup.mjs +11 -0
  35. package/src/tui/subagent-freeze.mjs +5 -0
  36. package/src/tui/subagent-panel.mjs +1 -1
  37. package/src/tui/suspension-drive.mjs +9 -2
  38. package/src/tui/timer-watch.mjs +4 -3
  39. package/src/tui/tui-state.mjs +3 -1
  40. package/src/tui/wizard.mjs +198 -39
@@ -0,0 +1,235 @@
1
+ /**
2
+ * cmd-team.mjs — `/team` 命令族 + 会话内团队问句面(登录面补全批 · 2026-10-10 · 台账 #1229)。
3
+ * 设计单源 = `docs/cli/design/TUI-COMMANDS.md` §5.5(三子命令 ∥ 问句面)∥ §1(模块地图);
4
+ * 机制单源 = `docs/core/design/TEAM.md` §2.2(登录)∥ §2.3(退出)∥ §2.6(活校验 ∥ verify 清位)。
5
+ * 词面 = argv 面逐字同源(`src/cli/team-command.mjs` 导出面——判据「CLI = 单语直出同句」;
6
+ * 本档零第二份字面)。两消费方:① 本档 `handleTeamCommand`(注册 = `slash-commands.mjs` 两表);
7
+ * ② `wizard.mjs` 团队路(`completeTeamLogin` ∥ `syncProvidersFromDisk` ∥ `refreshTeamState` 三件共用)。
8
+ *
9
+ * 问句面(模态族第三支):`state.teamAsk` = { step, fields, error, busy, scroll, lines }——
10
+ * 键面 = `key-handler.mjs` 序 2 守卫 + `key-handler-modals.mjs` `handleTeamAskKeys`(Esc 取消 ∥
11
+ * Enter 提交;可打印键回落编辑族);render 面 = `layout.mjs` overlay 第三支(掩码步经 `ask-steps.mjs`
12
+ * `askMaskActive`);模态判据 = `timer-watch.mjs` `modalOpen`(#448① 模态期抑制 ∥ 关闭后补评估同谓词)。
13
+ *
14
+ * ctx(两调用面同源字段):{ agent, state, pushLine, render, openModelPicker, onModalClose }
15
+ */
16
+ import { t } from "@thincoder/core/i18n.mjs"
17
+ import { teamLogin, teamLogout, teamStatus, teamVerify, NOTICE_MANUAL_NAME_CONFLICT } from "@thincoder/core/team.mjs"
18
+
19
+ import { C } from "./ansi.mjs"
20
+ import { teamAskLines, teamAskStepAt, nextTeamAskStep } from "./ask-steps.mjs"
21
+ import {
22
+ FAILURE_TEXT, NOT_LOGGED_IN, TEXT_MANUAL_CONFLICT, TEXT_REVOKE_UNDELIVERED,
23
+ TEXT_LOGGED_IN, TEXT_LOGGED_OUT, renderState,
24
+ } from "../cli/team-command.mjs"
25
+
26
+ /** 用法行(表外子命令 ∥ 多余参数 ⇒ 零动作 + 用法——沿 argv 面 fail-closed 同口径;词面改指 TUI 入口)。 */
27
+ export const TEAM_USAGE = "Usage: /team login | /team logout | /team status"
28
+
29
+ /** 模型选定引导行(本地路尾同句——`wizard.mjs` finishWizard 与本档两处消费,单源)。 */
30
+ export const MODEL_SELECT_HINT = "Select a model (选定即成为默认模型;Esc 跳过——之后可用 /model 选定)"
31
+
32
+ // ─── 命令族(TUI-COMMANDS.md §5.5)────────────────────────────────────────────────────────────
33
+
34
+ /** `/team` 入口(注册 = `SLASH_COMMANDS` + `HANDLERS`):
35
+ * `/team` ∥ `/team status` = 状态面(活校验);`/team login` = 三问面;`/team logout` = 退出;
36
+ * 表外子命令 ∥ 多余参数 ⇒ usage(fail-closed——零动作)。 */
37
+ export async function handleTeamCommand(ctx, args = []) {
38
+ const [sub] = args
39
+ const known = sub === undefined || sub === "status" || sub === "login" || sub === "logout"
40
+ if (!known || args.length > 1) {
41
+ ctx.pushLine(TEAM_USAGE, C.warn)
42
+ ctx.render()
43
+ return
44
+ }
45
+ if (sub === undefined || sub === "status") return runTeamStatus(ctx)
46
+ if (sub === "login") return startTeamAsk(ctx)
47
+ return runTeamLogout(ctx)
48
+ }
49
+
50
+ /** `/team` ∥ `/team status`:未登录 ⇒ 未登录句逐字;已登录 ⇒ argv `team status` 同形三行 +
51
+ * 活校验(`invalid` ⇒ 追词句;`unreachable` ⇒ 照本地零行——离线容忍)。活校验结果回填 =
52
+ * `state.team.verify`(写者③会话内点)。 */
53
+ async function runTeamStatus(ctx) {
54
+ const { state, pushLine, render } = ctx
55
+ const st = teamStatus()
56
+ if (st.loggedIn !== true) {
57
+ pushLine(NOT_LOGGED_IN, C.dim)
58
+ refreshTeamState(state) // token 缺席 ⇒ verify 清(TEAM.md §2.6 清位)
59
+ return
60
+ }
61
+ for (const line of renderState(st)) pushLine(line, C.dim)
62
+ const v = await teamVerify()
63
+ refreshTeamState(state)
64
+ state.team.verify = v?.state ?? null
65
+ if (v?.state === "invalid") pushLine(t("status.team.invalid"), C.warn) // 词面单源 = 核字典键
66
+ render()
67
+ }
68
+
69
+ /** `/team login`:开三问面(地址 → 账号 → 密码)。字段预填 = 核留存快照(TEAM.md §2.1
70
+ * member 行「表单预填」——桌面表单同款);密码零预填 ∥ 零留存(§3.1 保真判据)。 */
71
+ function startTeamAsk(ctx) {
72
+ const { state } = ctx
73
+ if (state.teamAsk != null) return // 面在场(重入零动作——键面已归该面)
74
+ const st = teamStatus()
75
+ state.teamAsk = {
76
+ step: "server",
77
+ fields: { server: st.server ?? "", username: st.member?.username ?? "" },
78
+ error: null,
79
+ busy: false, // 提交在途重入闸(teamLogin await 期 Enter 零动作)
80
+ scroll: 0, // overlay 契约位(layout/renderPicker 读)
81
+ lines: [],
82
+ }
83
+ enterTeamAskStep(ctx, "server")
84
+ }
85
+
86
+ /** 步入场:步名 ⇒ 问句屏行 + 输入框预填(地址 ∥ 账号;掩码步恒空)∥ 错误清。 */
87
+ function enterTeamAskStep(ctx, step) {
88
+ const { state } = ctx
89
+ const face = state.teamAsk
90
+ const def = teamAskStepAt(step)
91
+ face.step = step
92
+ face.error = null
93
+ face.lines = teamAskFaceLines(face)
94
+ const value = def.mask ? "" : (face.fields[def.field] ?? "")
95
+ state.input = [...value]
96
+ state.cursor = state.input.length
97
+ ctx.render()
98
+ }
99
+
100
+ /** 面体行构造(问句屏 + 就地失败行——「败 ⇒ 四句逐字就地出 + 停留可重试」:面在场、步不动)。 */
101
+ function teamAskFaceLines(face) {
102
+ const lines = teamAskLines(face.step, face.fields)
103
+ if (face.error) lines.push({ text: ` ${face.error}`, color: C.error })
104
+ return lines
105
+ }
106
+
107
+ /** 问句面提交(Enter——键面转口):步内推进;末步 ⇒ 核 `teamLogin`。
108
+ * 成 ⇒ 面退场 + `completeTeamLogin`;败 ⇒ 四句逐字就地 + 停留(步不动、输入框清空——密码零留存)。 */
109
+ export async function teamAskSubmit(ctx) {
110
+ const { state, render } = ctx
111
+ const face = state.teamAsk
112
+ if (face == null || face.busy === true) return
113
+ const def = teamAskStepAt(face.step)
114
+ if (def === null) return
115
+ const raw = state.input.join("")
116
+ const value = def.trim ? raw.trim() : raw
117
+ if (!def.mask) face.fields[def.field] = value // 掩码步(密码)零留存——不入面体态
118
+ const next = nextTeamAskStep(def.step)
119
+ if (next !== null) { enterTeamAskStep(ctx, next); return }
120
+ face.busy = true
121
+ try {
122
+ const result = await teamLogin({ server: face.fields.server, username: face.fields.username, password: value })
123
+ if (state.teamAsk !== face) return // 在途退场(Esc)⇒ 零动作
124
+ if (result.ok !== true) {
125
+ face.error = FAILURE_TEXT[result.reason] ?? FAILURE_TEXT.network
126
+ face.lines = teamAskFaceLines(face)
127
+ state.input = []
128
+ state.cursor = 0
129
+ render()
130
+ return
131
+ }
132
+ state.teamAsk = null
133
+ state.input = []
134
+ state.cursor = 0
135
+ await completeTeamLogin(ctx, result)
136
+ } finally {
137
+ face.busy = false
138
+ }
139
+ }
140
+
141
+ /** 问句面取消(Esc——键面转口):面退场(输入框归还——清空 + 光标归零);零行(零新文案)。
142
+ * #448①:用户自发模态退场 ⇒ 闩重武装(同 picker ∥ wizard 关闭点)。 */
143
+ export function teamAskCancel(ctx) {
144
+ const { state, render } = ctx
145
+ if (state.teamAsk == null) return
146
+ state.teamAsk = null
147
+ state.input = []
148
+ state.cursor = 0
149
+ render()
150
+ ctx.onModalClose?.()
151
+ }
152
+
153
+ /** `/team logout`:未登录 ⇒ 未登录句(幂等——零动作);已登录 ⇒ 核 `teamLogout` ⇒ 结果行 +
154
+ * 吊销未达一次性提示(逐字)+ 两复读(token 摘除 ⇒ verify 清 ∥ 派生条目失 key ⇒ 候选面隐藏)。 */
155
+ async function runTeamLogout(ctx) {
156
+ const { agent, state, pushLine, render } = ctx
157
+ if (teamStatus().loggedIn !== true) {
158
+ pushLine(NOT_LOGGED_IN, C.dim)
159
+ return
160
+ }
161
+ const result = await teamLogout()
162
+ if (result.ok !== true) {
163
+ pushLine(FAILURE_TEXT[result.reason] ?? FAILURE_TEXT.network, C.error)
164
+ render()
165
+ return
166
+ }
167
+ pushLine(TEXT_LOGGED_OUT, C.tool)
168
+ if (result.revokeDelivered === false) pushLine(TEXT_REVOKE_UNDELIVERED, C.warn)
169
+ refreshTeamState(state)
170
+ await syncProvidersFromDisk(agent)
171
+ render()
172
+ }
173
+
174
+ // ─── 两消费方共用的登录成后收尾 ∥ 复读件 ───────────────────────────────────────────────────────
175
+
176
+ /** 登录成后公共收尾(向导团队路 ∥ `/team login` 同源):
177
+ * ① 结果行(argv 同形:`Logged in.` + server/member/label 三行);② 同名冲突一次性提示(逐字);
178
+ * ③ 两复读——渠道列表(`agent.providers` ← 磁盘:模型 picker 候选随含 `team` 派生条目)∥
179
+ * `state.team`(`clearVerify`——重登成 ⇒ verify 清、新 token 新判:TEAM.md §2.6);
180
+ * ④ `defaultModel` 未设 ⇒ 追开模型 picker(「登录成即用」;已设 ⇒ 零打断——同本地路尾)。
181
+ * 调用方须已退场其模态面(向导 ∥ 问句面)——本函数只做收尾与闩重武装。 */
182
+ export async function completeTeamLogin(ctx, result) {
183
+ const { agent, state, pushLine } = ctx
184
+ pushLine(TEXT_LOGGED_IN, C.tool)
185
+ for (const line of renderState(teamStatus())) pushLine(line, C.dim)
186
+ if (result?.notice === NOTICE_MANUAL_NAME_CONFLICT) pushLine(TEXT_MANUAL_CONFLICT, C.warn)
187
+ const cfg = await syncProvidersFromDisk(agent)
188
+ refreshTeamState(state, { clearVerify: true })
189
+ ctx.render()
190
+ if (typeof cfg?.defaultModel === "string" && cfg.defaultModel !== "") {
191
+ ctx.onModalClose?.() // 模态面已退且零弹面 ⇒ 闩重武装
192
+ return
193
+ }
194
+ pushLine(MODEL_SELECT_HINT, C.dim)
195
+ ctx.openModelPicker()
196
+ .catch((e) => pushLine(`[error] ${e?.message ?? e}`, C.error))
197
+ .then(() => { if (state.picker == null && state.wizard == null && state.teamAsk == null) ctx.onModalClose?.() })
198
+ }
199
+
200
+ /** 渠道列表复读(磁盘 → 会话内存):核 `loadConfig` 全量读 + proxy 归一(与 `/config` reloadConfig
201
+ * 同链)⇒ 替换 `agent.providers`(模型 picker 候选活读面);会话槽值零触碰(已设 `defaultModel`
202
+ * 零打断——模型选定仍由用户显式走 picker)。返回读到的 cfg(`defaultModel` 门判据)。 */
203
+ export async function syncProvidersFromDisk(agent) {
204
+ const { loadConfig } = await import("@thincoder/core/config.mjs")
205
+ const { injectProxy } = await import("@thincoder/core/proxy.mjs")
206
+ const cfg = loadConfig()
207
+ injectProxy(cfg.providersList, cfg)
208
+ agent.providers = cfg.providersList
209
+ return cfg
210
+ }
211
+
212
+ /** `state.team` 复读(TUI.md §7.8 写者②):核 `teamStatus()` 投影 ⇒ 切片五键。
213
+ * 清位(TEAM.md §2.6):token 缺席 ⇒ `verify` 不存续;`clearVerify`(重登成 ∥ 启动读)同清。 */
214
+ export function refreshTeamState(state, { clearVerify = false } = {}) {
215
+ const st = teamStatus()
216
+ const loggedIn = st.loggedIn === true
217
+ state.team = {
218
+ loggedIn,
219
+ member: st.member ?? null,
220
+ server: st.server ?? null,
221
+ label: st.label ?? null,
222
+ verify: loggedIn && !clearVerify ? (state.team?.verify ?? null) : null,
223
+ }
224
+ return state.team
225
+ }
226
+
227
+ /** 启动装配(写者①+③):同步读 `teamStatus()`(随装,零阻塞)+ token 在场 ⇒ `teamVerify()`
228
+ * 异步回填(回填当拍 render;核件不抛、失败零行——`unreachable` 已是核内常态,离线容忍)。 */
229
+ export function initTeamState({ state, render }) {
230
+ refreshTeamState(state, { clearVerify: true })
231
+ if (state.team.loggedIn !== true) return
232
+ teamVerify()
233
+ .then((v) => { state.team.verify = v?.state ?? null; render() })
234
+ .catch(() => { /* 校验失败零行(离线容忍——不假报失效) */ })
235
+ }
@@ -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
@@ -33,9 +33,11 @@ export function digestCapRecord(turns) {
33
33
  return { kind: "digest", status: "cap", mode: "stop", turns }
34
34
  }
35
35
 
36
- /** digest 收尾记录(终态行同点):`ok` ∥ `ms`(行文案 `seconds` 由同一 `ms` 派生——同值单算式)。 */
37
- export function digestEndRecord({ ok, ms }) {
38
- return { kind: "digest", status: "end", ok, ms }
36
+ /** digest 收尾记录(终态行同点):`ok` ∥ `ms`(行文案 `seconds` 由同一 `ms` 派生——同值单算式);
37
+ * `unsettled` = 本轮未销账条数(消化账务批 · 2026-10-05 · 台账 #930 —— 残余行判据 ∥ 重建同调;
38
+ * 零未销账 ⇒ 键缺席——零噪音,与帧面「> 0 才携」同判)。 */
39
+ export function digestEndRecord({ ok, ms, unsettled = 0 }) {
40
+ return { kind: "digest", status: "end", ok, ms, ...(Number.isFinite(unsettled) && unsettled > 0 ? { unsettled } : {}) }
39
41
  }
40
42
 
41
43
  /** subagent 归档快照记录(冻结载体行插入同点):meta = 冻结时点块头事实(含 `pool`/`queued?`——§6.26)
@@ -114,7 +116,13 @@ export function digestTraceLines(rec, startN = null) {
114
116
  if (rec.status === "end") {
115
117
  if (!Number.isFinite(startN) || startN <= 0 || !Number.isFinite(rec.ms)) return []
116
118
  const seconds = (rec.ms / 1000).toFixed(1) // 与记录 `ms` 同值单算式
117
- return [{ text: t(rec.ok === false ? "digest.aborted" : "digest.done", { n: startN, seconds }), color: C.dim }]
119
+ const lines = [{ text: t(rec.ok === false ? "digest.aborted" : "digest.done", { n: startN, seconds }), color: C.dim }]
120
+ // 未销账残余行(消化账务批 · 2026-10-05 · 台账 #930 · §6.31.6):终态行之后再落一行 dim
121
+ // (核字典 `digest.residue` 单源——端侧零自持字面);零未销账 ⇒ 零行(零噪音)。
122
+ // 随终态行同门(重建面 `startN` 不可得 ⇒ 零行——fail-closed)。
123
+ const unsettled = Number.isFinite(rec.unsettled) && rec.unsettled > 0 ? rec.unsettled : 0
124
+ if (unsettled > 0) lines.push({ text: t("digest.residue", { n: unsettled }), color: C.dim })
125
+ return lines
118
126
  }
119
127
  return []
120
128
  }
@@ -122,7 +130,7 @@ export function digestTraceLines(rec, startN = null) {
122
130
  // ─── ③ 重建(读面):subagent 记录 ⇒ 合成件 ────────────────────────────────
123
131
 
124
132
  /** subagent 记录 ⇒ `_frozenSubTask` 合成件(重建面;渲染端零改消费——折叠头 + tail-3 原式)。
125
- * meta 块头事实逐项回填(渲染端读面:started→elapsed ∥ turn/maxTurns ∥ stopped ∥ error→errPart);
133
+ * meta 块头事实逐项回填(渲染端读面:started→elapsed ∥ turn/maxTurns ∥ stopped ∥ errored ∥ error→errPart);
126
134
  * #790:`pool`/`queued` ⇒ CLI 本地两事实(`async`/`queued`)∥ `key` 剥 `sub:` 前缀(显示 = 本地无前缀形)。 */
127
135
  export function synthSubTask(rec) {
128
136
  const meta = rec?.meta ?? {}
@@ -144,6 +152,9 @@ export function synthSubTask(rec) {
144
152
  // #795 残项批:停止面词集扩三词(stopped ∥ cancelled ∥ terminated——词面判据单源 = §6.26;VSC/桌面写 cancelled)。
145
153
  stopped: meta.status === "stopped" || meta.status === "cancelled"
146
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",
147
158
  lastError: typeof meta.error === "string" ? meta.error : null,
148
159
  blocks,
149
160
  _charCount: blocks.reduce((n, b) => n + b.text.length, 0), // 行集字符和(§5.4 账实一致——恢复直算同源)