@dirgha/code 1.20.25 → 1.20.27
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/dist/auth/keypool.js +40 -26
- package/dist/auth/keypool.js.map +1 -1
- package/dist/auth/keystore.js +16 -11
- package/dist/auth/keystore.js.map +1 -1
- package/dist/cli/config.js +23 -2
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/first-run.js +40 -24
- package/dist/cli/first-run.js.map +1 -1
- package/dist/cli/flows/wizard.js +12 -18
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.d.ts +4 -0
- package/dist/cli/interactive.js +29 -1
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +59 -17
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/slash/fleet.js +19 -1
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/models.js +4 -2
- package/dist/cli/slash/models.js.map +1 -1
- package/dist/cli/slash.js +26 -10
- package/dist/cli/slash.js.map +1 -1
- package/dist/cli/subcommands/telemetry.d.ts +2 -1
- package/dist/cli/subcommands/telemetry.js +47 -34
- package/dist/cli/subcommands/telemetry.js.map +1 -1
- package/dist/context/branch.d.ts +2 -2
- package/dist/context/branch.js +40 -23
- package/dist/context/branch.js.map +1 -1
- package/dist/context/compaction.js +38 -18
- package/dist/context/compaction.js.map +1 -1
- package/dist/context/git-state.js +31 -18
- package/dist/context/git-state.js.map +1 -1
- package/dist/context/knowledge.js +31 -20
- package/dist/context/knowledge.js.map +1 -1
- package/dist/context/memory.js +7 -0
- package/dist/context/memory.js.map +1 -1
- package/dist/context/mode-enforcement.js +11 -2
- package/dist/context/mode-enforcement.js.map +1 -1
- package/dist/context/mode.js +67 -30
- package/dist/context/mode.js.map +1 -1
- package/dist/context/primer.js +15 -3
- package/dist/context/primer.js.map +1 -1
- package/dist/fleet/apply-back.js +5 -1
- package/dist/fleet/apply-back.js.map +1 -1
- package/dist/fleet/cli-command.d.ts +2 -0
- package/dist/fleet/cli-command.js +15 -1
- package/dist/fleet/cli-command.js.map +1 -1
- package/dist/fleet/runner.js +35 -2
- package/dist/fleet/runner.js.map +1 -1
- package/dist/fleet/scratchpad.js +1 -2
- package/dist/fleet/scratchpad.js.map +1 -1
- package/dist/fleet/state.d.ts +4 -0
- package/dist/fleet/state.js +11 -2
- package/dist/fleet/state.js.map +1 -1
- package/dist/fleet/templates.d.ts +4 -0
- package/dist/fleet/templates.js.map +1 -1
- package/dist/fleet/types.d.ts +4 -0
- package/dist/fleet/types.js.map +1 -1
- package/dist/intelligence/prices.d.ts +6 -4
- package/dist/intelligence/prices.js +36 -10
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/kernel/agent-loop.js +49 -15
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/lsp/client.js +29 -16
- package/dist/lsp/client.js.map +1 -1
- package/dist/lsp/detector.js +7 -6
- package/dist/lsp/detector.js.map +1 -1
- package/dist/mcp/client.d.ts +1 -1
- package/dist/mcp/client.js +19 -16
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/transport.js +46 -38
- package/dist/mcp/transport.js.map +1 -1
- package/dist/providers/dispatch.js +15 -1
- package/dist/providers/dispatch.js.map +1 -1
- package/dist/providers/index.d.ts +11 -0
- package/dist/providers/index.js +29 -2
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/openai-compat.js +4 -2
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/safety/audit-log.d.ts +15 -0
- package/dist/safety/audit-log.js +21 -0
- package/dist/safety/audit-log.js.map +1 -1
- package/dist/telemetry/gateway-push.d.ts +17 -0
- package/dist/telemetry/gateway-push.js +48 -0
- package/dist/telemetry/gateway-push.js.map +1 -0
- package/dist/telemetry/index.d.ts +9 -0
- package/dist/telemetry/index.js +9 -0
- package/dist/telemetry/index.js.map +1 -0
- package/dist/tools/browser.js +24 -16
- package/dist/tools/browser.js.map +1 -1
- package/dist/tools/checkpoint.d.ts +6 -1
- package/dist/tools/checkpoint.js +79 -62
- package/dist/tools/checkpoint.js.map +1 -1
- package/dist/tools/cron.js +1 -3
- package/dist/tools/cron.js.map +1 -1
- package/dist/tools/diff.js +25 -21
- package/dist/tools/diff.js.map +1 -1
- package/dist/tools/exec.d.ts +2 -0
- package/dist/tools/exec.js +13 -0
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/fs-edit.d.ts +3 -5
- package/dist/tools/fs-edit.js +8 -23
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/fs-ls.js +6 -8
- package/dist/tools/fs-ls.js.map +1 -1
- package/dist/tools/fs-read.d.ts +1 -1
- package/dist/tools/fs-read.js +37 -28
- package/dist/tools/fs-read.js.map +1 -1
- package/dist/tools/fs-write.d.ts +1 -1
- package/dist/tools/fs-write.js +33 -33
- package/dist/tools/fs-write.js.map +1 -1
- package/dist/tools/git.js +12 -6
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/index.d.ts +3 -1
- package/dist/tools/index.js +4 -3
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/multimodal.js +11 -12
- package/dist/tools/multimodal.js.map +1 -1
- package/dist/tools/rtk.js +22 -9
- package/dist/tools/rtk.js.map +1 -1
- package/dist/tools/search-glob.d.ts +1 -1
- package/dist/tools/search-glob.js +42 -24
- package/dist/tools/search-glob.js.map +1 -1
- package/dist/tools/search-grep.d.ts +1 -1
- package/dist/tools/search-grep.js +56 -32
- package/dist/tools/search-grep.js.map +1 -1
- package/dist/tools/shell.d.ts +1 -1
- package/dist/tools/shell.js +78 -54
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/ink/App.js +90 -42
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/DenseToolMessage.js +5 -1
- package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
- package/dist/tui/ink/components/InputBox.js +16 -15
- package/dist/tui/ink/components/InputBox.js.map +1 -1
- package/dist/tui/ink/components/ModelPicker.d.ts +2 -2
- package/dist/tui/ink/components/ModelPicker.js +34 -26
- package/dist/tui/ink/components/ModelPicker.js.map +1 -1
- package/dist/tui/ink/components/SpinnerGlyph.d.ts +4 -4
- package/dist/tui/ink/components/SpinnerGlyph.js +34 -14
- package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -1
- package/dist/tui/ink/components/StatusBar.js +0 -2
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/components/ToolBox.js +1 -3
- package/dist/tui/ink/components/ToolBox.js.map +1 -1
- package/dist/tui/ink/components/VirtualTranscript.js +3 -1
- package/dist/tui/ink/components/VirtualTranscript.js.map +1 -1
- package/dist/tui/ink/use-declined-versions.js +6 -2
- package/dist/tui/ink/use-declined-versions.js.map +1 -1
- package/dist/tui/ink/use-event-projection.js +12 -0
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/dist/tui/ink/use-overlays.js +16 -17
- package/dist/tui/ink/use-overlays.js.map +1 -1
- package/dist/tui/ink/use-render-metrics.js +6 -2
- package/dist/tui/ink/use-render-metrics.js.map +1 -1
- package/dist/utils/env.d.ts +1 -0
- package/dist/utils/env.js +60 -0
- package/dist/utils/env.js.map +1 -0
- package/dist/utils/fs.d.ts +10 -0
- package/dist/utils/fs.js +37 -0
- package/dist/utils/fs.js.map +1 -0
- package/package.json +1 -1
package/dist/tools/exec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/tools/exec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/tools/exec.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/fs-edit.d.ts
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* String-replace edit with exact
|
|
2
|
+
* String-replace edit with exact matching.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
* ambiguous, returns an error with the candidate contexts so the agent
|
|
7
|
-
* can retry with more specific anchors. This is deterministic and
|
|
4
|
+
* When the exact string is missing, returns an error so the agent can
|
|
5
|
+
* retry with more specific anchors. This is deterministic and
|
|
8
6
|
* auditable — no "nearest fuzzy match" guessing.
|
|
9
7
|
*/
|
|
10
8
|
import type { Tool } from "./registry.js";
|
package/dist/tools/fs-edit.js
CHANGED
|
@@ -1,28 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* String-replace edit with exact
|
|
2
|
+
* String-replace edit with exact matching.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
* ambiguous, returns an error with the candidate contexts so the agent
|
|
7
|
-
* can retry with more specific anchors. This is deterministic and
|
|
4
|
+
* When the exact string is missing, returns an error so the agent can
|
|
5
|
+
* retry with more specific anchors. This is deterministic and
|
|
8
6
|
* auditable — no "nearest fuzzy match" guessing.
|
|
9
7
|
*/
|
|
10
8
|
import { readFile, stat, writeFile } from "node:fs/promises";
|
|
11
|
-
import { resolve, sep } from "node:path";
|
|
12
9
|
import { summariseDiff, unifiedDiff } from "./diff.js";
|
|
13
|
-
|
|
14
|
-
function decodeLiteralUnicodeEscapes(s) {
|
|
15
|
-
return s.replace(/\\u([0-9a-fA-F]{4})/g, (_, hex) => {
|
|
16
|
-
const cp = parseInt(hex, 16);
|
|
17
|
-
// Only decode printable ASCII range (0x20–0x7E) plus common whitespace.
|
|
18
|
-
// Leave high-codepoint escapes (e.g. CJK, emoji) as-is to avoid
|
|
19
|
-
// corrupting intentional unicode-escape strings in JS source.
|
|
20
|
-
if ((cp >= 0x20 && cp <= 0x7e) || cp === 0x0a || cp === 0x0d || cp === 0x09) {
|
|
21
|
-
return String.fromCodePoint(cp);
|
|
22
|
-
}
|
|
23
|
-
return _;
|
|
24
|
-
});
|
|
25
|
-
}
|
|
10
|
+
import { decodeLiteralUnicodeEscapes, isValidCwdPath } from "../utils/fs.js";
|
|
26
11
|
export const fsEditTool = {
|
|
27
12
|
name: "fs_edit",
|
|
28
13
|
description: "Replace an exact substring in a file. Fails on ambiguity (multiple matches) unless replaceAll is set. Use larger context around oldString to disambiguate.",
|
|
@@ -39,10 +24,10 @@ export const fsEditTool = {
|
|
|
39
24
|
requiresApproval: () => true,
|
|
40
25
|
async execute(rawInput, ctx) {
|
|
41
26
|
const input = rawInput;
|
|
42
|
-
const
|
|
43
|
-
if (!
|
|
44
|
-
return { content:
|
|
45
|
-
|
|
27
|
+
const check = isValidCwdPath(ctx.cwd, input.path);
|
|
28
|
+
if (!check.valid)
|
|
29
|
+
return { content: check.error, isError: true };
|
|
30
|
+
const abs = check.resolved;
|
|
46
31
|
const info = await stat(abs).catch(() => undefined);
|
|
47
32
|
if (!info || !info.isFile())
|
|
48
33
|
return { content: `No such file: ${input.path}`, isError: true };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-edit.js","sourceRoot":"","sources":["../../src/tools/fs-edit.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"fs-edit.js","sourceRoot":"","sources":["../../src/tools/fs-edit.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/fs-ls.js
CHANGED
|
@@ -4,7 +4,8 @@
|
|
|
4
4
|
* spending tokens on noisy metadata.
|
|
5
5
|
*/
|
|
6
6
|
import { readdir, stat } from "node:fs/promises";
|
|
7
|
-
import { resolve
|
|
7
|
+
import { resolve } from "node:path";
|
|
8
|
+
import { isValidCwdPath } from "../utils/fs.js";
|
|
8
9
|
// Paths where a blind fs_ls is almost never what the user actually
|
|
9
10
|
// wanted. Typing `fs_ls .` at / or /root spills 100+ unrelated entries
|
|
10
11
|
// into the model's context for no gain. Force a narrower ask.
|
|
@@ -34,13 +35,10 @@ export const fsLsTool = {
|
|
|
34
35
|
},
|
|
35
36
|
async execute(rawInput, ctx) {
|
|
36
37
|
const input = rawInput;
|
|
37
|
-
const
|
|
38
|
-
if (!
|
|
39
|
-
return {
|
|
40
|
-
|
|
41
|
-
isError: true,
|
|
42
|
-
};
|
|
43
|
-
}
|
|
38
|
+
const check = isValidCwdPath(ctx.cwd, input.path ?? ".");
|
|
39
|
+
if (!check.valid)
|
|
40
|
+
return { content: check.error, isError: true };
|
|
41
|
+
const target = check.resolved;
|
|
44
42
|
if (HUGE_ROOTS.has(target)) {
|
|
45
43
|
return {
|
|
46
44
|
content: `Refusing to list ${target} — too broad. Supply a narrower path, or use search_glob / search_grep with a targeted pattern.`,
|
package/dist/tools/fs-ls.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-ls.js","sourceRoot":"","sources":["../../src/tools/fs-ls.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"fs-ls.js","sourceRoot":"","sources":["../../src/tools/fs-ls.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/fs-read.d.ts
CHANGED
|
@@ -3,5 +3,5 @@
|
|
|
3
3
|
* files are rejected with a clear message; line-based windowing uses
|
|
4
4
|
* cat -n style numbering so the model can cite line numbers reliably.
|
|
5
5
|
*/
|
|
6
|
-
import type { Tool } from
|
|
6
|
+
import type { Tool } from "./registry.js";
|
|
7
7
|
export declare const fsReadTool: Tool;
|
package/dist/tools/fs-read.js
CHANGED
|
@@ -3,61 +3,70 @@
|
|
|
3
3
|
* files are rejected with a clear message; line-based windowing uses
|
|
4
4
|
* cat -n style numbering so the model can cite line numbers reliably.
|
|
5
5
|
*/
|
|
6
|
-
import { readFile, stat } from
|
|
7
|
-
import {
|
|
6
|
+
import { readFile, stat } from "node:fs/promises";
|
|
7
|
+
import { isValidCwdPath, isBinary } from "../utils/fs.js";
|
|
8
8
|
const MAX_BYTES = 2 * 1024 * 1024;
|
|
9
9
|
export const fsReadTool = {
|
|
10
|
-
name:
|
|
11
|
-
description:
|
|
10
|
+
name: "fs_read",
|
|
11
|
+
description: "Read a text file from disk. Returns contents with 1-based line numbers. Use offset/limit to page through large files.",
|
|
12
12
|
inputSchema: {
|
|
13
|
-
type:
|
|
13
|
+
type: "object",
|
|
14
14
|
properties: {
|
|
15
|
-
path: {
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
path: {
|
|
16
|
+
type: "string",
|
|
17
|
+
description: "Absolute or cwd-relative path to the file.",
|
|
18
|
+
},
|
|
19
|
+
offset: {
|
|
20
|
+
type: "integer",
|
|
21
|
+
minimum: 1,
|
|
22
|
+
description: "Line number to start from (1-based).",
|
|
23
|
+
},
|
|
24
|
+
limit: {
|
|
25
|
+
type: "integer",
|
|
26
|
+
minimum: 1,
|
|
27
|
+
description: "Maximum number of lines to return.",
|
|
28
|
+
},
|
|
18
29
|
},
|
|
19
|
-
required: [
|
|
30
|
+
required: ["path"],
|
|
20
31
|
},
|
|
21
32
|
async execute(rawInput, ctx) {
|
|
22
33
|
const input = rawInput;
|
|
23
|
-
const
|
|
24
|
-
if (!
|
|
25
|
-
return { content:
|
|
26
|
-
|
|
34
|
+
const check = isValidCwdPath(ctx.cwd, input.path);
|
|
35
|
+
if (!check.valid)
|
|
36
|
+
return { content: check.error, isError: true };
|
|
37
|
+
const abs = check.resolved;
|
|
27
38
|
const info = await stat(abs).catch(() => undefined);
|
|
28
39
|
if (!info)
|
|
29
40
|
return { content: `No such file: ${input.path}`, isError: true };
|
|
30
41
|
if (!info.isFile())
|
|
31
42
|
return { content: `Not a file: ${input.path}`, isError: true };
|
|
32
43
|
if (info.size > MAX_BYTES) {
|
|
33
|
-
return {
|
|
44
|
+
return {
|
|
45
|
+
content: `File too large (${info.size} bytes, max ${MAX_BYTES}). Use offset/limit.`,
|
|
46
|
+
isError: true,
|
|
47
|
+
};
|
|
34
48
|
}
|
|
35
49
|
const buffer = await readFile(abs);
|
|
36
50
|
if (isBinary(buffer))
|
|
37
|
-
return {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
51
|
+
return {
|
|
52
|
+
content: `File appears to be binary: ${input.path}`,
|
|
53
|
+
isError: true,
|
|
54
|
+
};
|
|
55
|
+
const text = buffer.toString("utf8");
|
|
56
|
+
const lines = text.split("\n");
|
|
57
|
+
const offset = (input.offset ?? 1) - 1;
|
|
41
58
|
const limit = input.limit ?? lines.length;
|
|
42
59
|
const window = lines.slice(offset, offset + limit);
|
|
43
60
|
const numbered = window
|
|
44
61
|
.map((line, idx) => `${String(offset + idx + 1).padStart(6)}\t${line}`)
|
|
45
|
-
.join(
|
|
62
|
+
.join("\n");
|
|
46
63
|
const truncated = offset + window.length < lines.length;
|
|
47
64
|
return {
|
|
48
65
|
content: numbered,
|
|
49
66
|
data: { lines: window.length, truncated },
|
|
50
67
|
isError: false,
|
|
51
|
-
metadata: { totalLines: lines.length, offset, limit },
|
|
68
|
+
metadata: { totalLines: lines.length, offset: offset + 1, limit },
|
|
52
69
|
};
|
|
53
70
|
},
|
|
54
71
|
};
|
|
55
|
-
function isBinary(buf) {
|
|
56
|
-
const sample = buf.subarray(0, Math.min(buf.length, 8192));
|
|
57
|
-
for (const byte of sample) {
|
|
58
|
-
if (byte === 0)
|
|
59
|
-
return true;
|
|
60
|
-
}
|
|
61
|
-
return false;
|
|
62
|
-
}
|
|
63
72
|
//# sourceMappingURL=fs-read.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-read.js","sourceRoot":"","sources":["../../src/tools/fs-read.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"fs-read.js","sourceRoot":"","sources":["../../src/tools/fs-read.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/fs-write.d.ts
CHANGED
package/dist/tools/fs-write.js
CHANGED
|
@@ -4,57 +4,57 @@
|
|
|
4
4
|
* change. Refuses to silently overwrite: the description declares the
|
|
5
5
|
* overwrite contract.
|
|
6
6
|
*/
|
|
7
|
-
import { mkdir, readFile, stat, writeFile } from
|
|
8
|
-
import { dirname
|
|
9
|
-
import { summariseDiff, unifiedDiff } from
|
|
10
|
-
|
|
11
|
-
function decodeLiteralUnicodeEscapes(s) {
|
|
12
|
-
return s.replace(/\\u([0-9a-fA-F]{4})/g, (_, hex) => {
|
|
13
|
-
const cp = parseInt(hex, 16);
|
|
14
|
-
// Only decode printable ASCII range (0x20–0x7E) plus common whitespace.
|
|
15
|
-
// Leave high-codepoint escapes (e.g. CJK, emoji) as-is to avoid
|
|
16
|
-
// corrupting intentional unicode-escape strings in JS source.
|
|
17
|
-
if ((cp >= 0x20 && cp <= 0x7e) || cp === 0x0a || cp === 0x0d || cp === 0x09) {
|
|
18
|
-
return String.fromCodePoint(cp);
|
|
19
|
-
}
|
|
20
|
-
return _;
|
|
21
|
-
});
|
|
22
|
-
}
|
|
7
|
+
import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
|
|
8
|
+
import { dirname } from "node:path";
|
|
9
|
+
import { summariseDiff, unifiedDiff } from "./diff.js";
|
|
10
|
+
import { decodeLiteralUnicodeEscapes, isValidCwdPath } from "../utils/fs.js";
|
|
23
11
|
export const fsWriteTool = {
|
|
24
|
-
name:
|
|
25
|
-
description:
|
|
12
|
+
name: "fs_write",
|
|
13
|
+
description: "Write content to a file. Creates parent directories when createDirs is true. Overwrites existing files.",
|
|
26
14
|
inputSchema: {
|
|
27
|
-
type:
|
|
15
|
+
type: "object",
|
|
28
16
|
properties: {
|
|
29
|
-
path: { type:
|
|
30
|
-
content: { type:
|
|
31
|
-
createDirs: {
|
|
17
|
+
path: { type: "string" },
|
|
18
|
+
content: { type: "string" },
|
|
19
|
+
createDirs: {
|
|
20
|
+
type: "boolean",
|
|
21
|
+
description: "Create parent directories if they do not exist.",
|
|
22
|
+
},
|
|
32
23
|
},
|
|
33
|
-
required: [
|
|
24
|
+
required: ["path", "content"],
|
|
34
25
|
},
|
|
35
26
|
requiresApproval: () => true,
|
|
36
27
|
async execute(rawInput, ctx) {
|
|
37
28
|
const input = rawInput;
|
|
38
|
-
const
|
|
39
|
-
if (!
|
|
40
|
-
return { content:
|
|
41
|
-
|
|
42
|
-
let before =
|
|
43
|
-
const existed = await stat(abs)
|
|
29
|
+
const check = isValidCwdPath(ctx.cwd, input.path);
|
|
30
|
+
if (!check.valid)
|
|
31
|
+
return { content: check.error, isError: true };
|
|
32
|
+
const abs = check.resolved;
|
|
33
|
+
let before = "";
|
|
34
|
+
const existed = await stat(abs)
|
|
35
|
+
.then(() => true)
|
|
36
|
+
.catch(() => false);
|
|
44
37
|
if (existed)
|
|
45
|
-
before = await readFile(abs,
|
|
38
|
+
before = await readFile(abs, "utf8");
|
|
46
39
|
else if (input.createDirs)
|
|
47
40
|
await mkdir(dirname(abs), { recursive: true });
|
|
48
41
|
const sanitized = decodeLiteralUnicodeEscapes(input.content);
|
|
49
|
-
const diff = unifiedDiff(before, sanitized, {
|
|
42
|
+
const diff = unifiedDiff(before, sanitized, {
|
|
43
|
+
fromLabel: input.path,
|
|
44
|
+
toLabel: input.path,
|
|
45
|
+
});
|
|
50
46
|
const { added, removed } = summariseDiff(diff);
|
|
51
|
-
await writeFile(abs, sanitized,
|
|
47
|
+
await writeFile(abs, sanitized, "utf8");
|
|
52
48
|
const summary = existed
|
|
53
49
|
? `Updated ${input.path} (+${added} / -${removed})`
|
|
54
50
|
: `Created ${input.path} (${sanitized.length} bytes)`;
|
|
55
51
|
return {
|
|
56
52
|
content: summary,
|
|
57
|
-
data: {
|
|
53
|
+
data: {
|
|
54
|
+
bytesWritten: Buffer.byteLength(sanitized, "utf8"),
|
|
55
|
+
added,
|
|
56
|
+
removed,
|
|
57
|
+
},
|
|
58
58
|
isError: false,
|
|
59
59
|
metadata: { diff },
|
|
60
60
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-write.js","sourceRoot":"","sources":["../../src/tools/fs-write.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"fs-write.js","sourceRoot":"","sources":["../../src/tools/fs-write.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,2BAA2B,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAQ7E,MAAM,CAAC,MAAM,WAAW,GAAS;IAC/B,IAAI,EAAE,UAAU;IAChB,WAAW,EACT,yGAAyG;IAC3G,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,UAAU,EAAE;gBACV,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,iDAAiD;aAC/D;SACF;QACD,QAAQ,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;KAC9B;IACD,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI;IAC5B,KAAK,CAAC,OAAO,CACX,QAAiB,EACjB,GAAG;QAIH,MAAM,KAAK,GAAG,QAAiB,CAAC;QAChC,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,CAAC,KAAK;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACjE,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC;QAC3B,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC;aAC5B,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;aAChB,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QACtB,IAAI,OAAO;YAAE,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;aAC7C,IAAI,KAAK,CAAC,UAAU;YAAE,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE1E,MAAM,SAAS,GAAG,2BAA2B,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE;YAC1C,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,OAAO,EAAE,KAAK,CAAC,IAAI;SACpB,CAAC,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,SAAS,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAExC,MAAM,OAAO,GAAG,OAAO;YACrB,CAAC,CAAC,WAAW,KAAK,CAAC,IAAI,MAAM,KAAK,OAAO,OAAO,GAAG;YACnD,CAAC,CAAC,WAAW,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,SAAS,CAAC;QAExD,OAAO;YACL,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE;gBACJ,YAAY,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC;gBAClD,KAAK;gBACL,OAAO;aACR;YACD,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,EAAE,IAAI,EAAE;SACnB,CAAC;IACJ,CAAC;CACF,CAAC"}
|
package/dist/tools/git.js
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* a single "exec this command?" prompt per operation.
|
|
6
6
|
*/
|
|
7
7
|
import { spawn } from "node:child_process";
|
|
8
|
-
import {
|
|
8
|
+
import { isValidCwdPath } from "../utils/fs.js";
|
|
9
9
|
export const gitTool = {
|
|
10
10
|
name: "git",
|
|
11
11
|
description: "Run read-mostly git operations: status, diff, log, branch, show. Destructive git operations should go through the shell tool.",
|
|
@@ -18,6 +18,10 @@ export const gitTool = {
|
|
|
18
18
|
},
|
|
19
19
|
required: ["op"],
|
|
20
20
|
},
|
|
21
|
+
requiresApproval: (raw) => {
|
|
22
|
+
const input = raw;
|
|
23
|
+
return input.op === "diff" || input.op === "show";
|
|
24
|
+
},
|
|
21
25
|
async execute(rawInput, ctx) {
|
|
22
26
|
const input = rawInput;
|
|
23
27
|
const base = commandFor(input.op);
|
|
@@ -29,10 +33,12 @@ export const gitTool = {
|
|
|
29
33
|
};
|
|
30
34
|
}
|
|
31
35
|
const full = [...base, ...(input.args ?? [])];
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
+
if (input.cwd) {
|
|
37
|
+
const check = isValidCwdPath(ctx.cwd, input.cwd);
|
|
38
|
+
if (!check.valid)
|
|
39
|
+
return { content: check.error, isError: true };
|
|
40
|
+
}
|
|
41
|
+
const cwd = input.cwd ? ctx.cwd : ctx.cwd;
|
|
36
42
|
const result = await run("git", full, cwd, ctx.env);
|
|
37
43
|
return {
|
|
38
44
|
content: [result.stdout, result.stderr]
|
|
@@ -64,7 +70,7 @@ async function run(command, args, cwd, env) {
|
|
|
64
70
|
const child = spawn(command, args, {
|
|
65
71
|
cwd,
|
|
66
72
|
env,
|
|
67
|
-
stdio: ["
|
|
73
|
+
stdio: ["pipe", "pipe", "pipe"],
|
|
68
74
|
});
|
|
69
75
|
const stdout = [];
|
|
70
76
|
const stderr = [];
|
package/dist/tools/git.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/tools/git.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/tools/git.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAG3C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAUhD,MAAM,CAAC,MAAM,OAAO,GAAS;IAC3B,IAAI,EAAE,KAAK;IACX,WAAW,EACT,+HAA+H;IACjI,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE;YACzE,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;YAClD,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SACxB;QACD,QAAQ,EAAE,CAAC,IAAI,CAAC;KACjB;IACD,gBAAgB,EAAE,CAAC,GAAY,EAAW,EAAE;QAC1C,MAAM,KAAK,GAAG,GAAY,CAAC;QAC3B,OAAO,KAAK,CAAC,EAAE,KAAK,MAAM,IAAI,KAAK,CAAC,EAAE,KAAK,MAAM,CAAC;IACpD,CAAC;IACD,KAAK,CAAC,OAAO,CACX,QAAiB,EACjB,GAAG;QAEH,MAAM,KAAK,GAAG,QAAiB,CAAC;QAChC,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;gBACL,OAAO,EAAE,oBAAoB,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,sDAAsD;gBACnG,IAAI,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;gBACpC,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;QAC9C,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;YACd,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;YACjD,IAAI,CAAC,KAAK,CAAC,KAAK;gBAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACnE,CAAC;QACD,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;QAC1C,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QACpD,OAAO;YACL,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;iBACpC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;iBAChC,IAAI,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE;YAC7C,OAAO,EAAE,MAAM,CAAC,IAAI,KAAK,CAAC;SAC3B,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,SAAS,UAAU,CAAC,EAAkB;IACpC,QAAQ,EAAE,EAAE,CAAC;QACX,KAAK,QAAQ;YACX,OAAO,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QAC3C,KAAK,MAAM;YACT,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAChC,KAAK,KAAK;YACR,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC1C,KAAK,QAAQ;YACX,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC9B,KAAK,MAAM;YACT,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAChC;YACE,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,GAAG,CAChB,OAAe,EACf,IAAc,EACd,GAAW,EACX,GAA2B;IAE3B,OAAO,IAAI,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAChC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE;YACjC,GAAG;YACH,GAAG;YACH,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;SAChC,CAAC,CAAC;QACH,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACnD,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACnD,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1E,oEAAoE;QACpE,2EAA2E;QAC3E,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CACzB,UAAU,CAAC;YACT,MAAM,EAAE,MAAM,CAAC,MAAM,CACnB,MAA0C,CAC3C,CAAC,QAAQ,CAAC,MAAM,CAAC;YAClB,MAAM,EAAE,MAAM,CAAC,MAAM,CACnB,MAA0C,CAC3C,CAAC,QAAQ,CAAC,MAAM,CAAC;YAClB,IAAI,EAAE,IAAI,IAAI,CAAC,CAAC;SACjB,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/tools/index.d.ts
CHANGED
|
@@ -13,16 +13,18 @@ import { searchGrepTool } from "./search-grep.js";
|
|
|
13
13
|
import { searchGlobTool } from "./search-glob.js";
|
|
14
14
|
import { gitTool } from "./git.js";
|
|
15
15
|
import { browserTool } from "./browser.js";
|
|
16
|
-
import { checkpointTool } from "./checkpoint.js";
|
|
17
16
|
import { lspGoToDefinitionTool } from "./lsp-definition.js";
|
|
18
17
|
import { lspFindReferencesTool } from "./lsp-references.js";
|
|
19
18
|
import { lspHoverTool } from "./lsp-hover.js";
|
|
20
19
|
import { lspDocumentSymbolsTool } from "./lsp-symbols.js";
|
|
21
20
|
import { rtkTool } from "./rtk.js";
|
|
22
21
|
import { qmdTool } from "./qmd.js";
|
|
22
|
+
export { createMultimodalTool } from "./multimodal.js";
|
|
23
23
|
export { createCronTool } from "./cron.js";
|
|
24
|
+
export { createCheckpointTool } from "./checkpoint.js";
|
|
24
25
|
export { createTaskTool } from "./task.js";
|
|
25
26
|
declare const cronTool: Tool;
|
|
27
|
+
declare const checkpointTool: Tool;
|
|
26
28
|
export * from "./registry.js";
|
|
27
29
|
export * from "./permission.js";
|
|
28
30
|
export * from "./exec.js";
|
package/dist/tools/index.js
CHANGED
|
@@ -12,7 +12,7 @@ import { searchGrepTool } from "./search-grep.js";
|
|
|
12
12
|
import { searchGlobTool } from "./search-glob.js";
|
|
13
13
|
import { gitTool } from "./git.js";
|
|
14
14
|
import { browserTool } from "./browser.js";
|
|
15
|
-
import {
|
|
15
|
+
import { createCheckpointTool } from "./checkpoint.js";
|
|
16
16
|
import { createCronTool } from "./cron.js";
|
|
17
17
|
import { lspGoToDefinitionTool } from "./lsp-definition.js";
|
|
18
18
|
import { lspFindReferencesTool } from "./lsp-references.js";
|
|
@@ -20,11 +20,12 @@ import { lspHoverTool } from "./lsp-hover.js";
|
|
|
20
20
|
import { lspDocumentSymbolsTool } from "./lsp-symbols.js";
|
|
21
21
|
import { rtkTool } from "./rtk.js";
|
|
22
22
|
import { qmdTool } from "./qmd.js";
|
|
23
|
-
|
|
24
|
-
// export { createMultimodalTool } from "./multimodal.js";
|
|
23
|
+
export { createMultimodalTool } from "./multimodal.js";
|
|
25
24
|
export { createCronTool } from "./cron.js";
|
|
25
|
+
export { createCheckpointTool } from "./checkpoint.js";
|
|
26
26
|
export { createTaskTool } from "./task.js";
|
|
27
27
|
const cronTool = createCronTool();
|
|
28
|
+
const checkpointTool = createCheckpointTool();
|
|
28
29
|
export * from "./registry.js";
|
|
29
30
|
export * from "./permission.js";
|
|
30
31
|
export * from "./exec.js";
|
package/dist/tools/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;AAClC,MAAM,cAAc,GAAG,oBAAoB,EAAE,CAAC;AAE9C,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAE1B,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AAEjC,MAAM,CAAC,MAAM,YAAY,GAAW;IAClC,UAAU;IACV,WAAW;IACX,UAAU;IACV,QAAQ;IACR,SAAS;IACT,cAAc;IACd,cAAc;IACd,OAAO;IACP,WAAW;IACX,cAAc;IACd,QAAQ;IACR,qBAAqB;IACrB,qBAAqB;IACrB,YAAY;IACZ,sBAAsB;IACtB,OAAO;IACP,OAAO;CACR,CAAC;AAEF,OAAO,EACL,UAAU,EACV,WAAW,EACX,UAAU,EACV,QAAQ,EACR,SAAS,EACT,cAAc,EACd,cAAc,EACd,OAAO,EACP,WAAW,EACX,cAAc,EACd,QAAQ,EACR,qBAAqB,EACrB,qBAAqB,EACrB,YAAY,EACZ,sBAAsB,EACtB,OAAO,EACP,OAAO,GACR,CAAC"}
|
package/dist/tools/multimodal.js
CHANGED
|
@@ -23,7 +23,8 @@
|
|
|
23
23
|
* pull in any streaming/chat-completions internals.
|
|
24
24
|
*/
|
|
25
25
|
import { readFile, stat, writeFile, mkdir } from "node:fs/promises";
|
|
26
|
-
import { resolve, extname, dirname
|
|
26
|
+
import { resolve, extname, dirname } from "node:path";
|
|
27
|
+
import { isValidCwdPath } from "../utils/fs.js";
|
|
27
28
|
import { OpenAIProvider } from "../providers/openai.js";
|
|
28
29
|
import { NvidiaProvider } from "../providers/nvidia.js";
|
|
29
30
|
const MAX_IMAGE_BYTES = 8 * 1024 * 1024;
|
|
@@ -198,10 +199,10 @@ async function transcribeAudio(a) {
|
|
|
198
199
|
return streamProviderText(a.provider, a.model, messages, "transcribe_audio");
|
|
199
200
|
}
|
|
200
201
|
async function loadMedia(path, cwd, allowed, maxBytes, kind) {
|
|
201
|
-
const
|
|
202
|
-
if (!
|
|
203
|
-
return { error:
|
|
204
|
-
|
|
202
|
+
const check = isValidCwdPath(cwd, path);
|
|
203
|
+
if (!check.valid)
|
|
204
|
+
return { error: check.error };
|
|
205
|
+
const abs = check.resolved;
|
|
205
206
|
const info = await stat(abs).catch(() => undefined);
|
|
206
207
|
if (!info || !info.isFile())
|
|
207
208
|
return { error: `No such ${kind} file: ${path}` };
|
|
@@ -231,12 +232,10 @@ function multimodalCapabilityNotice(action, model, mime, bytes) {
|
|
|
231
232
|
].join(" ");
|
|
232
233
|
}
|
|
233
234
|
/**
|
|
234
|
-
* Build a provider-agnostic multimodal message.
|
|
235
|
-
*
|
|
236
|
-
* `image_url`
|
|
237
|
-
*
|
|
238
|
-
* instruction and a base64 blob and may handle it or return an error
|
|
239
|
-
* the agent loop can surface.
|
|
235
|
+
* Build a provider-agnostic multimodal message. For image/audio content,
|
|
236
|
+
* uses a structured content blob so provider serialisation layers can
|
|
237
|
+
* emit proper `image_url` / `input_audio` blocks. Falls back to a text
|
|
238
|
+
* annotation when the content type isn't natively handled.
|
|
240
239
|
*/
|
|
241
240
|
function multimodalMessage(args) {
|
|
242
241
|
return [
|
|
@@ -246,7 +245,7 @@ function multimodalMessage(args) {
|
|
|
246
245
|
{ type: "text", text: args.instruction },
|
|
247
246
|
{
|
|
248
247
|
type: "text",
|
|
249
|
-
text: `[${args.mediaKind.toUpperCase()} ATTACHMENT
|
|
248
|
+
text: `[${args.mediaKind.toUpperCase()} ATTACHMENT]\n${args.dataUrl}\n[/${args.mediaKind.toUpperCase()} ATTACHMENT]`,
|
|
250
249
|
},
|
|
251
250
|
],
|
|
252
251
|
},
|