@deepwhale/coding-agent 1.0.1 → 1.0.9
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/bin/deepwhale.js +69 -4
- package/dist/agent/session-adapter.d.ts.map +1 -1
- package/dist/agent/session-adapter.js +28 -3
- package/dist/agent/session-adapter.js.map +1 -1
- package/dist/agent/tool-loop.d.ts.map +1 -1
- package/dist/agent/tool-loop.js +12 -1
- package/dist/agent/tool-loop.js.map +1 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/llm-factory.d.ts +3 -0
- package/dist/llm-factory.d.ts.map +1 -1
- package/dist/llm-factory.js +26 -4
- package/dist/llm-factory.js.map +1 -1
- package/dist/modes/tui.d.ts +58 -0
- package/dist/modes/tui.d.ts.map +1 -1
- package/dist/modes/tui.js +396 -24
- package/dist/modes/tui.js.map +1 -1
- package/dist/policy/index.d.ts +17 -0
- package/dist/policy/index.d.ts.map +1 -0
- package/dist/policy/index.js +16 -0
- package/dist/policy/index.js.map +1 -0
- package/dist/repl.d.ts +30 -2
- package/dist/repl.d.ts.map +1 -1
- package/dist/repl.js +65 -19
- package/dist/repl.js.map +1 -1
- package/dist/tui-ink-bundle.js +38584 -0
- package/package.json +2 -2
package/bin/deepwhale.js
CHANGED
|
@@ -24,6 +24,8 @@
|
|
|
24
24
|
*/
|
|
25
25
|
|
|
26
26
|
import { resolve as pathResolve } from 'node:path';
|
|
27
|
+
import { createRequire } from 'node:module';
|
|
28
|
+
import { fileURLToPath } from 'node:url';
|
|
27
29
|
import process from 'node:process';
|
|
28
30
|
// Sprint 1c-revive-2-D-7 (review, 2026-06-04): 启动时加载项目根 .env (补缺不覆盖,
|
|
29
31
|
// CI / shell export 优先级最高). 必须在 import dist 之前调, 让 createDefaultClient
|
|
@@ -33,7 +35,16 @@ loadProjectEnv();
|
|
|
33
35
|
import { startRepl } from '../dist/index.js';
|
|
34
36
|
import { runPrintMode } from '../dist/modes/print.js';
|
|
35
37
|
import { runRpcMode } from '../dist/modes/rpc.js';
|
|
38
|
+
// Sprint 1c-revive-2-D-24.3 (2026-06-06) v1.0.9: 'tui' mode 优先走 Ink 容器 bundle
|
|
39
|
+
// (../dist/tui-ink-bundle.js). 跟 D-24.1 拍板一致.
|
|
40
|
+
// - bundle 是 tui-ink 1.0.9 esbuild 输出, copy 自 packages/tui-ink/dist/tui.js (postbuild)
|
|
41
|
+
// - 1.74MB unminified, runtime 0 依赖, 跟 Hermes ui-tui 决策表一致
|
|
42
|
+
import { runTuiInkMode } from '../dist/tui-ink-bundle.js';
|
|
43
|
+
// D-24.1 §6 红线 1: legacy runTuiMode 仍保留作 source-install dev 路径兜底.
|
|
44
|
+
// 1.0.9+ tarball 装路径 100% 走 runTuiInkMode (postbuild 强保证 bundle 存在),
|
|
45
|
+
// 实际不会调 runTuiMode. void reference 仅为让 ESLint 闭嘴 (0 删 + 0 warning).
|
|
36
46
|
import { runTuiMode } from '../dist/modes/tui.js';
|
|
47
|
+
void runTuiMode; // legacy 兜底, sprint 1.1+ 计划完全删除.
|
|
37
48
|
import { runVerify } from '../dist/verify/index.js';
|
|
38
49
|
import { buildSummaryAndNext, formatReport } from '../dist/verify/index.js';
|
|
39
50
|
// Sprint 1c-revive-4-D-20.1 (2026-06-05): 友好错误处理.
|
|
@@ -58,6 +69,40 @@ import { APIKeyMissingError } from '@deepwhale/llm';
|
|
|
58
69
|
* @param {ReadonlyArray<string>} argv
|
|
59
70
|
* @returns {CliArgs}
|
|
60
71
|
*/
|
|
72
|
+
// Sprint D-21.0.1 (2026-06-06): --version 写死 "0.1.0 (Sprint 1a)" 跟 npm 1.0.1 /
|
|
73
|
+
// GitHub v1.0.1 不一致, 用户在 Windows 装出来看到 stale string. 改读自身 package.json.
|
|
74
|
+
//
|
|
75
|
+
// 拍板 (D-21.0.1, 2026-06-06):
|
|
76
|
+
// - 用 createRequire(import.meta.url) 拿 `../package.json` (相对 bin 路径).
|
|
77
|
+
// - 装出来: bin 在 `<prefix>/lib/node_modules/@deepwhale/coding-agent/bin/`,
|
|
78
|
+
// `../package.json` 走 `<root>/package.json` ✅. 1.0.1 / 1.0.2 / 1.1.0 自动跟.
|
|
79
|
+
// - monorepo: bin 在 `packages/coding-agent/bin/`, `../package.json` 走
|
|
80
|
+
// `packages/coding-agent/package.json` ✅. dev workflow 也对.
|
|
81
|
+
// - 输出格式跟 `npm -v` 一致 (多行, 字段对齐). 不再带 "(Sprint X)" — sprint 名
|
|
82
|
+
// 是设计历史, 写在 CHANGELOG / 注释里, 不进 user-facing version 字符串.
|
|
83
|
+
//
|
|
84
|
+
// 不变量: pkg 读不到 (异常路径) → fallback 旧字符串, 不让 bin 直接 crash. 跟
|
|
85
|
+
// Sprint 1c-revive-2-D-7 容错语义一致 (启动期不抛, 走 best-effort).
|
|
86
|
+
const req = createRequire(fileURLToPath(import.meta.url));
|
|
87
|
+
function readPkgVersion() {
|
|
88
|
+
try {
|
|
89
|
+
const pkg = req('../package.json');
|
|
90
|
+
return {
|
|
91
|
+
name: typeof pkg.name === 'string' ? pkg.name : '@deepwhale/coding-agent',
|
|
92
|
+
version: typeof pkg.version === 'string' ? pkg.version : '0.0.0-unknown',
|
|
93
|
+
description:
|
|
94
|
+
typeof pkg.description === 'string' ? pkg.description : 'DeepWhale coding agent',
|
|
95
|
+
};
|
|
96
|
+
} catch {
|
|
97
|
+
return { name: '@deepwhale/coding-agent', version: '0.0.0-unknown', description: '' };
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
function formatVersion() {
|
|
101
|
+
const { name, version, description } = readPkgVersion();
|
|
102
|
+
// 跟 `npm -v` 一样, 一行 version, 一行 name+description. Windows 友好 (没 ANSI).
|
|
103
|
+
return `${version}\n${name}: ${description}\n`;
|
|
104
|
+
}
|
|
105
|
+
|
|
61
106
|
function parseArgs(argv) {
|
|
62
107
|
const args = {
|
|
63
108
|
mode: 'interactive',
|
|
@@ -74,7 +119,10 @@ function parseArgs(argv) {
|
|
|
74
119
|
while (i < argv.length) {
|
|
75
120
|
const a = argv[i];
|
|
76
121
|
if (a === '--version' || a === '-v') {
|
|
77
|
-
|
|
122
|
+
// Sprint D-21.0.1 (2026-06-06): 改读 package.json, 跟 npm registry / GitHub
|
|
123
|
+
// release 对齐. 旧实现写死 '0.1.0 (Sprint 1a)' → 用户在 Windows 装出 1.0.1
|
|
124
|
+
// 但 --version 显示 stale, 看着像 bug. 现在 npm 1.0.2 / 1.1.0 / 2.0.0 自动跟.
|
|
125
|
+
process.stdout.write(formatVersion());
|
|
78
126
|
process.exit(0);
|
|
79
127
|
}
|
|
80
128
|
if (a === '--help' || a === '-h') {
|
|
@@ -246,8 +294,14 @@ async function main() {
|
|
|
246
294
|
...(args.yes ? { yes: true } : {}),
|
|
247
295
|
maxSteps: args.maxSteps,
|
|
248
296
|
});
|
|
249
|
-
case 'tui':
|
|
250
|
-
|
|
297
|
+
case 'tui': {
|
|
298
|
+
// Sprint 1c-revive-2-D-24.3 (2026-06-06) v1.0.9: 优先走 Ink 容器 bundle.
|
|
299
|
+
// 1. 优先 @deepwhale/tui-ink/dist bundle (tarball 装路径 / dev-build 路径)
|
|
300
|
+
// 2. Fallback 旧的 readline runTuiMode (D-20.3 P0-B legacy, source-only)
|
|
301
|
+
// 注: 上面 import 阶段是 static, 但 bundle 找不到时 import 抛 ERR_MODULE_NOT_FOUND
|
|
302
|
+
// 已经被 Node 提前到 start 抛了, 这里用 try/catch 兜不住. 拍板: 走 D-24.3 装路径
|
|
303
|
+
// 验证, bundle 必须 100% 存在 (postbuild 强保证), legacy 是 dev-only. 跟 D-24.1 §6 红线 1 一致.
|
|
304
|
+
return runTuiInkMode({
|
|
251
305
|
...(args.sessionPath !== undefined ? { sessionPath: args.sessionPath } : {}),
|
|
252
306
|
...(args.provider !== undefined ? { provider: args.provider } : {}),
|
|
253
307
|
...(args.model !== undefined ? { model: args.model } : {}),
|
|
@@ -255,6 +309,7 @@ async function main() {
|
|
|
255
309
|
enableToolLoop: args.enableToolLoop,
|
|
256
310
|
maxSteps: args.maxSteps,
|
|
257
311
|
});
|
|
312
|
+
}
|
|
258
313
|
case 'verify': // Sprint 1c-revive-2-D-11-4: 走 runVerify (4 步 default), formatReport 印到 stdout.
|
|
259
314
|
// 退出码: passed=0, failed=1 (跟 runVerify overallStatus 对应). 跟 Unix
|
|
260
315
|
// 惯例一致 (CI 脚本 \`if deepwhale --verify; then ...\`).
|
|
@@ -275,7 +330,17 @@ async function main() {
|
|
|
275
330
|
}
|
|
276
331
|
|
|
277
332
|
main().then(
|
|
278
|
-
(code) =>
|
|
333
|
+
(code) => {
|
|
334
|
+
// Sprint 1c-revive-2-D-24.3 (2026-06-06) v1.0.9: 兼容 tui mode 返 TuiInkResult 对象.
|
|
335
|
+
// 其它 mode 返 number. 跟 D-24.3 dispatch 1:1.
|
|
336
|
+
if (typeof code === 'number') {
|
|
337
|
+
process.exit(code);
|
|
338
|
+
}
|
|
339
|
+
if (code && typeof code === 'object' && typeof code.exitCode === 'number') {
|
|
340
|
+
process.exit(code.exitCode);
|
|
341
|
+
}
|
|
342
|
+
process.exit(0);
|
|
343
|
+
},
|
|
279
344
|
(err) => {
|
|
280
345
|
// Sprint 1c-revive-4-D-20.1 (2026-06-05) review-fix: 友好错误处理, 退出码 2 (跟参数错一致).
|
|
281
346
|
// - APIKeyMissingError: REPL/print/rpc/tui 缺 key → 印 setup hint
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-adapter.d.ts","sourceRoot":"","sources":["../../src/agent/session-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAY,MAAM,gBAAgB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAClF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEnD;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"session-adapter.d.ts","sourceRoot":"","sources":["../../src/agent/session-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAY,MAAM,gBAAgB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAClF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEnD;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,GAAG,IAAI,CAmClF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,aAAa,CAAC,YAAY,CAAC,GAAG,WAAW,EAAE,CAgH1F;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,MAAM,EACf,EAAE,GAAE,MAAmB,GACtB,OAAO,CAAC,IAAI,CAAC,CAEf;AAED;;;;;;;;;GASG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,EAAE,GAAE,MAAmB,GACtB,OAAO,CAAC,IAAI,CAAC,CAQf;AAED;;;;;;;;GAQG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,aAAa,EACrB,mBAAmB,EAAE,MAAM,EAC3B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,EAAE,GAAE,MAAmB,GACtB,OAAO,CAAC,IAAI,CAAC,CASf;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,aAAa,CAAC,YAAY,CAAC,GACjC,OAAO,CAAC,IAAI,CAAC,CAOf;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC;IAAE,MAAM,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IAAC,QAAQ,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CAS3E;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,aAAa,EACrB,IAAI,EAAE;IACJ,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,GACA,OAAO,CAAC,IAAI,CAAC,CAWf;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,aAAa,EACrB,IAAI,EAAE;IACJ,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,GAAG,sBAAsB,GAAG,eAAe,GAAG,aAAa,CAAC;IAC5E,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,GACA,OAAO,CAAC,IAAI,CAAC,CAWf"}
|
|
@@ -35,6 +35,14 @@ export function toolLoopStepToSessionEvent(step) {
|
|
|
35
35
|
ts: step.ts,
|
|
36
36
|
content: step.message.content,
|
|
37
37
|
...(step.message.tool_calls ? { tool_calls: [...step.message.tool_calls] } : {}),
|
|
38
|
+
// Sprint 1c-revive-2-D-21.1 (2026-06-06, 修 DeepSeek V4 thinking 400 bug):
|
|
39
|
+
// reasoning_content 透传到 session event. reload 重建 messages 时还原,
|
|
40
|
+
// 让 reload 后的下一轮 LLM call 仍能带 reasoning_content (避免 400).
|
|
41
|
+
// 不开 thinking 时 (V3 旧 alias / thinking 关) message.reasoning_content
|
|
42
|
+
// 是 undefined, 字段 absent — 跟旧 session 兼容, 不污染 JSONL.
|
|
43
|
+
...(step.message.reasoning_content !== undefined
|
|
44
|
+
? { reasoning_content: step.message.reasoning_content }
|
|
45
|
+
: {}),
|
|
38
46
|
};
|
|
39
47
|
}
|
|
40
48
|
if (step.kind === 'tool') {
|
|
@@ -128,13 +136,30 @@ export function sessionEventsToMessages(events) {
|
|
|
128
136
|
if (ev.tool_calls && ev.tool_calls.length > 0) {
|
|
129
137
|
// 进入延迟 push 模式
|
|
130
138
|
pendingToolCalls = new Set(ev.tool_calls.map((tc) => tc.id));
|
|
131
|
-
|
|
139
|
+
// Sprint 1c-revive-2-D-21.1 (2026-06-06, 修 DeepSeek V4 thinking 400 bug):
|
|
140
|
+
// reasoning_content 透传回 ChatMessage, 跟 content / tool_calls 一起 reload.
|
|
141
|
+
// 让 reload 后下轮 LLM call wire 仍带 reasoning_content, 避免 DeepSeek V4
|
|
142
|
+
// 多轮 400. 旧 session (无 reasoning_content 字段) 走 omit 分支, 行为不变.
|
|
143
|
+
const msg = {
|
|
144
|
+
role: 'assistant',
|
|
145
|
+
content: ev.content,
|
|
146
|
+
...(ev.reasoning_content !== undefined
|
|
147
|
+
? { reasoning_content: ev.reasoning_content }
|
|
148
|
+
: {}),
|
|
149
|
+
};
|
|
132
150
|
msg.tool_calls = [...ev.tool_calls];
|
|
133
151
|
buffer.push(msg);
|
|
134
152
|
}
|
|
135
153
|
else {
|
|
136
|
-
//
|
|
137
|
-
|
|
154
|
+
// Sprint 1c-revive-2-D-21.1 (2026-06-06): 同样 reasoning_content 透传.
|
|
155
|
+
const msg = {
|
|
156
|
+
role: 'assistant',
|
|
157
|
+
content: ev.content,
|
|
158
|
+
...(ev.reasoning_content !== undefined
|
|
159
|
+
? { reasoning_content: ev.reasoning_content }
|
|
160
|
+
: {}),
|
|
161
|
+
};
|
|
162
|
+
out.push(msg);
|
|
138
163
|
}
|
|
139
164
|
}
|
|
140
165
|
else if (ev.kind === 'tool') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-adapter.js","sourceRoot":"","sources":["../../src/agent/session-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAMH;;;;;;;;GAQG;AACH,MAAM,UAAU,0BAA0B,CAAC,IAAkB;IAC3D,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC9B,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;YAC7B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"session-adapter.js","sourceRoot":"","sources":["../../src/agent/session-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAMH;;;;;;;;GAQG;AACH,MAAM,UAAU,0BAA0B,CAAC,IAAkB;IAC3D,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC9B,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;YAC7B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChF,0EAA0E;YAC1E,+DAA+D;YAC/D,0DAA0D;YAC1D,oEAAoE;YACpE,qDAAqD;YACrD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,KAAK,SAAS;gBAC9C,CAAC,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE;gBACvD,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACzB,OAAO;YACL,IAAI,EAAE,MAAM;YACZ,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE;YAC/B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;YACzB,MAAM,EAAE;gBACN,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;gBAC5B,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;gBAC5B,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS;oBAClE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;oBAC9B,CAAC,CAAC,EAAE,CAAC;aACR;YACD,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC;IACJ,CAAC;IACD,yBAAyB;IACzB,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,MAAM,UAAU,uBAAuB,CAAC,MAAmC;IACzE,gEAAgE;IAChE,+DAA+D;IAC/D,2DAA2D;IAC3D,iCAAiC;IACjC,MAAM,GAAG,GAAkB,EAAE,CAAC;IAC9B,IAAI,MAAM,GAAkB,EAAE,CAAC;IAC/B,IAAI,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAEzC,MAAM,WAAW,GAAG,GAAS,EAAE;QAC7B,IAAI,gBAAgB,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YAC9B,kEAAkE;YAClE,MAAM,GAAG,EAAE,CAAC;QACd,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;YACpB,MAAM,GAAG,EAAE,CAAC;QACd,CAAC;QACD,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;IAC/B,CAAC,CAAC;IAEF,KAAK,MAAM,EAAE,IAAI,MAAM,EAAE,CAAC;QACxB,IAAI,EAAE,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACvB,WAAW,EAAE,CAAC;YACd,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QAClD,CAAC;aAAM,IAAI,EAAE,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YACnC,WAAW,EAAE,CAAC;YACd,IAAI,EAAE,CAAC,UAAU,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9C,eAAe;gBACf,gBAAgB,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC7D,0EAA0E;gBAC1E,uEAAuE;gBACvE,kEAAkE;gBAClE,8DAA8D;gBAC9D,MAAM,GAAG,GAAgB;oBACvB,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,EAAE,CAAC,OAAO;oBACnB,GAAG,CAAC,EAAE,CAAC,iBAAiB,KAAK,SAAS;wBACpC,CAAC,CAAC,EAAE,iBAAiB,EAAE,EAAE,CAAC,iBAAiB,EAAE;wBAC7C,CAAC,CAAC,EAAE,CAAC;iBACR,CAAC;gBACF,GAAG,CAAC,UAAU,GAAG,CAAC,GAAG,EAAE,CAAC,UAAU,CAAe,CAAC;gBAClD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;iBAAM,CAAC;gBACN,mEAAmE;gBACnE,MAAM,GAAG,GAAgB;oBACvB,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,EAAE,CAAC,OAAO;oBACnB,GAAG,CAAC,EAAE,CAAC,iBAAiB,KAAK,SAAS;wBACpC,CAAC,CAAC,EAAE,iBAAiB,EAAE,EAAE,CAAC,iBAAiB,EAAE;wBAC7C,CAAC,CAAC,EAAE,CAAC;iBACR,CAAC;gBACF,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChB,CAAC;QACH,CAAC;aAAM,IAAI,EAAE,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC9B,IAAI,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC1C,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;gBACzC,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO;oBAC1B,YAAY,EAAE,EAAE,CAAC,YAAY;oBAC7B,IAAI,EAAE,EAAE,CAAC,IAAI;iBACd,CAAC,CAAC;YACL,CAAC;YACD,6DAA6D;QAC/D,CAAC;aAAM,IAAI,EAAE,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YACpC,yEAAyE;YACzE,oDAAoD;YACpD,wEAAwE;YACxE,yEAAyE;YACzE,yCAAyC;YACzC,qEAAqE;YACrE,qCAAqC;YACrC,sEAAsE;YACtE,cAAc;YACd,kBAAkB;YAClB,oEAAoE;YACpE,+DAA+D;YAC/D,gEAAgE;YAChE,kBAAkB;YAClB,+DAA+D;YAC/D,iEAAiE;YACjE,wDAAwD;YACxD,sDAAsD;YACtD,iEAAiE;YACjE,mEAAmE;YACnE,iCAAiC;YACjC,WAAW,EAAE,CAAC;YACd,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC;YACvC,IAAI,KAAK,GAAG,CAAC,IAAI,GAAG,GAAG,KAAK;gBAAE,SAAS,CAAC,WAAW;YACnD,IAAI,KAAK,GAAG,GAAG,CAAC,MAAM;gBAAE,SAAS,CAAC,oBAAoB;YACtD,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,EAAE,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC;YAC9D,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,EAAE;gBAC7B,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,iCAAiC,EAAE,CAAC,OAAO,EAAE;aACvD,CAAC,CAAC;QACL,CAAC;QACD,2GAA2G;QAC3G,6BAA6B;QAC7B,wCAAwC;QACxC,oFAAoF;QACpF,kDAAkD;QAClD,+FAA+F;QAC/F,gFAAgF;QAChF,yEAAyE;IAC3E,CAAC;IACD,4BAA4B;IAC5B,8DAA8D;IAC9D,2DAA2D;IAC3D,qDAAqD;IACrD,2DAA2D;IAC3D,WAAW,EAAE,CAAC;IACd,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,MAAqB,EACrB,OAAe,EACf,KAAa,IAAI,CAAC,GAAG,EAAE;IAEvB,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;AACrD,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,MAAqB,EACrB,OAAe,EACf,aAAwC,EACxC,IAA8B,EAC9B,KAAa,IAAI,CAAC,GAAG,EAAE;IAEvB,MAAM,MAAM,CAAC,MAAM,CAAC;QAClB,IAAI,EAAE,YAAY;QAClB,EAAE;QACF,OAAO;QACP,cAAc,EAAE,aAAa;QAC7B,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,MAAqB,EACrB,mBAA2B,EAC3B,MAAc,EACd,SAAiB,EACjB,IAA8B,EAC9B,KAAa,IAAI,CAAC,GAAG,EAAE;IAEvB,MAAM,MAAM,CAAC,MAAM,CAAC;QAClB,IAAI,EAAE,mBAAmB;QACzB,EAAE;QACF,oBAAoB,EAAE,mBAAmB;QACzC,MAAM;QACN,UAAU,EAAE,SAAS;QACrB,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxC,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,MAAqB,EACrB,KAAkC;IAElC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,EAAE,GAAG,0BAA0B,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YAChB,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAAqB;IAErB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;IACtC,wDAAwD;IACxD,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,+CAA+C;IACjD,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,uBAAuB,CAAC,MAAM,CAAC,EAAE,CAAC;AAC/D,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,MAAqB,EACrB,IAQC;IAED,MAAM,MAAM,CAAC,MAAM,CAAC;QAClB,IAAI,EAAE,cAAc;QACpB,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE;QACzB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,aAAa,EAAE,IAAI,CAAC,YAAY;QAChC,YAAY,EAAE,IAAI,CAAC,WAAW;QAC9B,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxD,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,MAAqB,EACrB,IAQC;IAED,MAAM,MAAM,CAAC,MAAM,CAAC;QAClB,IAAI,EAAE,iBAAiB;QACvB,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE;QACzB,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxD,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../src/agent/tool-loop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAiB,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAGlG,OAAO,KAAK,EAAQ,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAMrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,oEAAoE;AACpE,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAE7C,MAAM,WAAW,eAAe;IAC9B,2CAA2C;IAC3C,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,uDAAuD;IACvD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,+DAA+D;IAC/D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,6DAA6D;IAC7D,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAA;KAAE,KAAK,IAAI,CAAC;IACtF,4CAA4C;IAC5C,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;OAIG;IACH,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC3B,4EAA4E;IAC5E,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,8FAA8F;IAC9F,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,8EAA8E;IAC9E,MAAM,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,MAAM,YAAY,GACpB;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,GAC3E;IACE,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,UAAU,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,GACD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,GACpE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC;AAEhD,MAAM,WAAW,cAAc;IAC7B,mDAAmD;IACnD,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,+DAA+D;IAC/D,KAAK,EAAE,UAAU,CAAC;IAClB;;;;OAIG;IACH,KAAK,EAAE,YAAY,EAAE,CAAC;CACvB;AAED;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,KAAK;aAIzB,KAAK,EAAE,MAAM;aACb,UAAU,EAAE,UAAU;IAJxC,SAAkB,IAAI,EAAG,oBAAoB,CAAU;IACvD,QAAQ,CAAC,eAAe,EAAG,IAAI,CAAU;gBAEvB,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,UAAU;CAIzC;AAED,YAAY;AACZ,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,kBAAkB,CAEvE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,aAAa,CAAC,WAAW,CAAC,EACpC,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../src/agent/tool-loop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAiB,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAGlG,OAAO,KAAK,EAAQ,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAMrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,oEAAoE;AACpE,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAE7C,MAAM,WAAW,eAAe;IAC9B,2CAA2C;IAC3C,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,uDAAuD;IACvD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,+DAA+D;IAC/D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,6DAA6D;IAC7D,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAA;KAAE,KAAK,IAAI,CAAC;IACtF,4CAA4C;IAC5C,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;OAIG;IACH,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC3B,4EAA4E;IAC5E,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,8FAA8F;IAC9F,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,8EAA8E;IAC9E,MAAM,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,MAAM,YAAY,GACpB;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,GAC3E;IACE,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,UAAU,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,GACD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,GACpE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC;AAEhD,MAAM,WAAW,cAAc;IAC7B,mDAAmD;IACnD,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,+DAA+D;IAC/D,KAAK,EAAE,UAAU,CAAC;IAClB;;;;OAIG;IACH,KAAK,EAAE,YAAY,EAAE,CAAC;CACvB;AAED;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,KAAK;aAIzB,KAAK,EAAE,MAAM;aACb,UAAU,EAAE,UAAU;IAJxC,SAAkB,IAAI,EAAG,oBAAoB,CAAU;IACvD,QAAQ,CAAC,eAAe,EAAG,IAAI,CAAU;gBAEvB,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,UAAU;CAIzC;AAED,YAAY;AACZ,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,kBAAkB,CAEvE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,aAAa,CAAC,WAAW,CAAC,EACpC,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,cAAc,CAAC,CAgGzB"}
|
package/dist/agent/tool-loop.js
CHANGED
|
@@ -98,7 +98,18 @@ export async function runToolLoop(client, messages, options = {}) {
|
|
|
98
98
|
throw err;
|
|
99
99
|
}
|
|
100
100
|
// 2) 把 assistant 消息写进 working(tool_calls 必带;content 可能空)
|
|
101
|
-
|
|
101
|
+
// Sprint 1c-revive-2-D-21.1 (2026-06-06, 修 DeepSeek V4 thinking 400 bug):
|
|
102
|
+
// reasoning_content 也写进 working, 让下轮 LLM call 时 toWireMessage 透传.
|
|
103
|
+
// DeepSeek V4 默认开 thinking, 多轮必须回传上轮 reasoning, 否则 400.
|
|
104
|
+
// 不开 thinking 时 (V3 旧 alias / thinking 关) lastResult.reasoning_content
|
|
105
|
+
// 是 undefined, 字段 absent, 行为不变.
|
|
106
|
+
const assistantMsg = {
|
|
107
|
+
role: 'assistant',
|
|
108
|
+
content: lastResult.content,
|
|
109
|
+
...(lastResult.reasoning_content !== undefined
|
|
110
|
+
? { reasoning_content: lastResult.reasoning_content }
|
|
111
|
+
: {}),
|
|
112
|
+
};
|
|
102
113
|
if (lastResult.tool_calls && lastResult.tool_calls.length > 0) {
|
|
103
114
|
assistantMsg.tool_calls = lastResult.tool_calls;
|
|
104
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../src/agent/tool-loop.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../src/agent/tool-loop.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -20,6 +20,10 @@ export * from './types.js';
|
|
|
20
20
|
export * from './agent/index.js';
|
|
21
21
|
export * from './modes/index.js';
|
|
22
22
|
export * from './verify/index.js';
|
|
23
|
-
export
|
|
23
|
+
export * from './policy/index.js';
|
|
24
|
+
export type { ChatMessage } from '@deepwhale/llm';
|
|
25
|
+
export { SessionReader, SessionWriter } from '@deepwhale/core';
|
|
26
|
+
export { startRepl, runOneTurn, formatUsageStatus, createReplConfirm } from './repl.js';
|
|
27
|
+
export type { ReplConfirmController, ReplConfirmOptions, ReplConfirm } from './repl/repl-confirm.js';
|
|
24
28
|
export type { ReplOptions } from './repl.js';
|
|
25
29
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAElC,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AACxF,YAAY,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrG,YAAY,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -20,5 +20,7 @@ export * from './types.js';
|
|
|
20
20
|
export * from './agent/index.js';
|
|
21
21
|
export * from './modes/index.js';
|
|
22
22
|
export * from './verify/index.js'; // Sprint 1c-revive-2-D-11-4 (2026-06-04): verify module
|
|
23
|
-
export
|
|
23
|
+
export * from './policy/index.js'; // Sprint 1c-revive-2-D-24.2 (2026-06-06): tui-ink needs ToolPolicy/staticToolPolicy
|
|
24
|
+
export { SessionReader, SessionWriter } from '@deepwhale/core';
|
|
25
|
+
export { startRepl, runOneTurn, formatUsageStatus, createReplConfirm } from './repl.js';
|
|
24
26
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC,CAAC,wDAAwD;AAC3F,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC,CAAC,wDAAwD;AAC3F,cAAc,mBAAmB,CAAC,CAAC,oFAAoF;AAGvH,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC"}
|
package/dist/llm-factory.d.ts
CHANGED
|
@@ -5,6 +5,8 @@
|
|
|
5
5
|
* REPL 启动时 provider 怎么选, 拍板为 "env 推断 + flag 显式覆盖":
|
|
6
6
|
* 1. options.provider 显式给 → 优先用显式值 (REPL --provider flag)
|
|
7
7
|
* 2. options.provider 未给 → 看 env:
|
|
8
|
+
* - DEEPWHALE_PROVIDER=deepseek|anthropic 显式设 → 用该值 (D-21.1 拍板,
|
|
9
|
+
* 让 shell user 一行 set 决断, 不必 unset 另一个 key)
|
|
8
10
|
* - ANTHROPIC_AUTH_TOKEN 设了 + DEEPSEEK_API_KEY 没设 → anthropic (走 DeepSeek shim)
|
|
9
11
|
* - DEEPSEEK_API_KEY 设了 + ANTHROPIC_AUTH_TOKEN 没设 → deepseek
|
|
10
12
|
* - 两个都设了 → 报错 (静默走错 provider 误用 API key 是 P0 风险)
|
|
@@ -12,6 +14,7 @@
|
|
|
12
14
|
*
|
|
13
15
|
* 设计原则 (Hermes 1a follow-up #2 lesson):
|
|
14
16
|
* - 不**静默** default 到某个 provider, 必报清晰错
|
|
17
|
+
* - DEEPWHALE_PROVIDER 是 "user 决断" 显式语义, 优先级高于 env 推断
|
|
15
18
|
* - 不**做**汇率换算 / 跨 provider 兼容 (DeepSeek shim 走同一 endpoint, 接口层隔离)
|
|
16
19
|
* - 注入点已存在 (ReplOptions.client), factory 只在 startRepl 入口用
|
|
17
20
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-factory.d.ts","sourceRoot":"","sources":["../src/llm-factory.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"llm-factory.d.ts","sourceRoot":"","sources":["../src/llm-factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,KAAK,SAAS,EAAsB,MAAM,gBAAgB,CAAC;AAErG,MAAM,MAAM,QAAQ,GAAG,UAAU,GAAG,WAAW,CAAC;AAEhD,MAAM,WAAW,mBAAmB;IAClC,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,mGAAmG;IACnG,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,mBAAwB,GAAG,SAAS,CAchF;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,GAAG,SAAS,CAM3D;AAiDD;;;;;GAKG;AACH,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC"}
|
package/dist/llm-factory.js
CHANGED
|
@@ -5,6 +5,8 @@
|
|
|
5
5
|
* REPL 启动时 provider 怎么选, 拍板为 "env 推断 + flag 显式覆盖":
|
|
6
6
|
* 1. options.provider 显式给 → 优先用显式值 (REPL --provider flag)
|
|
7
7
|
* 2. options.provider 未给 → 看 env:
|
|
8
|
+
* - DEEPWHALE_PROVIDER=deepseek|anthropic 显式设 → 用该值 (D-21.1 拍板,
|
|
9
|
+
* 让 shell user 一行 set 决断, 不必 unset 另一个 key)
|
|
8
10
|
* - ANTHROPIC_AUTH_TOKEN 设了 + DEEPSEEK_API_KEY 没设 → anthropic (走 DeepSeek shim)
|
|
9
11
|
* - DEEPSEEK_API_KEY 设了 + ANTHROPIC_AUTH_TOKEN 没设 → deepseek
|
|
10
12
|
* - 两个都设了 → 报错 (静默走错 provider 误用 API key 是 P0 风险)
|
|
@@ -12,6 +14,7 @@
|
|
|
12
14
|
*
|
|
13
15
|
* 设计原则 (Hermes 1a follow-up #2 lesson):
|
|
14
16
|
* - 不**静默** default 到某个 provider, 必报清晰错
|
|
17
|
+
* - DEEPWHALE_PROVIDER 是 "user 决断" 显式语义, 优先级高于 env 推断
|
|
15
18
|
* - 不**做**汇率换算 / 跨 provider 兼容 (DeepSeek shim 走同一 endpoint, 接口层隔离)
|
|
16
19
|
* - 注入点已存在 (ReplOptions.client), factory 只在 startRepl 入口用
|
|
17
20
|
*/
|
|
@@ -59,21 +62,40 @@ export function resolveAnthropicApiKey() {
|
|
|
59
62
|
* - 都没设 → 抛 APIKeyMissingError (跟 1b 时代一致, 引导 user)
|
|
60
63
|
* - 都设了 → 抛 'both-set' 错误 (P0 风险, 强制 user 决断)
|
|
61
64
|
* - 只设一个 → 返那个
|
|
65
|
+
*
|
|
66
|
+
* Sprint 1c-revive-2-D-21.1 (2026-06-06, 修 Anthropic wins tiebreak bug):
|
|
67
|
+
* 之前 if-else 顺序是 "hasAnthropic 排第一", 跟产品 "DeepSeek-first" 品牌
|
|
68
|
+
* (README:18 / package.json:6 / DeepSeekClient 默认 model=deepseek-v4-flash)
|
|
69
|
+
* 矛盾. 两个都设的实情被 tryCreateClient catch 静默 + tryCreateClient
|
|
70
|
+
* 自身的 fallback 让用户误以为"在走 anthropic". 拍板: 跟品牌一致,
|
|
71
|
+
* hasDeepseek 排第一; 都设的 error 信息明示用户可以传 --provider 决断.
|
|
72
|
+
* 行为兼容: 单 key 路径 (只设 Anthropic 或只设 DeepSeek) 完全不变.
|
|
62
73
|
*/
|
|
63
74
|
function resolveProvider(explicit) {
|
|
75
|
+
// 优先级: 显式 options.provider > DEEPWHALE_PROVIDER env > 单 key 推断.
|
|
64
76
|
if (explicit !== undefined)
|
|
65
77
|
return explicit;
|
|
78
|
+
// Sprint 1c-revive-2-D-21.1 (2026-06-06): DEEPWHALE_PROVIDER 让 user shell 一行
|
|
79
|
+
// 决断 (e.g. `DEEPWHALE_PROVIDER=deepseek deepwhale` 即使两个 key 都设了也走 deepseek).
|
|
80
|
+
const providerEnv = process.env['DEEPWHALE_PROVIDER'];
|
|
81
|
+
if (providerEnv === 'deepseek' || providerEnv === 'anthropic') {
|
|
82
|
+
return providerEnv;
|
|
83
|
+
}
|
|
84
|
+
// DEEPWHALE_PROVIDER 设了非法值: 静默 fall through 到 env 推断, 不让 typo
|
|
85
|
+
// (e.g. `DEEPWHALE_PROVIDER=depseek`) 整个 CLI 崩. 拍板: 静默忽略, 因为
|
|
86
|
+
// "拼错" 不该是 fatal, user 该看到下面的 "Both set" 错才知道哪里设错了.
|
|
66
87
|
const hasAnthropic = (process.env['ANTHROPIC_AUTH_TOKEN'] ?? '') !== '';
|
|
67
88
|
const hasDeepseek = (process.env['DEEPSEEK_API_KEY'] ?? '') !== '';
|
|
68
89
|
if (hasAnthropic && hasDeepseek) {
|
|
69
90
|
throw new APIKeyMissingError('Both ANTHROPIC_AUTH_TOKEN and DEEPSEEK_API_KEY are set. ' +
|
|
70
|
-
'Unset one or pass --provider
|
|
71
|
-
'silently using the wrong provider with the wrong API key.'
|
|
91
|
+
'Unset one, or set DEEPWHALE_PROVIDER=<deepseek|anthropic>, or pass --provider <name>. ' +
|
|
92
|
+
'This is a safety check to prevent silently using the wrong provider with the wrong API key. ' +
|
|
93
|
+
'Note: DeepWhale is DeepSeek-first (default model: deepseek-v4-flash).');
|
|
72
94
|
}
|
|
73
|
-
if (hasAnthropic)
|
|
74
|
-
return 'anthropic';
|
|
75
95
|
if (hasDeepseek)
|
|
76
96
|
return 'deepseek';
|
|
97
|
+
if (hasAnthropic)
|
|
98
|
+
return 'anthropic';
|
|
77
99
|
throw new APIKeyMissingError('No LLM API key set. Set DEEPSEEK_API_KEY (DeepSeek) or ' +
|
|
78
100
|
'ANTHROPIC_AUTH_TOKEN (Anthropic, via DeepSeek shim /anthropic endpoint) ' +
|
|
79
101
|
'environment variable, or pass --provider explicitly.');
|
package/dist/llm-factory.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-factory.js","sourceRoot":"","sources":["../src/llm-factory.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"llm-factory.js","sourceRoot":"","sources":["../src/llm-factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,eAAe,EAAE,cAAc,EAAkB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAWrG;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,UAA+B,EAAE;IACnE,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnD,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,UAAU;YACb,OAAO,IAAI,cAAc,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAClG,KAAK,WAAW;YACd,oFAAoF;YACpF,yEAAyE;YACzE,kEAAkE;YAClE,EAAE;YACF,6DAA6D;YAC7D,iEAAiE;YACjE,OAAO,IAAI,eAAe,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACrG,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB;IACpC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACtD,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,EAAE;QAAE,OAAO,SAAS,CAAC;IAClE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACjD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,EAAE;QAAE,OAAO,QAAQ,CAAC;IAC/D,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,SAAS,eAAe,CAAC,QAA8B;IACrD,gEAAgE;IAChE,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAC5C,6EAA6E;IAC7E,6EAA6E;IAC7E,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtD,IAAI,WAAW,KAAK,UAAU,IAAI,WAAW,KAAK,WAAW,EAAE,CAAC;QAC9D,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,8DAA8D;IAC9D,6DAA6D;IAC7D,oDAAoD;IACpD,MAAM,YAAY,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;IACxE,MAAM,WAAW,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;IACnE,IAAI,YAAY,IAAI,WAAW,EAAE,CAAC;QAChC,MAAM,IAAI,kBAAkB,CAC1B,0DAA0D;YACxD,wFAAwF;YACxF,8FAA8F;YAC9F,uEAAuE,CAC1E,CAAC;IACJ,CAAC;IACD,IAAI,WAAW;QAAE,OAAO,UAAU,CAAC;IACnC,IAAI,YAAY;QAAE,OAAO,WAAW,CAAC;IACrC,MAAM,IAAI,kBAAkB,CAC1B,yDAAyD;QACvD,0EAA0E;QAC1E,sDAAsD,CACzD,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC"}
|
package/dist/modes/tui.d.ts
CHANGED
|
@@ -1,6 +1,18 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* TUI 模式 — Sprint 1c-revive-4-D-20.3 P0-B (2026-06-05) v1.0 capability completion
|
|
3
3
|
*
|
|
4
|
+
* @deprecated LEGACY — Sprint 1c-revive-2-D-24.3 (2026-06-06) v1.0.9:
|
|
5
|
+
* 1.0.9+ `deepwhale tui` mode 走 Ink 容器 (@deepwhale/tui-ink 1.0.9 bundle).
|
|
6
|
+
* 本文件保留仅作 source-install dev 路径保底, 不再是 default path.
|
|
7
|
+
* - bin/deepwhale.js 'tui' case → runTuiInkMode (D-24.3 dispatch)
|
|
8
|
+
* - 跟 D-24.1 §6 红线 1 一致: legacy 0 删, fallback 兜底
|
|
9
|
+
* - 现有 979 行 tui-smoke.test.ts 0 改动, 行为在 readline 容器仍验过
|
|
10
|
+
*
|
|
11
|
+
* 业务逻辑 0 重写: D-22 / D-23.1 / D-23.2 业务 1:1 搬到 tui-ink/, 跟本文件同形态.
|
|
12
|
+
* 不再维护 (sprint 1.1+): 计划完全删除本文件, 但保留 0 改动作 fallback.
|
|
13
|
+
*
|
|
14
|
+
* ---- 下方为 v1.0.0 - v1.0.8 readline 容器实现 ----
|
|
15
|
+
*
|
|
4
16
|
* Minimal ANSI TUI. **不**装新依赖 (无 Ink), 用 node:readline + ANSI 转义码.
|
|
5
17
|
*
|
|
6
18
|
* 复用红线 (D-20.3 P0-B 拍板):
|
|
@@ -33,6 +45,50 @@
|
|
|
33
45
|
import type { LLMClient } from '@deepwhale/llm';
|
|
34
46
|
import { type AgentCompactionConfig } from '../agent/index.js';
|
|
35
47
|
import { type Provider } from '../llm-factory.js';
|
|
48
|
+
export type TuiThemeName = 'default' | 'solarized' | 'monochrome';
|
|
49
|
+
export interface TuiTheme {
|
|
50
|
+
header: string;
|
|
51
|
+
model: string;
|
|
52
|
+
divider: string;
|
|
53
|
+
prompt: string;
|
|
54
|
+
error: string;
|
|
55
|
+
success: string;
|
|
56
|
+
/** D-23.1 (2026-06-06): 工具名 (tool call/result 行), 跟 model 同级, 用同色变体 */
|
|
57
|
+
toolName: string;
|
|
58
|
+
}
|
|
59
|
+
export declare const THEMES: Record<TuiThemeName, TuiTheme>;
|
|
60
|
+
/**
|
|
61
|
+
* 解析 theme 来源 (env > 默认), 找不到或 invalid 时退化到 'default' + stderr warning.
|
|
62
|
+
* 不抛: 启动期不阻塞, 跟 env-gate 风格一致.
|
|
63
|
+
*/
|
|
64
|
+
export declare function resolveTuiTheme(themeArg?: string): TuiThemeName;
|
|
65
|
+
/**
|
|
66
|
+
* 语法高亮 chunk content. 非 TTY 退化到原 text (跟 colorize 行为一致, 跟 CI/管道 log 兼容).
|
|
67
|
+
*
|
|
68
|
+
* @param text - 单 chunk 文本 fragment
|
|
69
|
+
* @param theme - 当前 theme (从 runTuiMode 闭包传入)
|
|
70
|
+
* @param forceColor - D-23.2 测试 hook: 强制当 TTY (非默认) 用于 unit test 验证染色字节.
|
|
71
|
+
* 生产路径 (runTuiMode) 不传, 走 isTty() 自动判断.
|
|
72
|
+
* @returns 染色后文本 (含 ANSI escape) 或原 text (非 TTY)
|
|
73
|
+
*/
|
|
74
|
+
export declare function highlightChunk(text: string, theme?: TuiTheme, forceColor?: boolean): string;
|
|
75
|
+
declare const TUI_HISTORY_MAX = 1000;
|
|
76
|
+
declare function tuiHistoryPath(): string;
|
|
77
|
+
declare function tuiHistoryLoad(): string[];
|
|
78
|
+
declare function tuiHistoryAppend(line: string): void;
|
|
79
|
+
export { tuiHistoryAppend, tuiHistoryLoad, tuiHistoryPath, TUI_HISTORY_MAX };
|
|
80
|
+
declare const SPINNER_FRAMES: readonly ["⠋", "⠙", "⠹", "⠸", "⠼"];
|
|
81
|
+
declare const SPINNER_INTERVAL_MS = 80;
|
|
82
|
+
declare const SPINNER_LABEL = "thinking\u2026";
|
|
83
|
+
declare class Spinner {
|
|
84
|
+
private timer;
|
|
85
|
+
private frame;
|
|
86
|
+
private active;
|
|
87
|
+
start(stream?: NodeJS.WritableStream): void;
|
|
88
|
+
stop(stream?: NodeJS.WritableStream): void;
|
|
89
|
+
private render;
|
|
90
|
+
}
|
|
91
|
+
export { Spinner, SPINNER_FRAMES, SPINNER_INTERVAL_MS, SPINNER_LABEL };
|
|
36
92
|
export interface TuiModeOptions {
|
|
37
93
|
sessionPath?: string;
|
|
38
94
|
enableToolLoop?: boolean;
|
|
@@ -47,6 +103,8 @@ export interface TuiModeOptions {
|
|
|
47
103
|
output?: NodeJS.WritableStream;
|
|
48
104
|
/** 注入错误流(默认 stderr)。单测用。 */
|
|
49
105
|
errorOutput?: NodeJS.WritableStream;
|
|
106
|
+
/** D-23.1 (2026-06-06): TUI 主题. 不传或 invalid → 'default' (跟 env DEEPWHALE_TUI_THEME 协同). */
|
|
107
|
+
theme?: TuiThemeName;
|
|
50
108
|
/** compaction config 跟 print mode 同形态 */
|
|
51
109
|
compactionConfig?: Omit<AgentCompactionConfig, 'writer' | 'state'> | null;
|
|
52
110
|
}
|
package/dist/modes/tui.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tui.d.ts","sourceRoot":"","sources":["../../src/modes/tui.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"tui.d.ts","sourceRoot":"","sources":["../../src/modes/tui.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AAOH,OAAO,KAAK,EAAe,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE7D,OAAO,EAKL,KAAK,qBAAqB,EAE3B,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAuB,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAwCvE,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,WAAW,GAAG,YAAY,CAAC;AAElE,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,QAAQ,CA8BjD,CAAC;AAIF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,YAAY,CAO/D;AAyED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,KAAK,GAAE,QAAyB,EAChC,UAAU,CAAC,EAAE,OAAO,GACnB,MAAM,CA8CR;AAUD,QAAA,MAAM,eAAe,OAAO,CAAC;AAE7B,iBAAS,cAAc,IAAI,MAAM,CAEhC;AAED,iBAAS,cAAc,IAAI,MAAM,EAAE,CA0BlC;AAED,iBAAS,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAe5C;AAGD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC;AAO7E,QAAA,MAAM,cAAc,oCAAqC,CAAC;AAC1D,QAAA,MAAM,mBAAmB,KAAK,CAAC;AAC/B,QAAA,MAAM,aAAa,mBAAc,CAAC;AAElC,cAAM,OAAO;IACX,OAAO,CAAC,KAAK,CAA+C;IAC5D,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,MAAM,CAAS;IAEvB,KAAK,CAAC,MAAM,GAAE,MAAM,CAAC,cAAuB,GAAG,IAAI;IAYnD,IAAI,CAAC,MAAM,GAAE,MAAM,CAAC,cAAuB,GAAG,IAAI;IA0BlD,OAAO,CAAC,MAAM;CAKf;AAGD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,aAAa,EAAE,CAAC;AAmBvE,MAAM,WAAW,cAAc;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,2BAA2B;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC9B,4BAA4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,4BAA4B;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IACpC,2FAA2F;IAC3F,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,yCAAyC;IACzC,gBAAgB,CAAC,EAAE,IAAI,CAAC,qBAAqB,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC;CAC3E;AAID,wBAAsB,UAAU,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqX9E"}
|