dvalincode 0.12.0 → 0.14.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 (116) hide show
  1. package/README.md +122 -24
  2. package/README.zh-CN.md +52 -4
  3. package/dist/agent/compact.d.ts +4 -2
  4. package/dist/agent/compact.js +41 -7
  5. package/dist/agent/compact.js.map +1 -1
  6. package/dist/agent/loop.js +30 -31
  7. package/dist/agent/loop.js.map +1 -1
  8. package/dist/agent/modes.d.ts +2 -2
  9. package/dist/agent/modes.js +6 -3
  10. package/dist/agent/modes.js.map +1 -1
  11. package/dist/agent/runner.d.ts +14 -6
  12. package/dist/agent/runner.js +370 -75
  13. package/dist/agent/runner.js.map +1 -1
  14. package/dist/agent/session.d.ts +3 -1
  15. package/dist/agent/session.js +23 -2
  16. package/dist/agent/session.js.map +1 -1
  17. package/dist/agent/types.d.ts +10 -5
  18. package/dist/agent/types.js +12 -2
  19. package/dist/agent/types.js.map +1 -1
  20. package/dist/audit/log.d.ts +4 -1
  21. package/dist/audit/log.js.map +1 -1
  22. package/dist/audit/report.js +5 -0
  23. package/dist/audit/report.js.map +1 -1
  24. package/dist/cli.js +6 -1
  25. package/dist/cli.js.map +1 -1
  26. package/dist/commands/chat.js +1 -1
  27. package/dist/commands/chat.js.map +1 -1
  28. package/dist/commands/dvalin.d.ts +9 -0
  29. package/dist/commands/dvalin.js +222 -0
  30. package/dist/commands/dvalin.js.map +1 -0
  31. package/dist/commands/provider.js +3 -3
  32. package/dist/commands/provider.js.map +1 -1
  33. package/dist/commands/tui.js +2 -2
  34. package/dist/commands/tui.js.map +1 -1
  35. package/dist/commands/update.d.ts +2 -0
  36. package/dist/commands/update.js +238 -0
  37. package/dist/commands/update.js.map +1 -0
  38. package/dist/core/context.d.ts +4 -0
  39. package/dist/core/context.js +8 -1
  40. package/dist/core/context.js.map +1 -1
  41. package/dist/core/guiUpdate.d.ts +27 -0
  42. package/dist/core/guiUpdate.js +65 -0
  43. package/dist/core/guiUpdate.js.map +1 -0
  44. package/dist/core/policy.d.ts +6 -3
  45. package/dist/core/policy.js +8 -1
  46. package/dist/core/policy.js.map +1 -1
  47. package/dist/core/selfUpdate.d.ts +108 -0
  48. package/dist/core/selfUpdate.js +180 -0
  49. package/dist/core/selfUpdate.js.map +1 -0
  50. package/dist/core/subprocessSandbox.d.ts +16 -0
  51. package/dist/core/subprocessSandbox.js +168 -28
  52. package/dist/core/subprocessSandbox.js.map +1 -1
  53. package/dist/core/trust.d.ts +8 -0
  54. package/dist/core/trust.js +1 -10
  55. package/dist/core/trust.js.map +1 -1
  56. package/dist/core/workspace.js +2 -1
  57. package/dist/core/workspace.js.map +1 -1
  58. package/dist/providers/anthropic.d.ts +14 -0
  59. package/dist/providers/anthropic.js +244 -0
  60. package/dist/providers/anthropic.js.map +1 -0
  61. package/dist/providers/manager.d.ts +3 -0
  62. package/dist/providers/manager.js +13 -2
  63. package/dist/providers/manager.js.map +1 -1
  64. package/dist/providers/openaiCompatible.d.ts +12 -1
  65. package/dist/providers/openaiCompatible.js +21 -6
  66. package/dist/providers/openaiCompatible.js.map +1 -1
  67. package/dist/providers/pool.js +3 -4
  68. package/dist/providers/pool.js.map +1 -1
  69. package/dist/providers/trustedBaseUrls.js +1 -0
  70. package/dist/providers/trustedBaseUrls.js.map +1 -1
  71. package/dist/providers/types.d.ts +20 -4
  72. package/dist/remediation/automate.d.ts +18 -0
  73. package/dist/remediation/automate.js +78 -0
  74. package/dist/remediation/automate.js.map +1 -0
  75. package/dist/remediation/localScan.js +9 -1
  76. package/dist/remediation/localScan.js.map +1 -1
  77. package/dist/remediation/sarif.js +18 -4
  78. package/dist/remediation/sarif.js.map +1 -1
  79. package/dist/remediation/scannerSuite.d.ts +43 -0
  80. package/dist/remediation/scannerSuite.js +248 -0
  81. package/dist/remediation/scannerSuite.js.map +1 -0
  82. package/dist/server/routes/config.js +2 -3
  83. package/dist/server/routes/config.js.map +1 -1
  84. package/dist/server/routes/remediation.js +34 -0
  85. package/dist/server/routes/remediation.js.map +1 -1
  86. package/dist/server/scannerWorkspaceGrants.d.ts +7 -0
  87. package/dist/server/scannerWorkspaceGrants.js +48 -0
  88. package/dist/server/scannerWorkspaceGrants.js.map +1 -0
  89. package/dist/server/security.js +20 -6
  90. package/dist/server/security.js.map +1 -1
  91. package/dist/server/wsHandler.js.map +1 -1
  92. package/dist/skills/store.js +28 -0
  93. package/dist/skills/store.js.map +1 -1
  94. package/dist/tools/registry.d.ts +7 -0
  95. package/dist/tools/registry.js +30 -0
  96. package/dist/tools/registry.js.map +1 -1
  97. package/dist/tools/runCheck.js +1 -0
  98. package/dist/tools/runCheck.js.map +1 -1
  99. package/dist/tools/runSecuritySuite.d.ts +14 -0
  100. package/dist/tools/runSecuritySuite.js +35 -0
  101. package/dist/tools/runSecuritySuite.js.map +1 -0
  102. package/dist/tools/shell.d.ts +3 -1
  103. package/dist/tools/shell.js +16 -6
  104. package/dist/tools/shell.js.map +1 -1
  105. package/dist/tui/app.d.ts +1 -0
  106. package/dist/tui/app.js +110 -16
  107. package/dist/tui/app.js.map +1 -1
  108. package/dist/tui/presets.d.ts +2 -2
  109. package/dist/tui/presets.js +1 -0
  110. package/dist/tui/presets.js.map +1 -1
  111. package/dist/tui/render.js +2 -1
  112. package/dist/tui/render.js.map +1 -1
  113. package/dist/version.d.ts +8 -0
  114. package/dist/version.js +9 -0
  115. package/dist/version.js.map +1 -0
  116. package/package.json +4 -3
