thincoder 0.12.77 → 0.12.79
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 +21 -1
- package/package.json +2 -2
- package/src/tui/cmd-new.mjs +5 -1
- package/src/tui/cmd-session.mjs +5 -1
- package/src/tui/model-picker.mjs +17 -19
- package/src/tui/provider-admin.mjs +186 -34
- package/src/tui/render-frame.mjs +2 -2
- package/src/tui/status-line.mjs +9 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,4 +1,24 @@
|
|
|
1
|
-
## [
|
|
1
|
+
## [0.12.79] — 2026-10-26
|
|
2
|
+
|
|
3
|
+
### Changed
|
|
4
|
+
|
|
5
|
+
- **升级核到 `0.10.12`**:承载「台账无根抛明(不再静默空集)」与「多根工作区下建批档报明项目」两项行为变化。
|
|
6
|
+
|
|
7
|
+
## [0.12.78] — 2026-10-25
|
|
8
|
+
|
|
9
|
+
### Changed
|
|
10
|
+
|
|
11
|
+
- **`modelContext` 撞键不再报错**:同一渠道里两条键按末段归一后相同(如 `qwen/glm-5.3` ∥ `zhipu/glm-5.3`)等于同一个模型的两种写法——读面取其中一条即用、不再告警也不再当作未声明;写面会把这几种写法一并改成新值,清除面一并删掉。
|
|
12
|
+
- **上下文窗口展示串统一由核出词**:声明 `1024`(= 1M)此前显示 `1024K`,现显示 `1M`;`128` 仍是 `128K`。三端(CLI / VSC / 桌面)同源,端侧不再自拼单位。
|
|
13
|
+
- **「设上下文窗口」命令改按模型、单位仍是 K**:旧的渠道级 `context`(K)编辑命令退役,新命令 `Set context window (K)…` 走「选渠道 → 选模型 → 输 K」,写 `providers[].modelContext`(键 = 模型 ID,值 = 正整数 K)。单位在输入 ∥ 存储 ∥ 提示 ∥ 回显四处一致,端侧不做任何 ×1024 换算(换算只在核一处)。
|
|
14
|
+
- **清除需确认**:清空输入不再直接删声明——有已声明值时先弹确认(默认 Cancel,带当前值),无值时回 `Nothing to clear`(不留假收据)。原因:Esc 与空回车同返空串,直接删会让「取消」变成破坏动作。
|
|
15
|
+
- **`/model` 渠道行改读已声明值**:渠道条目不携模型,`providerSpec().context` 在渠道粒度上只能落到兜底值;行面改读 `modelContext`(逐条 `模型: NK` / 单条 `NK` / 无声明 `Not declared`)。
|
|
16
|
+
|
|
17
|
+
## [0.12.77] — 2026-10-22
|
|
18
|
+
|
|
19
|
+
### Changed
|
|
20
|
+
|
|
21
|
+
- **随核 0.10.10**:提示词面 16 档重写(一条规则一行)+ 新增「动手前先查文档」一节;子代理获得 `manifest` 只读面。CLI 代码零改,行为面随核。
|
|
2
22
|
|
|
3
23
|
## [0.12.76] — 2026-10-19
|
|
4
24
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "thincoder",
|
|
3
|
-
"version": "0.12.
|
|
3
|
+
"version": "0.12.79",
|
|
4
4
|
"description": "Thin coding agent - zero third-party dependencies, no build step, Node.js native. Sharp code, zero bloat.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"ai",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"node": ">=24"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@thincoder/core": "^0.10.
|
|
23
|
+
"@thincoder/core": "^0.10.12"
|
|
24
24
|
},
|
|
25
25
|
"files": [
|
|
26
26
|
"bin/",
|
package/src/tui/cmd-new.mjs
CHANGED
|
@@ -13,7 +13,7 @@ export async function handleNewCommand(ctx) {
|
|
|
13
13
|
// 多槽设计凭证(_engDesignTokens——单值镜像 _engDesignToken 已退役 D3)/压缩与验证计数
|
|
14
14
|
// 等)——原实现只清 agent.history,新会话首次落盘把旧会话完整人类线 + 旧标题写进新
|
|
15
15
|
// slot(实锤 .19/.3 双副本)。_slot 更新为粘性新槽位。
|
|
16
|
-
resetSessionState(agent)
|
|
16
|
+
const { droppedDesignTokens } = resetSessionState(agent)
|
|
17
17
|
agent._slot = slot
|
|
18
18
|
// SESSION.md §6.14:/new 绑定新槽记录存储(baseHistory 空——identity 此时为 null = 待固化;
|
|
19
19
|
// 首次保存/首条追加时补写现场身份)
|
|
@@ -24,6 +24,10 @@ export async function handleNewCommand(ctx) {
|
|
|
24
24
|
state.streaming = ""
|
|
25
25
|
render()
|
|
26
26
|
pushLine(`New session started (slot ${slot}; /session to switch back)`, C.dim)
|
|
27
|
+
// 设计档 §3.2(R2):> 0 才输出恰一行警示(= 0 零输出——负向锁)
|
|
28
|
+
if (droppedDesignTokens > 0) {
|
|
29
|
+
pushLine(`⚠ ${droppedDesignTokens} 个已批准设计凭证离开本会话,继续本会话需重走设计评审`, C.warn)
|
|
30
|
+
}
|
|
27
31
|
}
|
|
28
32
|
|
|
29
33
|
if (agent.history.length > 0) {
|
package/src/tui/cmd-session.mjs
CHANGED
|
@@ -119,7 +119,7 @@ export async function handleSessionCommand(ctx) {
|
|
|
119
119
|
if (occ.occupied) {
|
|
120
120
|
pushLine(`⚠ Slot ${e.slot} is being used by another live process (${occ.owner}) — continuing here will create a new copy on the next save`, C.warn)
|
|
121
121
|
}
|
|
122
|
-
applySession(agent, data, occ.occupied ? {} : { slot: e.slot })
|
|
122
|
+
const applied = applySession(agent, data, occ.occupied ? {} : { slot: e.slot })
|
|
123
123
|
// #41 准翻列:附着动作 = 翻转面自己赋值(`agent.manifest` ← 判据结果——相位行当回合起活;
|
|
124
124
|
// 工作区放行 ⇒ 显式置 `null` = 零附着)。
|
|
125
125
|
if (targetEng) agent.manifest = manifestAfterSwitch
|
|
@@ -135,5 +135,9 @@ export async function handleSessionCommand(ctx) {
|
|
|
135
135
|
state.tasks = []
|
|
136
136
|
}
|
|
137
137
|
pushLabel(`── Switched to slot ${e.slot} (${desc.total} messages) ──`, C.warn)
|
|
138
|
+
// 设计档 §3.2(R2):取值在 :122(局部量),打印必须晚于 `state.lines = []` / `restoreLines`——否则行被清掉。
|
|
139
|
+
if (applied.droppedDesignTokens > 0) {
|
|
140
|
+
pushLine(`⚠ ${applied.droppedDesignTokens} 个已批准设计凭证在本槽不再生效(切回原槽可恢复)`, C.warn)
|
|
141
|
+
}
|
|
138
142
|
render()
|
|
139
143
|
}
|
package/src/tui/model-picker.mjs
CHANGED
|
@@ -9,25 +9,29 @@
|
|
|
9
9
|
* 切换成功回显规格来源(M6);渠道条目不携模型(单值 `providers[].model` 退场——2026-10-09 清除批;
|
|
10
10
|
* 渠道行显示回退 = 渠道 note 的 `baseURL`)。
|
|
11
11
|
* 配置写入面(加渠道 / 设 key)探一次 `/models`(M9——探不通标「不可用」+ 明示原因,不阻断保存)。
|
|
12
|
-
* 渠道管理流(add/remove/key/context)是 provider 级 config 写——语义不变;2026-09-29 结构拆分起
|
|
13
|
-
*
|
|
12
|
+
* 渠道管理流(add/remove/key/model-context)是 provider 级 config 写——语义不变;2026-09-29 结构拆分起
|
|
13
|
+
* 各流居 provider-admin.mjs(本档装配 ∥ 尾同名再出口)。F-4 (ISSUE-FIX-BATCH):removeProviderFlow
|
|
14
14
|
* 级联清理悬挂引用(cascadeRemoveProvider——定义同在 provider-admin.mjs)。
|
|
15
|
+
* 2026-10-23(PROVIDER.md §6.15 写面):L1 管理项 = `Set context window (K)…` → `action:"model-context"`
|
|
16
|
+
* ——写面 `setModelContextFlow`(按模型写 `modelContext`,单位 K);旧键 `providers[].context` 的
|
|
17
|
+
* K 编辑项退役。渠道行的窗口回显统一取已声明值(`declaredContextText`——与写面行、VSC / 桌面同串);
|
|
18
|
+
* `formatContextK` 仍用于 token 值面(切模型的规格回显)。
|
|
15
19
|
* ctx: { agent, state, render, ansi, C, pushLine, persistRaw, askQuestion, maskKey, showPicker,
|
|
16
20
|
* closePicker, renderPickerLines, confirmDelete }(后四者为 pickers.mjs 通用 picker 绑定——闭包入参,环安全)。
|
|
17
21
|
*/
|
|
18
22
|
import { sliceByWidth } from "./render.mjs"
|
|
19
|
-
import { providerSpec, specMatch, resolveCompactThreshold } from "@thincoder/core/config.mjs"
|
|
23
|
+
import { providerSpec, specMatch, resolveCompactThreshold, formatContextK } from "@thincoder/core/config.mjs"
|
|
20
24
|
import { saveSession, loadSlotFile } from "@thincoder/core/session.mjs"
|
|
21
25
|
import { carryoverDefaultModel } from "./config-helpers.mjs"
|
|
22
26
|
import { getProviderModels, modelListFailureText, dedupeModels } from "./model-catalog.mjs"
|
|
23
|
-
import { createProviderAdmin, isDerivedProviderHidden } from "./provider-admin.mjs"
|
|
27
|
+
import { createProviderAdmin, isDerivedProviderHidden, declaredContextText } from "./provider-admin.mjs"
|
|
24
28
|
|
|
25
|
-
/** createModelPicker(ctx) → { openModelPicker, selectModel, setProviderKey,
|
|
29
|
+
/** createModelPicker(ctx) → { openModelPicker, selectModel, setProviderKey, setModelContextFlow, pickModelForSlot } */
|
|
26
30
|
export function createModelPicker(ctx) {
|
|
27
31
|
const { agent, state, pushLine, persistRaw, askQuestion, maskKey, showPicker, closePicker, renderPickerLines, confirmDelete = () => { throw new Error("ctx.confirmDelete missing — deletion refused (fail-closed)") } } = ctx
|
|
28
32
|
const { ansi, C } = ctx
|
|
29
|
-
//
|
|
30
|
-
const admin = createProviderAdmin({ agent, pushLine, persistRaw, askQuestion, maskKey, showPicker, confirmDelete, C
|
|
33
|
+
// 渠道管理流 + 级联清理(provider-admin.mjs——structure-split-2 迁出:本档装配 ∥ 尾同名再出口)
|
|
34
|
+
const admin = createProviderAdmin({ agent, pushLine, persistRaw, askQuestion, maskKey, showPicker, confirmDelete, C })
|
|
31
35
|
|
|
32
36
|
/** entry 唯一标识:异步更新 entries 后按它恢复选中项 */
|
|
33
37
|
function entryKey(e) {
|
|
@@ -35,12 +39,6 @@ export function createModelPicker(ctx) {
|
|
|
35
39
|
return e.action === "switch" ? `switch:${e.provider}:${e.model}` : `action:${e.action}`
|
|
36
40
|
}
|
|
37
41
|
|
|
38
|
-
/** 模型信息显示的 context 窗口(PROVIDER.md §15 D-C5):K 单位形态跟随覆盖值。 */
|
|
39
|
-
function fmtContextK(tokens) {
|
|
40
|
-
if (tokens >= 1_000_000) return `${Math.round(tokens / 1_048_576)}M`
|
|
41
|
-
return `${Math.round(tokens / 1024)}K`
|
|
42
|
-
}
|
|
43
|
-
|
|
44
42
|
/** Get API key for a provider (config.json only — env vars are not a key source) */
|
|
45
43
|
function getApiKey(providerConfig) {
|
|
46
44
|
return providerConfig.apiKey
|
|
@@ -75,8 +73,8 @@ export function createModelPicker(ctx) {
|
|
|
75
73
|
await admin.removeProviderFlow()
|
|
76
74
|
} else if (e.action === "key") {
|
|
77
75
|
await admin.setKeyFlow()
|
|
78
|
-
} else if (e.action === "context") {
|
|
79
|
-
await admin.
|
|
76
|
+
} else if (e.action === "model-context") {
|
|
77
|
+
await admin.setModelContextFlow()
|
|
80
78
|
}
|
|
81
79
|
}
|
|
82
80
|
}
|
|
@@ -123,7 +121,7 @@ export function createModelPicker(ctx) {
|
|
|
123
121
|
const sessionNote = active ? " ← session" : ""
|
|
124
122
|
const keyStatus = p.apiKey ? "" : " (no key)"
|
|
125
123
|
const unavailable = p._unavailable ? " (不可用)" : ""
|
|
126
|
-
const ctxTag = ` (ctx ${
|
|
124
|
+
const ctxTag = ` (ctx ${declaredContextText(p)})`
|
|
127
125
|
entries.push({
|
|
128
126
|
type: "item",
|
|
129
127
|
text: `${p.name.padEnd(12)}${shown}${ctxTag}${keyStatus}${unavailable}${sessionNote}`,
|
|
@@ -137,7 +135,7 @@ export function createModelPicker(ctx) {
|
|
|
137
135
|
entries.push({ type: "item", text: "Add provider…", action: "add" })
|
|
138
136
|
if (providers.length > 1) entries.push({ type: "item", text: "Remove provider…", action: "remove" })
|
|
139
137
|
entries.push({ type: "item", text: "Set / change API key…", action: "key" })
|
|
140
|
-
entries.push({ type: "item", text: "Set context window (K
|
|
138
|
+
entries.push({ type: "item", text: "Set context window (K)…", action: "model-context" })
|
|
141
139
|
return entries
|
|
142
140
|
}
|
|
143
141
|
|
|
@@ -253,7 +251,7 @@ export function createModelPicker(ctx) {
|
|
|
253
251
|
const spec = providerSpec(agent.provider)
|
|
254
252
|
pushLine(
|
|
255
253
|
matched
|
|
256
|
-
? `Model: ${item.provider}:${item.model} — spec found (ctx ${
|
|
254
|
+
? `Model: ${item.provider}:${item.model} — spec found (ctx ${formatContextK(spec.context)} / out ${formatContextK(spec.maxOutput)})`
|
|
257
255
|
: `Model: ${item.provider}:${item.model} — spec not found in MODEL_SPECS — default 128K ctx / 32K out; set context in /config to override`,
|
|
258
256
|
matched ? C.tool : C.error,
|
|
259
257
|
)
|
|
@@ -318,7 +316,7 @@ export function createModelPicker(ctx) {
|
|
|
318
316
|
renderPickerLines()
|
|
319
317
|
}
|
|
320
318
|
|
|
321
|
-
return { openModelPicker, selectModel, setProviderKey: admin.setProviderKey,
|
|
319
|
+
return { openModelPicker, selectModel, setProviderKey: admin.setProviderKey, setModelContextFlow: admin.setModelContextFlow, pickModelForSlot }
|
|
322
320
|
}
|
|
323
321
|
|
|
324
322
|
export { cascadeRemoveProvider, isDerivedProviderHidden } from "./provider-admin.mjs"
|
|
@@ -1,24 +1,29 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* provider-admin.mjs —
|
|
2
|
+
* provider-admin.mjs — 渠道管理流 + 级联清理出档(structure-split-2 · 2026-09-29):自
|
|
3
3
|
* `model-picker.mjs` 迁出〔probeChannelFlow ∥ addProviderFlow ∥ removeProviderFlow ∥
|
|
4
|
-
* setKeyFlow ∥ setProviderKey ∥
|
|
4
|
+
* setKeyFlow ∥ setProviderKey ∥ setModelContextFlow + cascadeRemoveProvider〕——
|
|
5
5
|
* 结构拆分零语义(面不变 ∕ 判据不变,只换宿主档);切点 ∕ 缝单源 = 批档
|
|
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
|
|
10
|
-
*
|
|
11
|
-
* setContextFlow }`;`cascadeRemoveProvider` 模块级导出(宿主 `model-picker.mjs` 尾同名再出口——
|
|
9
|
+
* maskKey, confirmDelete, C }`)→ `{ addProviderFlow, removeProviderFlow, setKeyFlow, setProviderKey,
|
|
10
|
+
* setModelContextFlow }`;`cascadeRemoveProvider` 模块级导出(宿主 `model-picker.mjs` 尾同名再出口——
|
|
12
11
|
* 历史导出面零改)。零环:本档不 import 主档(宿主 → 本档单向)。
|
|
13
|
-
*
|
|
12
|
+
* 语义(迁出原文照录):渠道管理流 = provider 级 config 写——M9 配置阶段准入探一次 `/models`(不阻断保存)
|
|
14
13
|
* ∥ F-4 (IKCDMR):removeProviderFlow 级联清理悬挂引用(consultModels ∕ subagentModels ∕ advisor.provider)。
|
|
15
14
|
* 2026-10-07 三端对齐批(#1027):添加流两支 +走 proxy 问句(写同一键 `providers[].proxy`);
|
|
16
15
|
* 三端探针目标构造收敛核 `probeTargetOf`(③′)。
|
|
16
|
+
* 2026-10-23(`PROVIDER.md` §6.15 写面 · R31):旧键 `providers[].context`(K)的编辑流退役
|
|
17
|
+
* (本端不再写旧键);同批替代 = `setModelContextFlow`——按模型写 `providers[].modelContext`,
|
|
18
|
+
* 单位仍是 K(输入 ∥ 存储 ∥ 提示 ∥ 回显四处同口径;端侧零 ×1024——唯一乘点在核)。
|
|
17
19
|
*/
|
|
18
|
-
import { PROVIDER_PRESETS as PRESETS,
|
|
20
|
+
import { PROVIDER_PRESETS as PRESETS, resolveCompactThreshold } from "@thincoder/core/config.mjs"
|
|
19
21
|
import { hasKey } from "@thincoder/core/model-ref.mjs"
|
|
22
|
+
import { normalizeModelKey, positiveInt } from "@thincoder/core/model-context.mjs"
|
|
23
|
+
import { formatDeclaredContextK } from "@thincoder/core/model-specs.mjs"
|
|
24
|
+
import { loadRaw } from "@thincoder/core/config-io.mjs"
|
|
20
25
|
import { probeTargetOf } from "@thincoder/core/provider-flows.mjs"
|
|
21
|
-
import { probeChannelModels } from "./model-catalog.mjs"
|
|
26
|
+
import { probeChannelModels, getProviderModels, modelListFailureText } from "./model-catalog.mjs"
|
|
22
27
|
|
|
23
28
|
/** 派生条目隐藏判据(TEAM.md §2.4 ∥ PROVIDER.md §6.25):`derived === true` ∧ 无 key ⇒ 列表/候选面
|
|
24
29
|
* 隐藏(四消费面各一处过滤——CLI 模型候选 ∥ CLI provider-admin ∥ VSC ∥ 桌面);登录态(有 key)在场。
|
|
@@ -27,9 +32,9 @@ export function isDerivedProviderHidden(provider) {
|
|
|
27
32
|
return provider?.derived === true && !hasKey(provider)
|
|
28
33
|
}
|
|
29
34
|
|
|
30
|
-
/** createProviderAdmin(ctx) → { addProviderFlow, removeProviderFlow, setKeyFlow, setProviderKey,
|
|
35
|
+
/** createProviderAdmin(ctx) → { addProviderFlow, removeProviderFlow, setKeyFlow, setProviderKey, setModelContextFlow } */
|
|
31
36
|
export function createProviderAdmin(ctx) {
|
|
32
|
-
const { agent, showPicker, askQuestion, pushLine, persistRaw, maskKey, confirmDelete, C
|
|
37
|
+
const { agent, showPicker, askQuestion, pushLine, persistRaw, maskKey, confirmDelete, C } = ctx
|
|
33
38
|
|
|
34
39
|
// ═══ 渠道管理流(provider 级 config 写——语义不变——与 /model 会话选择分离)═══
|
|
35
40
|
|
|
@@ -171,55 +176,202 @@ export function createProviderAdmin(ctx) {
|
|
|
171
176
|
if (probe) await probeChannelFlow(target, name)
|
|
172
177
|
}
|
|
173
178
|
|
|
174
|
-
/**
|
|
175
|
-
|
|
179
|
+
/** 写面第 2 步:候选 = 该渠道 `/v1/models` 的 id(`model-catalog.mjs` 会话缓存——与 `/model`
|
|
180
|
+
* 选模型同源,零新增拉取面)。**该渠无候选 ∥ 探测失败 ⇒ 该步换文本输入模型 id**(不区分
|
|
181
|
+
* 两者——都只能手填);探测失败时另明示失败信息。可达时只从候选行选(不设手填行——避免两套
|
|
182
|
+
* 输入面)。返回模型 id 或 null(取消)。 */
|
|
183
|
+
async function pickContextModel(providerConfig) {
|
|
184
|
+
let models = []
|
|
185
|
+
let failure = null
|
|
186
|
+
try {
|
|
187
|
+
models = await getProviderModels(providerConfig)
|
|
188
|
+
} catch (error) {
|
|
189
|
+
failure = modelListFailureText(error)
|
|
190
|
+
}
|
|
191
|
+
if (models.length) {
|
|
192
|
+
const me = await showPicker(`${providerConfig.name} models`, [
|
|
193
|
+
{ type: "header", text: "Select model" },
|
|
194
|
+
...[...new Set(models)].map((id) => ({ type: "item", text: id, name: id })),
|
|
195
|
+
])
|
|
196
|
+
return me?.name || null
|
|
197
|
+
}
|
|
198
|
+
if (failure) pushLine(failure, C.error) // 探测失败:先明示失败信息(文案本体 = M8 长句)
|
|
199
|
+
pushLine("No candidates (type the model ID)", C.warn) // 登记文案(`settings.providers.contextNoCandidates`)
|
|
200
|
+
const typed = (await askQuestion(`Model id for ${providerConfig.name} (empty to cancel):`))?.trim() ?? ""
|
|
201
|
+
return typed || null
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
/** /model 管理:模型上下文窗口编辑流(`PROVIDER.md` §6.15「写面:`modelContext` 编辑」——三端
|
|
205
|
+
* 同形:选渠道 → 选模型 → 输 K 值 → 落盘 + 回显 K)。替代退役的旧键编辑流(R31①②:本端不再写
|
|
206
|
+
* `providers[].context`)。
|
|
207
|
+
*
|
|
208
|
+
* **单位 = K**(128 = 128K):输入 ∥ 存储 ∥ 提示 ∥ 回显四处同口径;本档**一次都不乘 1024**——
|
|
209
|
+
* 唯一乘点在核 `model-specs.mjs` 的 L1∥L2 合流点(端侧自乘 = 下一次单位事故)。
|
|
210
|
+
* 值校验 = 先 parse 再判:`Number(String(v).trim())` 后过核 `positiveInt`(交互输入是字符串,
|
|
211
|
+
* 直接喂谓词会全量拒绝)。
|
|
212
|
+
* 清除语义:空输入 = 清除该模型的键(归一相等的多条一并删除——R29⑤);**有已声明值先过一道确认**(默认 Cancel)——CLI 自由文本态
|
|
213
|
+
* Esc 与空回车同返 `""`(`key-modes.mjs`),不确认就是拿取消手势当删除;无声明 ⇒ 空操作。
|
|
214
|
+
* 键处理 = 末段尺子(核 `normalizeModelKey`):归一后相等的既有键就改它(不新增第二种拼写),
|
|
215
|
+
* 否则用模型 id 原样作键;命中多条(归一后相等 = 同一模型)⇒ 一并改写为同一新值(R29⑤)。
|
|
216
|
+
* **不预填任何非声明值**:提示里的 current 只取该模型的已声明 K——列表值 ∥ 静态表值都不进输入框
|
|
217
|
+
* (一次回车就会把参考值固化成人工声明)。
|
|
218
|
+
* 读面回显 = 已声明值(R31④ / W-9 / W-11):渠道行展示核出词串(逐条 `模型: <核出词>`,
|
|
219
|
+
* 单条即 `<核出词>`,无声明 `Not declared`)——**不取 `providerSpec(p).context`**:渠道条目不携模型,
|
|
220
|
+
* 该值只能落 L5 的 125K(把声明的 128 显示成 125K = 错读数,设计「读面回显」明令禁止)。 */
|
|
221
|
+
async function setModelContextFlow() {
|
|
176
222
|
const se = await showPicker("Set Context Window", [
|
|
177
223
|
{ type: "header", text: "Select provider" },
|
|
178
224
|
...agent.providers.filter((p) => !isDerivedProviderHidden(p)).map((p) => ({
|
|
179
225
|
type: "item",
|
|
180
|
-
text: `${p.name} (ctx ${
|
|
226
|
+
text: `${p.name} (ctx ${declaredContextText(p)}) (declared: ${declaredContextOf(p).length || "none"})`,
|
|
181
227
|
name: p.name,
|
|
182
228
|
})),
|
|
183
229
|
])
|
|
184
230
|
if (!se?.name) return // Esc
|
|
185
231
|
const target = agent.providers.find((p) => p.name === se.name)
|
|
186
232
|
if (!target) return
|
|
187
|
-
|
|
188
|
-
const
|
|
189
|
-
|
|
233
|
+
|
|
234
|
+
const model = await pickContextModel(target)
|
|
235
|
+
if (!model) return // Esc ∥ 空输入 ⇒ 中止(盘上零变)
|
|
236
|
+
|
|
237
|
+
const matches = matchingContextKeys(target.modelContext, model)
|
|
238
|
+
const declaredK = matches.length > 0 ? positiveInt(target.modelContext[matches[0]]) : null
|
|
239
|
+
const current = declaredK !== null ? formatDeclaredContextK(declaredK) : "Not declared"
|
|
240
|
+
const input = (await askQuestion(
|
|
241
|
+
`Context window for ${se.name}:${model} in K (current: ${current} — e.g. 128 = 128K; empty to clear):`
|
|
190
242
|
))?.trim() ?? ""
|
|
191
|
-
let
|
|
192
|
-
if (
|
|
193
|
-
const n = Number(
|
|
194
|
-
if (
|
|
195
|
-
pushLine(`Invalid context: "${
|
|
243
|
+
let nextK // undefined = 清除请求(下面按有无已声明值分流)
|
|
244
|
+
if (input !== "") {
|
|
245
|
+
const n = positiveInt(Number(input))
|
|
246
|
+
if (n === null) {
|
|
247
|
+
pushLine(`Invalid context: "${input}" — must be a positive integer in K (e.g. 128 = 128K)`, C.error)
|
|
248
|
+
return // 盘上零变
|
|
249
|
+
}
|
|
250
|
+
nextK = n
|
|
251
|
+
} else {
|
|
252
|
+
// 清除判据 = 「键存在即算」(设计 §6.15「清除语义」)——**含值非法的条目**:装载归一会把
|
|
253
|
+
// 非法值从内存镜像清掉(`config.mjs` 归一),盘面原文仍在 ⇒ 只看内存会让这类条目永远删不掉。
|
|
254
|
+
// 盘面原文 = `loadRaw()`(只读;写仍走 persistRaw——D-F5a)。
|
|
255
|
+
const clearKeys = diskDeclaredKeys(se.name, model) ?? matches
|
|
256
|
+
if (clearKeys.length === 0) {
|
|
257
|
+
// 无已声明值:空输入 = 空操作——不留假收据(`Context cleared` 在这里是句谎)
|
|
258
|
+
pushLine(`Nothing to clear for ${model}`, C.text)
|
|
196
259
|
return
|
|
197
260
|
}
|
|
198
|
-
|
|
261
|
+
// 有已声明值:删一个声明值 = 破坏动作——先确认,默认 Cancel(Esc 回到这里 ⇒ 盘上零变)。
|
|
262
|
+
// 确认行带当前值:不带值用户不知道自己删的是多少(值非法 ⇒ current 段回 `Not declared`)。
|
|
263
|
+
const confirmed = await confirmDelete(
|
|
264
|
+
`Clear context for ${se.name}:${model} (currently ${current})?`
|
|
265
|
+
)
|
|
266
|
+
if (!confirmed) return // Cancel / Esc ⇒ 盘上零变
|
|
199
267
|
}
|
|
268
|
+
|
|
269
|
+
// D-F5a 先盘后存:磁盘 fresh raw 上单键补丁(不取内存 providers 整数组);键仍在盘面重判一次
|
|
270
|
+
// (对端的并发改写优先——盘面命中就沿盘面拼写;命中多条 = 同一模型的多种写法 ⇒ 一并改写 ∥ 一并删除,R29⑤)。
|
|
271
|
+
let diskMissing = false
|
|
272
|
+
let diskNothing = false
|
|
273
|
+
let diskKeys = [] // 盘面命中的全部拼写(空 ⇒ 写面用模型 id 原样作新键)
|
|
200
274
|
await persistRaw((raw) => {
|
|
201
275
|
raw.providers ??= []
|
|
202
276
|
const t = raw.providers.find((p) => p?.name === se.name)
|
|
203
|
-
if (!t) return
|
|
204
|
-
|
|
205
|
-
|
|
277
|
+
if (!t) { diskMissing = true; return }
|
|
278
|
+
diskKeys = matchingContextKeys(t.modelContext, model)
|
|
279
|
+
if (nextK === undefined) {
|
|
280
|
+
// 清除:盘面已无该键(对端刚删)⇒ 不出假收据(下面回 Nothing to clear)
|
|
281
|
+
if (diskKeys.length === 0) { diskNothing = true; return }
|
|
282
|
+
for (const key of diskKeys) applyModelContext(t, key, undefined) // 删键;对象空 ⇒ 连 modelContext 一起删
|
|
283
|
+
return
|
|
284
|
+
}
|
|
285
|
+
for (const key of (diskKeys.length ? diskKeys : [model])) applyModelContext(t, key, nextK)
|
|
206
286
|
})
|
|
207
|
-
if (
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
287
|
+
if (diskMissing) {
|
|
288
|
+
pushLine(`Provider "${se.name}" no longer exists in the config file — nothing saved`, C.error)
|
|
289
|
+
return
|
|
290
|
+
}
|
|
291
|
+
if (diskNothing) {
|
|
292
|
+
for (const key of matches) applyModelContext(target, key, undefined) // 内存镜像对齐盘面(不留 ghost)
|
|
293
|
+
pushLine(`Nothing to clear for ${model}`, C.text)
|
|
294
|
+
return
|
|
295
|
+
}
|
|
296
|
+
|
|
297
|
+
// 内存镜像就地改键(`agent.provider = { ...target }` 是浅拷贝——改同一对象 ∥ 指同一表,整替换会失配);
|
|
298
|
+
// 盘面拼写与内存不同时先清旧拼写——内存镜像与盘面一一对应,不留 ghost 键
|
|
299
|
+
for (const key of matches) if (!diskKeys.includes(key)) applyModelContext(target, key, undefined)
|
|
300
|
+
for (const key of (diskKeys.length ? diskKeys : [model])) applyModelContext(target, key, nextK)
|
|
301
|
+
if (se.name === agent.activeProvider && agent.provider) {
|
|
302
|
+
if (target.modelContext === undefined) delete agent.provider.modelContext
|
|
303
|
+
else agent.provider.modelContext = target.modelContext
|
|
212
304
|
// §6.17:窗口覆盖后 auto 派生线跟手——只刷新显示面 compactThresholdResolved,显式键永不被改写
|
|
213
305
|
if (agent.config?.agent?.compactThresholdAuto) {
|
|
214
306
|
agent.config.agent.compactThresholdResolved = resolveCompactThreshold(null, agent.provider).value
|
|
215
307
|
}
|
|
216
308
|
}
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
309
|
+
// 回显串 = 核出词(`128K` / `1M`)——不同时给 token 数(两个数并排又把人绕回单位问题)
|
|
310
|
+
pushLine(nextK === undefined
|
|
311
|
+
? `Context cleared for ${model}`
|
|
312
|
+
: `Context saved: ${se.name}:${model} = ${formatDeclaredContextK(nextK)}`, C.tool)
|
|
220
313
|
}
|
|
221
314
|
|
|
222
|
-
return { addProviderFlow, removeProviderFlow, setKeyFlow, setProviderKey,
|
|
315
|
+
return { addProviderFlow, removeProviderFlow, setKeyFlow, setProviderKey, setModelContextFlow }
|
|
316
|
+
}
|
|
317
|
+
|
|
318
|
+
/** 盘面原文里该模型的既有键(含值非法条目——装载归一把它们从内存镜像清掉了,盘面仍在)。
|
|
319
|
+
* 读不出 ∥ 盘上无此渠道 ⇒ `null`(调用侧落回内存判据;写仍走 persistRaw)。 */
|
|
320
|
+
function diskDeclaredKeys(providerName, model) {
|
|
321
|
+
try {
|
|
322
|
+
const raw = loadRaw()
|
|
323
|
+
const provider = Array.isArray(raw?.providers) ? raw.providers.find((p) => p?.name === providerName) : null
|
|
324
|
+
if (!provider || typeof provider !== "object") return null
|
|
325
|
+
return matchingContextKeys(provider.modelContext, model)
|
|
326
|
+
} catch {
|
|
327
|
+
return null // 畸形档:内存判据兜底(persistRaw 会以同一错误浮出)
|
|
328
|
+
}
|
|
329
|
+
}
|
|
330
|
+
|
|
331
|
+
/** `modelContext` 键匹配(写面 `PROVIDER.md` §6.15「键形与查表规则」):末段 + 小写归一后**相等**
|
|
332
|
+
* 才是同一模型(核 `normalizeModelKey`——不是前缀:`glm-5.3` 不命中 `glm-5.3-flashx`)。
|
|
333
|
+
* 返回全部命中的既有键(>1 = 同一模型的多种写法——写面一并改写 ∥ 清除一并删除,R29⑤)。 */
|
|
334
|
+
function matchingContextKeys(table, model) {
|
|
335
|
+
if (!table || typeof table !== "object" || Array.isArray(table)) return []
|
|
336
|
+
const target = normalizeModelKey(model)
|
|
337
|
+
if (!target) return []
|
|
338
|
+
return Object.keys(table).filter((key) => normalizeModelKey(key) === target)
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
/** 已声明条目(只认正整数 K——与 VSC ∥ 桌面行面的过滤同判;非法值装载期已被核剔除)。 */
|
|
342
|
+
function declaredContextOf(provider) {
|
|
343
|
+
const table = provider?.modelContext
|
|
344
|
+
if (!table || typeof table !== "object" || Array.isArray(table)) return []
|
|
345
|
+
return Object.entries(table).filter(([, value]) => Number.isInteger(value) && value > 0)
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
/** 渠道行上下文回显串(读面 = 已声明值,R31④ / W-9 / W-9b / W-11,**两端共用**:写面渠道行 ∥ `/model`
|
|
349
|
+
* L1 渠道行):逐条 `模型: <核出词>`;单条即 `<核出词>`;无声明 ⇒ `Not declared`。出词一律经核
|
|
350
|
+
* `formatDeclaredContextK`(K→token 展示换算只在核一处——声明 `1024` 出 `1M`,端侧拼串会出 `1024K`)。
|
|
351
|
+
* 三端同串(VSC ∥ 桌面同形——` · ` 分隔)——**不取 `providerSpec`**(渠道条目无模型 ⇒ 只能落 L5 的
|
|
352
|
+
* 125K,会把声明的 128 显示错)。 */
|
|
353
|
+
export function declaredContextText(provider) {
|
|
354
|
+
const entries = declaredContextOf(provider)
|
|
355
|
+
if (entries.length === 0) return "Not declared"
|
|
356
|
+
return entries.length === 1
|
|
357
|
+
? formatDeclaredContextK(entries[0][1])
|
|
358
|
+
: entries.map(([model, k]) => `${model}: ${formatDeclaredContextK(k)}`).join(" · ")
|
|
359
|
+
}
|
|
360
|
+
|
|
361
|
+
/** 内存 ∥ 磁盘共用的单键补丁:`k === undefined` ⇒ 删该键,对象空则连 `modelContext` 键一起删
|
|
362
|
+
* (不留空对象);否则就地写该键(**就地**——`agent.provider = { ...target }` 是浅拷贝,
|
|
363
|
+
* 整替换会让引用失配)。 */
|
|
364
|
+
function applyModelContext(provider, key, k) {
|
|
365
|
+
if (!provider) return
|
|
366
|
+
if (k === undefined) {
|
|
367
|
+
const table = provider.modelContext
|
|
368
|
+
if (!table || typeof table !== "object" || Array.isArray(table)) return
|
|
369
|
+
delete table[key]
|
|
370
|
+
if (Object.keys(table).length === 0) delete provider.modelContext
|
|
371
|
+
return
|
|
372
|
+
}
|
|
373
|
+
if (!provider.modelContext || typeof provider.modelContext !== "object" || Array.isArray(provider.modelContext)) provider.modelContext = {}
|
|
374
|
+
provider.modelContext[key] = k
|
|
223
375
|
}
|
|
224
376
|
|
|
225
377
|
/** F-4 (IKCDMR) 级联清理(删渠道共享写点):raw/merged config 移除 name 渠道后清悬挂引用——
|
package/src/tui/render-frame.mjs
CHANGED
|
@@ -21,7 +21,7 @@ import { isYesNoModal } from "./interaction.mjs" // X8 跟进①:y/n-only 族
|
|
|
21
21
|
// SSH 凭据窗标题(SSH-SESSION 批 §6.22 ⑧——overlay 标题行 keys.title 投影;面体单源 = secret-prompt.mjs)
|
|
22
22
|
import { secretPromptTitle } from "./secret-prompt.mjs"
|
|
23
23
|
// 状态栏(#1437 拆分——族体居 status-line.mjs;renderRows 状态行 put 走此引,导出面转发见下)
|
|
24
|
-
import { renderStatus } from "./status-line.mjs"
|
|
24
|
+
import { renderStatus, singleLineTitle } from "./status-line.mjs"
|
|
25
25
|
// 掩码面在场判据单源(#1437 显示面同归——框题侧消费;内容侧 = layout.mjs)
|
|
26
26
|
import { maskSurfacePresent } from "./ask-steps.mjs"
|
|
27
27
|
|
|
@@ -262,7 +262,7 @@ export function renderRows(state, agent, opts) {
|
|
|
262
262
|
const boxLayout = qFree ? (layout.questionLayout ?? layout.inputLayout) : layout.inputLayout
|
|
263
263
|
const boxOffset = qFree ? (layout.questionOffset ?? 0) : layout.inputOffset
|
|
264
264
|
put(panels.inputBox.y, renderInputBox(state, W, boxLines, cols, boxLayout, boxOffset))
|
|
265
|
-
put(panels.status.y, [renderStatus(state, agent, cols, slashCommands)])
|
|
265
|
+
put(panels.status.y, [singleLineTitle(renderStatus(state, agent, cols, slashCommands))])
|
|
266
266
|
|
|
267
267
|
let cursorRow = 0, cursorCol = 0
|
|
268
268
|
if (!state.permission && !state.picker && state.wizard?.step !== "provider" && !qOptionsOnly) {
|
package/src/tui/status-line.mjs
CHANGED
|
@@ -15,6 +15,11 @@ import { t } from "@thincoder/core/i18n.mjs" // 停滞轻显形(TUI.md §7.7
|
|
|
15
15
|
import { isRealUserMsg } from "@thincoder/core/history-window.mjs" // B6 回退链:首条真实 user 消息谓词(纯件单源)
|
|
16
16
|
import { isYesNoModal } from "./interaction.mjs" // X8 跟进①:y/n-only 族判据单源
|
|
17
17
|
|
|
18
|
+
/** 标题单行化(docs/cli/design/TUI.md §7.4 = 单源):固定断行字符集命中 ⇒ 一个空格(一字符换一空格——
|
|
19
|
+
* 宽度账逐个守恒);具名导出——入口 / 回退 / status 行写出口三处同用。 */
|
|
20
|
+
const TITLE_BREAK_RE = /[\r\n\t\v\f\u0085\u2028\u2029]/g
|
|
21
|
+
export function singleLineTitle(s) { return typeof s === "string" ? s.replace(TITLE_BREAK_RE, " ") : s }
|
|
22
|
+
|
|
18
23
|
// ---------- status bar slash-command hints ----------
|
|
19
24
|
const SLASH_HINTS = {
|
|
20
25
|
"/config": "open config menu",
|
|
@@ -72,7 +77,9 @@ function sessionTitleFallback(agent) {
|
|
|
72
77
|
const fm = (agent?._recordStore?.counters?.().firstMessage ?? "")
|
|
73
78
|
|| (agent?._fullHistory ?? agent?.history ?? []).find(isRealUserMsg)?.content
|
|
74
79
|
if (typeof fm !== "string" || fm === "") return "(empty)"
|
|
75
|
-
|
|
80
|
+
// TUI.md §7.4:回退标题同规则单行化(`"(empty)"` 分支无控制字符,不处理)
|
|
81
|
+
const title = singleLineTitle(fm)
|
|
82
|
+
return `"${title.length <= 40 ? title : title.slice(0, 39) + "…"}"`
|
|
76
83
|
}
|
|
77
84
|
|
|
78
85
|
function buildStatusLine(state, agent, { cols, slashCommands }) {
|
|
@@ -169,7 +176,7 @@ function buildStatusLine(state, agent, { cols, slashCommands }) {
|
|
|
169
176
|
// D8(2026-09-21 块标题行对齐批——会话标题常显 · `docs/cli/design/TUI.md` §7.4):状态段簇尾
|
|
170
177
|
// (ledgerHint 后、键位组前);取值 = `agent.title` 活读(每帧 recompute)· 40 列截断。
|
|
171
178
|
// B6 消(#677):空白 ⇒ 回退链值(对位 VSC 顶栏——生成前 ∕ 失败期两端同值;值逐字,行级超宽走 statusMax)。
|
|
172
|
-
const titleRaw = typeof agent.title === "string" ? agent.title.trim() : ""
|
|
179
|
+
const titleRaw = typeof agent.title === "string" ? singleLineTitle(agent.title).trim() : ""
|
|
173
180
|
const titleShown = titleRaw ? (stringWidth(titleRaw) > 40 ? sliceByWidth(titleRaw, 39) + "…" : titleRaw) : sessionTitleFallback(agent)
|
|
174
181
|
const titleHint = ` │ ${titleShown}`
|
|
175
182
|
// 团队登录态段(登录面补全批 · `docs/cli/design/TUI.md` §7.8):簇尾末位(titleHint 后、`│ <enterHint>` 前)
|