@dirgha/code 1.17.2 → 1.18.1
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/CHANGELOG.md +130 -45
- package/README.md +36 -25
- package/dist/cli/config.d.ts +2 -0
- package/dist/cli/config.js +16 -1
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/flows/tarball.js +26 -21
- package/dist/cli/flows/tarball.js.map +1 -1
- package/dist/cli/flows/wizard.d.ts +1 -1
- package/dist/cli/flows/wizard.js +282 -163
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.js +11 -3
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +82 -9
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/models-cmd.js +18 -20
- package/dist/cli/models-cmd.js.map +1 -1
- package/dist/cli/slash/fleet.d.ts +1 -1
- package/dist/cli/slash/fleet.js +25 -16
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/fs.js +1 -3
- package/dist/cli/slash/fs.js.map +1 -1
- package/dist/cli/slash/models.js +3 -4
- package/dist/cli/slash/models.js.map +1 -1
- package/dist/cli/slash/paste.d.ts +1 -1
- package/dist/cli/slash/paste.js +87 -41
- package/dist/cli/slash/paste.js.map +1 -1
- package/dist/cli/slash/provider.js +2 -2
- package/dist/cli/slash/provider.js.map +1 -1
- package/dist/cli/slash/session.js +4 -1
- package/dist/cli/slash/session.js.map +1 -1
- package/dist/cli/slash.js +19 -6
- package/dist/cli/slash.js.map +1 -1
- package/dist/cli/subcommands/doctor.js +48 -0
- package/dist/cli/subcommands/doctor.js.map +1 -1
- package/dist/cli/subcommands/feature-setup.d.ts +13 -0
- package/dist/cli/subcommands/feature-setup.js +438 -0
- package/dist/cli/subcommands/feature-setup.js.map +1 -0
- package/dist/cli/subcommands/history.d.ts +8 -0
- package/dist/cli/subcommands/history.js +45 -0
- package/dist/cli/subcommands/history.js.map +1 -0
- package/dist/cli/subcommands/index.js +4 -0
- package/dist/cli/subcommands/index.js.map +1 -1
- package/dist/cli/subcommands/scaffold.js +6 -2
- package/dist/cli/subcommands/scaffold.js.map +1 -1
- package/dist/cli/subcommands/setup.d.ts +4 -0
- package/dist/cli/subcommands/setup.js +9 -1
- package/dist/cli/subcommands/setup.js.map +1 -1
- package/dist/cli/subcommands/state.d.ts +8 -0
- package/dist/cli/subcommands/state.js +44 -0
- package/dist/cli/subcommands/state.js.map +1 -0
- package/dist/cli/subcommands/web.d.ts +1 -1
- package/dist/cli/subcommands/web.js +17 -14
- package/dist/cli/subcommands/web.js.map +1 -1
- package/dist/context/compaction.d.ts +3 -3
- package/dist/context/compaction.js +85 -37
- package/dist/context/compaction.js.map +1 -1
- package/dist/context/default-soul.md +5 -1
- package/dist/context/kb-init.d.ts +7 -0
- package/dist/context/kb-init.js +51 -0
- package/dist/context/kb-init.js.map +1 -0
- package/dist/context/ledger.js +3 -3
- package/dist/context/ledger.js.map +1 -1
- package/dist/context/memory.js +3 -0
- package/dist/context/memory.js.map +1 -1
- package/dist/context/primer.js +2 -0
- package/dist/context/primer.js.map +1 -1
- package/dist/context/session.js +5 -0
- package/dist/context/session.js.map +1 -1
- package/dist/daemon/server.d.ts +4 -0
- package/dist/daemon/server.js +81 -29
- package/dist/daemon/server.js.map +1 -1
- package/dist/fleet/apply-back.d.ts +1 -1
- package/dist/fleet/apply-back.js +90 -48
- package/dist/fleet/apply-back.js.map +1 -1
- package/dist/fleet/cli-command.d.ts +2 -2
- package/dist/fleet/cli-command.js +189 -72
- package/dist/fleet/cli-command.js.map +1 -1
- package/dist/fleet/dag.d.ts +38 -0
- package/dist/fleet/dag.js +77 -0
- package/dist/fleet/dag.js.map +1 -0
- package/dist/fleet/ledger-hook.d.ts +15 -0
- package/dist/fleet/ledger-hook.js +67 -0
- package/dist/fleet/ledger-hook.js.map +1 -0
- package/dist/fleet/runner.js +38 -5
- package/dist/fleet/runner.js.map +1 -1
- package/dist/fleet/scratchpad-tools.d.ts +13 -0
- package/dist/fleet/scratchpad-tools.js +73 -0
- package/dist/fleet/scratchpad-tools.js.map +1 -0
- package/dist/fleet/scratchpad.d.ts +28 -0
- package/dist/fleet/scratchpad.js +93 -0
- package/dist/fleet/scratchpad.js.map +1 -0
- package/dist/fleet/state.d.ts +37 -0
- package/dist/fleet/state.js +82 -0
- package/dist/fleet/state.js.map +1 -0
- package/dist/fleet/tripleshot.d.ts +2 -2
- package/dist/fleet/tripleshot.js +61 -48
- package/dist/fleet/tripleshot.js.map +1 -1
- package/dist/fleet/types.d.ts +4 -0
- package/dist/fleet/types.js.map +1 -1
- package/dist/fleet/worktree.d.ts +5 -0
- package/dist/fleet/worktree.js +82 -11
- package/dist/fleet/worktree.js.map +1 -1
- package/dist/hooks/config-bridge.d.ts +2 -2
- package/dist/hooks/config-bridge.js +49 -19
- package/dist/hooks/config-bridge.js.map +1 -1
- package/dist/integrations/arniko-client.d.ts +1 -1
- package/dist/integrations/arniko-client.js +32 -26
- package/dist/integrations/arniko-client.js.map +1 -1
- package/dist/intelligence/cost.js +13 -7
- package/dist/intelligence/cost.js.map +1 -1
- package/dist/intelligence/failover-chain.d.ts +27 -0
- package/dist/intelligence/failover-chain.js +70 -0
- package/dist/intelligence/failover-chain.js.map +1 -0
- package/dist/intelligence/models-dev-sync.js +10 -3
- package/dist/intelligence/models-dev-sync.js.map +1 -1
- package/dist/intelligence/prices.js +1 -1
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/kernel/agent-loop.js +74 -17
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/kernel/event-stream.d.ts +7 -2
- package/dist/kernel/event-stream.js +63 -9
- package/dist/kernel/event-stream.js.map +1 -1
- package/dist/kernel/message.d.ts +2 -2
- package/dist/kernel/message.js +45 -30
- package/dist/kernel/message.js.map +1 -1
- package/dist/kernel/types.d.ts +1 -1
- package/dist/lsp/client.js +16 -7
- package/dist/lsp/client.js.map +1 -1
- package/dist/providers/deepseek.d.ts +2 -2
- package/dist/providers/deepseek.js +21 -21
- package/dist/providers/deepseek.js.map +1 -1
- package/dist/providers/health.d.ts +4 -1
- package/dist/providers/health.js +24 -9
- package/dist/providers/health.js.map +1 -1
- package/dist/providers/http.d.ts +2 -0
- package/dist/providers/http.js +52 -24
- package/dist/providers/http.js.map +1 -1
- package/dist/providers/openai-compat.js +30 -27
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/providers/openrouter.d.ts +2 -2
- package/dist/providers/openrouter.js +25 -16
- package/dist/providers/openrouter.js.map +1 -1
- package/dist/safety/approval-bus.js +1 -1
- package/dist/safety/approval-bus.js.map +1 -1
- package/dist/safety/policy.d.ts +3 -3
- package/dist/safety/policy.js +60 -47
- package/dist/safety/policy.js.map +1 -1
- package/dist/safety/sandbox/noop.d.ts +2 -2
- package/dist/safety/sandbox/noop.js +23 -15
- package/dist/safety/sandbox/noop.js.map +1 -1
- package/dist/safety/sandbox/seatbelt.d.ts +1 -1
- package/dist/safety/sandbox/seatbelt.js +16 -9
- package/dist/safety/sandbox/seatbelt.js.map +1 -1
- package/dist/state/db.d.ts +29 -0
- package/dist/state/db.js +138 -0
- package/dist/state/db.js.map +1 -0
- package/dist/state/index.d.ts +23 -0
- package/dist/state/index.js +119 -0
- package/dist/state/index.js.map +1 -0
- package/dist/subagents/delegator.d.ts +8 -0
- package/dist/subagents/delegator.js +22 -5
- package/dist/subagents/delegator.js.map +1 -1
- package/dist/telemetry/crash-report.js +111 -79
- package/dist/telemetry/crash-report.js.map +1 -1
- package/dist/tools/browser.d.ts +1 -1
- package/dist/tools/browser.js +62 -45
- package/dist/tools/browser.js.map +1 -1
- package/dist/tools/checkpoint.js +3 -0
- package/dist/tools/checkpoint.js.map +1 -1
- package/dist/tools/cron.d.ts +1 -1
- package/dist/tools/cron.js +61 -41
- package/dist/tools/cron.js.map +1 -1
- package/dist/tools/exec.js +36 -1
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/fs-edit.js +4 -1
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/fs-ls.js +4 -1
- package/dist/tools/fs-ls.js.map +1 -1
- package/dist/tools/fs-read.js +4 -1
- package/dist/tools/fs-read.js.map +1 -1
- package/dist/tools/fs-write.js +4 -1
- package/dist/tools/fs-write.js.map +1 -1
- package/dist/tools/git.d.ts +1 -1
- package/dist/tools/git.js +45 -25
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/index.d.ts +3 -1
- package/dist/tools/index.js +5 -1
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/lsp-definition.js +10 -1
- package/dist/tools/lsp-definition.js.map +1 -1
- package/dist/tools/lsp-hover.js +10 -1
- package/dist/tools/lsp-hover.js.map +1 -1
- package/dist/tools/lsp-references.js +10 -1
- package/dist/tools/lsp-references.js.map +1 -1
- package/dist/tools/lsp-symbols.js +10 -1
- package/dist/tools/lsp-symbols.js.map +1 -1
- package/dist/tools/multimodal.d.ts +2 -2
- package/dist/tools/multimodal.js +141 -90
- package/dist/tools/multimodal.js.map +1 -1
- package/dist/tools/qmd.d.ts +15 -0
- package/dist/tools/qmd.js +107 -0
- package/dist/tools/qmd.js.map +1 -0
- package/dist/tools/registry.d.ts +5 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/rtk.d.ts +12 -0
- package/dist/tools/rtk.js +113 -0
- package/dist/tools/rtk.js.map +1 -0
- package/dist/tools/search-grep.js +1 -0
- package/dist/tools/search-grep.js.map +1 -1
- package/dist/tools/shell.js +25 -16
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/approval.d.ts +1 -1
- package/dist/tui/approval.js +38 -14
- package/dist/tui/approval.js.map +1 -1
- package/dist/tui/ink/App.js +85 -71
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/DenseToolMessage.js +9 -22
- package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
- package/dist/tui/ink/components/InputBox.d.ts +2 -0
- package/dist/tui/ink/components/InputBox.js +9 -14
- package/dist/tui/ink/components/InputBox.js.map +1 -1
- package/dist/tui/ink/components/SpinnerGlyph.d.ts +18 -0
- package/dist/tui/ink/components/SpinnerGlyph.js +28 -0
- package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -0
- package/dist/tui/ink/components/StatusBar.js +4 -22
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/components/ThinkingBlock.js +3 -3
- package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
- package/dist/tui/ink/components/ToolBox.js +6 -26
- package/dist/tui/ink/components/ToolBox.js.map +1 -1
- package/dist/tui/ink/components/ToolGroup.js +4 -14
- package/dist/tui/ink/components/ToolGroup.js.map +1 -1
- package/dist/tui/ink/ink-approval-bus.js +4 -1
- package/dist/tui/ink/ink-approval-bus.js.map +1 -1
- package/dist/tui/ink/spinner-context.d.ts +5 -0
- package/dist/tui/ink/spinner-context.js +7 -0
- package/dist/tui/ink/spinner-context.js.map +1 -0
- package/dist/tui/ink/use-event-projection.js +142 -37
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/dist/tui/renderer.js +9 -1
- package/dist/tui/renderer.js.map +1 -1
- package/dist/web/ledger.d.ts +1 -1
- package/dist/web/ledger.js +44 -20
- package/dist/web/ledger.js.map +1 -1
- package/dist/web/server.js +4 -3
- package/dist/web/server.js.map +1 -1
- package/package.json +21 -12
- package/vendor/qmd/VERSION +3 -0
- package/vendor/rtk/CHECKSUMS.txt +6 -0
- package/vendor/rtk/VERSION +3 -0
- package/vendor/rtk/linux-x64/rtk +0 -0
package/dist/tools/browser.js
CHANGED
|
@@ -15,16 +15,16 @@
|
|
|
15
15
|
* tool for the older `agent-browser` shell-out implementation this tool
|
|
16
16
|
* supersedes.
|
|
17
17
|
*/
|
|
18
|
-
import { mkdir } from
|
|
19
|
-
import { homedir, tmpdir } from
|
|
20
|
-
import { join } from
|
|
18
|
+
import { mkdir } from "node:fs/promises";
|
|
19
|
+
import { homedir, tmpdir } from "node:os";
|
|
20
|
+
import { join } from "node:path";
|
|
21
21
|
const MAX_CONTENT_CHARS = 50_000;
|
|
22
22
|
const DEFAULT_TIMEOUT_MS = 30_000;
|
|
23
|
-
const SCREENSHOT_DIR = join(homedir(),
|
|
23
|
+
const SCREENSHOT_DIR = join(homedir(), ".dirgha", "screenshots");
|
|
24
24
|
let browser;
|
|
25
25
|
let page;
|
|
26
26
|
async function ensureBrowser() {
|
|
27
|
-
if (page && browser
|
|
27
|
+
if (page && browser?.isConnected?.() !== false)
|
|
28
28
|
return page;
|
|
29
29
|
let chromium;
|
|
30
30
|
try {
|
|
@@ -32,11 +32,11 @@ async function ensureBrowser() {
|
|
|
32
32
|
// not in package.json deps (heavy + optional). Hiding the literal
|
|
33
33
|
// string behind a variable keeps TS's module resolver from looking
|
|
34
34
|
// for type definitions for an absent package.
|
|
35
|
-
const pwModuleId =
|
|
35
|
+
const pwModuleId = "playwright";
|
|
36
36
|
const mod = await import(pwModuleId);
|
|
37
37
|
chromium = mod.chromium ?? mod.default?.chromium;
|
|
38
|
-
if (!chromium || typeof chromium.launch !==
|
|
39
|
-
throw new Error(
|
|
38
|
+
if (!chromium || typeof chromium.launch !== "function") {
|
|
39
|
+
throw new Error("playwright module shape unexpected (no chromium.launch)");
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
catch (err) {
|
|
@@ -44,7 +44,7 @@ async function ensureBrowser() {
|
|
|
44
44
|
}
|
|
45
45
|
browser = await chromium.launch({
|
|
46
46
|
headless: true,
|
|
47
|
-
args: [
|
|
47
|
+
args: ["--no-sandbox", "--disable-dev-shm-usage"],
|
|
48
48
|
});
|
|
49
49
|
page = await browser.newPage();
|
|
50
50
|
return page;
|
|
@@ -62,24 +62,24 @@ function fail(content) {
|
|
|
62
62
|
}
|
|
63
63
|
async function doGoto(input) {
|
|
64
64
|
if (!input.url)
|
|
65
|
-
return fail(
|
|
65
|
+
return fail("url required for goto");
|
|
66
66
|
const p = await ensureBrowser();
|
|
67
67
|
await p.goto(input.url, {
|
|
68
|
-
waitUntil: input.waitUntil ??
|
|
68
|
+
waitUntil: input.waitUntil ?? "domcontentloaded",
|
|
69
69
|
timeout: input.timeoutMs ?? DEFAULT_TIMEOUT_MS,
|
|
70
70
|
});
|
|
71
|
-
const title = await p.title().catch(() =>
|
|
72
|
-
return ok({ action:
|
|
71
|
+
const title = await p.title().catch(() => "");
|
|
72
|
+
return ok({ action: "goto", url: p.url(), title }, `navigated to ${p.url()}\ntitle: ${title || "(none)"}`);
|
|
73
73
|
}
|
|
74
74
|
async function doClick(input) {
|
|
75
75
|
if (!input.selector && !input.text) {
|
|
76
|
-
return fail(
|
|
76
|
+
return fail("click requires selector or text");
|
|
77
77
|
}
|
|
78
78
|
const p = await ensureBrowser();
|
|
79
79
|
const timeout = input.timeoutMs ?? DEFAULT_TIMEOUT_MS;
|
|
80
80
|
if (input.selector) {
|
|
81
81
|
await p.click(input.selector, { timeout });
|
|
82
|
-
return ok({ action:
|
|
82
|
+
return ok({ action: "click" }, `clicked selector: ${input.selector}`);
|
|
83
83
|
}
|
|
84
84
|
// Text-based click — pick the first match to avoid ambiguity.
|
|
85
85
|
const locator = p.getByText(input.text).first();
|
|
@@ -87,30 +87,33 @@ async function doClick(input) {
|
|
|
87
87
|
if (count === 0)
|
|
88
88
|
return fail(`no element contains text: ${input.text}`);
|
|
89
89
|
await locator.click({ timeout });
|
|
90
|
-
return ok({ action:
|
|
90
|
+
return ok({ action: "click" }, `clicked text: ${input.text}`);
|
|
91
91
|
}
|
|
92
92
|
async function doScreenshot(input) {
|
|
93
93
|
const p = await ensureBrowser();
|
|
94
94
|
const outPath = input.path ?? join(SCREENSHOT_DIR, `shot-${Date.now()}.png`);
|
|
95
95
|
await mkdir(SCREENSHOT_DIR, { recursive: true }).catch(() => undefined);
|
|
96
96
|
await p.screenshot({ path: outPath, fullPage: input.fullPage ?? false });
|
|
97
|
-
return ok({ action:
|
|
97
|
+
return ok({ action: "screenshot", path: outPath }, `screenshot saved: ${outPath}`);
|
|
98
98
|
}
|
|
99
99
|
async function doContent(_input) {
|
|
100
100
|
const p = await ensureBrowser();
|
|
101
|
-
const text = await p.innerText(
|
|
101
|
+
const text = await p.innerText("body").catch(async () => {
|
|
102
102
|
// Fallback to raw HTML stripped of tags if body isn't available yet.
|
|
103
103
|
const html = await p.content();
|
|
104
|
-
return html
|
|
104
|
+
return html
|
|
105
|
+
.replace(/<[^>]+>/g, " ")
|
|
106
|
+
.replace(/\s+/g, " ")
|
|
107
|
+
.trim();
|
|
105
108
|
});
|
|
106
109
|
const url = p.url();
|
|
107
|
-
const title = await p.title().catch(() =>
|
|
110
|
+
const title = await p.title().catch(() => "");
|
|
108
111
|
const body = truncate(text);
|
|
109
|
-
return ok({ action:
|
|
112
|
+
return ok({ action: "content", url, title }, `url: ${url}\ntitle: ${title}\n\n${body}`);
|
|
110
113
|
}
|
|
111
114
|
async function doClose() {
|
|
112
115
|
await closeBrowser();
|
|
113
|
-
return ok({ action:
|
|
116
|
+
return ok({ action: "close" }, "browser closed");
|
|
114
117
|
}
|
|
115
118
|
/**
|
|
116
119
|
* Shut down the browser instance and reset module state. Safe to call
|
|
@@ -127,47 +130,61 @@ export async function closeBrowser() {
|
|
|
127
130
|
await b.close().catch(() => undefined);
|
|
128
131
|
}
|
|
129
132
|
export const browserTool = {
|
|
130
|
-
name:
|
|
131
|
-
description:
|
|
133
|
+
name: "browser",
|
|
134
|
+
description: "Control a headless Chromium browser. Actions: goto (url), click (selector or text), screenshot (path), content (returns page text), close. One page is kept alive across calls.",
|
|
132
135
|
inputSchema: {
|
|
133
|
-
type:
|
|
136
|
+
type: "object",
|
|
134
137
|
properties: {
|
|
135
138
|
action: {
|
|
136
|
-
type:
|
|
137
|
-
enum: [
|
|
139
|
+
type: "string",
|
|
140
|
+
enum: ["goto", "click", "screenshot", "content", "close"],
|
|
138
141
|
},
|
|
139
|
-
url: { type:
|
|
140
|
-
selector: { type:
|
|
141
|
-
text: { type:
|
|
142
|
-
path: { type:
|
|
143
|
-
fullPage: { type:
|
|
144
|
-
timeoutMs: { type:
|
|
142
|
+
url: { type: "string", description: "Target URL for goto." },
|
|
143
|
+
selector: { type: "string", description: "CSS selector for click." },
|
|
144
|
+
text: { type: "string", description: "Visible text for click fallback." },
|
|
145
|
+
path: { type: "string", description: "Output path for screenshot." },
|
|
146
|
+
fullPage: { type: "boolean", description: "Whole-page screenshot." },
|
|
147
|
+
timeoutMs: { type: "integer", minimum: 1000 },
|
|
145
148
|
waitUntil: {
|
|
146
|
-
type:
|
|
147
|
-
enum: [
|
|
149
|
+
type: "string",
|
|
150
|
+
enum: ["load", "domcontentloaded", "networkidle"],
|
|
148
151
|
},
|
|
149
152
|
},
|
|
150
|
-
required: [
|
|
153
|
+
required: ["action"],
|
|
151
154
|
},
|
|
152
155
|
requiresApproval: (raw) => {
|
|
153
156
|
const input = raw;
|
|
154
157
|
// Approve network-touching or filesystem-writing actions. `content`
|
|
155
158
|
// and `close` reuse the already-approved page so they don't.
|
|
156
|
-
return input.action ===
|
|
159
|
+
return input.action === "goto" || input.action === "screenshot";
|
|
157
160
|
},
|
|
158
161
|
async execute(rawInput, _ctx) {
|
|
159
162
|
const input = rawInput;
|
|
160
|
-
if (!input || typeof input.action !==
|
|
161
|
-
return fail(
|
|
163
|
+
if (!input || typeof input.action !== "string") {
|
|
164
|
+
return fail("action required");
|
|
165
|
+
}
|
|
166
|
+
// Probe playwright availability before attempting any action.
|
|
167
|
+
try {
|
|
168
|
+
const pwModuleId = "playwright";
|
|
169
|
+
await import(pwModuleId);
|
|
170
|
+
}
|
|
171
|
+
catch {
|
|
172
|
+
return fail("Browser tool unavailable: Playwright is not installed. Run: npm install -g playwright && playwright install chromium");
|
|
162
173
|
}
|
|
163
174
|
try {
|
|
164
175
|
switch (input.action) {
|
|
165
|
-
case
|
|
166
|
-
|
|
167
|
-
case
|
|
168
|
-
|
|
169
|
-
case
|
|
170
|
-
|
|
176
|
+
case "goto":
|
|
177
|
+
return await doGoto(input);
|
|
178
|
+
case "click":
|
|
179
|
+
return await doClick(input);
|
|
180
|
+
case "screenshot":
|
|
181
|
+
return await doScreenshot(input);
|
|
182
|
+
case "content":
|
|
183
|
+
return await doContent(input);
|
|
184
|
+
case "close":
|
|
185
|
+
return await doClose();
|
|
186
|
+
default:
|
|
187
|
+
return fail(`unknown action: ${String(input.action)}`);
|
|
171
188
|
}
|
|
172
189
|
}
|
|
173
190
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/tools/browser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/tools/browser.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/checkpoint.js
CHANGED
|
@@ -24,6 +24,7 @@ import { mkdir, readdir, readFile, stat, unlink, writeFile } from 'node:fs/promi
|
|
|
24
24
|
import { homedir } from 'node:os';
|
|
25
25
|
import { join, basename } from 'node:path';
|
|
26
26
|
import { SessionStore } from '../context/session.js';
|
|
27
|
+
import { registerCheckpoint } from '../state/index.js';
|
|
27
28
|
const CHECKPOINT_DIR = join(homedir(), '.dirgha', 'checkpoints');
|
|
28
29
|
async function ensureDir() {
|
|
29
30
|
await mkdir(CHECKPOINT_DIR, { recursive: true }).catch(() => undefined);
|
|
@@ -93,6 +94,8 @@ async function doSave(input, ctx) {
|
|
|
93
94
|
};
|
|
94
95
|
const path = checkpointPath(id);
|
|
95
96
|
await writeFile(path, JSON.stringify(payload, null, 2), 'utf8');
|
|
97
|
+
// Register in unified state index (fire-and-forget, never blocks).
|
|
98
|
+
void registerCheckpoint(ctx.sessionId, id);
|
|
96
99
|
const info = await stat(path).catch(() => undefined);
|
|
97
100
|
const summary = {
|
|
98
101
|
id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpoint.js","sourceRoot":"","sources":["../../src/tools/checkpoint.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACrF,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAI3C,OAAO,EAAE,YAAY,EAAqB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"checkpoint.js","sourceRoot":"","sources":["../../src/tools/checkpoint.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/cron.d.ts
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* field cron expressions, human strings like "every 1h", or ISO dates.
|
|
17
17
|
* We only validate that it is non-empty.
|
|
18
18
|
*/
|
|
19
|
-
import type { Tool } from
|
|
19
|
+
import type { Tool } from "./registry.js";
|
|
20
20
|
export interface CronJob {
|
|
21
21
|
id: string;
|
|
22
22
|
schedule: string;
|
package/dist/tools/cron.js
CHANGED
|
@@ -16,43 +16,61 @@
|
|
|
16
16
|
* field cron expressions, human strings like "every 1h", or ISO dates.
|
|
17
17
|
* We only validate that it is non-empty.
|
|
18
18
|
*/
|
|
19
|
-
import { readFile, writeFile, mkdir, stat } from
|
|
20
|
-
import { join } from
|
|
21
|
-
import { homedir } from
|
|
22
|
-
import { randomUUID } from
|
|
23
|
-
const DEFAULT_PATH = join(homedir(),
|
|
19
|
+
import { readFile, writeFile, mkdir, stat, rename } from "node:fs/promises";
|
|
20
|
+
import { join, dirname } from "node:path";
|
|
21
|
+
import { homedir } from "node:os";
|
|
22
|
+
import { randomUUID } from "node:crypto";
|
|
23
|
+
const DEFAULT_PATH = join(homedir(), ".dirgha", "cron", "jobs.json");
|
|
24
24
|
export function createCronTool(opts = {}) {
|
|
25
25
|
const filePath = opts.filePath ?? DEFAULT_PATH;
|
|
26
26
|
return {
|
|
27
|
-
name:
|
|
28
|
-
description:
|
|
27
|
+
name: "cron",
|
|
28
|
+
description: "Manage scheduled job declarations (add/remove/list/run_now). This tool only stores job declarations — a separate daemon is responsible for running them.",
|
|
29
29
|
inputSchema: {
|
|
30
|
-
type:
|
|
30
|
+
type: "object",
|
|
31
31
|
properties: {
|
|
32
|
-
action: { type:
|
|
33
|
-
id: {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
32
|
+
action: { type: "string", enum: ["add", "remove", "list", "run_now"] },
|
|
33
|
+
id: {
|
|
34
|
+
type: "string",
|
|
35
|
+
description: "Job id (required for remove/run_now).",
|
|
36
|
+
},
|
|
37
|
+
schedule: {
|
|
38
|
+
type: "string",
|
|
39
|
+
description: "Schedule string (cron expression, ISO date, or human phrase). Required for add.",
|
|
40
|
+
},
|
|
41
|
+
command: {
|
|
42
|
+
type: "string",
|
|
43
|
+
description: "Shell command or agent prompt to run. Required for add.",
|
|
44
|
+
},
|
|
45
|
+
nextRunAt: {
|
|
46
|
+
type: "string",
|
|
47
|
+
description: "Optional ISO timestamp of next run. Defaults to now.",
|
|
48
|
+
},
|
|
37
49
|
},
|
|
38
|
-
required: [
|
|
50
|
+
required: ["action"],
|
|
39
51
|
},
|
|
40
52
|
async execute(rawInput, _ctx) {
|
|
41
53
|
const input = rawInput;
|
|
42
|
-
if (input.action ===
|
|
54
|
+
if (input.action === "list") {
|
|
43
55
|
const jobs = await readJobs(filePath);
|
|
44
56
|
return {
|
|
45
57
|
content: formatJobList(jobs),
|
|
46
|
-
data: { action:
|
|
58
|
+
data: { action: "list", count: jobs.length },
|
|
47
59
|
isError: false,
|
|
48
60
|
};
|
|
49
61
|
}
|
|
50
|
-
if (input.action ===
|
|
62
|
+
if (input.action === "add") {
|
|
51
63
|
if (!input.schedule || !input.schedule.trim()) {
|
|
52
|
-
return {
|
|
64
|
+
return {
|
|
65
|
+
content: "add requires a non-empty `schedule`.",
|
|
66
|
+
isError: true,
|
|
67
|
+
};
|
|
53
68
|
}
|
|
54
69
|
if (!input.command || !input.command.trim()) {
|
|
55
|
-
return {
|
|
70
|
+
return {
|
|
71
|
+
content: "add requires a non-empty `command`.",
|
|
72
|
+
isError: true,
|
|
73
|
+
};
|
|
56
74
|
}
|
|
57
75
|
const jobs = await readJobs(filePath);
|
|
58
76
|
const job = {
|
|
@@ -66,30 +84,30 @@ export function createCronTool(opts = {}) {
|
|
|
66
84
|
await writeJobs(filePath, jobs);
|
|
67
85
|
return {
|
|
68
86
|
content: `Added cron job ${job.id} (${job.schedule}): ${job.command}`,
|
|
69
|
-
data: { action:
|
|
87
|
+
data: { action: "add", job },
|
|
70
88
|
isError: false,
|
|
71
89
|
};
|
|
72
90
|
}
|
|
73
|
-
if (input.action ===
|
|
91
|
+
if (input.action === "remove") {
|
|
74
92
|
if (!input.id)
|
|
75
|
-
return { content:
|
|
93
|
+
return { content: "remove requires an `id`.", isError: true };
|
|
76
94
|
const jobs = await readJobs(filePath);
|
|
77
|
-
const next = jobs.filter(j => j.id !== input.id);
|
|
95
|
+
const next = jobs.filter((j) => j.id !== input.id);
|
|
78
96
|
if (next.length === jobs.length) {
|
|
79
97
|
return { content: `No job with id "${input.id}".`, isError: true };
|
|
80
98
|
}
|
|
81
99
|
await writeJobs(filePath, next);
|
|
82
100
|
return {
|
|
83
101
|
content: `Removed cron job ${input.id}.`,
|
|
84
|
-
data: { action:
|
|
102
|
+
data: { action: "remove", count: next.length },
|
|
85
103
|
isError: false,
|
|
86
104
|
};
|
|
87
105
|
}
|
|
88
|
-
if (input.action ===
|
|
106
|
+
if (input.action === "run_now") {
|
|
89
107
|
if (!input.id)
|
|
90
|
-
return { content:
|
|
108
|
+
return { content: "run_now requires an `id`.", isError: true };
|
|
91
109
|
const jobs = await readJobs(filePath);
|
|
92
|
-
const job = jobs.find(j => j.id === input.id);
|
|
110
|
+
const job = jobs.find((j) => j.id === input.id);
|
|
93
111
|
if (!job)
|
|
94
112
|
return { content: `No job with id "${input.id}".`, isError: true };
|
|
95
113
|
job.lastRunAt = new Date().toISOString();
|
|
@@ -99,8 +117,8 @@ export function createCronTool(opts = {}) {
|
|
|
99
117
|
`Marked cron job ${job.id} as manually run.`,
|
|
100
118
|
`This tool does not execute the command; a scheduler daemon`,
|
|
101
119
|
`should pick it up. Command was: ${job.command}`,
|
|
102
|
-
].join(
|
|
103
|
-
data: { action:
|
|
120
|
+
].join(" "),
|
|
121
|
+
data: { action: "run_now", job },
|
|
104
122
|
isError: false,
|
|
105
123
|
};
|
|
106
124
|
}
|
|
@@ -112,7 +130,7 @@ export function createCronTool(opts = {}) {
|
|
|
112
130
|
};
|
|
113
131
|
}
|
|
114
132
|
async function readJobs(filePath) {
|
|
115
|
-
const raw = await readFile(filePath,
|
|
133
|
+
const raw = await readFile(filePath, "utf8").catch(() => null);
|
|
116
134
|
if (raw === null)
|
|
117
135
|
return [];
|
|
118
136
|
try {
|
|
@@ -127,10 +145,12 @@ async function readJobs(filePath) {
|
|
|
127
145
|
}
|
|
128
146
|
async function writeJobs(filePath, jobs) {
|
|
129
147
|
await ensureParent(filePath);
|
|
130
|
-
|
|
148
|
+
const tmp = filePath + ".tmp";
|
|
149
|
+
await writeFile(tmp, `${JSON.stringify(jobs, null, 2)}\n`, "utf8");
|
|
150
|
+
await rename(tmp, filePath);
|
|
131
151
|
}
|
|
132
152
|
async function ensureParent(filePath) {
|
|
133
|
-
const dir =
|
|
153
|
+
const dir = dirname(filePath);
|
|
134
154
|
if (!dir)
|
|
135
155
|
return;
|
|
136
156
|
const info = await stat(dir).catch(() => undefined);
|
|
@@ -138,23 +158,23 @@ async function ensureParent(filePath) {
|
|
|
138
158
|
await mkdir(dir, { recursive: true });
|
|
139
159
|
}
|
|
140
160
|
function isCronJob(value) {
|
|
141
|
-
if (!value || typeof value !==
|
|
161
|
+
if (!value || typeof value !== "object")
|
|
142
162
|
return false;
|
|
143
163
|
const v = value;
|
|
144
|
-
return (typeof v.id ===
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
164
|
+
return (typeof v.id === "string" &&
|
|
165
|
+
typeof v.schedule === "string" &&
|
|
166
|
+
typeof v.command === "string" &&
|
|
167
|
+
typeof v.createdAt === "string");
|
|
148
168
|
}
|
|
149
169
|
function formatJobList(jobs) {
|
|
150
170
|
if (jobs.length === 0)
|
|
151
171
|
return '(no cron jobs — add one with action="add").';
|
|
152
|
-
const lines = [`${jobs.length} cron job${jobs.length === 1 ?
|
|
172
|
+
const lines = [`${jobs.length} cron job${jobs.length === 1 ? "" : "s"}:`];
|
|
153
173
|
for (const job of jobs) {
|
|
154
|
-
const next = job.nextRunAt ? ` next=${job.nextRunAt}` :
|
|
155
|
-
const last = job.lastRunAt ? ` last=${job.lastRunAt}` :
|
|
174
|
+
const next = job.nextRunAt ? ` next=${job.nextRunAt}` : "";
|
|
175
|
+
const last = job.lastRunAt ? ` last=${job.lastRunAt}` : "";
|
|
156
176
|
lines.push(` ${job.id} [${job.schedule}]${next}${last} ${job.command}`);
|
|
157
177
|
}
|
|
158
|
-
return lines.join(
|
|
178
|
+
return lines.join("\n");
|
|
159
179
|
}
|
|
160
180
|
//# sourceMappingURL=cron.js.map
|
package/dist/tools/cron.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.js","sourceRoot":"","sources":["../../src/tools/cron.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"cron.js","sourceRoot":"","sources":["../../src/tools/cron.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/exec.js
CHANGED
|
@@ -9,8 +9,20 @@
|
|
|
9
9
|
* When an onProgress callback is provided, tools that emit streaming
|
|
10
10
|
* progress push events back through the agent-loop event stream.
|
|
11
11
|
*/
|
|
12
|
+
import { selectSandbox } from "../safety/sandbox/select.js";
|
|
12
13
|
export function createToolExecutor(opts) {
|
|
13
14
|
const env = opts.env ?? sanitiseEnv(process.env);
|
|
15
|
+
// Resolve the platform sandbox adapter once per executor instance.
|
|
16
|
+
// Falls back to null if selectSandbox throws (unsupported platform or
|
|
17
|
+
// misconfigured DIRGHA_SANDBOX override). Tools receive the adapter via
|
|
18
|
+
// ToolContext.sandbox and may opt in to sandbox execution.
|
|
19
|
+
let sandboxPromise;
|
|
20
|
+
try {
|
|
21
|
+
sandboxPromise = selectSandbox().catch(() => null);
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
sandboxPromise = Promise.resolve(null);
|
|
25
|
+
}
|
|
14
26
|
return {
|
|
15
27
|
async execute(call, signal) {
|
|
16
28
|
const tool = opts.registry.get(call.name);
|
|
@@ -20,11 +32,13 @@ export function createToolExecutor(opts) {
|
|
|
20
32
|
isError: true,
|
|
21
33
|
};
|
|
22
34
|
}
|
|
35
|
+
const sandbox = await sandboxPromise;
|
|
23
36
|
const ctx = {
|
|
24
37
|
cwd: opts.cwd,
|
|
25
38
|
env,
|
|
26
39
|
sessionId: opts.sessionId,
|
|
27
40
|
signal,
|
|
41
|
+
sandbox,
|
|
28
42
|
log: opts.log,
|
|
29
43
|
onProgress: opts.onProgress
|
|
30
44
|
? (msg) => opts.onProgress(call.id, msg)
|
|
@@ -42,7 +56,28 @@ export function createToolExecutor(opts) {
|
|
|
42
56
|
}
|
|
43
57
|
async function runTool(tool, input, ctx) {
|
|
44
58
|
const started = Date.now();
|
|
45
|
-
const
|
|
59
|
+
const deadlineMs = tool.timeoutMs ?? 0;
|
|
60
|
+
let result;
|
|
61
|
+
if (deadlineMs > 0) {
|
|
62
|
+
result = await Promise.race([
|
|
63
|
+
tool.execute(input, ctx),
|
|
64
|
+
new Promise((resolve) => {
|
|
65
|
+
const timer = setTimeout(() => {
|
|
66
|
+
resolve({
|
|
67
|
+
content: `Tool "${tool.name}" timed out after ${deadlineMs}ms.`,
|
|
68
|
+
isError: true,
|
|
69
|
+
durationMs: deadlineMs,
|
|
70
|
+
});
|
|
71
|
+
}, deadlineMs);
|
|
72
|
+
// Clean up timer on success to avoid leaking.
|
|
73
|
+
const abort = () => clearTimeout(timer);
|
|
74
|
+
ctx.signal?.addEventListener("abort", abort, { once: true });
|
|
75
|
+
}),
|
|
76
|
+
]);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
result = await tool.execute(input, ctx);
|
|
80
|
+
}
|
|
46
81
|
result.durationMs = result.durationMs ?? Date.now() - started;
|
|
47
82
|
return result;
|
|
48
83
|
}
|
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.js
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* auditable — no "nearest fuzzy match" guessing.
|
|
9
9
|
*/
|
|
10
10
|
import { readFile, stat, writeFile } from "node:fs/promises";
|
|
11
|
-
import { resolve } from "node:path";
|
|
11
|
+
import { resolve, sep } from "node:path";
|
|
12
12
|
import { summariseDiff, unifiedDiff } from "./diff.js";
|
|
13
13
|
export const fsEditTool = {
|
|
14
14
|
name: "fs_edit",
|
|
@@ -27,6 +27,9 @@ export const fsEditTool = {
|
|
|
27
27
|
async execute(rawInput, ctx) {
|
|
28
28
|
const input = rawInput;
|
|
29
29
|
const abs = resolve(ctx.cwd, input.path);
|
|
30
|
+
if (!abs.startsWith(ctx.cwd + sep) && abs !== ctx.cwd) {
|
|
31
|
+
return { content: `Path escapes working directory: ${input.path}`, isError: true };
|
|
32
|
+
}
|
|
30
33
|
const info = await stat(abs).catch(() => undefined);
|
|
31
34
|
if (!info || !info.isFile())
|
|
32
35
|
return { content: `No such file: ${input.path}`, isError: true };
|