@@ -0,0 +1,244 @@
1
+ import { governedProviderFetch } from './egress.js';
2
+ export function normalizeAnthropicUsage(usage) {
3
+ const miss = usage.input_tokens ?? 0;
4
+ const cached = usage.cache_read_input_tokens ?? 0;
5
+ const write = usage.cache_creation_input_tokens ?? 0;
6
+ return {
7
+ inputTokens: miss + cached + write,
8
+ outputTokens: usage.output_tokens ?? 0,
9
+ cachedInputTokens: cached,
10
+ cacheMissInputTokens: miss,
11
+ cacheWriteInputTokens: write,
12
+ };
13
+ }
14
+ export function createAnthropicProvider(config) {
15
+ const baseUrl = (config.baseUrl ?? 'https://api.anthropic.com/v1').replace(/\/$/, '');
16
+ const model = config.model ?? 'claude-sonnet-4-6';
17
+ const name = config.name ?? 'anthropic';
18
+ const cacheControl = { type: 'ephemeral', ttl: config.cacheTtl ?? '5m' };
19
+ function makeHeaders() {
20
+ return {
21
+ 'Content-Type': 'application/json',
22
+ 'anthropic-version': '2023-06-01',
23
+ ...(config.apiKey ? { 'x-api-key': config.apiKey } : {}),
24
+ };
25
+ }
26
+ function buildBody(request, stream) {
27
+ const messages = convertMessages(request.messages, cacheControl);
28
+ const body = {
29
+ model,
30
+ max_tokens: request.maxTokens ?? 4096,
31
+ temperature: request.temperature ?? 0.7,
32
+ messages,
33
+ stream,
34
+ };
35
+ if (request.system) {
36
+ body.system = [{ type: 'text', text: request.system, cache_control: cacheControl }];
37
+ }
38
+ if (request.tools?.length) {
39
+ body.tools = request.tools.map((tool, index) => ({
40
+ name: tool.name,
41
+ description: tool.description,
42
+ input_schema: tool.parameters,
43
+ ...(index === request.tools.length - 1 ? { cache_control: cacheControl } : {}),
44
+ }));
45
+ }
46
+ return JSON.stringify(body);
47
+ }
48
+ async function fetchMessages(request, stream) {
49
+ const response = await governedProviderFetch(`${baseUrl}/messages`, {
50
+ method: 'POST',
51
+ headers: makeHeaders(),
52
+ body: buildBody(request, stream),
53
+ signal: request.signal,
54
+ }, request, name, baseUrl, model);
55
+ if (!response.ok) {
56
+ const text = await response.text();
57
+ throw new Error(`Provider API error ${response.status}: ${text}`);
58
+ }
59
+ return response;
60
+ }
61
+ async function chatNonStreaming(request) {
62
+ const response = await fetchMessages(request, false);
63
+ const data = await response.json();
64
+ const content = (data.content ?? [])
65
+ .filter(block => block.type === 'text')
66
+ .map(block => block.text ?? '')
67
+ .join('');
68
+ const toolCalls = (data.content ?? [])
69
+ .filter(block => block.type === 'tool_use' && block.name)
70
+ .map((block, index) => ({
71
+ id: block.id ?? `tc_anthropic_${index}`,
72
+ name: block.name,
73
+ arguments: JSON.stringify(block.input ?? {}),
74
+ }));
75
+ return {
76
+ content,
77
+ model: data.model ?? model,
78
+ finishReason: data.stop_reason ?? undefined,
79
+ toolCalls: toolCalls.length ? toolCalls : undefined,
80
+ usage: data.usage ? normalizeAnthropicUsage(data.usage) : undefined,
81
+ };
82
+ }
83
+ async function chatStreaming(request) {
84
+ const response = await fetchMessages(request, true);
85
+ if (!response.body)
86
+ throw new Error('No response body for streaming');
87
+ const reader = response.body.getReader();
88
+ const decoder = new TextDecoder();
89
+ const toolBuffers = new Map();
90
+ let content = '';
91
+ let modelName = model;
92
+ let finishReason;
93
+ let usage = {};
94
+ let buffer = '';
95
+ try {
96
+ while (true) {
97
+ const { done, value } = await reader.read();
98
+ if (done)
99
+ break;
100
+ buffer += decoder.decode(value, { stream: true });
101
+ const events = buffer.split('\n\n');
102
+ buffer = events.pop() ?? '';
103
+ for (const event of events) {
104
+ const dataLine = event.split('\n').find(line => line.startsWith('data: '));
105
+ if (!dataLine)
106
+ continue;
107
+ let payload;
108
+ try {
109
+ payload = JSON.parse(dataLine.slice(6));
110
+ }
111
+ catch {
112
+ continue;
113
+ }
114
+ const type = payload.type;
115
+ if (type === 'message_start') {
116
+ const message = payload.message;
117
+ modelName = message?.model ?? modelName;
118
+ usage = mergeAnthropicUsage(usage, message?.usage);
119
+ }
120
+ else if (type === 'content_block_start') {
121
+ const index = Number(payload.index ?? 0);
122
+ const block = payload.content_block;
123
+ if (block?.type === 'tool_use') {
124
+ toolBuffers.set(index, { id: block.id ?? `tc_anthropic_${index}`, name: block.name ?? '', json: '' });
125
+ }
126
+ }
127
+ else if (type === 'content_block_delta') {
128
+ const index = Number(payload.index ?? 0);
129
+ const delta = payload.delta;
130
+ if (delta?.type === 'text_delta' && delta.text) {
131
+ content += delta.text;
132
+ request.onDelta?.(delta.text);
133
+ }
134
+ else if (delta?.type === 'input_json_delta' && delta.partial_json) {
135
+ const tool = toolBuffers.get(index);
136
+ if (tool)
137
+ tool.json += delta.partial_json;
138
+ }
139
+ }
140
+ else if (type === 'message_delta') {
141
+ const delta = payload.delta;
142
+ finishReason = delta?.stop_reason ?? finishReason;
143
+ usage = mergeAnthropicUsage(usage, payload.usage);
144
+ }
145
+ }
146
+ }
147
+ }
148
+ finally {
149
+ reader.releaseLock();
150
+ }
151
+ const toolCalls = [...toolBuffers.values()]
152
+ .filter(tool => tool.name)
153
+ .map((tool) => ({ id: tool.id, name: tool.name, arguments: tool.json || '{}' }));
154
+ return {
155
+ content,
156
+ model: modelName,
157
+ finishReason,
158
+ toolCalls: toolCalls.length ? toolCalls : undefined,
159
+ usage: normalizeAnthropicUsage(usage),
160
+ };
161
+ }
162
+ return {
163
+ name,
164
+ chat(request) {
165
+ return request.onDelta ? chatStreaming(request) : chatNonStreaming(request);
166
+ },
167
+ };
168
+ }
169
+ function convertMessages(messages, defaultCache) {
170
+ const converted = [];
171
+ for (const message of messages) {
172
+ const next = convertMessage(message);
173
+ if (!next || next.content.length === 0)
174
+ continue;
175
+ const prior = converted[converted.length - 1];
176
+ if (prior?.role === next.role)
177
+ prior.content.push(...next.content);
178
+ else
179
+ converted.push(next);
180
+ }
181
+ // Cache the growing stable conversation prefix. On the next iteration this
182
+ // block is unchanged and the new assistant/tool suffix is appended after it.
183
+ const lastMessage = converted[converted.length - 1];
184
+ const lastBlock = lastMessage?.content[lastMessage.content.length - 1];
185
+ if (lastBlock && isCacheable(lastBlock))
186
+ lastBlock.cache_control ??= defaultCache;
187
+ return converted;
188
+ }
189
+ function convertMessage(message) {
190
+ const cache = message.cacheControl;
191
+ if (message.role === 'tool') {
192
+ if (!message.tool_call_id)
193
+ return undefined;
194
+ return {
195
+ role: 'user',
196
+ content: [{
197
+ type: 'tool_result',
198
+ tool_use_id: message.tool_call_id,
199
+ content: message.content,
200
+ ...(cache ? { cache_control: cache } : {}),
201
+ }],
202
+ };
203
+ }
204
+ const role = message.role === 'assistant' ? 'assistant' : 'user';
205
+ const content = [];
206
+ if (message.content) {
207
+ content.push({
208
+ type: 'text',
209
+ text: message.role === 'system' ? `[System note]\n${message.content}` : message.content,
210
+ ...(cache ? { cache_control: cache } : {}),
211
+ });
212
+ }
213
+ for (const toolCall of message.tool_calls ?? []) {
214
+ content.push({
215
+ type: 'tool_use',
216
+ id: toolCall.id,
217
+ name: toolCall.name,
218
+ input: parseToolArguments(toolCall.arguments),
219
+ });
220
+ }
221
+ return { role, content };
222
+ }
223
+ function parseToolArguments(value) {
224
+ try {
225
+ return JSON.parse(value);
226
+ }
227
+ catch {
228
+ return { raw: value };
229
+ }
230
+ }
231
+ function isCacheable(block) {
232
+ return block.type !== 'text' || block.text.length > 0;
233
+ }
234
+ function mergeAnthropicUsage(current, next) {
235
+ if (!next)
236
+ return current;
237
+ return {
238
+ input_tokens: next.input_tokens ?? current.input_tokens,
239
+ output_tokens: next.output_tokens ?? current.output_tokens,
240
+ cache_creation_input_tokens: next.cache_creation_input_tokens ?? current.cache_creation_input_tokens,
241
+ cache_read_input_tokens: next.cache_read_input_tokens ?? current.cache_read_input_tokens,
242
+ };
243
+ }
244
+ //# sourceMappingURL=anthropic.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../src/providers/anthropic.ts"],"names":[],"mappings":"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"}
@@ -17,6 +17,7 @@ export type ProviderProfile = {
17
17
  export declare class ProviderManager {
18
18
  private providers;
19
19
  addOpenAI(name: string, config: OpenAIConfig): this;
20
+ addConfigured(name: string, config: OpenAIConfig): this;
20
21
  get(name: string): ProviderAdapter;
21
22
  list(): ConfiguredProvider[];
22
23
  /** Load from env: DVALINCODE_PROVIDER, DVALINCODE_API_KEY, DVALINCODE_BASE_URL, DVALINCODE_MODEL */
@@ -28,3 +29,5 @@ export declare class ProviderManager {
28
29
  */
29
30
  addProfile(profiles: Record<string, ProviderProfile> | undefined, name: string): string;
30
31
  }
32
+ /** Select a native adapter only for the direct Anthropic provider id. */
33
+ export declare function createProviderAdapter(name: string, config: OpenAIConfig, providerKind?: string): ProviderAdapter;
@@ -1,4 +1,5 @@
1
1
  import { createOpenAICompatibleProvider } from './openaiCompatible.js';
2
+ import { createAnthropicProvider } from './anthropic.js';
2
3
  import { resolveApiKey } from './secrets.js';
3
4
  export class ProviderManager {
4
5
  providers = new Map();
@@ -7,6 +8,10 @@ export class ProviderManager {
7
8
  this.providers.set(name, adapter);
8
9
  return this;
9
10
  }
11
+ addConfigured(name, config) {
12
+ this.providers.set(name, createProviderAdapter(name, config));
13
+ return this;
14
+ }
10
15
  get(name) {
11
16
  const provider = this.providers.get(name);
12
17
  if (!provider)
@@ -22,7 +27,7 @@ export class ProviderManager {
22
27
  const apiKey = process.env.DVALINCODE_API_KEY;
23
28
  const baseUrl = process.env.DVALINCODE_BASE_URL;
24
29
  const model = process.env.DVALINCODE_MODEL;
25
- this.addOpenAI(providerName, { apiKey, baseUrl, model });
30
+ this.addConfigured(providerName, { apiKey, baseUrl, model });
26
31
  return this;
27
32
  }
28
33
  /**
@@ -37,7 +42,7 @@ export class ProviderManager {
37
42
  const hint = available.length ? ` Available: ${available.join(', ')}` : ' No profiles configured.';
38
43
  throw new Error(`Profile not found: ${name}.${hint}`);
39
44
  }
40
- this.addOpenAI(profile.provider, {
45
+ this.addConfigured(profile.provider, {
41
46
  apiKey: resolveApiKey(profile),
42
47
  baseUrl: profile.baseUrl,
43
48
  model: profile.model,
@@ -45,4 +50,10 @@ export class ProviderManager {
45
50
  return profile.provider;
46
51
  }
47
52
  }
53
+ /** Select a native adapter only for the direct Anthropic provider id. */
54
+ export function createProviderAdapter(name, config, providerKind = name) {
55
+ return providerKind === 'anthropic'
56
+ ? createAnthropicProvider({ ...config, name })
57
+ : createOpenAICompatibleProvider({ ...config, name });
58
+ }
48
59
  //# sourceMappingURL=manager.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/providers/manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,8BAA8B,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,aAAa,EAA0B,MAAM,cAAc,CAAC;AAiBrE,MAAM,OAAO,eAAe;IAClB,SAAS,GAAG,IAAI,GAAG,EAA2B,CAAC;IAEvD,SAAS,CAAC,IAAY,EAAE,MAAoB;QAC1C,MAAM,OAAO,GAAG,8BAA8B,CAAC,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,GAAG,CAAC,IAAY;QACd,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,gBAAgB,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,IAAI;QACF,OAAO,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IACrF,CAAC;IAED,oGAAoG;IACpG,WAAW;QACT,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,UAAU,CAAC;QACnE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;QAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;QAChD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;QAE3C,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACH,UAAU,CAAC,QAAqD,EAAE,IAAY;QAC5E,MAAM,OAAO,GAAG,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;YAC9C,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,0BAA0B,CAAC;YACnG,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE;YAC/B,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC;YAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,QAAQ,CAAC;IAC1B,CAAC;CACF"}
1
+ {"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/providers/manager.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,16 @@
1
- import type { ProviderAdapter, ProviderConfig } from './types.js';
1
+ import type { ProviderAdapter, ProviderConfig, TokenUsage } from './types.js';
2
2
  export type OpenAIConfig = ProviderConfig & {
3
3
  name?: string;
4
4
  };
5
+ type OpenAIUsage = {
6
+ prompt_tokens: number;
7
+ completion_tokens: number;
8
+ prompt_cache_hit_tokens?: number;
9
+ prompt_cache_miss_tokens?: number;
10
+ prompt_tokens_details?: {
11
+ cached_tokens?: number;
12
+ };
13
+ };
14
+ export declare function normalizeOpenAIUsage(usage: OpenAIUsage): TokenUsage;
5
15
  export declare function createOpenAICompatibleProvider(config: OpenAIConfig): ProviderAdapter;
16
+ export {};
@@ -1,4 +1,14 @@
1
1
  import { governedProviderFetch } from './egress.js';
2
+ export function normalizeOpenAIUsage(usage) {
3
+ const cachedInputTokens = usage.prompt_cache_hit_tokens ?? usage.prompt_tokens_details?.cached_tokens;
4
+ const cacheMissInputTokens = usage.prompt_cache_miss_tokens ?? (cachedInputTokens !== undefined ? Math.max(0, usage.prompt_tokens - cachedInputTokens) : undefined);
5
+ return {
6
+ inputTokens: usage.prompt_tokens,
7
+ outputTokens: usage.completion_tokens,
8
+ cachedInputTokens,
9
+ cacheMissInputTokens,
10
+ };
11
+ }
2
12
  export function createOpenAICompatibleProvider(config) {
3
13
  const baseUrl = config.baseUrl ?? 'https://api.openai.com/v1';
4
14
  const model = config.model ?? 'gpt-4o';
@@ -64,6 +74,7 @@ export function createOpenAICompatibleProvider(config) {
64
74
  let lineBuffer = '';
65
75
  const toolCallBuffers = new Map();
66
76
  let usage;
77
+ let finishReason;
67
78
  try {
68
79
  while (true) {
69
80
  const { done, value } = await reader.read();
@@ -91,7 +102,10 @@ export function createOpenAICompatibleProvider(config) {
91
102
  usage = u;
92
103
  }
93
104
  const choices = chunk.choices;
94
- const delta = choices?.[0]?.delta;
105
+ const choice = choices?.[0];
106
+ if (choice?.finish_reason)
107
+ finishReason = choice.finish_reason;
108
+ const delta = choice?.delta;
95
109
  if (!delta)
96
110
  continue;
97
111
  // Stream text content
@@ -131,8 +145,9 @@ export function createOpenAICompatibleProvider(config) {
131
145
  return {
132
146
  content,
133
147
  model,
148
+ finishReason,
134
149
  toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
135
- usage: usage ? { inputTokens: usage.prompt_tokens, outputTokens: usage.completion_tokens } : undefined,
150
+ usage: usage ? normalizeOpenAIUsage(usage) : undefined,
136
151
  };
137
152
  }
138
153
  async function chatNonStreaming(request) {
@@ -147,7 +162,8 @@ export function createOpenAICompatibleProvider(config) {
147
162
  throw new Error(`Provider API error ${response.status}: ${text}`);
148
163
  }
149
164
  const data = (await response.json());
150
- const choice = data.choices[0]?.message;
165
+ const resultChoice = data.choices[0];
166
+ const choice = resultChoice?.message;
151
167
  let toolCalls;
152
168
  if (choice?.tool_calls && choice.tool_calls.length > 0) {
153
169
  toolCalls = choice.tool_calls.map(tc => ({
@@ -159,10 +175,9 @@ export function createOpenAICompatibleProvider(config) {
159
175
  return {
160
176
  content: choice?.content ?? '',
161
177
  model: data.model,
178
+ finishReason: resultChoice?.finish_reason ?? undefined,
162
179
  toolCalls,
163
- usage: data.usage
164
- ? { inputTokens: data.usage.prompt_tokens, outputTokens: data.usage.completion_tokens }
165
- : undefined,
180
+ usage: data.usage ? normalizeOpenAIUsage(data.usage) : undefined,
166
181
  };
167
182
  }
168
183
  async function chat(request) {
@@ -1 +1 @@
1
- {"version":3,"file":"openaiCompatible.js","sourceRoot":"","sources":["../../src/providers/openaiCompatible.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"openaiCompatible.js","sourceRoot":"","sources":["../../src/providers/openaiCompatible.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { createOpenAICompatibleProvider } from './openaiCompatible.js';
1
+ import { createProviderAdapter } from './manager.js';
2
2
  import { resolveApiKey } from './secrets.js';
3
3
  // Module-level cursor so round-robin state survives pool re-creation (e.g. config reload)
4
4
  let rrCursor = 0;
@@ -11,12 +11,11 @@ export class ProviderPool {
11
11
  .filter(e => e.enabled)
12
12
  .map(e => ({
13
13
  id: e.id,
14
- adapter: createOpenAICompatibleProvider({
15
- name: e.id,
14
+ adapter: createProviderAdapter(e.id, {
16
15
  apiKey: resolveApiKey(e),
17
16
  baseUrl: e.baseUrl,
18
17
  model: e.model,
19
- }),
18
+ }, e.provider),
20
19
  weight: Math.max(1, e.weight),
21
20
  }));
22
21
  if (this.slots.length === 0)
@@ -1 +1 @@
1
- {"version":3,"file":"pool.js","sourceRoot":"","sources":["../../src/providers/pool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,8BAA8B,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,0FAA0F;AAC1F,IAAI,QAAQ,GAAG,CAAC,CAAC;AAEjB,MAAM,OAAO,YAAY;IACf,KAAK,CAAS;IACd,MAAM,CAAiB;IAE/B,YAAY,OAAoB,EAAE,MAAsB;QACtD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,OAAO;aACjB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;aACtB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACT,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,OAAO,EAAE,8BAA8B,CAAC;gBACtC,IAAI,EAAE,CAAC,CAAC,EAAE;gBACV,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;gBACxB,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,KAAK,EAAE,CAAC,CAAC,KAAK;aACf,CAAC;YACF,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC;SAC9B,CAAC,CAAC,CAAC;QACN,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACvF,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAElD,IAAI,IAAU,CAAC;QACf,IAAI,IAAI,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;YAClC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChD,QAAQ,EAAE,CAAC;QACb,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACpC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,kBAAkB;YAClB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAC7D,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC;YAC9B,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACzC,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBAC5B,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC;gBACf,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBAAC,IAAI,GAAG,EAAE,CAAC;oBAAC,MAAM;gBAAC,CAAC;YACnC,CAAC;QACH,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;IAChD,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;CACF;AAED,2EAA2E;AAC3E,MAAM,UAAU,aAAa;IAC3B,QAAQ,GAAG,CAAC,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"pool.js","sourceRoot":"","sources":["../../src/providers/pool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,0FAA0F;AAC1F,IAAI,QAAQ,GAAG,CAAC,CAAC;AAEjB,MAAM,OAAO,YAAY;IACf,KAAK,CAAS;IACd,MAAM,CAAiB;IAE/B,YAAY,OAAoB,EAAE,MAAsB;QACtD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,OAAO;aACjB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;aACtB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACT,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAAE,EAAE;gBACnC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;gBACxB,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,KAAK,EAAE,CAAC,CAAC,KAAK;aACf,EAAE,CAAC,CAAC,QAAQ,CAAC;YACd,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC;SAC9B,CAAC,CAAC,CAAC;QACN,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACvF,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAElD,IAAI,IAAU,CAAC;QACf,IAAI,IAAI,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;YAClC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChD,QAAQ,EAAE,CAAC;QACb,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACpC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,kBAAkB;YAClB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAC7D,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC;YAC9B,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACzC,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBAC5B,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC;gBACf,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBAAC,IAAI,GAAG,EAAE,CAAC;oBAAC,MAAM;gBAAC,CAAC;YACnC,CAAC;QACH,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;IAChD,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;CACF;AAED,2EAA2E;AAC3E,MAAM,UAAU,aAAa;IAC3B,QAAQ,GAAG,CAAC,CAAC;AACf,CAAC"}
@@ -1,6 +1,7 @@
1
1
  const TRUSTED_PROVIDER_BASE_URLS = {
2
2
  deepseek: ['https://api.deepseek.com/v1'],
3
3
  openai: ['https://api.openai.com/v1'],
4
+ anthropic: ['https://api.anthropic.com/v1'],
4
5
  google: ['https://generativelanguage.googleapis.com/v1beta/openai'],
5
6
  'anthropic-openrouter': ['https://openrouter.ai/api/v1'],
6
7
  xai: ['https://api.x.ai/v1'],
@@ -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,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,0BAA0B,EAAE,0BAA0B,CAAC;IACrE,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
+ {"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,0BAA0B,EAAE,0BAA0B,CAAC;IACrE,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"}
@@ -5,12 +5,29 @@ export type ProviderConfig = {
5
5
  baseUrl?: string;
6
6
  model?: string;
7
7
  };
8
+ export type CacheControl = {
9
+ type: 'ephemeral';
10
+ ttl?: '5m' | '1h';
11
+ };
12
+ /** Provider-reported token usage, including prompt-cache accounting when exposed. */
13
+ export type TokenUsage = {
14
+ inputTokens: number;
15
+ outputTokens: number;
16
+ /** Input tokens served from a provider prompt cache. Included in inputTokens. */
17
+ cachedInputTokens?: number;
18
+ /** Input tokens that missed the prompt cache. Included in inputTokens. */
19
+ cacheMissInputTokens?: number;
20
+ /** Input tokens written into a provider prompt cache. Included in inputTokens. */
21
+ cacheWriteInputTokens?: number;
22
+ };
8
23
  export type ChatMessage = {
9
24
  role: 'system' | 'user' | 'assistant' | 'tool';
10
25
  content: string;
11
26
  tool_call_id?: string;
12
27
  name?: string;
13
28
  tool_calls?: ToolCall[];
29
+ /** Explicit prompt-cache breakpoint for adapters that support it. */
30
+ cacheControl?: CacheControl;
14
31
  };
15
32
  export type ToolDef = {
16
33
  name: string;
@@ -47,11 +64,10 @@ export type ChatRequest = {
47
64
  export type ChatResponse = {
48
65
  content: string;
49
66
  model: string;
67
+ /** Provider stop reason, e.g. stop, tool_calls, or length. */
68
+ finishReason?: string;
50
69
  toolCalls?: ToolCall[];
51
- usage?: {
52
- inputTokens: number;
53
- outputTokens: number;
54
- };
70
+ usage?: TokenUsage;
55
71
  };
56
72
  export interface ProviderAdapter {
57
73
  readonly name: string;
@@ -0,0 +1,18 @@
1
+ import type { DvalinScanSuiteResult } from './scannerSuite.js';
2
+ import type { RemediationFinding } from './sarif.js';
3
+ export declare const VERIFICATION_MARKER = "DVALIN_VERIFICATION_PASSED";
4
+ export declare function buildAutomatedFixPrompt(findings: RemediationFinding[], worktreeContext?: string): string;
5
+ export declare function buildAutomatedVerificationPrompt(findings: RemediationFinding[], scanners: string[]): string;
6
+ export declare function buildDraftPrPrompt(findings: RemediationFinding[]): string;
7
+ export type VerificationGate = {
8
+ passed: boolean;
9
+ reasons: string[];
10
+ };
11
+ export declare function evaluateVerificationGate(input: {
12
+ originals: RemediationFinding[];
13
+ baseline?: RemediationFinding[];
14
+ after: DvalinScanSuiteResult;
15
+ agentOutput: string;
16
+ hasChanges: boolean;
17
+ }): VerificationGate;
18
+ export declare function extractDraftPrUrl(output: string): string | undefined;