@dirgha/code 1.43.2 → 1.43.3
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/orchestra/agent/dirgha.d.ts +2 -0
- package/dist/orchestra/agent/dirgha.js +1 -0
- package/dist/orchestra/agent/dirgha.js.map +1 -1
- package/dist/orchestra/agent/manager.d.ts +2 -0
- package/dist/orchestra/agent/manager.js +73 -1
- package/dist/orchestra/agent/manager.js.map +1 -1
- package/dist/orchestra/orchestration/log.js +7 -2
- package/dist/orchestra/orchestration/log.js.map +1 -1
- package/dist/tools/fs-edit.js +17 -7
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/fs-read.js +20 -5
- package/dist/tools/fs-read.js.map +1 -1
- package/dist/tools/fs-write.js +16 -6
- package/dist/tools/fs-write.js.map +1 -1
- package/package.json +1 -1
|
@@ -8,6 +8,8 @@ export interface DirghaAgentOptions {
|
|
|
8
8
|
extraArgs?: string[];
|
|
9
9
|
/** Working directory. */
|
|
10
10
|
cwd?: string;
|
|
11
|
+
/** Extra environment variables to pass to the agent. */
|
|
12
|
+
env?: Record<string, string | undefined>;
|
|
11
13
|
}
|
|
12
14
|
/**
|
|
13
15
|
* Spawn a dirgha agent subprocess for a given task.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dirgha.js","sourceRoot":"","sources":["../../../src/orchestra/agent/dirgha.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAqB,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"dirgha.js","sourceRoot":"","sources":["../../../src/orchestra/agent/dirgha.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAqB,MAAM,cAAc,CAAC;AAW7D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,KAAa,EACb,IAAY,EACZ,OAA2B,EAAE;IAE7B,MAAM,IAAI,GAAa,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IACnD,IAAI,IAAI,CAAC,SAAS;QAAE,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IACjD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEhB,MAAM,SAAS,GAAiB;QAC9B,OAAO,EAAE,QAAQ;QACjB,IAAI;QACJ,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,GAAG,EAAE,IAAI,CAAC,GAAG;KACd,CAAC;IAEF,OAAO,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AACjE,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,KAAe,EACf,OAA2B,EAAE;IAE7B,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAE,EAAE,IAAI,CAAC,CAAC;QACzE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -27,6 +27,8 @@ export interface SpawnOptions {
|
|
|
27
27
|
cwd?: string;
|
|
28
28
|
/** Environment variables. */
|
|
29
29
|
env?: Record<string, string | undefined>;
|
|
30
|
+
/** Spawn timeout in ms (default 120 000). SIGTERM on timeout, SIGKILL after 3 s. */
|
|
31
|
+
timeoutMs?: number;
|
|
30
32
|
}
|
|
31
33
|
/**
|
|
32
34
|
* Spawn an agent subprocess and wire it into the session registry + log.
|
|
@@ -15,6 +15,46 @@ import { randomUUID } from "node:crypto";
|
|
|
15
15
|
import { safeEnvironment } from "../../utils/env.js";
|
|
16
16
|
import { registry } from "../core/registry.js";
|
|
17
17
|
import { writeLog } from "../orchestration/log.js";
|
|
18
|
+
/** Env var names for known LLM providers that spawned agents need. */
|
|
19
|
+
const LLM_PROVIDER_KEY_VARS = Object.freeze([
|
|
20
|
+
"OPENAI_API_KEY",
|
|
21
|
+
"ANTHROPIC_API_KEY",
|
|
22
|
+
"GEMINI_API_KEY",
|
|
23
|
+
"GOOGLE_API_KEY",
|
|
24
|
+
"DEEPSEEK_API_KEY",
|
|
25
|
+
"OPENROUTER_API_KEY",
|
|
26
|
+
"NVIDIA_API_KEY",
|
|
27
|
+
"MISTRAL_API_KEY",
|
|
28
|
+
"COHERE_API_KEY",
|
|
29
|
+
"CEREBRAS_API_KEY",
|
|
30
|
+
"TOGETHER_API_KEY",
|
|
31
|
+
"PERPLEXITY_API_KEY",
|
|
32
|
+
"XAI_API_KEY",
|
|
33
|
+
"GROQ_API_KEY",
|
|
34
|
+
"ZAI_API_KEY",
|
|
35
|
+
"GLM_API_KEY",
|
|
36
|
+
"FIREWORKS_API_KEY",
|
|
37
|
+
]);
|
|
38
|
+
/**
|
|
39
|
+
* Build the environment for a spawned agent: safe-clean parent env
|
|
40
|
+
* plus any LLM provider keys the parent has set.
|
|
41
|
+
*/
|
|
42
|
+
function buildSpawnEnv(extraEnv) {
|
|
43
|
+
const env = { ...safeEnvironment() };
|
|
44
|
+
// Pass through known LLM provider keys from the parent.
|
|
45
|
+
for (const key of LLM_PROVIDER_KEY_VARS) {
|
|
46
|
+
const val = process.env[key];
|
|
47
|
+
if (val)
|
|
48
|
+
env[key] = val;
|
|
49
|
+
}
|
|
50
|
+
if (extraEnv) {
|
|
51
|
+
for (const [k, v] of Object.entries(extraEnv)) {
|
|
52
|
+
if (v !== undefined)
|
|
53
|
+
env[k] = v;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
return env;
|
|
57
|
+
}
|
|
18
58
|
/**
|
|
19
59
|
* Spawn an agent subprocess and wire it into the session registry + log.
|
|
20
60
|
* Returns the agent id and the child process handle.
|
|
@@ -46,7 +86,7 @@ export async function spawnAgent(sessionId, label, task, adapter, opts = {}) {
|
|
|
46
86
|
try {
|
|
47
87
|
child = spawn(command, args, {
|
|
48
88
|
cwd: opts.cwd,
|
|
49
|
-
env:
|
|
89
|
+
env: buildSpawnEnv(opts.env),
|
|
50
90
|
stdio: ["pipe", "pipe", "pipe"],
|
|
51
91
|
});
|
|
52
92
|
}
|
|
@@ -81,9 +121,39 @@ export async function spawnAgent(sessionId, label, task, adapter, opts = {}) {
|
|
|
81
121
|
writeLog(sessionId, agentId, "output", { line, stream: "stderr" });
|
|
82
122
|
}
|
|
83
123
|
});
|
|
124
|
+
// Spawn timeout: kill the child if it hasn't exited within timeoutMs.
|
|
125
|
+
const timeoutMs = opts.timeoutMs ?? 120_000;
|
|
126
|
+
let timeoutHandle;
|
|
127
|
+
if (timeoutMs > 0) {
|
|
128
|
+
timeoutHandle = setTimeout(() => {
|
|
129
|
+
const elapsed = Date.now() - now;
|
|
130
|
+
registry.updateAgent(sessionId, agentId, {
|
|
131
|
+
status: "failed",
|
|
132
|
+
exitCode: -3,
|
|
133
|
+
elapsedMs: elapsed,
|
|
134
|
+
});
|
|
135
|
+
writeLog(sessionId, agentId, "exit", {
|
|
136
|
+
code: -3,
|
|
137
|
+
elapsedMs: elapsed,
|
|
138
|
+
reason: `spawn timeout after ${timeoutMs}ms`,
|
|
139
|
+
});
|
|
140
|
+
try {
|
|
141
|
+
child.kill("SIGTERM");
|
|
142
|
+
}
|
|
143
|
+
catch { /* already dead */ }
|
|
144
|
+
setTimeout(() => {
|
|
145
|
+
try {
|
|
146
|
+
child.kill("SIGKILL");
|
|
147
|
+
}
|
|
148
|
+
catch { /* already dead */ }
|
|
149
|
+
}, 3000);
|
|
150
|
+
}, timeoutMs);
|
|
151
|
+
}
|
|
84
152
|
// Wait for exit.
|
|
85
153
|
const done = new Promise((resolve) => {
|
|
86
154
|
child.on("exit", (code) => {
|
|
155
|
+
if (timeoutHandle)
|
|
156
|
+
clearTimeout(timeoutHandle);
|
|
87
157
|
const elapsed = Date.now() - now;
|
|
88
158
|
registry.updateAgent(sessionId, agentId, {
|
|
89
159
|
status: code === 0 ? "done" : "failed",
|
|
@@ -94,6 +164,8 @@ export async function spawnAgent(sessionId, label, task, adapter, opts = {}) {
|
|
|
94
164
|
resolve(code ?? -1);
|
|
95
165
|
});
|
|
96
166
|
child.on("error", (err) => {
|
|
167
|
+
if (timeoutHandle)
|
|
168
|
+
clearTimeout(timeoutHandle);
|
|
97
169
|
registry.updateAgent(sessionId, agentId, {
|
|
98
170
|
status: "failed",
|
|
99
171
|
exitCode: -2,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/orchestra/agent/manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/orchestra/agent/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,10 +26,15 @@ export function createLog(sessionId) {
|
|
|
26
26
|
export function appendLog(entry) {
|
|
27
27
|
try {
|
|
28
28
|
const path = logPath(entry.sessionId);
|
|
29
|
+
const dir = tmpdir();
|
|
30
|
+
if (!existsSync(dir))
|
|
31
|
+
mkdirSync(dir, { recursive: true });
|
|
29
32
|
appendFileSync(path, JSON.stringify(entry) + "\n", "utf-8");
|
|
30
33
|
}
|
|
31
|
-
catch {
|
|
32
|
-
// Non-fatal — log writes must never crash the orchestrator
|
|
34
|
+
catch (err) {
|
|
35
|
+
// Non-fatal — log writes must never crash the orchestrator,
|
|
36
|
+
// but surface the error so root cause is visible.
|
|
37
|
+
process.stderr.write(`[orchestra] log write failed: ${err.message}\n`);
|
|
33
38
|
}
|
|
34
39
|
}
|
|
35
40
|
/** Convenience: build and write a structured entry in one call. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/orchestra/orchestration/log.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7F,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,8CAA8C;AAC9C,MAAM,UAAU,OAAO,CAAC,SAAiB;IACvC,OAAO,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,SAAS,SAAS,CAAC,CAAC;AACzD,CAAC;AAED,yDAAyD;AACzD,MAAM,UAAU,SAAS,CAAC,SAAiB;IACzC,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;IACrB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1D,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,oDAAoD;AACpD,MAAM,UAAU,SAAS,CAAC,KAAe;IACvC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACtC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAAC,
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/orchestra/orchestration/log.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/fs-edit.js
CHANGED
|
@@ -8,6 +8,14 @@
|
|
|
8
8
|
import { readFile, stat, writeFile } from "node:fs/promises";
|
|
9
9
|
import { summariseDiff, unifiedDiff } from "./diff.js";
|
|
10
10
|
import { decodeLiteralUnicodeEscapes, isValidCwdPath } from "../utils/fs.js";
|
|
11
|
+
function resolvePath(raw) {
|
|
12
|
+
const filePath = typeof raw.filePath === "string" ? raw.filePath : undefined;
|
|
13
|
+
const path = typeof raw.path === "string" ? raw.path : undefined;
|
|
14
|
+
const resolved = path ?? filePath;
|
|
15
|
+
if (!resolved)
|
|
16
|
+
throw new Error("fs_edit requires 'path' or 'filePath'");
|
|
17
|
+
return resolved;
|
|
18
|
+
}
|
|
11
19
|
export const fsEditTool = {
|
|
12
20
|
name: "fs_edit",
|
|
13
21
|
description: "Replace an exact substring in a file. Fails on ambiguity (multiple matches) unless replaceAll is set. Use larger context around oldString to disambiguate.",
|
|
@@ -15,22 +23,24 @@ export const fsEditTool = {
|
|
|
15
23
|
type: "object",
|
|
16
24
|
properties: {
|
|
17
25
|
path: { type: "string" },
|
|
26
|
+
filePath: { type: "string", description: "Alias for `path`." },
|
|
18
27
|
oldString: { type: "string" },
|
|
19
28
|
newString: { type: "string" },
|
|
20
29
|
replaceAll: { type: "boolean" },
|
|
21
30
|
},
|
|
22
|
-
required: ["
|
|
31
|
+
required: ["oldString", "newString"],
|
|
23
32
|
},
|
|
24
33
|
requiresApproval: () => true,
|
|
25
34
|
async execute(rawInput, ctx) {
|
|
26
35
|
const input = rawInput;
|
|
27
|
-
const
|
|
36
|
+
const resolvedPath = resolvePath(rawInput);
|
|
37
|
+
const check = isValidCwdPath(ctx.cwd, resolvedPath, { allowOutside: ctx.autoApprove === true && (ctx.sandboxMode === 'off' || ctx.sandboxMode == null) });
|
|
28
38
|
if (!check.valid)
|
|
29
39
|
return { content: check.error, isError: true };
|
|
30
40
|
const abs = check.resolved;
|
|
31
41
|
const info = await stat(abs).catch(() => undefined);
|
|
32
42
|
if (!info || !info.isFile())
|
|
33
|
-
return { content: `No such file: ${
|
|
43
|
+
return { content: `No such file: ${resolvedPath}`, isError: true };
|
|
34
44
|
const before = await readFile(abs, "utf8");
|
|
35
45
|
const oldString = decodeLiteralUnicodeEscapes(input.oldString);
|
|
36
46
|
const newString = decodeLiteralUnicodeEscapes(input.newString);
|
|
@@ -43,7 +53,7 @@ export const fsEditTool = {
|
|
|
43
53
|
const exactCount = countOccurrences(before, oldString);
|
|
44
54
|
if (exactCount === 0) {
|
|
45
55
|
return {
|
|
46
|
-
content: `oldString not found in ${
|
|
56
|
+
content: `oldString not found in ${resolvedPath}. Provide more surrounding context or verify the file.`,
|
|
47
57
|
isError: true,
|
|
48
58
|
};
|
|
49
59
|
}
|
|
@@ -57,12 +67,12 @@ export const fsEditTool = {
|
|
|
57
67
|
? splitJoin(before, oldString, newString)
|
|
58
68
|
: before.replace(oldString, newString);
|
|
59
69
|
const diff = unifiedDiff(before, after, {
|
|
60
|
-
fromLabel:
|
|
61
|
-
toLabel:
|
|
70
|
+
fromLabel: resolvedPath,
|
|
71
|
+
toLabel: resolvedPath,
|
|
62
72
|
});
|
|
63
73
|
const { added, removed } = summariseDiff(diff);
|
|
64
74
|
await writeFile(abs, after, "utf8");
|
|
65
|
-
const summary = `Edited ${
|
|
75
|
+
const summary = `Edited ${resolvedPath}: ${input.replaceAll ? exactCount : 1} replacement(s) (+${added} / -${removed})`;
|
|
66
76
|
const content = diff ? `${summary}\n\n${diff}` : summary;
|
|
67
77
|
return {
|
|
68
78
|
content,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-edit.js","sourceRoot":"","sources":["../../src/tools/fs-edit.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,2BAA2B,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"fs-edit.js","sourceRoot":"","sources":["../../src/tools/fs-edit.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,2BAA2B,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAW7E,SAAS,WAAW,CAAC,GAA4B;IAC/C,MAAM,QAAQ,GAAG,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7E,MAAM,IAAI,GAAG,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACjE,MAAM,QAAQ,GAAG,IAAI,IAAI,QAAQ,CAAC;IAClC,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IACxE,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAS;IAC9B,IAAI,EAAE,SAAS;IACf,WAAW,EACT,4JAA4J;IAC9J,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,mBAAmB,EAAE;YAC9D,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC7B,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC7B,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;SAChC;QACD,QAAQ,EAAE,CAAC,WAAW,EAAE,WAAW,CAAC;KACrC;IACD,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI;IAC5B,KAAK,CAAC,OAAO,CACX,QAAiB,EACjB,GAAG;QAIH,MAAM,KAAK,GAAG,QAAiB,CAAC;QAChC,MAAM,YAAY,GAAG,WAAW,CAAC,QAAmC,CAAC,CAAC;QACtE,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,KAAK,KAAK,IAAI,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1J,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,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACzB,OAAO,EAAE,OAAO,EAAE,iBAAiB,YAAY,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACrE,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAE3C,MAAM,SAAS,GAAG,2BAA2B,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC/D,MAAM,SAAS,GAAG,2BAA2B,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAE/D,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,OAAO;gBACL,OAAO,EAAE,uDAAuD;gBAChE,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACvD,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO;gBACL,OAAO,EAAE,0BAA0B,YAAY,wDAAwD;gBACvG,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;QACD,IAAI,UAAU,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;YACxC,OAAO;gBACL,OAAO,EAAE,qBAAqB,UAAU,2EAA2E;gBACnH,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;QAED,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU;YAC5B,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;YACzC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAEzC,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE;YACtC,SAAS,EAAE,YAAY;YACvB,OAAO,EAAE,YAAY;SACtB,CAAC,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAEpC,MAAM,OAAO,GAAG,UAAU,YAAY,KAAK,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,qBAAqB,KAAK,OAAO,OAAO,GAAG,CAAC;QACxH,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAEzD,OAAO;YACL,OAAO;YACP,IAAI,EAAE,EAAE,YAAY,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE;YACzE,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE;gBACR,IAAI;gBACJ,KAAK;gBACL,OAAO;gBACP,YAAY,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;aAChD;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,SAAS,gBAAgB,CAAC,QAAgB,EAAE,MAAc;IACxD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IAClC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,SAAS,CAAC;QACR,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC5C,IAAI,KAAK,GAAG,CAAC;YAAE,MAAM;QACrB,KAAK,EAAE,CAAC;QACR,GAAG,GAAG,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9B,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,SAAS,CAChB,QAAgB,EAChB,MAAc,EACd,WAAmB;IAEnB,OAAO,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAClD,CAAC"}
|
package/dist/tools/fs-read.js
CHANGED
|
@@ -6,6 +6,15 @@
|
|
|
6
6
|
import { readFile, stat } from "node:fs/promises";
|
|
7
7
|
import { isValidCwdPath, isBinary } from "../utils/fs.js";
|
|
8
8
|
const MAX_BYTES = 2 * 1024 * 1024;
|
|
9
|
+
/** Resolve the canonical path from `filePath` or `path`, failing if neither is set. */
|
|
10
|
+
function resolvePath(raw) {
|
|
11
|
+
const filePath = typeof raw.filePath === "string" ? raw.filePath : undefined;
|
|
12
|
+
const path = typeof raw.path === "string" ? raw.path : undefined;
|
|
13
|
+
const resolved = path ?? filePath;
|
|
14
|
+
if (!resolved)
|
|
15
|
+
throw new Error("fs_read requires 'path' or 'filePath'");
|
|
16
|
+
return resolved;
|
|
17
|
+
}
|
|
9
18
|
export const fsReadTool = {
|
|
10
19
|
name: "fs_read",
|
|
11
20
|
description: "Read a text file from disk. Returns contents with 1-based line numbers. Use offset/limit to page through large files.",
|
|
@@ -16,6 +25,10 @@ export const fsReadTool = {
|
|
|
16
25
|
type: "string",
|
|
17
26
|
description: "Absolute or cwd-relative path to the file.",
|
|
18
27
|
},
|
|
28
|
+
filePath: {
|
|
29
|
+
type: "string",
|
|
30
|
+
description: "Alias for `path`. Use path or filePath interchangeably.",
|
|
31
|
+
},
|
|
19
32
|
offset: {
|
|
20
33
|
type: "integer",
|
|
21
34
|
minimum: 1,
|
|
@@ -27,19 +40,21 @@ export const fsReadTool = {
|
|
|
27
40
|
description: "Maximum number of lines to return.",
|
|
28
41
|
},
|
|
29
42
|
},
|
|
30
|
-
|
|
43
|
+
// Either path or filePath must be present; the execute handler validates.
|
|
44
|
+
required: [],
|
|
31
45
|
},
|
|
32
46
|
async execute(rawInput, ctx) {
|
|
33
47
|
const input = rawInput;
|
|
34
|
-
const
|
|
48
|
+
const resolvedPath = resolvePath(rawInput);
|
|
49
|
+
const check = isValidCwdPath(ctx.cwd, resolvedPath, { allowOutside: ctx.autoApprove === true && (ctx.sandboxMode === 'off' || ctx.sandboxMode == null) });
|
|
35
50
|
if (!check.valid)
|
|
36
51
|
return { content: check.error, isError: true };
|
|
37
52
|
const abs = check.resolved;
|
|
38
53
|
const info = await stat(abs).catch(() => undefined);
|
|
39
54
|
if (!info)
|
|
40
|
-
return { content: `No such file: ${
|
|
55
|
+
return { content: `No such file: ${resolvedPath}`, isError: true };
|
|
41
56
|
if (!info.isFile())
|
|
42
|
-
return { content: `Not a file: ${
|
|
57
|
+
return { content: `Not a file: ${resolvedPath}`, isError: true };
|
|
43
58
|
if (info.size > MAX_BYTES) {
|
|
44
59
|
return {
|
|
45
60
|
content: `File too large (${info.size} bytes, max ${MAX_BYTES}). Use offset/limit.`,
|
|
@@ -49,7 +64,7 @@ export const fsReadTool = {
|
|
|
49
64
|
const buffer = await readFile(abs);
|
|
50
65
|
if (isBinary(buffer))
|
|
51
66
|
return {
|
|
52
|
-
content: `File appears to be binary: ${
|
|
67
|
+
content: `File appears to be binary: ${resolvedPath}`,
|
|
53
68
|
isError: true,
|
|
54
69
|
};
|
|
55
70
|
const text = buffer.toString("utf8");
|
|
@@ -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;AAGlD,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,gBAAgB,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.js
CHANGED
|
@@ -8,6 +8,14 @@ import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
|
|
|
8
8
|
import { dirname } from "node:path";
|
|
9
9
|
import { summariseDiff, unifiedDiff } from "./diff.js";
|
|
10
10
|
import { decodeLiteralUnicodeEscapes, isValidCwdPath } from "../utils/fs.js";
|
|
11
|
+
function resolvePath(raw) {
|
|
12
|
+
const filePath = typeof raw.filePath === "string" ? raw.filePath : undefined;
|
|
13
|
+
const path = typeof raw.path === "string" ? raw.path : undefined;
|
|
14
|
+
const resolved = path ?? filePath;
|
|
15
|
+
if (!resolved)
|
|
16
|
+
throw new Error("fs_write requires 'path' or 'filePath'");
|
|
17
|
+
return resolved;
|
|
18
|
+
}
|
|
11
19
|
export const fsWriteTool = {
|
|
12
20
|
name: "fs_write",
|
|
13
21
|
description: "Write content to a file. Creates parent directories when createDirs is true. Overwrites existing files.",
|
|
@@ -15,18 +23,20 @@ export const fsWriteTool = {
|
|
|
15
23
|
type: "object",
|
|
16
24
|
properties: {
|
|
17
25
|
path: { type: "string" },
|
|
26
|
+
filePath: { type: "string", description: "Alias for `path`." },
|
|
18
27
|
content: { type: "string" },
|
|
19
28
|
createDirs: {
|
|
20
29
|
type: "boolean",
|
|
21
30
|
description: "Create parent directories if they do not exist.",
|
|
22
31
|
},
|
|
23
32
|
},
|
|
24
|
-
required: ["
|
|
33
|
+
required: ["content"],
|
|
25
34
|
},
|
|
26
35
|
requiresApproval: () => true,
|
|
27
36
|
async execute(rawInput, ctx) {
|
|
28
37
|
const input = rawInput;
|
|
29
|
-
const
|
|
38
|
+
const resolvedPath = resolvePath(rawInput);
|
|
39
|
+
const check = isValidCwdPath(ctx.cwd, resolvedPath, { allowOutside: ctx.autoApprove === true && (ctx.sandboxMode === 'off' || ctx.sandboxMode == null) });
|
|
30
40
|
if (!check.valid)
|
|
31
41
|
return { content: check.error, isError: true };
|
|
32
42
|
const abs = check.resolved;
|
|
@@ -40,14 +50,14 @@ export const fsWriteTool = {
|
|
|
40
50
|
await mkdir(dirname(abs), { recursive: true });
|
|
41
51
|
const sanitized = decodeLiteralUnicodeEscapes(input.content);
|
|
42
52
|
const diff = unifiedDiff(before, sanitized, {
|
|
43
|
-
fromLabel:
|
|
44
|
-
toLabel:
|
|
53
|
+
fromLabel: resolvedPath,
|
|
54
|
+
toLabel: resolvedPath,
|
|
45
55
|
});
|
|
46
56
|
const { added, removed } = summariseDiff(diff);
|
|
47
57
|
await writeFile(abs, sanitized, "utf8");
|
|
48
58
|
const summary = existed
|
|
49
|
-
? `Updated ${
|
|
50
|
-
: `Created ${
|
|
59
|
+
? `Updated ${resolvedPath} (+${added} / -${removed})`
|
|
60
|
+
: `Created ${resolvedPath} (${sanitized.length} bytes)`;
|
|
51
61
|
return {
|
|
52
62
|
content: summary,
|
|
53
63
|
data: {
|
|
@@ -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,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,2BAA2B,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"fs-write.js","sourceRoot":"","sources":["../../src/tools/fs-write.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dirgha/code",
|
|
3
|
-
"version": "1.43.
|
|
3
|
+
"version": "1.43.3",
|
|
4
4
|
"description": "CLI coding agent for complex agentic workflows and long-horizon development. Local models (llama.cpp / Ollama), BYOK across 17 providers, parallel agents, persistent memory, scanned skills.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|