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.
Files changed (144) hide show
  1. package/README.md +261 -27
  2. package/README.zh-CN.md +203 -23
  3. package/dist/agent/compact.d.ts +8 -0
  4. package/dist/agent/compact.js +44 -5
  5. package/dist/agent/compact.js.map +1 -1
  6. package/dist/agent/loop.d.ts +5 -0
  7. package/dist/agent/loop.js +18 -9
  8. package/dist/agent/loop.js.map +1 -1
  9. package/dist/agent/runner.d.ts +15 -3
  10. package/dist/agent/runner.js +99 -9
  11. package/dist/agent/runner.js.map +1 -1
  12. package/dist/agent/session.d.ts +7 -0
  13. package/dist/agent/session.js +32 -4
  14. package/dist/agent/session.js.map +1 -1
  15. package/dist/agent/types.d.ts +5 -1
  16. package/dist/agent/types.js.map +1 -1
  17. package/dist/audit/log.d.ts +5 -1
  18. package/dist/audit/log.js.map +1 -1
  19. package/dist/cli.js +2 -0
  20. package/dist/cli.js.map +1 -1
  21. package/dist/commands/agents.d.ts +11 -0
  22. package/dist/commands/agents.js +223 -0
  23. package/dist/commands/agents.js.map +1 -0
  24. package/dist/commands/dvalin.d.ts +7 -1
  25. package/dist/commands/dvalin.js +209 -9
  26. package/dist/commands/dvalin.js.map +1 -1
  27. package/dist/commands/mcpInstall.d.ts +24 -0
  28. package/dist/commands/mcpInstall.js +62 -17
  29. package/dist/commands/mcpInstall.js.map +1 -1
  30. package/dist/commands/provider.js +6 -1
  31. package/dist/commands/provider.js.map +1 -1
  32. package/dist/commands/run.js +4 -2
  33. package/dist/commands/run.js.map +1 -1
  34. package/dist/commands/security.d.ts +15 -0
  35. package/dist/commands/security.js +273 -22
  36. package/dist/commands/security.js.map +1 -1
  37. package/dist/dvalinCli.js +2 -0
  38. package/dist/dvalinCli.js.map +1 -1
  39. package/dist/harness/run.d.ts +8 -2
  40. package/dist/harness/run.js +1 -1
  41. package/dist/harness/run.js.map +1 -1
  42. package/dist/mcp/agents.d.ts +41 -0
  43. package/dist/mcp/agents.js +129 -0
  44. package/dist/mcp/agents.js.map +1 -0
  45. package/dist/mcp/install.d.ts +43 -6
  46. package/dist/mcp/install.js +104 -1
  47. package/dist/mcp/install.js.map +1 -1
  48. package/dist/mcp/server.js +10 -2
  49. package/dist/mcp/server.js.map +1 -1
  50. package/dist/providers/anthropic.js +14 -2
  51. package/dist/providers/anthropic.js.map +1 -1
  52. package/dist/providers/openaiCompatible.js +7 -6
  53. package/dist/providers/openaiCompatible.js.map +1 -1
  54. package/dist/providers/retry.d.ts +32 -0
  55. package/dist/providers/retry.js +150 -0
  56. package/dist/providers/retry.js.map +1 -0
  57. package/dist/providers/trustedBaseUrls.js +1 -1
  58. package/dist/providers/trustedBaseUrls.js.map +1 -1
  59. package/dist/providers/types.d.ts +10 -0
  60. package/dist/remediation/automate.d.ts +1 -1
  61. package/dist/remediation/automate.js +2 -1
  62. package/dist/remediation/automate.js.map +1 -1
  63. package/dist/remediation/cases.d.ts +1 -0
  64. package/dist/remediation/cases.js +1 -0
  65. package/dist/remediation/cases.js.map +1 -1
  66. package/dist/remediation/codeQualityExport.d.ts +25 -0
  67. package/dist/remediation/codeQualityExport.js +24 -0
  68. package/dist/remediation/codeQualityExport.js.map +1 -0
  69. package/dist/remediation/codexSecurity.d.ts +54 -0
  70. package/dist/remediation/codexSecurity.js +366 -0
  71. package/dist/remediation/codexSecurity.js.map +1 -0
  72. package/dist/remediation/evasion.d.ts +61 -0
  73. package/dist/remediation/evasion.js +190 -0
  74. package/dist/remediation/evasion.js.map +1 -0
  75. package/dist/remediation/fixLoop.d.ts +255 -0
  76. package/dist/remediation/fixLoop.js +639 -0
  77. package/dist/remediation/fixLoop.js.map +1 -0
  78. package/dist/remediation/fixLoopStats.d.ts +93 -0
  79. package/dist/remediation/fixLoopStats.js +244 -0
  80. package/dist/remediation/fixLoopStats.js.map +1 -0
  81. package/dist/remediation/rebase.d.ts +44 -0
  82. package/dist/remediation/rebase.js +114 -0
  83. package/dist/remediation/rebase.js.map +1 -0
  84. package/dist/remediation/reproduce.d.ts +47 -0
  85. package/dist/remediation/reproduce.js +75 -0
  86. package/dist/remediation/reproduce.js.map +1 -0
  87. package/dist/remediation/sarif.d.ts +14 -1
  88. package/dist/remediation/sarif.js +21 -3
  89. package/dist/remediation/sarif.js.map +1 -1
  90. package/dist/remediation/scannerSuite.d.ts +52 -3
  91. package/dist/remediation/scannerSuite.js +347 -88
  92. package/dist/remediation/scannerSuite.js.map +1 -1
  93. package/dist/remediation/verify.d.ts +8 -0
  94. package/dist/remediation/verify.js +24 -11
  95. package/dist/remediation/verify.js.map +1 -1
  96. package/dist/security/config.d.ts +8 -2
  97. package/dist/security/config.js +10 -3
  98. package/dist/security/config.js.map +1 -1
  99. package/dist/security/contracts.js +15 -0
  100. package/dist/security/contracts.js.map +1 -1
  101. package/dist/security/fixRecord.d.ts +103 -8
  102. package/dist/security/fixRecord.js +113 -11
  103. package/dist/security/fixRecord.js.map +1 -1
  104. package/dist/security/fixRecordFile.d.ts +11 -2
  105. package/dist/security/fixRecordFile.js +20 -2
  106. package/dist/security/fixRecordFile.js.map +1 -1
  107. package/dist/security/fixRecordSignature.d.ts +104 -0
  108. package/dist/security/fixRecordSignature.js +227 -0
  109. package/dist/security/fixRecordSignature.js.map +1 -0
  110. package/dist/security/guardedScan.d.ts +39 -0
  111. package/dist/security/guardedScan.js +45 -0
  112. package/dist/security/guardedScan.js.map +1 -0
  113. package/dist/security/onboarding.d.ts +28 -0
  114. package/dist/security/onboarding.js +124 -0
  115. package/dist/security/onboarding.js.map +1 -0
  116. package/dist/security/reproduceInCi.d.ts +44 -0
  117. package/dist/security/reproduceInCi.js +96 -0
  118. package/dist/security/reproduceInCi.js.map +1 -0
  119. package/dist/security/reverify.d.ts +130 -0
  120. package/dist/security/reverify.js +361 -0
  121. package/dist/security/reverify.js.map +1 -0
  122. package/dist/security/suppressionGuard.d.ts +58 -0
  123. package/dist/security/suppressionGuard.js +216 -0
  124. package/dist/security/suppressionGuard.js.map +1 -0
  125. package/dist/security/verifyRun.js +14 -3
  126. package/dist/security/verifyRun.js.map +1 -1
  127. package/dist/security/workflow.d.ts +11 -1
  128. package/dist/security/workflow.js +2 -0
  129. package/dist/security/workflow.js.map +1 -1
  130. package/dist/server/routes/config.js +2 -0
  131. package/dist/server/routes/config.js.map +1 -1
  132. package/dist/server/routes/remediation.js +6 -5
  133. package/dist/server/routes/remediation.js.map +1 -1
  134. package/dist/tools/editFile.js +9 -2
  135. package/dist/tools/editFile.js.map +1 -1
  136. package/dist/tools/registry.d.ts +4 -1
  137. package/dist/tools/registry.js +29 -9
  138. package/dist/tools/registry.js.map +1 -1
  139. package/dist/tools/runSecuritySuite.d.ts +3 -0
  140. package/dist/tools/runSecuritySuite.js +2 -2
  141. package/dist/tools/runSecuritySuite.js.map +1 -1
  142. package/dist/version.d.ts +1 -1
  143. package/dist/version.js +1 -1
  144. package/package.json +1 -1
