dvalincode 0.12.0 → 0.15.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 +278 -81
- package/README.zh-CN.md +219 -74
- package/THIRD_PARTY_NOTICES.md +295 -147
- package/dist/agent/compact.d.ts +4 -2
- package/dist/agent/compact.js +41 -7
- package/dist/agent/compact.js.map +1 -1
- package/dist/agent/loop.d.ts +8 -0
- package/dist/agent/loop.js +38 -32
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/modes.d.ts +2 -2
- package/dist/agent/modes.js +6 -3
- package/dist/agent/modes.js.map +1 -1
- package/dist/agent/runner.d.ts +15 -6
- package/dist/agent/runner.js +379 -75
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/session.d.ts +26 -2
- package/dist/agent/session.js +85 -12
- package/dist/agent/session.js.map +1 -1
- package/dist/agent/types.d.ts +12 -5
- package/dist/agent/types.js +12 -2
- package/dist/agent/types.js.map +1 -1
- package/dist/audit/log.d.ts +7 -1
- package/dist/audit/log.js.map +1 -1
- package/dist/audit/report.js +7 -0
- package/dist/audit/report.js.map +1 -1
- package/dist/cli.js +30 -3
- package/dist/cli.js.map +1 -1
- package/dist/commands/chat.js +1 -1
- package/dist/commands/chat.js.map +1 -1
- package/dist/commands/dvalin.d.ts +9 -0
- package/dist/commands/dvalin.js +234 -0
- package/dist/commands/dvalin.js.map +1 -0
- package/dist/commands/mcpServe.d.ts +2 -0
- package/dist/commands/mcpServe.js +36 -0
- package/dist/commands/mcpServe.js.map +1 -0
- package/dist/commands/policy.js +12 -0
- package/dist/commands/policy.js.map +1 -1
- package/dist/commands/provider.js +3 -3
- package/dist/commands/provider.js.map +1 -1
- package/dist/commands/run.d.ts +30 -0
- package/dist/commands/run.js +229 -0
- package/dist/commands/run.js.map +1 -0
- package/dist/commands/tui.js +2 -2
- package/dist/commands/tui.js.map +1 -1
- package/dist/commands/update.d.ts +2 -0
- package/dist/commands/update.js +238 -0
- package/dist/commands/update.js.map +1 -0
- package/dist/core/context.d.ts +4 -0
- package/dist/core/context.js +8 -1
- package/dist/core/context.js.map +1 -1
- package/dist/core/guiUpdate.d.ts +27 -0
- package/dist/core/guiUpdate.js +65 -0
- package/dist/core/guiUpdate.js.map +1 -0
- package/dist/core/policy.d.ts +27 -3
- package/dist/core/policy.js +40 -1
- package/dist/core/policy.js.map +1 -1
- package/dist/core/selfUpdate.d.ts +108 -0
- package/dist/core/selfUpdate.js +180 -0
- package/dist/core/selfUpdate.js.map +1 -0
- package/dist/core/subprocessSandbox.d.ts +59 -0
- package/dist/core/subprocessSandbox.js +274 -23
- package/dist/core/subprocessSandbox.js.map +1 -1
- package/dist/core/trust.d.ts +8 -0
- package/dist/core/trust.js +13 -10
- package/dist/core/trust.js.map +1 -1
- package/dist/core/workspace.js +2 -1
- package/dist/core/workspace.js.map +1 -1
- package/dist/harness/run.d.ts +70 -0
- package/dist/harness/run.js +185 -0
- package/dist/harness/run.js.map +1 -0
- package/dist/mcp/client.d.ts +12 -0
- package/dist/mcp/client.js +2 -2
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/config.d.ts +33 -3
- package/dist/mcp/config.js +32 -3
- package/dist/mcp/config.js.map +1 -1
- package/dist/mcp/register.d.ts +23 -6
- package/dist/mcp/register.js +42 -8
- package/dist/mcp/register.js.map +1 -1
- package/dist/mcp/server.d.ts +35 -0
- package/dist/mcp/server.js +230 -0
- package/dist/mcp/server.js.map +1 -0
- package/dist/mcp/stdio.d.ts +34 -0
- package/dist/mcp/stdio.js +183 -0
- package/dist/mcp/stdio.js.map +1 -0
- package/dist/providers/anthropic.d.ts +14 -0
- package/dist/providers/anthropic.js +244 -0
- package/dist/providers/anthropic.js.map +1 -0
- package/dist/providers/manager.d.ts +3 -0
- package/dist/providers/manager.js +13 -2
- package/dist/providers/manager.js.map +1 -1
- package/dist/providers/openaiCompatible.d.ts +12 -1
- package/dist/providers/openaiCompatible.js +21 -6
- package/dist/providers/openaiCompatible.js.map +1 -1
- package/dist/providers/pool.js +3 -4
- package/dist/providers/pool.js.map +1 -1
- package/dist/providers/trustedBaseUrls.js +1 -0
- package/dist/providers/trustedBaseUrls.js.map +1 -1
- package/dist/providers/types.d.ts +20 -4
- package/dist/remediation/automate.d.ts +18 -0
- package/dist/remediation/automate.js +78 -0
- package/dist/remediation/automate.js.map +1 -0
- package/dist/remediation/localScan.js +9 -1
- package/dist/remediation/localScan.js.map +1 -1
- package/dist/remediation/sarif.js +18 -4
- package/dist/remediation/sarif.js.map +1 -1
- package/dist/remediation/sarifExport.d.ts +7 -0
- package/dist/remediation/sarifExport.js +102 -0
- package/dist/remediation/sarifExport.js.map +1 -0
- package/dist/remediation/scannerSuite.d.ts +43 -0
- package/dist/remediation/scannerSuite.js +258 -0
- package/dist/remediation/scannerSuite.js.map +1 -0
- package/dist/server/configStore.d.ts +2 -8
- package/dist/server/configStore.js +12 -7
- package/dist/server/configStore.js.map +1 -1
- package/dist/server/routes/config.js +2 -3
- package/dist/server/routes/config.js.map +1 -1
- package/dist/server/routes/remediation.js +34 -0
- package/dist/server/routes/remediation.js.map +1 -1
- package/dist/server/scannerWorkspaceGrants.d.ts +7 -0
- package/dist/server/scannerWorkspaceGrants.js +48 -0
- package/dist/server/scannerWorkspaceGrants.js.map +1 -0
- package/dist/server/security.js +20 -6
- package/dist/server/security.js.map +1 -1
- package/dist/server/wsHandler.js +8 -0
- package/dist/server/wsHandler.js.map +1 -1
- package/dist/skills/store.js +28 -0
- package/dist/skills/store.js.map +1 -1
- package/dist/tools/registry.d.ts +7 -0
- package/dist/tools/registry.js +30 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/runCheck.js +1 -0
- package/dist/tools/runCheck.js.map +1 -1
- package/dist/tools/runSecuritySuite.d.ts +14 -0
- package/dist/tools/runSecuritySuite.js +35 -0
- package/dist/tools/runSecuritySuite.js.map +1 -0
- package/dist/tools/shell.d.ts +3 -1
- package/dist/tools/shell.js +16 -6
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/app.d.ts +1 -0
- package/dist/tui/app.js +114 -17
- package/dist/tui/app.js.map +1 -1
- package/dist/tui/presets.d.ts +2 -2
- package/dist/tui/presets.js +1 -0
- package/dist/tui/presets.js.map +1 -1
- package/dist/tui/render.d.ts +1 -0
- package/dist/tui/render.js +13 -1
- package/dist/tui/render.js.map +1 -1
- package/dist/version.d.ts +8 -0
- package/dist/version.js +9 -0
- package/dist/version.js.map +1 -0
- package/package.json +7 -5
package/dist/agent/runner.js
CHANGED
|
@@ -1,3 +1,56 @@
|
|
|
1
|
+
import { truncateToolOutput } from '../tools/registry.js';
|
|
2
|
+
import { estimateRequestTokens } from './compact.js';
|
|
3
|
+
/** Carries the completed model/tool state so an interrupted turn can resume. */
|
|
4
|
+
export class TurnInterruptedError extends Error {
|
|
5
|
+
messages;
|
|
6
|
+
iterationsUsed;
|
|
7
|
+
usage;
|
|
8
|
+
constructor(messages, iterationsUsed, usage) {
|
|
9
|
+
super('interrupted');
|
|
10
|
+
this.messages = messages;
|
|
11
|
+
this.iterationsUsed = iterationsUsed;
|
|
12
|
+
this.usage = usage;
|
|
13
|
+
this.name = 'TurnInterruptedError';
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
const PENDING_WORK_NUDGE = [
|
|
17
|
+
'Runtime completion check: your previous response described work that is still pending.',
|
|
18
|
+
'Continue the task now by calling the next required tool. Do not merely describe what you will do.',
|
|
19
|
+
'Only return a response without tool calls when the requested task and its focused validation are complete.',
|
|
20
|
+
].join(' ');
|
|
21
|
+
const INVESTIGATION_NUDGE = [
|
|
22
|
+
'Runtime investigation check: the first requested action was a source edit, so it was deferred once.',
|
|
23
|
+
'Before editing, reproduce or inspect the failure and use read/search/command evidence to identify the responsible file and line.',
|
|
24
|
+
'Then retry the smallest justified edit and rerun the focused failing check.',
|
|
25
|
+
].join(' ');
|
|
26
|
+
const STALL_NUDGE = [
|
|
27
|
+
'Runtime progress check: recent actions show no new evidence or verification.',
|
|
28
|
+
'Pause the current approach, restate the leading hypothesis from observed results, and choose a materially different diagnostic step.',
|
|
29
|
+
'Do not repeat the same command or keep editing the same area without a new read or focused check.',
|
|
30
|
+
].join(' ');
|
|
31
|
+
const WRITE_TOOLS = new Set(['edit_file', 'write_file', 'delete_file']);
|
|
32
|
+
const INVESTIGATION_TOOLS = new Set([
|
|
33
|
+
'read_file',
|
|
34
|
+
'search_text',
|
|
35
|
+
'list_files',
|
|
36
|
+
'git_diff',
|
|
37
|
+
'git_status',
|
|
38
|
+
'project_scripts',
|
|
39
|
+
'run_check',
|
|
40
|
+
'shell',
|
|
41
|
+
]);
|
|
42
|
+
/** Detect a process update that must not be mistaken for a final answer. */
|
|
43
|
+
export function looksLikePendingWork(content, finishReason) {
|
|
44
|
+
if (finishReason === 'length' || finishReason === 'max_tokens')
|
|
45
|
+
return true;
|
|
46
|
+
const text = content.trim();
|
|
47
|
+
if (!text)
|
|
48
|
+
return true;
|
|
49
|
+
const englishFutureAction = /\b(?:let me|i(?:'ll| will| need to| am going to)|next,?\s+i(?:'ll| will)|now,?\s+i(?:'ll| will))\s+(?:check|inspect|verify|validate|fix|edit|update|add|run|test|implement|continue|review|open|read|write|create|remove|ensure)\b/i;
|
|
50
|
+
const chineseFutureAction = /(?:让我|我(?:将|会|需要|准备)|接下来|下一步|现在(?:让我|我来|我将|我要)|继续)(?:检查|验证|确认|修复|修改|更新|添加|运行|测试|实现|继续|查看|读取|编写|创建|删除|确保|完成)/;
|
|
51
|
+
const explicitIncomplete = /\b(?:still need to|work remains|remaining steps?)\b|(?:还需要|尚未完成|仍需|待完成)/i;
|
|
52
|
+
return englishFutureAction.test(text) || chineseFutureAction.test(text) || explicitIncomplete.test(text);
|
|
53
|
+
}
|
|
1
54
|
export class AgentRunner {
|
|
2
55
|
provider;
|
|
3
56
|
registry;
|
|
@@ -5,6 +58,7 @@ export class AgentRunner {
|
|
|
5
58
|
config;
|
|
6
59
|
systemPrompt;
|
|
7
60
|
iterationCount = 0;
|
|
61
|
+
compactHistory;
|
|
8
62
|
/** Stack of executed tool calls for undo support */
|
|
9
63
|
undoStack;
|
|
10
64
|
constructor(options) {
|
|
@@ -14,6 +68,7 @@ export class AgentRunner {
|
|
|
14
68
|
this.config = options.config;
|
|
15
69
|
this.systemPrompt = options.systemPrompt;
|
|
16
70
|
this.undoStack = options.sharedUndoStack ?? [];
|
|
71
|
+
this.compactHistory = options.compactHistory;
|
|
17
72
|
}
|
|
18
73
|
/** Undo the last N tool calls. Returns a description of what was undone. */
|
|
19
74
|
async undoLast(count = 1) {
|
|
@@ -50,83 +105,187 @@ export class AgentRunner {
|
|
|
50
105
|
}
|
|
51
106
|
/** Run a single turn: user message → LLM → (tool calls → LLM) → final response */
|
|
52
107
|
async runTurn(userMessage, history, onEvent, signal) {
|
|
53
|
-
|
|
108
|
+
let messages = [...history, { role: 'user', content: userMessage }];
|
|
54
109
|
this.iterationCount = 0;
|
|
55
110
|
let totalUsage;
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
reverseInput: null,
|
|
118
|
-
timestamp: new Date().toISOString(),
|
|
119
|
-
});
|
|
120
|
-
onEvent?.({ type: 'tool_result', name: tc.name, id: tc.id, output: result.output, metadata: result.metadata });
|
|
121
|
-
messages.push({
|
|
122
|
-
role: 'tool',
|
|
123
|
-
content: `[Tool ${tc.name} result]:\n${result.output}`,
|
|
124
|
-
tool_call_id: tc.id,
|
|
125
|
-
name: tc.name,
|
|
126
|
-
});
|
|
111
|
+
let lastCompactionAtTokens = 0;
|
|
112
|
+
let totalToolCalls = 0;
|
|
113
|
+
let hasInvestigated = history.some(message => message.role === 'tool' && Boolean(message.name && INVESTIGATION_TOOLS.has(message.name)));
|
|
114
|
+
let investigationNudged = false;
|
|
115
|
+
let stallNudges = 0;
|
|
116
|
+
const changedFiles = new Set();
|
|
117
|
+
const stall = {
|
|
118
|
+
recentActions: [],
|
|
119
|
+
recentLabels: [],
|
|
120
|
+
repeatCount: 0,
|
|
121
|
+
consecutiveEdits: 0,
|
|
122
|
+
writeGeneration: 0,
|
|
123
|
+
};
|
|
124
|
+
try {
|
|
125
|
+
while (this.iterationCount < this.config.maxIterations) {
|
|
126
|
+
if (signal?.aborted)
|
|
127
|
+
throw new Error('interrupted');
|
|
128
|
+
this.iterationCount++;
|
|
129
|
+
onEvent?.({ type: 'llm_iteration', iteration: this.iterationCount });
|
|
130
|
+
// Build tool definitions from registry
|
|
131
|
+
const toolDefs = this.buildToolDefs();
|
|
132
|
+
// Long coding turns grow after every tool result. Compact at iteration
|
|
133
|
+
// boundaries so the turn can continue instead of hitting the provider's
|
|
134
|
+
// context limit halfway through the task.
|
|
135
|
+
const triggerTokens = this.config.contextTokenLimit * this.config.compactThreshold;
|
|
136
|
+
const requestTokens = estimateRequestTokens(messages, this.systemPrompt, toolDefs);
|
|
137
|
+
if (this.compactHistory &&
|
|
138
|
+
requestTokens > triggerTokens &&
|
|
139
|
+
requestTokens > lastCompactionAtTokens + 1_000) {
|
|
140
|
+
lastCompactionAtTokens = requestTokens;
|
|
141
|
+
messages = await this.compactHistory(messages, signal);
|
|
142
|
+
if (signal?.aborted)
|
|
143
|
+
throw new Error('interrupted');
|
|
144
|
+
}
|
|
145
|
+
// Call LLM (streaming if onEvent is provided)
|
|
146
|
+
const response = await this.provider.chat({
|
|
147
|
+
system: this.systemPrompt,
|
|
148
|
+
messages,
|
|
149
|
+
tools: toolDefs.length > 0 ? toolDefs : undefined,
|
|
150
|
+
signal,
|
|
151
|
+
onDelta: onEvent ? (delta) => onEvent({ type: 'token_delta', content: delta }) : undefined,
|
|
152
|
+
runtime: {
|
|
153
|
+
policy: this.context.policy,
|
|
154
|
+
audit: this.context.audit,
|
|
155
|
+
},
|
|
156
|
+
});
|
|
157
|
+
// Accumulate token usage across all iterations
|
|
158
|
+
if (response.usage) {
|
|
159
|
+
totalUsage = accumulateUsage(totalUsage, response.usage);
|
|
160
|
+
}
|
|
161
|
+
// Add assistant message — include tool_calls if present (required by OpenAI-compatible APIs)
|
|
162
|
+
const assistantMsg = {
|
|
163
|
+
role: 'assistant',
|
|
164
|
+
content: response.content,
|
|
165
|
+
tool_calls: response.toolCalls && response.toolCalls.length > 0 ? response.toolCalls : undefined,
|
|
166
|
+
};
|
|
167
|
+
messages.push(assistantMsg);
|
|
168
|
+
// Check for tool calls — prefer native API response, fallback to @tool() text parsing
|
|
169
|
+
let toolCalls = [];
|
|
170
|
+
if (response.toolCalls && response.toolCalls.length > 0) {
|
|
171
|
+
toolCalls = response.toolCalls;
|
|
127
172
|
}
|
|
128
|
-
|
|
129
|
-
|
|
173
|
+
else {
|
|
174
|
+
toolCalls = this.parseToolCalls(response.content);
|
|
175
|
+
}
|
|
176
|
+
if (toolCalls.length === 0) {
|
|
177
|
+
// Some models occasionally emit a narration such as "let me verify
|
|
178
|
+
// the file" without the promised tool call. Treat that as an
|
|
179
|
+
// incomplete checkpoint and immediately ask for the actual action.
|
|
180
|
+
if (looksLikePendingWork(response.content, response.finishReason)) {
|
|
181
|
+
// Keep the request prefix append-only so provider prompt caches can
|
|
182
|
+
// reuse every prior message on the next iteration.
|
|
183
|
+
messages.push({ role: 'user', content: PENDING_WORK_NUDGE });
|
|
184
|
+
continue;
|
|
185
|
+
}
|
|
186
|
+
// A tool-free response with no pending-work signal is the final answer.
|
|
187
|
+
return {
|
|
188
|
+
messages,
|
|
189
|
+
finalResponse: response.content,
|
|
190
|
+
iterationsUsed: this.iterationCount,
|
|
191
|
+
usage: totalUsage,
|
|
192
|
+
stopReason: 'done',
|
|
193
|
+
};
|
|
194
|
+
}
|
|
195
|
+
// Enforce the budget across the entire turn. Previously this slice was
|
|
196
|
+
// reset on every model iteration, so a nominal 15-call limit could grow
|
|
197
|
+
// to hundreds of actions and make simple tasks spiral.
|
|
198
|
+
const remainingToolCalls = Math.max(0, this.config.maxToolCallsPerTurn - totalToolCalls);
|
|
199
|
+
const callsToExecute = toolCalls.slice(0, remainingToolCalls);
|
|
200
|
+
const skippedCalls = toolCalls.slice(remainingToolCalls);
|
|
201
|
+
let deferredFirstEdit = false;
|
|
202
|
+
let stallReason;
|
|
203
|
+
// Execute tool calls
|
|
204
|
+
for (const tc of callsToExecute) {
|
|
205
|
+
if (signal?.aborted)
|
|
206
|
+
throw new Error('interrupted');
|
|
207
|
+
let parsedInput;
|
|
208
|
+
try {
|
|
209
|
+
parsedInput = JSON.parse(tc.arguments);
|
|
210
|
+
// A one-shot soft gate prevents a model from acting directly on
|
|
211
|
+
// issue wording before it has gathered any workspace evidence.
|
|
212
|
+
if (WRITE_TOOLS.has(tc.name) && !hasInvestigated && !investigationNudged) {
|
|
213
|
+
investigationNudged = true;
|
|
214
|
+
deferredFirstEdit = true;
|
|
215
|
+
const error = 'Deferred once: inspect/reproduce and locate the responsible code before the first source edit.';
|
|
216
|
+
onEvent?.({ type: 'tool_error', name: tc.name, id: tc.id, error });
|
|
217
|
+
messages.push({
|
|
218
|
+
role: 'tool',
|
|
219
|
+
content: `[Tool ${tc.name} error]: ${error}`,
|
|
220
|
+
tool_call_id: tc.id,
|
|
221
|
+
name: tc.name,
|
|
222
|
+
});
|
|
223
|
+
observeAction(stall, tc.name, parsedInput, undefined, error, this.config);
|
|
224
|
+
totalToolCalls++;
|
|
225
|
+
continue;
|
|
226
|
+
}
|
|
227
|
+
onEvent?.({ type: 'tool_call', name: tc.name, id: tc.id, input: parsedInput });
|
|
228
|
+
const result = await this.registry.run(tc.name, parsedInput, signal ? { ...this.context, signal } : this.context);
|
|
229
|
+
const bounded = truncateToolOutput(result.output, this.config.maxToolResultBytes ?? 32_000);
|
|
230
|
+
const visibleResult = bounded.output;
|
|
231
|
+
// Record undo entry for this tool call
|
|
232
|
+
this.undoStack.push({
|
|
233
|
+
toolName: tc.name,
|
|
234
|
+
input: parsedInput,
|
|
235
|
+
result: {
|
|
236
|
+
title: result.title,
|
|
237
|
+
output: visibleResult,
|
|
238
|
+
metadata: result.metadata,
|
|
239
|
+
},
|
|
240
|
+
reverseInput: null,
|
|
241
|
+
timestamp: new Date().toISOString(),
|
|
242
|
+
});
|
|
243
|
+
onEvent?.({
|
|
244
|
+
type: 'tool_result',
|
|
245
|
+
name: tc.name,
|
|
246
|
+
id: tc.id,
|
|
247
|
+
output: visibleResult,
|
|
248
|
+
metadata: bounded.truncated
|
|
249
|
+
? { ...result.metadata, outputTruncated: true, omittedBytes: bounded.omittedBytes }
|
|
250
|
+
: result.metadata,
|
|
251
|
+
});
|
|
252
|
+
messages.push({
|
|
253
|
+
role: 'tool',
|
|
254
|
+
content: `[Tool ${tc.name} result]:\n${visibleResult}`,
|
|
255
|
+
tool_call_id: tc.id,
|
|
256
|
+
name: tc.name,
|
|
257
|
+
});
|
|
258
|
+
if (INVESTIGATION_TOOLS.has(tc.name))
|
|
259
|
+
hasInvestigated = true;
|
|
260
|
+
if (WRITE_TOOLS.has(tc.name)) {
|
|
261
|
+
const path = toolPath(parsedInput);
|
|
262
|
+
if (path)
|
|
263
|
+
changedFiles.add(path);
|
|
264
|
+
}
|
|
265
|
+
stallReason ??= observeAction(stall, tc.name, parsedInput, result.metadata, undefined, this.config);
|
|
266
|
+
}
|
|
267
|
+
catch (err) {
|
|
268
|
+
if (signal?.aborted)
|
|
269
|
+
throw err;
|
|
270
|
+
const error = err instanceof Error ? err.message : String(err);
|
|
271
|
+
onEvent?.({ type: 'tool_error', name: tc.name, id: tc.id, error });
|
|
272
|
+
messages.push({
|
|
273
|
+
role: 'tool',
|
|
274
|
+
content: `[Tool ${tc.name} error]: ${error}`,
|
|
275
|
+
tool_call_id: tc.id,
|
|
276
|
+
name: tc.name,
|
|
277
|
+
});
|
|
278
|
+
stallReason ??= observeAction(stall, tc.name, parsedInput ?? tc.arguments, undefined, error, this.config);
|
|
279
|
+
}
|
|
280
|
+
totalToolCalls++;
|
|
281
|
+
}
|
|
282
|
+
if (deferredFirstEdit) {
|
|
283
|
+
messages.push({ role: 'user', content: INVESTIGATION_NUDGE });
|
|
284
|
+
}
|
|
285
|
+
// Native tool-call protocols require one tool response for every call
|
|
286
|
+
// in the assistant message, including calls rejected by the budget.
|
|
287
|
+
for (const tc of skippedCalls) {
|
|
288
|
+
const error = `Skipped: reached the ${this.config.maxToolCallsPerTurn}-action turn limit.`;
|
|
130
289
|
onEvent?.({ type: 'tool_error', name: tc.name, id: tc.id, error });
|
|
131
290
|
messages.push({
|
|
132
291
|
role: 'tool',
|
|
@@ -135,15 +294,50 @@ export class AgentRunner {
|
|
|
135
294
|
name: tc.name,
|
|
136
295
|
});
|
|
137
296
|
}
|
|
297
|
+
if (totalToolCalls >= this.config.maxToolCallsPerTurn || skippedCalls.length > 0) {
|
|
298
|
+
return {
|
|
299
|
+
messages,
|
|
300
|
+
finalResponse: `Task paused after ${totalToolCalls} actions, the configured per-turn safety limit. Review the completed actions or send "continue" if more work is needed.`,
|
|
301
|
+
iterationsUsed: this.iterationCount,
|
|
302
|
+
usage: totalUsage,
|
|
303
|
+
stopReason: 'done',
|
|
304
|
+
};
|
|
305
|
+
}
|
|
306
|
+
if (stallReason) {
|
|
307
|
+
if (stallNudges === 0) {
|
|
308
|
+
stallNudges++;
|
|
309
|
+
messages.push({ role: 'user', content: `${STALL_NUDGE}\n\nDetected: ${stallReason}` });
|
|
310
|
+
resetStallCheckpoint(stall);
|
|
311
|
+
continue;
|
|
312
|
+
}
|
|
313
|
+
return {
|
|
314
|
+
messages,
|
|
315
|
+
finalResponse: renderStallSummary(stallReason, changedFiles, stall.recentLabels),
|
|
316
|
+
iterationsUsed: this.iterationCount,
|
|
317
|
+
usage: totalUsage,
|
|
318
|
+
stopReason: 'done',
|
|
319
|
+
};
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
catch (err) {
|
|
324
|
+
if (signal?.aborted || (err instanceof Error && err.message === 'interrupted')) {
|
|
325
|
+
throw new TurnInterruptedError(messages, this.iterationCount, totalUsage);
|
|
138
326
|
}
|
|
327
|
+
throw err;
|
|
139
328
|
}
|
|
140
329
|
// Max iterations reached
|
|
141
330
|
const lastMsg = messages.filter(m => m.role === 'assistant').pop();
|
|
331
|
+
const detail = lastMsg?.content.trim();
|
|
142
332
|
return {
|
|
143
333
|
messages,
|
|
144
|
-
finalResponse:
|
|
334
|
+
finalResponse: [
|
|
335
|
+
detail,
|
|
336
|
+
`Task paused after reaching the ${this.config.maxIterations}-iteration safety limit. Send \"continue\" to resume from the saved tool state.`,
|
|
337
|
+
].filter(Boolean).join('\n\n'),
|
|
145
338
|
iterationsUsed: this.iterationCount,
|
|
146
339
|
usage: totalUsage,
|
|
340
|
+
stopReason: 'max_iterations',
|
|
147
341
|
};
|
|
148
342
|
}
|
|
149
343
|
buildToolDefs() {
|
|
@@ -168,4 +362,114 @@ export class AgentRunner {
|
|
|
168
362
|
return calls;
|
|
169
363
|
}
|
|
170
364
|
}
|
|
365
|
+
function accumulateUsage(total, next) {
|
|
366
|
+
const merged = {
|
|
367
|
+
inputTokens: (total?.inputTokens ?? 0) + next.inputTokens,
|
|
368
|
+
outputTokens: (total?.outputTokens ?? 0) + next.outputTokens,
|
|
369
|
+
};
|
|
370
|
+
for (const key of ['cachedInputTokens', 'cacheMissInputTokens', 'cacheWriteInputTokens']) {
|
|
371
|
+
const value = (total?.[key] ?? 0) + (next[key] ?? 0);
|
|
372
|
+
if (value > 0 || total?.[key] !== undefined || next[key] !== undefined)
|
|
373
|
+
merged[key] = value;
|
|
374
|
+
}
|
|
375
|
+
return merged;
|
|
376
|
+
}
|
|
377
|
+
function observeAction(state, toolName, input, metadata, error, config) {
|
|
378
|
+
const signature = `${toolName}:${stableStringify(input)}`;
|
|
379
|
+
const label = `${toolName} ${summarizeInput(input)}`.trim();
|
|
380
|
+
const window = Math.max(2, config.stallWindow ?? 8);
|
|
381
|
+
state.recentActions.push(signature);
|
|
382
|
+
state.recentLabels.push(label);
|
|
383
|
+
if (state.recentActions.length > window)
|
|
384
|
+
state.recentActions.shift();
|
|
385
|
+
if (state.recentLabels.length > window)
|
|
386
|
+
state.recentLabels.shift();
|
|
387
|
+
if (signature === state.lastSignature)
|
|
388
|
+
state.repeatCount++;
|
|
389
|
+
else {
|
|
390
|
+
state.lastSignature = signature;
|
|
391
|
+
state.repeatCount = 1;
|
|
392
|
+
}
|
|
393
|
+
if (WRITE_TOOLS.has(toolName) && !error) {
|
|
394
|
+
state.consecutiveEdits++;
|
|
395
|
+
state.writeGeneration++;
|
|
396
|
+
}
|
|
397
|
+
else if (INVESTIGATION_TOOLS.has(toolName)) {
|
|
398
|
+
state.consecutiveEdits = 0;
|
|
399
|
+
}
|
|
400
|
+
const maxRepeats = Math.max(2, config.maxRepeats ?? 2);
|
|
401
|
+
if (state.repeatCount >= maxRepeats) {
|
|
402
|
+
return `the exact action “${label}” repeated ${state.repeatCount} times consecutively`;
|
|
403
|
+
}
|
|
404
|
+
const exitCode = typeof metadata?.exitCode === 'number' ? metadata.exitCode : undefined;
|
|
405
|
+
if (isTestAction(toolName, input) && (error || (exitCode !== undefined && exitCode !== 0))) {
|
|
406
|
+
const prior = state.lastFailedTest;
|
|
407
|
+
if (prior?.signature === signature && prior.writeGeneration === state.writeGeneration) {
|
|
408
|
+
prior.count++;
|
|
409
|
+
}
|
|
410
|
+
else {
|
|
411
|
+
state.lastFailedTest = { signature, writeGeneration: state.writeGeneration, count: 1 };
|
|
412
|
+
}
|
|
413
|
+
if ((state.lastFailedTest?.count ?? 0) >= maxRepeats) {
|
|
414
|
+
return `the same focused check failed ${state.lastFailedTest.count} times without an intervening source edit`;
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
const maxUnverifiedEdits = Math.max(2, config.maxUnverifiedEdits ?? 4);
|
|
418
|
+
if (state.consecutiveEdits >= maxUnverifiedEdits) {
|
|
419
|
+
return `${state.consecutiveEdits} consecutive source edits were made without a read, diff, or validation step`;
|
|
420
|
+
}
|
|
421
|
+
return undefined;
|
|
422
|
+
}
|
|
423
|
+
function resetStallCheckpoint(state) {
|
|
424
|
+
state.recentActions = [];
|
|
425
|
+
state.recentLabels = [];
|
|
426
|
+
state.lastSignature = undefined;
|
|
427
|
+
state.repeatCount = 0;
|
|
428
|
+
state.consecutiveEdits = 0;
|
|
429
|
+
state.lastFailedTest = undefined;
|
|
430
|
+
}
|
|
431
|
+
function renderStallSummary(reason, changedFiles, recentLabels) {
|
|
432
|
+
const files = changedFiles.size > 0 ? [...changedFiles].sort().join(', ') : 'none';
|
|
433
|
+
const actions = recentLabels.length > 0 ? recentLabels.map(action => `- ${action}`).join('\n') : '- none';
|
|
434
|
+
return [
|
|
435
|
+
'Task paused early because the agent remained stalled after a corrective checkpoint.',
|
|
436
|
+
'',
|
|
437
|
+
`Stall reason: ${reason}.`,
|
|
438
|
+
`Files changed this turn: ${files}.`,
|
|
439
|
+
'Recent actions:',
|
|
440
|
+
actions,
|
|
441
|
+
'',
|
|
442
|
+
'Resume with a different hypothesis or provide additional diagnostic context.',
|
|
443
|
+
].join('\n');
|
|
444
|
+
}
|
|
445
|
+
function toolPath(input) {
|
|
446
|
+
if (!input || typeof input !== 'object')
|
|
447
|
+
return undefined;
|
|
448
|
+
const value = input.filePath;
|
|
449
|
+
return typeof value === 'string' ? value : undefined;
|
|
450
|
+
}
|
|
451
|
+
function isTestAction(toolName, input) {
|
|
452
|
+
if (toolName === 'run_check')
|
|
453
|
+
return input?.kind === 'test';
|
|
454
|
+
if (toolName !== 'shell' || !input || typeof input !== 'object')
|
|
455
|
+
return false;
|
|
456
|
+
const record = input;
|
|
457
|
+
const command = [record.command, ...(Array.isArray(record.args) ? record.args : [])].join(' ');
|
|
458
|
+
return /\b(?:pytest|py\.test|vitest|jest|test|check)\b/i.test(command);
|
|
459
|
+
}
|
|
460
|
+
function summarizeInput(input) {
|
|
461
|
+
const text = stableStringify(input);
|
|
462
|
+
return text.length > 120 ? `${text.slice(0, 120)}…` : text;
|
|
463
|
+
}
|
|
464
|
+
function stableStringify(value) {
|
|
465
|
+
if (Array.isArray(value))
|
|
466
|
+
return `[${value.map(stableStringify).join(',')}]`;
|
|
467
|
+
if (value && typeof value === 'object') {
|
|
468
|
+
return `{${Object.entries(value)
|
|
469
|
+
.sort(([a], [b]) => a.localeCompare(b))
|
|
470
|
+
.map(([key, entry]) => `${JSON.stringify(key)}:${stableStringify(entry)}`)
|
|
471
|
+
.join(',')}}`;
|
|
472
|
+
}
|
|
473
|
+
return JSON.stringify(value);
|
|
474
|
+
}
|
|
171
475
|
//# sourceMappingURL=runner.js.map
|
package/dist/agent/runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/session.d.ts
CHANGED
|
@@ -1,17 +1,23 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type AgentEventHandler, type LoopResult, type TurnConfig } from './types.js';
|
|
2
2
|
import { type AgentMode, type CodePermissionMode } from './modes.js';
|
|
3
3
|
import type { ProviderAdapter } from '../providers/types.js';
|
|
4
4
|
import { type McpConnectionSummary } from '../mcp/register.js';
|
|
5
|
+
import type { RunOrigin } from '../audit/log.js';
|
|
5
6
|
export type ResolvedProvider = {
|
|
6
7
|
provider: ProviderAdapter;
|
|
7
8
|
providerId: string;
|
|
8
9
|
model: string;
|
|
9
10
|
};
|
|
11
|
+
export type ProviderResolutionOptions = {
|
|
12
|
+
provider?: string;
|
|
13
|
+
model?: string;
|
|
14
|
+
profile?: string;
|
|
15
|
+
};
|
|
10
16
|
/**
|
|
11
17
|
* Resolve the active provider from saved config: a provider pool takes priority
|
|
12
18
|
* when enabled, otherwise the single `llm` config (optionally overridden by name).
|
|
13
19
|
*/
|
|
14
|
-
export declare function resolveProvider(override?: string): Promise<ResolvedProvider>;
|
|
20
|
+
export declare function resolveProvider(override?: string | ProviderResolutionOptions): Promise<ResolvedProvider>;
|
|
15
21
|
export type RunTurnInput = {
|
|
16
22
|
/** The user's message (may contain @file references). */
|
|
17
23
|
content: string;
|
|
@@ -24,6 +30,12 @@ export type RunTurnInput = {
|
|
|
24
30
|
codePermissionMode?: CodePermissionMode;
|
|
25
31
|
/** Override the configured provider by name. */
|
|
26
32
|
providerOverride?: string;
|
|
33
|
+
/** Override the configured model. */
|
|
34
|
+
modelOverride?: string;
|
|
35
|
+
/** Resolve a named provider profile. Takes precedence over providerOverride. */
|
|
36
|
+
profileOverride?: string;
|
|
37
|
+
/** Surface recorded in the audit run_start event. */
|
|
38
|
+
origin?: RunOrigin;
|
|
27
39
|
/**
|
|
28
40
|
* Stable id for this logical message. Reusing an id whose turn already
|
|
29
41
|
* completed replays the prior result instead of re-running the model
|
|
@@ -31,6 +43,8 @@ export type RunTurnInput = {
|
|
|
31
43
|
*/
|
|
32
44
|
messageId?: string;
|
|
33
45
|
signal?: AbortSignal;
|
|
46
|
+
/** Optional per-turn runtime tuning (used by deterministic evaluation harnesses). */
|
|
47
|
+
turnConfig?: Partial<TurnConfig>;
|
|
34
48
|
};
|
|
35
49
|
/** A turn that crashed before completing, surfaced on the next resume with its input intact. */
|
|
36
50
|
export type RecoveredTurn = {
|
|
@@ -44,6 +58,14 @@ export type RunTurnHooks = {
|
|
|
44
58
|
onProviderSelected?: (providerId: string, model: string) => void;
|
|
45
59
|
/** Streams token deltas and tool events as the turn runs. */
|
|
46
60
|
onEvent?: AgentEventHandler;
|
|
61
|
+
/** Fired after the audit run_start record is written. */
|
|
62
|
+
onRunStart?: (details: {
|
|
63
|
+
sessionId: string;
|
|
64
|
+
runId: string;
|
|
65
|
+
provider: string;
|
|
66
|
+
model: string;
|
|
67
|
+
policyHash: string;
|
|
68
|
+
}) => void;
|
|
47
69
|
/** Approval gate for writes/commands in Cowork / Code-Ask mode. */
|
|
48
70
|
requestApproval?: (id: string, toolName: string, input: unknown) => Promise<boolean>;
|
|
49
71
|
};
|
|
@@ -54,6 +76,8 @@ export type RunTurnResult = {
|
|
|
54
76
|
reportMarkdown?: string;
|
|
55
77
|
providerId: string;
|
|
56
78
|
model: string;
|
|
79
|
+
/** Hash of the resolved org policy governing the turn. */
|
|
80
|
+
policyHash: string;
|
|
57
81
|
/** True when the turn was served from the journal (idempotent replay) without re-running. */
|
|
58
82
|
replayed?: boolean;
|
|
59
83
|
/** Turns that had crashed mid-execution and were closed out on this resume. */
|