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/completions.mjs
CHANGED
|
@@ -29,10 +29,14 @@ export function printCompletion(shell) {
|
|
|
29
29
|
audit) COMPREPLY=( $(compgen -W "--root" -- "$cur") ) ;;
|
|
30
30
|
list) COMPREPLY=( $(compgen -W "--json --full --family --cwd" -- "$cur") ) ;;
|
|
31
31
|
esac ;;
|
|
32
|
+
team) case "$prev" in
|
|
33
|
+
team) COMPREPLY=( $(compgen -W "login logout status" -- "$cur") ) ;;
|
|
34
|
+
login) COMPREPLY=( $(compgen -W "--server --user" -- "$cur") ) ;;
|
|
35
|
+
esac ;;
|
|
32
36
|
distill) COMPREPLY=( $(compgen -W "--yes --layer=" -- "$cur") ) ;;
|
|
33
37
|
completion) COMPREPLY=( $(compgen -W "bash zsh fish" -- "$cur") ) ;;
|
|
34
38
|
*)
|
|
35
|
-
COMPREPLY=( $(compgen -W "tui chat acp memory sync reindex distill upgrade completion session ledger -v --version -h --help" -- "$cur") ) ;;
|
|
39
|
+
COMPREPLY=( $(compgen -W "tui chat acp memory sync reindex distill upgrade completion session ledger team -v --version -h --help" -- "$cur") ) ;;
|
|
36
40
|
esac
|
|
37
41
|
}
|
|
38
42
|
complete -F _thincoder thincoder
|
|
@@ -60,7 +64,8 @@ _thincoder() {
|
|
|
60
64
|
'upgrade[Update to latest version from npm]' \\
|
|
61
65
|
'completion[Generate shell completion script]' \\
|
|
62
66
|
'session[Session dir GC: session gc --dry-run|--confirm]' \\
|
|
63
|
-
'ledger[Ledger variants: migrate / audit / list]'
|
|
67
|
+
'ledger[Ledger variants: migrate / audit / list]' \\
|
|
68
|
+
'team[Team login: login / logout / status]'
|
|
64
69
|
;;
|
|
65
70
|
args)
|
|
66
71
|
case "$words[1]" in
|
|
@@ -75,6 +80,8 @@ _thincoder() {
|
|
|
75
80
|
migrate) _arguments '--dry-run[Report only]' '--confirm[Apply migration]' '--from:Source key:' ;;
|
|
76
81
|
list) _arguments '--json[Single-segment JSON output]' '--full[Include evidence]' '--family[Family scope]' '--cwd:Project anchor:' ;;
|
|
77
82
|
audit) _arguments '--root:Scan root dir:' ;; esac ;;
|
|
83
|
+
team) case "$words[2]" in
|
|
84
|
+
login) _arguments '--server:Team server URL:' '--user:Team user name:' ;; esac ;;
|
|
78
85
|
distill) _arguments '--yes[Skip confirmation]' '--layer=[Layer filter]' ;;
|
|
79
86
|
completion) _values 'shell' 'bash' 'zsh' 'fish' ;;
|
|
80
87
|
esac ;;
|
|
@@ -98,6 +105,7 @@ complete -c thincoder -a completion -d 'Shell completion'
|
|
|
98
105
|
complete -c thincoder -a session -d 'Session dir GC (session gc --dry-run|--confirm)'
|
|
99
106
|
complete -c thincoder -a ledger -d 'Ledger variants: migrate / audit / list'
|
|
100
107
|
complete -c thincoder -a acp -d 'Agent Client Protocol server for IDEs'
|
|
108
|
+
complete -c thincoder -a team -d 'Team login: login / logout / status'
|
|
101
109
|
|
|
102
110
|
# Flags
|
|
103
111
|
complete -c thincoder -s v -l version -d 'Print version'
|
|
@@ -138,6 +146,11 @@ complete -c thincoder -n '__fish_seen_subcommand_from completion' -a fish -d 'Fi
|
|
|
138
146
|
complete -c thincoder -n '__fish_seen_subcommand_from ledger' -a 'migrate audit list' -d 'Ledger variants: migrate / audit / list'
|
|
139
147
|
complete -c thincoder -n '__fish_seen_subcommand_from ledger' -l dry-run -l confirm -l from -l root -d 'Ledger flags'
|
|
140
148
|
complete -c thincoder -n '__fish_seen_subcommand_from ledger; and __fish_seen_subcommand_from list' -l json -l full -l family -l cwd -d 'Ledger list flags'
|
|
149
|
+
|
|
150
|
+
# team subcommands / flags
|
|
151
|
+
complete -c thincoder -n '__fish_seen_subcommand_from team' -a 'login logout status' -d 'Team login commands'
|
|
152
|
+
complete -c thincoder -n '__fish_seen_subcommand_from team; and __fish_seen_subcommand_from login' -l server -d 'Team server URL'
|
|
153
|
+
complete -c thincoder -n '__fish_seen_subcommand_from team; and __fish_seen_subcommand_from login' -l user -d 'Team user name'
|
|
141
154
|
`)
|
|
142
155
|
}
|
|
143
156
|
}
|
|
@@ -8,13 +8,30 @@
|
|
|
8
8
|
*
|
|
9
9
|
* 2026-09-17 消端差:提示词面(persona / discipline / common)注入锚全消——导航注记删
|
|
10
10
|
* (正文自足)、端特有段通用化并入核内正文、文档地图路径统一写死 `docs/README.md`。
|
|
11
|
-
* 剩 = 工具面 2 锚(bash-terminal-face / question-ui-face
|
|
11
|
+
* 剩 = 工具面 2 锚(bash-terminal-face / question-ui-face)。
|
|
12
|
+
*
|
|
13
|
+
* bash-executor-face 批(台账 #922):`bash-terminal-face` 激活 = 运行时执行器身份声明行
|
|
14
|
+
* (核心单源 `resolveShellIdentity`——spawn 同链探测 + memo 按配置值键控)。
|
|
15
|
+
* 求值形态 = **import 期求值**(端装配层求值路径——核心缝 `applyPromptInjections` 为纯字符串
|
|
16
|
+
* 替换、不支持函数值键:函数值会被 String.replace 字符串化)。求值时机 = 注册前、任何装配前;
|
|
17
|
+
* **描述面值随进程启动固定**——进程内改 `shell` 配置不刷新本行(重启生效);hint 门
|
|
18
|
+
* (核 `tools/bash.mjs` 逐执行调用同一单源)按配置值 memo 键控重探。
|
|
19
|
+
* 偏差登记 = 批次档 §5(设计终值「值函数 / 重装配期求值」于纯字符串缝不可达——取端装配层前置求值)。
|
|
20
|
+
* 机制权威 = `docs/core/design/BASH-EXECUTOR-FACE.md` §2 值面 + §3.2。
|
|
12
21
|
*/
|
|
13
22
|
|
|
14
|
-
|
|
23
|
+
import { resolveShellIdentity, executorLine } from "@thincoder/core/shell-identity.mjs"
|
|
24
|
+
import { loadConfig } from "@thincoder/core/config.mjs"
|
|
25
|
+
|
|
26
|
+
// 配置读容错(先例 = `bin/thincoder.mjs:54` 同式「配置缺失/损坏 ⇒ 各向默认」):读取失败不阻断进程,
|
|
27
|
+
// 读失败 ⇒ null ⇒ 默认链(fail-open——探测面不猜)。
|
|
28
|
+
function configShell() {
|
|
29
|
+
try { return loadConfig()?.shell ?? null } catch { return null }
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
// CLI 无 terminal 参数(工具面 review 再统一)⇒ 执行器声明行单值。
|
|
15
33
|
export const CLI_PROMPT_INJECTIONS = {
|
|
16
|
-
|
|
17
|
-
"bash-terminal-face": "",
|
|
34
|
+
"bash-terminal-face": executorLine(resolveShellIdentity(configShell())),
|
|
18
35
|
// question 工具可用性行(核内正文该行已移出正文、锚原位替换——本端填回 CLI 措辞)
|
|
19
36
|
"question-ui-face": "- Availability: this tool needs an interactive UI — in contexts without one (headless runs) it returns an error instead of asking; subagent children (depth>0) never get it (excluded from their tool tables); put the question in your reply text instead.",
|
|
20
37
|
}
|
package/src/tui/agent-turn.mjs
CHANGED
|
@@ -82,7 +82,7 @@ export async function runAgentTurn(ctx, text, opts = {}) {
|
|
|
82
82
|
|
|
83
83
|
/** #448② 重武装守卫(KD-6「异常径重武装——会话停 ∕ 显式撤销除外」):**粘滞位 `_timerRearmRevoked`**
|
|
84
84
|
* = 主线(两实落点:Ctrl+C 全停 `{abortTrigger:"stop"}` 中止分支 ∕ 挂起会话中止(`_suspAborted`)复位前捕获;
|
|
85
|
-
* 链头复位 ⇒
|
|
85
|
+
* 链头复位 ⇒ 下一链正常重入)。余两分支为**防御面**(仅在正文异常早退、控制器尚未置空时可达):
|
|
86
86
|
* `_suspAborted` 未及复位 ∥ 本链控制器 stop 语义在场 ∥ 会话 abort 句柄已中止。 */
|
|
87
87
|
function timerRearmBlocked(state, agent) {
|
|
88
88
|
return state?._timerRearmRevoked === true
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ask-steps.mjs — 团队问句步进小件(登录面补全批 · 2026-10-10 · 台账 #1229)。
|
|
3
|
+
* 设计单源 = `docs/cli/design/TUI-COMMANDS.md` §1(模块地图)∥ §3.1 ∥ §5.5;
|
|
4
|
+
* 机制单源 = `docs/core/design/TEAM.md` §2.2 ∥ §2.5(三字段 ∥ 掩码回显 ∥ 分类面)。
|
|
5
|
+
*
|
|
6
|
+
* 面:步定义 ∥ 推进 ∥ 问句行构造 ∥ 掩码位——**两消费方共用(单源)**:
|
|
7
|
+
* ① 首启向导团队路文本步(`wizard.mjs`——`state.wizard.step` 直接用步名 server ∥ username ∥ password);
|
|
8
|
+
* ② 会话内 `/team login` 问句面(`cmd-team.mjs`——`state.teamAsk.step` 同三值)。
|
|
9
|
+
* 掩码与提交语义只有这一处定义:`mask` 步 ⇒ 输入框回显走 `maskEcho`(显示层变换——提交值原样,
|
|
10
|
+
* 由消费方从 `state.input` 原数组取值)且该步值零留存(密码恒不保留——§3.1 保真判据)。
|
|
11
|
+
* 校验:本层不做表单校验(零自铸文案)——空值 ∥ 不可达 ∥ 401 ∥ 429 ∥ 写盘失败一律交核
|
|
12
|
+
* `teamLogin` 分类(`reason` 四值闭集 ⇒ argv 面四句;与 argv ∥ 桌面同口径)。
|
|
13
|
+
*/
|
|
14
|
+
import { ansi, C } from "./ansi.mjs"
|
|
15
|
+
|
|
16
|
+
/** 三问步定义(序 = 提交序)。`trim` 与 argv 面同口径(地址 ∥ 账号 trim;密码原样——零裁剪);
|
|
17
|
+
* `prompt` 与 argv 面问句同词(password 去 "(hidden)" 后缀——TUI 掩码回显已可见该语义)。 */
|
|
18
|
+
export const TEAM_ASK_STEPS = Object.freeze([
|
|
19
|
+
Object.freeze({ step: "server", field: "server", prompt: "Team server URL (e.g. http://host:8787):", mask: false, trim: true }),
|
|
20
|
+
Object.freeze({ step: "username", field: "username", prompt: "Username:", mask: false, trim: true }),
|
|
21
|
+
Object.freeze({ step: "password", field: "password", prompt: "Password:", mask: true, trim: false }),
|
|
22
|
+
])
|
|
23
|
+
|
|
24
|
+
/** 步名 ⇒ 定义;非团队步 ⇒ `null`(两消费方共同判据:向导步分派 ∥ 问句面分派单源)。 */
|
|
25
|
+
export function teamAskStepAt(step) {
|
|
26
|
+
return TEAM_ASK_STEPS.find((s) => s.step === step) ?? null
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/** 下一步名;末步 ⇒ `null`(= 提交登录)。 */
|
|
30
|
+
export function nextTeamAskStep(step) {
|
|
31
|
+
const i = TEAM_ASK_STEPS.findIndex((s) => s.step === step)
|
|
32
|
+
return i >= 0 && i < TEAM_ASK_STEPS.length - 1 ? TEAM_ASK_STEPS[i + 1].step : null
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/** 掩码回显(显示层变换——每字符 `•`;提交值 = `state.input` 原值,本函数只喂渲染)。
|
|
36
|
+
* 消费点唯一 = `layout.mjs` 输入框 buf 构造(`askMaskActive` 判据 + 本函数)。 */
|
|
37
|
+
export function maskEcho(chars) {
|
|
38
|
+
return chars.map(() => "\u2022")
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/** 当前在场模态面是否处于掩码步(向导团队 password 步 ∥ `/team login` password 步)——
|
|
42
|
+
* 只认步名 + 掩码位,两个面共用一条判据。 */
|
|
43
|
+
export function askMaskActive(state) {
|
|
44
|
+
const w = state?.wizard
|
|
45
|
+
if (w != null && teamAskStepAt(w.step)?.mask === true) return true
|
|
46
|
+
const face = state?.teamAsk
|
|
47
|
+
return face != null && teamAskStepAt(face.step)?.mask === true
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/** 问句屏行构造(两消费方共用):已填两值(地址 ∥ 账号——密码恒不示)作 dim 上下文行 +
|
|
51
|
+
* 加粗问句行 + 输入提示行。`fields` 缺省 = 零上下文行。 */
|
|
52
|
+
export function teamAskLines(step, fields = {}) {
|
|
53
|
+
const def = teamAskStepAt(step)
|
|
54
|
+
if (def === null) return []
|
|
55
|
+
const lines = []
|
|
56
|
+
if (fields.server) lines.push({ text: ` Server: ${fields.server}`, color: C.dim })
|
|
57
|
+
if (fields.username) lines.push({ text: ` Username: ${fields.username}`, color: C.dim })
|
|
58
|
+
lines.push({ text: ` \u276f ${def.prompt}`, color: ansi.bold + C.text })
|
|
59
|
+
lines.push({ text: " (type in input box below)", color: C.dim })
|
|
60
|
+
return lines
|
|
61
|
+
}
|
package/src/tui/cmd-advisor.mjs
CHANGED
|
@@ -208,10 +208,9 @@ export async function handleAdvisorCommand(ctx) {
|
|
|
208
208
|
// ── Model helpers ──
|
|
209
209
|
|
|
210
210
|
function getEffectiveModel(agent, cfg) {
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
return cfg.model || providerForDefaults.model
|
|
211
|
+
// 2026-10-09 清除批:渠道条目不携模型——无 `cfg.model` ⇒ 父解析模型单档(M3③ 消费者行;核
|
|
212
|
+
// `resolveAdvisorProvider` 同判定)——渠道侧零回落,与 `advisorStatus` 的 `curModel` 同式。
|
|
213
|
+
return cfg.model || agent.provider?.model
|
|
215
214
|
}
|
|
216
215
|
|
|
217
216
|
async function fetchAdvisorModels(agent) {
|
|
@@ -242,14 +241,10 @@ function buildModelEntries(agent, cfg, cache) {
|
|
|
242
241
|
if (cached?.error) noteParts.push(`(fetch failed: ${cached.error})`)
|
|
243
242
|
entries.push({ type: "header", text: p.name, note: noteParts.join(" ") })
|
|
244
243
|
|
|
245
|
-
//
|
|
246
|
-
|
|
247
|
-
entries.push({ type: "item", text: `${isDefault ? "● " : " "}${p.model}`, action: "switch", provider: p.name, model: p.model })
|
|
248
|
-
|
|
249
|
-
// Additional models from API, excluding the default model
|
|
244
|
+
// 候选行 = 运行期拉取清单(2026-10-09 清除批:渠道条目不携模型——渠道侧无模型可列;
|
|
245
|
+
// 拉不到 ⇒ 该渠道只有 header(note 携失败原因)——不造第二真源)
|
|
250
246
|
if (cached?.models) {
|
|
251
247
|
for (const m of cached.models) {
|
|
252
|
-
if (m === p.model) continue
|
|
253
248
|
const isSelected = cfg.provider === p.name && cfg.model === m
|
|
254
249
|
entries.push({ type: "item", text: `${isSelected ? "● " : " "}${m}`, action: "switch", provider: p.name, model: m })
|
|
255
250
|
}
|
|
@@ -263,7 +258,7 @@ async function buildThinkingEntries(agent, cfg) {
|
|
|
263
258
|
const providerForDefaults = cfg.provider
|
|
264
259
|
? agent.providers?.find(p => p.name === cfg.provider) || agent.provider
|
|
265
260
|
: agent.provider
|
|
266
|
-
const effectiveModel = cfg
|
|
261
|
+
const effectiveModel = getEffectiveModel(agent, cfg) // 2026-10-09 清除批:渠道侧零回落(同上)
|
|
267
262
|
const spec = specForModel(effectiveModel)
|
|
268
263
|
const thinkOnValue = spec.thinkEnabledValue ?? "enabled"
|
|
269
264
|
const isCustomThink = thinkOnValue !== "enabled"
|
package/src/tui/cmd-config.mjs
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ansi, C } from "./ansi.mjs"
|
|
2
2
|
import { probeChannelModels, dedupeModels } from "./model-catalog.mjs"
|
|
3
|
+
import { probeTargetOf } from "@thincoder/core/provider-flows.mjs"
|
|
3
4
|
/** Merge an embedding-key save into the raw config, backfilling baseURL/model from defaults.
|
|
4
5
|
* Keeps existing custom values (Ollama/local embedding); defaults are the single source
|
|
5
6
|
* (TUI.md §9.3D — NF1). Exported for unit tests. */
|
|
@@ -15,7 +16,7 @@ export function embeddingPatch(raw, embKey, defaults) {
|
|
|
15
16
|
|
|
16
17
|
/** 并发池三键当前值读取(POOL-CONFIG-UNIFIED F-3——2026-09-09):配置值合法(≥1 整数)
|
|
17
18
|
* 读配置——非法/缺省回退 DEFAULTS(agent.poolLimits 三键——/config 并发池子菜单/
|
|
18
|
-
* 主菜单/view 三面共用同一读取——config-pool.test.mjs
|
|
19
|
+
* 主菜单/view 三面共用同一读取——config-pool.test.mjs 单元测试)。 */
|
|
19
20
|
export function poolCur(pl, defaults) {
|
|
20
21
|
return (k) => (Number.isInteger(pl?.[k]) && pl[k] >= 1 ? pl[k] : defaults.agent.poolLimits[k])
|
|
21
22
|
}
|
|
@@ -37,11 +38,11 @@ export async function handleConfigCommand(ctx, args = []) {
|
|
|
37
38
|
let tc = agent.config?.traces ?? {}
|
|
38
39
|
let dc = agent.config?.diagnostics ?? {}
|
|
39
40
|
|
|
40
|
-
// agent.config.proxy 已被 loadConfig 归一化为 { uri, web
|
|
41
|
+
// agent.config.proxy 已被 loadConfig 归一化为 { uri, web } | undefined
|
|
41
42
|
function proxySummary() {
|
|
42
43
|
const pc = agent.config?.proxy
|
|
43
44
|
if (!pc) return "not configured"
|
|
44
|
-
return `${pc.uri} web:${pc.web ? "on" : "off"}
|
|
45
|
+
return `${pc.uri} web:${pc.web ? "on" : "off"}`
|
|
45
46
|
}
|
|
46
47
|
|
|
47
48
|
async function setEmbedKey() {
|
|
@@ -62,7 +63,7 @@ export async function handleConfigCommand(ctx, args = []) {
|
|
|
62
63
|
|
|
63
64
|
/** 保存后的公共重载:loadConfig → injectProxy → 恢复运行时 provider 选择。
|
|
64
65
|
* MODEL-MERGE-SESSION 三支改写(cfg 无 active*):运行时由「会话槽复合仍在 providers 中 →
|
|
65
|
-
* 保持槽值」或「config defaultModel
|
|
66
|
+
* 保持槽值」或「config defaultModel(新会话起点)」决定(渠道条目不携模型——2026-10-09 清除批)。 */
|
|
66
67
|
async function reloadConfig() {
|
|
67
68
|
const { loadConfig } = await import("@thincoder/core/config.mjs")
|
|
68
69
|
const { injectProxy } = await import("@thincoder/core/proxy.mjs")
|
|
@@ -75,9 +76,10 @@ export async function handleConfigCommand(ctx, args = []) {
|
|
|
75
76
|
agent.config.agent ??= {}
|
|
76
77
|
const keep = sessionName ? cfg.providersList.find((p) => p.name === sessionName) : null
|
|
77
78
|
if (keep) {
|
|
78
|
-
// 会话 provider 仍存在 → 会话复合优先(槽值——不看 cfg
|
|
79
|
+
// 会话 provider 仍存在 → 会话复合优先(槽值——不看 cfg 默认;模型空时落默认复合;
|
|
80
|
+
// 渠道侧无模型可回落——单值退场 2026-10-09 清除批:缺 ⇒ 明示未设置)
|
|
79
81
|
const dm = cfg.provider.name ? cfg.provider : null
|
|
80
|
-
const model = sessionModel ?? (dm && dm.name === sessionName ? dm.model :
|
|
82
|
+
const model = sessionModel ?? (dm && dm.name === sessionName ? dm.model : "")
|
|
81
83
|
agent.activeProvider = keep.name
|
|
82
84
|
agent.activeModel = model || null
|
|
83
85
|
agent.provider = { ...keep }
|
|
@@ -113,12 +115,11 @@ export async function handleConfigCommand(ctx, args = []) {
|
|
|
113
115
|
async function proxyMenu() {
|
|
114
116
|
let proxyIdx = 0
|
|
115
117
|
for (;;) {
|
|
116
|
-
const pc = agent.config?.proxy // 已归一化 { uri, web
|
|
118
|
+
const pc = agent.config?.proxy // 已归一化 { uri, web } | undefined
|
|
117
119
|
const entries = [
|
|
118
120
|
{ type: "header", text: `Proxy: ${pc?.uri || "(not set)"}` },
|
|
119
121
|
{ type: "item", text: "Set proxy URI…", action: "seturi" },
|
|
120
122
|
{ type: "item", text: `Web tools (fetch/websearch): ${!pc || pc.web ? "ON" : "OFF"}`, action: "toggleweb" },
|
|
121
|
-
{ type: "item", text: `Model requests (providers with proxy:true): ${pc?.model ? "ON" : "OFF"}`, action: "togglemodel" },
|
|
122
123
|
{ type: "item", text: "Test connection", action: "test" },
|
|
123
124
|
{ type: "item", text: "Clear proxy", action: "clear" },
|
|
124
125
|
]
|
|
@@ -130,20 +131,18 @@ export async function handleConfigCommand(ctx, args = []) {
|
|
|
130
131
|
if (c.action === "seturi") {
|
|
131
132
|
const newUri = await askQuestion("Proxy URI (e.g. http://127.0.0.1:7890):")
|
|
132
133
|
if (!newUri) continue // 空输入不改动
|
|
133
|
-
//
|
|
134
|
+
// 写即归一:两键重建 `{ uri, web }`——旧 string 形态 ∥ 盘上退役残键(如 `model`)读后即清;
|
|
135
|
+
// `web` 不显式 OFF 即 true(沿现值显示口径 `!pc || pc.web`——改 URI 不动 web 开合)。
|
|
134
136
|
await saveProxy((raw) => {
|
|
135
|
-
raw.proxy =
|
|
136
|
-
? { ...raw.proxy, uri: newUri }
|
|
137
|
-
: { uri: newUri, web: true, model: false }
|
|
137
|
+
raw.proxy = { uri: newUri, web: !pc || pc.web !== false }
|
|
138
138
|
})
|
|
139
139
|
pushLabel("❯ Config", ansi.bold + C.tool)
|
|
140
140
|
pushLine(`proxy.uri = ${newUri}`, C.tool)
|
|
141
|
-
} else if (c.action === "toggleweb"
|
|
141
|
+
} else if (c.action === "toggleweb") {
|
|
142
142
|
if (!pc) { pushLine("Proxy URI not set — use Set proxy URI… first", C.error); continue }
|
|
143
|
-
|
|
144
|
-
await saveProxy((raw) => { raw.proxy = { ...pc, [key]: !pc[key] } })
|
|
143
|
+
await saveProxy((raw) => { raw.proxy = { ...pc, web: !pc.web } })
|
|
145
144
|
pushLabel("❯ Config", ansi.bold + C.tool)
|
|
146
|
-
pushLine(`proxy
|
|
145
|
+
pushLine(`proxy.web = ${!pc.web ? "on" : "off"}`, C.tool)
|
|
147
146
|
} else if (c.action === "test") {
|
|
148
147
|
const { proxyFetch, resolveWebProxy } = await import("@thincoder/core/proxy.mjs")
|
|
149
148
|
const { UA } = await import("@thincoder/core/tools/web.mjs")
|
|
@@ -293,7 +292,7 @@ export async function handleConfigCommand(ctx, args = []) {
|
|
|
293
292
|
const probes = new Map()
|
|
294
293
|
pushLine("Fetching channel model lists (GET /models)…", C.dim)
|
|
295
294
|
await Promise.all(agent.providers.map(async (p) => {
|
|
296
|
-
const r = await probeChannelModels(p)
|
|
295
|
+
const r = await probeChannelModels(probeTargetOf(p)) // 探针目标构造收敛核判据(③′——逐渠旗 ∧ `uri` 在案;执行体零改)
|
|
297
296
|
probes.set(p.name, r)
|
|
298
297
|
if (r.ok) delete p._unavailable
|
|
299
298
|
else p._unavailable = true
|
|
@@ -306,8 +305,8 @@ export async function handleConfigCommand(ctx, args = []) {
|
|
|
306
305
|
const r = probes.get(p.name)
|
|
307
306
|
if (!r?.ok) return { type: "item", text: `${p.name.padEnd(10)} 不可用`, action: "provider", provider: p.name, unavailable: true }
|
|
308
307
|
const n = r.list.length
|
|
309
|
-
// M3
|
|
310
|
-
return { type: "item", text: `${p.name.padEnd(10)} ${p.
|
|
308
|
+
// M3③:渠道行显示回退 = `baseURL`(渠道条目不携模型——2026-10-09 清除批)+ 探得候选数
|
|
309
|
+
return { type: "item", text: `${p.name.padEnd(10)} ${p.baseURL} (${n} model${n === 1 ? "" : "s"})`, action: "provider", provider: p.name }
|
|
311
310
|
}),
|
|
312
311
|
]
|
|
313
312
|
const c = await showPicker("Default Model (新会话起点)", entries, { defaultIndex: idx })
|
package/src/tui/cmd-mcp-form.mjs
CHANGED
|
@@ -1,31 +1,67 @@
|
|
|
1
1
|
import { C } from "./ansi.mjs"
|
|
2
|
-
// #58(hygiene-sweep
|
|
2
|
+
// #58(hygiene-sweep 批)∥ #1046:headers/env 行集现值 ∥ 问句脱敏判据 = 核 settings 同源单点(不再各自为政)。
|
|
3
3
|
import { isSensitiveKey } from "@thincoder/core/agent-tools/settings.mjs"
|
|
4
4
|
|
|
5
5
|
/** MCP.md §5 v2(D-1):edit/add 统一字段 picker 表单机制。
|
|
6
6
|
* fieldPicker 循环:picker 列字段行(label + 当前值打码)+ `✓ Save & test` 末行;
|
|
7
|
-
* 选中字段 → askQuestion
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
*
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
7
|
+
* 选中字段 → askQuestion 只输入该字段新值——空=不变、`-`=删除可选字段、required 字段
|
|
8
|
+
* 拒绝 `-`(不许删空)→ 回 picker(已改值保留——T18b 中间 Esc 回 picker 不丢);
|
|
9
|
+
* 选 `✓ Save & test` → 必填校验(add 含 name 重复检查)→ 调用方走 F2 预览+探活确认环;
|
|
10
|
+
* 探活失败回同一 picker(AC2——独立 retry 路径废除)。
|
|
11
|
+
* **headers / env = 逐对行集编辑**(#1046 行集化 · 2026-10-10,口径单源 = docs/core/design/MCP.md
|
|
12
|
+
* §6.5):选中该字段 ⇒ 行集选择器(每行 = 一对 `k=<值/掩码>`——敏感值掩码沿 `isSensitiveKey`
|
|
13
|
+
* 单源;末两行 `+ Add row` ∥ `← Back`)→ 选某对问值 ∥ `+ Add row` 问 `key=value`;提交四判据
|
|
14
|
+
* 同 GUI 两端行格(trim ∥ 空键/空值行不提交 ∥ 重复键后行胜 ∥ 全空 ⇒ 字段删除);值 = 字面——
|
|
15
|
+
* 串式半语法(comma-split ∥ 引号剥离 ∥ `-` 整串清空)退场。本文件亦为 v1 cmd-mcp.mjs 的
|
|
16
|
+
* maskToken 迁移落点(拆分前置——cmd-mcp.mjs 499 行压 500 硬限,评审 #1)。 */
|
|
17
|
+
|
|
18
|
+
/** 行集字段面字(提示语 / 拒收文案共用;`title` = 行级词,`field` = 字段词)。 */
|
|
19
|
+
const PAIR_LABELS = {
|
|
20
|
+
headers: { title: "Header", field: "Headers" },
|
|
21
|
+
env: { title: "Env var", field: "Env" },
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/** #1046 行集编辑(headers/env——逐对;终端原生载体 = 既有 `showPicker` + `askQuestion`,零新组件类)。
|
|
25
|
+
* 语义沿 GUI 两端行格编辑器四判据(口径单源 = `docs/core/design/MCP.md` §6.5):trim ∥ 空键/空值
|
|
26
|
+
* 行不提交(拒 + 提示)∥ 重复键后行胜 ∥ 全空 ⇒ 字段删除;值 = 字面(零引号剥离 ∥ 零逗号切分——
|
|
27
|
+
* 逗号/等号/引号/空格原样)。Esc ∥ `← Back` ⇒ 回字段 picker(已改值不丢——T18b 同径)。 */
|
|
28
|
+
async function editPairs(ctx, entry, field, title) {
|
|
29
|
+
const { showPicker, askQuestion, pushLine } = ctx
|
|
30
|
+
const words = PAIR_LABELS[field]
|
|
31
|
+
for (;;) {
|
|
32
|
+
const sel = await showPicker(`${title} · ${words.field}`, [
|
|
33
|
+
...Object.entries(entry[field] ?? {}).map(([k, v]) => ({
|
|
34
|
+
type: "item",
|
|
35
|
+
text: `${k}=${isSensitiveKey(k) ? "••••" : String(v)}`, // 敏感键值位脱敏(核 settings 同源谓词)
|
|
36
|
+
action: `row:${k}`,
|
|
37
|
+
})),
|
|
38
|
+
{ type: "item", text: "+ Add row", action: "add" },
|
|
39
|
+
{ type: "item", text: "← Back", action: "back" },
|
|
40
|
+
])
|
|
41
|
+
if (!sel || sel.action === "back") return
|
|
42
|
+
if (sel.action === "add") {
|
|
43
|
+
const raw = ((await askQuestion(`${words.title} entry (key=value):`)) ?? "").trim()
|
|
44
|
+
const eq = raw.indexOf("=")
|
|
45
|
+
if (eq === -1) { pushLine(`[mcp] ${words.title} entry needs key=value — not added`, C.error); continue }
|
|
46
|
+
const key = raw.slice(0, eq).trim()
|
|
47
|
+
const value = raw.slice(eq + 1).trim()
|
|
48
|
+
if (!key) { pushLine(`[mcp] ${words.title} key is empty — not added`, C.error); continue }
|
|
49
|
+
if (!value) { pushLine(`[mcp] ${words.title} value is empty — not added`, C.error); continue }
|
|
50
|
+
entry[field] = { ...(entry[field] ?? {}), [key]: value } // 重复键 = 后行胜(同键赋值 ⇒ 原位覆盖)
|
|
51
|
+
continue
|
|
52
|
+
}
|
|
53
|
+
const key = sel.action.slice("row:".length)
|
|
54
|
+
const shown = isSensitiveKey(key) ? "••••" : String(entry[field]?.[key] ?? "")
|
|
55
|
+
const input = ((await askQuestion(`${words.title} "${key}" (current: ${shown}; '-' removes; empty keeps):`)) ?? "").trim()
|
|
56
|
+
if (input === "-") {
|
|
57
|
+
const next = { ...entry[field] }
|
|
58
|
+
delete next[key]
|
|
59
|
+
if (Object.keys(next).length > 0) entry[field] = next
|
|
60
|
+
else delete entry[field] // 全删 ⇒ 字段删除(沿 GUI「全空 ⇒ 字段删除」)
|
|
61
|
+
} else if (input) {
|
|
62
|
+
entry[field] = { ...entry[field], [key]: input } // 值 = 字面(引号不剥——串式半语法退场)
|
|
26
63
|
}
|
|
27
64
|
}
|
|
28
|
-
return Object.keys(merged).length > 0 ? merged : null
|
|
29
65
|
}
|
|
30
66
|
|
|
31
67
|
/** F2(评审 #6):预览 token 遮蔽——len > 12 显示前 4 字符 + "…",否则全遮。 */
|
|
@@ -113,19 +149,11 @@ function formEntries(entry, transport, mode) {
|
|
|
113
149
|
]
|
|
114
150
|
}
|
|
115
151
|
|
|
116
|
-
/**
|
|
117
|
-
* `
|
|
118
|
-
function currentPairs(v) {
|
|
119
|
-
const pairs = Object.entries(v ?? {}).map(([k, val]) => (isSensitiveKey(k) ? `${k}=••••` : `${k}=${val}`))
|
|
120
|
-
return pairs.length ? pairs.join(", ") : "none"
|
|
121
|
-
}
|
|
122
|
-
|
|
123
|
-
/** 字段输入提示 `(current: …)`——token 打码(maskToken)、headers/env 列键值对(敏感值位遮)、
|
|
124
|
-
* args 空格串接;空值 → "none"。 */
|
|
152
|
+
/** 字段输入提示 `(current: …)`——token 打码(maskToken)、args 空格串接;空值 → "none"。
|
|
153
|
+
* headers/env 不入本径(行集编辑——现值列示 ∥ 脱敏在 `editPairs` 行集面)。 */
|
|
125
154
|
function currentText(entry, field) {
|
|
126
155
|
const v = entry[field]
|
|
127
156
|
if (field === "token") return v ? maskToken(v) : "none"
|
|
128
|
-
if (field === "headers" || field === "env") return currentPairs(v)
|
|
129
157
|
if (field === "args") return (v ?? []).length ? v.join(" ") : "none"
|
|
130
158
|
return String(v ?? "") || "none"
|
|
131
159
|
}
|
|
@@ -135,19 +163,17 @@ const PROMPT_BASES = {
|
|
|
135
163
|
url: "HTTP URL",
|
|
136
164
|
wsUrl: "WebSocket URL",
|
|
137
165
|
token: "Auth token (Bearer, optional; '-' clears, empty keeps)",
|
|
138
|
-
headers: "Headers (key=value, comma-separated; key= removes; empty keeps; '-' clears all)",
|
|
139
166
|
command: "Command",
|
|
140
167
|
args: "Arguments (space-separated; '-' clears, empty keeps)",
|
|
141
|
-
env: "Environment variables (key=value, comma-separated; key= removes; empty keeps; '-' clears all)",
|
|
142
168
|
}
|
|
143
169
|
|
|
144
170
|
function fieldPrompt(entry, field) {
|
|
145
171
|
return `${PROMPT_BASES[field]} (current: ${currentText(entry, field)}):`
|
|
146
172
|
}
|
|
147
173
|
|
|
148
|
-
/** 字段输入应用(UI 决策 #3):空=不变;`-`=删除可选字段(token/
|
|
149
|
-
*
|
|
150
|
-
*
|
|
174
|
+
/** 字段输入应用(UI 决策 #3):空=不变;`-`=删除可选字段(token/args);required 字段
|
|
175
|
+
* (name/url/wsUrl/command)拒绝 `-`——必填不许删空。headers/env 不入本径(行集编辑——
|
|
176
|
+
* `editPairs`:空=不变 ∥ `-`=删该行)。返回错误文案(调用方 pushLine)或 null。 */
|
|
151
177
|
function applyFieldInput(entry, field, input, required) {
|
|
152
178
|
if (required) {
|
|
153
179
|
if (input === "-") return `${FIELD_LABELS[field]} is required — cannot be cleared`
|
|
@@ -157,13 +183,6 @@ function applyFieldInput(entry, field, input, required) {
|
|
|
157
183
|
if (field === "token") {
|
|
158
184
|
if (input === "-") delete entry.token
|
|
159
185
|
else if (input) entry.token = input
|
|
160
|
-
} else if (field === "headers" || field === "env") {
|
|
161
|
-
if (input === "-") delete entry[field]
|
|
162
|
-
else if (input) {
|
|
163
|
-
const updated = mergeKeyValuePairs(entry[field] ? { ...entry[field] } : {}, input)
|
|
164
|
-
if (updated) entry[field] = updated
|
|
165
|
-
else delete entry[field]
|
|
166
|
-
}
|
|
167
186
|
} else if (field === "args") {
|
|
168
187
|
if (input === "-") delete entry.args
|
|
169
188
|
else if (input) entry.args = input.split(/\s+/)
|
|
@@ -195,6 +214,10 @@ export async function fieldPicker(ctx, { title, mode, entry, transport, existing
|
|
|
195
214
|
return { action: "save", entry }
|
|
196
215
|
}
|
|
197
216
|
const field = sel.action.slice("field:".length)
|
|
217
|
+
if (field === "headers" || field === "env") {
|
|
218
|
+
await editPairs(ctx, entry, field, title) // #1046:行集编辑(Esc ∥ `← Back` 回本 picker)
|
|
219
|
+
continue
|
|
220
|
+
}
|
|
198
221
|
const raw = ((await askQuestion(fieldPrompt(entry, field))) ?? "").trim()
|
|
199
222
|
const err = applyFieldInput(entry, field, raw, required.includes(field))
|
|
200
223
|
if (err) pushLine(`[mcp] ${err}`, C.error)
|
package/src/tui/cmd-submodel.mjs
CHANGED
|
@@ -26,9 +26,9 @@ function slotDisplay(agent, role) {
|
|
|
26
26
|
* /submodel <type> <value> → set a role slot
|
|
27
27
|
* /submodel <type> → show a slot
|
|
28
28
|
* /submodel reset [type] → clear global (or a slot)
|
|
29
|
-
* value forms: provider:model |
|
|
29
|
+
* value forms: provider:model | model name(同 subagent 工具 model 入参;裸渠名 = 清除批前遗留值——2026-10-09 起解析层拒)
|
|
30
30
|
* MODEL-MERGE-SESSION:会话模型 = provider:model 复合(agent.activeProvider/activeModel 双字段
|
|
31
|
-
*
|
|
31
|
+
* 恒非空——渠道条目不携模型(单值退场——2026-10-09 清除批)——父会话模型引用一律复合值)。 */
|
|
32
32
|
export async function handleSubmodelCommand(ctx, args = []) {
|
|
33
33
|
const { agent, pushLine, showPicker, askQuestion, persistRaw, pickModelForSlot } = ctx
|
|
34
34
|
const input = args.join(" ").trim()
|