dvalincode 0.21.0 → 0.23.0
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/README.md +261 -27
- package/README.zh-CN.md +203 -23
- package/dist/agent/compact.d.ts +8 -0
- package/dist/agent/compact.js +44 -5
- package/dist/agent/compact.js.map +1 -1
- package/dist/agent/loop.d.ts +5 -0
- package/dist/agent/loop.js +18 -9
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/runner.d.ts +15 -3
- package/dist/agent/runner.js +99 -9
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/session.d.ts +7 -0
- package/dist/agent/session.js +32 -4
- package/dist/agent/session.js.map +1 -1
- package/dist/agent/types.d.ts +5 -1
- package/dist/agent/types.js.map +1 -1
- package/dist/audit/log.d.ts +5 -1
- package/dist/audit/log.js.map +1 -1
- package/dist/cli.js +2 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/agents.d.ts +11 -0
- package/dist/commands/agents.js +223 -0
- package/dist/commands/agents.js.map +1 -0
- package/dist/commands/dvalin.d.ts +7 -1
- package/dist/commands/dvalin.js +209 -9
- package/dist/commands/dvalin.js.map +1 -1
- package/dist/commands/mcpInstall.d.ts +24 -0
- package/dist/commands/mcpInstall.js +62 -17
- package/dist/commands/mcpInstall.js.map +1 -1
- package/dist/commands/provider.js +6 -1
- package/dist/commands/provider.js.map +1 -1
- package/dist/commands/run.js +4 -2
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/security.d.ts +15 -0
- package/dist/commands/security.js +273 -22
- package/dist/commands/security.js.map +1 -1
- package/dist/dvalinCli.js +2 -0
- package/dist/dvalinCli.js.map +1 -1
- package/dist/harness/run.d.ts +8 -2
- package/dist/harness/run.js +1 -1
- package/dist/harness/run.js.map +1 -1
- package/dist/mcp/agents.d.ts +41 -0
- package/dist/mcp/agents.js +129 -0
- package/dist/mcp/agents.js.map +1 -0
- package/dist/mcp/install.d.ts +43 -6
- package/dist/mcp/install.js +104 -1
- package/dist/mcp/install.js.map +1 -1
- package/dist/mcp/server.js +10 -2
- package/dist/mcp/server.js.map +1 -1
- package/dist/providers/anthropic.js +14 -2
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/openaiCompatible.js +7 -6
- package/dist/providers/openaiCompatible.js.map +1 -1
- package/dist/providers/retry.d.ts +32 -0
- package/dist/providers/retry.js +150 -0
- package/dist/providers/retry.js.map +1 -0
- package/dist/providers/trustedBaseUrls.js +1 -1
- package/dist/providers/trustedBaseUrls.js.map +1 -1
- package/dist/providers/types.d.ts +10 -0
- package/dist/remediation/automate.d.ts +1 -1
- package/dist/remediation/automate.js +2 -1
- package/dist/remediation/automate.js.map +1 -1
- package/dist/remediation/cases.d.ts +1 -0
- package/dist/remediation/cases.js +1 -0
- package/dist/remediation/cases.js.map +1 -1
- package/dist/remediation/codeQualityExport.d.ts +25 -0
- package/dist/remediation/codeQualityExport.js +24 -0
- package/dist/remediation/codeQualityExport.js.map +1 -0
- package/dist/remediation/codexSecurity.d.ts +54 -0
- package/dist/remediation/codexSecurity.js +366 -0
- package/dist/remediation/codexSecurity.js.map +1 -0
- package/dist/remediation/evasion.d.ts +61 -0
- package/dist/remediation/evasion.js +190 -0
- package/dist/remediation/evasion.js.map +1 -0
- package/dist/remediation/fixLoop.d.ts +255 -0
- package/dist/remediation/fixLoop.js +639 -0
- package/dist/remediation/fixLoop.js.map +1 -0
- package/dist/remediation/fixLoopStats.d.ts +93 -0
- package/dist/remediation/fixLoopStats.js +244 -0
- package/dist/remediation/fixLoopStats.js.map +1 -0
- package/dist/remediation/rebase.d.ts +44 -0
- package/dist/remediation/rebase.js +114 -0
- package/dist/remediation/rebase.js.map +1 -0
- package/dist/remediation/reproduce.d.ts +47 -0
- package/dist/remediation/reproduce.js +75 -0
- package/dist/remediation/reproduce.js.map +1 -0
- package/dist/remediation/sarif.d.ts +14 -1
- package/dist/remediation/sarif.js +21 -3
- package/dist/remediation/sarif.js.map +1 -1
- package/dist/remediation/scannerSuite.d.ts +52 -3
- package/dist/remediation/scannerSuite.js +347 -88
- package/dist/remediation/scannerSuite.js.map +1 -1
- package/dist/remediation/verify.d.ts +8 -0
- package/dist/remediation/verify.js +24 -11
- package/dist/remediation/verify.js.map +1 -1
- package/dist/security/config.d.ts +8 -2
- package/dist/security/config.js +10 -3
- package/dist/security/config.js.map +1 -1
- package/dist/security/contracts.js +15 -0
- package/dist/security/contracts.js.map +1 -1
- package/dist/security/fixRecord.d.ts +103 -8
- package/dist/security/fixRecord.js +113 -11
- package/dist/security/fixRecord.js.map +1 -1
- package/dist/security/fixRecordFile.d.ts +11 -2
- package/dist/security/fixRecordFile.js +20 -2
- package/dist/security/fixRecordFile.js.map +1 -1
- package/dist/security/fixRecordSignature.d.ts +104 -0
- package/dist/security/fixRecordSignature.js +227 -0
- package/dist/security/fixRecordSignature.js.map +1 -0
- package/dist/security/guardedScan.d.ts +39 -0
- package/dist/security/guardedScan.js +45 -0
- package/dist/security/guardedScan.js.map +1 -0
- package/dist/security/onboarding.d.ts +28 -0
- package/dist/security/onboarding.js +124 -0
- package/dist/security/onboarding.js.map +1 -0
- package/dist/security/reproduceInCi.d.ts +44 -0
- package/dist/security/reproduceInCi.js +96 -0
- package/dist/security/reproduceInCi.js.map +1 -0
- package/dist/security/reverify.d.ts +130 -0
- package/dist/security/reverify.js +361 -0
- package/dist/security/reverify.js.map +1 -0
- package/dist/security/suppressionGuard.d.ts +58 -0
- package/dist/security/suppressionGuard.js +216 -0
- package/dist/security/suppressionGuard.js.map +1 -0
- package/dist/security/verifyRun.js +14 -3
- package/dist/security/verifyRun.js.map +1 -1
- package/dist/security/workflow.d.ts +11 -1
- package/dist/security/workflow.js +2 -0
- package/dist/security/workflow.js.map +1 -1
- package/dist/server/routes/config.js +2 -0
- package/dist/server/routes/config.js.map +1 -1
- package/dist/server/routes/remediation.js +6 -5
- package/dist/server/routes/remediation.js.map +1 -1
- package/dist/tools/editFile.js +9 -2
- package/dist/tools/editFile.js.map +1 -1
- package/dist/tools/registry.d.ts +4 -1
- package/dist/tools/registry.js +29 -9
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/runSecuritySuite.d.ts +3 -0
- package/dist/tools/runSecuritySuite.js +2 -2
- package/dist/tools/runSecuritySuite.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
package/README.zh-CN.md
CHANGED
|
@@ -57,7 +57,7 @@ Fix record 2c9d71ac03e0 · VERIFIED · scan-and-checks
|
|
|
57
57
|
|
|
58
58
|
Dvalin 是放在“代码生成”和“允许合并”之间的独立安全运行时。人类开发者、Coding
|
|
59
59
|
Agent 和 CI 调用同一套版本化协议完成发现、修复与验证。它既可以独立运行,也可以通过
|
|
60
|
-
|
|
60
|
+
密封扫描工件或可移植 SARIF 与 Codex Security 等专业系统互操作。内置 Coding 能力只负责可靠地执行
|
|
61
61
|
聚焦修复,不是安全结论的信任边界,也不以打败所有通用 Coding Agent 为目标。
|
|
62
62
|
详见[安全 Agent 战略](docs/SECURITY-AGENT-STRATEGY.md)。
|
|
63
63
|
|
|
@@ -80,6 +80,116 @@ dvalin scanners install semgrep # 只显示并审查命令
|
|
|
80
80
|
dvalin scanners install semgrep --yes # 在 Dvalin 策略约束下执行
|
|
81
81
|
```
|
|
82
82
|
|
|
83
|
+
### 一步变成门禁
|
|
84
|
+
|
|
85
|
+
```sh
|
|
86
|
+
dvalin init
|
|
87
|
+
```
|
|
88
|
+
|
|
89
|
+
`init` 会写入 `dvalin.security.json`(只对 high 及以上的*新增* finding 失败),把项目里真实存在的检查
|
|
90
|
+
(`test`、`typecheck`、`build`、`lint`)登记为 Dvalin 判定修复前要亲自运行的检查,把当前已有的
|
|
91
|
+
finding 记录为可接受的存量(`.dvalin/baseline.json`),并为 GitHub(`.github/workflows/dvalin.yml`)
|
|
92
|
+
或 GitLab(`.gitlab/dvalin-security.yml`,附带 MR 面板用的 Code Quality 报告)写好 CI 门禁。
|
|
93
|
+
已存在的文件不会被覆盖,除非加 `--force`。把它写出的文件提交上去,存量问题就不会再挡住任何人:
|
|
94
|
+
只有改动新增的问题才会失败。
|
|
95
|
+
|
|
96
|
+
想在本地每次提交前也把关,加上 [pre-commit](https://pre-commit.com) hook:
|
|
97
|
+
|
|
98
|
+
```yaml
|
|
99
|
+
# .pre-commit-config.yaml
|
|
100
|
+
repos:
|
|
101
|
+
- repo: https://github.com/arthurpanhku/dvalincode
|
|
102
|
+
rev: v0.22.0 # hook 随 v0.22.0 发布
|
|
103
|
+
hooks:
|
|
104
|
+
- id: dvalin-scan # PATH 上已有 dvalin 时用 dvalin-scan-installed
|
|
105
|
+
```
|
|
106
|
+
|
|
107
|
+
### 用 CI 门禁同一把尺子来验证
|
|
108
|
+
|
|
109
|
+
如果卡你合并的是 Snyk,就用 Snyk 来验证。用别的引擎判定"干净"的修复,推上去照样可能被门禁拒绝 ——
|
|
110
|
+
一次 agent 修复变成"推送、失败、rebase"反复好几轮,往往就是因为两边尺子不一样。
|
|
111
|
+
|
|
112
|
+
```sh
|
|
113
|
+
npm install -g snyk && snyk auth # 或设置 SNYK_TOKEN
|
|
114
|
+
dvalin scan . --scanners builtin,snyk-code,snyk-oss
|
|
115
|
+
```
|
|
116
|
+
|
|
117
|
+
`snyk-code`(SAST)和 `snyk-oss`(依赖)与其他引擎完全同等:同样的指纹、覆盖度和门禁;
|
|
118
|
+
登录失败会作为引擎错误上报,扫描结果是 `partial`,绝不会显示成干净。它们只在被显式点名时运行,
|
|
119
|
+
因为 Snyk Code 会把源码上传到 Snyk。把它们写进 `dvalin.security.json` 就成为策略的一部分,
|
|
120
|
+
`reverify` 也会用它们评判每一次修复。
|
|
121
|
+
|
|
122
|
+
如果卡合并的是 GitHub code scanning,就同样用 CodeQL:
|
|
123
|
+
|
|
124
|
+
```sh
|
|
125
|
+
dvalin scan . --scanners builtin,codeql
|
|
126
|
+
```
|
|
127
|
+
|
|
128
|
+
`codeql` 会在 workspace 之外为每种语言建一个数据库,并跑该语言默认的 code-scanning 查询集,
|
|
129
|
+
所以它报的就是门禁会报的问题。JavaScript/TypeScript、Python、Ruby、Java、C# 无需构建即可分析;
|
|
130
|
+
Go 使用 CodeQL 的 autobuild。Kotlin、C/C++、Swift 需要项目自己的构建,树里有它们时运行结果会如实说明,
|
|
131
|
+
扫描是 `partial` 而不是干净。它只在被点名时运行 —— 建库要几分钟而不是几秒,而且 CodeQL CLI
|
|
132
|
+
的许可只覆盖开源代码和 GitHub Advanced Security 客户。
|
|
133
|
+
|
|
134
|
+
Snyk 自己标记为已接受的忽略会被尊重,并列入覆盖度的排除项。但**被审查的这次改动新增的**忽略不算数:
|
|
135
|
+
评判修复时,`.snyk`、`.semgrepignore`、`.trivyignore`、`.dvalincodeignore` 会恢复成 base 版本,
|
|
136
|
+
新增的行内标记(`deepcode ignore`、`nosemgrep`、`nosec`、`NOSONAR` 等)会被抹掉 ——
|
|
137
|
+
被"静音"而不是被修复的问题仍然会让这次修复失败。忽略是人在单独变更里做的风险决定,从来不是修复。
|
|
138
|
+
|
|
139
|
+
凡是 Dvalin 说"已验证"的地方,判定标准都一样:修复循环、`dvalin verify`、MCP 的 `dvalin_verify_findings`、
|
|
140
|
+
单轮 `--fix --verify`,以及 CI 的 `reverify`。这些入口签发的是 `dvalin-fix-record/v3` 记录,
|
|
141
|
+
它还会拒绝"把问题藏起来而不是修掉"的改动 —— 换成同类危险调用、删掉有漏洞的文件、删测试或删断言。
|
|
142
|
+
在非 git 仓库中无法确定改动范围,记录保持 v2,并写明未评估规避。
|
|
143
|
+
|
|
144
|
+
### 让它一直修到门禁会通过为止
|
|
145
|
+
|
|
146
|
+
```sh
|
|
147
|
+
dvalincode dvalin . --scanners builtin,snyk-code,snyk-oss --until-clean --max-rounds 3 --executor codex
|
|
148
|
+
```
|
|
149
|
+
|
|
150
|
+
`--until-clean` 把一次修复变成有上限的循环:执行器改代码,Dvalin 用同样的引擎重新扫描、亲自跑项目检查,
|
|
151
|
+
然后**只把还没解决的部分**发回给执行器 —— 仍存在的目标、它的改动新引入的问题、失败的检查及其最后几行输出、
|
|
152
|
+
它新增的忽略 —— 让它再修一轮。依赖漏洞优先处理。
|
|
153
|
+
|
|
154
|
+
循环会在以下情况停下并说明原因:所有目标消失、没有新引入阻断问题、检查全部通过(`verified`);轮数用完;
|
|
155
|
+
某一轮留下完全相同的问题、或问题集合不再缩小(`stalled`);目标需要人处理,比如依赖没有可修复版本
|
|
156
|
+
(`not-auto-fixable`);引擎或检查跑不起来(`unverifiable`)。执行器新增的忽略会在每次扫描前被撤销,
|
|
157
|
+
并且在被删除之前一直算作未解决的问题。每种结局都会签发修复记录,每一轮都记录在
|
|
158
|
+
`~/.dvalincode/security/fix-loops/` 下。
|
|
159
|
+
|
|
160
|
+
每一轮会尽量短,但判定方式不变。各扫描引擎并行运行,一次扫描的耗时取决于最慢的引擎,而不是所有引擎之和。
|
|
161
|
+
在两轮之间,逐文件分析的引擎(Dvalin Built-in、Semgrep)只重扫本次改动的文件和目标所在的文件,
|
|
162
|
+
其他引擎始终扫描整个目录树。这种缩小范围的扫描只用于给执行器反馈:任何会让循环停下的一轮,
|
|
163
|
+
都会在同一棵树上用全量扫描重新判定,最终结论和修复记录只来自全量扫描。
|
|
164
|
+
`--full-rescan` 让每一轮都做全量扫描;`dvalin loop-stats` 会报告每轮扫描耗时,以及全量扫描改变判定的次数。
|
|
165
|
+
|
|
166
|
+
对**代码类**问题,循环会先要求复现:执行器只写测试,Dvalin 在未修复的代码上运行,并要求它失败 ——
|
|
167
|
+
必须是断言失败,而不是测试运行器缺失、或引用了还没写的函数。测试文件会被记录哈希;修复必须让它们在
|
|
168
|
+
**不被改动**的前提下通过,这次运行会作为一项检查写进记录。如果没有任何测试能复现,循环在动手修之前就以
|
|
169
|
+
`not-reproduced` 停下:这可能是误报,交给人来判断。测试运行器自动推断(vitest、jest、mocha、`node --test`、
|
|
170
|
+
pytest、`go test`),也可以用 `--repro-command 'npx vitest run {files}'` 或 `dvalin.security.json` 里的
|
|
171
|
+
`reproduce` 指定 —— 永远不由执行器选择。
|
|
172
|
+
|
|
173
|
+
每一轮修复还会拒绝 agent 在"让扫描器闭嘴"目标下常用的规避手法:把危险调用换成同类写法(`eval` →
|
|
174
|
+
`new Function`,`exec` → 带 `shell: true` 的 `spawn`)、删掉有漏洞的文件、删测试、删断言。
|
|
175
|
+
实际上第一种手法单靠扫描器是拦不住的 —— 规则不再匹配 —— 真正拦住它的是复现测试和规避检测。
|
|
176
|
+
|
|
177
|
+
### 始终基于最新的 main,并在 CI 里收尾
|
|
178
|
+
|
|
179
|
+
```sh
|
|
180
|
+
dvalincode dvalin . --scanners builtin,snyk-code,snyk-oss --until-clean \
|
|
181
|
+
--rebase-onto origin/main --executor codex --draft-pr --sign-key ci.key
|
|
182
|
+
```
|
|
183
|
+
|
|
184
|
+
加上 `--rebase-onto` 后,循环会在开始前和每一轮之后拉取上游并把修复 rebase 上去,然后在新的 base 上评判。
|
|
185
|
+
冲突交给执行器 —— 只给冲突文件,并要求"不要运行 git" —— rebase 由 Dvalin 自己继续;文件里残留冲突标记就算没解决。
|
|
186
|
+
解决不了就中止 rebase,工作区恢复原样,循环以 `rebase-conflict` 停下。每次 rebase 后都会在新 base 上重新扫描建立基线,
|
|
187
|
+
队友合进 main 的问题不会被算到这次修复头上。
|
|
188
|
+
|
|
189
|
+
`--draft-pr` 会把记录提交到 `.dvalin/fix-record.json`,
|
|
190
|
+
[`docs/examples/dvalin-fix-loop.yml`](docs/examples/dvalin-fix-loop.yml) 在 PR 上用 `reverify: true` 重新执行:
|
|
191
|
+
重新扫描 base 和 head、重跑检查,并在原地还原修复后重跑复现测试(必须失败)、恢复后再跑(必须通过)—— 最后用 CI 密钥签名。
|
|
192
|
+
|
|
83
193
|
要建立“禁止新增高风险问题”的增量门禁,把策略和基线一并提交到仓库:
|
|
84
194
|
|
|
85
195
|
```sh
|
|
@@ -103,7 +213,7 @@ steps:
|
|
|
103
213
|
- uses: actions/checkout@v5
|
|
104
214
|
with:
|
|
105
215
|
fetch-depth: 0 # 让扫描能取到 base commit
|
|
106
|
-
- uses: arthurpanhku/dvalincode@v0.
|
|
216
|
+
- uses: arthurpanhku/dvalincode@v0.22.0
|
|
107
217
|
with:
|
|
108
218
|
fail-on: high
|
|
109
219
|
diff: true # 只报告这个 PR 改动的部分
|
|
@@ -126,14 +236,17 @@ steps:
|
|
|
126
236
|
如果你的流水线产出了 fix record,把它交给同一个 action:
|
|
127
237
|
|
|
128
238
|
```yaml
|
|
129
|
-
- uses: arthurpanhku/dvalincode@v0.
|
|
239
|
+
- uses: arthurpanhku/dvalincode@v0.22.0
|
|
130
240
|
with:
|
|
131
241
|
fix-record: fix-record.json
|
|
132
242
|
```
|
|
133
243
|
|
|
134
244
|
runner 会仅凭这个文件本身重新推导它 —— 重算哈希,并从它自己的证据重新推出结论 ——
|
|
135
245
|
然后把结果发到 PR 上。一份签发之后被改过的记录会在这里失败,并让整个 job 失败。
|
|
136
|
-
|
|
246
|
+
|
|
247
|
+
重新推导只能证明记录**自洽**,证明不了它出自真正跑过验证的人:记录里的每个字段(包括退出码)
|
|
248
|
+
伪造者都能写出来,一份自洽的伪造记录照样能通过重新推导。要补上这个缺口,需要两件事 ——
|
|
249
|
+
在 runner 上重新执行这份声明,并对 runner 观察到的结果签名。
|
|
137
250
|
|
|
138
251
|
```
|
|
139
252
|
🔏 Verified Fix Record
|
|
@@ -156,6 +269,45 @@ runner 会仅凭这个文件本身重新推导它 —— 重算哈希,并从
|
|
|
156
269
|
- outcome: regressed
|
|
157
270
|
```
|
|
158
271
|
|
|
272
|
+
### 在 runner 上重新执行,并对看到的结果签名
|
|
273
|
+
|
|
274
|
+
```yaml
|
|
275
|
+
- uses: actions/checkout@v5
|
|
276
|
+
with:
|
|
277
|
+
fetch-depth: 0 # 需要能拿到 base commit
|
|
278
|
+
- run: npm ci # 项目自己的检查会在 runner 上执行
|
|
279
|
+
- uses: arthurpanhku/dvalincode@v0.22.0 # reverify 随 v0.22.0 发布;打 tag 之前请固定到 main 的某个 commit SHA
|
|
280
|
+
with:
|
|
281
|
+
fix-record: fix-record.json
|
|
282
|
+
reverify: true
|
|
283
|
+
signing-key: ${{ secrets.DVALIN_SIGNING_KEY }} # 可选
|
|
284
|
+
```
|
|
285
|
+
|
|
286
|
+
开启 `reverify: true` 后,被声明的记录只提供两样东西:它说修了**哪些 target**,以及
|
|
287
|
+
**谁**是执行者。其余一切都重新观察:
|
|
288
|
+
|
|
289
|
+
- 检出并扫描 **base** commit,每个被声明的 target 必须真的在那里存在 —— 记录不能把
|
|
290
|
+
"删掉一个从未存在的 finding" 算作功劳;
|
|
291
|
+
- 扫描 **head**,"已消失" 由 runner 亲眼观察;
|
|
292
|
+
- 在 runner 上运行项目检查,检查项、门禁和扫描器都读自 **base** commit 的
|
|
293
|
+
`dvalin.security.json` —— 一个放宽自己门禁或删掉自己检查的 PR,仍按它想改掉的规则评判;
|
|
294
|
+
- 根据这些观察签发一份全新的记录,只有它判定通过,job 才通过。
|
|
295
|
+
|
|
296
|
+
提供 `signing-key` 时,新记录会被签名(Ed25519,签的是记录哈希)。私钥在项目检查运行前
|
|
297
|
+
就被读入内存并从环境变量中移除,被审查的代码读不到它。下游(发布 job、其他仓库、审计方)
|
|
298
|
+
就可以要求这个签名:
|
|
299
|
+
|
|
300
|
+
```sh
|
|
301
|
+
dvalin keygen --out ci # 只需一次;ci.key 存为 secret,ci.pub 公开
|
|
302
|
+
dvalin verify-fix record.json --trusted-key ci.pub
|
|
303
|
+
```
|
|
304
|
+
|
|
305
|
+
在 `--trusted-key` 下,未签名或只由你没指定的密钥签名的记录都会失败。有效签名只说明
|
|
306
|
+
**哪个密钥为这份记录背书**;是否信任这个密钥由你决定 —— 信任 CI 密钥的理由,是 CI job
|
|
307
|
+
亲自重新执行了验证,而不是照抄。本地可以用 `dvalin reverify <record> --base origin/main`
|
|
308
|
+
做同样的重新执行,用 `dvalin sign-fix` 给一份能重新推导的记录签名。
|
|
309
|
+
[FVP-1 §4a、§5a →](docs/spec/FIX-VERIFICATION.md)
|
|
310
|
+
|
|
159
311
|
### 或者让你的 agent 调用它
|
|
160
312
|
|
|
161
313
|
如果代码是 agent 写的,那检查它的就不能是同一个 agent。DvalinCode 本身是个 MCP
|
|
@@ -168,15 +320,32 @@ claude mcp add dvalin -- npx -y dvalincode mcp-serve --workspace .
|
|
|
168
320
|
一条命令配好你实际在用的编辑器:
|
|
169
321
|
|
|
170
322
|
```sh
|
|
323
|
+
npx dvalincode mcp-install codex # 通过 `codex mcp add` 更新 ~/.codex/config.toml
|
|
171
324
|
npx dvalincode mcp-install cursor # .cursor/mcp.json
|
|
172
325
|
npx dvalincode mcp-install vscode # .vscode/mcp.json
|
|
173
326
|
npx dvalincode mcp-install claude-code # .mcp.json
|
|
327
|
+
npx dvalincode mcp-install gemini # .gemini/settings.json
|
|
328
|
+
npx dvalincode mcp-install opencode # opencode.json
|
|
174
329
|
```
|
|
175
330
|
|
|
176
|
-
|
|
331
|
+
对于 Codex,Dvalin 会委托官方 `codex mcp add` 命令安全更新 TOML,无需手改用户配置。
|
|
332
|
+
其他客户端的格式也不一样,而且写错不会报错——VS Code 的 key 是 `servers`,Cursor 是
|
|
177
333
|
`mcpServers`,填反了编辑器会照单全收然后当没看见。这条命令会写对,并且合并进已有
|
|
178
334
|
配置而不是覆盖。[编辑器与 MCP →](integrations/mcp/)
|
|
179
335
|
|
|
336
|
+
也可以让 Dvalin 自己去找。`agents` 列出这台机器上装了哪些 coding agent,以及哪些已经
|
|
337
|
+
接入 Dvalin;`agents connect` 给剩下的列出接入计划,不加 `--yes` 就什么都不写:
|
|
338
|
+
|
|
339
|
+
```sh
|
|
340
|
+
npx dvalincode agents # 装了哪些 agent,哪些已经接入 Dvalin
|
|
341
|
+
npx dvalincode agents connect # 接入计划:每个 agent 会写什么
|
|
342
|
+
npx dvalincode agents connect --yes # 执行
|
|
343
|
+
```
|
|
344
|
+
|
|
345
|
+
如果你用 [CC Switch](https://github.com/farion1231/cc-switch) 管理 MCP server,
|
|
346
|
+
`agents connect cc-switch --yes` 会把 Dvalin 交给它:CC Switch 先展示导入内容、征得你
|
|
347
|
+
确认,再把 Dvalin 同步进 Claude Code、Codex、Gemini CLI 和 OpenCode。
|
|
348
|
+
|
|
180
349
|
`dvalin_scan` 支持 `diff: "uncommitted"`,只报告 agent 刚写的部分,而不是仓库里的全部存量问题。它不跑模型、不修改目标 workspace、也不持久化 Dvalin 状态,因此客户端可以默认允许这次预览。确认要修复某条发现后,Agent 再显式调用
|
|
181
350
|
`dvalin_begin_verification` 创建精简的本地安全 workflow,用 fingerprint 精确读取单条发现,再通过 `dvalin_get_finding` 和
|
|
182
351
|
`dvalin_verify_findings` 请求独立复扫。响应包含 MCP `structuredContent`,并可通过
|
|
@@ -187,9 +356,11 @@ npx dvalincode mcp-install claude-code # .mcp.json
|
|
|
187
356
|
哪个版本、哪一天验的,写成了表格而不是一句话,因为手写的版本号会悄无声息地过期。
|
|
188
357
|
[集成支持 ↓](#-集成支持) · [Agent 集成 →](integrations/)
|
|
189
358
|
|
|
190
|
-
仓库还提供一份 [Codex/Claude
|
|
191
|
-
|
|
192
|
-
|
|
359
|
+
仓库还提供一份 [Codex/Claude 可移植插件](integrations/dvalin-security/):包含当前根目录
|
|
360
|
+
Agent Plugins manifest、兼容 manifest、共享安全门禁 skill 和 Claude 兼容 MCP 配置。
|
|
361
|
+
仓库内 marketplace 让 Codex desktop 可以直接发现它;安装后,agent 可根据任务
|
|
362
|
+
上下文自动发现门禁,不再依赖每位开发者记住扫描提示词。Codex 的 MCP server 由
|
|
363
|
+
`mcp-install codex` 单独绑定到当前项目,避免插件进程误扫自身的安装缓存目录。
|
|
193
364
|
Codex 会采纳扫描工具的只读 MCP 标注;Claude Code 按其安全设计仍需显式授权一次。
|
|
194
365
|
插件给出精确到只读扫描工具的 allow 规则,不要求用户绕过所有权限。
|
|
195
366
|
|
|
@@ -199,37 +370,40 @@ Codex 会采纳扫描工具的只读 MCP 标注;Claude Code 按其安全设计
|
|
|
199
370
|
|
|
200
371
|
| Harness | 怎么接 |
|
|
201
372
|
|---|---|
|
|
202
|
-
| **Claude Code** | [
|
|
203
|
-
| **Codex** | [
|
|
373
|
+
| **Claude Code** | [可移植插件](integrations/dvalin-security/),或 `claude mcp add` · [独立 skill](integrations/claude-code/) |
|
|
374
|
+
| **Codex** | `dvalincode mcp-install codex` · [可移植插件](integrations/dvalin-security/) · 与 Codex Security 的 [密封扫描 + SARIF 互操作](integrations/codex-security/) |
|
|
204
375
|
| **Cursor** | `dvalincode mcp-install cursor` |
|
|
205
376
|
| **VS Code** | `dvalincode mcp-install vscode` · 在 Problems、coverage/gate 状态和离线 VFR 校验中展示结果的[扩展](editors/vscode/) —— *已构建,尚未发布* |
|
|
377
|
+
| **Gemini CLI** | `dvalincode mcp-install gemini` |
|
|
378
|
+
| **OpenCode** | `dvalincode mcp-install opencode` |
|
|
379
|
+
| **CC Switch** | `dvalin agents connect cc-switch` —— 导入一次,同步进 CC Switch 管理的每个 agent |
|
|
206
380
|
| **Windsurf · Zed** | 在各自设置里配 stdio MCP —— [server 命令](integrations/mcp/) |
|
|
207
381
|
| **任意 MCP 客户端** | [MCP registry](https://registry.modelcontextprotocol.io/):`io.github.arthurpanhku/dvalincode` |
|
|
208
382
|
| **GitHub Actions** | [Marketplace action](https://github.com/marketplace/actions/dvalin-security-scan) —— 结果直接标在 PR diff 上 |
|
|
383
|
+
| **GitLab CI** | `dvalin init --ci gitlab` —— 新增 finding 卡住 MR,并显示在 Code Quality 面板里 |
|
|
384
|
+
| **pre-commit** | [`dvalin-scan` hook](.pre-commit-hooks.yaml) —— 每次提交前跑同一套策略门禁 |
|
|
209
385
|
| **任意 CI** | `dvalin scan . --fail-on high`,输出 SARIF 供 code scanning 用 |
|
|
210
386
|
|
|
211
|
-
各家的 MCP 配置格式并不通用——VS Code 的 key 是
|
|
387
|
+
各家的 MCP 配置格式并不通用——Codex 通过自己的 CLI 管理 TOML,VS Code 的 key 是
|
|
388
|
+
`servers`,Cursor 是 `mcpServers`,OpenCode 是 `mcp` 且整条命令写在一个数组里,
|
|
212
389
|
填错了不会报错只会静默失效——所以 `mcp-install` 会写对格式,并合并进已有配置。
|
|
213
390
|
[编辑器与 MCP →](integrations/mcp/)
|
|
214
391
|
|
|
215
392
|
### 或者和 Codex Security 互操作
|
|
216
393
|
|
|
217
|
-
[Codex Security](https://github.com/openai/codex-security)
|
|
218
|
-
|
|
394
|
+
[Codex Security](https://github.com/openai/codex-security) 会为已完成扫描保存 manifest、
|
|
395
|
+
结构化 findings 与 coverage。Dvalin 只读取这些可移植工件,不耦合其私有应用状态:
|
|
219
396
|
|
|
220
397
|
```sh
|
|
221
398
|
DVALIN_CODEX_SCAN_DIR=/tmp/codex-security-results
|
|
222
399
|
npx @openai/codex-security scan . --output-dir "$DVALIN_CODEX_SCAN_DIR"
|
|
223
|
-
|
|
224
|
-
--export-format sarif --source-root "$PWD" --output /tmp/codex-security.sarif
|
|
225
|
-
|
|
226
|
-
dvalin import /tmp/codex-security.sarif .
|
|
400
|
+
dvalin import "$DVALIN_CODEX_SCAN_DIR" .
|
|
227
401
|
dvalin scan . --fail-on high
|
|
228
402
|
```
|
|
229
403
|
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
404
|
+
导入会校验 manifest 记录的工件哈希、生成稳定的 remediation case,并把排除项和延期
|
|
405
|
+
工作明确报告为 complete、partial 或 unknown coverage;`--no-persist` 可以只校验交接件
|
|
406
|
+
而不修改 backlog。SARIF 继续作为只包含 findings 的兼容路径。
|
|
233
407
|
[集成指南 →](integrations/codex-security/)
|
|
234
408
|
|
|
235
409
|
### 然后让它把找到的问题修掉
|
|
@@ -295,15 +469,18 @@ Dvalin 在这四处背后是同一个 MCP server、同一次确定性扫描 —
|
|
|
295
469
|
|
|
296
470
|
| 开发环节 | 你在哪儿 | Dvalin 怎么接进去 | 状态 |
|
|
297
471
|
|---|---|---|---|
|
|
298
|
-
| **写代码** | Claude Code | [
|
|
299
|
-
| | Codex | [
|
|
472
|
+
| **写代码** | Claude Code | [可移植插件](integrations/dvalin-security/) · `claude mcp add` · `mcp-install claude-code` | ✅ 会话已验证 |
|
|
473
|
+
| | Codex | `mcp-install codex` · [可移植插件](integrations/dvalin-security/) · [密封扫描 + SARIF 互操作](integrations/codex-security/) | ✅ 会话已验证 · 见下方截图 |
|
|
300
474
|
| | Cursor | `dvalincode mcp-install cursor` | ⚙️ 配置已验证 |
|
|
475
|
+
| | Gemini CLI · OpenCode | `mcp-install gemini\|opencode` · `dvalin agents connect` | ⚙️ 配置已验证 |
|
|
476
|
+
| | CC Switch | `dvalin agents connect cc-switch` | ⚙️ 链接格式已测试,尚未实际导入 |
|
|
301
477
|
| | Windsurf · Zed | 通过它们自己的设置接 stdio MCP | ⚙️ 已文档化,未验证 |
|
|
302
478
|
| | 任意 MCP 客户端 | registry `io.github.arthurpanhku/dvalincode` | ⚙️ 已发布 |
|
|
303
479
|
| **回头读代码** | VS Code | `mcp-install vscode` · [扩展](editors/vscode/):Problems、覆盖度与门禁状态 | ✅ 编辑器内已验证 |
|
|
304
480
|
| **卡住合并** | GitHub Actions | [Marketplace action](https://github.com/marketplace/actions/dvalin-security-scan) —— finding 落在 diff 上,fix record 在 runner 上重新推导 | ✅ 本仓库自己的 CI 就在跑 |
|
|
305
481
|
| | 任意 CI | `dvalin scan . --fail-on high`,输出 SARIF | ✅ 退出码就是契约 |
|
|
306
|
-
| **相信这个结论** | 任何人,离线 | `dvalin verify-fix record.json` | ✅ 不需要 workspace、网络或任何 Dvalin 状态 |
|
|
482
|
+
| **相信这个结论** | 任何人,离线 | `dvalin verify-fix record.json --trusted-key ci.pub` | ✅ 不需要 workspace、网络或任何 Dvalin 状态 |
|
|
483
|
+
| | 合并门禁 | `reverify: true` —— base 与 head 重新扫描、检查在 runner 上重跑、新记录签名 | ✅ 有测试覆盖 |
|
|
307
484
|
|
|
308
485
|
**✅** 表示真实客户端被端到端驱动过,并且观察到了工具调用。
|
|
309
486
|
**⚙️** 表示配置能生成、格式经过测试,但还没有抓到会话记录。这个区别这里不含糊过去 ——
|
|
@@ -319,6 +496,8 @@ Dvalin 在这四处背后是同一个 MCP server、同一次确定性扫描 —
|
|
|
319
496
|
| Codex | CLI 0.151.0 | 2026-08-31 | 每周的 `harness-interop`:server 配置被接受并按 stdio 存下。**这不是握手** —— 在设置 `CODEX_API_KEY` 之前,调用工具那一步一直是 skipped |
|
|
320
497
|
| VS Code | 1.134.0 · 扩展 0.18.0 | 2026-09-03 | 干净 profile 里安装打包好的 VSIX;finding、门禁和覆盖度都出现在编辑器里 —— 见下方截图 |
|
|
321
498
|
| Cursor | — | 2026-09-04 | `mcp-install cursor` 会把 `.cursor/mcp.json` 写成 `mcpServers` 结构;但还没有抓到会话记录 |
|
|
499
|
+
| Gemini CLI · OpenCode | — | 2026-11-11 | `mcp-install` 按它们自己文档规定的结构写入(Gemini:`settings.json` 里的 `mcpServers`;OpenCode:V1 的 `mcp` 条目,V2 仍然读取);还没有抓到会话记录 |
|
|
500
|
+
| CC Switch | — | 2026-11-11 | `ccswitch://` 链接按 CC Switch 的 deep link 指南和导入器源码生成;还没有在运行中的 CC Switch 里实际打开过 |
|
|
322
501
|
|
|
323
502
|
那个每周任务之所以存在,是因为这段话的早期版本手写了两个 CLI 版本号,两个都在几周内
|
|
324
503
|
过期,而没有任何东西提醒过。现在它每周对着这些工具的当周版本重跑一次 —— 上面这些日期
|
|
@@ -1040,6 +1219,7 @@ prompt、UI 文案、工具 schema、模块布局和产品实现均为原创;
|
|
|
1040
1219
|
| badhope | [@weed33834](https://github.com/weed33834) |
|
|
1041
1220
|
| Samran Asif | [@webdevsamran](https://github.com/webdevsamran) |
|
|
1042
1221
|
| dchaudhari7177 | [@dchaudhari7177](https://github.com/dchaudhari7177) |
|
|
1222
|
+
| TayfurYldz | [@TayfurYldz](https://github.com/TayfurYldz) |
|
|
1043
1223
|
|
|
1044
1224
|
查看[完整贡献记录](https://github.com/arthurpanhku/dvalincode/graphs/contributors),其中也包含自动依赖更新和维护记录。
|
|
1045
1225
|
|
package/dist/agent/compact.d.ts
CHANGED
|
@@ -4,3 +4,11 @@ export declare function estimateTokens(messages: ChatMessage[]): number;
|
|
|
4
4
|
export declare function estimateRequestTokens(messages: ChatMessage[], systemPrompt: string, tools?: ToolDef[]): number;
|
|
5
5
|
export declare function summarizeWithLLM(messages: ChatMessage[], provider: ProviderAdapter, runtime?: ChatRequest['runtime'], signal?: AbortSignal): Promise<string>;
|
|
6
6
|
export declare function buildCompactedHistory(summary: string): ChatMessage[];
|
|
7
|
+
export declare function summaryMessage(summary: string): ChatMessage;
|
|
8
|
+
/** The task message kept verbatim when a turn is compacted mid-way. */
|
|
9
|
+
export declare function compactedTaskMessage(task: string): ChatMessage;
|
|
10
|
+
/**
|
|
11
|
+
* The latest messages that fit in `budget` tokens, starting at an assistant
|
|
12
|
+
* message so that no tool result is kept without the call it answers.
|
|
13
|
+
*/
|
|
14
|
+
export declare function recentTail(messages: ChatMessage[], budget: number): ChatMessage[];
|
package/dist/agent/compact.js
CHANGED
|
@@ -1,10 +1,23 @@
|
|
|
1
1
|
export function estimateTokens(messages) {
|
|
2
|
-
const total = messages.reduce((acc, m) => acc + (m.content
|
|
3
|
-
return Math.ceil(total
|
|
2
|
+
const total = messages.reduce((acc, m) => acc + roughTokens(m.content ?? '') + roughTokens(JSON.stringify(m.tool_calls ?? [])), 0);
|
|
3
|
+
return Math.ceil(total);
|
|
4
4
|
}
|
|
5
5
|
/** Estimate the complete provider request, not just visible chat content. */
|
|
6
6
|
export function estimateRequestTokens(messages, systemPrompt, tools = []) {
|
|
7
|
-
return estimateTokens(messages) + Math.ceil((systemPrompt
|
|
7
|
+
return estimateTokens(messages) + Math.ceil(roughTokens(systemPrompt) + roughTokens(JSON.stringify(tools)));
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* About four ASCII characters per token, but roughly one token per CJK (or
|
|
11
|
+
* other non-ASCII) character -- counting those at a quarter too would
|
|
12
|
+
* underestimate a Chinese conversation about fourfold.
|
|
13
|
+
*/
|
|
14
|
+
function roughTokens(text) {
|
|
15
|
+
let nonAscii = 0;
|
|
16
|
+
for (let i = 0; i < text.length; i++) {
|
|
17
|
+
if (text.charCodeAt(i) > 0x7f)
|
|
18
|
+
nonAscii++;
|
|
19
|
+
}
|
|
20
|
+
return (text.length - nonAscii) / 4 + nonAscii;
|
|
8
21
|
}
|
|
9
22
|
const COMPACT_PROMPT = `Summarize this coding session using exactly this format:
|
|
10
23
|
|
|
@@ -25,7 +38,7 @@ export async function summarizeWithLLM(messages, provider, runtime, signal) {
|
|
|
25
38
|
const transcript = compactTranscript(messages);
|
|
26
39
|
const resp = await provider.chat({
|
|
27
40
|
messages: [{ role: 'user', content: `${COMPACT_PROMPT}\n\n---\n${transcript}` }],
|
|
28
|
-
maxTokens:
|
|
41
|
+
maxTokens: 1_500,
|
|
29
42
|
temperature: 0.3,
|
|
30
43
|
runtime,
|
|
31
44
|
signal,
|
|
@@ -66,9 +79,35 @@ function compactTranscript(messages, maxChars = 64_000) {
|
|
|
66
79
|
}
|
|
67
80
|
export function buildCompactedHistory(summary) {
|
|
68
81
|
return [
|
|
69
|
-
|
|
82
|
+
summaryMessage(summary),
|
|
70
83
|
{ role: 'user', content: 'Context was compacted. Continue from the Pending list.' },
|
|
71
84
|
{ role: 'assistant', content: 'Understood. I have the session summary and am ready to continue.' },
|
|
72
85
|
];
|
|
73
86
|
}
|
|
87
|
+
export function summaryMessage(summary) {
|
|
88
|
+
return { role: 'system', content: `[Conversation summary]\n\n${summary}` };
|
|
89
|
+
}
|
|
90
|
+
/** The task message kept verbatim when a turn is compacted mid-way. */
|
|
91
|
+
export function compactedTaskMessage(task) {
|
|
92
|
+
return {
|
|
93
|
+
role: 'user',
|
|
94
|
+
content: `${task}\n\n[Context was compacted: the summary above covers the earlier work on this task. Continue from where it left off.]`,
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
/**
|
|
98
|
+
* The latest messages that fit in `budget` tokens, starting at an assistant
|
|
99
|
+
* message so that no tool result is kept without the call it answers.
|
|
100
|
+
*/
|
|
101
|
+
export function recentTail(messages, budget) {
|
|
102
|
+
let start = messages.length;
|
|
103
|
+
let used = 0;
|
|
104
|
+
for (let i = messages.length - 1; i >= 0; i--) {
|
|
105
|
+
used += estimateTokens([messages[i]]);
|
|
106
|
+
if (used > budget)
|
|
107
|
+
break;
|
|
108
|
+
if (messages[i].role === 'assistant')
|
|
109
|
+
start = i;
|
|
110
|
+
}
|
|
111
|
+
return messages.slice(start);
|
|
112
|
+
}
|
|
74
113
|
//# sourceMappingURL=compact.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compact.js","sourceRoot":"","sources":["../../src/agent/compact.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,cAAc,CAAC,QAAuB;IACpD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAC3B,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"compact.js","sourceRoot":"","sources":["../../src/agent/compact.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/loop.d.ts
CHANGED
|
@@ -48,5 +48,10 @@ export declare class AgentLoop {
|
|
|
48
48
|
processMessage(userMessage: string, history: ChatMessage[], onEvent?: AgentEventHandler, signal?: AbortSignal): Promise<LoopResult>;
|
|
49
49
|
/** Emit the terminal run_end event, folding in any best-effort write warnings. */
|
|
50
50
|
private finishRun;
|
|
51
|
+
/**
|
|
52
|
+
* Summarize `messages`. With `keep` (a compaction in the middle of a turn) the
|
|
53
|
+
* summary is followed by those messages verbatim, instead of the generic
|
|
54
|
+
* continuation used between turns.
|
|
55
|
+
*/
|
|
51
56
|
private handleCompact;
|
|
52
57
|
}
|
package/dist/agent/loop.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TurnState, DEFAULT_TURN_CONFIG } from './types.js';
|
|
2
|
-
import { AgentRunner, TurnInterruptedError } from './runner.js';
|
|
3
|
-
import { buildCompactedHistory, estimateRequestTokens, summarizeWithLLM } from './compact.js';
|
|
2
|
+
import { AgentRunner, TurnFailedError, TurnInterruptedError } from './runner.js';
|
|
3
|
+
import { buildCompactedHistory, estimateRequestTokens, summarizeWithLLM, summaryMessage } from './compact.js';
|
|
4
4
|
import { AuditSink, newRunId, resolveGitHead } from '../audit/log.js';
|
|
5
5
|
import { minimizedDescriptor } from '../audit/minimize.js';
|
|
6
6
|
import { policyHash } from '../core/policy.js';
|
|
@@ -181,7 +181,7 @@ export class AgentLoop {
|
|
|
181
181
|
config: this.config,
|
|
182
182
|
systemPrompt: this.systemPrompt,
|
|
183
183
|
sharedUndoStack: this.sharedUndoStack,
|
|
184
|
-
compactHistory: async (current, compactSignal) => (await this.handleCompact(current, compactSignal, true)).messages,
|
|
184
|
+
compactHistory: async (current, compactSignal, keep) => (await this.handleCompact(current, compactSignal, true, keep)).messages,
|
|
185
185
|
});
|
|
186
186
|
try {
|
|
187
187
|
const result = await runner.runTurn(userMessage, messages, onEvent, signal);
|
|
@@ -190,11 +190,11 @@ export class AgentLoop {
|
|
|
190
190
|
iterationsUsed = result.iterationsUsed;
|
|
191
191
|
usage = result.usage;
|
|
192
192
|
stopReason = result.stopReason;
|
|
193
|
-
this.finishRun(sink,
|
|
193
|
+
this.finishRun(sink, result.stopReason, iterationsUsed, usage);
|
|
194
194
|
auditHead = sink?.head();
|
|
195
195
|
}
|
|
196
196
|
catch (err) {
|
|
197
|
-
if (err instanceof TurnInterruptedError) {
|
|
197
|
+
if (err instanceof TurnInterruptedError || err instanceof TurnFailedError) {
|
|
198
198
|
iterationsUsed = err.iterationsUsed;
|
|
199
199
|
usage = err.usage;
|
|
200
200
|
}
|
|
@@ -234,7 +234,12 @@ export class AgentLoop {
|
|
|
234
234
|
warnings: warnings.length > 0 ? warnings : undefined,
|
|
235
235
|
});
|
|
236
236
|
}
|
|
237
|
-
|
|
237
|
+
/**
|
|
238
|
+
* Summarize `messages`. With `keep` (a compaction in the middle of a turn) the
|
|
239
|
+
* summary is followed by those messages verbatim, instead of the generic
|
|
240
|
+
* continuation used between turns.
|
|
241
|
+
*/
|
|
242
|
+
async handleCompact(messages, signal, force = false, keep) {
|
|
238
243
|
if (!force && messages.length <= 10) {
|
|
239
244
|
return { messages, output: 'Context is already small enough.' };
|
|
240
245
|
}
|
|
@@ -246,7 +251,7 @@ export class AgentLoop {
|
|
|
246
251
|
}, signal);
|
|
247
252
|
if (signal?.aborted)
|
|
248
253
|
throw new Error('interrupted');
|
|
249
|
-
const kept = buildCompactedHistory(summary);
|
|
254
|
+
const kept = keep ? [summaryMessage(summary), ...keep] : buildCompactedHistory(summary);
|
|
250
255
|
return {
|
|
251
256
|
messages: kept,
|
|
252
257
|
output: `Compacted: reduced from ${messages.length} to ${kept.length} messages using LLM summarization.`,
|
|
@@ -255,9 +260,13 @@ export class AgentLoop {
|
|
|
255
260
|
catch (err) {
|
|
256
261
|
if (signal?.aborted)
|
|
257
262
|
throw new Error('interrupted');
|
|
258
|
-
// Fallback: keep last 20 messages
|
|
263
|
+
// Fallback: keep the last 20 messages (or what the turn asked to keep),
|
|
264
|
+
// never starting on a tool result whose call was dropped -- providers
|
|
265
|
+
// reject that request outright.
|
|
259
266
|
const systemMsg = messages.find(m => m.role === 'system');
|
|
260
|
-
const recentMessages = messages.filter(m => m.role !== 'system').slice(-20);
|
|
267
|
+
const recentMessages = keep ? [...keep] : messages.filter(m => m.role !== 'system').slice(-20);
|
|
268
|
+
while (recentMessages[0]?.role === 'tool')
|
|
269
|
+
recentMessages.shift();
|
|
261
270
|
const kept = systemMsg ? [systemMsg, ...recentMessages] : recentMessages;
|
|
262
271
|
return {
|
|
263
272
|
messages: kept,
|
package/dist/agent/loop.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loop.js","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA+E,mBAAmB,EAAkB,MAAM,YAAY,CAAC;AACzJ,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"loop.js","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/runner.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ChatMessage, TokenUsage, ProviderAdapter } from '../providers/types.js';
|
|
2
2
|
import { type ToolRegistry } from '../tools/registry.js';
|
|
3
3
|
import type { DvalinContext } from '../core/context.js';
|
|
4
|
-
import type { TurnConfig, UndoEntry, AgentEventHandler } from './types.js';
|
|
4
|
+
import type { TurnConfig, UndoEntry, AgentEventHandler, TurnStopReason } from './types.js';
|
|
5
5
|
export type RunnerOptions = {
|
|
6
6
|
provider: ProviderAdapter;
|
|
7
7
|
registry: ToolRegistry;
|
|
@@ -9,7 +9,8 @@ export type RunnerOptions = {
|
|
|
9
9
|
config: TurnConfig;
|
|
10
10
|
systemPrompt: string;
|
|
11
11
|
sharedUndoStack?: UndoEntry[];
|
|
12
|
-
|
|
12
|
+
/** Summarize `messages`; `keep` is what must follow the summary verbatim. */
|
|
13
|
+
compactHistory?: (messages: ChatMessage[], signal?: AbortSignal, keep?: ChatMessage[]) => Promise<ChatMessage[]>;
|
|
13
14
|
};
|
|
14
15
|
/** Carries the completed model/tool state so an interrupted turn can resume. */
|
|
15
16
|
export declare class TurnInterruptedError extends Error {
|
|
@@ -18,6 +19,17 @@ export declare class TurnInterruptedError extends Error {
|
|
|
18
19
|
readonly usage?: TokenUsage | undefined;
|
|
19
20
|
constructor(messages: ChatMessage[], iterationsUsed: number, usage?: TokenUsage | undefined);
|
|
20
21
|
}
|
|
22
|
+
/**
|
|
23
|
+
* Carries the completed model/tool state of a turn that failed, so the work it
|
|
24
|
+
* already did can be saved. `cause` is the error that ended the turn, and
|
|
25
|
+
* `message` repeats its message.
|
|
26
|
+
*/
|
|
27
|
+
export declare class TurnFailedError extends Error {
|
|
28
|
+
readonly messages: ChatMessage[];
|
|
29
|
+
readonly iterationsUsed: number;
|
|
30
|
+
readonly usage: TokenUsage | undefined;
|
|
31
|
+
constructor(messages: ChatMessage[], iterationsUsed: number, usage: TokenUsage | undefined, cause: unknown);
|
|
32
|
+
}
|
|
21
33
|
/** Detect a process update that must not be mistaken for a final answer. */
|
|
22
34
|
export declare function looksLikePendingWork(content: string, finishReason?: string): boolean;
|
|
23
35
|
export declare class AgentRunner {
|
|
@@ -39,7 +51,7 @@ export declare class AgentRunner {
|
|
|
39
51
|
finalResponse: string;
|
|
40
52
|
iterationsUsed: number;
|
|
41
53
|
usage?: TokenUsage;
|
|
42
|
-
stopReason:
|
|
54
|
+
stopReason: TurnStopReason;
|
|
43
55
|
}>;
|
|
44
56
|
private buildToolDefs;
|
|
45
57
|
private parseToolCalls;
|