thincoder 0.12.71 → 0.12.73
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 +32 -1
- package/README.md +18 -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/resource-link.mjs +1 -1
- package/src/cli/setup-wizard.mjs +30 -10
- package/src/cli/team-command.mjs +246 -0
- package/src/command-table.mjs +11 -2
- package/src/completions.mjs +15 -2
- 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 +4 -1
- 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 +9 -0
- package/src/tui/subagent-freeze.mjs +5 -0
- package/src/tui/subagent-panel.mjs +1 -1
- package/src/tui/suspension-drive.mjs +1 -1
- package/src/tui/timer-watch.mjs +4 -3
- package/src/tui/tui-state.mjs +3 -1
- package/src/tui/wizard.mjs +198 -39
package/CHANGELOG.md
CHANGED
|
@@ -1,4 +1,35 @@
|
|
|
1
|
-
## [
|
|
1
|
+
## [0.12.73] — 2026-10-13
|
|
2
|
+
|
|
3
|
+
> 0.12.72 → 0.12.73(连续号——发布时定号)
|
|
4
|
+
|
|
5
|
+
### Changed
|
|
6
|
+
|
|
7
|
+
- **核依赖升级**:`@thincoder/core` `^0.10.5` → `^0.10.6`(P0 热修随核生效)。
|
|
8
|
+
|
|
9
|
+
### Fixed
|
|
10
|
+
|
|
11
|
+
- **装后启动崩(P0)**:核包 `files` 白名单缺 `browser/` 致装后 `ERR_MODULE_NOT_FOUND`(经 `@thincoder/core@0.10.6` 修复;台账 #1362)。
|
|
12
|
+
|
|
13
|
+
## [0.12.72] — 2026-10-13
|
|
14
|
+
|
|
15
|
+
> 0.12.71 → 0.12.72(连续号——发布时定号)
|
|
16
|
+
|
|
17
|
+
### Added
|
|
18
|
+
|
|
19
|
+
- **团队命令族(B1)**:`team` 登录 ∥ 退出 ∥ 状态 + 补全与派生入口隐藏(随核 `teamVerify` 缝)。
|
|
20
|
+
- 四端定时器完备性(后台定时器四端同达)。
|
|
21
|
+
|
|
22
|
+
### Changed
|
|
23
|
+
|
|
24
|
+
- **核依赖升级**:`@thincoder/core` `^0.10.4` → `^0.10.5`(浏览器工具 ∥ 团队面 ∥ 台账族 ∥ 提示词纪律线随核生效)。
|
|
25
|
+
- provider 配置一致性(CLI 腿)∥ provider 默认模型清退 ∥ 索引自维护 ∥ disk-root 启动门。
|
|
26
|
+
|
|
27
|
+
### Fixed
|
|
28
|
+
|
|
29
|
+
- TUI `cmd-config` ∥ 选择器 ∥ 生命周期、smoke 脚本、文档影响面;
|
|
30
|
+
- 台账家族锚 ∥ 状态行即时刷新(随核)。
|
|
31
|
+
|
|
32
|
+
## [0.12.71] — 2026-10-05
|
|
2
33
|
|
|
3
34
|
> 0.12.70 → 0.12.71(连续号——发布时定号)
|
|
4
35
|
|
package/README.md
CHANGED
|
@@ -17,7 +17,7 @@ resolved from the npm registry for releases).
|
|
|
17
17
|
- **Checkpoint system**: auto-snapshot before every user task, `list`/`create`/`rewind` tools for the model, single-file restore — rewinding itself is reversible (pre-rewind state auto-saved)
|
|
18
18
|
- **Codebase understanding** ⭐0.5.0: `repo_outline` (dependency outline, auto-injected at startup), `code_search` (source FTS5 + vectors + JSDoc extraction), `doc_search` (docs chunked by ## headings) — background indexing, auto-incremental updates on file writes, three tools
|
|
19
19
|
guided by "structure → intent → details"
|
|
20
|
-
- **Model adaptation** ⭐: top-tier only, latest only. Built-in flagship models from twenty-
|
|
20
|
+
- **Model adaptation** ⭐: top-tier only, latest only. Built-in flagship models from twenty-five providers — DeepSeek / Kimi / Kimi For Coding / GLM / GLM Coding Plan (智谱 Coding) / Qwen / Qwen Token Plan / MiMo (小米) / MiMo Token Plan (小米套餐) / MiniMax / OpenAI / Claude / Gemini / Gemini (OpenAI-compatible — same key) /
|
|
21
21
|
Grok / Mistral / Volcengine Ark (豆包) / Hunyuan (腾讯混元) / Tencent TokenHub (腾讯混元网关) / Huawei Cloud MaaS (华为云 MaaS) / SiliconFlow (硅基流动) / OpenRouter / Groq / OpenCode Go (same key for both protocol sides: OpenAI-compatible + Anthropic Messages). No legacy model compatibility. Auto-matched context windows, truncation-resume protocols (prefix/partial), thinking-mode APIs (thinking.type /
|
|
22
22
|
reasoning_effort), reasoning_content echo strategies (reasoningEcho), output limits, temperature range clamping — all deeply adapted.
|
|
23
23
|
- **Toolset**: `read` / `write` / `edit` / `bash` / `glob` (supports `**`) / `grep` / `websearch` / `ls` / `fetch` + `read_image` (image/video paste) + three retrieval tools + MCP — all zero-dependency, file tools confined to the working directory
|
|
@@ -218,7 +218,7 @@ Key design decisions:
|
|
|
218
218
|
## Development
|
|
219
219
|
|
|
220
220
|
```bash
|
|
221
|
-
npm test #
|
|
221
|
+
npm test # integration tests (offline) — empty manifest after the 2026-09-28 reset; unit tests = docs/batches/ — current state: ../docs/core/design/TESTING.md §2.3
|
|
222
222
|
node scripts/verify-compress.mjs # real-API verification of context compaction (needs valid config)
|
|
223
223
|
node scripts/verify-team.mjs # team memory A->git->B full-chain verification (local git, offline)
|
|
224
224
|
```
|
|
@@ -231,6 +231,22 @@ Code conventions: pure `.mjs`, no semicolons, no third-party npm dependencies al
|
|
|
231
231
|
|
|
232
232
|
## Changelog
|
|
233
233
|
|
|
234
|
+
### 0.12.73 (2026-10)
|
|
235
|
+
- **Core `^0.10.6`** — P0 packaging hotfix: the published core now ships `browser/`, so fresh installs no longer crash at startup.
|
|
236
|
+
- Fixed: startup `ERR_MODULE_NOT_FOUND` after install (missing `@thincoder/core/browser/*` in the tarball whitelist — fixed via core `0.10.6`).
|
|
237
|
+
|
|
238
|
+
### 0.12.72 (2026-10)
|
|
239
|
+
- **Team command family (B1)** — `team` login / logout / status with completion and derived-entry hiding; rides the core `teamVerify` seam.
|
|
240
|
+
- **Four-end timer completeness** — background timers delivered on all four faces.
|
|
241
|
+
- **Core `^0.10.5`** — browser tool input/clipboard/async faces, the manifest tool, index self-maintenance, the team ledger tool, the read-before-ask prompt line, provider config parity, and more ride in with the core.
|
|
242
|
+
- Fixed: TUI cmd-config / pickers / lifecycle, smoke scripts, doc-impact surfaces; ledger family anchors and status-line live refresh (via core).
|
|
243
|
+
|
|
244
|
+
### 0.12.71 (2026-10)
|
|
245
|
+
- **Ledger variant detection (#935)** — first-run detection of stale drive-case ledger DB variants with a `migrate` pointer (no more silent splits).
|
|
246
|
+
- **Digest accounting fixes (#930)** — delivery-vs-settlement split, retry cap with escalation, unsettled entries visible.
|
|
247
|
+
- **bash executor identity (#922)** — the injected executor line now matches the real runtime shell.
|
|
248
|
+
- **Core `^0.10.4`** — the review verdict gate, engineering-mode state-file write path, batch-path landing fixes, citation-check decoration fix, and more ride in with the core.
|
|
249
|
+
|
|
234
250
|
### 0.12.70 (2026-10)
|
|
235
251
|
- **ACP face round 2 (#870–#873)** — `resource_link` (@ file references from Zed, with three graceful degradations); `usage_update` `{used,size}` + ISO `updatedAt`; stable session identity (slot-key ids, delete→new); `set_config_option` returns full `configOptions` + a `type` discriminator.
|
|
236
252
|
- **`thincoder ledger list --json` (#886)** — read-only ledger interface (multi-project / empty set / fully read-only).
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* disk-root-gate.mjs — 盘根启动门(fail-fast · 2026-10-08 · 台账 #1080 ∥ `docs/cli/design/CLI-ENTRY.md` §1)。
|
|
3
|
+
*
|
|
4
|
+
* **会话面**(无参默认 ∥ `tui` ∥ `chat` ∥ `acp`)于 cwd = 磁盘根时 ⇒ 一行提示 + 非零退出
|
|
5
|
+
* (阻断盘根启动 ⇒ 全盘索引——N10 动机面);**其余面一律放行**(判定式 = 会话集成员——信息维护面
|
|
6
|
+
* `-v` ∥ `--help` ∥ `memory` ∥ `upgrade` ∥ `completion` ∥ `session *` 照常);**无强开旗**。
|
|
7
|
+
*
|
|
8
|
+
* 判定 = `resolve(cwd)` 与路径根(`parse(p).root`)相等(win32 大小写归一;覆盖 `X:\` ∥ `/` ∥
|
|
9
|
+
* UNC 共享根)。`platform` 入参供直测双道(先例 `nodeVersionError(version)`);纯函数 ⇒
|
|
10
|
+
* `null` ∥ 逐字一行文案。接线 = `bin/thincoder.mjs` argv 解析后 ∥ TUI 包装块前
|
|
11
|
+
* (阻断 ⇒ 包装不发生;包装子进程复判幂等——cwd 同源)。
|
|
12
|
+
*/
|
|
13
|
+
import { win32, posix } from "node:path"
|
|
14
|
+
|
|
15
|
+
/** 会话面命令集(无参默认 = `command === undefined`——同 TUI 默认路径)。 */
|
|
16
|
+
export const SESSION_COMMANDS = new Set(["tui", "chat", "acp"])
|
|
17
|
+
|
|
18
|
+
/** 逐字定稿文案(含 em dash;输出流 = stderr、退出码 = `process.exit(1)`)。 */
|
|
19
|
+
export const DISK_ROOT_MESSAGE = "thincoder cannot start from a disk root — cd into a working directory and start again"
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* 盘根判定:会话面 ∧ cwd 为路径根 ⇒ 文案;否则 `null`(放行)。
|
|
23
|
+
* @param {{command?: string, cwd?: string, platform?: string}} [args]
|
|
24
|
+
* @returns {string|null}
|
|
25
|
+
*/
|
|
26
|
+
export function diskRootGateError({ command, cwd, platform = process.platform } = {}) {
|
|
27
|
+
if (command !== undefined && !SESSION_COMMANDS.has(command)) return null
|
|
28
|
+
const p = platform === "win32" ? win32 : posix
|
|
29
|
+
const resolved = p.resolve(String(cwd ?? ""))
|
|
30
|
+
const root = p.parse(resolved).root
|
|
31
|
+
const atRoot = platform === "win32"
|
|
32
|
+
? resolved.toLowerCase() === root.toLowerCase()
|
|
33
|
+
: resolved === root
|
|
34
|
+
return atRoot ? DISK_ROOT_MESSAGE : null
|
|
35
|
+
}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* 执行点 = `bin/thincoder.cjs`(shim)**首行**——先于 `.mjs` 链任何 ESM 静态 import 求值;不满足 ⇒
|
|
5
5
|
* 一行显式错误(当前版本 + 要求)+ `exit 1`(`node:sqlite` 等核 API 在旧版行为不可期)。
|
|
6
6
|
* 纯函数 `nodeVersionError(version = process.versions.node)` 版本串入参 ⇒ 供直测假版本;
|
|
7
|
-
* 零依赖(主版本整数比较)。射程 = npm bin 入口(`node bin/thincoder.mjs` 直跑 = 开发 ∥
|
|
7
|
+
* 零依赖(主版本整数比较)。射程 = npm bin 入口(`node bin/thincoder.mjs` 直跑 = 开发 ∥ 测试)。
|
|
8
8
|
*/
|
|
9
9
|
"use strict"
|
|
10
10
|
|
package/bin/thincoder.mjs
CHANGED
|
@@ -23,9 +23,10 @@ import { setTuiActive, restoreTerminalAfterCrash, _setCleanupOutPathForTest } fr
|
|
|
23
23
|
import { spawnTuiWrapped } from "../src/tui/wrapped-spawn.mjs"
|
|
24
24
|
import { configurePromptInjections } from "@thincoder/core/prompt-files.mjs"
|
|
25
25
|
import { CLI_PROMPT_INJECTIONS } from "../src/prompt-injections.mjs"
|
|
26
|
-
// 拆档批 R4(2026-09-28):命令分发表外提——分发骨架 +
|
|
26
|
+
// 拆档批 R4(2026-09-28):命令分发表外提——分发骨架 + 九薄命令族 + help ∕ version =
|
|
27
27
|
// `src/command-table.mjs`;交互长驻三命令(chat ∕ tui ∕ acp)= `src/command-interactive.mjs`。
|
|
28
28
|
import { runCommandTable } from "../src/command-table.mjs"
|
|
29
|
+
import { diskRootGateError } from "./disk-root-gate.mjs"
|
|
29
30
|
|
|
30
31
|
// U2(CORE-UNIFICATION §2.6.3 专项补⑦ / §2.13.8(六)):CLI 端锚取值表——**进程入口、任何装配之前**注册一次(调用期应用 ⇒ 无导入序要求)。
|
|
31
32
|
// 漏配 = 锚字面静默进模型 ⇒ 入口面用例(test/integration/cli-prompt-entry.test.mjs)显式覆盖本调用路径。
|
|
@@ -38,6 +39,13 @@ configurePromptInjections(CLI_PROMPT_INJECTIONS)
|
|
|
38
39
|
const _argvRaw = process.argv.slice(2)
|
|
39
40
|
const _tuiWrapped = _argvRaw.includes("--tui-wrapped")
|
|
40
41
|
const [command, ...args] = _argvRaw.filter((a) => a !== "--tui-wrapped")
|
|
42
|
+
|
|
43
|
+
// 盘根启动门(CLI-ENTRY §1 · 台账 #1080):会话面盘根 ⇒ stderr 一行 + exit 1(其余面放行;先于 TUI 包装)
|
|
44
|
+
const _diskRootError = diskRootGateError({ command, cwd: process.cwd() })
|
|
45
|
+
if (_diskRootError !== null) {
|
|
46
|
+
console.error(_diskRootError)
|
|
47
|
+
process.exit(1)
|
|
48
|
+
}
|
|
41
49
|
// TUI-STDERR-CAPTURE(F-1):TUI 启动(tui/无命令)默认包装——父 spawn 子 tee stderr 落盘(外部
|
|
42
50
|
// 终止/native abort——第 4 类崩溃面——诊断默认捕获)。须在 prepareCrashReporting 前(父不预建/不设
|
|
43
51
|
// report——子进程做——R25 保留)。argv 门已设(包装内子进程)或包装失败 → 直行现逻辑(尽力面)。
|
|
@@ -140,6 +148,8 @@ Usage:
|
|
|
140
148
|
Read-only ledger export as single-segment JSON (--full adds evidence; --family exports the discovered family)
|
|
141
149
|
thincoder upgrade Update to the latest version from npm
|
|
142
150
|
thincoder completion <sh> Generate shell completion script (bash / zsh / fish)
|
|
151
|
+
thincoder team login [--server <url>] [--user <name>] Log in to a team server (password prompt — hidden echo)
|
|
152
|
+
thincoder team logout | status Log out (revoke the team token) / show login state
|
|
143
153
|
thincoder -v, --version Print version
|
|
144
154
|
|
|
145
155
|
Config: ~/.thincoder/config.json — providers[] (one default model per channel) + defaultModel (new-session starting point); the available-model list is fetched from the provider at runtime (GET /models); manage via /config → 默认模型 and /model (session-level) in TUI
|
|
@@ -159,7 +169,7 @@ function exitSoon(code) {
|
|
|
159
169
|
// (fire-and-forget——不阻塞启动——失败静默——与轨迹写盘同纪律)。
|
|
160
170
|
// D-TR13(2026-09-21 · STARTUP-LATENCY 批 · TRACES.md §6.4):触发面 = **会话型命令白名单**
|
|
161
171
|
// (`tui` 含无参默认路径 `command === undefined` / `chat` / `acp`);白名单外命令(`--version` /
|
|
162
|
-
// `--help` / `completion` / `memory` / `sync` / `reindex` / `distill` / `upgrade` / `session`)
|
|
172
|
+
// `--help` / `completion` / `memory` / `sync` / `reindex` / `distill` / `upgrade` / `session` / `team`)
|
|
163
173
|
// 零启动清理。**启动清理 = 启动窗外延迟拍**——核侧 `scheduleTraceCleanup`(`TRACE_CLEANUP_DELAY_MS` = 3s,自调度点起;失败静默 / 不 unref 保后台排空)。
|
|
164
174
|
if (command === undefined || command === "tui" || command === "chat" || command === "acp") {
|
|
165
175
|
try {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "thincoder",
|
|
3
|
-
"version": "0.12.
|
|
3
|
+
"version": "0.12.73",
|
|
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.6"
|
|
24
24
|
},
|
|
25
25
|
"files": [
|
|
26
26
|
"bin/",
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* 基线 MUST,非 `PromptCapabilities` 项——`embeddedContext` 维持 false);**上限量级与 `read`
|
|
15
15
|
* 同源**(行上限直引核 `MAX_READ_LINES`——零副本)。
|
|
16
16
|
*
|
|
17
|
-
* 降级标记 = 单行固定词表(11
|
|
17
|
+
* 降级标记 = 单行固定词表(11 词——机检锚;块间独立,单块失败不影响他块)。
|
|
18
18
|
*/
|
|
19
19
|
import { readFile, stat } from "node:fs/promises"
|
|
20
20
|
import { resolve as resolvePath } from "node:path"
|
package/src/cli/setup-wizard.mjs
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import { createInterface } from "node:readline"
|
|
2
2
|
import { configPath, writeConfigAtomic, PROVIDER_PRESETS } from "@thincoder/core/config.mjs"
|
|
3
|
+
import { resolveProviders } from "@thincoder/core/config-io.mjs"
|
|
4
|
+
import { probeTargetOf } from "@thincoder/core/provider-flows.mjs"
|
|
3
5
|
import { probeChannelModels } from "../tui/model-catalog.mjs"
|
|
4
6
|
|
|
5
|
-
/** First-time setup (TTY chat / distill): ask a few questions to configure a provider, save to disk, return runtime provider. Cancel returns null.
|
|
7
|
+
/** First-time setup (TTY chat / distill): ask a few questions to configure a provider, save to disk, return runtime provider. Cancel returns null.
|
|
8
|
+
* 2026-10-09 清除批:渠道条目不携 `model`(单值 `providers[].model` 退场)——模型问句 = 顶层 `defaultModel`
|
|
9
|
+
* 的显式选定(只写 `defaultModel`;返回对象携 `model` = 该选定值——运行时 provider 形,非 config 渠道字段)。 */
|
|
6
10
|
export async function setupWizard() {
|
|
7
11
|
// Buffered asker: rl.question loses lines when input is piped/fast-pasted (line arrives before question is registered)
|
|
8
12
|
const rl = createInterface({ input: process.stdin, terminal: false })
|
|
@@ -29,12 +33,11 @@ export async function setupWizard() {
|
|
|
29
33
|
presets.forEach(([n, p], i) => console.error(` ${i + 1}. ${n.padEnd(10)} ${p.desc}`))
|
|
30
34
|
console.error(` ${presets.length + 1}. Custom endpoint`)
|
|
31
35
|
const choice = Number((await ask(`Pick [1-${presets.length + 1}]: `)).trim())
|
|
32
|
-
let name, baseURL,
|
|
36
|
+
let name, baseURL, presetFields = null
|
|
33
37
|
if (choice === presets.length + 1) {
|
|
34
38
|
name = (await ask("Name (e.g. my-openai): ")).trim()
|
|
35
39
|
baseURL = (await ask("baseURL (e.g. https://api.openai.com/v1): ")).trim().replace(/\/+$/, "")
|
|
36
|
-
|
|
37
|
-
if (!name || !/^https?:\/\//.test(baseURL) || !model) {
|
|
40
|
+
if (!name || !/^https?:\/\//.test(baseURL)) {
|
|
38
41
|
console.error("Incomplete input or invalid baseURL — cancelled")
|
|
39
42
|
return null
|
|
40
43
|
}
|
|
@@ -43,27 +46,43 @@ export async function setupWizard() {
|
|
|
43
46
|
presetFields = presets[choice - 1][1]
|
|
44
47
|
name = presets[choice - 1][0]
|
|
45
48
|
baseURL = presetFields.baseURL
|
|
46
|
-
model = presetFields.model
|
|
47
49
|
} else {
|
|
48
50
|
console.error("Invalid choice — cancelled")
|
|
49
51
|
return null
|
|
50
52
|
}
|
|
53
|
+
// 2026-10-09 清除批:渠道条目不携模型——模型问句 = **默认模型**(顶层 `defaultModel`)的显式选定
|
|
54
|
+
// (答值不落渠道条目;运行时随下方返回对象携出)。零静默回落 ∥ 零预设播种。
|
|
55
|
+
const model = (await ask("Model (this becomes your default model — e.g. gpt-4o): ")).trim()
|
|
56
|
+
if (!model) {
|
|
57
|
+
console.error("Model cannot be empty — cancelled")
|
|
58
|
+
return null
|
|
59
|
+
}
|
|
51
60
|
const apiKey = (await ask(`API key for ${name}: `)).trim()
|
|
52
61
|
if (!apiKey) {
|
|
53
62
|
console.error("API key cannot be empty — cancelled")
|
|
54
63
|
return null
|
|
55
64
|
}
|
|
56
65
|
const embedKey = (await ask("Optional: embedding API key (SiliconFlow, for vector search; press Enter to skip): ")).trim()
|
|
66
|
+
// #1049 补步(2026-10-08 裁「补步」):向导末问——「走 proxy」问句(形 ≡ add 流既有问句——
|
|
67
|
+
// `provider-admin.mjs` 两支同语义:答 Yes ⇒ 条目 `proxy: true`;No ∥ 缺省 ⇒ 零 `proxy` 键)。
|
|
68
|
+
// 载体 = 本档唯一输入机制 readline `ask`(y/N——空输入 = 缺省 No)。
|
|
69
|
+
const route = (await ask("Route this provider's model requests through the proxy [y/N]: ")).trim().toLowerCase()
|
|
70
|
+
const useProxy = route === "y" || route === "yes"
|
|
57
71
|
// M9 配置阶段准入(加渠道 = 配置写入面):探一次 `/models`——探通/探不通都不阻断保存,
|
|
58
72
|
// 仅明示结果(失败文案 = M8 消息本体;无绕过指引)。
|
|
59
73
|
// 探针输入带预设扩展字段(format 决定 M1 分派——claude/gemini 预设必须走自己的拉取分支)。
|
|
60
|
-
|
|
74
|
+
// #1048②(2026-10-08):探针 ≡ 写后运行态——目标 = **合并条目**(既有渠道盘上 `proxy`/`headers` 随行;
|
|
75
|
+
// 下方 upsert 本就保留两键);目标构造单源 = 核 `probeTargetOf`(判定 ∥ 归一零第二份)。
|
|
76
|
+
const existing = (() => { try { return resolveProviders().providers.find((p) => p.name === name) ?? null } catch { return null } })()
|
|
77
|
+
// 探针条目携答案(#1049——探针 ≡ 写后运行态,同 #1048② 判据;答 Yes ⇒ 目标携 `proxy: true`)
|
|
78
|
+
const probeEntry = { ...existing, ...(presetFields ? { ...presetFields, name, apiKey } : { name, baseURL, apiKey }), ...(useProxy ? { proxy: true } : {}) }
|
|
79
|
+
const probe = await probeChannelModels(probeTargetOf(probeEntry))
|
|
61
80
|
console.error(probe.ok
|
|
62
81
|
? `✓ ${name}: /models 可用(${probe.list.length} 个模型可候选)`
|
|
63
82
|
: `⚠ ${probe.message}`)
|
|
64
83
|
// D-F5b:磁盘新鲜读 → mutate → mtime 门控写(writeConfigAtomic 收口);冲突 = 放弃
|
|
65
84
|
// + 提示重试(首配场景另有实例同时写盘——极低概率;不自动合并——决策点① A)
|
|
66
|
-
// MODEL-SELECTION v2
|
|
85
|
+
// MODEL-SELECTION v2:渠道条目不携模型(单值退场——2026-10-09 清除批)+ defaultModel 顶层复合(显式选定);
|
|
67
86
|
// 预设扩展字段(format/thinking/maxTokens…)随行落盘——与 TUI wizard 近似同构(探针/聊天字段同源),
|
|
68
87
|
// 但 `thinking` 复制语义不同:本文件用 `!== undefined` → kimi/kimi-code 预设的 `thinking: null`
|
|
69
88
|
// **被落盘**;TUI 路径用真值过滤(model-picker.mjs / wizard.mjs)不落该键。
|
|
@@ -71,14 +90,15 @@ export async function setupWizard() {
|
|
|
71
90
|
const r = writeConfigAtomic(configPath, (raw) => {
|
|
72
91
|
const providers = raw.providers?.length ? raw.providers : []
|
|
73
92
|
const existing = providers.find((p) => p.name === name)
|
|
74
|
-
const rec = { name, baseURL,
|
|
93
|
+
const rec = { name, baseURL, apiKey } // 2026-10-09 清除批:渠道条目不携 `model`
|
|
75
94
|
for (const k of ["format", "thinking", "reasoningEffort", "maxTokens", "chatPath"]) {
|
|
76
95
|
if (presetFields?.[k] !== undefined) rec[k] = presetFields[k]
|
|
77
96
|
}
|
|
97
|
+
if (useProxy) rec.proxy = true // #1049 补步:答 Yes ⇒ 随本落盘一次写(No ∥ 缺省 ⇒ 零键零写)
|
|
78
98
|
if (existing) Object.assign(existing, rec) // 渠道老字段(models 候选清单)由 config-migrate 在下次 load 统一清理
|
|
79
99
|
else providers.push(rec)
|
|
80
100
|
raw.providers = providers
|
|
81
|
-
raw.defaultModel = `${name}:${model}`
|
|
101
|
+
raw.defaultModel = `${name}:${model}` // 显式选定降盘(唯一模型写面之一——渠道条目零 `model`)
|
|
82
102
|
delete raw.activeProvider
|
|
83
103
|
delete raw.activeModel
|
|
84
104
|
if (embedKey) raw.embedding = { ...(raw.embedding ?? {}), apiKey: embedKey }
|
|
@@ -87,7 +107,7 @@ export async function setupWizard() {
|
|
|
87
107
|
console.error("config changed on disk concurrently — retry")
|
|
88
108
|
return null
|
|
89
109
|
}
|
|
90
|
-
console.error(`Configured: ${name}
|
|
110
|
+
console.error(`Configured: ${name} (defaultModel = ${name}:${model} — saved to ${configPath})`)
|
|
91
111
|
console.error(embedKey ? "Vector search enabled\n" : "(No embedding key configured: memory search will use text-only FTS. Add embedding.apiKey to config.json to enable vector search later.)\n")
|
|
92
112
|
return { name, baseURL, model, apiKey, defaultModel: `${name}:${model}` }
|
|
93
113
|
} finally {
|
|
@@ -0,0 +1,246 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* team-command.mjs — `thincoder team` 命令族(login ∥ logout ∥ status;CLI-ENTRY.md §2 `team` 行 ·
|
|
3
|
+
* 2026-10-10 B1 批 · 台账 #1212)。
|
|
4
|
+
*
|
|
5
|
+
* 机制单源 = 核 `@thincoder/core/team.mjs`(登录 ∥ 退出 ∥ 状态 ∥ 地址归一 ∥ 端标签 ∥ 派生条目写面)——
|
|
6
|
+
* 本档 = 命令面壳(旗标解析 ∥ 问句收集 ∥ 出词);**端侧零自写盘**(一切写经核单源)。
|
|
7
|
+
* 输入形(D-TM6):地址/用户名可旗标注入(`--server <url>` ∥ `--user <name>`——空格形,缺 ⇒ 问句);
|
|
8
|
+
* 密码恒问句(零旗标——零命令历史)——TTY = 隐藏回显(原始模式逐键,零回显)∥ 非 TTY = stdin 行读。
|
|
9
|
+
* 文案(TEAM.md §2.5——三端逐字同句):未登录「未登录——登录后可用」;失败四句(理由域四值单源 =
|
|
10
|
+
* 核 `reason` 闭集);两条一次性提示(同名冲突(登录当刻)∥ 吊销未达(退出当刻))——读面零提示字段。
|
|
11
|
+
* 输出流:结果行 = stdout;问句 ∥ 失败句 ∥ 一次性提示 = stderr(问句先例 = setup-wizard.mjs `ask`)。
|
|
12
|
+
* 返回 = 退出码(0 成 ∥ 1 败);未知参 ∥ 缺子命令 ⇒ usage + 1(fail-closed,先例 ledger-read.mjs)。
|
|
13
|
+
* 词面导出面(登录面补全批 · 2026-10-10):四句闭集表 ∥ 未登录句 ∥ 两条一次性提示 ∥ 结果行首句
|
|
14
|
+
* ∥ `renderState`——TUI 面(`src/tui/cmd-team.mjs`)逐字同源消费(判据「CLI = 单语直出同句」),
|
|
15
|
+
* 本档行为零变(导出关键字与常量收拢;出词 ∥ 退出码 ∥ 旗标面逐字不动)。
|
|
16
|
+
*/
|
|
17
|
+
import { createInterface } from "node:readline"
|
|
18
|
+
|
|
19
|
+
import { teamLogin, teamLogout, teamStatus, NOTICE_MANUAL_NAME_CONFLICT } from "@thincoder/core/team.mjs"
|
|
20
|
+
|
|
21
|
+
/** 命令面 usage(未知参 / 缺子命令 ⇒ stderr + 退出 1)。 */
|
|
22
|
+
const TEAM_USAGE = "Usage: thincoder team login [--server <url>] [--user <name>] | thincoder team logout | thincoder team status"
|
|
23
|
+
|
|
24
|
+
/** 失败出词四句(TEAM.md §2.5 失败理由域;核 `reason` 四值闭集 ⇔ 四句——三端逐字同句)。 */
|
|
25
|
+
export const FAILURE_TEXT = {
|
|
26
|
+
network: "网络不可达——请检查地址与端口",
|
|
27
|
+
credentials: "用户名或密码错误",
|
|
28
|
+
rate_limited: "登录尝试过于频繁",
|
|
29
|
+
write_failed: "本机配置写入失败",
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/** 未登录提示(§2.5 未登录行——三端逐字同句)+ 指引进登录。 */
|
|
33
|
+
export const NOT_LOGGED_IN = "未登录——登录后可用"
|
|
34
|
+
const LOGIN_GUIDE = 'Run "thincoder team login" to log in.'
|
|
35
|
+
|
|
36
|
+
/** 结果行首句(两流程各一——argv ∥ TUI 同形)。 */
|
|
37
|
+
export const TEXT_LOGGED_IN = "Logged in."
|
|
38
|
+
export const TEXT_LOGGED_OUT = "Logged out."
|
|
39
|
+
|
|
40
|
+
/** 一次性提示两句(登录/退出当刻就地显示——读面不复显):同名手工 provider ⇒ 派生条目未写(D-TM4)∥ 服务端吊销未达(§2.3)。 */
|
|
41
|
+
export const TEXT_MANUAL_CONFLICT = "已存在同名 provider「team」——未自动添加;请改名或删除后重登"
|
|
42
|
+
export const TEXT_REVOKE_UNDELIVERED = "服务端吊销未达"
|
|
43
|
+
|
|
44
|
+
/** 命令入口(`bin/thincoder.mjs` → command-table 分发):返回退出码(0 成 ∥ 1 败)。 */
|
|
45
|
+
export async function teamCommand(args) {
|
|
46
|
+
const argv = Array.isArray(args) ? args : []
|
|
47
|
+
const sub = argv[0]
|
|
48
|
+
if (sub === "login") return runLogin(argv.slice(1))
|
|
49
|
+
if (sub === "logout") return runLogout(argv.slice(1))
|
|
50
|
+
if (sub === "status") return runStatus(argv.slice(1))
|
|
51
|
+
console.error(TEAM_USAGE)
|
|
52
|
+
return 1
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/** `team login`:收集(旗标 ∥ 问句)⇒ 核 `teamLogin`(写盘单源)⇒ 出词。 */
|
|
56
|
+
async function runLogin(rest) {
|
|
57
|
+
const flags = parseLoginArgs(rest)
|
|
58
|
+
if (flags === null) {
|
|
59
|
+
console.error(TEAM_USAGE)
|
|
60
|
+
return 1
|
|
61
|
+
}
|
|
62
|
+
const input = createInput()
|
|
63
|
+
try {
|
|
64
|
+
const server = flags.server ?? (await input.ask("Team server URL (e.g. http://host:8787): ")).trim()
|
|
65
|
+
const username = flags.user ?? (await input.ask("Username: ")).trim()
|
|
66
|
+
const password = await input.askHidden("Password (hidden): ")
|
|
67
|
+
const result = await teamLogin({ server, username, password })
|
|
68
|
+
if (result.ok !== true) {
|
|
69
|
+
console.error(FAILURE_TEXT[result.reason] ?? FAILURE_TEXT.network)
|
|
70
|
+
return 1
|
|
71
|
+
}
|
|
72
|
+
console.log(TEXT_LOGGED_IN)
|
|
73
|
+
for (const line of renderState(teamStatus())) console.log(line)
|
|
74
|
+
if (result.notice === NOTICE_MANUAL_NAME_CONFLICT) console.error(TEXT_MANUAL_CONFLICT) // 登录当刻一次性提示(码 ⇒ 文)
|
|
75
|
+
return 0
|
|
76
|
+
} finally {
|
|
77
|
+
input.close()
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
/** `team logout`:未登录 ⇒ 未登录提示(幂等——退出码 0);已登录 ⇒ 核 `teamLogout`(吊销 best-effort + 本地清)。 */
|
|
82
|
+
async function runLogout(rest) {
|
|
83
|
+
if (rest.length > 0) {
|
|
84
|
+
console.error(TEAM_USAGE)
|
|
85
|
+
return 1
|
|
86
|
+
}
|
|
87
|
+
if (teamStatus().loggedIn !== true) {
|
|
88
|
+
printNotLoggedIn()
|
|
89
|
+
return 0
|
|
90
|
+
}
|
|
91
|
+
const result = await teamLogout()
|
|
92
|
+
if (result.ok !== true) {
|
|
93
|
+
console.error(FAILURE_TEXT[result.reason] ?? FAILURE_TEXT.network)
|
|
94
|
+
return 1
|
|
95
|
+
}
|
|
96
|
+
console.log(TEXT_LOGGED_OUT)
|
|
97
|
+
if (result.revokeDelivered === false) console.error(TEXT_REVOKE_UNDELIVERED) // 退出当刻一次性提示
|
|
98
|
+
return 0
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
/** `team status`:未登录 ⇒ 未登录提示;已登录 ⇒ server + member + label(§2.5 当前态行)。 */
|
|
102
|
+
async function runStatus(rest) {
|
|
103
|
+
if (rest.length > 0) {
|
|
104
|
+
console.error(TEAM_USAGE)
|
|
105
|
+
return 1
|
|
106
|
+
}
|
|
107
|
+
const st = teamStatus()
|
|
108
|
+
if (st.loggedIn !== true) {
|
|
109
|
+
printNotLoggedIn()
|
|
110
|
+
return 0
|
|
111
|
+
}
|
|
112
|
+
for (const line of renderState(st)) console.log(line)
|
|
113
|
+
return 0
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
/** 未登录提示块(§2.5 未登录行 = 逐字句 + 指引进登录)。 */
|
|
117
|
+
function printNotLoggedIn() {
|
|
118
|
+
console.log(NOT_LOGGED_IN)
|
|
119
|
+
console.log(LOGIN_GUIDE)
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
/** 当前态三行(server ∥ member ∥ label——§2.5 当前态行;值 = 核 `teamStatus()` 投影)。 */
|
|
123
|
+
export function renderState(st) {
|
|
124
|
+
const member = st.member !== null && st.member !== undefined && typeof st.member === "object"
|
|
125
|
+
? `${st.member.name ?? st.member.username ?? "(unknown)"} (${st.member.username ?? "?"})`
|
|
126
|
+
: "(unknown)"
|
|
127
|
+
return [
|
|
128
|
+
`Server: ${st.server ?? "(unknown)"}`,
|
|
129
|
+
`Member: ${member}`,
|
|
130
|
+
`Label: ${st.label ?? "(unknown)"}`,
|
|
131
|
+
]
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
/** 登录旗标解析(§2 行:`--server <url>` ∥ `--user <name>`——空格形;值缺 ∥ 未知参 ⇒ null(usage))。
|
|
135
|
+
* 密码零旗标(D-TM6——shell 历史泄漏面关闭)。 */
|
|
136
|
+
function parseLoginArgs(rest) {
|
|
137
|
+
const flags = { server: null, user: null }
|
|
138
|
+
for (let i = 0; i < rest.length; i++) {
|
|
139
|
+
const arg = rest[i]
|
|
140
|
+
if (arg === "--server" || arg === "--user") {
|
|
141
|
+
const value = rest[i + 1]
|
|
142
|
+
if (value === undefined || value.startsWith("--")) return null
|
|
143
|
+
const trimmed = value.trim()
|
|
144
|
+
if (arg === "--server") flags.server = trimmed === "" ? null : trimmed // 空值视同缺省(回落问句——失败理由与实际对位)
|
|
145
|
+
else flags.user = trimmed === "" ? null : trimmed
|
|
146
|
+
i++
|
|
147
|
+
} else {
|
|
148
|
+
return null
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
return flags
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
/** 输入面(D-TM6):TTY = 交互问句(可见 ∥ 隐藏回显);非 TTY = stdin 行读(单接口 + 行缓冲——
|
|
155
|
+
* 防丢行,先例 setup-wizard.mjs);EOF 无行 ⇒ 空串(上层分类兜底)。`close()` 释放 stdin。 */
|
|
156
|
+
function createInput() {
|
|
157
|
+
if (process.stdin.isTTY) {
|
|
158
|
+
return {
|
|
159
|
+
ask: (question) => askVisible(question),
|
|
160
|
+
askHidden: (question) => askHidden(question),
|
|
161
|
+
close: () => {},
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
const rl = createInterface({ input: process.stdin, terminal: false })
|
|
165
|
+
const buffered = []
|
|
166
|
+
let waiter = null
|
|
167
|
+
let ended = false // EOF 粘性标志:流结束后**所有**后续读取立即取空串(防悬挂——上层凭据门兜底)
|
|
168
|
+
rl.on("line", (line) => {
|
|
169
|
+
if (waiter !== null) {
|
|
170
|
+
const resolve = waiter
|
|
171
|
+
waiter = null
|
|
172
|
+
resolve(line)
|
|
173
|
+
} else {
|
|
174
|
+
buffered.push(line)
|
|
175
|
+
}
|
|
176
|
+
})
|
|
177
|
+
rl.on("close", () => {
|
|
178
|
+
ended = true
|
|
179
|
+
if (waiter !== null) {
|
|
180
|
+
const resolve = waiter
|
|
181
|
+
waiter = null
|
|
182
|
+
resolve(null)
|
|
183
|
+
}
|
|
184
|
+
})
|
|
185
|
+
const nextLine = () => {
|
|
186
|
+
if (buffered.length > 0) return Promise.resolve(buffered.shift())
|
|
187
|
+
if (ended) return Promise.resolve(null)
|
|
188
|
+
return new Promise((resolve) => { waiter = resolve })
|
|
189
|
+
}
|
|
190
|
+
const askLine = async (question) => {
|
|
191
|
+
process.stderr.write(question)
|
|
192
|
+
const value = await nextLine()
|
|
193
|
+
process.stderr.write("\n") // 管道无回显 ⇒ 补行尾(与 TTY 面同形——后续提示/出词不占问句行)
|
|
194
|
+
return value ?? ""
|
|
195
|
+
}
|
|
196
|
+
return {
|
|
197
|
+
ask: (question) => askLine(question),
|
|
198
|
+
askHidden: (question) => askLine(question),
|
|
199
|
+
close: () => rl.close(),
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
/** TTY 可见问句(readline——行编辑 ∥ 回显;输出流 = stderr,沿 setup-wizard.mjs 问句先例)。 */
|
|
204
|
+
function askVisible(question) {
|
|
205
|
+
return new Promise((resolve) => {
|
|
206
|
+
const rl = createInterface({ input: process.stdin, output: process.stderr, terminal: true })
|
|
207
|
+
let answered = false
|
|
208
|
+
rl.question(question, (answer) => {
|
|
209
|
+
answered = true
|
|
210
|
+
rl.close()
|
|
211
|
+
resolve(answer)
|
|
212
|
+
})
|
|
213
|
+
rl.on("close", () => { if (!answered) resolve("") }) // EOF(Ctrl-D)⇒ 空串兜底(防悬挂——与非 TTY 路同判)
|
|
214
|
+
})
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
/** TTY 隐藏回显问句(D-TM6):原始模式逐键读——零回显(密码零落屏 ∥ 零命令历史);
|
|
218
|
+
* Enter 提交 ∥ Ctrl-C 还原终端后退出 130 ∥ Ctrl-D 提交当前输入 ∥ Backspace 删字符。 */
|
|
219
|
+
function askHidden(question) {
|
|
220
|
+
return new Promise((resolve) => {
|
|
221
|
+
process.stderr.write(question)
|
|
222
|
+
const stdin = process.stdin
|
|
223
|
+
const wasRaw = stdin.isRaw === true
|
|
224
|
+
stdin.setRawMode(true)
|
|
225
|
+
stdin.resume()
|
|
226
|
+
stdin.setEncoding("utf8")
|
|
227
|
+
let buf = ""
|
|
228
|
+
function finish() {
|
|
229
|
+
stdin.removeListener("data", onData)
|
|
230
|
+
if (!wasRaw) stdin.setRawMode(false)
|
|
231
|
+
stdin.pause()
|
|
232
|
+
process.stderr.write("\n")
|
|
233
|
+
resolve(buf)
|
|
234
|
+
}
|
|
235
|
+
function onData(chunk) {
|
|
236
|
+
for (const ch of chunk) {
|
|
237
|
+
if (ch === "\r" || ch === "\n") return finish()
|
|
238
|
+
if (ch === "\u0003") { finish(); process.exit(130) } // Ctrl-C(raw 模式不自动发 SIGINT)
|
|
239
|
+
if (ch === "\u0004") return finish() // Ctrl-D = 提交
|
|
240
|
+
if (ch === "\u007f" || ch === "\b") { buf = buf.slice(0, -1); continue }
|
|
241
|
+
buf += ch
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
stdin.on("data", onData)
|
|
245
|
+
})
|
|
246
|
+
}
|
package/src/command-table.mjs
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* command-table.mjs — CLI 命令分发表(`bin/thincoder.mjs` 外提——2026-09-28 拆档批 R4 · 纯移动 ·
|
|
3
|
-
* 命令行为 ∕ USAGE 文本 ∕ 旗标语义零改):分发骨架 +
|
|
4
|
-
* reindex ∕ completion ∕ upgrade ∕ session ∕ ledger)+ help ∕ version;交互长驻三命令
|
|
3
|
+
* 命令行为 ∕ USAGE 文本 ∕ 旗标语义零改):分发骨架 + 九薄命令族(memory ∕ sync ∕ distill ∕
|
|
4
|
+
* reindex ∕ completion ∕ upgrade ∕ session ∕ ledger ∕ team)+ help ∕ version;交互长驻三命令
|
|
5
5
|
* (chat ∕ tui ∕ acp)经 `command-interactive.mjs` 承接。依赖经 ctx 注入(`usage` ∕ `version` ∕
|
|
6
6
|
* `exitSoon`——bin 装配面注入;先例 = `src/tui/turn-face.mjs` 出档)。
|
|
7
7
|
*/
|
|
@@ -13,6 +13,7 @@ import { teamConfig } from "./cli/make-agent.mjs"
|
|
|
13
13
|
import { memoryCommand } from "./cli/memory-command.mjs"
|
|
14
14
|
import { distillCommand } from "./cli/distill-command.mjs"
|
|
15
15
|
import { chatCommand, tuiCommand, acpCommand } from "./command-interactive.mjs"
|
|
16
|
+
import { teamCommand } from "./cli/team-command.mjs"
|
|
16
17
|
|
|
17
18
|
/** 命令分发(原 `bin/thincoder.mjs` 顶层 switch 骨架逐字搬移——命令行为零改)。 */
|
|
18
19
|
export async function runCommandTable(command, args, ctx) {
|
|
@@ -171,6 +172,14 @@ export async function runCommandTable(command, args, ctx) {
|
|
|
171
172
|
break
|
|
172
173
|
}
|
|
173
174
|
|
|
175
|
+
case "team": {
|
|
176
|
+
// 团队登录命令族(B1 批 · `docs/core/design/TEAM.md` §2):login ∥ logout ∥ status——机制单源 = 核
|
|
177
|
+
// `@thincoder/core/team.mjs`(本档只分发;退出码 0 成 ∥ 1 败——先例 = memory ∥ distill 薄命令族)。
|
|
178
|
+
const code = await teamCommand(args)
|
|
179
|
+
if (code) exitSoon(code)
|
|
180
|
+
break
|
|
181
|
+
}
|
|
182
|
+
|
|
174
183
|
case "--help":
|
|
175
184
|
case "-h": {
|
|
176
185
|
process.stdout.write(usage)
|
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
|
}
|
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
|