@dirgha/code 1.22.0 → 1.24.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +171 -0
- package/README.md +8 -4
- 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.d.ts +36 -5
- package/dist/cli/config.js +31 -3
- 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 +13 -18
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.d.ts +4 -0
- package/dist/cli/interactive.js +61 -1
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +82 -23
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/setup.js +1 -0
- package/dist/cli/setup.js.map +1 -1
- package/dist/cli/slash/fleet.js +28 -3
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/index.d.ts +2 -1
- package/dist/cli/slash/index.js +3 -1
- package/dist/cli/slash/index.js.map +1 -1
- package/dist/cli/slash/models.js +339 -7
- package/dist/cli/slash/models.js.map +1 -1
- package/dist/cli/slash/paste.js +4 -7
- package/dist/cli/slash/paste.js.map +1 -1
- package/dist/cli/slash/provider.d.ts +1 -0
- package/dist/cli/slash/provider.js +33 -1
- package/dist/cli/slash/provider.js.map +1 -1
- package/dist/cli/slash/sandbox.d.ts +21 -0
- package/dist/cli/slash/sandbox.js +84 -0
- package/dist/cli/slash/sandbox.js.map +1 -0
- package/dist/cli/slash.d.ts +5 -0
- package/dist/cli/slash.js +26 -10
- package/dist/cli/slash.js.map +1 -1
- package/dist/cli/subcommands/audit.js +28 -8
- package/dist/cli/subcommands/audit.js.map +1 -1
- package/dist/cli/subcommands/doctor.d.ts +4 -0
- package/dist/cli/subcommands/doctor.js +117 -21
- package/dist/cli/subcommands/doctor.js.map +1 -1
- package/dist/cli/subcommands/feature-setup.js +6 -6
- package/dist/cli/subcommands/feature-setup.js.map +1 -1
- package/dist/cli/subcommands/memory.js +23 -0
- package/dist/cli/subcommands/memory.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/_fts.js +4 -1
- package/dist/context/_fts.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 +44 -21
- package/dist/context/compaction.js.map +1 -1
- package/dist/context/default-soul.md +1 -0
- 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 +8 -1
- 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.d.ts +17 -0
- package/dist/context/primer.js +50 -3
- package/dist/context/primer.js.map +1 -1
- package/dist/context/session.d.ts +4 -0
- package/dist/context/session.js.map +1 -1
- package/dist/daemon/server.js +17 -3
- package/dist/daemon/server.js.map +1 -1
- package/dist/embeddings/iface.d.ts +26 -0
- package/dist/embeddings/iface.js +15 -0
- package/dist/embeddings/iface.js.map +1 -0
- package/dist/embeddings/local.d.ts +24 -0
- package/dist/embeddings/local.js +112 -0
- package/dist/embeddings/local.js.map +1 -0
- package/dist/embeddings/remote.d.ts +31 -0
- package/dist/embeddings/remote.js +88 -0
- package/dist/embeddings/remote.js.map +1 -0
- package/dist/embeddings/select.d.ts +24 -0
- package/dist/embeddings/select.js +39 -0
- package/dist/embeddings/select.js.map +1 -0
- 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/failover-chain.js +10 -1
- package/dist/intelligence/failover-chain.js.map +1 -1
- package/dist/intelligence/prices.d.ts +6 -4
- package/dist/intelligence/prices.js +45 -11
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/kernel/abort-utils.d.ts +4 -0
- package/dist/kernel/abort-utils.js +45 -0
- package/dist/kernel/abort-utils.js.map +1 -0
- package/dist/kernel/agent-loop.js +104 -25
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/kernel/tool-timeout.d.ts +27 -0
- package/dist/kernel/tool-timeout.js +53 -0
- package/dist/kernel/tool-timeout.js.map +1 -0
- package/dist/kernel/types.d.ts +3 -0
- 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/custom-provider.d.ts +31 -0
- package/dist/providers/custom-provider.js +72 -0
- package/dist/providers/custom-provider.js.map +1 -0
- package/dist/providers/deepseek.js +1 -1
- package/dist/providers/deepseek.js.map +1 -1
- package/dist/providers/dispatch.d.ts +1 -1
- package/dist/providers/dispatch.js +25 -2
- package/dist/providers/dispatch.js.map +1 -1
- package/dist/providers/family-fallback.js +5 -0
- package/dist/providers/family-fallback.js.map +1 -1
- package/dist/providers/gemini.js +33 -3
- package/dist/providers/gemini.js.map +1 -1
- package/dist/providers/index.d.ts +16 -0
- package/dist/providers/index.js +43 -2
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/machine1.d.ts +30 -0
- package/dist/providers/machine1.js +341 -0
- package/dist/providers/machine1.js.map +1 -0
- package/dist/providers/nvidia.js +1 -1
- package/dist/providers/nvidia.js.map +1 -1
- package/dist/providers/openai-compat.d.ts +1 -0
- package/dist/providers/openai-compat.js +32 -9
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/providers/openrouter.js +5 -2
- package/dist/providers/openrouter.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/state/db-telemetry.js +11 -1
- package/dist/state/db-telemetry.js.map +1 -1
- package/dist/state/db.d.ts +7 -0
- package/dist/state/db.js +147 -3
- package/dist/state/db.js.map +1 -1
- package/dist/state/index.js +8 -4
- package/dist/state/index.js.map +1 -1
- package/dist/state/sync-index.d.ts +74 -0
- package/dist/state/sync-index.js +246 -0
- package/dist/state/sync-index.js.map +1 -0
- package/dist/state/transaction.d.ts +62 -0
- package/dist/state/transaction.js +65 -0
- package/dist/state/transaction.js.map +1 -0
- package/dist/state/vec.d.ts +28 -0
- package/dist/state/vec.js +113 -0
- package/dist/state/vec.js.map +1 -0
- 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 +94 -63
- 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/db-workspace-info.d.ts +10 -0
- package/dist/tools/db-workspace-info.js +76 -0
- package/dist/tools/db-workspace-info.js.map +1 -0
- package/dist/tools/diff.js +25 -21
- package/dist/tools/diff.js.map +1 -1
- package/dist/tools/exec.d.ts +6 -1
- package/dist/tools/exec.js +46 -4
- 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 +13 -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/graph-neighbors.d.ts +9 -0
- package/dist/tools/graph-neighbors.js +77 -0
- package/dist/tools/graph-neighbors.js.map +1 -0
- package/dist/tools/graph-traverse.d.ts +10 -0
- package/dist/tools/graph-traverse.js +90 -0
- package/dist/tools/graph-traverse.js.map +1 -0
- package/dist/tools/index.d.ts +10 -2
- package/dist/tools/index.js +17 -4
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/kb-search.d.ts +13 -0
- package/dist/tools/kb-search.js +113 -0
- package/dist/tools/kb-search.js.map +1 -0
- package/dist/tools/multimodal.js +30 -15
- package/dist/tools/multimodal.js.map +1 -1
- package/dist/tools/permission.js +5 -4
- package/dist/tools/permission.js.map +1 -1
- package/dist/tools/registry.d.ts +10 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/rtk.js +28 -9
- package/dist/tools/rtk.js.map +1 -1
- package/dist/tools/search-glob.d.ts +1 -1
- package/dist/tools/search-glob.js +46 -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 +178 -61
- package/dist/tools/shell.js.map +1 -1
- package/dist/tools/transactional-write.d.ts +10 -0
- package/dist/tools/transactional-write.js +132 -0
- package/dist/tools/transactional-write.js.map +1 -0
- package/dist/tui/approval.js +31 -3
- package/dist/tui/approval.js.map +1 -1
- package/dist/tui/ink/App.d.ts +2 -1
- package/dist/tui/ink/App.js +333 -79
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/DenseToolMessage.js +20 -3
- package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
- package/dist/tui/ink/components/InputBox.d.ts +4 -0
- package/dist/tui/ink/components/InputBox.js +38 -21
- package/dist/tui/ink/components/InputBox.js.map +1 -1
- package/dist/tui/ink/components/KeySetOverlay.d.ts +1 -1
- package/dist/tui/ink/components/KeySetOverlay.js +18 -16
- package/dist/tui/ink/components/KeySetOverlay.js.map +1 -1
- package/dist/tui/ink/components/Logo.d.ts +20 -0
- package/dist/tui/ink/components/Logo.js +67 -1
- package/dist/tui/ink/components/Logo.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/PasteCollapse.d.ts +3 -1
- package/dist/tui/ink/components/PasteCollapse.js +11 -9
- package/dist/tui/ink/components/PasteCollapse.js.map +1 -1
- package/dist/tui/ink/components/PromptQueueIndicator.js +1 -1
- package/dist/tui/ink/components/PromptQueueIndicator.js.map +1 -1
- package/dist/tui/ink/components/SandboxPicker.d.ts +18 -0
- package/dist/tui/ink/components/SandboxPicker.js +77 -0
- package/dist/tui/ink/components/SandboxPicker.js.map +1 -0
- 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.d.ts +3 -7
- package/dist/tui/ink/components/StatusBar.js +2 -11
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/components/ThinkingBlock.d.ts +15 -4
- package/dist/tui/ink/components/ThinkingBlock.js +34 -17
- package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
- package/dist/tui/ink/components/ToolBox.js +21 -13
- package/dist/tui/ink/components/ToolBox.js.map +1 -1
- package/dist/tui/ink/components/VirtualTranscript.d.ts +1 -1
- package/dist/tui/ink/components/VirtualTranscript.js +5 -3
- package/dist/tui/ink/components/VirtualTranscript.js.map +1 -1
- package/dist/tui/ink/index.js +36 -14
- package/dist/tui/ink/index.js.map +1 -1
- package/dist/tui/ink/ink-approval-bus.d.ts +2 -0
- package/dist/tui/ink/ink-approval-bus.js +10 -0
- package/dist/tui/ink/ink-approval-bus.js.map +1 -1
- package/dist/tui/ink/markdown/display.js +9 -2
- package/dist/tui/ink/markdown/display.js.map +1 -1
- package/dist/tui/ink/markdown/split-point.js +8 -13
- package/dist/tui/ink/markdown/split-point.js.map +1 -1
- package/dist/tui/ink/markdown/syntax-highlight.d.ts +13 -0
- package/dist/tui/ink/markdown/syntax-highlight.js +91 -0
- package/dist/tui/ink/markdown/syntax-highlight.js.map +1 -0
- package/dist/tui/ink/theme-context.js +6 -3
- package/dist/tui/ink/theme-context.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-elapsed.d.ts +9 -1
- package/dist/tui/ink/use-elapsed.js +17 -2
- package/dist/tui/ink/use-elapsed.js.map +1 -1
- package/dist/tui/ink/use-event-projection.d.ts +10 -0
- package/dist/tui/ink/use-event-projection.js +111 -12
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/dist/tui/ink/use-flicker-detector.js +9 -0
- package/dist/tui/ink/use-flicker-detector.js.map +1 -1
- package/dist/tui/ink/use-overlays.d.ts +2 -2
- package/dist/tui/ink/use-overlays.js +20 -17
- package/dist/tui/ink/use-overlays.js.map +1 -1
- package/dist/tui/ink/use-render-metrics.js +18 -5
- package/dist/tui/ink/use-render-metrics.js.map +1 -1
- package/dist/tui/ink/use-tool-progress.d.ts +7 -0
- package/dist/tui/ink/use-tool-progress.js +39 -0
- package/dist/tui/ink/use-tool-progress.js.map +1 -0
- package/dist/tui/ink/use-transcript-scroll.js +14 -6
- package/dist/tui/ink/use-transcript-scroll.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 +12 -8
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"db-workspace-info.js","sourceRoot":"","sources":["../../src/tools/db-workspace-info.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAUxC,MAAM,CAAC,MAAM,mBAAmB,GAAS;IACvC,IAAI,EAAE,mBAAmB;IACzB,WAAW,EACT,oEAAoE;QACpE,6DAA6D;QAC7D,gEAAgE;QAChE,gDAAgD;IAClD,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE;IAC/C,KAAK,CAAC,OAAO,CAAC,MAAe,EAAE,IAAI;QACjC,IAAI,EAA6B,CAAC;QAClC,IAAI,CAAC;YACH,EAAE,GAAG,MAAM,EAAE,CAAC;QAChB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,6BAA8B,GAAa,CAAC,OAAO,EAAE;gBAC9D,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;QAED,IAAI,UAAU,GAAkB,IAAI,CAAC;QACrC,IAAI,CAAC;YACH,UAAU,GAAI,EAAE,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC,GAAG,EAAoB,CAAC,CAAC,CAAC;QAClF,CAAC;QAAC,MAAM,CAAC;YACP,mCAAmC;QACrC,CAAC;QAED,MAAM,MAAM,GACV,EAAE;aACC,OAAO,CACN,gFAAgF,CACjF;aACA,GAAG,EACP,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAErB,MAAM,MAAM,GAA2B,EAAE,CAAC;QAC1C,KAAK,MAAM,CAAC,IAAI;YACd,UAAU;YACV,aAAa;YACb,aAAa;YACb,gBAAgB;SACjB,EAAE,CAAC;YACF,IAAI,CAAC;gBACH,MAAM,CAAC,CAAC,CAAC,GACP,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,EAAE,CAAC,CAAC,GAAG,EACjD,CAAC,CAAC,CAAC;YACN,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACjB,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAAI,EAAkC,CAAC,IAAI,CAAC;QACxD,MAAM,aAAa,GACjB,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC,GAAG,EAC/C,CAAC,CAAC,CAAC;QAEJ,MAAM,IAAI,GAAkB;YAC1B,MAAM;YACN,aAAa;YACb,UAAU;YACV,MAAM;YACN,MAAM;SACP,CAAC;QAEF,MAAM,KAAK,GAAG;YACZ,YAAY,MAAM,EAAE;YACpB,WAAW,aAAa,EAAE;YAC1B,QAAQ,UAAU,IAAI,wBAAwB,EAAE;YAChD,WAAW,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC9B,SAAS;YACT,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;SAC1D,CAAC;QAEF,OAAO;YACL,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;YACzB,IAAI;YACJ,OAAO,EAAE,KAAK;SACf,CAAC;IACJ,CAAC;CACF,CAAC"}
|
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
|
@@ -10,7 +10,8 @@
|
|
|
10
10
|
* progress push events back through the agent-loop event stream.
|
|
11
11
|
*/
|
|
12
12
|
import type { ToolExecutor } from "../kernel/types.js";
|
|
13
|
-
import type { ToolContext, ToolRegistry } from "./registry.js";
|
|
13
|
+
import type { ToolContext, ToolRegistry, SandboxMode } 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,9 @@ export interface ToolExecutorOptions {
|
|
|
19
20
|
sessionId: string;
|
|
20
21
|
log?: ToolContext["log"];
|
|
21
22
|
onProgress?: (toolId: string, message: string) => void;
|
|
23
|
+
permission?: PermissionEngine;
|
|
24
|
+
/** User-selected sandbox mode (config + /sandbox slash command).
|
|
25
|
+
* Defaults to "off" when omitted (backwards compatible). */
|
|
26
|
+
sandboxMode?: SandboxMode;
|
|
22
27
|
}
|
|
23
28
|
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,
|
|
@@ -39,6 +52,7 @@ export function createToolExecutor(opts) {
|
|
|
39
52
|
sessionId: opts.sessionId,
|
|
40
53
|
signal,
|
|
41
54
|
sandbox,
|
|
55
|
+
sandboxMode: opts.sandboxMode ?? "off",
|
|
42
56
|
log: opts.log,
|
|
43
57
|
onProgress: opts.onProgress
|
|
44
58
|
? (msg) => opts.onProgress(call.id, msg)
|
|
@@ -57,10 +71,38 @@ export function createToolExecutor(opts) {
|
|
|
57
71
|
async function runTool(tool, input, ctx) {
|
|
58
72
|
const started = Date.now();
|
|
59
73
|
const deadlineMs = tool.timeoutMs ?? 0;
|
|
74
|
+
// Race tool.execute against ctx.signal so ESC aborts immediately
|
|
75
|
+
// instead of waiting for tool completion. Tolerate legacy callers
|
|
76
|
+
// and test harnesses that pass a ctx without a signal — the abort
|
|
77
|
+
// race is then a never-resolving promise that simply waits for the
|
|
78
|
+
// tool/timeout to settle, identical to pre-fix behaviour for those
|
|
79
|
+
// callers. The real agent loop always passes a signal so the abort
|
|
80
|
+
// behaviour is preserved end-to-end.
|
|
81
|
+
const abortPromise = ctx.signal
|
|
82
|
+
? new Promise((resolve) => {
|
|
83
|
+
if (ctx.signal.aborted) {
|
|
84
|
+
resolve({
|
|
85
|
+
content: `Tool "${tool.name}" aborted before start.`,
|
|
86
|
+
isError: true,
|
|
87
|
+
});
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
ctx.signal.addEventListener("abort", () => {
|
|
91
|
+
resolve({
|
|
92
|
+
content: `Tool "${tool.name}" aborted by user (signal).`,
|
|
93
|
+
isError: true,
|
|
94
|
+
durationMs: Date.now() - started,
|
|
95
|
+
});
|
|
96
|
+
}, { once: true });
|
|
97
|
+
})
|
|
98
|
+
: new Promise(() => {
|
|
99
|
+
/* never resolves — caller passed no AbortSignal */
|
|
100
|
+
});
|
|
60
101
|
let result;
|
|
61
102
|
if (deadlineMs > 0) {
|
|
62
103
|
result = await Promise.race([
|
|
63
104
|
tool.execute(input, ctx),
|
|
105
|
+
abortPromise,
|
|
64
106
|
new Promise((resolve) => {
|
|
65
107
|
const timer = setTimeout(() => {
|
|
66
108
|
resolve({
|
|
@@ -69,14 +111,14 @@ async function runTool(tool, input, ctx) {
|
|
|
69
111
|
durationMs: deadlineMs,
|
|
70
112
|
});
|
|
71
113
|
}, deadlineMs);
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
114
|
+
ctx.signal?.addEventListener("abort", () => clearTimeout(timer), {
|
|
115
|
+
once: true,
|
|
116
|
+
});
|
|
75
117
|
}),
|
|
76
118
|
]);
|
|
77
119
|
}
|
|
78
120
|
else {
|
|
79
|
-
result = await tool.execute(input, ctx);
|
|
121
|
+
result = await Promise.race([tool.execute(input, ctx), abortPromise]);
|
|
80
122
|
}
|
|
81
123
|
result.durationMs = result.durationMs ?? Date.now() - started;
|
|
82
124
|
return result;
|
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
|
};
|