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/compact.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import type { ChatMessage, ChatRequest, ProviderAdapter } from '../providers/types.js';
|
|
1
|
+
import type { ChatMessage, ChatRequest, ProviderAdapter, ToolDef } from '../providers/types.js';
|
|
2
2
|
export declare function estimateTokens(messages: ChatMessage[]): number;
|
|
3
|
-
|
|
3
|
+
/** Estimate the complete provider request, not just visible chat content. */
|
|
4
|
+
export declare function estimateRequestTokens(messages: ChatMessage[], systemPrompt: string, tools?: ToolDef[]): number;
|
|
5
|
+
export declare function summarizeWithLLM(messages: ChatMessage[], provider: ProviderAdapter, runtime?: ChatRequest['runtime'], signal?: AbortSignal): Promise<string>;
|
|
4
6
|
export declare function buildCompactedHistory(summary: string): ChatMessage[];
|
package/dist/agent/compact.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
export function estimateTokens(messages) {
|
|
2
|
-
const total = messages.reduce((acc, m) => acc + (m.content?.length ?? 0), 0);
|
|
2
|
+
const total = messages.reduce((acc, m) => acc + (m.content?.length ?? 0) + JSON.stringify(m.tool_calls ?? []).length, 0);
|
|
3
3
|
return Math.ceil(total / 4);
|
|
4
4
|
}
|
|
5
|
+
/** Estimate the complete provider request, not just visible chat content. */
|
|
6
|
+
export function estimateRequestTokens(messages, systemPrompt, tools = []) {
|
|
7
|
+
return estimateTokens(messages) + Math.ceil((systemPrompt.length + JSON.stringify(tools).length) / 4);
|
|
8
|
+
}
|
|
5
9
|
const COMPACT_PROMPT = `Summarize this coding session using exactly this format:
|
|
6
10
|
|
|
7
11
|
## Goal
|
|
@@ -17,22 +21,52 @@ const COMPACT_PROMPT = `Summarize this coding session using exactly this format:
|
|
|
17
21
|
- <remaining work items in priority order>
|
|
18
22
|
|
|
19
23
|
Be concise. Each bullet is one line. Omit sections with no content.`;
|
|
20
|
-
export async function summarizeWithLLM(messages, provider, runtime) {
|
|
21
|
-
const transcript = messages
|
|
22
|
-
.filter((m) => m.role === 'user' || m.role === 'assistant')
|
|
23
|
-
.map((m) => `${m.role === 'user' ? 'User' : 'Assistant'}: ${m.content.slice(0, 1000)}`)
|
|
24
|
-
.join('\n\n');
|
|
24
|
+
export async function summarizeWithLLM(messages, provider, runtime, signal) {
|
|
25
|
+
const transcript = compactTranscript(messages);
|
|
25
26
|
const resp = await provider.chat({
|
|
26
27
|
messages: [{ role: 'user', content: `${COMPACT_PROMPT}\n\n---\n${transcript}` }],
|
|
27
28
|
maxTokens: 600,
|
|
28
29
|
temperature: 0.3,
|
|
29
30
|
runtime,
|
|
31
|
+
signal,
|
|
30
32
|
});
|
|
31
33
|
return resp.content;
|
|
32
34
|
}
|
|
35
|
+
/**
|
|
36
|
+
* Keep compaction itself safely below the model context window while retaining
|
|
37
|
+
* both the original objective and the latest implementation/tool state.
|
|
38
|
+
*/
|
|
39
|
+
function compactTranscript(messages, maxChars = 64_000) {
|
|
40
|
+
const entries = messages
|
|
41
|
+
// Preserve an earlier compacted summary when compaction happens more than
|
|
42
|
+
// once in a long turn; ordinary system messages are supplied separately.
|
|
43
|
+
.filter((m) => m.role !== 'system' || m.content.startsWith('[Conversation summary]'))
|
|
44
|
+
.map((m) => {
|
|
45
|
+
const label = m.role === 'system'
|
|
46
|
+
? 'Previous session summary'
|
|
47
|
+
: m.role === 'user'
|
|
48
|
+
? 'User'
|
|
49
|
+
: m.role === 'assistant'
|
|
50
|
+
? 'Assistant'
|
|
51
|
+
: `Tool ${m.name ?? ''}`.trim();
|
|
52
|
+
const calls = m.tool_calls?.length ? `\nTool calls: ${JSON.stringify(m.tool_calls)}` : '';
|
|
53
|
+
return `${label}: ${m.content}${calls}`.slice(0, 4_000);
|
|
54
|
+
});
|
|
55
|
+
const first = entries[0];
|
|
56
|
+
const selected = [];
|
|
57
|
+
let used = first ? first.length : 0;
|
|
58
|
+
for (let i = entries.length - 1; i >= (first ? 1 : 0); i--) {
|
|
59
|
+
const entry = entries[i];
|
|
60
|
+
if (used + entry.length + 2 > maxChars)
|
|
61
|
+
break;
|
|
62
|
+
selected.unshift(entry);
|
|
63
|
+
used += entry.length + 2;
|
|
64
|
+
}
|
|
65
|
+
return [first, ...selected].filter((entry) => Boolean(entry)).join('\n\n');
|
|
66
|
+
}
|
|
33
67
|
export function buildCompactedHistory(summary) {
|
|
34
68
|
return [
|
|
35
|
-
{ role: 'system', content:
|
|
69
|
+
{ role: 'system', content: `[Conversation summary]\n\n${summary}` },
|
|
36
70
|
{ role: 'user', content: 'Context was compacted. Continue from the Pending list.' },
|
|
37
71
|
{ role: 'assistant', content: 'Understood. I have the session summary and am ready to continue.' },
|
|
38
72
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compact.js","sourceRoot":"","sources":["../../src/agent/compact.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,cAAc,CAAC,QAAuB;IACpD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"compact.js","sourceRoot":"","sources":["../../src/agent/compact.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,cAAc,CAAC,QAAuB;IACpD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAC3B,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,EACtF,CAAC,CACF,CAAC;IACF,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;AAC9B,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,qBAAqB,CACnC,QAAuB,EACvB,YAAoB,EACpB,QAAmB,EAAE;IAErB,OAAO,cAAc,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AACxG,CAAC;AAED,MAAM,cAAc,GAAG;;;;;;;;;;;;;;oEAc6C,CAAC;AAErE,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,QAAuB,EACvB,QAAyB,EACzB,OAAgC,EAChC,MAAoB;IAEpB,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAE/C,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC;QAC/B,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,YAAY,UAAU,EAAE,EAAE,CAAC;QAChF,SAAS,EAAE,GAAG;QACd,WAAW,EAAE,GAAG;QAChB,OAAO;QACP,MAAM;KACP,CAAC,CAAC;IACH,OAAO,IAAI,CAAC,OAAO,CAAC;AACtB,CAAC;AAED;;;GAGG;AACH,SAAS,iBAAiB,CAAC,QAAuB,EAAE,QAAQ,GAAG,MAAM;IACnE,MAAM,OAAO,GAAG,QAAQ;QACtB,0EAA0E;QAC1E,yEAAyE;SACxE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;SACpF,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,KAAK,QAAQ;YAC/B,CAAC,CAAC,0BAA0B;YAC5B,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM;gBACjB,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW;oBACtB,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;QACtC,MAAM,KAAK,GAAG,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1F,OAAO,GAAG,KAAK,KAAK,CAAC,CAAC,OAAO,GAAG,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEL,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAI,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3D,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAE,CAAC;QAC1B,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,GAAG,QAAQ;YAAE,MAAM;QAC9C,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACxB,IAAI,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3B,CAAC;IACD,OAAO,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC9F,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,OAAe;IACnD,OAAO;QACL,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,6BAA6B,OAAO,EAAE,EAAE;QACnE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,wDAAwD,EAAE;QACnF,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,kEAAkE,EAAE;KACnG,CAAC;AACJ,CAAC"}
|
package/dist/agent/loop.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type TurnConfig, type LoopResult, type SlashCommand, type AgentEventHandler } from './types.js';
|
|
2
|
+
import { type RunOrigin } from '../audit/log.js';
|
|
2
3
|
import { type LoadedPolicy } from '../core/policy.js';
|
|
3
4
|
import type { ChatMessage } from '../providers/types.js';
|
|
4
5
|
import type { ProviderAdapter } from '../providers/types.js';
|
|
@@ -16,6 +17,13 @@ export type AuditOptions = {
|
|
|
16
17
|
policy?: LoadedPolicy;
|
|
17
18
|
/** Session id recorded in run_start, linking the audit chain to the session journal. */
|
|
18
19
|
sessionId?: string;
|
|
20
|
+
/** Surface that initiated the run. */
|
|
21
|
+
origin?: RunOrigin;
|
|
22
|
+
/** Fired after run_start has been appended and before any provider request. */
|
|
23
|
+
onRunStart?: (details: {
|
|
24
|
+
runId: string;
|
|
25
|
+
policyHash: string;
|
|
26
|
+
}) => void;
|
|
19
27
|
};
|
|
20
28
|
export type AgentLoopOptions = {
|
|
21
29
|
provider: ProviderAdapter;
|
package/dist/agent/loop.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { TurnState, DEFAULT_TURN_CONFIG } from './types.js';
|
|
2
|
-
import { AgentRunner } from './runner.js';
|
|
3
|
-
import {
|
|
2
|
+
import { AgentRunner, TurnInterruptedError } from './runner.js';
|
|
3
|
+
import { buildCompactedHistory, estimateRequestTokens, summarizeWithLLM } from './compact.js';
|
|
4
4
|
import { AuditSink, newRunId, resolveGitHead } from '../audit/log.js';
|
|
5
5
|
import { minimizedDescriptor } from '../audit/minimize.js';
|
|
6
6
|
import { policyHash } from '../core/policy.js';
|
|
@@ -96,6 +96,7 @@ export class AgentLoop {
|
|
|
96
96
|
let usage;
|
|
97
97
|
let runId;
|
|
98
98
|
let auditHead;
|
|
99
|
+
let stopReason = 'done';
|
|
99
100
|
while (state !== TurnState.DONE) {
|
|
100
101
|
switch (state) {
|
|
101
102
|
case TurnState.RESTORE: {
|
|
@@ -104,7 +105,12 @@ export class AgentLoop {
|
|
|
104
105
|
// next turn. Wires up `contextTokenLimit` / `compactThreshold`, which
|
|
105
106
|
// were defined but previously never consulted by the state machine.
|
|
106
107
|
const triggerTokens = this.config.contextTokenLimit * this.config.compactThreshold;
|
|
107
|
-
|
|
108
|
+
const toolDefs = this.registry.list().map(tool => ({
|
|
109
|
+
name: tool.name,
|
|
110
|
+
description: tool.description,
|
|
111
|
+
parameters: tool.parametersSchema ?? tool.inputSchema.toJSONSchema?.() ?? {},
|
|
112
|
+
}));
|
|
113
|
+
if (estimateRequestTokens(messages, this.systemPrompt, toolDefs) > triggerTokens) {
|
|
108
114
|
state = TurnState.COMPACT;
|
|
109
115
|
}
|
|
110
116
|
else {
|
|
@@ -113,7 +119,7 @@ export class AgentLoop {
|
|
|
113
119
|
break;
|
|
114
120
|
}
|
|
115
121
|
case TurnState.COMPACT: {
|
|
116
|
-
const compacted = await this.handleCompact(messages);
|
|
122
|
+
const compacted = await this.handleCompact(messages, signal, true);
|
|
117
123
|
messages = compacted.messages;
|
|
118
124
|
state = TurnState.BUILD;
|
|
119
125
|
break;
|
|
@@ -156,10 +162,15 @@ export class AgentLoop {
|
|
|
156
162
|
model: this.auditOptions.model ?? 'unknown',
|
|
157
163
|
cwd: this.context.cwd,
|
|
158
164
|
gitHead: await resolveGitHead(this.context.cwd),
|
|
165
|
+
origin: this.auditOptions.origin ?? 'cli',
|
|
159
166
|
sessionId: this.auditOptions.sessionId,
|
|
160
167
|
policyHash: this.auditOptions.policy?.hash ?? policyHash(this.context.policy),
|
|
161
168
|
policySources: this.auditOptions.policy?.sources,
|
|
162
169
|
});
|
|
170
|
+
this.auditOptions.onRunStart?.({
|
|
171
|
+
runId,
|
|
172
|
+
policyHash: this.auditOptions.policy?.hash ?? policyHash(this.context.policy),
|
|
173
|
+
});
|
|
163
174
|
runContext = { ...this.context, audit: sink };
|
|
164
175
|
}
|
|
165
176
|
const runner = new AgentRunner({
|
|
@@ -169,6 +180,7 @@ export class AgentLoop {
|
|
|
169
180
|
config: this.config,
|
|
170
181
|
systemPrompt: this.systemPrompt,
|
|
171
182
|
sharedUndoStack: this.sharedUndoStack,
|
|
183
|
+
compactHistory: async (current, compactSignal) => (await this.handleCompact(current, compactSignal, true)).messages,
|
|
172
184
|
});
|
|
173
185
|
try {
|
|
174
186
|
const result = await runner.runTurn(userMessage, messages, onEvent, signal);
|
|
@@ -176,10 +188,15 @@ export class AgentLoop {
|
|
|
176
188
|
output = result.finalResponse;
|
|
177
189
|
iterationsUsed = result.iterationsUsed;
|
|
178
190
|
usage = result.usage;
|
|
191
|
+
stopReason = result.stopReason;
|
|
179
192
|
this.finishRun(sink, 'done', iterationsUsed, usage);
|
|
180
193
|
auditHead = sink?.head();
|
|
181
194
|
}
|
|
182
195
|
catch (err) {
|
|
196
|
+
if (err instanceof TurnInterruptedError) {
|
|
197
|
+
iterationsUsed = err.iterationsUsed;
|
|
198
|
+
usage = err.usage;
|
|
199
|
+
}
|
|
183
200
|
const status = err instanceof Error && err.message === 'interrupted' ? 'interrupted' : 'error';
|
|
184
201
|
this.finishRun(sink, status, iterationsUsed, usage);
|
|
185
202
|
throw err;
|
|
@@ -197,7 +214,7 @@ export class AgentLoop {
|
|
|
197
214
|
}
|
|
198
215
|
}
|
|
199
216
|
}
|
|
200
|
-
return { messages, output, iterationsUsed, usage, runId, auditHead };
|
|
217
|
+
return { messages, output, iterationsUsed, usage, runId, auditHead, stopReason };
|
|
201
218
|
}
|
|
202
219
|
/** Emit the terminal run_end event, folding in any best-effort write warnings. */
|
|
203
220
|
finishRun(sink, status, iterations, usage) {
|
|
@@ -210,44 +227,33 @@ export class AgentLoop {
|
|
|
210
227
|
iterations,
|
|
211
228
|
inputTokens: usage?.inputTokens,
|
|
212
229
|
outputTokens: usage?.outputTokens,
|
|
230
|
+
cachedInputTokens: usage?.cachedInputTokens,
|
|
231
|
+
cacheMissInputTokens: usage?.cacheMissInputTokens,
|
|
232
|
+
cacheWriteInputTokens: usage?.cacheWriteInputTokens,
|
|
213
233
|
warnings: warnings.length > 0 ? warnings : undefined,
|
|
214
234
|
});
|
|
215
235
|
}
|
|
216
|
-
async handleCompact(messages) {
|
|
217
|
-
if (messages.length <= 10) {
|
|
236
|
+
async handleCompact(messages, signal, force = false) {
|
|
237
|
+
if (!force && messages.length <= 10) {
|
|
218
238
|
return { messages, output: 'Context is already small enough.' };
|
|
219
239
|
}
|
|
220
|
-
const conversationText = messages
|
|
221
|
-
.filter(m => m.role !== 'system')
|
|
222
|
-
.map(m => `[${m.role}]: ${m.content}`)
|
|
223
|
-
.join('\n\n');
|
|
224
240
|
try {
|
|
225
|
-
const
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
runtime: {
|
|
234
|
-
policy: this.context.policy,
|
|
235
|
-
audit: this.context.audit,
|
|
236
|
-
model: this.auditOptions.model,
|
|
237
|
-
},
|
|
238
|
-
});
|
|
239
|
-
const systemMsg = messages.find(m => m.role === 'system');
|
|
240
|
-
const summaryMsg = {
|
|
241
|
-
role: 'assistant',
|
|
242
|
-
content: `[Conversation summary]\n${summaryResponse.content}`,
|
|
243
|
-
};
|
|
244
|
-
const kept = systemMsg ? [systemMsg, summaryMsg] : [summaryMsg];
|
|
241
|
+
const summary = await summarizeWithLLM(messages, this.provider, {
|
|
242
|
+
policy: this.context.policy,
|
|
243
|
+
audit: this.context.audit,
|
|
244
|
+
model: this.auditOptions.model,
|
|
245
|
+
}, signal);
|
|
246
|
+
if (signal?.aborted)
|
|
247
|
+
throw new Error('interrupted');
|
|
248
|
+
const kept = buildCompactedHistory(summary);
|
|
245
249
|
return {
|
|
246
250
|
messages: kept,
|
|
247
251
|
output: `Compacted: reduced from ${messages.length} to ${kept.length} messages using LLM summarization.`,
|
|
248
252
|
};
|
|
249
253
|
}
|
|
250
|
-
catch {
|
|
254
|
+
catch (err) {
|
|
255
|
+
if (signal?.aborted)
|
|
256
|
+
throw new Error('interrupted');
|
|
251
257
|
// Fallback: keep last 20 messages
|
|
252
258
|
const systemMsg = messages.find(m => m.role === 'system');
|
|
253
259
|
const recentMessages = messages.filter(m => m.role !== 'system').slice(-20);
|
package/dist/agent/loop.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loop.js","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA+E,mBAAmB,EAAkB,MAAM,YAAY,CAAC;AACzJ,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"loop.js","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/modes.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ApprovalMode } from '../core/context.js';
|
|
2
|
-
/** Top-level agent mode
|
|
3
|
-
export type AgentMode = 'chat' | 'cowork' | 'code';
|
|
2
|
+
/** Top-level agent mode. Home in the GUI maps to Chat or Cowork. */
|
|
3
|
+
export type AgentMode = 'chat' | 'cowork' | 'code' | 'dvalin';
|
|
4
4
|
/** Fine-grained permission within Code mode. */
|
|
5
5
|
export type CodePermissionMode = 'ask' | 'plan' | 'auto' | 'bypass';
|
|
6
6
|
/** Tools allowed per mode; `null` means all registered tools. */
|
package/dist/agent/modes.js
CHANGED
|
@@ -14,11 +14,13 @@ export const MODE_TOOLS = {
|
|
|
14
14
|
],
|
|
15
15
|
cowork: null,
|
|
16
16
|
code: null,
|
|
17
|
+
dvalin: null,
|
|
17
18
|
};
|
|
18
19
|
export const MODE_APPROVAL = {
|
|
19
20
|
chat: 'readonly',
|
|
20
21
|
cowork: 'auto-edit',
|
|
21
22
|
code: 'full-auto',
|
|
23
|
+
dvalin: 'full-auto',
|
|
22
24
|
};
|
|
23
25
|
export const CODE_PERMISSION_APPROVAL = {
|
|
24
26
|
ask: 'auto-edit',
|
|
@@ -29,16 +31,17 @@ export const CODE_PERMISSION_APPROVAL = {
|
|
|
29
31
|
export const MODE_PROMPT = {
|
|
30
32
|
chat: 'You are in Chat mode. Answer questions, explain code, and discuss ideas. Do NOT write, edit, delete files or run shell commands — read-only tools only.',
|
|
31
33
|
cowork: 'You are in Cowork mode. Work collaboratively. Briefly explain your plan before making changes. Prefer focused, surgical edits. File writes and shell commands require user approval.',
|
|
32
|
-
code: 'You are in Code mode. Work autonomously to complete the task efficiently. Use all available tools as needed. For git fetch/pull/push/clone or package downloads that need outbound network access, use shell with networkAccess="unrestricted"
|
|
34
|
+
code: 'You are in Code mode. Work autonomously to complete the task efficiently. For bug fixes, investigate before editing: first reproduce or inspect the failure, then use search/read evidence to identify the responsible file and line, and only then make the smallest justified change. After editing, rerun the focused failing check before broader validation. Use all available tools as needed. Git and GitHub CLI (gh) operations are supported through shell. For git fetch/pull/push/clone, gh operations, or package downloads that need outbound network access, use shell with networkAccess="unrestricted"; the selected permission mode determines whether runtime approval is required.',
|
|
35
|
+
dvalin: 'You are in Dvalin mode: a security engineering agent for white-box assessment and test-backed remediation. Start from scanner evidence, inspect source and data flow before editing, remove the vulnerability class with the smallest safe change, and rerun focused tests plus the Dvalin security suite. Treat findings as hypotheses until code evidence confirms them. Never weaken tests, suppress a rule, or mark a case verified merely to make a scan pass. Before publishing, review the diff, report remaining risk, and create a draft pull request only when the user explicitly requests publication. Use run_security_suite, remediation cases, isolated worktrees, tests, git, and repository CLI tools as appropriate.',
|
|
33
36
|
};
|
|
34
37
|
export const CODE_PERMISSION_PROMPT = {
|
|
35
38
|
ask: 'Code permission mode: Ask Permissions. Request approval before edits, deletes, or shell commands.',
|
|
36
39
|
plan: 'Code permission mode: Plan Mode. Create a clear plan only. Do not write files, delete files, or run shell commands.',
|
|
37
40
|
auto: 'Code permission mode: Auto Mode. Complete the task autonomously with normal tool access.',
|
|
38
|
-
bypass: 'Code permission mode: Bypass Permissions.
|
|
41
|
+
bypass: 'Code permission mode: Bypass Permissions. Automatically approve every runtime permission request without prompting, including unrestricted subprocess network access. Organization policy restrictions remain enforced.',
|
|
39
42
|
};
|
|
40
43
|
/** Resolve the effective approval mode for a (mode, codePermissionMode) pair. */
|
|
41
44
|
export function resolveApprovalMode(mode, codePermissionMode) {
|
|
42
|
-
return mode === 'code' ? CODE_PERMISSION_APPROVAL[codePermissionMode] : MODE_APPROVAL[mode];
|
|
45
|
+
return mode === 'code' || mode === 'dvalin' ? CODE_PERMISSION_APPROVAL[codePermissionMode] : MODE_APPROVAL[mode];
|
|
43
46
|
}
|
|
44
47
|
//# sourceMappingURL=modes.js.map
|
package/dist/agent/modes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modes.js","sourceRoot":"","sources":["../../src/agent/modes.ts"],"names":[],"mappings":"AAQA,iEAAiE;AACjE,MAAM,CAAC,MAAM,UAAU,GAAuC;IAC5D,IAAI,EAAI;QACN,WAAW;QACX,YAAY;QACZ,aAAa;QACb,YAAY;QACZ,UAAU;QACV,iBAAiB;QACjB,eAAe;QACf,aAAa;QACb,YAAY;QACZ,wBAAwB;KACzB;IACD,MAAM,EAAE,IAAI;IACZ,IAAI,EAAI,IAAI;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAoC;IAC5D,IAAI,EAAI,UAAU;IAClB,MAAM,EAAE,WAAW;IACnB,IAAI,EAAI,WAAW;CACpB,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAA6C;IAChF,GAAG,EAAK,WAAW;IACnB,IAAI,EAAI,UAAU;IAClB,IAAI,EAAI,WAAW;IACnB,MAAM,EAAE,QAAQ;CACjB,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAA8B;IACpD,IAAI,EACF,yJAAyJ;IAC3J,MAAM,EACJ,sLAAsL;IACxL,IAAI,EACF,
|
|
1
|
+
{"version":3,"file":"modes.js","sourceRoot":"","sources":["../../src/agent/modes.ts"],"names":[],"mappings":"AAQA,iEAAiE;AACjE,MAAM,CAAC,MAAM,UAAU,GAAuC;IAC5D,IAAI,EAAI;QACN,WAAW;QACX,YAAY;QACZ,aAAa;QACb,YAAY;QACZ,UAAU;QACV,iBAAiB;QACjB,eAAe;QACf,aAAa;QACb,YAAY;QACZ,wBAAwB;KACzB;IACD,MAAM,EAAE,IAAI;IACZ,IAAI,EAAI,IAAI;IACZ,MAAM,EAAE,IAAI;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAoC;IAC5D,IAAI,EAAI,UAAU;IAClB,MAAM,EAAE,WAAW;IACnB,IAAI,EAAI,WAAW;IACnB,MAAM,EAAE,WAAW;CACpB,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAA6C;IAChF,GAAG,EAAK,WAAW;IACnB,IAAI,EAAI,UAAU;IAClB,IAAI,EAAI,WAAW;IACnB,MAAM,EAAE,QAAQ;CACjB,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAA8B;IACpD,IAAI,EACF,yJAAyJ;IAC3J,MAAM,EACJ,sLAAsL;IACxL,IAAI,EACF,uqBAAuqB;IACzqB,MAAM,EACJ,wsBAAwsB;CAC3sB,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAuC;IACxE,GAAG,EAAK,mGAAmG;IAC3G,IAAI,EAAI,qHAAqH;IAC7H,IAAI,EAAI,0FAA0F;IAClG,MAAM,EAAE,yNAAyN;CAClO,CAAC;AAEF,iFAAiF;AACjF,MAAM,UAAU,mBAAmB,CAAC,IAAe,EAAE,kBAAsC;IACzF,OAAO,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,wBAAwB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;AACnH,CAAC"}
|
package/dist/agent/runner.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { ChatMessage, ProviderAdapter } from '../providers/types.js';
|
|
2
|
-
import type
|
|
1
|
+
import type { ChatMessage, TokenUsage, ProviderAdapter } from '../providers/types.js';
|
|
2
|
+
import { type ToolRegistry } from '../tools/registry.js';
|
|
3
3
|
import type { DvalinContext } from '../core/context.js';
|
|
4
4
|
import type { TurnConfig, UndoEntry, AgentEventHandler } from './types.js';
|
|
5
5
|
export type RunnerOptions = {
|
|
@@ -9,7 +9,17 @@ export type RunnerOptions = {
|
|
|
9
9
|
config: TurnConfig;
|
|
10
10
|
systemPrompt: string;
|
|
11
11
|
sharedUndoStack?: UndoEntry[];
|
|
12
|
+
compactHistory?: (messages: ChatMessage[], signal?: AbortSignal) => Promise<ChatMessage[]>;
|
|
12
13
|
};
|
|
14
|
+
/** Carries the completed model/tool state so an interrupted turn can resume. */
|
|
15
|
+
export declare class TurnInterruptedError extends Error {
|
|
16
|
+
readonly messages: ChatMessage[];
|
|
17
|
+
readonly iterationsUsed: number;
|
|
18
|
+
readonly usage?: TokenUsage | undefined;
|
|
19
|
+
constructor(messages: ChatMessage[], iterationsUsed: number, usage?: TokenUsage | undefined);
|
|
20
|
+
}
|
|
21
|
+
/** Detect a process update that must not be mistaken for a final answer. */
|
|
22
|
+
export declare function looksLikePendingWork(content: string, finishReason?: string): boolean;
|
|
13
23
|
export declare class AgentRunner {
|
|
14
24
|
private provider;
|
|
15
25
|
private registry;
|
|
@@ -17,6 +27,7 @@ export declare class AgentRunner {
|
|
|
17
27
|
private config;
|
|
18
28
|
private systemPrompt;
|
|
19
29
|
private iterationCount;
|
|
30
|
+
private compactHistory?;
|
|
20
31
|
/** Stack of executed tool calls for undo support */
|
|
21
32
|
private undoStack;
|
|
22
33
|
constructor(options: RunnerOptions);
|
|
@@ -27,10 +38,8 @@ export declare class AgentRunner {
|
|
|
27
38
|
messages: ChatMessage[];
|
|
28
39
|
finalResponse: string;
|
|
29
40
|
iterationsUsed: number;
|
|
30
|
-
usage?:
|
|
31
|
-
|
|
32
|
-
outputTokens: number;
|
|
33
|
-
};
|
|
41
|
+
usage?: TokenUsage;
|
|
42
|
+
stopReason: 'done' | 'max_iterations';
|
|
34
43
|
}>;
|
|
35
44
|
private buildToolDefs;
|
|
36
45
|
private parseToolCalls;
|