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/wizard.mjs
CHANGED
|
@@ -1,34 +1,57 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* wizard.mjs — first-launch config wizard
|
|
3
|
-
*
|
|
4
|
-
*
|
|
3
|
+
* 首屏两路(登录面补全批 · TUI-COMMANDS.md §3.1):`route` 屏(① 登录团队服务器 ∥ ② 配置本地 provider
|
|
4
|
+
* ∥ ③ 以后再说——**零预选**:光标 = 首行;说明行随光标)⇒ ①团队三问步(`server → username →
|
|
5
|
+
* password`——步定义 ∥ 掩码单源 = `ask-steps.mjs`;败 ⇒ 四句逐字就地 + 停留可重试)/ ②既有 provider
|
|
6
|
+
* 步零改。回退行「← 换一种方式」(团队步 ∥ 本地步 1 皆在场)⇒ 回 route;保真 = 已填保留(团队地址/账号
|
|
7
|
+
* ∥ provider 字段—同会话内),密码恒不保留。
|
|
8
|
+
* Extracted from index.mjs: provider select → step-by-step input (name/baseURL/format/key/embedkey)
|
|
9
|
+
* → 末问「走 proxy」(#1049 补步——showPicker,落盘前)→ persist → then model picker. Custom 分支含 API format 步(D-C2,TUI.md §10.6D)。
|
|
10
|
+
* 2026-10-09 清除批:**渠道条目不携模型**(单值 `providers[].model` 退场)——落盘后由模型 picker 显式选定
|
|
11
|
+
* (`selectModel` 选定即写回 config.defaultModel);零播种 ∥ 零静默回落。
|
|
5
12
|
* Accesses shared state and UI functions from the startTUI closure via ctx object.
|
|
6
|
-
* ctx: { agent, state, pushLine, pushLabel, render, persistRaw, openModelPicker }
|
|
13
|
+
* ctx: { agent, state, pushLine, pushLabel, render, persistRaw, showPicker, openModelPicker, onModalClose }
|
|
7
14
|
*/
|
|
8
15
|
|
|
9
16
|
import { PROVIDER_PRESETS as PRESETS } from "@thincoder/core/config.mjs"
|
|
17
|
+
import { teamLogin, teamStatus } from "@thincoder/core/team.mjs"
|
|
10
18
|
import { ansi, C } from "./ansi.mjs"
|
|
11
19
|
import { computeLayout } from "./layout.mjs"
|
|
12
20
|
import { probeChannelModels } from "./model-catalog.mjs"
|
|
21
|
+
import { probeTargetOf } from "@thincoder/core/provider-flows.mjs"
|
|
22
|
+
import { nextTeamAskStep, teamAskLines, teamAskStepAt } from "./ask-steps.mjs"
|
|
23
|
+
import { MODEL_SELECT_HINT, completeTeamLogin } from "./cmd-team.mjs"
|
|
24
|
+
import { FAILURE_TEXT } from "../cli/team-command.mjs"
|
|
25
|
+
|
|
26
|
+
/** 首屏三行(TUI-COMMANDS.md §3.1——文案逐字:① ∥ ② 说明 = 团队卡 ∥ 本地卡同句;③ 零说明行)。 */
|
|
27
|
+
const WIZARD_ROUTES = Object.freeze([
|
|
28
|
+
Object.freeze({ kind: "route-team", label: "登录团队服务器", desc: "用团队发的账号登录——模型由服务器提供,不用自己填 key" }),
|
|
29
|
+
Object.freeze({ kind: "route-local", label: "配置本地 provider", desc: "自己填 API key,不依赖团队服务器" }),
|
|
30
|
+
Object.freeze({ kind: "route-later", label: "以后再说", desc: null }),
|
|
31
|
+
])
|
|
32
|
+
|
|
33
|
+
/** 回退行词面(两在场点共用——团队三问步 ∥ 本地 provider 步)。 */
|
|
34
|
+
const BACK_ROW_LABEL = "← 换一种方式"
|
|
13
35
|
|
|
14
36
|
/**
|
|
15
37
|
* Creates the wizard controller.
|
|
16
38
|
* Returns { startWizard, renderWizard, wizardChooseProvider, wizardSubmitText, cancelWizard, finishWizard }
|
|
17
39
|
*/
|
|
18
40
|
export function createWizard(ctx) {
|
|
19
|
-
const { agent, state, pushLine, pushLabel, render, persistRaw, onModalClose = null } = ctx
|
|
41
|
+
const { agent, state, pushLine, pushLabel, render, persistRaw, showPicker, onModalClose = null } = ctx
|
|
20
42
|
|
|
21
43
|
/** Candidates for the menu step: existing providers (marked "no key" if missing), unadded presets, custom
|
|
22
|
-
*
|
|
44
|
+
* 渠道条目不携模型(2026-10-09 清除批:单值 `providers[].model` 退场)——条目只携 name/baseURL + 预设扩展字段;
|
|
45
|
+
* 模型在向导尾由模型 picker 显式选定(候选清单运行期拉取)。 */
|
|
23
46
|
function wizardProviderItems() {
|
|
24
47
|
const items = []
|
|
25
48
|
for (const p of agent.providers) {
|
|
26
|
-
items.push({ kind: "existing", name: p.name, baseURL: p.baseURL,
|
|
49
|
+
items.push({ kind: "existing", name: p.name, baseURL: p.baseURL, label: `${p.name} (added${p.apiKey ? "" : ", no key"})` })
|
|
27
50
|
}
|
|
28
51
|
for (const [name, p] of Object.entries(PRESETS)) {
|
|
29
52
|
if (!agent.providers.some((x) => x.name === name)) {
|
|
30
53
|
items.push({
|
|
31
|
-
kind: "preset", name, baseURL: p.baseURL,
|
|
54
|
+
kind: "preset", name, baseURL: p.baseURL, label: `${name} (${p.desc})`,
|
|
32
55
|
// 预设自身声明的扩展字段随 preset 直达落盘(code review 🟡——与 pickers preset 路径同构;
|
|
33
56
|
// claude/gemini 缺 format、deepseek/glm 缺 thinking/maxTokens 会静默错配);不新增提问步。
|
|
34
57
|
format: p.format, thinking: p.thinking, reasoningEffort: p.reasoningEffort,
|
|
@@ -37,6 +60,9 @@ export function createWizard(ctx) {
|
|
|
37
60
|
}
|
|
38
61
|
}
|
|
39
62
|
items.push({ kind: "custom", name: null, label: "Custom endpoint…" })
|
|
63
|
+
// 回退行(TUI-COMMANDS.md §3.1 键盘激活裁定):列表**末行**——↑↓ 选中 + Enter 回 route 屏
|
|
64
|
+
// (与列表步同键,零新键;行文本自含语义)。
|
|
65
|
+
items.push({ kind: "back", name: null, label: BACK_ROW_LABEL })
|
|
40
66
|
return items
|
|
41
67
|
}
|
|
42
68
|
|
|
@@ -51,10 +77,6 @@ export function createWizard(ctx) {
|
|
|
51
77
|
prompt: "Enter baseURL (e.g. https://api.openai.com/v1)",
|
|
52
78
|
validate: (v) => /^https?:\/\/.+/.test(v) || "baseURL must start with http(s)://",
|
|
53
79
|
},
|
|
54
|
-
model: {
|
|
55
|
-
prompt: "Enter model name (e.g. gpt-4o)",
|
|
56
|
-
validate: (v) => v.length > 0 || "Model name required",
|
|
57
|
-
},
|
|
58
80
|
// D-C2(TUI.md §10.6D):Custom 分支的 API format 步(endpoint 后 key 前——与 Add Provider
|
|
59
81
|
// picker 路径两入口一致;默认 openai)。空输入 = openai 直过(Enter 即默认——同 D-C1 index=0);
|
|
60
82
|
// Esc 在该步沿用 wizard 既有“Esc 随时跳过”语义(取消整个向导——无半配置落盘)。
|
|
@@ -72,10 +94,16 @@ export function createWizard(ctx) {
|
|
|
72
94
|
validate: () => true, // skippable
|
|
73
95
|
},
|
|
74
96
|
}
|
|
75
|
-
const WIZARD_NEXT = { name: "baseURL", baseURL: "
|
|
97
|
+
const WIZARD_NEXT = { name: "baseURL", baseURL: "format", format: "key", key: "embedkey", embedkey: null }
|
|
76
98
|
|
|
77
99
|
function startWizard() {
|
|
78
|
-
state.wizard = {
|
|
100
|
+
state.wizard = {
|
|
101
|
+
step: "route", index: 0, scroll: 0, selectedLine: 0, fields: {}, error: null, lines: [],
|
|
102
|
+
// 登录面补全批:团队路留存(地址 ∥ 账号——密码零字段:恒不保留)+ 回退行焦点位 + 提交重入闸
|
|
103
|
+
team: { inited: false, server: "", username: "" },
|
|
104
|
+
teamFocusBack: false,
|
|
105
|
+
busy: false,
|
|
106
|
+
}
|
|
79
107
|
renderWizard()
|
|
80
108
|
}
|
|
81
109
|
|
|
@@ -83,7 +111,21 @@ export function createWizard(ctx) {
|
|
|
83
111
|
const w = state.wizard
|
|
84
112
|
if (!w) return
|
|
85
113
|
const lines = []
|
|
86
|
-
if (w.step === "
|
|
114
|
+
if (w.step === "route") {
|
|
115
|
+
lines.push({ text: " Choose a route:", color: C.text })
|
|
116
|
+
WIZARD_ROUTES.forEach((it, i) => {
|
|
117
|
+
if (i === w.index) w.selectedLine = lines.length
|
|
118
|
+
lines.push({
|
|
119
|
+
text: `${i === w.index ? " ▸ " : " "}${it.label}`,
|
|
120
|
+
color: i === w.index ? ansi.bold + C.text : C.dim,
|
|
121
|
+
})
|
|
122
|
+
if (i === w.index && it.desc) lines.push({ text: ` ${it.desc}`, color: C.dim })
|
|
123
|
+
})
|
|
124
|
+
} else if (teamAskStepAt(w.step) !== null) {
|
|
125
|
+
lines.push(...teamAskLines(w.step, w.team))
|
|
126
|
+
lines.push(backRowLine(w.teamFocusBack === true))
|
|
127
|
+
w.selectedLine = 0
|
|
128
|
+
} else if (w.step === "provider") {
|
|
87
129
|
lines.push({ text: " Choose a model provider:", color: C.text })
|
|
88
130
|
wizardProviderItems().forEach((it, i) => {
|
|
89
131
|
if (i === w.index) w.selectedLine = lines.length
|
|
@@ -96,7 +138,6 @@ export function createWizard(ctx) {
|
|
|
96
138
|
const f = w.fields
|
|
97
139
|
if (f.name) lines.push({ text: ` Provider: ${f.name}`, color: C.dim })
|
|
98
140
|
if (f.baseURL) lines.push({ text: ` baseURL: ${f.baseURL}`, color: C.dim })
|
|
99
|
-
if (f.model) lines.push({ text: ` Model: ${f.model}`, color: C.dim })
|
|
100
141
|
lines.push({ text: ` ❯ ${WIZARD_STEPS[w.step].prompt}`, color: ansi.bold + C.text })
|
|
101
142
|
lines.push({ text: " (type in input box below)", color: C.dim })
|
|
102
143
|
w.selectedLine = 0
|
|
@@ -121,11 +162,16 @@ export function createWizard(ctx) {
|
|
|
121
162
|
|
|
122
163
|
function wizardChooseProvider(item) {
|
|
123
164
|
const w = state.wizard
|
|
165
|
+
if (item.kind === "back") {
|
|
166
|
+
wizardBackToRoute() // 「← 换一种方式」(本地步 1)⇒ 回 route 屏(已填保留)
|
|
167
|
+
return
|
|
168
|
+
}
|
|
124
169
|
if (item.kind === "custom") {
|
|
125
170
|
w.step = "name"
|
|
126
171
|
} else {
|
|
127
|
-
|
|
128
|
-
|
|
172
|
+
// 2026-10-09 清除批:渠道条目不携模型——fields 只收 name/baseURL + 预设扩展字段
|
|
173
|
+
w.fields = { name: item.name, baseURL: item.baseURL }
|
|
174
|
+
// preset 直达:其余扩展字段照旧(随 fields 落盘)
|
|
129
175
|
for (const k of ["format", "thinking", "reasoningEffort", "maxTokens", "chatPath"]) {
|
|
130
176
|
if (item[k]) w.fields[k] = item[k]
|
|
131
177
|
}
|
|
@@ -134,8 +180,88 @@ export function createWizard(ctx) {
|
|
|
134
180
|
renderWizard()
|
|
135
181
|
}
|
|
136
182
|
|
|
183
|
+
/** 回退行渲染(团队步在场):焦点态 = ↑ 聚焦位(裁定 2026-10-10「↑ 聚焦该行 + Enter」)——
|
|
184
|
+
* 两态行文本都自含可见键提示(不得藏键)。 */
|
|
185
|
+
function backRowLine(focused) {
|
|
186
|
+
return focused
|
|
187
|
+
? { text: ` ▸ ${BACK_ROW_LABEL}(Enter 确认 · ↓ 回输入框)`, color: ansi.bold + C.text }
|
|
188
|
+
: { text: ` ${BACK_ROW_LABEL}(↑ 选中)`, color: C.dim }
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
/** route 步行源(三行——零预选:`index` 初值 0 = 首行高亮,无“常选态”)。 */
|
|
192
|
+
function wizardRouteItems() {
|
|
193
|
+
return WIZARD_ROUTES
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
/** route 行选中:① ⇒ 团队三问步(字段首入预填核留存快照);② ⇒ 既有 provider 步(零改);
|
|
197
|
+
* ③ ⇒ 既有 `cancelWizard` 语义(退场 + Skipped 提示——无半配置落盘)。 */
|
|
198
|
+
function wizardChooseRoute(item) {
|
|
199
|
+
const w = state.wizard
|
|
200
|
+
if (!w) return
|
|
201
|
+
if (item.kind === "route-team") {
|
|
202
|
+
initTeamFields(w)
|
|
203
|
+
enterTeamStep(w, "server")
|
|
204
|
+
return
|
|
205
|
+
}
|
|
206
|
+
if (item.kind === "route-local") {
|
|
207
|
+
w.step = "provider"
|
|
208
|
+
w.index = 0
|
|
209
|
+
w.error = null
|
|
210
|
+
state.input = []
|
|
211
|
+
state.cursor = 0
|
|
212
|
+
renderWizard()
|
|
213
|
+
return
|
|
214
|
+
}
|
|
215
|
+
cancelWizard()
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
/** 团队字段初值(同会话首入一次——`inited` 门):核留存快照预填(TEAM.md §2.1 member 行
|
|
219
|
+
* 「表单预填」——桌面表单同款);读不可用 ⇒ 空。密码零字段(恒不保留)。 */
|
|
220
|
+
function initTeamFields(w) {
|
|
221
|
+
if (w.team.inited === true) return
|
|
222
|
+
let st = null
|
|
223
|
+
try { st = teamStatus() } catch { st = null }
|
|
224
|
+
w.team.server = st?.server ?? ""
|
|
225
|
+
w.team.username = st?.member?.username ?? ""
|
|
226
|
+
w.team.inited = true
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
/** 团队步入场:输入框预填该步留存值(地址 ∥ 账号——掩码步恒空)∥ 焦点复位 ∥ 错误清。 */
|
|
230
|
+
function enterTeamStep(w, stepName) {
|
|
231
|
+
const def = teamAskStepAt(stepName)
|
|
232
|
+
w.step = stepName
|
|
233
|
+
w.teamFocusBack = false
|
|
234
|
+
w.error = null
|
|
235
|
+
const value = def.mask ? "" : (w.team[def.field] ?? "")
|
|
236
|
+
state.input = [...value]
|
|
237
|
+
state.cursor = state.input.length
|
|
238
|
+
renderWizard()
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
/** 回退到 route 屏(两在场点共用:团队步 ∥ 本地步 1——「← 换一种方式」)。保真判据(§3.1):
|
|
242
|
+
* 已填保留——未提交的输入框内容在非掩码步收入字段(= 已填)、掩码步(密码)即弃;
|
|
243
|
+
* `fields`(本地路)与 `team` 地址/账号不动。 */
|
|
244
|
+
function wizardBackToRoute() {
|
|
245
|
+
const w = state.wizard
|
|
246
|
+
if (!w) return
|
|
247
|
+
const def = teamAskStepAt(w.step)
|
|
248
|
+
const typed = state.input.join("")
|
|
249
|
+
if (def !== null && def.mask !== true && typed !== "") w.team[def.field] = def.trim ? typed.trim() : typed
|
|
250
|
+
w.step = "route"
|
|
251
|
+
w.index = 0
|
|
252
|
+
w.teamFocusBack = false
|
|
253
|
+
w.error = null
|
|
254
|
+
state.input = []
|
|
255
|
+
state.cursor = 0
|
|
256
|
+
renderWizard()
|
|
257
|
+
}
|
|
258
|
+
|
|
137
259
|
function wizardSubmitText() {
|
|
138
260
|
const w = state.wizard
|
|
261
|
+
const teamDef = teamAskStepAt(w.step)
|
|
262
|
+
if (teamDef !== null) {
|
|
263
|
+
return submitTeamStep(w, teamDef).catch((e) => pushLine(`[error] ${e?.message ?? e}`, C.error))
|
|
264
|
+
}
|
|
139
265
|
const value = state.input.join("").trim()
|
|
140
266
|
const ok = WIZARD_STEPS[w.step].validate(value)
|
|
141
267
|
if (ok !== true) {
|
|
@@ -158,8 +284,42 @@ export function createWizard(ctx) {
|
|
|
158
284
|
}
|
|
159
285
|
}
|
|
160
286
|
|
|
287
|
+
/** 团队步提交:步内推进(末步 ⇒ 核 `teamLogin`)。成 ⇒ 退场 + 公共收尾(结果行 ∥ 两复读 ∥
|
|
288
|
+
* 模型选定——`cmd-team.mjs` 单源);败 ⇒ 四句逐字就地 + 停留(步不动、输入框清空——密码零留存重输)。 */
|
|
289
|
+
async function submitTeamStep(w, def) {
|
|
290
|
+
if (w.busy === true) return // 提交在途重入闸
|
|
291
|
+
const raw = state.input.join("")
|
|
292
|
+
const value = def.trim ? raw.trim() : raw
|
|
293
|
+
if (def.mask !== true) w.team[def.field] = value // 掩码步(密码)零留存——不着状态
|
|
294
|
+
w.error = null
|
|
295
|
+
const next = nextTeamAskStep(def.step)
|
|
296
|
+
if (next !== null) { enterTeamStep(w, next); return }
|
|
297
|
+
w.busy = true
|
|
298
|
+
try {
|
|
299
|
+
const result = await teamLogin({ server: w.team.server, username: w.team.username, password: value })
|
|
300
|
+
if (state.wizard !== w) return // 在途退场(Esc ∥「以后再说」)⇒ 零动作
|
|
301
|
+
if (result.ok !== true) {
|
|
302
|
+
w.error = FAILURE_TEXT[result.reason] ?? FAILURE_TEXT.network
|
|
303
|
+
state.input = []
|
|
304
|
+
state.cursor = 0
|
|
305
|
+
renderWizard()
|
|
306
|
+
return
|
|
307
|
+
}
|
|
308
|
+
state.wizard = null
|
|
309
|
+
state.input = []
|
|
310
|
+
state.cursor = 0
|
|
311
|
+
await completeTeamLogin(ctx, result)
|
|
312
|
+
} finally {
|
|
313
|
+
w.busy = false
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
|
|
161
317
|
function cancelWizard() {
|
|
318
|
+
const w = state.wizard
|
|
162
319
|
state.wizard = null
|
|
320
|
+
// 登录面补全批:route ∥ 团队步的输入框归向导面(预填 ∥ 键入)——退场归还(清空);既有文本步
|
|
321
|
+
// 保持原语义(零行为变更)。
|
|
322
|
+
if (w !== null && (w.step === "route" || teamAskStepAt(w.step) !== null)) { state.input = []; state.cursor = 0 }
|
|
163
323
|
// MODEL-MERGE-SESSION 引导 A(F-6):有 provider 但 defaultModel 未设时指引 /config 入口
|
|
164
324
|
const hint = (agent.providers?.length ?? 0) > 0 && !agent.config?.defaultModel
|
|
165
325
|
? "Skipped initial setup. 已配置渠道但 config.defaultModel 未设——新会话无起点:/config → 默认模型 设置一次(或 /model 选定即成为默认模型)。"
|
|
@@ -170,28 +330,36 @@ export function createWizard(ctx) {
|
|
|
170
330
|
if (state.picker == null) ctx.onModalClose?.()
|
|
171
331
|
}
|
|
172
332
|
|
|
173
|
-
/** Wizard complete: write provider
|
|
174
|
-
*
|
|
175
|
-
*
|
|
176
|
-
* + 明示原因,不阻断保存)。 */
|
|
333
|
+
/** Wizard complete: write provider(**渠道条目不携模型**——单值退场 2026-10-09 清除批)、清 legacy 顶层键,
|
|
334
|
+
* 然后打开会话模型 picker——模型由用户在 picker 里**显式选定**(选定即写回 config.defaultModel——判据句 6)。
|
|
335
|
+
* 加渠道 = 配置写入面——落盘后探一次 `/models`(M9:探不通标「不可用」+ 明示原因,不阻断保存)。 */
|
|
177
336
|
async function finishWizard() {
|
|
178
337
|
const f = state.wizard.fields
|
|
179
338
|
state.wizard = null
|
|
180
339
|
// D-C2:format 非默认(anthropic/google)时落盘;openai = 默认省略(与 D-C1 picker 路径同构)
|
|
181
|
-
|
|
182
|
-
const providerRec = { name: f.name, baseURL: f.baseURL, model: f.model, apiKey: f.key }
|
|
340
|
+
const providerRec = { name: f.name, baseURL: f.baseURL, apiKey: f.key }
|
|
183
341
|
if (f.format && f.format !== "openai") providerRec.format = f.format
|
|
184
342
|
for (const k of ["thinking", "reasoningEffort", "maxTokens", "chatPath"]) {
|
|
185
343
|
if (f[k]) providerRec[k] = f[k]
|
|
186
344
|
}
|
|
345
|
+
// #1049 补步(2026-10-08 裁「补步」):向导末问——「走 proxy」问句(形 ≡ add 流既有问句——
|
|
346
|
+
// provider-admin.mjs add 流两支同形:No (direct) / Yes (proxy),缺省 No/Esc;本档载体 = showPicker
|
|
347
|
+
// 同形调用(ctx 注入——index.mjs 装配处随 openModelPicker 先例)。答 Yes ⇒ 条目 proxy: true
|
|
348
|
+
// (随下方落盘一次写);No ∥ 缺省 ⇒ 零 proxy 键。
|
|
349
|
+
const route = await showPicker("Route this provider's model requests through the proxy", [
|
|
350
|
+
{ type: "item", text: "No (direct)", name: "no" },
|
|
351
|
+
{ type: "item", text: "Yes (proxy)", name: "yes" },
|
|
352
|
+
])
|
|
353
|
+
if (route?.name === "yes") providerRec.proxy = true
|
|
187
354
|
// D-F5a(wizard finishWizard——清单外同型写回补正)先盘后存:磁盘 fresh raw 单操作
|
|
188
|
-
// (upsert 目标项 +
|
|
355
|
+
// (upsert 目标项 + 清 legacy 字段)——冲突放弃不留下内存 ghost(F5 约定)。
|
|
356
|
+
// 2026-10-09 清除批:不写 `raw.defaultModel`——模型面写入唯二径 = picker 显式选定(carryoverDefaultModel)
|
|
357
|
+
// ∥ /config 默认模型子菜单;渠道条目零 `model`。
|
|
189
358
|
await persistRaw((raw) => {
|
|
190
359
|
raw.providers ??= []
|
|
191
360
|
const existing = raw.providers.find((p) => p?.name === f.name)
|
|
192
361
|
if (existing) Object.assign(existing, providerRec)
|
|
193
362
|
else raw.providers.push(providerRec)
|
|
194
|
-
raw.defaultModel = `${f.name}:${providerRec.model}`
|
|
195
363
|
delete raw.activeProvider
|
|
196
364
|
delete raw.activeModel
|
|
197
365
|
// 渠道老字段(models 候选清单)由 config-migrate 在下次 load 统一清理(迁移唯一权威)
|
|
@@ -199,21 +367,12 @@ export function createWizard(ctx) {
|
|
|
199
367
|
const existing = agent.providers.find((p) => p.name === f.name)
|
|
200
368
|
if (existing) Object.assign(existing, providerRec)
|
|
201
369
|
else agent.providers.push(providerRec)
|
|
202
|
-
|
|
203
|
-
agent.activeModel = providerRec.model
|
|
204
|
-
agent.provider = { ...agent.providers.find((p) => p.name === f.name) }
|
|
205
|
-
agent.provider.model = agent.activeModel
|
|
206
|
-
if (agent.config?.agent?.compactThresholdAuto) {
|
|
207
|
-
const { resolveCompactThreshold } = await import("@thincoder/core/config.mjs")
|
|
208
|
-
agent.config.agent.compactThreshold = resolveCompactThreshold(null, agent.provider).value
|
|
209
|
-
}
|
|
210
|
-
// agent.config 是 loadConfig merged——无 active* 键可写——defaultModel 随内存 merged 更新
|
|
211
|
-
agent.config.defaultModel = `${f.name}:${agent.activeModel}`
|
|
370
|
+
// 会话槽(activeProvider/activeModel/provider)不在此播种——由向导尾 picker 的显式选定一次写入
|
|
212
371
|
pushLabel(`❯ Setup`, ansi.bold + C.tool)
|
|
213
|
-
pushLine(`Setup complete: ${f.name}
|
|
372
|
+
pushLine(`Setup complete: ${f.name}(渠道已落盘——默认模型下一步选定)`, C.tool)
|
|
214
373
|
// M9 配置阶段准入:加渠道属配置写入面——保存已落,探一次 `/models`(探不通标「不可用」+ 明示原因;不阻断)
|
|
215
374
|
const channel = agent.providers.find((p) => p.name === f.name) ?? providerRec
|
|
216
|
-
const probe = await probeChannelModels(channel)
|
|
375
|
+
const probe = await probeChannelModels(probeTargetOf(channel)) // 探针目标构造收敛核判据(③′——执行体与返形零改)
|
|
217
376
|
if (probe.ok) {
|
|
218
377
|
delete channel._unavailable
|
|
219
378
|
pushLine(`${f.name}: /models 可用(${probe.list.length} 个模型可候选)`, C.tool)
|
|
@@ -235,12 +394,12 @@ export function createWizard(ctx) {
|
|
|
235
394
|
} else {
|
|
236
395
|
pushLine(`Vector search disabled (memory falls back to text-only search). Run /config embedkey <key> to enable.`, C.dim)
|
|
237
396
|
}
|
|
238
|
-
pushLine(
|
|
397
|
+
pushLine(MODEL_SELECT_HINT, C.dim)
|
|
239
398
|
// #448①「关闭后补评估」:收尾链落定(模型 picker 关闭 ∕ 零弹面两态)⇒ 通知链尾(闩重武装——幂等)。
|
|
240
399
|
ctx.openModelPicker()
|
|
241
400
|
.catch((e) => pushLine(`[error] ${e.message}`, C.error))
|
|
242
401
|
.then(() => { if (state.picker == null && state.wizard == null) ctx.onModalClose?.() })
|
|
243
402
|
}
|
|
244
403
|
|
|
245
|
-
return { startWizard, renderWizard, wizardChooseProvider, wizardSubmitText, cancelWizard, finishWizard, wizardProviderItems }
|
|
404
|
+
return { startWizard, renderWizard, wizardChooseProvider, wizardSubmitText, cancelWizard, finishWizard, wizardProviderItems, wizardRouteItems, wizardChooseRoute, wizardBackToRoute }
|
|
246
405
|
}
|