dvalincode 0.23.0 → 0.24.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 +51 -12
- package/README.zh-CN.md +43 -11
- package/dist/agent/compact.js +9 -1
- package/dist/agent/compact.js.map +1 -1
- package/dist/agent/loop.d.ts +9 -1
- package/dist/agent/loop.js +56 -12
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/modes.js +7 -0
- package/dist/agent/modes.js.map +1 -1
- package/dist/agent/runner.d.ts +2 -1
- package/dist/agent/runner.js +180 -32
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/session.d.ts +21 -0
- package/dist/agent/session.js +71 -33
- package/dist/agent/session.js.map +1 -1
- package/dist/agent/toolFollowups.d.ts +13 -0
- package/dist/agent/toolFollowups.js +50 -0
- package/dist/agent/toolFollowups.js.map +1 -0
- package/dist/agent/types.d.ts +3 -1
- package/dist/agent/types.js.map +1 -1
- package/dist/audit/log.d.ts +41 -1
- package/dist/audit/log.js.map +1 -1
- package/dist/audit/minimize.js +2 -1
- package/dist/audit/minimize.js.map +1 -1
- package/dist/audit/taps.js +10 -1
- package/dist/audit/taps.js.map +1 -1
- package/dist/cli.js +2 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/checkpoint.d.ts +3 -0
- package/dist/commands/checkpoint.js +34 -0
- package/dist/commands/checkpoint.js.map +1 -0
- package/dist/commands/run.d.ts +1 -0
- package/dist/commands/run.js +46 -18
- package/dist/commands/run.js.map +1 -1
- package/dist/core/checkpoint.d.ts +41 -0
- package/dist/core/checkpoint.js +159 -0
- package/dist/core/checkpoint.js.map +1 -0
- package/dist/core/context.d.ts +7 -0
- package/dist/core/context.js +1 -0
- package/dist/core/context.js.map +1 -1
- package/dist/core/gitRead.d.ts +20 -0
- package/dist/core/gitRead.js +97 -0
- package/dist/core/gitRead.js.map +1 -0
- package/dist/core/ignorefile.d.ts +2 -0
- package/dist/core/ignorefile.js +8 -0
- package/dist/core/ignorefile.js.map +1 -1
- package/dist/core/policy.d.ts +4 -0
- package/dist/core/policy.js +8 -6
- package/dist/core/policy.js.map +1 -1
- package/dist/core/redactSecrets.d.ts +14 -0
- package/dist/core/redactSecrets.js +35 -0
- package/dist/core/redactSecrets.js.map +1 -0
- package/dist/core/trust.d.ts +5 -0
- package/dist/core/trust.js +12 -0
- package/dist/core/trust.js.map +1 -1
- package/dist/core/webEgress.d.ts +66 -0
- package/dist/core/webEgress.js +281 -0
- package/dist/core/webEgress.js.map +1 -0
- package/dist/evidence/compliance.js +1 -1
- package/dist/evidence/compliance.js.map +1 -1
- package/dist/harness/run.d.ts +4 -0
- package/dist/harness/run.js +20 -15
- package/dist/harness/run.js.map +1 -1
- package/dist/mcp/register.js +4 -1
- package/dist/mcp/register.js.map +1 -1
- package/dist/mcp/server.d.ts +3 -2
- package/dist/mcp/server.js +28 -9
- package/dist/mcp/server.js.map +1 -1
- package/dist/providers/anthropic.js +16 -1
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/chatImages.d.ts +21 -0
- package/dist/providers/chatImages.js +18 -0
- package/dist/providers/chatImages.js.map +1 -0
- package/dist/providers/egress.js +7 -0
- package/dist/providers/egress.js.map +1 -1
- package/dist/providers/openaiCompatible.js +19 -1
- package/dist/providers/openaiCompatible.js.map +1 -1
- package/dist/providers/retry.js +2 -0
- package/dist/providers/retry.js.map +1 -1
- package/dist/providers/runBudget.d.ts +11 -0
- package/dist/providers/runBudget.js +74 -0
- package/dist/providers/runBudget.js.map +1 -0
- package/dist/providers/types.d.ts +6 -0
- package/dist/server/auth.d.ts +33 -0
- package/dist/server/auth.js +53 -0
- package/dist/server/auth.js.map +1 -0
- package/dist/server/configStore.d.ts +10 -0
- package/dist/server/configStore.js +9 -0
- package/dist/server/configStore.js.map +1 -1
- package/dist/server/index.d.ts +5 -0
- package/dist/server/index.js +73 -5
- package/dist/server/index.js.map +1 -1
- package/dist/server/routes/config.js +37 -0
- package/dist/server/routes/config.js.map +1 -1
- package/dist/server/routes/sessions.js +2 -1
- package/dist/server/routes/sessions.js.map +1 -1
- package/dist/server/wsHandler.js +23 -12
- package/dist/server/wsHandler.js.map +1 -1
- package/dist/sessions/journal.d.ts +2 -0
- package/dist/sessions/journal.js.map +1 -1
- package/dist/sessions/store.d.ts +6 -0
- package/dist/sessions/store.js +11 -0
- package/dist/sessions/store.js.map +1 -1
- package/dist/tools/applyPatch.d.ts +13 -0
- package/dist/tools/applyPatch.js +144 -0
- package/dist/tools/applyPatch.js.map +1 -0
- package/dist/tools/askUser.d.ts +3 -0
- package/dist/tools/askUser.js +23 -0
- package/dist/tools/askUser.js.map +1 -0
- package/dist/tools/checkDiagnostics.d.ts +8 -0
- package/dist/tools/checkDiagnostics.js +48 -0
- package/dist/tools/checkDiagnostics.js.map +1 -0
- package/dist/tools/editFile.d.ts +8 -2
- package/dist/tools/editFile.js +95 -26
- package/dist/tools/editFile.js.map +1 -1
- package/dist/tools/gitBlame.d.ts +11 -0
- package/dist/tools/gitBlame.js +43 -0
- package/dist/tools/gitBlame.js.map +1 -0
- package/dist/tools/gitDiff.js +13 -24
- package/dist/tools/gitDiff.js.map +1 -1
- package/dist/tools/gitLog.d.ts +11 -0
- package/dist/tools/gitLog.js +39 -0
- package/dist/tools/gitLog.js.map +1 -0
- package/dist/tools/gitShow.d.ts +11 -0
- package/dist/tools/gitShow.js +41 -0
- package/dist/tools/gitShow.js.map +1 -0
- package/dist/tools/gitStatus.js +2 -5
- package/dist/tools/gitStatus.js.map +1 -1
- package/dist/tools/htmlText.d.ts +19 -0
- package/dist/tools/htmlText.js +104 -0
- package/dist/tools/htmlText.js.map +1 -0
- package/dist/tools/readFile.js +84 -1
- package/dist/tools/readFile.js.map +1 -1
- package/dist/tools/registry.d.ts +2 -1
- package/dist/tools/registry.js +29 -3
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/rollbackRun.d.ts +5 -0
- package/dist/tools/rollbackRun.js +142 -0
- package/dist/tools/rollbackRun.js.map +1 -0
- package/dist/tools/runCheck.js +10 -1
- package/dist/tools/runCheck.js.map +1 -1
- package/dist/tools/searchText.d.ts +10 -0
- package/dist/tools/searchText.js +193 -19
- package/dist/tools/searchText.js.map +1 -1
- package/dist/tools/updatePlan.d.ts +38 -0
- package/dist/tools/updatePlan.js +81 -0
- package/dist/tools/updatePlan.js.map +1 -0
- package/dist/tools/webFetch.d.ts +8 -0
- package/dist/tools/webFetch.js +103 -0
- package/dist/tools/webFetch.js.map +1 -0
- package/dist/tools/webSearch.d.ts +26 -0
- package/dist/tools/webSearch.js +157 -0
- package/dist/tools/webSearch.js.map +1 -0
- package/dist/tools/writeFile.js +4 -1
- package/dist/tools/writeFile.js.map +1 -1
- package/dist/tui/app.js +22 -1
- package/dist/tui/app.js.map +1 -1
- package/dist/tui/render.js +7 -1
- package/dist/tui/render.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { chmod, lstat, mkdir, rename, rmdir, unlink, writeFile } from 'node:fs/promises';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { z } from 'zod';
|
|
5
|
+
import { checkpointPath, loadCheckpoint, readCheckpointBlob, readCheckpointFile, sameFileState } from '../core/checkpoint.js';
|
|
6
|
+
import { isIgnoredPath, loadIgnorePatterns } from '../core/ignorefile.js';
|
|
7
|
+
import { resolveWorkspaceRoot } from '../core/workspace.js';
|
|
8
|
+
import { ToolRegistry } from './registry.js';
|
|
9
|
+
const inputSchema = z.object({ runId: z.string() }).strict();
|
|
10
|
+
const activeRollbacks = new Set();
|
|
11
|
+
async function restoreCheckpoint(runId, manifest, context) {
|
|
12
|
+
const root = await resolveWorkspaceRoot(context.cwd);
|
|
13
|
+
if (root !== manifest.root)
|
|
14
|
+
throw new Error('Checkpoint belongs to another workspace');
|
|
15
|
+
const ignore = await loadIgnorePatterns(root);
|
|
16
|
+
const staged = [];
|
|
17
|
+
const temporary = new Set();
|
|
18
|
+
const committed = [];
|
|
19
|
+
const recovery = [];
|
|
20
|
+
const createdDirectories = new Set();
|
|
21
|
+
const stage = async (target, bytes, mode) => {
|
|
22
|
+
const directory = await existingParent(path.dirname(target), root);
|
|
23
|
+
const file = path.join(directory, `.dvalin-rollback-${randomUUID()}`);
|
|
24
|
+
await writeFile(file, bytes, { flag: 'wx', mode: 0o600 });
|
|
25
|
+
temporary.add(file);
|
|
26
|
+
await chmod(file, mode);
|
|
27
|
+
return file;
|
|
28
|
+
};
|
|
29
|
+
const paths = new Set();
|
|
30
|
+
try {
|
|
31
|
+
for (const change of manifest.changes) {
|
|
32
|
+
const target = await checkpointPath(root, change.filePath);
|
|
33
|
+
if (paths.has(target) || path.relative(root, target).split(path.sep).join('/') !== change.filePath ||
|
|
34
|
+
isIgnoredPath(change.filePath, ignore))
|
|
35
|
+
throw new Error(`Checkpoint path is unavailable: ${change.filePath}`);
|
|
36
|
+
paths.add(target);
|
|
37
|
+
const current = await readCheckpointFile(target);
|
|
38
|
+
if (!sameFileState(current?.state ?? null, change.after))
|
|
39
|
+
throw new Error(`Rollback conflict: ${change.filePath}`);
|
|
40
|
+
const item = { change, target };
|
|
41
|
+
if (change.before)
|
|
42
|
+
item.restore = await stage(target, await readCheckpointBlob(runId, change.before), change.before.mode);
|
|
43
|
+
if (current)
|
|
44
|
+
item.backup = await stage(target, current.bytes, current.state.mode);
|
|
45
|
+
staged.push(item);
|
|
46
|
+
}
|
|
47
|
+
for (const item of staged) {
|
|
48
|
+
if (context.signal?.aborted)
|
|
49
|
+
throw new Error('interrupted');
|
|
50
|
+
const target = await checkpointPath(root, item.change.filePath);
|
|
51
|
+
if (!sameFileState((await readCheckpointFile(target))?.state ?? null, item.change.after)) {
|
|
52
|
+
throw new Error(`Rollback conflict: ${item.change.filePath}`);
|
|
53
|
+
}
|
|
54
|
+
if (item.restore) {
|
|
55
|
+
const parent = path.dirname(target);
|
|
56
|
+
const existing = await existingParent(parent, root);
|
|
57
|
+
let directory = existing;
|
|
58
|
+
if (parent !== existing) {
|
|
59
|
+
for (const part of path.relative(existing, parent).split(path.sep)) {
|
|
60
|
+
directory = path.join(directory, part);
|
|
61
|
+
await mkdir(directory);
|
|
62
|
+
createdDirectories.add(directory);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
await checkpointPath(root, item.change.filePath);
|
|
66
|
+
await rename(item.restore, target);
|
|
67
|
+
}
|
|
68
|
+
else if (item.change.after) {
|
|
69
|
+
await unlink(target);
|
|
70
|
+
}
|
|
71
|
+
committed.push(item);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
catch (error) {
|
|
75
|
+
for (const item of committed.reverse()) {
|
|
76
|
+
try {
|
|
77
|
+
const target = await checkpointPath(root, item.change.filePath);
|
|
78
|
+
if (!sameFileState((await readCheckpointFile(target))?.state ?? null, item.change.before))
|
|
79
|
+
throw new Error('Conflict');
|
|
80
|
+
if (item.backup)
|
|
81
|
+
await rename(item.backup, target);
|
|
82
|
+
else if (item.change.before)
|
|
83
|
+
await unlink(target);
|
|
84
|
+
}
|
|
85
|
+
catch {
|
|
86
|
+
recovery.push(item.backup ?? item.target);
|
|
87
|
+
if (item.backup)
|
|
88
|
+
temporary.delete(item.backup);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
for (const directory of [...createdDirectories].reverse())
|
|
92
|
+
await rmdir(directory).catch(() => undefined);
|
|
93
|
+
if (recovery.length)
|
|
94
|
+
throw new Error(`Rollback was interrupted. Inspect recovery paths: ${recovery.join(', ')}`);
|
|
95
|
+
throw error;
|
|
96
|
+
}
|
|
97
|
+
finally {
|
|
98
|
+
await Promise.allSettled([...temporary].map(file => unlink(file)));
|
|
99
|
+
}
|
|
100
|
+
context.audit?.append({ type: 'run_rollback', sourceRunId: runId, files: committed.length });
|
|
101
|
+
return { title: 'Run rollback', output: `Restored ${committed.length} file(s) from run ${runId}.` };
|
|
102
|
+
}
|
|
103
|
+
export async function createRollbackRegistry(runId) {
|
|
104
|
+
const manifest = await loadCheckpoint(runId);
|
|
105
|
+
const registry = new ToolRegistry();
|
|
106
|
+
registry.register({
|
|
107
|
+
name: 'rollback_run',
|
|
108
|
+
description: 'Restore covered files from a previous workspace checkpoint when they still match the end of that run.',
|
|
109
|
+
access: 'write',
|
|
110
|
+
inputSchema: inputSchema.refine(input => input.runId === runId, 'Checkpoint ID mismatch'),
|
|
111
|
+
policyTargets: () => manifest.changes.map(({ filePath }) => ({ kind: 'path', value: filePath })),
|
|
112
|
+
async run(_input, context) {
|
|
113
|
+
const root = await resolveWorkspaceRoot(context.cwd);
|
|
114
|
+
if (activeRollbacks.has(root))
|
|
115
|
+
throw new Error('A rollback is already in progress for this workspace');
|
|
116
|
+
activeRollbacks.add(root);
|
|
117
|
+
try {
|
|
118
|
+
return await restoreCheckpoint(runId, manifest, context);
|
|
119
|
+
}
|
|
120
|
+
finally {
|
|
121
|
+
activeRollbacks.delete(root);
|
|
122
|
+
}
|
|
123
|
+
},
|
|
124
|
+
});
|
|
125
|
+
return { registry, root: manifest.root };
|
|
126
|
+
}
|
|
127
|
+
async function existingParent(directory, root) {
|
|
128
|
+
while (directory !== root) {
|
|
129
|
+
try {
|
|
130
|
+
if (!(await lstat(directory)).isDirectory())
|
|
131
|
+
throw new Error('Checkpoint parent must be a regular directory');
|
|
132
|
+
return directory;
|
|
133
|
+
}
|
|
134
|
+
catch (error) {
|
|
135
|
+
if (error.code !== 'ENOENT')
|
|
136
|
+
throw error;
|
|
137
|
+
directory = path.dirname(directory);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
return root;
|
|
141
|
+
}
|
|
142
|
+
//# sourceMappingURL=rollbackRun.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rollbackRun.js","sourceRoot":"","sources":["../../src/tools/rollbackRun.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/runCheck.js
CHANGED
|
@@ -5,6 +5,7 @@ import { detectScripts } from './projectScripts.js';
|
|
|
5
5
|
import { checkCommand, PolicyViolationError } from '../core/policy.js';
|
|
6
6
|
import { runGovernedProcess } from '../core/subprocessSandbox.js';
|
|
7
7
|
import { minimizedDescriptor } from '../audit/minimize.js';
|
|
8
|
+
import { parseCheckDiagnostics } from './checkDiagnostics.js';
|
|
8
9
|
const inputSchema = z
|
|
9
10
|
.object({
|
|
10
11
|
kind: z.enum(['test', 'typecheck', 'build', 'lint', 'custom']),
|
|
@@ -20,6 +21,9 @@ export const runCheckTool = {
|
|
|
20
21
|
inputSchema,
|
|
21
22
|
isConcurrencySafe: () => false,
|
|
22
23
|
isUndoable: () => false,
|
|
24
|
+
policyTargets: input => input.kind === 'custom' && input.command
|
|
25
|
+
? [{ kind: 'command', value: [input.command, ...input.args].join(' ') }]
|
|
26
|
+
: [],
|
|
23
27
|
async run(input, context) {
|
|
24
28
|
const picked = input.kind === 'custom'
|
|
25
29
|
? pickCustom(input)
|
|
@@ -53,11 +57,16 @@ export const runCheckTool = {
|
|
|
53
57
|
preferSandboxWhenUnrestricted: true,
|
|
54
58
|
signal: context.signal,
|
|
55
59
|
});
|
|
60
|
+
const diagnostics = parseCheckDiagnostics(result.output, context.cwd);
|
|
61
|
+
const locations = diagnostics.map(item => `${item.file}:${item.line}${item.column ? `:${item.column}` : ''} ${item.message}`);
|
|
56
62
|
return {
|
|
57
63
|
title: `run_check ${input.kind}`,
|
|
58
|
-
output:
|
|
64
|
+
output: locations.length
|
|
65
|
+
? `Diagnostics:\n${locations.join('\n')}\n\n${result.output}`
|
|
66
|
+
: result.output || '(no output)',
|
|
59
67
|
metadata: {
|
|
60
68
|
kind: input.kind,
|
|
69
|
+
diagnostics,
|
|
61
70
|
command: picked.command,
|
|
62
71
|
args: picked.args,
|
|
63
72
|
argsCount: picked.args.length,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runCheck.js","sourceRoot":"","sources":["../../src/tools/runCheck.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"runCheck.js","sourceRoot":"","sources":["../../src/tools/runCheck.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,20 @@ import { z } from 'zod';
|
|
|
2
2
|
import type { Tool } from './types.js';
|
|
3
3
|
declare const inputSchema: z.ZodObject<{
|
|
4
4
|
query: z.ZodString;
|
|
5
|
+
regex: z.ZodDefault<z.ZodBoolean>;
|
|
5
6
|
pattern: z.ZodDefault<z.ZodString>;
|
|
6
7
|
caseSensitive: z.ZodDefault<z.ZodBoolean>;
|
|
8
|
+
context: z.ZodDefault<z.ZodNumber>;
|
|
9
|
+
filesOnly: z.ZodDefault<z.ZodBoolean>;
|
|
7
10
|
limit: z.ZodDefault<z.ZodNumber>;
|
|
8
11
|
}, z.core.$strict>;
|
|
9
12
|
type Input = z.infer<typeof inputSchema>;
|
|
10
13
|
export declare const searchTextTool: Tool<Input>;
|
|
14
|
+
/**
|
|
15
|
+
* Refuse a regex with a repeated group that itself contains a repeat, such as
|
|
16
|
+
* (a+)+ or (\w*){2,}. That shape can backtrack exponentially, and the search
|
|
17
|
+
* runs inside the agent's process, so one bad pattern would freeze it. A
|
|
18
|
+
* heuristic (the classic "star height" check), not a proof of safety.
|
|
19
|
+
*/
|
|
20
|
+
export declare function assertSafeRegex(source: string): void;
|
|
11
21
|
export {};
|
package/dist/tools/searchText.js
CHANGED
|
@@ -1,60 +1,234 @@
|
|
|
1
|
-
import { readFile } from 'node:fs/promises';
|
|
1
|
+
import { readFile, stat } from 'node:fs/promises';
|
|
2
2
|
import fg from 'fast-glob';
|
|
3
3
|
import { z } from 'zod';
|
|
4
|
+
import { gitRead } from '../core/gitRead.js';
|
|
4
5
|
import { resolveInsideWorkspace } from '../core/workspace.js';
|
|
5
6
|
import { loadIgnorePatterns } from '../core/ignorefile.js';
|
|
7
|
+
const DEFAULT_IGNORES = ['**/.git/**', '**/node_modules/**', '**/dist/**', '**/coverage/**'];
|
|
8
|
+
/** Larger files are generated, minified, or data, and are skipped. */
|
|
9
|
+
const MAX_FILE_BYTES = 2_000_000;
|
|
10
|
+
/** Matching lines are shown up to this many characters. */
|
|
11
|
+
const MAX_SHOWN_LINE_CHARS = 500;
|
|
12
|
+
/** A regex is tested against at most this much of each line. */
|
|
13
|
+
const MAX_REGEX_LINE_CHARS = 10_000;
|
|
14
|
+
const TIME_BUDGET_MS = 10_000;
|
|
6
15
|
const inputSchema = z
|
|
7
16
|
.object({
|
|
8
|
-
query: z.string().min(1),
|
|
9
|
-
|
|
17
|
+
query: z.string().min(1).describe('Text to find. With regex set, a JavaScript regular expression.'),
|
|
18
|
+
regex: z.boolean().default(false).describe('Treat query as a JavaScript regular expression, e.g. "export (async )?function \\w+".'),
|
|
19
|
+
pattern: z.string().default('**/*').describe('Glob of files to search, e.g. "src/**/*.{ts,tsx}".'),
|
|
10
20
|
caseSensitive: z.boolean().default(false),
|
|
11
|
-
|
|
21
|
+
context: z.number().int().min(0).max(10).default(0).describe('Lines of context to show before and after each match.'),
|
|
22
|
+
filesOnly: z.boolean().default(false).describe('List the files that match instead of the matching lines.'),
|
|
23
|
+
limit: z.number().int().positive().max(500).default(50).describe('Maximum matching lines (or files, with filesOnly) to return.'),
|
|
12
24
|
})
|
|
13
25
|
.strict();
|
|
14
26
|
export const searchTextTool = {
|
|
15
27
|
name: 'search_text',
|
|
16
|
-
description: 'Search text files in the workspace and return matching lines.',
|
|
28
|
+
description: 'Search text files in the workspace for a string or regular expression and return matching lines, optionally with surrounding context, or just the matching files. Skips files ignored by .gitignore and .dvalincodeignore.',
|
|
17
29
|
access: 'read',
|
|
18
30
|
inputSchema,
|
|
19
31
|
isConcurrencySafe: () => true,
|
|
20
32
|
async run(input, context) {
|
|
33
|
+
const matches = buildMatcher(input);
|
|
34
|
+
const started = Date.now();
|
|
21
35
|
const userIgnore = await loadIgnorePatterns(context.cwd);
|
|
22
|
-
const
|
|
36
|
+
const gitIgnored = await gitIgnoredPaths(context.cwd);
|
|
37
|
+
const files = (await fg(input.pattern, {
|
|
23
38
|
cwd: context.cwd,
|
|
24
39
|
dot: true,
|
|
25
40
|
onlyFiles: true,
|
|
26
41
|
followSymbolicLinks: false,
|
|
27
|
-
ignore: [
|
|
28
|
-
})
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
42
|
+
ignore: [...DEFAULT_IGNORES, ...userIgnore, ...(gitIgnored?.directories ?? [])],
|
|
43
|
+
}))
|
|
44
|
+
.filter(file => !gitIgnored?.files.has(file))
|
|
45
|
+
.sort();
|
|
46
|
+
const out = [];
|
|
47
|
+
let found = 0;
|
|
48
|
+
let filesMatched = 0;
|
|
49
|
+
let skippedLarge = 0;
|
|
50
|
+
let timedOut = false;
|
|
51
|
+
for (const file of files) {
|
|
52
|
+
if (found >= input.limit)
|
|
53
|
+
break;
|
|
54
|
+
if (Date.now() - started > TIME_BUDGET_MS) {
|
|
55
|
+
timedOut = true;
|
|
33
56
|
break;
|
|
57
|
+
}
|
|
34
58
|
const filePath = await resolveInsideWorkspace(context.cwd, file);
|
|
59
|
+
const size = await fileSize(filePath);
|
|
60
|
+
if (size === null)
|
|
61
|
+
continue;
|
|
62
|
+
if (size > MAX_FILE_BYTES) {
|
|
63
|
+
skippedLarge++;
|
|
64
|
+
continue;
|
|
65
|
+
}
|
|
35
66
|
const text = await readMaybeText(filePath);
|
|
36
67
|
if (text === null)
|
|
37
68
|
continue;
|
|
38
69
|
const lines = text.split(/\r?\n/);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
if (
|
|
42
|
-
|
|
43
|
-
if (
|
|
70
|
+
const hits = [];
|
|
71
|
+
for (let index = 0; index < lines.length && found + hits.length < input.limit; index++) {
|
|
72
|
+
if (matches(lines[index])) {
|
|
73
|
+
hits.push(index);
|
|
74
|
+
if (input.filesOnly)
|
|
44
75
|
break;
|
|
45
76
|
}
|
|
46
77
|
}
|
|
78
|
+
if (hits.length === 0)
|
|
79
|
+
continue;
|
|
80
|
+
filesMatched++;
|
|
81
|
+
found += hits.length;
|
|
82
|
+
if (input.filesOnly)
|
|
83
|
+
out.push(file);
|
|
84
|
+
else
|
|
85
|
+
out.push(...formatHits(file, lines, hits, input.context, out.length > 0));
|
|
47
86
|
}
|
|
87
|
+
const unit = input.filesOnly ? 'file' : 'match';
|
|
88
|
+
const notes = [
|
|
89
|
+
found >= input.limit ? `Stopped at the limit of ${input.limit}; narrow the query or pattern to see more.` : '',
|
|
90
|
+
timedOut ? `Stopped after ${TIME_BUDGET_MS / 1000}s; narrow the pattern to search the rest.` : '',
|
|
91
|
+
skippedLarge ? `Skipped ${skippedLarge} file(s) over ${MAX_FILE_BYTES / 1_000_000} MB.` : '',
|
|
92
|
+
].filter(Boolean);
|
|
48
93
|
return {
|
|
49
|
-
title: `Found ${
|
|
50
|
-
output:
|
|
94
|
+
title: `Found ${found} ${unit}${found === 1 ? '' : unit === 'match' ? 'es' : 's'}`,
|
|
95
|
+
output: [out.join('\n') || '(no matches)', ...notes].join('\n'),
|
|
51
96
|
metadata: {
|
|
52
97
|
scannedFiles: files.length,
|
|
98
|
+
matchedFiles: filesMatched,
|
|
53
99
|
limit: input.limit,
|
|
100
|
+
gitignore: gitIgnored !== null,
|
|
101
|
+
timedOut,
|
|
102
|
+
skippedLargeFiles: skippedLarge,
|
|
54
103
|
},
|
|
55
104
|
};
|
|
56
105
|
},
|
|
57
106
|
};
|
|
107
|
+
function buildMatcher(input) {
|
|
108
|
+
if (!input.regex) {
|
|
109
|
+
const needle = input.caseSensitive ? input.query : input.query.toLowerCase();
|
|
110
|
+
return line => (input.caseSensitive ? line : line.toLowerCase()).includes(needle);
|
|
111
|
+
}
|
|
112
|
+
assertSafeRegex(input.query);
|
|
113
|
+
let pattern;
|
|
114
|
+
try {
|
|
115
|
+
pattern = new RegExp(input.query, input.caseSensitive ? '' : 'i');
|
|
116
|
+
}
|
|
117
|
+
catch (error) {
|
|
118
|
+
throw new Error(`Invalid regular expression: ${error instanceof Error ? error.message : String(error)}`);
|
|
119
|
+
}
|
|
120
|
+
return line => pattern.test(line.length > MAX_REGEX_LINE_CHARS ? line.slice(0, MAX_REGEX_LINE_CHARS) : line);
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* Refuse a regex with a repeated group that itself contains a repeat, such as
|
|
124
|
+
* (a+)+ or (\w*){2,}. That shape can backtrack exponentially, and the search
|
|
125
|
+
* runs inside the agent's process, so one bad pattern would freeze it. A
|
|
126
|
+
* heuristic (the classic "star height" check), not a proof of safety.
|
|
127
|
+
*/
|
|
128
|
+
export function assertSafeRegex(source) {
|
|
129
|
+
const groupHasRepeat = [];
|
|
130
|
+
for (let i = 0; i < source.length; i++) {
|
|
131
|
+
const ch = source[i];
|
|
132
|
+
if (ch === '\\') {
|
|
133
|
+
i++;
|
|
134
|
+
continue;
|
|
135
|
+
}
|
|
136
|
+
if (ch === '[') {
|
|
137
|
+
for (i++; i < source.length && source[i] !== ']'; i++) {
|
|
138
|
+
if (source[i] === '\\')
|
|
139
|
+
i++;
|
|
140
|
+
}
|
|
141
|
+
continue;
|
|
142
|
+
}
|
|
143
|
+
if (ch === '(') {
|
|
144
|
+
groupHasRepeat.push(false);
|
|
145
|
+
// Skip the group-kind marker: (?: (?= (?! (?<= (?<! (?<name>
|
|
146
|
+
if (source[i + 1] === '?') {
|
|
147
|
+
i += 2;
|
|
148
|
+
if (source[i] === '<' && source[i + 1] !== '=' && source[i + 1] !== '!') {
|
|
149
|
+
const close = source.indexOf('>', i);
|
|
150
|
+
i = close === -1 ? source.length : close;
|
|
151
|
+
}
|
|
152
|
+
else if (source[i] === '<') {
|
|
153
|
+
i++;
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
continue;
|
|
157
|
+
}
|
|
158
|
+
if (ch === ')') {
|
|
159
|
+
const inner = groupHasRepeat.pop() ?? false;
|
|
160
|
+
if (inner && isRepeatAt(source, i + 1)) {
|
|
161
|
+
throw new Error('This regular expression repeats a group that already contains a repeat, such as (a+)+, which can take exponentially long. Rewrite it without nesting repeats.');
|
|
162
|
+
}
|
|
163
|
+
if (inner && groupHasRepeat.length > 0)
|
|
164
|
+
groupHasRepeat[groupHasRepeat.length - 1] = true;
|
|
165
|
+
continue;
|
|
166
|
+
}
|
|
167
|
+
if (groupHasRepeat.length > 0 && isRepeatAt(source, i))
|
|
168
|
+
groupHasRepeat[groupHasRepeat.length - 1] = true;
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
/** `*`, `+`, or a `{n}` / `{n,}` / `{n,m}` quantifier at `index`. */
|
|
172
|
+
function isRepeatAt(source, index) {
|
|
173
|
+
const ch = source[index];
|
|
174
|
+
return ch === '*' || ch === '+' || (ch === '{' && /^\{\d+(,\d*)?\}/.test(source.slice(index)));
|
|
175
|
+
}
|
|
176
|
+
/** Lines for one file's hits, grep style: `file:line: text` for matches, `file-line- text` for context. */
|
|
177
|
+
function formatHits(file, lines, hits, context, separate) {
|
|
178
|
+
const out = [];
|
|
179
|
+
const hitSet = new Set(hits);
|
|
180
|
+
let lastShown = -2;
|
|
181
|
+
for (const hit of hits) {
|
|
182
|
+
const from = Math.max(0, hit - context, lastShown + 1);
|
|
183
|
+
const to = Math.min(lines.length - 1, hit + context);
|
|
184
|
+
if (context > 0 && (separate || out.length > 0) && from > lastShown + 1)
|
|
185
|
+
out.push('--');
|
|
186
|
+
for (let index = from; index <= to; index++) {
|
|
187
|
+
const marker = hitSet.has(index) ? ':' : '-';
|
|
188
|
+
out.push(`${file}${marker}${index + 1}${marker} ${clip(lines[index])}`);
|
|
189
|
+
}
|
|
190
|
+
lastShown = to;
|
|
191
|
+
}
|
|
192
|
+
return out;
|
|
193
|
+
}
|
|
194
|
+
function clip(line) {
|
|
195
|
+
return line.length > MAX_SHOWN_LINE_CHARS ? `${line.slice(0, MAX_SHOWN_LINE_CHARS)}… [${line.length} chars]` : line;
|
|
196
|
+
}
|
|
197
|
+
/**
|
|
198
|
+
* Paths .gitignore excludes, from git itself: whole directories (as fast-glob
|
|
199
|
+
* ignore patterns, so they are never walked) and single files. Null outside a
|
|
200
|
+
* git work tree or without git, in which case only the default ignores apply.
|
|
201
|
+
*/
|
|
202
|
+
async function gitIgnoredPaths(cwd) {
|
|
203
|
+
try {
|
|
204
|
+
const { stdout, truncated } = await gitRead(['ls-files', '-z', '--others', '--ignored', '--exclude-standard', '--directory'], cwd, 8 * 1024 * 1024);
|
|
205
|
+
if (truncated)
|
|
206
|
+
return null;
|
|
207
|
+
const directories = [];
|
|
208
|
+
const files = new Set();
|
|
209
|
+
for (const entry of stdout.split('\0')) {
|
|
210
|
+
// "./" means the workspace itself is ignored; searching it was asked for explicitly.
|
|
211
|
+
if (!entry || entry === './')
|
|
212
|
+
continue;
|
|
213
|
+
if (entry.endsWith('/'))
|
|
214
|
+
directories.push(`${fg.escapePath(entry)}**`);
|
|
215
|
+
else
|
|
216
|
+
files.add(entry);
|
|
217
|
+
}
|
|
218
|
+
return { directories, files };
|
|
219
|
+
}
|
|
220
|
+
catch {
|
|
221
|
+
return null;
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
async function fileSize(filePath) {
|
|
225
|
+
try {
|
|
226
|
+
return (await stat(filePath)).size;
|
|
227
|
+
}
|
|
228
|
+
catch {
|
|
229
|
+
return null;
|
|
230
|
+
}
|
|
231
|
+
}
|
|
58
232
|
async function readMaybeText(filePath) {
|
|
59
233
|
try {
|
|
60
234
|
const text = await readFile(filePath, 'utf8');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"searchText.js","sourceRoot":"","sources":["../../src/tools/searchText.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"searchText.js","sourceRoot":"","sources":["../../src/tools/searchText.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import type { ChatMessage } from '../providers/types.js';
|
|
3
|
+
import type { Tool } from './types.js';
|
|
4
|
+
declare const stepSchema: z.ZodObject<{
|
|
5
|
+
step: z.ZodString;
|
|
6
|
+
status: z.ZodEnum<{
|
|
7
|
+
completed: "completed";
|
|
8
|
+
in_progress: "in_progress";
|
|
9
|
+
pending: "pending";
|
|
10
|
+
}>;
|
|
11
|
+
}, z.core.$strict>;
|
|
12
|
+
declare const inputSchema: z.ZodObject<{
|
|
13
|
+
explanation: z.ZodOptional<z.ZodString>;
|
|
14
|
+
plan: z.ZodArray<z.ZodObject<{
|
|
15
|
+
step: z.ZodString;
|
|
16
|
+
status: z.ZodEnum<{
|
|
17
|
+
completed: "completed";
|
|
18
|
+
in_progress: "in_progress";
|
|
19
|
+
pending: "pending";
|
|
20
|
+
}>;
|
|
21
|
+
}, z.core.$strict>>;
|
|
22
|
+
}, z.core.$strict>;
|
|
23
|
+
type Input = z.infer<typeof inputSchema>;
|
|
24
|
+
export type PlanStep = z.infer<typeof stepSchema>;
|
|
25
|
+
export declare const updatePlanTool: Tool<Input>;
|
|
26
|
+
/** The checklist as plain text, one `- [x]` / `- [~]` / `- [ ]` line per step. */
|
|
27
|
+
export declare function renderChecklist(plan: PlanStep[]): string;
|
|
28
|
+
/** The checklist from the most recent valid update_plan call in `messages`. */
|
|
29
|
+
export declare function latestChecklist(messages: ChatMessage[]): PlanStep[] | undefined;
|
|
30
|
+
/**
|
|
31
|
+
* Append the current checklist to a compaction summary, so the model keeps it
|
|
32
|
+
* after older messages are summarized away. Nothing is added when there is no
|
|
33
|
+
* checklist, or when the messages kept verbatim already hold the latest one.
|
|
34
|
+
*/
|
|
35
|
+
export declare function carryChecklist(summary: string, compacted: ChatMessage[], kept?: ChatMessage[]): string;
|
|
36
|
+
/** The nudge sent when the model stops while its checklist still has open steps. */
|
|
37
|
+
export declare function unfinishedChecklistNudge(open: PlanStep[]): string;
|
|
38
|
+
export {};
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
const stepSchema = z
|
|
3
|
+
.object({
|
|
4
|
+
step: z.string().trim().min(1).max(300).describe('What this step does, in a few words.'),
|
|
5
|
+
status: z.enum(['pending', 'in_progress', 'completed']),
|
|
6
|
+
})
|
|
7
|
+
.strict();
|
|
8
|
+
const inputSchema = z
|
|
9
|
+
.object({
|
|
10
|
+
explanation: z.string().max(1_000).optional().describe('Optional note on why the checklist changed.'),
|
|
11
|
+
plan: z.array(stepSchema).min(1).max(50).describe('The whole checklist, in order, every time.'),
|
|
12
|
+
})
|
|
13
|
+
.strict()
|
|
14
|
+
.superRefine((input, ctx) => {
|
|
15
|
+
if (input.plan.filter(step => step.status === 'in_progress').length > 1) {
|
|
16
|
+
ctx.addIssue({ code: 'custom', message: 'At most one step can be in_progress at a time.' });
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
export const updatePlanTool = {
|
|
20
|
+
name: 'update_plan',
|
|
21
|
+
description: 'Keep a checklist for a task with three or more steps; skip it for quick tasks. Send the whole list each time: mark the step you are working on in_progress (one at a time) and finished steps completed, and remove steps that no longer apply. The user sees the checklist.',
|
|
22
|
+
access: 'read',
|
|
23
|
+
inputSchema,
|
|
24
|
+
isConcurrencySafe: () => false,
|
|
25
|
+
async run(input) {
|
|
26
|
+
const done = input.plan.filter(step => step.status === 'completed').length;
|
|
27
|
+
const current = input.plan.find(step => step.status === 'in_progress');
|
|
28
|
+
return {
|
|
29
|
+
title: `Checklist: ${done}/${input.plan.length} done`,
|
|
30
|
+
output: `Checklist updated: ${done} of ${input.plan.length} steps done.${current ? ` In progress: ${current.step}` : ''}`,
|
|
31
|
+
metadata: { plan: input.plan },
|
|
32
|
+
};
|
|
33
|
+
},
|
|
34
|
+
};
|
|
35
|
+
/** The checklist as plain text, one `- [x]` / `- [~]` / `- [ ]` line per step. */
|
|
36
|
+
export function renderChecklist(plan) {
|
|
37
|
+
const mark = { completed: '[x]', in_progress: '[~]', pending: '[ ]' };
|
|
38
|
+
return plan.map(step => `- ${mark[step.status]} ${step.step}`).join('\n');
|
|
39
|
+
}
|
|
40
|
+
/** The checklist from the most recent valid update_plan call in `messages`. */
|
|
41
|
+
export function latestChecklist(messages) {
|
|
42
|
+
for (let i = messages.length - 1; i >= 0; i--) {
|
|
43
|
+
const message = messages[i];
|
|
44
|
+
if (message.role !== 'assistant' || !message.tool_calls)
|
|
45
|
+
continue;
|
|
46
|
+
for (let j = message.tool_calls.length - 1; j >= 0; j--) {
|
|
47
|
+
const call = message.tool_calls[j];
|
|
48
|
+
if (call.name !== updatePlanTool.name)
|
|
49
|
+
continue;
|
|
50
|
+
try {
|
|
51
|
+
const parsed = inputSchema.safeParse(JSON.parse(call.arguments));
|
|
52
|
+
if (parsed.success)
|
|
53
|
+
return parsed.data.plan;
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
// Malformed arguments: the call failed, so look further back.
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
return undefined;
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Append the current checklist to a compaction summary, so the model keeps it
|
|
64
|
+
* after older messages are summarized away. Nothing is added when there is no
|
|
65
|
+
* checklist, or when the messages kept verbatim already hold the latest one.
|
|
66
|
+
*/
|
|
67
|
+
export function carryChecklist(summary, compacted, kept = []) {
|
|
68
|
+
const plan = latestChecklist(compacted);
|
|
69
|
+
if (!plan || latestChecklist(kept))
|
|
70
|
+
return summary;
|
|
71
|
+
return `${summary}\n\nTask checklist when the conversation was compacted (keep it current with update_plan):\n${renderChecklist(plan)}`;
|
|
72
|
+
}
|
|
73
|
+
/** The nudge sent when the model stops while its checklist still has open steps. */
|
|
74
|
+
export function unfinishedChecklistNudge(open) {
|
|
75
|
+
return [
|
|
76
|
+
`Runtime completion check: your checklist still has ${open.length} unfinished step${open.length === 1 ? '' : 's'}:`,
|
|
77
|
+
renderChecklist(open),
|
|
78
|
+
'Continue with the next step now. If steps are already done or no longer apply, call update_plan to mark them completed or remove them before giving your final answer.',
|
|
79
|
+
].join('\n');
|
|
80
|
+
}
|
|
81
|
+
//# sourceMappingURL=updatePlan.js.map
|