@@ -0,0 +1,75 @@
1
+ import { createHash } from 'node:crypto';
2
+ import { readFile } from 'node:fs/promises';
3
+ import path from 'node:path';
4
+ const ALWAYS_ERROR = [126, 127];
5
+ /**
6
+ * How to run just the reproduction tests.
7
+ *
8
+ * An explicit flag wins, then the policy file's `reproduce`, then inference
9
+ * from the project. The executor never chooses: a runner it picked could be one
10
+ * that fails on anything and passes on anything.
11
+ */
12
+ export async function resolveReproRunner(cwd, options = {}) {
13
+ if (options.flag)
14
+ return { template: options.flag, source: 'flag', errorExitCodes: ALWAYS_ERROR };
15
+ if (options.configured)
16
+ return { template: options.configured, source: 'config', errorExitCodes: ALWAYS_ERROR };
17
+ const pkg = await readJson(path.join(cwd, 'package.json'));
18
+ if (pkg) {
19
+ const deps = { ...(pkg.dependencies ?? {}), ...(pkg.devDependencies ?? {}) };
20
+ const testScript = String(pkg.scripts?.test ?? '');
21
+ if ('vitest' in deps || /\bvitest\b/.test(testScript))
22
+ return { template: 'npx --no-install vitest run {files}', source: 'inferred', errorExitCodes: ALWAYS_ERROR };
23
+ if ('jest' in deps || /\bjest\b/.test(testScript))
24
+ return { template: 'npx --no-install jest {files}', source: 'inferred', errorExitCodes: ALWAYS_ERROR };
25
+ if ('mocha' in deps || /\bmocha\b/.test(testScript))
26
+ return { template: 'npx --no-install mocha {files}', source: 'inferred', errorExitCodes: ALWAYS_ERROR };
27
+ if (/\bnode\s+--test\b/.test(testScript))
28
+ return { template: 'node --test {files}', source: 'inferred', errorExitCodes: ALWAYS_ERROR };
29
+ }
30
+ for (const file of ['pytest.ini', 'pyproject.toml', 'setup.cfg', 'tox.ini', 'requirements.txt', 'requirements-dev.txt']) {
31
+ const content = await readFile(path.join(cwd, file), 'utf8').catch(() => '');
32
+ // pytest: 2 interrupted, 3 internal error, 4 usage error, 5 no tests collected.
33
+ if (/\bpytest\b/.test(content))
34
+ return { template: 'python -m pytest {files}', source: 'inferred', errorExitCodes: [...ALWAYS_ERROR, 2, 3, 4, 5] };
35
+ }
36
+ if (await readFile(path.join(cwd, 'go.mod'), 'utf8').then(() => true, () => false)) {
37
+ return { template: 'go test {dirs}', source: 'inferred', errorExitCodes: ALWAYS_ERROR };
38
+ }
39
+ return undefined;
40
+ }
41
+ export function reproCommand(template, files) {
42
+ const quote = (value) => (/\s/.test(value) ? `"${value}"` : value);
43
+ const dirs = [...new Set(files.map(file => `./${path.posix.dirname(file.split(path.sep).join('/'))}`.replace(/\/\.$/, '')))];
44
+ return template
45
+ .replace('{files}', files.map(quote).join(' '))
46
+ .replace('{dirs}', dirs.map(quote).join(' '));
47
+ }
48
+ /**
49
+ * Output that means the run never reached a test. Includes a test importing a
50
+ * module that does not exist yet: a test that fails only because the fix has
51
+ * not been written is a test of the fix's name, not of the vulnerability.
52
+ */
53
+ const RUNNER_ERROR = /command not found|is not recognized as an internal|could not determine executable|npx canceled|missing script|no test files found|no tests? (?:ran|found)|collected 0 items|cannot find module|err_module_not_found|modulenotfounderror/i;
54
+ export function classifyReproExit(runner, exitCode, output = '') {
55
+ if (exitCode === 0)
56
+ return 'passed';
57
+ if (exitCode === null || runner.errorExitCodes.includes(exitCode) || RUNNER_ERROR.test(output))
58
+ return 'error';
59
+ return 'failed';
60
+ }
61
+ export async function hashFiles(cwd, files) {
62
+ return Promise.all(files.map(async (file) => {
63
+ const content = await readFile(path.join(cwd, file)).catch(() => null);
64
+ return { path: file, sha256: content ? createHash('sha256').update(content).digest('hex') : null };
65
+ }));
66
+ }
67
+ async function readJson(file) {
68
+ try {
69
+ return JSON.parse(await readFile(file, 'utf8'));
70
+ }
71
+ catch {
72
+ return undefined;
73
+ }
74
+ }
75
+ //# sourceMappingURL=reproduce.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"reproduce.js","sourceRoot":"","sources":["../../src/remediation/reproduce.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAmC7B,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAEhC;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,GAAW,EAAE,OAAO,GAA2C,EAAE;IACxG,IAAI,OAAO,CAAC,IAAI;QAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC;IAClG,IAAI,OAAO,CAAC,UAAU;QAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC;IAEhH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC;IAC3D,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,IAAI,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,YAAsB,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,eAAyB,IAAI,EAAE,CAAC,EAA6B,CAAC;QAC5H,MAAM,UAAU,GAAG,MAAM,CAAE,GAAG,CAAC,OAA+C,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;QAC5F,IAAI,QAAQ,IAAI,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC;YAAE,OAAO,EAAE,QAAQ,EAAE,qCAAqC,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC;QACpK,IAAI,MAAM,IAAI,IAAI,IAAI,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;YAAE,OAAO,EAAE,QAAQ,EAAE,+BAA+B,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC;QAC1J,IAAI,OAAO,IAAI,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC;YAAE,OAAO,EAAE,QAAQ,EAAE,gCAAgC,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC;QAC7J,IAAI,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC;YAAE,OAAO,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC;IACzI,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,SAAS,EAAE,kBAAkB,EAAE,sBAAsB,CAAC,EAAE,CAAC;QACxH,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QAC7E,gFAAgF;QAChF,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;YAAE,OAAO,EAAE,QAAQ,EAAE,0BAA0B,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;IACrJ,CAAC;IACD,IAAI,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;QACnF,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC;IAC1F,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,QAAgB,EAAE,KAAe;IAC5D,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC3E,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7H,OAAO,QAAQ;SACZ,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC9C,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAClD,CAAC;AAED;;;;GAIG;AACH,MAAM,YAAY,GAAG,0OAA0O,CAAC;AAEhQ,MAAM,UAAU,iBAAiB,CAAC,MAA2C,EAAE,QAAuB,EAAE,MAAM,GAAG,EAAE;IACjH,IAAI,QAAQ,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IACpC,IAAI,QAAQ,KAAK,IAAI,IAAI,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,OAAO,OAAO,CAAC;IAC/G,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,GAAW,EAAE,KAAe;IAC1D,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;QACxC,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACvE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACrG,CAAC,CAAC,CAAC,CAAC;AACN,CAAC;AAED,KAAK,UAAU,QAAQ,CAAC,IAAY;IAClC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAA4B,CAAC;IAC7E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}
@@ -1,3 +1,4 @@
1
+ import type { DvalinScannerId } from './scannerSuite.js';
1
2
  export type RemediationFinding = {
2
3
  id: string;
3
4
  source: string;
@@ -6,7 +7,7 @@ export type RemediationFinding = {
6
7
  * for SARIF imported from a tool outside the fleet, where no engine of ours
7
8
  * can be said to have covered it.
8
9
  */
9
- scanner?: 'builtin' | 'semgrep' | 'trivy' | 'osv-scanner';
10
+ scanner?: DvalinScannerId;
10
11
  ruleId: string;
11
12
  ruleName?: string;
12
13
  severity: 'error' | 'warning' | 'note' | 'none';
@@ -18,6 +19,14 @@ export type RemediationFinding = {
18
19
  helpUri?: string;
19
20
  tags: string[];
20
21
  snippet?: string;
22
+ /** Portable identity retained from a supported external evidence producer. */
23
+ external?: {
24
+ provider: string;
25
+ scanId?: string;
26
+ findingId?: string;
27
+ occurrenceId?: string;
28
+ fingerprint?: string;
29
+ };
21
30
  prompt: string;
22
31
  };
23
32
  export type SarifImportResult = {
@@ -25,7 +34,11 @@ export type SarifImportResult = {
25
34
  findings: RemediationFinding[];
26
35
  totalResults: number;
27
36
  skippedResults: number;
37
+ /** Results the producing tool marked suppressed; not findings, counted so they are not invisible. */
38
+ suppressedResults?: number;
28
39
  };
40
+ export declare function normalizeSarifPath(uri: string | undefined, cwd?: string): Promise<string | undefined>;
41
+ export declare function readSnippet(cwd: string | undefined, findingPath: string, startLine: number | undefined): Promise<string | undefined>;
29
42
  export declare function buildRemediationPrompt(finding: Omit<RemediationFinding, 'prompt'>): string;
30
43
  export declare function parseSarifForRemediation(report: unknown, opts?: {
31
44
  cwd?: string;
@@ -29,7 +29,7 @@ function normalizeLevel(level) {
29
29
  return level;
30
30
  return 'warning';
31
31
  }
32
- async function normalizeSarifPath(uri, cwd) {
32
+ export async function normalizeSarifPath(uri, cwd) {
33
33
  if (!uri)
34
34
  return undefined;
35
35
  const trimmed = uri.trim();
@@ -77,7 +77,7 @@ async function normalizeSarifPath(uri, cwd) {
77
77
  }
78
78
  return undefined;
79
79
  }
80
- async function readSnippet(cwd, findingPath, startLine) {
80
+ export async function readSnippet(cwd, findingPath, startLine) {
81
81
  if (!cwd || !startLine || path.isAbsolute(findingPath))
82
82
  return undefined;
83
83
  try {
@@ -130,11 +130,19 @@ export async function parseSarifForRemediation(report, opts = {}) {
130
130
  const findings = [];
131
131
  let totalResults = 0;
132
132
  let skippedResults = 0;
133
+ let suppressedResults = 0;
133
134
  for (const [runIndex, run] of (sarif.runs ?? []).entries()) {
134
135
  const source = run.tool?.driver?.name ?? 'SARIF';
135
136
  const rules = ruleMap(run);
136
137
  for (const [resultIndex, result] of (run.results ?? []).entries()) {
137
138
  totalResults += 1;
139
+ // The tool's own ignore decision. Whether that decision may be trusted
140
+ // is the caller's question — a verifier judging a change neutralizes
141
+ // suppressions the change added before scanning (see suppressionGuard).
142
+ if (isSuppressed(result)) {
143
+ suppressedResults += 1;
144
+ continue;
145
+ }
138
146
  if (findings.length >= MAX_FINDINGS) {
139
147
  skippedResults += 1;
140
148
  continue;
@@ -161,7 +169,7 @@ export async function parseSarifForRemediation(report, opts = {}) {
161
169
  ruleId,
162
170
  ruleName: rule?.name ?? rule?.shortDescription?.text,
163
171
  severity: normalizeLevel(result.level),
164
- securitySeverity: rule?.properties?.security_severity ?? rule?.properties?.problem?.severity,
172
+ securitySeverity: rule?.properties?.['security-severity'] ?? rule?.properties?.security_severity ?? rule?.properties?.problem?.severity,
165
173
  message: result.message?.text ?? location?.message?.text ?? rule?.fullDescription?.text ?? 'Security finding',
166
174
  path: findingPath,
167
175
  startLine,
@@ -181,6 +189,16 @@ export async function parseSarifForRemediation(report, opts = {}) {
181
189
  findings,
182
190
  totalResults,
183
191
  skippedResults,
192
+ ...(suppressedResults ? { suppressedResults } : {}),
184
193
  };
185
194
  }
195
+ /**
196
+ * SARIF §3.35: a suppression without a status, or with `accepted`, suppresses
197
+ * the result. `underReview` and `rejected` do not — a proposed ignore nobody
198
+ * has accepted is still a finding.
199
+ */
200
+ function isSuppressed(result) {
201
+ return Array.isArray(result.suppressions)
202
+ && result.suppressions.some(suppression => !suppression?.status || suppression.status === 'accepted');
203
+ }
186
204
  //# sourceMappingURL=sarif.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"sarif.js","sourceRoot":"","sources":["../../src/remediation/sarif.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sarif.js","sourceRoot":"","sources":["../../src/remediation/sarif.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAmHpF,MAAM,YAAY,GAAG,GAAG,CAAC;AACzB,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAChE,CAAC,CAAC,KAAgC;QAClC,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,SAAS,eAAe,CAAC,KAAe;IACtC,OAAO,KAAK;SACT,IAAI,CAAC,GAAG,CAAC;SACT,OAAO,CAAC,oBAAoB,EAAE,GAAG,CAAC;SAClC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;SACvB,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACnB,CAAC;AAED,SAAS,OAAO,CAAC,GAAa;IAC5B,MAAM,KAAK,GAAG,IAAI,GAAG,EAAqB,CAAC;IAC3C,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,IAAI,EAAE,EAAE,CAAC;QACjD,IAAI,IAAI,CAAC,EAAE;YAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,MAAM;QAAE,OAAO,KAAK,CAAC;IACnG,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,GAAuB,EAAE,GAAY;IAC5E,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC3B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IAC3B,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,OAAe,CAAC;IACpB,IAAI,CAAC;QACH,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC;YAAE,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;aACzD,CAAC;YACJ,MAAM,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC5D,IAAI,CAAC,oBAAoB,IAAI,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC;gBAAE,OAAO,SAAS,CAAC;YACpF,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAE3C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAChD,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC;eAC/D,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QACvE,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,OAAO,SAAS,CAAC;IACxF,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAC5C,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACjF,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IACjB,KAAK,MAAM,SAAS,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5C,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAC/D,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACnE,IAAI,QAAQ,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC;gBAAE,OAAO,QAAQ,CAAC;QACpF,CAAC;QAAC,MAAM,CAAC;YACP,yEAAyE;QAC3E,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAuB,EAAE,WAAmB,EAAE,SAA6B;IAC3G,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;QAAE,OAAO,SAAS,CAAC;IACzE,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,cAAc,CAAC,CAAC;QACtD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,GAAG,cAAc,CAAC,CAAC;QAC/D,OAAO,KAAK;aACT,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,GAAG,CAAC;aACrB,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;aAC3E,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,OAA2C;IAChF,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACtF,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACxE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO;QAC7B,CAAC,CAAC,uCAAuC,OAAO,CAAC,OAAO,YAAY;QACpE,CAAC,CAAC,2EAA2E,CAAC;IAEhF,OAAO;QACL,0BAA0B;QAC1B,EAAE;QACF,SAAS,OAAO,CAAC,MAAM,EAAE;QACzB,SAAS,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5E,aAAa,OAAO,CAAC,gBAAgB,IAAI,OAAO,CAAC,QAAQ,EAAE;QAC3D,aAAa,QAAQ,EAAE;QACvB,SAAS,IAAI,EAAE;QACf,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS;QAC7D,EAAE;QACF,UAAU;QACV,OAAO,CAAC,OAAO;QACf,OAAO;QACP,eAAe;QACf,qFAAqF;QACrF,4FAA4F;QAC5F,2EAA2E;QAC3E,0EAA0E;QAC1E,iHAAiH;KAClH,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,MAAe,EAAE,IAAI,GAAqB,EAAE;IACzF,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;IAED,MAAM,KAAK,GAAG,IAAgB,CAAC;IAC/B,MAAM,QAAQ,GAAyB,EAAE,CAAC;IAC1C,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAE1B,KAAK,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;QAC3D,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,IAAI,OAAO,CAAC;QACjD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAE3B,KAAK,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAClE,YAAY,IAAI,CAAC,CAAC;YAClB,uEAAuE;YACvE,qEAAqE;YACrE,wEAAwE;YACxE,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzB,iBAAiB,IAAI,CAAC,CAAC;gBACvB,SAAS;YACX,CAAC;YACD,IAAI,QAAQ,CAAC,MAAM,IAAI,YAAY,EAAE,CAAC;gBACpC,cAAc,IAAI,CAAC,CAAC;gBACpB,SAAS;YACX,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,QAAQ,GAAG,QAAQ,EAAE,gBAAgB,CAAC;YAC5C,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YACxF,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,cAAc,IAAI,CAAC,CAAC;gBACpB,SAAS;YACX,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,cAAc,CAAC;YAC/C,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC/B,MAAM,SAAS,GAAG,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC;YAC9C,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC;YAC1C,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;YACpE,MAAM,WAAW,GAAG,MAAM,CAAC,mBAAmB,EAAE,uBAAuB;mBAClE,MAAM,CAAC,mBAAmB,EAAE,qCAAqC;mBACjE,MAAM,CAAC,YAAY,EAAE,uBAAuB;mBAC5C,GAAG,QAAQ,IAAI,WAAW,EAAE,CAAC;YAElC,MAAM,WAAW,GAAG;gBAClB,EAAE,EAAE,eAAe,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,SAAS,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;gBACvF,MAAM;gBACN,MAAM;gBACN,QAAQ,EAAE,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,gBAAgB,EAAE,IAAI;gBACpD,QAAQ,EAAE,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC;gBACtC,gBAAgB,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,mBAAmB,CAAC,IAAI,IAAI,EAAE,UAAU,EAAE,iBAAiB,IAAI,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ;gBACvI,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,OAAO,EAAE,IAAI,IAAI,IAAI,EAAE,eAAe,EAAE,IAAI,IAAI,kBAAkB;gBAC7G,IAAI,EAAE,WAAW;gBACjB,SAAS;gBACT,OAAO;gBACP,OAAO,EAAE,IAAI,EAAE,OAAO;gBACtB,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,IAAI,EAAE;gBAClC,OAAO;aACqC,CAAC;YAE/C,QAAQ,CAAC,IAAI,CAAC;gBACZ,GAAG,WAAW;gBACd,MAAM,EAAE,sBAAsB,CAAC,WAAW,CAAC;aAC5C,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO;QACL,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,OAAO;QACtC,QAAQ;QACR,YAAY;QACZ,cAAc;QACd,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACpD,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,YAAY,CAAC,MAAmB;IACvC,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC;WACpC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,MAAM,IAAI,WAAW,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC;AAC1G,CAAC"}
@@ -1,13 +1,26 @@
1
1
  import { type DiffScope } from './diffScope.js';
2
2
  import { type RemediationFinding } from './sarif.js';
3
- export type DvalinScannerId = 'builtin' | 'semgrep' | 'trivy' | 'osv-scanner';
3
+ export type DvalinScannerId = 'builtin' | 'semgrep' | 'trivy' | 'osv-scanner' | 'snyk-code' | 'snyk-oss' | 'codeql';
4
4
  export declare const DVALIN_SCANNER_IDS: DvalinScannerId[];
5
+ /**
6
+ * What runs when nobody named the engines.
7
+ *
8
+ * Snyk is not here, and not by oversight: Snyk Code uploads source to Snyk's
9
+ * service and both engines need an account. A scan that sends code off the
10
+ * machine has to be asked for by name, in the policy file or on the command
11
+ * line — never reached by leaving a flag out. CodeQL is not here either: it
12
+ * builds a database per language, which takes minutes rather than seconds, and
13
+ * its license limits where it may run.
14
+ */
15
+ export declare const DEFAULT_SCANNER_IDS: DvalinScannerId[];
5
16
  export type DvalinScannerDescriptor = {
6
17
  id: DvalinScannerId;
7
18
  name: string;
8
19
  category: 'sast' | 'supply-chain' | 'secrets' | 'misconfiguration';
9
20
  description: string;
10
21
  available: boolean;
22
+ /** Sends code or dependency data to a third-party service and needs an account there. */
23
+ remote?: boolean;
11
24
  installCommand?: string;
12
25
  homepage: string;
13
26
  };
@@ -22,6 +35,8 @@ export type DvalinScannerRun = DvalinScannerDescriptor & {
22
35
  findings: number;
23
36
  durationMs: number;
24
37
  error?: string;
38
+ /** Parts of the tree a completed engine could not analyse; they make coverage partial. */
39
+ deferred?: string[];
25
40
  };
26
41
  export type DvalinScanMetrics = {
27
42
  critical: number;
@@ -41,6 +56,12 @@ export type DvalinScanSuiteResult = {
41
56
  findings: RemediationFinding[];
42
57
  totalResults: number;
43
58
  skippedResults: number;
59
+ /**
60
+ * Results the engine itself marked suppressed (SARIF `suppressions`), by its
61
+ * own ignore policy. Not findings, and not silently gone either: coverage
62
+ * lists them as exclusions.
63
+ */
64
+ suppressedResults?: number;
44
65
  scanners: DvalinScannerRun[];
45
66
  metrics: DvalinScanMetrics;
46
67
  /** Set when the scan was narrowed to a diff; absent for a whole-workspace scan. */
@@ -48,7 +69,21 @@ export type DvalinScanSuiteResult = {
48
69
  ref: string;
49
70
  files: number;
50
71
  };
72
+ /** Set when per-file engines analysed only some files. Not a verdict on its own. */
73
+ narrowed?: {
74
+ files: number;
75
+ engines: DvalinScannerId[];
76
+ };
51
77
  };
78
+ /**
79
+ * The CodeQL languages present in a tree, in a fixed order, and the languages
80
+ * present that need a build.
81
+ */
82
+ export declare function detectCodeqlLanguages(root: string): Promise<{
83
+ languages: string[];
84
+ needsBuild: string[];
85
+ truncated: boolean;
86
+ }>;
52
87
  export declare function listDvalinScanners(): Promise<DvalinScannerDescriptor[]>;
53
88
  /**
54
89
  * Return a reviewable install plan. Dvalin never downloads or executes an
@@ -57,8 +92,22 @@ export declare function listDvalinScanners(): Promise<DvalinScannerDescriptor[]>
57
92
  export declare function dvalinScannerInstallPlan(id: DvalinScannerId): DvalinScannerInstallPlan;
58
93
  /** Execute a previously reviewed, fixed installer argv under the resolved policy. */
59
94
  export declare function installDvalinScanner(cwd: string, id: DvalinScannerId): Promise<void>;
60
- export declare function runDvalinScanSuite(cwd: string, options?: {
95
+ /** Above this many files a narrowed scan gains little, and argv limits start to bite. */
96
+ export declare const MAX_NARROWED_FILES = 200;
97
+ export type DvalinScanSuiteOptions = {
61
98
  scanners?: DvalinScannerId[];
62
99
  timeoutMs?: number;
100
+ /** Report only on these lines (a diff). Filters every engine's results. */
63
101
  scope?: DiffScope;
64
- }): Promise<DvalinScanSuiteResult>;
102
+ /**
103
+ * Analyse only these workspace-relative files, with the engines that work
104
+ * file by file; the rest scan in full and are not filtered. Used between fix
105
+ * rounds. A narrowed result is never a verdict — callers confirm with a full
106
+ * scan before deciding anything.
107
+ */
108
+ narrow?: {
109
+ files: string[];
110
+ };
111
+ };
112
+ export declare function runDvalinScanSuite(cwd: string, options?: DvalinScanSuiteOptions): Promise<DvalinScanSuiteResult>;
113
+ export declare function findExecutable(command: string): Promise<string | undefined>;