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.
- package/CHANGELOG.md +33 -0
- package/README.md +14 -2
- package/bin/disk-root-gate.mjs +35 -0
- package/bin/node-version-gate.cjs +1 -1
- package/bin/thincoder.mjs +12 -2
- package/package.json +2 -2
- package/src/acp/bridge.mjs +4 -0
- package/src/acp/resource-link.mjs +1 -1
- package/src/cli/setup-wizard.mjs +30 -10
- package/src/cli/team-command.mjs +246 -0
- package/src/command-interactive.mjs +9 -0
- package/src/command-table.mjs +11 -2
- package/src/completions.mjs +15 -2
- package/src/prompt-injections.mjs +21 -4
- package/src/tui/agent-turn.mjs +1 -1
- package/src/tui/ask-steps.mjs +61 -0
- package/src/tui/cmd-advisor.mjs +6 -11
- package/src/tui/cmd-config.mjs +18 -19
- package/src/tui/cmd-mcp-form.mjs +66 -43
- package/src/tui/cmd-submodel.mjs +2 -2
- package/src/tui/cmd-team.mjs +235 -0
- package/src/tui/cmd-timers.mjs +38 -5
- package/src/tui/index.mjs +13 -1
- package/src/tui/key-handler-modals.mjs +45 -2
- package/src/tui/key-handler.mjs +15 -5
- package/src/tui/layout.mjs +8 -2
- package/src/tui/lifecycle-records.mjs +16 -5
- package/src/tui/model-picker.mjs +15 -16
- package/src/tui/pickers.mjs +1 -1
- package/src/tui/provider-admin.mjs +48 -13
- package/src/tui/render-frame.mjs +32 -5
- package/src/tui/render-segments.mjs +10 -4
- package/src/tui/slash-commands.mjs +3 -0
- package/src/tui/startup.mjs +11 -0
- package/src/tui/subagent-freeze.mjs +5 -0
- package/src/tui/subagent-panel.mjs +1 -1
- package/src/tui/suspension-drive.mjs +9 -2
- package/src/tui/timer-watch.mjs +4 -3
- package/src/tui/tui-state.mjs +3 -1
- package/src/tui/wizard.mjs +198 -39
package/src/tui/model-picker.mjs
CHANGED
|
@@ -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
|
|
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
|
|
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
|
-
|
|
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
|
|
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)}
|
|
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 (
|
|
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)} ${
|
|
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"
|
package/src/tui/pickers.mjs
CHANGED
|
@@ -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 后本文件 ≤
|
|
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
|
|
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
|
|
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 ?? ""}
|
|
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
|
|
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
|
|
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} (${
|
|
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" |
|
|
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) {
|
package/src/tui/render-frame.mjs
CHANGED
|
@@ -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
|
-
|
|
387
|
-
|
|
388
|
-
|
|
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
|
-
|
|
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
|
}
|
|
@@ -87,10 +87,16 @@ function frozenSubTaskLines(state, sub, cols, maxRows) {
|
|
|
87
87
|
const turnPart = sub.maxTurns > 0 ? ` · turn ${sub.turn}/${sub.maxTurns}` : ""
|
|
88
88
|
const errPart = sub.lastError ? ` — ${sub.lastError}` : ""
|
|
89
89
|
// 图标三态互斥(2026-09-20 端差·显示面消差批 M5):修前 stopped 冻结头 `✓` 与 verb 相抵
|
|
90
|
-
// ⇒ 补齐 VSC `webview/activity-view.js:46-49` 已成的 cancelled → `⏹` 形态(VSC
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
90
|
+
// ⇒ 补齐 VSC `webview/activity-view.js:46-49` 已成的 cancelled → `⏹` 形态(VSC 标尺;#821 起
|
|
91
|
+
// error 面同归 `⏹`——见下)。
|
|
92
|
+
// #821(跨端显示面差归一 · 2026-10-10):错误面并入 `⏹`(`errored` 事实两路同判——冻结单点 ∥
|
|
93
|
+
// 合成件);verb 三词 stopped/error/done;错误面注记移出括号——与核件 `subblocks/activity-view.mjs:88-91`
|
|
94
|
+
// 同形 `[…] — <err>`;stopped ∥ done ∥ queued 三面注记位逐字不变(负控)。
|
|
95
|
+
const errored = sub.errored === true
|
|
96
|
+
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}]`
|
|
94
100
|
const out = []
|
|
95
101
|
if (isExpanded(state, foldKey)) {
|
|
96
102
|
// Expanded: shared component renders blank + ▼ control + full timeline,
|
|
@@ -36,6 +36,7 @@ import { handleUpgradeCommand } from "./cmd-upgrade.mjs"
|
|
|
36
36
|
import { handleFoldCommand } from "./cmd-fold.mjs"
|
|
37
37
|
import { handleUndoCommand } from "./cmd-undo.mjs"
|
|
38
38
|
import { handleEngCommand } from "./cmd-eng.mjs"
|
|
39
|
+
import { handleTeamCommand } from "./cmd-team.mjs" // 团队登录(登录面补全批——/team login ∥ logout ∥ status)
|
|
39
40
|
|
|
40
41
|
export const SLASH_COMMANDS = [
|
|
41
42
|
{ name: "/plan", group: "Agent", desc: "toggle plan mode (design first, then implement)" },
|
|
@@ -50,6 +51,7 @@ export const SLASH_COMMANDS = [
|
|
|
50
51
|
{ name: "/think", group: "Agent", desc: "thinking mode & reasoning effort" },
|
|
51
52
|
{ name: "/upgrade", group: "System", desc: "check for updates & upgrade" },
|
|
52
53
|
{ name: "/config", group: "System", desc: "agent config (embedding, proxy, turns, threshold, consult pool)" },
|
|
54
|
+
{ name: "/team", group: "System", desc: "team login / logout / status" },
|
|
53
55
|
{ name: "/new", group: "Session", desc: "new session (old one archived to slot)" },
|
|
54
56
|
{ name: "/session", group: "Session", desc: "list/switch archived sessions" },
|
|
55
57
|
{ name: "/rename", group: "Session", desc: "rename the active session" },
|
|
@@ -92,6 +94,7 @@ export const HANDLERS = {
|
|
|
92
94
|
"/submodel": handleSubmodelCommand,
|
|
93
95
|
"/shell": handleShellCommand,
|
|
94
96
|
"/config": handleConfigCommand,
|
|
97
|
+
"/team": handleTeamCommand,
|
|
95
98
|
"/copy": handleCopyCommand,
|
|
96
99
|
"/upgrade": handleUpgradeCommand,
|
|
97
100
|
"/fold": handleFoldCommand,
|
package/src/tui/startup.mjs
CHANGED
|
@@ -244,6 +244,8 @@ export function showStartup(ctx) {
|
|
|
244
244
|
// R25(F-R25c):上次运行异常终止提示——bin 入口扫描 crash-reports(24h 窗)经
|
|
245
245
|
// startTUI opts.crashNotice 传入——无匹配为 undefined → 不提示(负例)
|
|
246
246
|
if (opts.crashNotice) pushLine(opts.crashNotice, C.warn)
|
|
247
|
+
// F-LX3(批 2026-10-05-ledger-variant-db-notice · 台账 #935 · LEDGER.md §12.2):变体键库首跑提示(恰一行;无命中不传)
|
|
248
|
+
if (opts.ledgerVariantNotice) pushLine(opts.ledgerVariantNotice, C.warn)
|
|
247
249
|
|
|
248
250
|
// Recover previous session: rebuild from history (lazy — display snapshot is
|
|
249
251
|
// deprecated; it drifted out of sync with history on VS Code writes).
|
|
@@ -329,4 +331,13 @@ export async function backgroundIndex(ctx) {
|
|
|
329
331
|
? `Ready — idx code ${codeFiles} doc ${docFiles}`
|
|
330
332
|
: "Ready"
|
|
331
333
|
render()
|
|
334
|
+
|
|
335
|
+
// 索引自维护启动拍(自愈轮 · MEMORY.md §6.14 面⑤-5 · 台账 #1096):Ready 置后邻位——核侧 3 s
|
|
336
|
+
// 延迟拍、每进程一次、异步非阻塞、失败静默;有动作 ⇒ 一行可见(零动作 ⇒ 零行)。维护为库全局、
|
|
337
|
+
// 非 cwd 依赖;home 跳过档在其上早退(不拍——登记接受面)。
|
|
338
|
+
const { scheduleMemoryMaintenance, maintainActionCount, maintainLine } = await import("@thincoder/core/memory/maintain.mjs")
|
|
339
|
+
scheduleMemoryMaintenance({
|
|
340
|
+
dbPath: agent.memory?.dbPath ?? null,
|
|
341
|
+
onReport: (report) => { if (maintainActionCount(report) > 0) pushLine(maintainLine(report), C.dim) },
|
|
342
|
+
})
|
|
332
343
|
}
|
|
@@ -88,6 +88,11 @@ export function finishSubTaskKey(state, key, lastError = null) {
|
|
|
88
88
|
export function freezeSubTaskLines(state, sub, anchor = undefined) {
|
|
89
89
|
if (!sub) return
|
|
90
90
|
closeOpenSubChildren(sub) // R23 D-R23c2——开子块随外层冻结定格 stopped(SUBAGENT-TAIL:② 防御性保留)
|
|
91
|
+
// #821(跨端显示面差归一 · 2026-10-10):冻结单点补**错误面事实**(与写面 status 推导同式——
|
|
92
|
+
// lifecycle-records.mjs `subagentRecord` `stopped ? stopped : lastError ? error : done`):非停止 ∧
|
|
93
|
+
// 携 lastError ⇒ errored(显示面 `⏹` + `error` + 括号外注记;重建面 errored 同判 = `synthSubTask`)。
|
|
94
|
+
// 显示层瞬时事实(随冻结块对象生存)——记录形 ∥ 载荷零触(记录 status 仍由上式推导)。
|
|
95
|
+
if (!sub.stopped && sub.lastError) sub.errored = true
|
|
91
96
|
state._frozenSubKeys ??= new Set()
|
|
92
97
|
state._frozenSubKeys.add(sub.key)
|
|
93
98
|
sub.done = true
|
|
@@ -36,7 +36,7 @@ import { SUBAGENT_ROLES } from "./subagent-blocks.mjs"
|
|
|
36
36
|
/**
|
|
37
37
|
* 面板行构建(纯函数):顶部分隔线 `─` + 各运行中区块(折叠头 + tail 3 /
|
|
38
38
|
* 展开全量)。maxRows = 终端行数(展开态 60% 封顶窗口化);省略 = 不封顶
|
|
39
|
-
*
|
|
39
|
+
* (单元测试/无终端环境)。
|
|
40
40
|
* @returns {Array<{text: string, color: string, ...}>}
|
|
41
41
|
*/
|
|
42
42
|
export function renderSubagentPanel(state, cols, maxRows) {
|
|
@@ -28,6 +28,8 @@ import { upstreamAskLabelVars } from "@thincoder/core/agent-tools/parent-channel
|
|
|
28
28
|
import { poolLive, startSuspension } from "@thincoder/core/agent/suspension.mjs"
|
|
29
29
|
// #726 写点①:痕行 ∥ 起跑·收尾记录同点双动作(记录形/文案 = lifecycle-records 单一实现)
|
|
30
30
|
import { pushRecord } from "@thincoder/core/context.mjs"
|
|
31
|
+
// 消化账务批 · 2026-10-05 · 台账 #930(§6.31.6):残余行判据单源(核件 `unsettledCount`)
|
|
32
|
+
import { unsettledCount } from "@thincoder/core/agent/digest-account.mjs"
|
|
31
33
|
import { digestEndRecord, digestStartRecord, digestTraceLines, recordCarrier } from "./lifecycle-records.mjs"
|
|
32
34
|
|
|
33
35
|
export { poolLive }
|
|
@@ -90,7 +92,9 @@ function backgroundStatusText(agent) {
|
|
|
90
92
|
* 起跑行 ∥ 计数行 ∥ cap 行 ∥ 终态行:不改 ∥ 不删 ∥ 不退场(零清理机器;退场机随拆);② 起跑窗
|
|
91
93
|
* (沿 #754 裁 A)——起跑行族落盘后 ⇒ 起跑快照(起跑刻 pending 单容器)逐条冻结入流,落位 = 本族之后;
|
|
92
94
|
* ③ 终态行 = **到达序追加于当刻流末**(`pushLine`——零就地换文 ∥ 不动原起跑行)。
|
|
93
|
-
* 导出面 =
|
|
95
|
+
* 导出面 = 单元测试档直驱(生产唯一调用 = 本档 `driveTurn`)。
|
|
96
|
+
* **消化账务批(2026-10-05 · 台账 #930 · §6.31.6)**:收尾 `unsettled` 随记录(非上行轮——与桌面 ∥
|
|
97
|
+
* VSC 同判据;判据单源 = 核 `unsettledCount`)⇒ 终态行之后再落残余行(`digest.residue`——lifecycle-records 单实现)。 */
|
|
94
98
|
export async function digestTurn(ctx, upstream = false) {
|
|
95
99
|
const { agent, state, pushLine } = ctx
|
|
96
100
|
const manual = !agent.autoApprove
|
|
@@ -111,7 +115,10 @@ export async function digestTurn(ctx, upstream = false) {
|
|
|
111
115
|
const outcome = await runAgentTurn(digestCtx, "", { autoTurn: true, upstreamTurn: upstream, skipSession: true })
|
|
112
116
|
const ms = Date.now() - d0
|
|
113
117
|
logEvent("digest:end", { pendingN: pendingFamilyCount(agent), ms, ...(upstream ? { upstream: true } : {}) })
|
|
114
|
-
|
|
118
|
+
// 消化账务批(§6.31.6):非上行轮且 > 0 才携 `unsettled`(残余行载荷——与桌面 ∥ VSC 同判据;
|
|
119
|
+
// 消化轮 = `autoTurn ∧ ¬upstreamTurn`,§6.31.2)
|
|
120
|
+
const unsettled = upstream ? 0 : unsettledCount(agent)
|
|
121
|
+
const endRec = digestEndRecord({ ok: outcome === "ok", ms, unsettled })
|
|
115
122
|
// ③ 终态行 = 到达序追加于当刻流末(自然形——零就地换文 ∥ 不动原起跑行)
|
|
116
123
|
for (const l of digestTraceLines(endRec, pend0)) pushLine(l.text, l.color)
|
|
117
124
|
pushRecord(carrier, endRec) // 收尾记录(与终态行同点)
|
package/src/tui/timer-watch.mjs
CHANGED
|
@@ -42,10 +42,11 @@ export function createTimerWatch({ agent, onFire, timer = setTimeout, clear = cl
|
|
|
42
42
|
return coreCreateTimerWatch({ getAgent: () => agent, onFire, timer, clear, now })
|
|
43
43
|
}
|
|
44
44
|
|
|
45
|
-
/** 用户自发模态判据(#448① · KD-6——单源:火面抑制 ∥「关闭后补评估」两处同谓词):picker ∕ wizard
|
|
46
|
-
*
|
|
45
|
+
/** 用户自发模态判据(#448① · KD-6——单源:火面抑制 ∥「关闭后补评估」两处同谓词):picker ∕ wizard ∕
|
|
46
|
+
* 团队问句面(登录面补全批——模态族第三支 `state.teamAsk`)在场即真(工具权限 ∕ 提问面板属**在飞回合**
|
|
47
|
+
* 面——由 `state.processing` 门承担,不入本判据)。 */
|
|
47
48
|
export function modalOpen(state) {
|
|
48
|
-
return state?.picker != null || state?.wizard != null
|
|
49
|
+
return state?.picker != null || state?.wizard != null || state?.teamAsk != null
|
|
49
50
|
}
|
|
50
51
|
|
|
51
52
|
/**
|
package/src/tui/tui-state.mjs
CHANGED
|
@@ -29,7 +29,9 @@ export function createTuiState({ cols, rows, agent }) {
|
|
|
29
29
|
picker: null, // active picker (stack top) { title, entries, lines, index, scroll, selectedLine, filter }
|
|
30
30
|
pickerStack: [], // picker 栈:showPicker push,Enter/Esc pop;state.picker 始终指向栈顶
|
|
31
31
|
pendingNotice: null, // 后台更新提示:有 picker 打开时挂起,picker 全部关闭后再弹
|
|
32
|
-
wizard: null, // first-launch config wizard { step, index, scroll, selectedLine, fields, error, lines }
|
|
32
|
+
wizard: null, // first-launch config wizard { step, index, scroll, selectedLine, fields, error, lines }——登录面补全批:step="route" 首屏 + 团队三问步(step = server/username/password)+ `team` 字段留存 + `teamFocusBack` 回退行焦点位 + `busy` 提交闸
|
|
33
|
+
teamAsk: null, // 团队问句面(会话内 `/team login`——模态族第三支): { step, fields, error, busy, scroll, lines }——cmd-team.mjs 持有;overlay 第三支 ∥ 键面序 2b ∥ modalOpen 计入
|
|
34
|
+
team: { loggedIn: false, member: null, server: null, label: null, verify: null }, // 团队登录态切片(TUI.md §7.8 五键)——写者 = cmd-team.mjs(启动读 ∥ `/team` 成退复读 ∥ 活校验回填);render-frame 每帧活读零缓存
|
|
33
35
|
tasks: agent.tasks ?? [], // task list from task tool (progress shown in status bar); carried over on session restore, auto-collapsed when all done
|
|
34
36
|
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)
|
|
35
37
|
tokens: { prompt: 0, completion: 0, cacheHit: 0, cacheMiss: 0, reasoningTokens: 0 }, // cumulative token usage (shown in status bar)
|