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
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { governedProviderFetch } from './egress.js';
|
|
2
|
+
import { chatWithRetry, ProviderHttpError, ProviderStreamError, providerStreamError, retryAfterMs } from './retry.js';
|
|
2
3
|
export function normalizeAnthropicUsage(usage) {
|
|
3
4
|
const miss = usage.input_tokens ?? 0;
|
|
4
5
|
const cached = usage.cache_read_input_tokens ?? 0;
|
|
@@ -54,7 +55,7 @@ export function createAnthropicProvider(config) {
|
|
|
54
55
|
}, request, name, baseUrl, model);
|
|
55
56
|
if (!response.ok) {
|
|
56
57
|
const text = await response.text();
|
|
57
|
-
throw new
|
|
58
|
+
throw new ProviderHttpError(response.status, text, retryAfterMs(response.headers));
|
|
58
59
|
}
|
|
59
60
|
return response;
|
|
60
61
|
}
|
|
@@ -92,6 +93,7 @@ export function createAnthropicProvider(config) {
|
|
|
92
93
|
let finishReason;
|
|
93
94
|
let usage = {};
|
|
94
95
|
let buffer = '';
|
|
96
|
+
let stopped = false;
|
|
95
97
|
try {
|
|
96
98
|
while (true) {
|
|
97
99
|
const { done, value } = await reader.read();
|
|
@@ -142,12 +144,22 @@ export function createAnthropicProvider(config) {
|
|
|
142
144
|
finishReason = delta?.stop_reason ?? finishReason;
|
|
143
145
|
usage = mergeAnthropicUsage(usage, payload.usage);
|
|
144
146
|
}
|
|
147
|
+
else if (type === 'message_stop') {
|
|
148
|
+
stopped = true;
|
|
149
|
+
}
|
|
150
|
+
else if (type === 'error') {
|
|
151
|
+
throw providerStreamError(payload.error);
|
|
152
|
+
}
|
|
145
153
|
}
|
|
146
154
|
}
|
|
147
155
|
}
|
|
148
156
|
finally {
|
|
149
157
|
reader.releaseLock();
|
|
150
158
|
}
|
|
159
|
+
// A connection that closes cleanly mid-message ends the read loop the same
|
|
160
|
+
// way a finished reply does; only message_stop says the reply is complete.
|
|
161
|
+
if (!stopped)
|
|
162
|
+
throw new ProviderStreamError('incomplete_stream', 'the stream ended before message_stop', true);
|
|
151
163
|
const toolCalls = [...toolBuffers.values()]
|
|
152
164
|
.filter(tool => tool.name)
|
|
153
165
|
.map((tool) => ({ id: tool.id, name: tool.name, arguments: tool.json || '{}' }));
|
|
@@ -162,7 +174,7 @@ export function createAnthropicProvider(config) {
|
|
|
162
174
|
return {
|
|
163
175
|
name,
|
|
164
176
|
chat(request) {
|
|
165
|
-
return request.onDelta ? chatStreaming(
|
|
177
|
+
return chatWithRetry(request, r => (r.onDelta ? chatStreaming(r) : chatNonStreaming(r)), config.retry);
|
|
166
178
|
},
|
|
167
179
|
};
|
|
168
180
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../src/providers/anthropic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AA+
|
|
1
|
+
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../src/providers/anthropic.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { governedProviderFetch } from './egress.js';
|
|
2
|
+
import { chatWithRetry, ProviderHttpError, providerStreamError, retryAfterMs } from './retry.js';
|
|
2
3
|
export function normalizeOpenAIUsage(usage) {
|
|
3
4
|
const cachedInputTokens = usage.prompt_cache_hit_tokens ?? usage.prompt_tokens_details?.cached_tokens;
|
|
4
5
|
const cacheMissInputTokens = usage.prompt_cache_miss_tokens ?? (cachedInputTokens !== undefined ? Math.max(0, usage.prompt_tokens - cachedInputTokens) : undefined);
|
|
@@ -64,7 +65,7 @@ export function createOpenAICompatibleProvider(config) {
|
|
|
64
65
|
}, request, config.name ?? 'openai-compatible', baseUrl, model);
|
|
65
66
|
if (!response.ok) {
|
|
66
67
|
const text = await response.text();
|
|
67
|
-
throw new
|
|
68
|
+
throw new ProviderHttpError(response.status, text, retryAfterMs(response.headers));
|
|
68
69
|
}
|
|
69
70
|
if (!response.body)
|
|
70
71
|
throw new Error('No response body for streaming');
|
|
@@ -96,6 +97,9 @@ export function createOpenAICompatibleProvider(config) {
|
|
|
96
97
|
catch {
|
|
97
98
|
continue;
|
|
98
99
|
}
|
|
100
|
+
// Some gateways report a failure as an `error` chunk inside a 200 stream.
|
|
101
|
+
if (chunk.error)
|
|
102
|
+
throw providerStreamError(chunk.error);
|
|
99
103
|
// Capture usage (sent in last chunk with stream_options.include_usage)
|
|
100
104
|
if (chunk.usage) {
|
|
101
105
|
const u = chunk.usage;
|
|
@@ -159,7 +163,7 @@ export function createOpenAICompatibleProvider(config) {
|
|
|
159
163
|
}, request, config.name ?? 'openai-compatible', baseUrl, model);
|
|
160
164
|
if (!response.ok) {
|
|
161
165
|
const text = await response.text();
|
|
162
|
-
throw new
|
|
166
|
+
throw new ProviderHttpError(response.status, text, retryAfterMs(response.headers));
|
|
163
167
|
}
|
|
164
168
|
const data = (await response.json());
|
|
165
169
|
const resultChoice = data.choices[0];
|
|
@@ -181,10 +185,7 @@ export function createOpenAICompatibleProvider(config) {
|
|
|
181
185
|
};
|
|
182
186
|
}
|
|
183
187
|
async function chat(request) {
|
|
184
|
-
|
|
185
|
-
return chatStreaming(request);
|
|
186
|
-
}
|
|
187
|
-
return chatNonStreaming(request);
|
|
188
|
+
return chatWithRetry(request, r => (r.onDelta ? chatStreaming(r) : chatNonStreaming(r)), config.retry);
|
|
188
189
|
}
|
|
189
190
|
return { name: config.name ?? 'openai-compatible', chat };
|
|
190
191
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiCompatible.js","sourceRoot":"","sources":["../../src/providers/openaiCompatible.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"openaiCompatible.js","sourceRoot":"","sources":["../../src/providers/openaiCompatible.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAcjG,MAAM,UAAU,oBAAoB,CAAC,KAAkB;IACrD,MAAM,iBAAiB,GAAG,KAAK,CAAC,uBAAuB,IAAI,KAAK,CAAC,qBAAqB,EAAE,aAAa,CAAC;IACtG,MAAM,oBAAoB,GAAG,KAAK,CAAC,wBAAwB,IAAI,CAC7D,iBAAiB,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,aAAa,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC,SAAS,CACnG,CAAC;IACF,OAAO;QACL,WAAW,EAAE,KAAK,CAAC,aAAa;QAChC,YAAY,EAAE,KAAK,CAAC,iBAAiB;QACrC,iBAAiB;QACjB,oBAAoB;KACrB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,MAAoB;IACjE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,2BAA2B,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,QAAQ,CAAC;IAEvC,SAAS,SAAS,CAAC,OAAoB,EAAE,MAAe;QACtD,MAAM,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACpD,MAAM,CAAC,GAA4B,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;YAC5E,IAAI,GAAG,CAAC,YAAY;gBAAE,CAAC,CAAC,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;YACxD,IAAI,GAAG,CAAC,IAAI;gBAAE,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YAChC,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChD,CAAC,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;oBACvC,EAAE,EAAE,EAAE,CAAC,EAAE;oBACT,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,SAAS,EAAE;iBACrD,CAAC,CAAC,CAAC;YACN,CAAC;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAA4B;YACvC,KAAK;YACL,QAAQ,EAAE;gBACR,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAiB,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjF,GAAG,kBAAkB;aACtB;YACD,UAAU,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI;YACrC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,GAAG;YACvC,MAAM;SACP,CAAC;QAEF,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9C,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACtC,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE;aACjF,CAAC,CAAC,CAAC;QACN,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,cAAc,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;QACnD,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,SAAS,WAAW;QAClB,OAAO;YACL,cAAc,EAAE,kBAAkB;YAClC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACvE,CAAC;IACJ,CAAC;IAED,KAAK,UAAU,aAAa,CAAC,OAAoB;QAC/C,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,GAAG,OAAO,mBAAmB,EAAE;YAC1E,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,WAAW,EAAE;YACtB,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC;YAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,IAAI,mBAAmB,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAEhE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,MAAM,IAAI,iBAAiB,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QACrF,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAEtE,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAElC,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,MAAM,eAAe,GAAG,IAAI,GAAG,EAA2D,CAAC;QAC3F,IAAI,KAA8B,CAAC;QACnC,IAAI,YAAgC,CAAC;QAErC,IAAI,CAAC;YACH,OAAO,IAAI,EAAE,CAAC;gBACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC5C,IAAI,IAAI;oBAAE,MAAM;gBAEhB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;gBACtD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACrC,UAAU,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;gBAE/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;oBACzB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;wBAAE,SAAS;oBACzC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBACjC,IAAI,GAAG,KAAK,QAAQ;wBAAE,SAAS;oBAE/B,IAAI,KAA8B,CAAC;oBACnC,IAAI,CAAC;wBACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAA4B,CAAC;oBACrD,CAAC;oBAAC,MAAM,CAAC;wBACP,SAAS;oBACX,CAAC;oBACD,0EAA0E;oBAC1E,IAAI,KAAK,CAAC,KAAK;wBAAE,MAAM,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAExD,uEAAuE;oBACvE,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;wBAChB,MAAM,CAAC,GAAG,KAAK,CAAC,KAAoB,CAAC;wBACrC,KAAK,GAAG,CAAC,CAAC;oBACZ,CAAC;oBAED,MAAM,OAAO,GAAG,KAAK,CAAC,OAGR,CAAC;oBACf,MAAM,MAAM,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;oBAC5B,IAAI,MAAM,EAAE,aAAa;wBAAE,YAAY,GAAG,MAAM,CAAC,aAAa,CAAC;oBAC/D,MAAM,KAAK,GAAG,MAAM,EAAE,KAAK,CAAC;oBAC5B,IAAI,CAAC,KAAK;wBAAE,SAAS;oBAErB,sBAAsB;oBACtB,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;wBAClB,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC;wBACzB,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBACnC,CAAC;oBAED,iCAAiC;oBACjC,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;wBACrB,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;4BAClC,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;4BACrB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gCAC9B,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;4BAChE,CAAC;4BACD,MAAM,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;4BACtC,IAAI,EAAE,CAAC,EAAE;gCAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;4BAC1B,IAAI,EAAE,CAAC,QAAQ,EAAE,IAAI;gCAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;4BACpD,IAAI,EAAE,CAAC,QAAQ,EAAE,SAAS;gCAAE,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;wBACrE,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,WAAW,EAAE,CAAC;QACvB,CAAC;QAED,MAAM,SAAS,GAAe,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC;aACxD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;aACvB,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAChB,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,aAAa,CAAC,EAAE;YAC9B,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,SAAS,EAAE,GAAG,CAAC,SAAS;SACzB,CAAC,CAAC,CAAC;QAEN,OAAO;YACL,OAAO;YACP,KAAK;YACL,YAAY;YACZ,SAAS,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YACvD,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;SACvD,CAAC;IACJ,CAAC;IAED,KAAK,UAAU,gBAAgB,CAAC,OAAoB;QAClD,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,GAAG,OAAO,mBAAmB,EAAE;YAC1E,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,WAAW,EAAE;YACtB,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC;YAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,IAAI,mBAAmB,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAEhE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,MAAM,IAAI,iBAAiB,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QACrF,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAOlC,CAAC;QAEF,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,YAAY,EAAE,OAAO,CAAC;QACrC,IAAI,SAAiC,CAAC;QACtC,IAAI,MAAM,EAAE,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvD,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBACvC,EAAE,EAAE,EAAE,CAAC,EAAE;gBACT,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI;gBACtB,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS;aACjC,CAAC,CAAC,CAAC;QACN,CAAC;QAED,OAAO;YACL,OAAO,EAAE,MAAM,EAAE,OAAO,IAAI,EAAE;YAC9B,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,YAAY,EAAE,YAAY,EAAE,aAAa,IAAI,SAAS;YACtD,SAAS;YACT,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;SACjE,CAAC;IACJ,CAAC;IAED,KAAK,UAAU,IAAI,CAAC,OAAoB;QACtC,OAAO,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACzG,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,mBAAmB,EAAE,IAAI,EAAE,CAAC;AAC5D,CAAC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import type { ChatRequest, ChatResponse, RetryOptions } from './types.js';
|
|
2
|
+
/** The provider answered with a non-2xx status. */
|
|
3
|
+
export declare class ProviderHttpError extends Error {
|
|
4
|
+
readonly status: number;
|
|
5
|
+
readonly body: string;
|
|
6
|
+
readonly retryAfterMs?: number | undefined;
|
|
7
|
+
constructor(status: number, body: string, retryAfterMs?: number | undefined);
|
|
8
|
+
}
|
|
9
|
+
/** The provider reported an error, or stopped early, inside a stream that had started. */
|
|
10
|
+
export declare class ProviderStreamError extends Error {
|
|
11
|
+
readonly errorType: string;
|
|
12
|
+
readonly retryable: boolean;
|
|
13
|
+
constructor(errorType: string, detail: string, retryable: boolean);
|
|
14
|
+
}
|
|
15
|
+
/** The error for an `error` payload found inside an event stream. */
|
|
16
|
+
export declare function providerStreamError(error: unknown): ProviderStreamError;
|
|
17
|
+
/** `retry-after-ms`, or `retry-after` in seconds or as an HTTP date. */
|
|
18
|
+
export declare function retryAfterMs(headers: Headers): number | undefined;
|
|
19
|
+
/** The provider refused the request because the prompt exceeds the model's context window. */
|
|
20
|
+
export declare function isContextOverflowError(err: unknown): boolean;
|
|
21
|
+
export declare function isRetryableProviderError(err: unknown): boolean;
|
|
22
|
+
/**
|
|
23
|
+
* Run `attempt`, retrying transient failures with jittered exponential backoff.
|
|
24
|
+
* `canRetry` lets a streaming caller refuse once output has reached its consumer.
|
|
25
|
+
*/
|
|
26
|
+
export declare function withProviderRetry<T>(attempt: () => Promise<T>, signal: AbortSignal | undefined, options?: RetryOptions, canRetry?: () => boolean): Promise<T>;
|
|
27
|
+
/**
|
|
28
|
+
* One adapter call with retries. A streamed call is retried only until its
|
|
29
|
+
* first delta reaches the caller: after that a retry would repeat output the
|
|
30
|
+
* caller has already shown.
|
|
31
|
+
*/
|
|
32
|
+
export declare function chatWithRetry(request: ChatRequest, once: (request: ChatRequest) => Promise<ChatResponse>, options?: RetryOptions): Promise<ChatResponse>;
|
|
@@ -0,0 +1,150 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Transient provider failures -- a rate limit, an overloaded API, a dropped
|
|
3
|
+
* connection -- are retried with backoff instead of ending the turn. Every
|
|
4
|
+
* attempt is its own `governedProviderFetch` call, so the egress check and the
|
|
5
|
+
* `provider_request` audit record apply to each try; nothing here touches the
|
|
6
|
+
* network itself.
|
|
7
|
+
*/
|
|
8
|
+
const DEFAULT_MAX_RETRIES = 3;
|
|
9
|
+
const DEFAULT_BASE_DELAY_MS = 1_000;
|
|
10
|
+
const DEFAULT_MAX_DELAY_MS = 30_000;
|
|
11
|
+
/** Timeout, rate limit, server error, and Anthropic's 529 overload. */
|
|
12
|
+
const RETRYABLE_STATUS = new Set([408, 429, 500, 502, 503, 504, 529]);
|
|
13
|
+
const RETRYABLE_STREAM_ERROR = /overloaded|rate.?limit|server.?error|api_error|timeout|unavailable/i;
|
|
14
|
+
const NETWORK_ERROR_CODES = new Set([
|
|
15
|
+
'ECONNRESET',
|
|
16
|
+
'ECONNREFUSED',
|
|
17
|
+
'ETIMEDOUT',
|
|
18
|
+
'EPIPE',
|
|
19
|
+
'EAI_AGAIN',
|
|
20
|
+
'ENETUNREACH',
|
|
21
|
+
'UND_ERR_SOCKET',
|
|
22
|
+
'UND_ERR_CONNECT_TIMEOUT',
|
|
23
|
+
'UND_ERR_HEADERS_TIMEOUT',
|
|
24
|
+
'UND_ERR_BODY_TIMEOUT',
|
|
25
|
+
]);
|
|
26
|
+
/** The provider answered with a non-2xx status. */
|
|
27
|
+
export class ProviderHttpError extends Error {
|
|
28
|
+
status;
|
|
29
|
+
body;
|
|
30
|
+
retryAfterMs;
|
|
31
|
+
constructor(status, body, retryAfterMs) {
|
|
32
|
+
super(`Provider API error ${status}: ${body}`);
|
|
33
|
+
this.status = status;
|
|
34
|
+
this.body = body;
|
|
35
|
+
this.retryAfterMs = retryAfterMs;
|
|
36
|
+
this.name = 'ProviderHttpError';
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
/** The provider reported an error, or stopped early, inside a stream that had started. */
|
|
40
|
+
export class ProviderStreamError extends Error {
|
|
41
|
+
errorType;
|
|
42
|
+
retryable;
|
|
43
|
+
constructor(errorType, detail, retryable) {
|
|
44
|
+
super(`Provider stream error (${errorType}): ${detail}`);
|
|
45
|
+
this.errorType = errorType;
|
|
46
|
+
this.retryable = retryable;
|
|
47
|
+
this.name = 'ProviderStreamError';
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
/** The error for an `error` payload found inside an event stream. */
|
|
51
|
+
export function providerStreamError(error) {
|
|
52
|
+
const detail = (error && typeof error === 'object' ? error : {});
|
|
53
|
+
const type = String(detail.type ?? detail.code ?? 'error');
|
|
54
|
+
const message = typeof detail.message === 'string' ? detail.message : JSON.stringify(error);
|
|
55
|
+
return new ProviderStreamError(type, message, RETRYABLE_STREAM_ERROR.test(`${type} ${String(detail.code ?? '')}`));
|
|
56
|
+
}
|
|
57
|
+
/** `retry-after-ms`, or `retry-after` in seconds or as an HTTP date. */
|
|
58
|
+
export function retryAfterMs(headers) {
|
|
59
|
+
const ms = headers.get('retry-after-ms');
|
|
60
|
+
if (ms !== null && Number.isFinite(Number(ms)))
|
|
61
|
+
return Math.max(0, Number(ms));
|
|
62
|
+
const value = headers.get('retry-after');
|
|
63
|
+
if (value === null)
|
|
64
|
+
return undefined;
|
|
65
|
+
if (Number.isFinite(Number(value)))
|
|
66
|
+
return Math.max(0, Number(value) * 1_000);
|
|
67
|
+
const date = Date.parse(value);
|
|
68
|
+
return Number.isNaN(date) ? undefined : Math.max(0, date - Date.now());
|
|
69
|
+
}
|
|
70
|
+
const CONTEXT_OVERFLOW = /context.?length|context window|maximum context|prompt is too long|too many tokens|input is too long|reduce the length/i;
|
|
71
|
+
/** The provider refused the request because the prompt exceeds the model's context window. */
|
|
72
|
+
export function isContextOverflowError(err) {
|
|
73
|
+
return err instanceof ProviderHttpError && (err.status === 400 || err.status === 413) && CONTEXT_OVERFLOW.test(err.body);
|
|
74
|
+
}
|
|
75
|
+
export function isRetryableProviderError(err) {
|
|
76
|
+
if (err instanceof ProviderHttpError)
|
|
77
|
+
return RETRYABLE_STATUS.has(err.status);
|
|
78
|
+
if (err instanceof ProviderStreamError)
|
|
79
|
+
return err.retryable;
|
|
80
|
+
if (!(err instanceof Error))
|
|
81
|
+
return false;
|
|
82
|
+
const code = err.code ?? err.cause?.code;
|
|
83
|
+
if (typeof code === 'string')
|
|
84
|
+
return NETWORK_ERROR_CODES.has(code);
|
|
85
|
+
// undici reports a refused or dropped connection as `fetch failed` / `terminated`.
|
|
86
|
+
return err instanceof TypeError && /fetch failed|terminated|network/i.test(err.message);
|
|
87
|
+
}
|
|
88
|
+
/**
|
|
89
|
+
* Run `attempt`, retrying transient failures with jittered exponential backoff.
|
|
90
|
+
* `canRetry` lets a streaming caller refuse once output has reached its consumer.
|
|
91
|
+
*/
|
|
92
|
+
export async function withProviderRetry(attempt, signal, options = {}, canRetry = () => true) {
|
|
93
|
+
const maxRetries = options.maxRetries ?? DEFAULT_MAX_RETRIES;
|
|
94
|
+
for (let retry = 0;; retry++) {
|
|
95
|
+
try {
|
|
96
|
+
return await attempt();
|
|
97
|
+
}
|
|
98
|
+
catch (err) {
|
|
99
|
+
if (signal?.aborted || retry >= maxRetries || !canRetry() || !isRetryableProviderError(err))
|
|
100
|
+
throw err;
|
|
101
|
+
await sleep(backoffMs(err, retry, options), signal);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
/**
|
|
106
|
+
* One adapter call with retries. A streamed call is retried only until its
|
|
107
|
+
* first delta reaches the caller: after that a retry would repeat output the
|
|
108
|
+
* caller has already shown.
|
|
109
|
+
*/
|
|
110
|
+
export function chatWithRetry(request, once, options) {
|
|
111
|
+
const onDelta = request.onDelta;
|
|
112
|
+
if (!onDelta)
|
|
113
|
+
return withProviderRetry(() => once(request), request.signal, options);
|
|
114
|
+
let emitted = false;
|
|
115
|
+
const tracked = {
|
|
116
|
+
...request,
|
|
117
|
+
onDelta: delta => {
|
|
118
|
+
emitted = true;
|
|
119
|
+
onDelta(delta);
|
|
120
|
+
},
|
|
121
|
+
};
|
|
122
|
+
return withProviderRetry(() => once(tracked), request.signal, options, () => !emitted);
|
|
123
|
+
}
|
|
124
|
+
function backoffMs(err, retry, options) {
|
|
125
|
+
const maxDelay = options.maxDelayMs ?? DEFAULT_MAX_DELAY_MS;
|
|
126
|
+
const hinted = err instanceof ProviderHttpError ? err.retryAfterMs : undefined;
|
|
127
|
+
if (hinted !== undefined)
|
|
128
|
+
return Math.min(hinted, maxDelay);
|
|
129
|
+
const exponential = Math.min(maxDelay, (options.baseDelayMs ?? DEFAULT_BASE_DELAY_MS) * 2 ** retry);
|
|
130
|
+
// Equal jitter, so runs that failed together do not all retry together.
|
|
131
|
+
return exponential / 2 + Math.random() * (exponential / 2);
|
|
132
|
+
}
|
|
133
|
+
function sleep(ms, signal) {
|
|
134
|
+
return new Promise((resolve, reject) => {
|
|
135
|
+
if (signal?.aborted) {
|
|
136
|
+
reject(signal.reason);
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
139
|
+
const onAbort = () => {
|
|
140
|
+
clearTimeout(timer);
|
|
141
|
+
reject(signal.reason);
|
|
142
|
+
};
|
|
143
|
+
const timer = setTimeout(() => {
|
|
144
|
+
signal?.removeEventListener('abort', onAbort);
|
|
145
|
+
resolve();
|
|
146
|
+
}, ms);
|
|
147
|
+
signal?.addEventListener('abort', onAbort, { once: true });
|
|
148
|
+
});
|
|
149
|
+
}
|
|
150
|
+
//# sourceMappingURL=retry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/providers/retry.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ const TRUSTED_PROVIDER_BASE_URLS = {
|
|
|
15
15
|
moonshot: ['https://api.moonshot.cn/v1'],
|
|
16
16
|
zhipu: ['https://open.bigmodel.cn/api/paas/v4'],
|
|
17
17
|
ollama: ['http://localhost:11434/v1', 'http://127.0.0.1:11434/v1'],
|
|
18
|
-
'cc-switch': ['http://
|
|
18
|
+
'cc-switch': ['http://127.0.0.1:15721/v1', 'http://localhost:15721/v1'],
|
|
19
19
|
gateway: ['http://localhost:3456/v1', 'http://127.0.0.1:3456/v1'],
|
|
20
20
|
};
|
|
21
21
|
export function requireTrustedProviderBaseUrl(provider, baseUrl) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trustedBaseUrls.js","sourceRoot":"","sources":["../../src/providers/trustedBaseUrls.ts"],"names":[],"mappings":"AAAA,MAAM,0BAA0B,GAAsC;IACpE,QAAQ,EAAE,CAAC,6BAA6B,CAAC;IACzC,MAAM,EAAE,CAAC,2BAA2B,CAAC;IACrC,SAAS,EAAE,CAAC,8BAA8B,CAAC;IAC3C,MAAM,EAAE,CAAC,yDAAyD,CAAC;IACnE,sBAAsB,EAAE,CAAC,8BAA8B,CAAC;IACxD,GAAG,EAAE,CAAC,qBAAqB,CAAC;IAC5B,OAAO,EAAE,CAAC,2BAA2B,CAAC;IACtC,IAAI,EAAE,CAAC,gCAAgC,CAAC;IACxC,QAAQ,EAAE,CAAC,6BAA6B,CAAC;IACzC,SAAS,EAAE,CAAC,uCAAuC,CAAC;IACpD,UAAU,EAAE,CAAC,2BAA2B,CAAC;IACzC,UAAU,EAAE,CAAC,8BAA8B,CAAC;IAC5C,IAAI,EAAE,CAAC,mDAAmD,CAAC;IAC3D,QAAQ,EAAE,CAAC,4BAA4B,CAAC;IACxC,KAAK,EAAE,CAAC,sCAAsC,CAAC;IAC/C,MAAM,EAAE,CAAC,2BAA2B,EAAE,2BAA2B,CAAC;IAClE,WAAW,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"trustedBaseUrls.js","sourceRoot":"","sources":["../../src/providers/trustedBaseUrls.ts"],"names":[],"mappings":"AAAA,MAAM,0BAA0B,GAAsC;IACpE,QAAQ,EAAE,CAAC,6BAA6B,CAAC;IACzC,MAAM,EAAE,CAAC,2BAA2B,CAAC;IACrC,SAAS,EAAE,CAAC,8BAA8B,CAAC;IAC3C,MAAM,EAAE,CAAC,yDAAyD,CAAC;IACnE,sBAAsB,EAAE,CAAC,8BAA8B,CAAC;IACxD,GAAG,EAAE,CAAC,qBAAqB,CAAC;IAC5B,OAAO,EAAE,CAAC,2BAA2B,CAAC;IACtC,IAAI,EAAE,CAAC,gCAAgC,CAAC;IACxC,QAAQ,EAAE,CAAC,6BAA6B,CAAC;IACzC,SAAS,EAAE,CAAC,uCAAuC,CAAC;IACpD,UAAU,EAAE,CAAC,2BAA2B,CAAC;IACzC,UAAU,EAAE,CAAC,8BAA8B,CAAC;IAC5C,IAAI,EAAE,CAAC,mDAAmD,CAAC;IAC3D,QAAQ,EAAE,CAAC,4BAA4B,CAAC;IACxC,KAAK,EAAE,CAAC,sCAAsC,CAAC;IAC/C,MAAM,EAAE,CAAC,2BAA2B,EAAE,2BAA2B,CAAC;IAClE,WAAW,EAAE,CAAC,2BAA2B,EAAE,2BAA2B,CAAC;IACvE,OAAO,EAAE,CAAC,0BAA0B,EAAE,0BAA0B,CAAC;CAClE,CAAC;AAEF,MAAM,UAAU,6BAA6B,CAAC,QAAgB,EAAE,OAA2B;IACzF,MAAM,OAAO,GAAG,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,iHAAiH,CAAC,CAAC;IACrI,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE;QAAE,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;IACzE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,2CAA2C,QAAQ,iCAAiC,CAAC,CAAC;IACxG,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,WAAW,CAAC,OAAe,EAAE,QAAgB;IACpD,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5B,OAAO,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ;YAC9B,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;YACjB,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACpE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAa;IACtC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC1C,OAAO,OAAO,IAAI,GAAG,CAAC;AACxB,CAAC"}
|
|
@@ -1,9 +1,19 @@
|
|
|
1
1
|
import type { AuditSink } from '../audit/log.js';
|
|
2
2
|
import type { ResolvedPolicy } from '../core/policy.js';
|
|
3
|
+
/** How an adapter retries transient provider failures. The defaults suit live use. */
|
|
4
|
+
export type RetryOptions = {
|
|
5
|
+
/** Retries after the first attempt (default 3). */
|
|
6
|
+
maxRetries?: number;
|
|
7
|
+
/** First backoff delay before jitter (default 1s); doubles on each retry. */
|
|
8
|
+
baseDelayMs?: number;
|
|
9
|
+
/** Ceiling for one delay, including a provider's retry-after hint (default 30s). */
|
|
10
|
+
maxDelayMs?: number;
|
|
11
|
+
};
|
|
3
12
|
export type ProviderConfig = {
|
|
4
13
|
apiKey?: string;
|
|
5
14
|
baseUrl?: string;
|
|
6
15
|
model?: string;
|
|
16
|
+
retry?: RetryOptions;
|
|
7
17
|
};
|
|
8
18
|
export type CacheControl = {
|
|
9
19
|
type: 'ephemeral';
|
|
@@ -3,7 +3,7 @@ import type { RemediationFinding } from './sarif.js';
|
|
|
3
3
|
import type { SecurityCheckEvidence } from '../security/workflow.js';
|
|
4
4
|
export declare const VERIFICATION_MARKER = "DVALIN_VERIFICATION_PASSED";
|
|
5
5
|
export declare function buildAutomatedFixPrompt(findings: RemediationFinding[], worktreeContext?: string): string;
|
|
6
|
-
export declare function buildDraftPrPrompt(findings: RemediationFinding[]): string;
|
|
6
|
+
export declare function buildDraftPrPrompt(findings: RemediationFinding[], recordPath?: string): string;
|
|
7
7
|
export type VerificationGate = {
|
|
8
8
|
passed: boolean;
|
|
9
9
|
reasons: string[];
|
|
@@ -29,13 +29,14 @@ export function buildAutomatedFixPrompt(findings, worktreeContext) {
|
|
|
29
29
|
'Return a concise summary of confirmed fixes, rejected findings, changed files, and checks run.',
|
|
30
30
|
].filter(Boolean).join('\n');
|
|
31
31
|
}
|
|
32
|
-
export function buildDraftPrPrompt(findings) {
|
|
32
|
+
export function buildDraftPrPrompt(findings, recordPath) {
|
|
33
33
|
return [
|
|
34
34
|
'The independent Dvalin verification gate passed. Publish this isolated remediation branch as a draft pull request.',
|
|
35
35
|
'',
|
|
36
36
|
`Remediated findings: ${findings.map(finding => `${finding.ruleId} (${finding.path})`).join('; ')}`,
|
|
37
37
|
'',
|
|
38
38
|
'Re-check git status and diff, commit only the remediation changes, push the current branch, and create a draft PR with gh.',
|
|
39
|
+
...(recordPath ? [`Include ${recordPath} in the commit unchanged: it is the Verified Fix Record CI re-executes with \`reverify\`, and editing it invalidates it.`] : []),
|
|
39
40
|
'The PR body must include vulnerability impact, source validation, changed files, tests and scanner evidence, and remaining risk.',
|
|
40
41
|
'Do not merge the PR and do not mark it ready for review. Return the draft PR URL.',
|
|
41
42
|
].join('\n');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automate.js","sourceRoot":"","sources":["../../src/remediation/automate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,MAAM,CAAC,MAAM,mBAAmB,GAAG,4BAA4B,CAAC;AAEhE,SAAS,UAAU,CAAC,OAA2B;IAC7C,OAAO,GAAG,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,IAAI,EAAE,CAAC;AACjE,CAAC;AAED,SAAS,cAAc,CAAC,OAA2B;IACjD,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;IAChE,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACzC,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnF,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,QAA8B,EAAE,eAAwB;IAC9F,OAAO;QACL,yEAAyE;QACzE,eAAe,IAAI,EAAE;QACrB,EAAE;QACF,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC;YAClC,GAAG,KAAK,GAAG,CAAC,KAAK,OAAO,CAAC,MAAM,MAAM,OAAO,CAAC,MAAM,EAAE;YACrD,MAAM,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;YACvE,MAAM,OAAO,CAAC,OAAO,EAAE;SACxB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,EAAE;QACF,oBAAoB;QACpB,2KAA2K;QAC3K,8KAA8K;QAC9K,kIAAkI;QAClI,kFAAkF;QAClF,yEAAyE;QACzE,gGAAgG;KACjG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,QAA8B;
|
|
1
|
+
{"version":3,"file":"automate.js","sourceRoot":"","sources":["../../src/remediation/automate.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,6 +59,7 @@ export async function upsertRemediationCases(input) {
|
|
|
59
59
|
path: finding.path,
|
|
60
60
|
startLine: finding.startLine,
|
|
61
61
|
tags: finding.tags,
|
|
62
|
+
external: finding.external,
|
|
62
63
|
prompt: previous?.prompt ?? finding.prompt,
|
|
63
64
|
status: previous?.status ?? 'open',
|
|
64
65
|
worktreeCwd: previous?.worktreeCwd,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cases.js","sourceRoot":"","sources":["../../src/remediation/cases.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"cases.js","sourceRoot":"","sources":["../../src/remediation/cases.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { DvalinScanSuiteResult } from './scannerSuite.js';
|
|
2
|
+
/**
|
|
3
|
+
* Emit a scan as a GitLab Code Quality report.
|
|
4
|
+
*
|
|
5
|
+
* GitLab's free tier renders this format in the merge request widget and on
|
|
6
|
+
* the diff, the way GitHub renders SARIF; its own SARIF ingestion needs the
|
|
7
|
+
* Ultimate tier. The fingerprint is the one the baseline uses, so GitLab's
|
|
8
|
+
* "new in this merge request" comparison agrees with Dvalin's.
|
|
9
|
+
*
|
|
10
|
+
* Format: https://docs.gitlab.com/ci/testing/code_quality/#code-quality-report-format
|
|
11
|
+
*/
|
|
12
|
+
export type CodeQualitySeverity = 'info' | 'minor' | 'major' | 'critical' | 'blocker';
|
|
13
|
+
export type CodeQualityIssue = {
|
|
14
|
+
description: string;
|
|
15
|
+
check_name: string;
|
|
16
|
+
fingerprint: string;
|
|
17
|
+
severity: CodeQualitySeverity;
|
|
18
|
+
location: {
|
|
19
|
+
path: string;
|
|
20
|
+
lines: {
|
|
21
|
+
begin: number;
|
|
22
|
+
};
|
|
23
|
+
};
|
|
24
|
+
};
|
|
25
|
+
export declare function buildGitlabCodeQuality(result: DvalinScanSuiteResult, root: string): CodeQualityIssue[];
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import path from 'node:path';
|
|
2
|
+
import { findingFingerprint, severityOfFinding } from '../security/contracts.js';
|
|
3
|
+
const SEVERITY = {
|
|
4
|
+
critical: 'blocker',
|
|
5
|
+
high: 'critical',
|
|
6
|
+
medium: 'major',
|
|
7
|
+
low: 'minor',
|
|
8
|
+
};
|
|
9
|
+
export function buildGitlabCodeQuality(result, root) {
|
|
10
|
+
return result.findings.map(finding => {
|
|
11
|
+
const relative = path.isAbsolute(finding.path) ? path.relative(root, finding.path) : finding.path;
|
|
12
|
+
return {
|
|
13
|
+
description: `${finding.ruleName ?? finding.ruleId}: ${finding.message}`,
|
|
14
|
+
check_name: finding.ruleId,
|
|
15
|
+
fingerprint: findingFingerprint(finding),
|
|
16
|
+
severity: SEVERITY[severityOfFinding(finding)],
|
|
17
|
+
location: {
|
|
18
|
+
path: relative.split(path.sep).join('/'),
|
|
19
|
+
lines: { begin: finding.startLine && finding.startLine > 0 ? finding.startLine : 1 },
|
|
20
|
+
},
|
|
21
|
+
};
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=codeQualityExport.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codeQualityExport.js","sourceRoot":"","sources":["../../src/remediation/codeQualityExport.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAyB,MAAM,0BAA0B,CAAC;AAwBxG,MAAM,QAAQ,GAAkD;IAC9D,QAAQ,EAAE,SAAS;IACnB,IAAI,EAAE,UAAU;IAChB,MAAM,EAAE,OAAO;IACf,GAAG,EAAE,OAAO;CACb,CAAC;AAEF,MAAM,UAAU,sBAAsB,CAAC,MAA6B,EAAE,IAAY;IAChF,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;QAClG,OAAO;YACL,WAAW,EAAE,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,OAAO,EAAE;YACxE,UAAU,EAAE,OAAO,CAAC,MAAM;YAC1B,WAAW,EAAE,kBAAkB,CAAC,OAAO,CAAC;YACxC,QAAQ,EAAE,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAC9C,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBACxC,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;aACrF;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import type { SecurityCoverageStatus } from '../security/contracts.js';
|
|
2
|
+
import { type RemediationFinding } from './sarif.js';
|
|
3
|
+
type JsonObject = Record<string, unknown>;
|
|
4
|
+
export type CodexSecurityCoverage = {
|
|
5
|
+
status: SecurityCoverageStatus;
|
|
6
|
+
mode?: string;
|
|
7
|
+
includePaths: string[];
|
|
8
|
+
excludePaths: string[];
|
|
9
|
+
exclusions: string[];
|
|
10
|
+
deferred: string[];
|
|
11
|
+
openQuestions: string[];
|
|
12
|
+
surfaces: Array<{
|
|
13
|
+
id: string;
|
|
14
|
+
label: string;
|
|
15
|
+
disposition: string;
|
|
16
|
+
}>;
|
|
17
|
+
notes: string[];
|
|
18
|
+
};
|
|
19
|
+
export type CodexSecurityScanImport = {
|
|
20
|
+
source: 'Codex Security';
|
|
21
|
+
scanDirectory: string;
|
|
22
|
+
manifestPath: string;
|
|
23
|
+
findingsPath: string;
|
|
24
|
+
coveragePath?: string;
|
|
25
|
+
scan: {
|
|
26
|
+
id: string;
|
|
27
|
+
status: 'completed';
|
|
28
|
+
sealedAt: string;
|
|
29
|
+
producer: {
|
|
30
|
+
name: string;
|
|
31
|
+
version: string;
|
|
32
|
+
};
|
|
33
|
+
mode?: string;
|
|
34
|
+
target?: JsonObject;
|
|
35
|
+
};
|
|
36
|
+
integrity: {
|
|
37
|
+
sealed: true;
|
|
38
|
+
verifiedArtifacts: Array<{
|
|
39
|
+
path: string;
|
|
40
|
+
sha256: string;
|
|
41
|
+
}>;
|
|
42
|
+
};
|
|
43
|
+
coverage: CodexSecurityCoverage;
|
|
44
|
+
findings: RemediationFinding[];
|
|
45
|
+
totalResults: number;
|
|
46
|
+
skippedResults: number;
|
|
47
|
+
};
|
|
48
|
+
/**
|
|
49
|
+
* Read a completed Codex Security scan through its documented portable
|
|
50
|
+
* artifacts. This deliberately does not inspect Codex Security's private state
|
|
51
|
+
* or invoke its model runtime: the sealed manifest is the handoff boundary.
|
|
52
|
+
*/
|
|
53
|
+
export declare function importCodexSecurityScan(scanDirectory: string, workspace: string): Promise<CodexSecurityScanImport>;
|
|
54
|
+
export {};
|