dvalincode 0.23.0 → 0.25.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 +92 -12
- package/README.zh-CN.md +75 -12
- 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 +68 -17
- 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 +14 -8
- 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 +13 -0
- package/dist/server/configStore.js +9 -0
- package/dist/server/configStore.js.map +1 -1
- package/dist/server/folderPicker.d.ts +29 -0
- package/dist/server/folderPicker.js +100 -0
- package/dist/server/folderPicker.js.map +1 -0
- 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 +57 -0
- package/dist/server/routes/config.js.map +1 -1
- package/dist/server/routes/projects.js +1 -30
- package/dist/server/routes/projects.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 +31 -0
- package/dist/tools/webSearch.js +244 -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
package/dist/tools/editFile.js
CHANGED
|
@@ -1,56 +1,89 @@
|
|
|
1
1
|
import { readFile, writeFile } from 'node:fs/promises';
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import { generateDiff, formatDiff } from '../core/diffPreview.js';
|
|
4
|
+
import { assertNoRedactionWriteBack } from '../core/redactSecrets.js';
|
|
4
5
|
import { resolveInsideWorkspace } from '../core/workspace.js';
|
|
5
6
|
import { sha256 } from '../audit/hash.js';
|
|
6
7
|
import { countDiffLines } from '../audit/diffStat.js';
|
|
8
|
+
const editSchema = z
|
|
9
|
+
.object({
|
|
10
|
+
oldString: z.string().describe('Exact text to replace. Must occur exactly once unless replaceAll is set.'),
|
|
11
|
+
newString: z.string().describe('Replacement text.'),
|
|
12
|
+
replaceAll: z.boolean().optional().describe('Replace every occurrence of oldString.'),
|
|
13
|
+
})
|
|
14
|
+
.strict();
|
|
7
15
|
const inputSchema = z
|
|
8
16
|
.object({
|
|
9
17
|
filePath: z.string().min(1),
|
|
10
|
-
oldString: z.string().describe('Exact text to replace; must occur exactly once
|
|
11
|
-
newString: z.string().describe('Replacement text'),
|
|
18
|
+
oldString: z.string().optional().describe('Exact text to replace; must occur exactly once unless replaceAll is set. Omit when using edits.'),
|
|
19
|
+
newString: z.string().optional().describe('Replacement text. Omit when using edits.'),
|
|
20
|
+
replaceAll: z.boolean().optional().describe('Replace every occurrence of oldString, e.g. to rename a variable throughout the file.'),
|
|
21
|
+
edits: z
|
|
22
|
+
.array(editSchema)
|
|
23
|
+
.min(1)
|
|
24
|
+
.max(100)
|
|
25
|
+
.optional()
|
|
26
|
+
.describe('Several replacements in one file, applied in order and all or nothing. Use instead of oldString/newString.'),
|
|
12
27
|
})
|
|
13
|
-
.strict()
|
|
28
|
+
.strict()
|
|
29
|
+
.superRefine((input, ctx) => {
|
|
30
|
+
const single = input.oldString !== undefined || input.newString !== undefined || input.replaceAll !== undefined;
|
|
31
|
+
if (input.edits && single) {
|
|
32
|
+
ctx.addIssue({ code: 'custom', message: 'Use either edits or oldString/newString, not both.' });
|
|
33
|
+
}
|
|
34
|
+
else if (!input.edits && (input.oldString === undefined || input.newString === undefined)) {
|
|
35
|
+
ctx.addIssue({ code: 'custom', message: 'Provide oldString and newString, or an edits list.' });
|
|
36
|
+
}
|
|
37
|
+
});
|
|
14
38
|
export const editFileTool = {
|
|
15
39
|
name: 'edit_file',
|
|
16
|
-
description: 'Replace exact text in a file. Reports a diff of the change.',
|
|
40
|
+
description: 'Replace exact text in a file: one replacement (oldString/newString), every occurrence (replaceAll), or several replacements at once (edits). Reports a diff of the change.',
|
|
17
41
|
access: 'write',
|
|
18
42
|
inputSchema,
|
|
19
43
|
isConcurrencySafe: () => false,
|
|
20
44
|
policyTargets: input => [{ kind: 'path', value: input.filePath }],
|
|
21
45
|
isUndoable: () => true,
|
|
22
|
-
reverse(input,
|
|
46
|
+
reverse(input, result) {
|
|
47
|
+
// Batches and replaceAll keep the original file, because swapping the strings
|
|
48
|
+
// back would also rewrite text that matched newString before the edit.
|
|
49
|
+
const originalContent = result.metadata?.originalContent;
|
|
50
|
+
if (typeof originalContent === 'string') {
|
|
51
|
+
return {
|
|
52
|
+
toolName: 'write_file',
|
|
53
|
+
input: { filePath: input.filePath, content: originalContent },
|
|
54
|
+
description: `Undo edit_file: restore "${input.filePath}" as it was before the edit`,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
const oldString = input.oldString ?? '';
|
|
58
|
+
const newString = input.newString ?? '';
|
|
23
59
|
return {
|
|
24
60
|
toolName: 'edit_file',
|
|
25
61
|
input: {
|
|
26
62
|
filePath: input.filePath,
|
|
27
|
-
oldString:
|
|
28
|
-
newString:
|
|
63
|
+
oldString: newString,
|
|
64
|
+
newString: oldString,
|
|
29
65
|
},
|
|
30
|
-
description: `Undo edit_file: revert "${input.filePath}" — swap back "${
|
|
66
|
+
description: `Undo edit_file: revert "${input.filePath}" — swap back "${newString.slice(0, 40)}…" → "${oldString.slice(0, 40)}…"`,
|
|
31
67
|
};
|
|
32
68
|
},
|
|
33
69
|
async run(input, context) {
|
|
34
70
|
const filePath = await resolveInsideWorkspace(context.cwd, input.filePath);
|
|
35
71
|
const existing = await readFile(filePath, 'utf8');
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
}
|
|
43
|
-
const before = input.oldString.length > 60
|
|
44
|
-
? input.oldString.slice(0, 60) + '…'
|
|
45
|
-
: input.oldString;
|
|
46
|
-
const occurrences = existing.split(input.oldString).length - 1;
|
|
47
|
-
if (occurrences > 1) {
|
|
48
|
-
throw new Error(`oldString matches ${occurrences} places in ${input.filePath}; include enough surrounding lines to match exactly one.`);
|
|
49
|
-
}
|
|
50
|
-
// Not String.prototype.replace: it would expand `$$`, `$&` and `$'` in newString.
|
|
51
|
-
const updated = existing.slice(0, idx) + input.newString + existing.slice(idx + input.oldString.length);
|
|
72
|
+
const batch = input.edits !== undefined;
|
|
73
|
+
const edits = input.edits ?? [
|
|
74
|
+
{ oldString: input.oldString ?? '', newString: input.newString ?? '', replaceAll: input.replaceAll },
|
|
75
|
+
];
|
|
76
|
+
const { updated, replacements } = applyEdits(existing, edits, input.filePath);
|
|
77
|
+
assertNoRedactionWriteBack(existing, updated, input.filePath);
|
|
52
78
|
const diff = generateDiff(existing, updated);
|
|
53
|
-
const
|
|
79
|
+
const first = edits[0].oldString;
|
|
80
|
+
const before = first.length > 60 ? first.slice(0, 60) + '…' : first;
|
|
81
|
+
const summary = batch
|
|
82
|
+
? `Applied ${edits.length} edit${edits.length === 1 ? '' : 's'} (${replacements} replacement${replacements === 1 ? '' : 's'})`
|
|
83
|
+
: replacements > 1
|
|
84
|
+
? `Replaced ${replacements} occurrences of "${before}"`
|
|
85
|
+
: `Replaced: "${before}"`;
|
|
86
|
+
const output = [summary, '', formatDiff(diff)].join('\n');
|
|
54
87
|
await writeFile(filePath, updated, 'utf8');
|
|
55
88
|
const stat = countDiffLines(diff);
|
|
56
89
|
return {
|
|
@@ -60,14 +93,50 @@ export const editFileTool = {
|
|
|
60
93
|
path: input.filePath,
|
|
61
94
|
bytesBefore: Buffer.byteLength(existing, 'utf8'),
|
|
62
95
|
bytesAfter: Buffer.byteLength(updated, 'utf8'),
|
|
63
|
-
occurrences,
|
|
96
|
+
occurrences: replacements,
|
|
97
|
+
edits: edits.length,
|
|
64
98
|
diff,
|
|
65
99
|
added: stat.added,
|
|
66
100
|
removed: stat.removed,
|
|
67
101
|
beforeHash: sha256(existing),
|
|
68
102
|
afterHash: sha256(updated),
|
|
103
|
+
// Kept for undo; stripped before WebSocket send.
|
|
104
|
+
...(batch || input.replaceAll ? { originalContent: existing } : {}),
|
|
69
105
|
},
|
|
70
106
|
};
|
|
71
107
|
},
|
|
72
108
|
};
|
|
109
|
+
/**
|
|
110
|
+
* Apply `edits` in order to `content`. Each edit sees the result of the ones
|
|
111
|
+
* before it, and any failure throws before anything is written.
|
|
112
|
+
*/
|
|
113
|
+
function applyEdits(content, edits, filePath) {
|
|
114
|
+
let updated = content;
|
|
115
|
+
let replacements = 0;
|
|
116
|
+
edits.forEach((edit, index) => {
|
|
117
|
+
const label = edits.length > 1 ? `Edit ${index + 1} of ${edits.length}: ` : '';
|
|
118
|
+
if (!edit.oldString) {
|
|
119
|
+
throw new Error(`${label}oldString must not be empty; use write_file to replace a whole file.`);
|
|
120
|
+
}
|
|
121
|
+
const occurrences = updated.split(edit.oldString).length - 1;
|
|
122
|
+
if (occurrences === 0) {
|
|
123
|
+
const after = index > 0 ? ' (after the earlier edits were applied)' : '';
|
|
124
|
+
throw new Error(`${label}Could not find oldString in ${filePath}${after}`);
|
|
125
|
+
}
|
|
126
|
+
if (occurrences > 1 && !edit.replaceAll) {
|
|
127
|
+
throw new Error(`${label}oldString matches ${occurrences} places in ${filePath}; include enough surrounding lines to match exactly one, or set replaceAll.`);
|
|
128
|
+
}
|
|
129
|
+
if (edit.replaceAll) {
|
|
130
|
+
updated = updated.split(edit.oldString).join(edit.newString);
|
|
131
|
+
replacements += occurrences;
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
134
|
+
// Not String.prototype.replace: it would expand `$$`, `$&` and `$'` in newString.
|
|
135
|
+
const idx = updated.indexOf(edit.oldString);
|
|
136
|
+
updated = updated.slice(0, idx) + edit.newString + updated.slice(idx + edit.oldString.length);
|
|
137
|
+
replacements += 1;
|
|
138
|
+
}
|
|
139
|
+
});
|
|
140
|
+
return { updated, replacements };
|
|
141
|
+
}
|
|
73
142
|
//# sourceMappingURL=editFile.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editFile.js","sourceRoot":"","sources":["../../src/tools/editFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,MAAM,WAAW,GAAG,CAAC;KAClB,MAAM,CAAC;IACN,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"editFile.js","sourceRoot":"","sources":["../../src/tools/editFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import type { Tool } from './types.js';
|
|
3
|
+
declare const inputSchema: z.ZodObject<{
|
|
4
|
+
filePath: z.ZodString;
|
|
5
|
+
startLine: z.ZodDefault<z.ZodNumber>;
|
|
6
|
+
endLine: z.ZodOptional<z.ZodNumber>;
|
|
7
|
+
ref: z.ZodOptional<z.ZodString>;
|
|
8
|
+
}, z.core.$strict>;
|
|
9
|
+
type Input = z.infer<typeof inputSchema>;
|
|
10
|
+
export declare const gitBlameTool: Tool<Input>;
|
|
11
|
+
export {};
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { assertRevision, gitRead, workspaceGitPath } from '../core/gitRead.js';
|
|
3
|
+
import { loadIgnorePatterns } from '../core/ignorefile.js';
|
|
4
|
+
const MAX_LINES = 500;
|
|
5
|
+
const inputSchema = z
|
|
6
|
+
.object({
|
|
7
|
+
filePath: z.string().min(1),
|
|
8
|
+
startLine: z.number().int().positive().default(1),
|
|
9
|
+
endLine: z.number().int().positive().optional().describe('Last line to include (default: 200 lines from startLine).'),
|
|
10
|
+
ref: z.string().min(1).max(200).optional().describe('Blame the file as of this commit (default: the working tree).'),
|
|
11
|
+
})
|
|
12
|
+
.strict();
|
|
13
|
+
export const gitBlameTool = {
|
|
14
|
+
name: 'git_blame',
|
|
15
|
+
description: 'Show which commit, author, and date last changed each line of a file, for a range of up to 500 lines. Use it to find the commit behind a line, then git_show to read it.',
|
|
16
|
+
access: 'read',
|
|
17
|
+
inputSchema,
|
|
18
|
+
isConcurrencySafe: () => true,
|
|
19
|
+
isUndoable: () => false,
|
|
20
|
+
policyTargets: input => [{ kind: 'path', value: input.filePath }],
|
|
21
|
+
async run(input, context) {
|
|
22
|
+
const endLine = input.endLine ?? input.startLine + 199;
|
|
23
|
+
if (endLine < input.startLine)
|
|
24
|
+
throw new Error('endLine must not be before startLine.');
|
|
25
|
+
if (endLine - input.startLine + 1 > MAX_LINES)
|
|
26
|
+
throw new Error(`Blame at most ${MAX_LINES} lines at a time.`);
|
|
27
|
+
const patterns = await loadIgnorePatterns(context.cwd);
|
|
28
|
+
const relative = await workspaceGitPath(context.cwd, input.filePath, patterns);
|
|
29
|
+
// blame takes the revision before "--" and does not honor --end-of-options;
|
|
30
|
+
// assertRevision has already refused anything that starts with a dash.
|
|
31
|
+
const args = ['blame', '--no-textconv', '--date=short', '-L', `${input.startLine},${endLine}`];
|
|
32
|
+
if (input.ref)
|
|
33
|
+
args.push(assertRevision(input.ref));
|
|
34
|
+
args.push('--', relative);
|
|
35
|
+
const { stdout, truncated } = await gitRead(args, context.cwd, 128_000);
|
|
36
|
+
return {
|
|
37
|
+
title: `git blame ${input.filePath}`,
|
|
38
|
+
output: stdout.trimEnd() + (truncated ? '\n[output truncated; blame a smaller range]' : ''),
|
|
39
|
+
metadata: { filePath: input.filePath, startLine: input.startLine, endLine, ref: input.ref },
|
|
40
|
+
};
|
|
41
|
+
},
|
|
42
|
+
};
|
|
43
|
+
//# sourceMappingURL=gitBlame.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gitBlame.js","sourceRoot":"","sources":["../../src/tools/gitBlame.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/gitDiff.js
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
import { execFile } from 'node:child_process';
|
|
2
|
-
import { promisify } from 'node:util';
|
|
3
|
-
import path from 'node:path';
|
|
4
1
|
import { z } from 'zod';
|
|
5
|
-
import {
|
|
6
|
-
|
|
2
|
+
import { excludePathspecs, gitRead, workspaceGitPath } from '../core/gitRead.js';
|
|
3
|
+
import { loadIgnorePatterns } from '../core/ignorefile.js';
|
|
7
4
|
const inputSchema = z
|
|
8
5
|
.object({
|
|
9
6
|
filePath: z.string().min(1).optional(),
|
|
@@ -19,26 +16,24 @@ export const gitDiffTool = {
|
|
|
19
16
|
isConcurrencySafe: () => true,
|
|
20
17
|
isUndoable: () => false,
|
|
21
18
|
async run(input, context) {
|
|
22
|
-
const args = ['diff'];
|
|
23
|
-
if (input.staged)
|
|
24
|
-
args.push('--cached');
|
|
25
|
-
if (input.filePath) {
|
|
26
|
-
const resolved = await resolveInsideWorkspace(context.cwd, input.filePath);
|
|
27
|
-
args.push('--', path.relative(context.cwd, resolved));
|
|
28
|
-
}
|
|
29
19
|
try {
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
20
|
+
const patterns = await loadIgnorePatterns(context.cwd);
|
|
21
|
+
const args = ['diff', '--no-color', '--no-ext-diff', '--no-textconv'];
|
|
22
|
+
if (input.staged)
|
|
23
|
+
args.push('--cached');
|
|
24
|
+
args.push('--');
|
|
25
|
+
if (input.filePath)
|
|
26
|
+
args.push(`:(literal)${await workspaceGitPath(context.cwd, input.filePath, patterns)}`);
|
|
27
|
+
args.push(...excludePathspecs(patterns));
|
|
28
|
+
const { stdout, truncated } = await gitRead(args, context.cwd, input.maxBytes);
|
|
29
|
+
const diff = stdout.trimEnd() + (truncated ? `\n[diff truncated at ${input.maxBytes} bytes]` : '');
|
|
35
30
|
return {
|
|
36
31
|
title: 'git diff',
|
|
37
32
|
output: diff || 'No diff.',
|
|
38
33
|
metadata: {
|
|
39
34
|
staged: input.staged,
|
|
40
35
|
filePath: input.filePath,
|
|
41
|
-
truncated
|
|
36
|
+
truncated,
|
|
42
37
|
},
|
|
43
38
|
};
|
|
44
39
|
}
|
|
@@ -50,10 +45,4 @@ export const gitDiffTool = {
|
|
|
50
45
|
}
|
|
51
46
|
},
|
|
52
47
|
};
|
|
53
|
-
function truncate(text, maxBytes) {
|
|
54
|
-
const bytes = Buffer.byteLength(text, 'utf8');
|
|
55
|
-
if (bytes <= maxBytes)
|
|
56
|
-
return text;
|
|
57
|
-
return `${text.slice(0, maxBytes)}\n[diff truncated at ${maxBytes} bytes]`;
|
|
58
|
-
}
|
|
59
48
|
//# sourceMappingURL=gitDiff.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitDiff.js","sourceRoot":"","sources":["../../src/tools/gitDiff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"gitDiff.js","sourceRoot":"","sources":["../../src/tools/gitDiff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG3D,MAAM,WAAW,GAAG,CAAC;KAClB,MAAM,CAAC;IACN,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACtC,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;CACnE,CAAC;KACD,MAAM,EAAE,CAAC;AAIZ,MAAM,CAAC,MAAM,WAAW,GAAgB;IACtC,IAAI,EAAE,UAAU;IAChB,WAAW,EAAE,kHAAkH;IAC/H,MAAM,EAAE,MAAM;IACd,WAAW;IACX,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI;IAC7B,UAAU,EAAE,GAAG,EAAE,CAAC,KAAK;IAEvB,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO;QACtB,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACvD,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;YACtE,IAAI,KAAK,CAAC,MAAM;gBAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACxC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChB,IAAI,KAAK,CAAC,QAAQ;gBAAE,IAAI,CAAC,IAAI,CAAC,aAAa,MAAM,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC5G,IAAI,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;YAEzC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC/E,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,wBAAwB,KAAK,CAAC,QAAQ,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACnG,OAAO;gBACL,KAAK,EAAE,UAAU;gBACjB,MAAM,EAAE,IAAI,IAAI,UAAU;gBAC1B,QAAQ,EAAE;oBACR,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ;oBACxB,SAAS;iBACV;aACF,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,KAAK,EAAE,UAAU;gBACjB,MAAM,EAAE,4BAA4B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;aACvF,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import type { Tool } from './types.js';
|
|
3
|
+
declare const inputSchema: z.ZodObject<{
|
|
4
|
+
filePath: z.ZodOptional<z.ZodString>;
|
|
5
|
+
ref: z.ZodOptional<z.ZodString>;
|
|
6
|
+
grep: z.ZodOptional<z.ZodString>;
|
|
7
|
+
limit: z.ZodDefault<z.ZodNumber>;
|
|
8
|
+
}, z.core.$strict>;
|
|
9
|
+
type Input = z.infer<typeof inputSchema>;
|
|
10
|
+
export declare const gitLogTool: Tool<Input>;
|
|
11
|
+
export {};
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { assertRevision, gitRead, workspaceGitPath } from '../core/gitRead.js';
|
|
3
|
+
import { loadIgnorePatterns } from '../core/ignorefile.js';
|
|
4
|
+
const inputSchema = z
|
|
5
|
+
.object({
|
|
6
|
+
filePath: z.string().min(1).optional().describe('Only commits that changed this file or directory (it may since have been deleted).'),
|
|
7
|
+
ref: z.string().min(1).max(200).optional().describe('Where to start: a branch, tag, commit, or range such as main..HEAD (default: HEAD).'),
|
|
8
|
+
grep: z.string().min(1).max(200).optional().describe('Only commits whose message contains this text (case-insensitive).'),
|
|
9
|
+
limit: z.number().int().min(1).max(100).default(20),
|
|
10
|
+
})
|
|
11
|
+
.strict();
|
|
12
|
+
export const gitLogTool = {
|
|
13
|
+
name: 'git_log',
|
|
14
|
+
description: 'List commits (hash, date, author, subject), optionally only those that changed a path or whose message matches text. Use it to find when and why code changed; read a commit with git_show.',
|
|
15
|
+
access: 'read',
|
|
16
|
+
inputSchema,
|
|
17
|
+
isConcurrencySafe: () => true,
|
|
18
|
+
isUndoable: () => false,
|
|
19
|
+
policyTargets: input => (input.filePath ? [{ kind: 'path', value: input.filePath }] : []),
|
|
20
|
+
async run(input, context) {
|
|
21
|
+
const args = ['log', '--no-color', '--no-show-signature', `-n${input.limit}`, '--date=short', '--format=%h %ad %an %s'];
|
|
22
|
+
if (input.grep)
|
|
23
|
+
args.push('--fixed-strings', '--regexp-ignore-case', `--grep=${input.grep}`);
|
|
24
|
+
args.push('--end-of-options', input.ref ? assertRevision(input.ref) : 'HEAD', '--');
|
|
25
|
+
if (input.filePath) {
|
|
26
|
+
const patterns = await loadIgnorePatterns(context.cwd);
|
|
27
|
+
args.push(`:(literal)${await workspaceGitPath(context.cwd, input.filePath, patterns)}`);
|
|
28
|
+
}
|
|
29
|
+
const { stdout } = await gitRead(args, context.cwd, 64_000);
|
|
30
|
+
const commits = stdout.trimEnd();
|
|
31
|
+
const count = commits ? commits.split('\n').length : 0;
|
|
32
|
+
return {
|
|
33
|
+
title: `git log${input.filePath ? ` ${input.filePath}` : ''}`,
|
|
34
|
+
output: commits || 'No commits found.',
|
|
35
|
+
metadata: { commits: count, ref: input.ref ?? 'HEAD', filePath: input.filePath },
|
|
36
|
+
};
|
|
37
|
+
},
|
|
38
|
+
};
|
|
39
|
+
//# sourceMappingURL=gitLog.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gitLog.js","sourceRoot":"","sources":["../../src/tools/gitLog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG3D,MAAM,WAAW,GAAG,CAAC;KAClB,MAAM,CAAC;IACN,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,oFAAoF,CAAC;IACrI,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,qFAAqF,CAAC;IAC1I,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,mEAAmE,CAAC;IACzH,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;CACpD,CAAC;KACD,MAAM,EAAE,CAAC;AAIZ,MAAM,CAAC,MAAM,UAAU,GAAgB;IACrC,IAAI,EAAE,SAAS;IACf,WAAW,EACT,6LAA6L;IAC/L,MAAM,EAAE,MAAM;IACd,WAAW;IACX,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI;IAC7B,UAAU,EAAE,GAAG,EAAE,CAAC,KAAK;IACvB,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEzF,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO;QACtB,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAAE,KAAK,KAAK,CAAC,KAAK,EAAE,EAAE,cAAc,EAAE,2BAA2B,CAAC,CAAC;QAC3H,IAAI,KAAK,CAAC,IAAI;YAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,EAAE,UAAU,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7F,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACpF,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACvD,IAAI,CAAC,IAAI,CAAC,aAAa,MAAM,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC1F,CAAC;QAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,OAAO;YACL,KAAK,EAAE,UAAU,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7D,MAAM,EAAE,OAAO,IAAI,mBAAmB;YACtC,QAAQ,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE;SACjF,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import type { Tool } from './types.js';
|
|
3
|
+
declare const inputSchema: z.ZodObject<{
|
|
4
|
+
ref: z.ZodDefault<z.ZodString>;
|
|
5
|
+
filePath: z.ZodOptional<z.ZodString>;
|
|
6
|
+
statOnly: z.ZodDefault<z.ZodBoolean>;
|
|
7
|
+
maxBytes: z.ZodDefault<z.ZodNumber>;
|
|
8
|
+
}, z.core.$strict>;
|
|
9
|
+
type Input = z.infer<typeof inputSchema>;
|
|
10
|
+
export declare const gitShowTool: Tool<Input>;
|
|
11
|
+
export {};
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { assertRevision, excludePathspecs, gitRead, workspaceGitPath } from '../core/gitRead.js';
|
|
3
|
+
import { loadIgnorePatterns } from '../core/ignorefile.js';
|
|
4
|
+
const inputSchema = z
|
|
5
|
+
.object({
|
|
6
|
+
ref: z.string().min(1).max(200).default('HEAD').describe('Commit, tag, or branch to show (default: HEAD).'),
|
|
7
|
+
filePath: z.string().min(1).optional().describe('Only show changes to this file or directory.'),
|
|
8
|
+
statOnly: z.boolean().default(false).describe('List the changed files with line counts instead of the full diff.'),
|
|
9
|
+
maxBytes: z.number().int().positive().max(128_000).default(64_000),
|
|
10
|
+
})
|
|
11
|
+
.strict();
|
|
12
|
+
export const gitShowTool = {
|
|
13
|
+
name: 'git_show',
|
|
14
|
+
description: 'Show one commit: its author, date, full message, and diff (or only the changed files with statOnly). Paths excluded by .dvalincodeignore are left out of the diff.',
|
|
15
|
+
access: 'read',
|
|
16
|
+
inputSchema,
|
|
17
|
+
isConcurrencySafe: () => true,
|
|
18
|
+
isUndoable: () => false,
|
|
19
|
+
policyTargets: input => (input.filePath ? [{ kind: 'path', value: input.filePath }] : []),
|
|
20
|
+
async run(input, context) {
|
|
21
|
+
const patterns = await loadIgnorePatterns(context.cwd);
|
|
22
|
+
const args = ['show', '--no-color', '--no-ext-diff', '--no-textconv', '--no-show-signature', '--format=fuller', '--date=iso'];
|
|
23
|
+
if (input.statOnly)
|
|
24
|
+
args.push('--stat');
|
|
25
|
+
args.push('--end-of-options', assertRevision(input.ref), '--');
|
|
26
|
+
if (input.filePath)
|
|
27
|
+
args.push(`:(literal)${await workspaceGitPath(context.cwd, input.filePath, patterns)}`);
|
|
28
|
+
args.push(...excludePathspecs(patterns));
|
|
29
|
+
const { stdout, truncated } = await gitRead(args, context.cwd, input.maxBytes);
|
|
30
|
+
const notes = [
|
|
31
|
+
truncated ? `[output truncated at ${input.maxBytes} bytes; narrow it with filePath or statOnly]` : '',
|
|
32
|
+
patterns.length > 0 ? '[paths excluded by .dvalincodeignore are not shown]' : '',
|
|
33
|
+
].filter(Boolean);
|
|
34
|
+
return {
|
|
35
|
+
title: `git show ${input.ref}`,
|
|
36
|
+
output: [stdout.trimEnd(), ...notes].filter(Boolean).join('\n'),
|
|
37
|
+
metadata: { ref: input.ref, filePath: input.filePath, statOnly: input.statOnly, truncated },
|
|
38
|
+
};
|
|
39
|
+
},
|
|
40
|
+
};
|
|
41
|
+
//# sourceMappingURL=gitShow.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gitShow.js","sourceRoot":"","sources":["../../src/tools/gitShow.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/gitStatus.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
import { execFile } from 'node:child_process';
|
|
2
|
-
import { promisify } from 'node:util';
|
|
3
1
|
import { z } from 'zod';
|
|
4
|
-
|
|
2
|
+
import { gitRead } from '../core/gitRead.js';
|
|
5
3
|
const inputSchema = z.object({}).strict();
|
|
6
4
|
async function git(args, cwd) {
|
|
7
|
-
|
|
8
|
-
return stdout.trim();
|
|
5
|
+
return (await gitRead(args, cwd, 256_000)).stdout.trim();
|
|
9
6
|
}
|
|
10
7
|
export const gitStatusTool = {
|
|
11
8
|
name: 'git_status',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitStatus.js","sourceRoot":"","sources":["../../src/tools/gitStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"gitStatus.js","sourceRoot":"","sources":["../../src/tools/gitStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;AAE1C,KAAK,UAAU,GAAG,CAAC,IAAc,EAAE,GAAW;IAC5C,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;AAC3D,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAsC;IAC9D,IAAI,EAAE,YAAY;IAClB,WAAW,EACT,6HAA6H;IAC/H,MAAM,EAAE,MAAM;IACd,WAAW;IACX,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI;IAC7B,UAAU,EAAE,GAAG,EAAE,CAAC,KAAK;IAEvB,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO;QACvB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QACxB,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAAE,GAAG,CAAC,CAAC;YAC5D,KAAK,CAAC,IAAI,CAAC,WAAW,MAAM,IAAI,iBAAiB,EAAE,CAAC,CAAC;YAErD,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;YACvD,IAAI,GAAG,EAAE,CAAC;gBACR,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;gBAClC,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;oBAAE,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YAC9D,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,CAAC;YACzD,IAAI,MAAM,EAAE,CAAC;gBACX,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;gBACjC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;oBAAE,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YACjE,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,qBAAqB,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,+CAA+C,EAAE,CAAC;QAC1F,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IAC3D,CAAC;CACF,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Small HTML → text conversion for the web tools. Not a parser: it keeps what a
|
|
3
|
+
* model needs from a page (title, headings, paragraphs, lists, links, code
|
|
4
|
+
* blocks) and drops scripts, styles, navigation and markup.
|
|
5
|
+
*
|
|
6
|
+
* Entities are decoded exactly once, after every tag is stripped, so escaped
|
|
7
|
+
* text such as `<div>` survives as `<div>` instead of being mistaken for
|
|
8
|
+
* a tag and removed.
|
|
9
|
+
*
|
|
10
|
+
* Tag names end at `(?=[\s/>])` rather than `\b`, so a custom element such as
|
|
11
|
+
* `<nav-menu>` is not taken for `<nav>`.
|
|
12
|
+
*/
|
|
13
|
+
/** Inline markup, such as a page title or a search snippet, as one line of text. */
|
|
14
|
+
export declare function inlineHtmlToText(html: string): string;
|
|
15
|
+
/** A whole page as readable text. Links are kept as `[label](absolute-url)`. */
|
|
16
|
+
export declare function htmlToText(html: string, baseUrl: string): {
|
|
17
|
+
title: string;
|
|
18
|
+
text: string;
|
|
19
|
+
};
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Small HTML → text conversion for the web tools. Not a parser: it keeps what a
|
|
3
|
+
* model needs from a page (title, headings, paragraphs, lists, links, code
|
|
4
|
+
* blocks) and drops scripts, styles, navigation and markup.
|
|
5
|
+
*
|
|
6
|
+
* Entities are decoded exactly once, after every tag is stripped, so escaped
|
|
7
|
+
* text such as `<div>` survives as `<div>` instead of being mistaken for
|
|
8
|
+
* a tag and removed.
|
|
9
|
+
*
|
|
10
|
+
* Tag names end at `(?=[\s/>])` rather than `\b`, so a custom element such as
|
|
11
|
+
* `<nav-menu>` is not taken for `<nav>`.
|
|
12
|
+
*/
|
|
13
|
+
const NAMED_ENTITIES = {
|
|
14
|
+
amp: '&', lt: '<', gt: '>', quot: '"', apos: "'", nbsp: ' ',
|
|
15
|
+
copy: '©', reg: '®', trade: '™', hellip: '…', mdash: '—', ndash: '–',
|
|
16
|
+
lsquo: '‘', rsquo: '’', ldquo: '“', rdquo: '”', laquo: '«', raquo: '»',
|
|
17
|
+
bull: '•', middot: '·', times: '×', deg: '°', larr: '←', rarr: '→',
|
|
18
|
+
};
|
|
19
|
+
/** Elements dropped with everything inside them. An unclosed one runs to the end. */
|
|
20
|
+
const DROPPED_ELEMENTS = /<(head|script|style|noscript|template|svg|math|iframe|object|canvas|select|nav|footer)(?=[\s/>])[\s\S]*?(?:<\/\1\s*>|$)/gi;
|
|
21
|
+
const PARAGRAPH_TAGS = /<\/?(?:p|div|section|article|aside|header|main|blockquote|figure|table|ul|ol|dl|details|form|fieldset|address)(?=[\s/>])[^>]*>/gi;
|
|
22
|
+
const LINE_TAGS = /<\/?(?:tr|dt|dd|summary|figcaption|caption)(?=[\s/>])[^>]*>/gi;
|
|
23
|
+
const BR_TAG = /<br(?=[\s/>])[^>]*>/gi;
|
|
24
|
+
function decodeEntities(text) {
|
|
25
|
+
return text.replace(/&(#\d{1,7}|#x[\da-f]{1,6}|[a-z][a-z\d]{1,9});/gi, (entity, body) => {
|
|
26
|
+
if (body[0] !== '#')
|
|
27
|
+
return NAMED_ENTITIES[body] ?? entity;
|
|
28
|
+
const code = body[1] === 'x' || body[1] === 'X' ? Number.parseInt(body.slice(2), 16) : Number.parseInt(body.slice(1), 10);
|
|
29
|
+
return code > 0 && code <= 0x10ffff ? String.fromCodePoint(code) : entity;
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
/** Inline markup, such as a page title or a search snippet, as one line of text. */
|
|
33
|
+
export function inlineHtmlToText(html) {
|
|
34
|
+
return decodeEntities(stripTags(html)).replace(/\s+/g, ' ').trim();
|
|
35
|
+
}
|
|
36
|
+
/** A whole page as readable text. Links are kept as `[label](absolute-url)`. */
|
|
37
|
+
export function htmlToText(html, baseUrl) {
|
|
38
|
+
const source = html.replace(/\u0000/g, '');
|
|
39
|
+
const title = inlineHtmlToText(/<title(?=[\s/>])[^>]*>([\s\S]*?)<\/title\s*>/i.exec(source)?.[1] ?? '');
|
|
40
|
+
const cleaned = source.replace(/<!--[\s\S]*?(?:-->|$)/g, '').replace(DROPPED_ELEMENTS, '');
|
|
41
|
+
let body = /<main(?=[\s/>])[^>]*>([\s\S]*?)(?:<\/main\s*>|$)/i.exec(cleaned)?.[1] ??
|
|
42
|
+
/<body(?=[\s/>])[^>]*>([\s\S]*?)(?:<\/body\s*>|$)/i.exec(cleaned)?.[1] ??
|
|
43
|
+
cleaned;
|
|
44
|
+
// Preformatted blocks keep their whitespace, so set them aside before the rest is collapsed.
|
|
45
|
+
const preBlocks = [];
|
|
46
|
+
body = body.replace(/<pre(?=[\s/>])[^>]*>([\s\S]*?)(?:<\/pre\s*>|$)/gi, (_match, inner) => {
|
|
47
|
+
preBlocks.push(decodeEntities(stripTags(inner.replace(BR_TAG, '\n'))).replace(/^\n+|\s+$/g, ''));
|
|
48
|
+
return `<p>\u0000${preBlocks.length - 1}\u0000</p>`;
|
|
49
|
+
});
|
|
50
|
+
const flattened = body
|
|
51
|
+
.replace(/\s+/g, ' ')
|
|
52
|
+
.replace(/<h([1-6])(?=[\s/>])[^>]*>(.*?)<\/h\1\s*>/gi, (_match, level, inner) => `\n\n${'#'.repeat(Number(level))} ${stripTags(inner).trim()}\n\n`)
|
|
53
|
+
.replace(/<a(?=[\s/>])([^>]*)>(.*?)<\/a\s*>/gi, (_match, attrs, inner) => renderLink(attrs, inner, baseUrl))
|
|
54
|
+
.replace(/<li(?=[\s/>])[^>]*>/gi, '\n- ')
|
|
55
|
+
.replace(BR_TAG, '\n')
|
|
56
|
+
.replace(/<hr(?=[\s/>])[^>]*>/gi, '\n\n---\n\n')
|
|
57
|
+
.replace(/<\/t[dh]\s*>/gi, ' | ')
|
|
58
|
+
.replace(LINE_TAGS, '\n')
|
|
59
|
+
.replace(PARAGRAPH_TAGS, '\n\n');
|
|
60
|
+
const text = decodeEntities(stripTags(flattened))
|
|
61
|
+
.split('\n')
|
|
62
|
+
// Zero-width spaces come from heading anchors (VitePress, Docusaurus) and BOMs.
|
|
63
|
+
.map(line => line.replace(/[]/g, '').replace(/[ \t ]+/g, ' ').replace(/\s*\|\s*$/, '').trim())
|
|
64
|
+
.filter(line => line !== '-')
|
|
65
|
+
.join('\n')
|
|
66
|
+
.replace(/\n{3,}/g, '\n\n')
|
|
67
|
+
.trim()
|
|
68
|
+
.replace(/\u0000(\d+)\u0000/g, (_match, index) => `\`\`\`\n${preBlocks[Number(index)]}\n\`\`\``);
|
|
69
|
+
return { title, text };
|
|
70
|
+
}
|
|
71
|
+
/**
|
|
72
|
+
* Remove every tag, repeating until nothing changes so that no tag can be left
|
|
73
|
+
* behind or re-formed from the pieces around a removed one.
|
|
74
|
+
*/
|
|
75
|
+
function stripTags(html) {
|
|
76
|
+
let text = html;
|
|
77
|
+
let previous;
|
|
78
|
+
do {
|
|
79
|
+
previous = text;
|
|
80
|
+
text = text.replace(/<[^>]*>/g, '');
|
|
81
|
+
} while (text !== previous);
|
|
82
|
+
return text;
|
|
83
|
+
}
|
|
84
|
+
function renderLink(attrs, inner, baseUrl) {
|
|
85
|
+
const label = stripTags(inner).trim();
|
|
86
|
+
if (!label)
|
|
87
|
+
return '';
|
|
88
|
+
const href = /\bhref\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'>]+))/i.exec(attrs);
|
|
89
|
+
const target = resolveLink(decodeEntities(href?.[1] ?? href?.[2] ?? href?.[3] ?? '').trim(), baseUrl);
|
|
90
|
+
return target ? `[${label}](${target})` : label;
|
|
91
|
+
}
|
|
92
|
+
/** Absolute http(s) target of a link, or null for same-page anchors and other schemes. */
|
|
93
|
+
function resolveLink(href, baseUrl) {
|
|
94
|
+
if (!href || href.startsWith('#'))
|
|
95
|
+
return null;
|
|
96
|
+
try {
|
|
97
|
+
const url = new URL(href, baseUrl);
|
|
98
|
+
return url.protocol === 'http:' || url.protocol === 'https:' ? url.href : null;
|
|
99
|
+
}
|
|
100
|
+
catch {
|
|
101
|
+
return null;
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=htmlText.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"htmlText.js","sourceRoot":"","sources":["../../src/tools/htmlText.ts"],"names":[],"mappings":"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"}
|