dvalincode 0.22.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 +54 -25
- package/README.zh-CN.md +45 -21
- package/dist/agent/loop.js +2 -2
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/runner.d.ts +11 -0
- package/dist/agent/runner.js +18 -1
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/session.js +5 -3
- package/dist/agent/session.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/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 +4 -1
- package/dist/commands/provider.js.map +1 -1
- package/dist/commands/security.d.ts +13 -0
- package/dist/commands/security.js +47 -10
- package/dist/commands/security.js.map +1 -1
- package/dist/dvalinCli.js +2 -0
- package/dist/dvalinCli.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 +5 -0
- package/dist/mcp/server.js.map +1 -1
- package/dist/providers/trustedBaseUrls.js +1 -1
- package/dist/providers/trustedBaseUrls.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/codexSecurity.d.ts +54 -0
- package/dist/remediation/codexSecurity.js +366 -0
- package/dist/remediation/codexSecurity.js.map +1 -0
- package/dist/remediation/sarif.d.ts +10 -0
- package/dist/remediation/sarif.js +2 -2
- package/dist/remediation/sarif.js.map +1 -1
- package/dist/remediation/scannerSuite.d.ts +1 -0
- package/dist/remediation/scannerSuite.js +1 -1
- package/dist/remediation/scannerSuite.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -64,7 +64,7 @@ finds something.
|
|
|
64
64
|
Dvalin is the independent security runtime between code generation and merge.
|
|
65
65
|
Humans, coding agents, and CI call the same versioned contract for discovery,
|
|
66
66
|
remediation, and verification. It runs independently, or interoperates with
|
|
67
|
-
specialist systems such as Codex Security through portable SARIF. Its built-in
|
|
67
|
+
specialist systems such as Codex Security through sealed scan artifacts or portable SARIF. Its built-in
|
|
68
68
|
coding capability is a remediation executor — not the trust boundary, and not an
|
|
69
69
|
attempt to compete with every general-purpose coding agent. See the
|
|
70
70
|
[security-agent strategy](docs/SECURITY-AGENT-STRATEGY.md).
|
|
@@ -263,7 +263,7 @@ steps:
|
|
|
263
263
|
- uses: actions/checkout@v5
|
|
264
264
|
with:
|
|
265
265
|
fetch-depth: 0 # so the scan can reach the base commit
|
|
266
|
-
- uses: arthurpanhku/dvalincode@v0.
|
|
266
|
+
- uses: arthurpanhku/dvalincode@v0.22.0
|
|
267
267
|
with:
|
|
268
268
|
fail-on: high
|
|
269
269
|
diff: true # only report on what this PR changed
|
|
@@ -287,7 +287,7 @@ engines were missing is not the same answer as "no findings" from a complete one
|
|
|
287
287
|
If your pipeline produced a fix record, hand it to the same action:
|
|
288
288
|
|
|
289
289
|
```yaml
|
|
290
|
-
- uses: arthurpanhku/dvalincode@v0.
|
|
290
|
+
- uses: arthurpanhku/dvalincode@v0.22.0
|
|
291
291
|
with:
|
|
292
292
|
fix-record: fix-record.json
|
|
293
293
|
```
|
|
@@ -382,15 +382,35 @@ claude mcp add dvalin -- npx -y dvalincode mcp-serve --workspace .
|
|
|
382
382
|
One command configures the editor you actually use:
|
|
383
383
|
|
|
384
384
|
```sh
|
|
385
|
+
npx dvalincode mcp-install codex # ~/.codex/config.toml, via `codex mcp add`
|
|
385
386
|
npx dvalincode mcp-install cursor # .cursor/mcp.json
|
|
386
387
|
npx dvalincode mcp-install vscode # .vscode/mcp.json
|
|
387
388
|
npx dvalincode mcp-install claude-code # .mcp.json
|
|
389
|
+
npx dvalincode mcp-install gemini # .gemini/settings.json
|
|
390
|
+
npx dvalincode mcp-install opencode # opencode.json
|
|
388
391
|
```
|
|
389
392
|
|
|
390
|
-
|
|
393
|
+
For Codex, Dvalin delegates to the official `codex mcp add` command, so it safely
|
|
394
|
+
updates TOML without hand-editing user configuration. The other formats differ
|
|
395
|
+
in a way that fails silently — VS Code keys its servers under
|
|
391
396
|
`servers`, Cursor under `mcpServers` — so the command writes the right one and
|
|
392
397
|
merges into whatever is already there. [Editors and MCP →](integrations/mcp/)
|
|
393
398
|
|
|
399
|
+
Or let Dvalin find them. `agents` lists the coding agents on this machine and
|
|
400
|
+
where Dvalin is already connected; `agents connect` plans the rest, and writes
|
|
401
|
+
nothing until you add `--yes`:
|
|
402
|
+
|
|
403
|
+
```sh
|
|
404
|
+
npx dvalincode agents # which agents are here, and which have Dvalin
|
|
405
|
+
npx dvalincode agents connect # the plan: what each agent gets
|
|
406
|
+
npx dvalincode agents connect --yes # apply it
|
|
407
|
+
```
|
|
408
|
+
|
|
409
|
+
If you manage MCP servers with [CC Switch](https://github.com/farion1231/cc-switch),
|
|
410
|
+
`agents connect cc-switch --yes` hands Dvalin to it instead. CC Switch shows the
|
|
411
|
+
import, asks first, then syncs Dvalin into Claude Code, Codex, Gemini CLI and
|
|
412
|
+
OpenCode.
|
|
413
|
+
|
|
394
414
|
`dvalin_scan` accepts `diff: "uncommitted"`, which reports only on what the
|
|
395
415
|
agent just wrote rather than everything the repository already carried — the
|
|
396
416
|
difference between a usable answer and a wall of pre-existing findings. It never
|
|
@@ -418,10 +438,13 @@ handshake — which client, which version, and on what date is a table rather
|
|
|
418
438
|
than a sentence, because hand-written version numbers go stale quietly.
|
|
419
439
|
[Integration support ↓](#-integration-support) · [Agent integrations →](integrations/)
|
|
420
440
|
|
|
421
|
-
The repository also contains one [
|
|
422
|
-
with
|
|
423
|
-
|
|
424
|
-
|
|
441
|
+
The repository also contains one [portable Codex/Claude plugin payload](integrations/dvalin-security/)
|
|
442
|
+
with the current root Agent Plugins manifest, compatibility manifests, the
|
|
443
|
+
shared security-gate skill, and a Claude-compatible MCP configuration. A repo-local
|
|
444
|
+
marketplace makes it discoverable in Codex desktop; installing it lets task
|
|
445
|
+
context trigger the gate instead of requiring every developer to remember a scan prompt.
|
|
446
|
+
For Codex, `mcp-install codex` separately binds the server to the active project;
|
|
447
|
+
the plugin does not risk scanning its own installed cache directory.
|
|
425
448
|
Codex honors the scan's read-only MCP annotation. Claude Code requires one
|
|
426
449
|
explicit MCP permission by design; the plugin documents the exact scan-only
|
|
427
450
|
allow rule instead of asking users to bypass all permissions.
|
|
@@ -432,10 +455,13 @@ One server, reached the way each tool expects:
|
|
|
432
455
|
|
|
433
456
|
| Harness | How Dvalin reaches it |
|
|
434
457
|
|---|---|
|
|
435
|
-
| **Claude Code** | [
|
|
436
|
-
| **Codex** | [
|
|
458
|
+
| **Claude Code** | [portable plugin](integrations/dvalin-security/) or `claude mcp add` · [standalone skill](integrations/claude-code/) |
|
|
459
|
+
| **Codex** | `dvalincode mcp-install codex` · [portable plugin](integrations/dvalin-security/) · [sealed scan + SARIF interop](integrations/codex-security/) with Codex Security |
|
|
437
460
|
| **Cursor** | `dvalincode mcp-install cursor` |
|
|
438
461
|
| **VS Code** | `dvalincode mcp-install vscode` · [extension](editors/vscode/) for Problems, coverage/gate status, and offline VFR verification — *built, not yet published* |
|
|
462
|
+
| **Gemini CLI** | `dvalincode mcp-install gemini` |
|
|
463
|
+
| **OpenCode** | `dvalincode mcp-install opencode` |
|
|
464
|
+
| **CC Switch** | `dvalin agents connect cc-switch` — one import, synced into each agent CC Switch manages |
|
|
439
465
|
| **Windsurf · Zed** | stdio MCP through their own settings — [server command](integrations/mcp/) |
|
|
440
466
|
| **Any MCP client** | [MCP registry](https://registry.modelcontextprotocol.io/): `io.github.arthurpanhku/dvalincode` |
|
|
441
467
|
| **GitHub Actions** | [Marketplace action](https://github.com/marketplace/actions/dvalin-security-scan) — findings inline on the pull request diff |
|
|
@@ -443,31 +469,30 @@ One server, reached the way each tool expects:
|
|
|
443
469
|
| **pre-commit** | [`dvalin-scan` hook](.pre-commit-hooks.yaml) — the same policy gate before every commit |
|
|
444
470
|
| **Any CI** | `dvalin scan . --fail-on high`, SARIF out for code scanning |
|
|
445
471
|
|
|
446
|
-
The MCP config formats are not interchangeable —
|
|
447
|
-
|
|
472
|
+
The MCP config formats are not interchangeable — Codex uses TOML through its own
|
|
473
|
+
CLI, VS Code keys its servers under
|
|
474
|
+
`servers`, Cursor under `mcpServers`, OpenCode under `mcp` with the command line
|
|
475
|
+
in one array, and the wrong one fails silently — so
|
|
448
476
|
`mcp-install` writes the right shape and merges into whatever is already there.
|
|
449
477
|
[Editors and MCP →](integrations/mcp/)
|
|
450
478
|
|
|
451
479
|
### Or interoperate with Codex Security
|
|
452
480
|
|
|
453
|
-
[Codex Security](https://github.com/openai/codex-security)
|
|
454
|
-
sealed
|
|
455
|
-
|
|
481
|
+
[Codex Security](https://github.com/openai/codex-security) writes completed,
|
|
482
|
+
sealed scans with a manifest, structured findings, and coverage. Import those
|
|
483
|
+
portable artifacts without coupling Dvalin to its private application state:
|
|
456
484
|
|
|
457
485
|
```sh
|
|
458
486
|
DVALIN_CODEX_SCAN_DIR=/tmp/codex-security-results
|
|
459
487
|
npx @openai/codex-security scan . --output-dir "$DVALIN_CODEX_SCAN_DIR"
|
|
460
|
-
|
|
461
|
-
--export-format sarif --source-root "$PWD" --output /tmp/codex-security.sarif
|
|
462
|
-
|
|
463
|
-
dvalin import /tmp/codex-security.sarif .
|
|
488
|
+
dvalin import "$DVALIN_CODEX_SCAN_DIR" .
|
|
464
489
|
dvalin scan . --fail-on high
|
|
465
490
|
```
|
|
466
491
|
|
|
467
|
-
The import
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
492
|
+
The import verifies manifest-recorded artifact hashes, creates stable Dvalin
|
|
493
|
+
remediation cases, and reports exclusions and deferred work as explicit
|
|
494
|
+
complete, partial, or unknown coverage. `--no-persist` validates the handoff
|
|
495
|
+
without changing the backlog. SARIF remains the findings-only fallback.
|
|
471
496
|
[Integration guide →](integrations/codex-security/)
|
|
472
497
|
|
|
473
498
|
### Then let it fix what it found
|
|
@@ -542,9 +567,11 @@ answer does not change depending on who asks it.
|
|
|
542
567
|
|
|
543
568
|
| Stage of the loop | Where you are | How Dvalin gets there | Status |
|
|
544
569
|
|---|---|---|---|
|
|
545
|
-
| **Writing the code** | Claude Code | [
|
|
546
|
-
| | Codex | [
|
|
570
|
+
| **Writing the code** | Claude Code | [portable plugin](integrations/dvalin-security/) · `claude mcp add` · `mcp-install claude-code` | ✅ session verified |
|
|
571
|
+
| | Codex | `mcp-install codex` · [portable plugin](integrations/dvalin-security/) · [sealed scan + SARIF interop](integrations/codex-security/) | ✅ session verified · capture below |
|
|
547
572
|
| | Cursor | `dvalincode mcp-install cursor` | ⚙️ config verified |
|
|
573
|
+
| | Gemini CLI · OpenCode | `mcp-install gemini\|opencode` · `dvalin agents connect` | ⚙️ config verified |
|
|
574
|
+
| | CC Switch | `dvalin agents connect cc-switch` | ⚙️ link format tested, not yet imported |
|
|
548
575
|
| | Windsurf · Zed | stdio MCP through their own settings | ⚙️ documented, unverified |
|
|
549
576
|
| | Any MCP client | registry `io.github.arthurpanhku/dvalincode` | ⚙️ published |
|
|
550
577
|
| **Reading it back** | VS Code | `mcp-install vscode` · [extension](editors/vscode/) for Problems, coverage and gate status | ✅ editor verified |
|
|
@@ -568,6 +595,8 @@ config file that loads is not evidence that a tool was ever called.
|
|
|
568
595
|
| Codex | CLI 0.151.0 | 2026-08-31 | weekly `harness-interop` — the server spec is accepted and stored as stdio. **Not a handshake**: the tool-call step stays skipped until `CODEX_API_KEY` is set |
|
|
569
596
|
| VS Code | 1.134.0 · extension 0.18.0 | 2026-09-03 | packaged VSIX in a clean profile; finding, gate and coverage rendered in the editor — capture below |
|
|
570
597
|
| Cursor | — | 2026-09-04 | `mcp-install cursor` writes `.cursor/mcp.json` under `mcpServers`; no session has been captured |
|
|
598
|
+
| Gemini CLI · OpenCode | — | 2026-11-11 | `mcp-install` writes the shapes their own docs specify (Gemini: `mcpServers` in `settings.json`; OpenCode: the V1 `mcp` entry, which V2 still reads); no session has been captured |
|
|
599
|
+
| CC Switch | — | 2026-11-11 | the `ccswitch://` link follows CC Switch's deep-link guide and importer source; not yet opened in a running CC Switch |
|
|
571
600
|
|
|
572
601
|
That weekly workflow exists because an earlier version of this claim named two
|
|
573
602
|
CLI versions by hand, both went stale within weeks, and nothing said so. It now
|
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
|
|
|
@@ -213,7 +213,7 @@ steps:
|
|
|
213
213
|
- uses: actions/checkout@v5
|
|
214
214
|
with:
|
|
215
215
|
fetch-depth: 0 # 让扫描能取到 base commit
|
|
216
|
-
- uses: arthurpanhku/dvalincode@v0.
|
|
216
|
+
- uses: arthurpanhku/dvalincode@v0.22.0
|
|
217
217
|
with:
|
|
218
218
|
fail-on: high
|
|
219
219
|
diff: true # 只报告这个 PR 改动的部分
|
|
@@ -236,7 +236,7 @@ steps:
|
|
|
236
236
|
如果你的流水线产出了 fix record,把它交给同一个 action:
|
|
237
237
|
|
|
238
238
|
```yaml
|
|
239
|
-
- uses: arthurpanhku/dvalincode@v0.
|
|
239
|
+
- uses: arthurpanhku/dvalincode@v0.22.0
|
|
240
240
|
with:
|
|
241
241
|
fix-record: fix-record.json
|
|
242
242
|
```
|
|
@@ -320,15 +320,32 @@ claude mcp add dvalin -- npx -y dvalincode mcp-serve --workspace .
|
|
|
320
320
|
一条命令配好你实际在用的编辑器:
|
|
321
321
|
|
|
322
322
|
```sh
|
|
323
|
+
npx dvalincode mcp-install codex # 通过 `codex mcp add` 更新 ~/.codex/config.toml
|
|
323
324
|
npx dvalincode mcp-install cursor # .cursor/mcp.json
|
|
324
325
|
npx dvalincode mcp-install vscode # .vscode/mcp.json
|
|
325
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
|
|
326
329
|
```
|
|
327
330
|
|
|
328
|
-
|
|
331
|
+
对于 Codex,Dvalin 会委托官方 `codex mcp add` 命令安全更新 TOML,无需手改用户配置。
|
|
332
|
+
其他客户端的格式也不一样,而且写错不会报错——VS Code 的 key 是 `servers`,Cursor 是
|
|
329
333
|
`mcpServers`,填反了编辑器会照单全收然后当没看见。这条命令会写对,并且合并进已有
|
|
330
334
|
配置而不是覆盖。[编辑器与 MCP →](integrations/mcp/)
|
|
331
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
|
+
|
|
332
349
|
`dvalin_scan` 支持 `diff: "uncommitted"`,只报告 agent 刚写的部分,而不是仓库里的全部存量问题。它不跑模型、不修改目标 workspace、也不持久化 Dvalin 状态,因此客户端可以默认允许这次预览。确认要修复某条发现后,Agent 再显式调用
|
|
333
350
|
`dvalin_begin_verification` 创建精简的本地安全 workflow,用 fingerprint 精确读取单条发现,再通过 `dvalin_get_finding` 和
|
|
334
351
|
`dvalin_verify_findings` 请求独立复扫。响应包含 MCP `structuredContent`,并可通过
|
|
@@ -339,9 +356,11 @@ npx dvalincode mcp-install claude-code # .mcp.json
|
|
|
339
356
|
哪个版本、哪一天验的,写成了表格而不是一句话,因为手写的版本号会悄无声息地过期。
|
|
340
357
|
[集成支持 ↓](#-集成支持) · [Agent 集成 →](integrations/)
|
|
341
358
|
|
|
342
|
-
仓库还提供一份 [Codex/Claude
|
|
343
|
-
|
|
344
|
-
|
|
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` 单独绑定到当前项目,避免插件进程误扫自身的安装缓存目录。
|
|
345
364
|
Codex 会采纳扫描工具的只读 MCP 标注;Claude Code 按其安全设计仍需显式授权一次。
|
|
346
365
|
插件给出精确到只读扫描工具的 allow 规则,不要求用户绕过所有权限。
|
|
347
366
|
|
|
@@ -351,10 +370,13 @@ Codex 会采纳扫描工具的只读 MCP 标注;Claude Code 按其安全设计
|
|
|
351
370
|
|
|
352
371
|
| Harness | 怎么接 |
|
|
353
372
|
|---|---|
|
|
354
|
-
| **Claude Code** | [
|
|
355
|
-
| **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/) |
|
|
356
375
|
| **Cursor** | `dvalincode mcp-install cursor` |
|
|
357
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 |
|
|
358
380
|
| **Windsurf · Zed** | 在各自设置里配 stdio MCP —— [server 命令](integrations/mcp/) |
|
|
359
381
|
| **任意 MCP 客户端** | [MCP registry](https://registry.modelcontextprotocol.io/):`io.github.arthurpanhku/dvalincode` |
|
|
360
382
|
| **GitHub Actions** | [Marketplace action](https://github.com/marketplace/actions/dvalin-security-scan) —— 结果直接标在 PR diff 上 |
|
|
@@ -362,28 +384,26 @@ Codex 会采纳扫描工具的只读 MCP 标注;Claude Code 按其安全设计
|
|
|
362
384
|
| **pre-commit** | [`dvalin-scan` hook](.pre-commit-hooks.yaml) —— 每次提交前跑同一套策略门禁 |
|
|
363
385
|
| **任意 CI** | `dvalin scan . --fail-on high`,输出 SARIF 供 code scanning 用 |
|
|
364
386
|
|
|
365
|
-
各家的 MCP 配置格式并不通用——VS Code 的 key 是
|
|
387
|
+
各家的 MCP 配置格式并不通用——Codex 通过自己的 CLI 管理 TOML,VS Code 的 key 是
|
|
388
|
+
`servers`,Cursor 是 `mcpServers`,OpenCode 是 `mcp` 且整条命令写在一个数组里,
|
|
366
389
|
填错了不会报错只会静默失效——所以 `mcp-install` 会写对格式,并合并进已有配置。
|
|
367
390
|
[编辑器与 MCP →](integrations/mcp/)
|
|
368
391
|
|
|
369
392
|
### 或者和 Codex Security 互操作
|
|
370
393
|
|
|
371
|
-
[Codex Security](https://github.com/openai/codex-security)
|
|
372
|
-
|
|
394
|
+
[Codex Security](https://github.com/openai/codex-security) 会为已完成扫描保存 manifest、
|
|
395
|
+
结构化 findings 与 coverage。Dvalin 只读取这些可移植工件,不耦合其私有应用状态:
|
|
373
396
|
|
|
374
397
|
```sh
|
|
375
398
|
DVALIN_CODEX_SCAN_DIR=/tmp/codex-security-results
|
|
376
399
|
npx @openai/codex-security scan . --output-dir "$DVALIN_CODEX_SCAN_DIR"
|
|
377
|
-
|
|
378
|
-
--export-format sarif --source-root "$PWD" --output /tmp/codex-security.sarif
|
|
379
|
-
|
|
380
|
-
dvalin import /tmp/codex-security.sarif .
|
|
400
|
+
dvalin import "$DVALIN_CODEX_SCAN_DIR" .
|
|
381
401
|
dvalin scan . --fail-on high
|
|
382
402
|
```
|
|
383
403
|
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
404
|
+
导入会校验 manifest 记录的工件哈希、生成稳定的 remediation case,并把排除项和延期
|
|
405
|
+
工作明确报告为 complete、partial 或 unknown coverage;`--no-persist` 可以只校验交接件
|
|
406
|
+
而不修改 backlog。SARIF 继续作为只包含 findings 的兼容路径。
|
|
387
407
|
[集成指南 →](integrations/codex-security/)
|
|
388
408
|
|
|
389
409
|
### 然后让它把找到的问题修掉
|
|
@@ -449,9 +469,11 @@ Dvalin 在这四处背后是同一个 MCP server、同一次确定性扫描 —
|
|
|
449
469
|
|
|
450
470
|
| 开发环节 | 你在哪儿 | Dvalin 怎么接进去 | 状态 |
|
|
451
471
|
|---|---|---|---|
|
|
452
|
-
| **写代码** | Claude Code | [
|
|
453
|
-
| | 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/) | ✅ 会话已验证 · 见下方截图 |
|
|
454
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` | ⚙️ 链接格式已测试,尚未实际导入 |
|
|
455
477
|
| | Windsurf · Zed | 通过它们自己的设置接 stdio MCP | ⚙️ 已文档化,未验证 |
|
|
456
478
|
| | 任意 MCP 客户端 | registry `io.github.arthurpanhku/dvalincode` | ⚙️ 已发布 |
|
|
457
479
|
| **回头读代码** | VS Code | `mcp-install vscode` · [扩展](editors/vscode/):Problems、覆盖度与门禁状态 | ✅ 编辑器内已验证 |
|
|
@@ -474,6 +496,8 @@ Dvalin 在这四处背后是同一个 MCP server、同一次确定性扫描 —
|
|
|
474
496
|
| Codex | CLI 0.151.0 | 2026-08-31 | 每周的 `harness-interop`:server 配置被接受并按 stdio 存下。**这不是握手** —— 在设置 `CODEX_API_KEY` 之前,调用工具那一步一直是 skipped |
|
|
475
497
|
| VS Code | 1.134.0 · 扩展 0.18.0 | 2026-09-03 | 干净 profile 里安装打包好的 VSIX;finding、门禁和覆盖度都出现在编辑器里 —— 见下方截图 |
|
|
476
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 里实际打开过 |
|
|
477
501
|
|
|
478
502
|
那个每周任务之所以存在,是因为这段话的早期版本手写了两个 CLI 版本号,两个都在几周内
|
|
479
503
|
过期,而没有任何东西提醒过。现在它每周对着这些工具的当周版本重跑一次 —— 上面这些日期
|
package/dist/agent/loop.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { TurnState, DEFAULT_TURN_CONFIG } from './types.js';
|
|
2
|
-
import { AgentRunner, TurnInterruptedError } from './runner.js';
|
|
2
|
+
import { AgentRunner, TurnFailedError, TurnInterruptedError } from './runner.js';
|
|
3
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';
|
|
@@ -194,7 +194,7 @@ export class AgentLoop {
|
|
|
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
|
}
|
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
|
@@ -19,6 +19,17 @@ export declare class TurnInterruptedError extends Error {
|
|
|
19
19
|
readonly usage?: TokenUsage | undefined;
|
|
20
20
|
constructor(messages: ChatMessage[], iterationsUsed: number, usage?: TokenUsage | undefined);
|
|
21
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
|
+
}
|
|
22
33
|
/** Detect a process update that must not be mistaken for a final answer. */
|
|
23
34
|
export declare function looksLikePendingWork(content: string, finishReason?: string): boolean;
|
|
24
35
|
export declare class AgentRunner {
|
package/dist/agent/runner.js
CHANGED
|
@@ -16,6 +16,23 @@ export class TurnInterruptedError extends Error {
|
|
|
16
16
|
this.name = 'TurnInterruptedError';
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
|
+
/**
|
|
20
|
+
* Carries the completed model/tool state of a turn that failed, so the work it
|
|
21
|
+
* already did can be saved. `cause` is the error that ended the turn, and
|
|
22
|
+
* `message` repeats its message.
|
|
23
|
+
*/
|
|
24
|
+
export class TurnFailedError extends Error {
|
|
25
|
+
messages;
|
|
26
|
+
iterationsUsed;
|
|
27
|
+
usage;
|
|
28
|
+
constructor(messages, iterationsUsed, usage, cause) {
|
|
29
|
+
super(cause instanceof Error ? cause.message : String(cause), { cause });
|
|
30
|
+
this.messages = messages;
|
|
31
|
+
this.iterationsUsed = iterationsUsed;
|
|
32
|
+
this.usage = usage;
|
|
33
|
+
this.name = 'TurnFailedError';
|
|
34
|
+
}
|
|
35
|
+
}
|
|
19
36
|
const PENDING_WORK_NUDGE = [
|
|
20
37
|
'Runtime completion check: your previous response described work that is still pending.',
|
|
21
38
|
'Continue the task now by calling the next required tool. Do not merely describe what you will do.',
|
|
@@ -397,7 +414,7 @@ export class AgentRunner {
|
|
|
397
414
|
if (signal?.aborted || (err instanceof Error && err.message === 'interrupted')) {
|
|
398
415
|
throw new TurnInterruptedError(messages, this.iterationCount, totalUsage);
|
|
399
416
|
}
|
|
400
|
-
throw err;
|
|
417
|
+
throw new TurnFailedError(messages, this.iterationCount, totalUsage, err);
|
|
401
418
|
}
|
|
402
419
|
// Max iterations reached
|
|
403
420
|
const lastMsg = messages.filter(m => m.role === 'assistant').pop();
|
package/dist/agent/runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/session.js
CHANGED
|
@@ -4,7 +4,7 @@ import { randomUUID } from 'node:crypto';
|
|
|
4
4
|
import { promisify } from 'node:util';
|
|
5
5
|
import path from 'node:path';
|
|
6
6
|
import { AgentLoop } from './loop.js';
|
|
7
|
-
import { TurnInterruptedError } from './runner.js';
|
|
7
|
+
import { TurnFailedError, TurnInterruptedError } from './runner.js';
|
|
8
8
|
import { DEFAULT_TURN_CONFIG } from './types.js';
|
|
9
9
|
import { MODE_PROMPT, MODE_TOOLS, CODE_PERMISSION_PROMPT, resolveApprovalMode, } from './modes.js';
|
|
10
10
|
import { createDvalinContext } from '../core/context.js';
|
|
@@ -225,7 +225,7 @@ export async function runAgentTurn(input, hooks = {}) {
|
|
|
225
225
|
catch (err) {
|
|
226
226
|
// Tool calls may already have changed the workspace. Persist their messages
|
|
227
227
|
// so reconnecting or sending "continue" resumes from the actual state.
|
|
228
|
-
if (err instanceof TurnInterruptedError) {
|
|
228
|
+
if (err instanceof TurnInterruptedError || err instanceof TurnFailedError) {
|
|
229
229
|
session.messages = err.messages;
|
|
230
230
|
session.updatedAt = new Date().toISOString();
|
|
231
231
|
session.summary = summarizeSession(session);
|
|
@@ -233,7 +233,9 @@ export async function runAgentTurn(input, hooks = {}) {
|
|
|
233
233
|
}
|
|
234
234
|
const status = err instanceof Error && err.message === 'interrupted' ? 'interrupted' : 'error';
|
|
235
235
|
appendJournal(session.id, { type: 'turn_end', messageId, status });
|
|
236
|
-
|
|
236
|
+
// Rethrow the error that ended the turn, not the wrapper that carried its
|
|
237
|
+
// state here: callers map its type to an exit code (a policy block is 3).
|
|
238
|
+
throw err instanceof TurnFailedError ? err.cause : err;
|
|
237
239
|
}
|
|
238
240
|
finally {
|
|
239
241
|
// Local MCP servers are per-run child processes; never outlive the turn.
|