@dirgha/code 1.20.25 → 1.20.28
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 -1
- 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/github.d.ts +13 -0
- package/dist/tools/github.js +257 -0
- package/dist/tools/github.js.map +1 -0
- package/dist/tools/index.d.ts +5 -2
- package/dist/tools/index.js +7 -4
- 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 +7 -1
- package/dist/tools/shell.js +114 -61
- 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/browser.js
CHANGED
|
@@ -15,36 +15,47 @@
|
|
|
15
15
|
* tool for the older `agent-browser` shell-out implementation this tool
|
|
16
16
|
* supersedes.
|
|
17
17
|
*/
|
|
18
|
+
import { access } from "node:fs/promises";
|
|
18
19
|
import { mkdir } from "node:fs/promises";
|
|
19
|
-
import { homedir
|
|
20
|
+
import { homedir } from "node:os";
|
|
20
21
|
import { join } from "node:path";
|
|
21
22
|
const MAX_CONTENT_CHARS = 50_000;
|
|
22
23
|
const DEFAULT_TIMEOUT_MS = 30_000;
|
|
23
24
|
const SCREENSHOT_DIR = join(homedir(), ".dirgha", "screenshots");
|
|
24
25
|
let browser;
|
|
25
26
|
let page;
|
|
27
|
+
let playwrightMod;
|
|
28
|
+
async function loadPlaywright() {
|
|
29
|
+
if (playwrightMod)
|
|
30
|
+
return playwrightMod;
|
|
31
|
+
const pwModuleId = "playwright";
|
|
32
|
+
const mod = await import(pwModuleId);
|
|
33
|
+
playwrightMod = mod.chromium ?? mod.default?.chromium;
|
|
34
|
+
if (!playwrightMod || typeof playwrightMod.launch !== "function") {
|
|
35
|
+
throw new Error("playwright module shape unexpected (no chromium.launch)");
|
|
36
|
+
}
|
|
37
|
+
return playwrightMod;
|
|
38
|
+
}
|
|
26
39
|
async function ensureBrowser() {
|
|
27
40
|
if (page && browser?.isConnected?.() !== false)
|
|
28
41
|
return page;
|
|
29
42
|
let chromium;
|
|
30
43
|
try {
|
|
31
|
-
|
|
32
|
-
// not in package.json deps (heavy + optional). Hiding the literal
|
|
33
|
-
// string behind a variable keeps TS's module resolver from looking
|
|
34
|
-
// for type definitions for an absent package.
|
|
35
|
-
const pwModuleId = "playwright";
|
|
36
|
-
const mod = await import(pwModuleId);
|
|
37
|
-
chromium = mod.chromium ?? mod.default?.chromium;
|
|
38
|
-
if (!chromium || typeof chromium.launch !== "function") {
|
|
39
|
-
throw new Error("playwright module shape unexpected (no chromium.launch)");
|
|
40
|
-
}
|
|
44
|
+
chromium = await loadPlaywright();
|
|
41
45
|
}
|
|
42
46
|
catch (err) {
|
|
43
47
|
throw new Error(`playwright is not available. Install with: pnpm add -w playwright && npx playwright install chromium. Underlying: ${err.message}`);
|
|
44
48
|
}
|
|
49
|
+
const args = ["--disable-dev-shm-usage"];
|
|
50
|
+
const sandboxAvailable = await access("/proc/sys/kernel/unprivileged_userns_clone")
|
|
51
|
+
.then(() => true)
|
|
52
|
+
.catch(() => false);
|
|
53
|
+
if (!sandboxAvailable) {
|
|
54
|
+
args.push("--no-sandbox");
|
|
55
|
+
}
|
|
45
56
|
browser = await chromium.launch({
|
|
46
57
|
headless: true,
|
|
47
|
-
args
|
|
58
|
+
args,
|
|
48
59
|
});
|
|
49
60
|
page = await browser.newPage();
|
|
50
61
|
return page;
|
|
@@ -165,8 +176,7 @@ export const browserTool = {
|
|
|
165
176
|
}
|
|
166
177
|
// Probe playwright availability before attempting any action.
|
|
167
178
|
try {
|
|
168
|
-
|
|
169
|
-
await import(pwModuleId);
|
|
179
|
+
await loadPlaywright();
|
|
170
180
|
}
|
|
171
181
|
catch {
|
|
172
182
|
return fail("Browser tool unavailable: Playwright is not installed. Run: npm install -g playwright && playwright install chromium");
|
|
@@ -192,7 +202,5 @@ export const browserTool = {
|
|
|
192
202
|
}
|
|
193
203
|
},
|
|
194
204
|
};
|
|
195
|
-
// Silence unused-var warnings for the tmp dir import even if unused.
|
|
196
|
-
void tmpdir;
|
|
197
205
|
export default browserTool;
|
|
198
206
|
//# sourceMappingURL=browser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/tools/browser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/tools/browser.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,11 @@
|
|
|
20
20
|
* session log). The kernel decides whether to prune older turns on a
|
|
21
21
|
* subsequent compaction — we don't truncate files here.
|
|
22
22
|
*/
|
|
23
|
-
import type { Tool } from
|
|
23
|
+
import type { Tool } from "./registry.js";
|
|
24
|
+
import { SessionStore } from "../context/session.js";
|
|
25
|
+
export interface CheckpointToolOptions {
|
|
26
|
+
store?: SessionStore;
|
|
27
|
+
}
|
|
28
|
+
export declare function createCheckpointTool(opts?: CheckpointToolOptions): Tool;
|
|
24
29
|
export declare const checkpointTool: Tool;
|
|
25
30
|
export default checkpointTool;
|
package/dist/tools/checkpoint.js
CHANGED
|
@@ -20,12 +20,12 @@
|
|
|
20
20
|
* session log). The kernel decides whether to prune older turns on a
|
|
21
21
|
* subsequent compaction — we don't truncate files here.
|
|
22
22
|
*/
|
|
23
|
-
import { mkdir, readdir, readFile, stat, unlink, writeFile } from
|
|
24
|
-
import { homedir } from
|
|
25
|
-
import { join, basename } from
|
|
26
|
-
import { SessionStore } from
|
|
27
|
-
import { registerCheckpoint } from
|
|
28
|
-
const CHECKPOINT_DIR = join(homedir(),
|
|
23
|
+
import { mkdir, readdir, readFile, stat, unlink, writeFile, } from "node:fs/promises";
|
|
24
|
+
import { homedir } from "node:os";
|
|
25
|
+
import { join, basename } from "node:path";
|
|
26
|
+
import { SessionStore } from "../context/session.js";
|
|
27
|
+
import { registerCheckpoint } from "../state/index.js";
|
|
28
|
+
const CHECKPOINT_DIR = join(homedir(), ".dirgha", "checkpoints");
|
|
29
29
|
async function ensureDir() {
|
|
30
30
|
await mkdir(CHECKPOINT_DIR, { recursive: true }).catch(() => undefined);
|
|
31
31
|
}
|
|
@@ -43,7 +43,7 @@ function fail(content) {
|
|
|
43
43
|
}
|
|
44
44
|
async function readCheckpoint(id) {
|
|
45
45
|
const p = checkpointPath(id);
|
|
46
|
-
const raw = await readFile(p,
|
|
46
|
+
const raw = await readFile(p, "utf8").catch(() => undefined);
|
|
47
47
|
if (!raw)
|
|
48
48
|
return undefined;
|
|
49
49
|
try {
|
|
@@ -56,10 +56,10 @@ async function readCheckpoint(id) {
|
|
|
56
56
|
async function listCheckpointFiles() {
|
|
57
57
|
await ensureDir();
|
|
58
58
|
const names = await readdir(CHECKPOINT_DIR).catch(() => []);
|
|
59
|
-
return names.filter(n => n.endsWith(
|
|
59
|
+
return names.filter((n) => n.endsWith(".json"));
|
|
60
60
|
}
|
|
61
61
|
async function summarise(fileName) {
|
|
62
|
-
const id = fileName.replace(/\.json$/,
|
|
62
|
+
const id = fileName.replace(/\.json$/, "");
|
|
63
63
|
const cp = await readCheckpoint(id);
|
|
64
64
|
if (!cp)
|
|
65
65
|
return undefined;
|
|
@@ -75,9 +75,8 @@ async function summarise(fileName) {
|
|
|
75
75
|
bytes: info?.size ?? 0,
|
|
76
76
|
};
|
|
77
77
|
}
|
|
78
|
-
async function doSave(input, ctx) {
|
|
78
|
+
async function doSave(input, ctx, store) {
|
|
79
79
|
await ensureDir();
|
|
80
|
-
const store = new SessionStore();
|
|
81
80
|
const session = await store.open(ctx.sessionId);
|
|
82
81
|
if (!session)
|
|
83
82
|
return fail(`session not found: ${ctx.sessionId}`);
|
|
@@ -93,7 +92,7 @@ async function doSave(input, ctx) {
|
|
|
93
92
|
messages,
|
|
94
93
|
};
|
|
95
94
|
const path = checkpointPath(id);
|
|
96
|
-
await writeFile(path, JSON.stringify(payload, null, 2),
|
|
95
|
+
await writeFile(path, JSON.stringify(payload, null, 2), "utf8");
|
|
97
96
|
// Register in unified state index (fire-and-forget, never blocks).
|
|
98
97
|
void registerCheckpoint(ctx.sessionId, id);
|
|
99
98
|
const info = await stat(path).catch(() => undefined);
|
|
@@ -109,13 +108,12 @@ async function doSave(input, ctx) {
|
|
|
109
108
|
};
|
|
110
109
|
return ok(`saved checkpoint ${id} (${messages.length} messages, ${summary.bytes} bytes)\npath: ${path}`, summary);
|
|
111
110
|
}
|
|
112
|
-
async function doRestore(input, ctx) {
|
|
111
|
+
async function doRestore(input, ctx, store) {
|
|
113
112
|
if (!input.id)
|
|
114
|
-
return fail(
|
|
113
|
+
return fail("id required for restore");
|
|
115
114
|
const cp = await readCheckpoint(input.id);
|
|
116
115
|
if (!cp)
|
|
117
116
|
return fail(`checkpoint not found: ${input.id}`);
|
|
118
|
-
const store = new SessionStore();
|
|
119
117
|
const session = await store.open(ctx.sessionId);
|
|
120
118
|
if (!session)
|
|
121
119
|
return fail(`session not found: ${ctx.sessionId}`);
|
|
@@ -125,9 +123,9 @@ async function doRestore(input, ctx) {
|
|
|
125
123
|
// normal transcript entries on next replay.
|
|
126
124
|
const markerTs = new Date().toISOString();
|
|
127
125
|
const marker = {
|
|
128
|
-
type:
|
|
126
|
+
type: "system",
|
|
129
127
|
ts: markerTs,
|
|
130
|
-
event:
|
|
128
|
+
event: "checkpoint_restore",
|
|
131
129
|
data: {
|
|
132
130
|
checkpointId: cp.id,
|
|
133
131
|
messageCount: cp.messageCount,
|
|
@@ -137,7 +135,7 @@ async function doRestore(input, ctx) {
|
|
|
137
135
|
};
|
|
138
136
|
await session.append(marker);
|
|
139
137
|
for (const message of cp.messages) {
|
|
140
|
-
const entry = { type:
|
|
138
|
+
const entry = { type: "message", ts: cp.createdAt, message };
|
|
141
139
|
await session.append(entry);
|
|
142
140
|
}
|
|
143
141
|
const info = await stat(checkpointPath(cp.id)).catch(() => undefined);
|
|
@@ -155,25 +153,25 @@ async function doRestore(input, ctx) {
|
|
|
155
153
|
}
|
|
156
154
|
async function doList(input, ctx) {
|
|
157
155
|
const files = await listCheckpointFiles();
|
|
158
|
-
const all = await Promise.all(files.map(f => summarise(basename(f))));
|
|
156
|
+
const all = await Promise.all(files.map((f) => summarise(basename(f))));
|
|
159
157
|
const items = all
|
|
160
158
|
.filter((x) => x !== undefined)
|
|
161
|
-
.filter(item => (input.all ? true : item.sessionId === ctx.sessionId))
|
|
159
|
+
.filter((item) => (input.all ? true : item.sessionId === ctx.sessionId))
|
|
162
160
|
.sort((a, b) => (a.createdAt < b.createdAt ? 1 : -1));
|
|
163
161
|
if (items.length === 0) {
|
|
164
162
|
return ok(input.all
|
|
165
|
-
?
|
|
163
|
+
? "(no checkpoints on disk)"
|
|
166
164
|
: `(no checkpoints for session ${ctx.sessionId})`, { count: 0, items });
|
|
167
165
|
}
|
|
168
|
-
const lines = items.map(i => {
|
|
169
|
-
const label = i.label ? ` "${i.label}"` :
|
|
166
|
+
const lines = items.map((i) => {
|
|
167
|
+
const label = i.label ? ` "${i.label}"` : "";
|
|
170
168
|
return `${i.id}${label}\t${i.createdAt}\tsession=${i.sessionId}\tmsgs=${i.messageCount}\t${i.bytes}B`;
|
|
171
169
|
});
|
|
172
|
-
return ok(lines.join(
|
|
170
|
+
return ok(lines.join("\n"), { count: items.length, items });
|
|
173
171
|
}
|
|
174
172
|
async function doDelete(input) {
|
|
175
173
|
if (!input.id)
|
|
176
|
-
return fail(
|
|
174
|
+
return fail("id required for delete");
|
|
177
175
|
const p = checkpointPath(input.id);
|
|
178
176
|
const info = await stat(p).catch(() => undefined);
|
|
179
177
|
if (!info)
|
|
@@ -181,45 +179,64 @@ async function doDelete(input) {
|
|
|
181
179
|
await unlink(p);
|
|
182
180
|
return ok(`deleted checkpoint ${input.id}`, { deleted: input.id });
|
|
183
181
|
}
|
|
184
|
-
export
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
182
|
+
export function createCheckpointTool(opts = {}) {
|
|
183
|
+
const store = opts.store ?? new SessionStore();
|
|
184
|
+
return {
|
|
185
|
+
name: "checkpoint",
|
|
186
|
+
description: "Save, list, restore, and delete session checkpoints. Snapshots the transcript (messages + cwd + timestamp) to ~/.dirgha/checkpoints so the user can rewind to a known-good agent state.",
|
|
187
|
+
inputSchema: {
|
|
188
|
+
type: "object",
|
|
189
|
+
properties: {
|
|
190
|
+
action: {
|
|
191
|
+
type: "string",
|
|
192
|
+
enum: ["save", "restore", "list", "delete"],
|
|
193
|
+
},
|
|
194
|
+
id: {
|
|
195
|
+
type: "string",
|
|
196
|
+
description: "Checkpoint id for restore/delete.",
|
|
197
|
+
},
|
|
198
|
+
label: {
|
|
199
|
+
type: "string",
|
|
200
|
+
description: "Optional human label attached to a save.",
|
|
201
|
+
},
|
|
202
|
+
all: {
|
|
203
|
+
type: "boolean",
|
|
204
|
+
description: "List checkpoints from every session, not just current.",
|
|
205
|
+
},
|
|
193
206
|
},
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
207
|
+
required: ["action"],
|
|
208
|
+
},
|
|
209
|
+
requiresApproval: (raw) => {
|
|
210
|
+
if (!raw || typeof raw !== "object")
|
|
211
|
+
return false;
|
|
212
|
+
const input = raw;
|
|
213
|
+
return input.action !== "list";
|
|
197
214
|
},
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
215
|
+
async execute(rawInput, ctx) {
|
|
216
|
+
const input = rawInput;
|
|
217
|
+
if (!input || typeof input.action !== "string") {
|
|
218
|
+
return fail("action required");
|
|
219
|
+
}
|
|
220
|
+
try {
|
|
221
|
+
switch (input.action) {
|
|
222
|
+
case "save":
|
|
223
|
+
return await doSave(input, ctx, store);
|
|
224
|
+
case "restore":
|
|
225
|
+
return await doRestore(input, ctx, store);
|
|
226
|
+
case "list":
|
|
227
|
+
return await doList(input, ctx);
|
|
228
|
+
case "delete":
|
|
229
|
+
return await doDelete(input);
|
|
230
|
+
default:
|
|
231
|
+
return fail(`unknown action: ${String(input.action)}`);
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
catch (err) {
|
|
235
|
+
return fail(`checkpoint ${input.action} failed: ${err.message}`);
|
|
217
236
|
}
|
|
218
|
-
}
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
},
|
|
223
|
-
};
|
|
237
|
+
},
|
|
238
|
+
};
|
|
239
|
+
}
|
|
240
|
+
export const checkpointTool = createCheckpointTool();
|
|
224
241
|
export default checkpointTool;
|
|
225
242
|
//# sourceMappingURL=checkpoint.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpoint.js","sourceRoot":"","sources":["../../src/tools/checkpoint.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"checkpoint.js","sourceRoot":"","sources":["../../src/tools/checkpoint.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/cron.js
CHANGED
|
@@ -110,8 +110,6 @@ export function createCronTool(opts = {}) {
|
|
|
110
110
|
const job = jobs.find((j) => j.id === input.id);
|
|
111
111
|
if (!job)
|
|
112
112
|
return { content: `No job with id "${input.id}".`, isError: true };
|
|
113
|
-
job.lastRunAt = new Date().toISOString();
|
|
114
|
-
await writeJobs(filePath, jobs);
|
|
115
113
|
return {
|
|
116
114
|
content: [
|
|
117
115
|
`Marked cron job ${job.id} as manually run.`,
|
|
@@ -145,7 +143,7 @@ async function readJobs(filePath) {
|
|
|
145
143
|
}
|
|
146
144
|
async function writeJobs(filePath, jobs) {
|
|
147
145
|
await ensureParent(filePath);
|
|
148
|
-
const tmp = filePath + ".tmp";
|
|
146
|
+
const tmp = filePath + ".tmp." + randomUUID().slice(0, 8);
|
|
149
147
|
await writeFile(tmp, `${JSON.stringify(jobs, null, 2)}\n`, "utf8");
|
|
150
148
|
await rename(tmp, filePath);
|
|
151
149
|
}
|
package/dist/tools/cron.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.js","sourceRoot":"","sources":["../../src/tools/cron.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cron.js","sourceRoot":"","sources":["../../src/tools/cron.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/diff.js
CHANGED
|
@@ -6,29 +6,33 @@
|
|
|
6
6
|
* subsequence walk; it is not minimised for very large files. Callers
|
|
7
7
|
* should cap inputs at ~200 KB to keep latency interactive.
|
|
8
8
|
*/
|
|
9
|
+
const MAX_DIFF_LINES = 10_000;
|
|
9
10
|
export function unifiedDiff(before, after, opts = {}) {
|
|
10
11
|
const ctx = opts.context ?? 3;
|
|
11
|
-
const a = before.split(
|
|
12
|
-
const b = after.split(
|
|
12
|
+
const a = before.split("\n");
|
|
13
|
+
const b = after.split("\n");
|
|
14
|
+
if (a.length > MAX_DIFF_LINES || b.length > MAX_DIFF_LINES) {
|
|
15
|
+
return `@@ diff truncated: input too large (${a.length} / ${b.length} lines, max ${MAX_DIFF_LINES}) @@`;
|
|
16
|
+
}
|
|
13
17
|
const ops = lcsOps(a, b);
|
|
14
18
|
const header = [
|
|
15
|
-
`--- ${opts.fromLabel ??
|
|
16
|
-
`+++ ${opts.toLabel ??
|
|
19
|
+
`--- ${opts.fromLabel ?? "before"}`,
|
|
20
|
+
`+++ ${opts.toLabel ?? "after"}`,
|
|
17
21
|
];
|
|
18
22
|
const hunks = [];
|
|
19
23
|
let i = 0;
|
|
20
24
|
while (i < ops.length) {
|
|
21
|
-
if (ops[i].kind ===
|
|
25
|
+
if (ops[i].kind === "eq") {
|
|
22
26
|
i++;
|
|
23
27
|
continue;
|
|
24
28
|
}
|
|
25
29
|
let start = i;
|
|
26
|
-
while (start > 0 && ops[start - 1].kind ===
|
|
30
|
+
while (start > 0 && ops[start - 1].kind === "eq" && i - start < ctx)
|
|
27
31
|
start--;
|
|
28
32
|
let end = i;
|
|
29
|
-
while (end < ops.length && (ops[end].kind !==
|
|
33
|
+
while (end < ops.length && (ops[end].kind !== "eq" || end - i < ctx))
|
|
30
34
|
end++;
|
|
31
|
-
while (end < ops.length && ops[end].kind ===
|
|
35
|
+
while (end < ops.length && ops[end].kind === "eq" && end - i < ctx * 2)
|
|
32
36
|
end++;
|
|
33
37
|
let aCount = 0;
|
|
34
38
|
let bCount = 0;
|
|
@@ -41,12 +45,12 @@ export function unifiedDiff(before, after, opts = {}) {
|
|
|
41
45
|
aStart = op.aLine;
|
|
42
46
|
if (bStart < 0 && op.bLine !== undefined)
|
|
43
47
|
bStart = op.bLine;
|
|
44
|
-
if (op.kind ===
|
|
48
|
+
if (op.kind === "eq") {
|
|
45
49
|
lines.push(` ${op.text}`);
|
|
46
50
|
aCount++;
|
|
47
51
|
bCount++;
|
|
48
52
|
}
|
|
49
|
-
else if (op.kind ===
|
|
53
|
+
else if (op.kind === "del") {
|
|
50
54
|
lines.push(`-${op.text}`);
|
|
51
55
|
aCount++;
|
|
52
56
|
}
|
|
@@ -55,13 +59,13 @@ export function unifiedDiff(before, after, opts = {}) {
|
|
|
55
59
|
bCount++;
|
|
56
60
|
}
|
|
57
61
|
}
|
|
58
|
-
hunks.push(`@@ -${
|
|
62
|
+
hunks.push(`@@ -${aStart < 0 ? 0 : aStart + 1},${aCount} +${bStart < 0 ? 0 : bStart + 1},${bCount} @@`);
|
|
59
63
|
hunks.push(...lines);
|
|
60
64
|
i = end;
|
|
61
65
|
}
|
|
62
66
|
if (hunks.length === 0)
|
|
63
|
-
return
|
|
64
|
-
return [...header, ...hunks].join(
|
|
67
|
+
return "";
|
|
68
|
+
return [...header, ...hunks].join("\n");
|
|
65
69
|
}
|
|
66
70
|
function lcsOps(a, b) {
|
|
67
71
|
const m = a.length;
|
|
@@ -80,25 +84,25 @@ function lcsOps(a, b) {
|
|
|
80
84
|
let j = 0;
|
|
81
85
|
while (i < m && j < n) {
|
|
82
86
|
if (a[i] === b[j]) {
|
|
83
|
-
out.push({ kind:
|
|
87
|
+
out.push({ kind: "eq", text: a[i], aLine: i, bLine: j });
|
|
84
88
|
i++;
|
|
85
89
|
j++;
|
|
86
90
|
}
|
|
87
91
|
else if (dp[i + 1][j] >= dp[i][j + 1]) {
|
|
88
|
-
out.push({ kind:
|
|
92
|
+
out.push({ kind: "del", text: a[i], aLine: i });
|
|
89
93
|
i++;
|
|
90
94
|
}
|
|
91
95
|
else {
|
|
92
|
-
out.push({ kind:
|
|
96
|
+
out.push({ kind: "add", text: b[j], bLine: j });
|
|
93
97
|
j++;
|
|
94
98
|
}
|
|
95
99
|
}
|
|
96
100
|
while (i < m) {
|
|
97
|
-
out.push({ kind:
|
|
101
|
+
out.push({ kind: "del", text: a[i], aLine: i });
|
|
98
102
|
i++;
|
|
99
103
|
}
|
|
100
104
|
while (j < n) {
|
|
101
|
-
out.push({ kind:
|
|
105
|
+
out.push({ kind: "add", text: b[j], bLine: j });
|
|
102
106
|
j++;
|
|
103
107
|
}
|
|
104
108
|
return out;
|
|
@@ -106,10 +110,10 @@ function lcsOps(a, b) {
|
|
|
106
110
|
export function summariseDiff(diff) {
|
|
107
111
|
let added = 0;
|
|
108
112
|
let removed = 0;
|
|
109
|
-
for (const line of diff.split(
|
|
110
|
-
if (line.startsWith(
|
|
113
|
+
for (const line of diff.split("\n")) {
|
|
114
|
+
if (line.startsWith("+") && !line.startsWith("+++"))
|
|
111
115
|
added++;
|
|
112
|
-
else if (line.startsWith(
|
|
116
|
+
else if (line.startsWith("-") && !line.startsWith("---"))
|
|
113
117
|
removed++;
|
|
114
118
|
}
|
|
115
119
|
return { added, removed };
|
package/dist/tools/diff.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/tools/diff.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAQH,MAAM,UAAU,WAAW,
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/tools/diff.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/exec.d.ts
CHANGED
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
*/
|
|
12
12
|
import type { ToolExecutor } from "../kernel/types.js";
|
|
13
13
|
import type { ToolContext, ToolRegistry } from "./registry.js";
|
|
14
|
+
import type { PermissionEngine } from "./permission.js";
|
|
14
15
|
export type { ToolExecutor } from "../kernel/types.js";
|
|
15
16
|
export interface ToolExecutorOptions {
|
|
16
17
|
registry: ToolRegistry;
|
|
@@ -19,5 +20,6 @@ export interface ToolExecutorOptions {
|
|
|
19
20
|
sessionId: string;
|
|
20
21
|
log?: ToolContext["log"];
|
|
21
22
|
onProgress?: (toolId: string, message: string) => void;
|
|
23
|
+
permission?: PermissionEngine;
|
|
22
24
|
}
|
|
23
25
|
export declare function createToolExecutor(opts: ToolExecutorOptions): ToolExecutor;
|
package/dist/tools/exec.js
CHANGED
|
@@ -32,6 +32,19 @@ export function createToolExecutor(opts) {
|
|
|
32
32
|
isError: true,
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
|
+
if (opts.permission) {
|
|
36
|
+
const decision = opts.permission.check({
|
|
37
|
+
tool: call.name,
|
|
38
|
+
action: "exec",
|
|
39
|
+
target: opts.cwd,
|
|
40
|
+
});
|
|
41
|
+
if (!decision.allowed) {
|
|
42
|
+
return {
|
|
43
|
+
content: `Permission denied: ${decision.reason}`,
|
|
44
|
+
isError: true,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
}
|
|
35
48
|
const sandbox = await sandboxPromise;
|
|
36
49
|
const ctx = {
|
|
37
50
|
cwd: opts.cwd,
|