@open-multi-agent/core 1.4.2 → 1.6.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/README.md +135 -79
- package/dist/agent/agent.d.ts.map +1 -1
- package/dist/agent/agent.js +5 -0
- package/dist/agent/agent.js.map +1 -1
- package/dist/agent/runner.d.ts +12 -0
- package/dist/agent/runner.d.ts.map +1 -1
- package/dist/agent/runner.js +48 -12
- package/dist/agent/runner.js.map +1 -1
- package/dist/cli/oma.d.ts +10 -2
- package/dist/cli/oma.d.ts.map +1 -1
- package/dist/cli/oma.js +12 -5
- package/dist/cli/oma.js.map +1 -1
- package/dist/dashboard/render-team-run-dashboard.d.ts.map +1 -1
- package/dist/dashboard/render-team-run-dashboard.js +177 -84
- package/dist/dashboard/render-team-run-dashboard.js.map +1 -1
- package/dist/errors.d.ts +10 -0
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +13 -0
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/llm/adapter.d.ts +5 -1
- package/dist/llm/adapter.d.ts.map +1 -1
- package/dist/llm/adapter.js +16 -0
- package/dist/llm/adapter.js.map +1 -1
- package/dist/llm/ai-sdk.d.ts +2 -1
- package/dist/llm/ai-sdk.d.ts.map +1 -1
- package/dist/llm/ai-sdk.js +48 -13
- package/dist/llm/ai-sdk.js.map +1 -1
- package/dist/llm/anthropic.d.ts.map +1 -1
- package/dist/llm/anthropic.js +27 -13
- package/dist/llm/anthropic.js.map +1 -1
- package/dist/llm/azure-openai.d.ts.map +1 -1
- package/dist/llm/azure-openai.js +5 -2
- package/dist/llm/azure-openai.js.map +1 -1
- package/dist/llm/bedrock.d.ts.map +1 -1
- package/dist/llm/bedrock.js +32 -19
- package/dist/llm/bedrock.js.map +1 -1
- package/dist/llm/copilot.d.ts.map +1 -1
- package/dist/llm/copilot.js +5 -2
- package/dist/llm/copilot.js.map +1 -1
- package/dist/llm/deepseek.d.ts +9 -2
- package/dist/llm/deepseek.d.ts.map +1 -1
- package/dist/llm/deepseek.js +21 -2
- package/dist/llm/deepseek.js.map +1 -1
- package/dist/llm/doubao.d.ts +21 -0
- package/dist/llm/doubao.d.ts.map +1 -0
- package/dist/llm/doubao.js +24 -0
- package/dist/llm/doubao.js.map +1 -0
- package/dist/llm/gemini.d.ts.map +1 -1
- package/dist/llm/gemini.js +35 -18
- package/dist/llm/gemini.js.map +1 -1
- package/dist/llm/hunyuan.d.ts +40 -0
- package/dist/llm/hunyuan.d.ts.map +1 -0
- package/dist/llm/hunyuan.js +59 -0
- package/dist/llm/hunyuan.js.map +1 -0
- package/dist/llm/mimo.d.ts +24 -0
- package/dist/llm/mimo.d.ts.map +1 -0
- package/dist/llm/mimo.js +30 -0
- package/dist/llm/mimo.js.map +1 -0
- package/dist/llm/openai-common.d.ts +10 -17
- package/dist/llm/openai-common.d.ts.map +1 -1
- package/dist/llm/openai-common.js +92 -43
- package/dist/llm/openai-common.js.map +1 -1
- package/dist/llm/openai.d.ts +22 -1
- package/dist/llm/openai.d.ts.map +1 -1
- package/dist/llm/openai.js +51 -7
- package/dist/llm/openai.js.map +1 -1
- package/dist/llm/reasoning-fallback.d.ts +80 -15
- package/dist/llm/reasoning-fallback.d.ts.map +1 -1
- package/dist/llm/reasoning-fallback.js +45 -12
- package/dist/llm/reasoning-fallback.js.map +1 -1
- package/dist/llm/validate.d.ts +26 -0
- package/dist/llm/validate.d.ts.map +1 -0
- package/dist/llm/validate.js +55 -0
- package/dist/llm/validate.js.map +1 -0
- package/dist/memory/shared.d.ts +14 -7
- package/dist/memory/shared.d.ts.map +1 -1
- package/dist/memory/shared.js +97 -14
- package/dist/memory/shared.js.map +1 -1
- package/dist/orchestrator/orchestrator.d.ts +22 -1
- package/dist/orchestrator/orchestrator.d.ts.map +1 -1
- package/dist/orchestrator/orchestrator.js +155 -32
- package/dist/orchestrator/orchestrator.js.map +1 -1
- package/dist/tool/built-in/bash.d.ts +1 -1
- package/dist/tool/built-in/bash.d.ts.map +1 -1
- package/dist/tool/built-in/bash.js +60 -7
- package/dist/tool/built-in/bash.js.map +1 -1
- package/dist/tool/built-in/file-edit.d.ts.map +1 -1
- package/dist/tool/built-in/file-edit.js +13 -8
- package/dist/tool/built-in/file-edit.js.map +1 -1
- package/dist/tool/built-in/file-read.d.ts.map +1 -1
- package/dist/tool/built-in/file-read.js +9 -4
- package/dist/tool/built-in/file-read.js.map +1 -1
- package/dist/tool/built-in/file-write.d.ts.map +1 -1
- package/dist/tool/built-in/file-write.js +11 -6
- package/dist/tool/built-in/file-write.js.map +1 -1
- package/dist/tool/built-in/fs-walk.d.ts.map +1 -1
- package/dist/tool/built-in/fs-walk.js +6 -3
- package/dist/tool/built-in/fs-walk.js.map +1 -1
- package/dist/tool/built-in/glob.d.ts.map +1 -1
- package/dist/tool/built-in/glob.js +10 -4
- package/dist/tool/built-in/glob.js.map +1 -1
- package/dist/tool/built-in/grep.d.ts.map +1 -1
- package/dist/tool/built-in/grep.js +15 -6
- package/dist/tool/built-in/grep.js.map +1 -1
- package/dist/tool/built-in/path-safety.d.ts +30 -0
- package/dist/tool/built-in/path-safety.d.ts.map +1 -0
- package/dist/tool/built-in/path-safety.js +106 -0
- package/dist/tool/built-in/path-safety.js.map +1 -0
- package/dist/tool/mcp.d.ts.map +1 -1
- package/dist/tool/mcp.js +58 -33
- package/dist/tool/mcp.js.map +1 -1
- package/dist/types.d.ts +151 -5
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/redaction.d.ts +4 -0
- package/dist/utils/redaction.d.ts.map +1 -0
- package/dist/utils/redaction.js +78 -0
- package/dist/utils/redaction.js.map +1 -0
- package/package.json +7 -4
- package/docs/DECISIONS.md +0 -49
- package/docs/cli.md +0 -265
- package/docs/context-management.md +0 -64
- package/docs/featured-partner.md +0 -28
- package/docs/observability.md +0 -56
- package/docs/providers/minimax.md +0 -75
- package/docs/providers.md +0 -80
- package/docs/shared-memory.md +0 -27
- package/docs/tool-configuration.md +0 -152
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bash.js","sourceRoot":"","sources":["../../../src/tool/built-in/bash.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"bash.js","sourceRoot":"","sources":["../../../src/tool/built-in/bash.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAqB,MAAM,eAAe,CAAA;AACxD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE/E,8EAA8E;AAC9E,YAAY;AACZ,8EAA8E;AAE9E,MAAM,kBAAkB,GAAG,MAAM,CAAA;AACjC,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC;IACjC,MAAM;IACN,MAAM;IACN,QAAQ;IACR,SAAS;IACT,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;IACN,KAAK;IACL,QAAQ;IACR,MAAM;CACP,CAAC,CAAA;AAEF,8EAA8E;AAC9E,kBAAkB;AAClB,8EAA8E;AAE9E,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC;IACjC,IAAI,EAAE,MAAM;IACZ,WAAW,EACT,2DAA2D;QAC3D,6EAA6E;QAC7E,2CAA2C;QAC3C,yDAAyD;QACzD,yDAAyD;IAE3D,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC;QACpB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,8BAA8B,CAAC;QAC5D,OAAO,EAAE,CAAC;aACP,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,CACP,iEAAiE;YAC/D,eAAe,kBAAkB,MAAM,CAC1C;QACH,GAAG,EAAE,CAAC;aACH,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,CAAC,gDAAgD,CAAC;KAC9D,CAAC;IAEF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QAChC,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,IAAI,kBAAkB,CAAA;QAErD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,UAAU,CACnD,KAAK,CAAC,OAAO,EACb,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,EAC7B,OAAO,CAAC,WAAW,CACpB,CAAA;QAED,MAAM,QAAQ,GAAG,mBAAmB,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAA;QAC3E,MAAM,OAAO,GAAG,QAAQ,KAAK,CAAC,CAAA;QAE9B,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,OAAO;SACR,CAAA;IACH,CAAC;CACF,CAAC,CAAA;AAiBF;;;GAGG;AACH,SAAS,UAAU,CACjB,OAAe,EACf,OAAmB,EACnB,MAA+B;IAE/B,OAAO,IAAI,OAAO,CAAY,CAAC,OAAO,EAAE,EAAE;QACxC,MAAM,YAAY,GAAa,EAAE,CAAA;QACjC,MAAM,YAAY,GAAa,EAAE,CAAA;QAEjC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE;YAC3C,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,QAAQ,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;YACtC,GAAG,EAAE,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC;YACnC,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;SAClC,CAAC,CAAA;QAEF,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QACpE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QAEpE,IAAI,QAAQ,GAAG,KAAK,CAAA;QACpB,IAAI,OAAO,GAAG,KAAK,CAAA;QACnB,IAAI,OAAO,GAAG,KAAK,CAAA;QAEnB,MAAM,IAAI,GAAG,CAAC,QAAgB,EAAQ,EAAE;YACtC,IAAI,OAAO;gBAAE,OAAM;YACnB,OAAO,GAAG,IAAI,CAAA;YACd,YAAY,CAAC,KAAK,CAAC,CAAA;YACnB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC9C,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAC3D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAE3D,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAA;QACvC,CAAC,CAAA;QAED,iEAAiE;QACjE,2DAA2D;QAC3D,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,QAAQ,GAAG,IAAI,CAAA;YACf,eAAe,CAAC,KAAK,CAAC,CAAA;QACxB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;QAErB,oEAAoE;QACpE,MAAM,OAAO,GAAG,GAAS,EAAE;YACzB,OAAO,GAAG,IAAI,CAAA;YACd,eAAe,CAAC,KAAK,CAAC,CAAA;QACxB,CAAC,CAAA;QAED,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QAC3D,CAAC;QAED,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAmB,EAAE,EAAE;YACxC,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAC7D,IAAI,CAAC,QAAQ,CAAC,CAAA;QAChB,CAAC,CAAC,CAAA;QAEF,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;YAC/B,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,GAAG,IAAI,CAAA;gBACd,YAAY,CAAC,KAAK,CAAC,CAAA;gBACnB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;oBACzB,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;gBAC9C,CAAC;gBACD,OAAO,CAAC;oBACN,MAAM,EAAE,EAAE;oBACV,MAAM,EAAE,GAAG,CAAC,OAAO;oBACnB,QAAQ,EAAE,GAAG;iBACd,CAAC,CAAA;YACJ,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,eAAe,CAAC,KAAmB;IAC1C,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAC5D,IAAI,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;YACnC,OAAM;QACR,CAAC;QAAC,MAAM,CAAC;YACP,oEAAoE;YACpE,iCAAiC;QACnC,CAAC;IACH,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;AACvB,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAsB;IAC/C,MAAM,OAAO,GAAsB,EAAE,CAAA;IACrC,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAChD,IAAI,KAAK,KAAK,SAAS;YAAE,SAAQ;QACjC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,SAAQ;QAC3C,IAAI,eAAe,CAAC,IAAI,CAAC;YAAE,SAAQ;QACnC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;IACvB,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAED;;;;GAIG;AACH,SAAS,WAAW,CAAC,MAAc,EAAE,MAAc,EAAE,QAAgB;IACnE,MAAM,KAAK,GAAa,EAAE,CAAA;IAE1B,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACpB,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,KAAK,CAAC,IAAI,CACR,MAAM,CAAC,MAAM,GAAG,CAAC;YACf,CAAC,CAAC,mBAAmB,MAAM,EAAE;YAC7B,CAAC,CAAC,MAAM,CACX,CAAA;IACH,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,QAAQ,KAAK,CAAC;YACnB,CAAC,CAAC,oCAAoC;YACtC,CAAC,CAAC,6BAA6B,QAAQ,cAAc,CAAA;IACzD,CAAC;IAED,IAAI,QAAQ,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvC,KAAK,CAAC,IAAI,CAAC,iBAAiB,QAAQ,GAAG,CAAC,CAAA;IAC1C,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACzB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-edit.d.ts","sourceRoot":"","sources":["../../../src/tool/built-in/file-edit.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"file-edit.d.ts","sourceRoot":"","sources":["../../../src/tool/built-in/file-edit.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAWH,eAAO,MAAM,YAAY;;;;;EAoGvB,CAAA"}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
import { readFile, writeFile } from 'fs/promises';
|
|
9
9
|
import { z } from 'zod';
|
|
10
10
|
import { defineTool } from '../framework.js';
|
|
11
|
+
import { resolvePathWithinCwd } from './path-safety.js';
|
|
11
12
|
// ---------------------------------------------------------------------------
|
|
12
13
|
// Tool definition
|
|
13
14
|
// ---------------------------------------------------------------------------
|
|
@@ -35,24 +36,28 @@ export const fileEditTool = defineTool({
|
|
|
35
36
|
.describe('When true, replace every occurrence of `old_string` instead of requiring it ' +
|
|
36
37
|
'to be unique. Defaults to false.'),
|
|
37
38
|
}),
|
|
38
|
-
execute: async (input) => {
|
|
39
|
+
execute: async (input, context) => {
|
|
40
|
+
const safePath = await resolvePathWithinCwd(input.path, context);
|
|
41
|
+
if (!safePath.ok) {
|
|
42
|
+
return { data: safePath.error, isError: true };
|
|
43
|
+
}
|
|
39
44
|
// Read the existing file.
|
|
40
45
|
let original;
|
|
41
46
|
try {
|
|
42
|
-
const buffer = await readFile(
|
|
47
|
+
const buffer = await readFile(safePath.path);
|
|
43
48
|
original = buffer.toString('utf8');
|
|
44
49
|
}
|
|
45
50
|
catch (err) {
|
|
46
51
|
const message = err instanceof Error ? err.message : 'Unknown error reading file.';
|
|
47
52
|
return {
|
|
48
|
-
data: `Could not read "${
|
|
53
|
+
data: `Could not read "${safePath.path}": ${message}`,
|
|
49
54
|
isError: true,
|
|
50
55
|
};
|
|
51
56
|
}
|
|
52
57
|
const occurrences = countOccurrences(original, input.old_string);
|
|
53
58
|
if (occurrences === 0) {
|
|
54
59
|
return {
|
|
55
|
-
data: `The string to replace was not found in "${
|
|
60
|
+
data: `The string to replace was not found in "${safePath.path}".\n` +
|
|
56
61
|
'Make sure `old_string` matches the file contents exactly, ' +
|
|
57
62
|
'including indentation and line endings.',
|
|
58
63
|
isError: true,
|
|
@@ -61,7 +66,7 @@ export const fileEditTool = defineTool({
|
|
|
61
66
|
const replaceAll = input.replace_all ?? false;
|
|
62
67
|
if (occurrences > 1 && !replaceAll) {
|
|
63
68
|
return {
|
|
64
|
-
data: `\`old_string\` appears ${occurrences} times in "${
|
|
69
|
+
data: `\`old_string\` appears ${occurrences} times in "${safePath.path}". ` +
|
|
65
70
|
'Provide a more specific string to uniquely identify the section you want ' +
|
|
66
71
|
'to replace, or set `replace_all: true` to replace every occurrence.',
|
|
67
72
|
isError: true,
|
|
@@ -73,19 +78,19 @@ export const fileEditTool = defineTool({
|
|
|
73
78
|
: original.replace(input.old_string, input.new_string);
|
|
74
79
|
// Persist the result.
|
|
75
80
|
try {
|
|
76
|
-
await writeFile(
|
|
81
|
+
await writeFile(safePath.path, updated, 'utf8');
|
|
77
82
|
}
|
|
78
83
|
catch (err) {
|
|
79
84
|
const message = err instanceof Error ? err.message : 'Unknown error writing file.';
|
|
80
85
|
return {
|
|
81
|
-
data: `Failed to write "${
|
|
86
|
+
data: `Failed to write "${safePath.path}": ${message}`,
|
|
82
87
|
isError: true,
|
|
83
88
|
};
|
|
84
89
|
}
|
|
85
90
|
const replacedCount = replaceAll ? occurrences : 1;
|
|
86
91
|
return {
|
|
87
92
|
data: `Replaced ${replacedCount} occurrence${replacedCount === 1 ? '' : 's'} ` +
|
|
88
|
-
`in "${
|
|
93
|
+
`in "${safePath.path}".`,
|
|
89
94
|
isError: false,
|
|
90
95
|
};
|
|
91
96
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-edit.js","sourceRoot":"","sources":["../../../src/tool/built-in/file-edit.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"file-edit.js","sourceRoot":"","sources":["../../../src/tool/built-in/file-edit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-read.d.ts","sourceRoot":"","sources":["../../../src/tool/built-in/file-read.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"file-read.d.ts","sourceRoot":"","sources":["../../../src/tool/built-in/file-read.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAWH,eAAO,MAAM,YAAY;;;;EA8FvB,CAAA"}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
import { readFile } from 'fs/promises';
|
|
8
8
|
import { z } from 'zod';
|
|
9
9
|
import { defineTool } from '../framework.js';
|
|
10
|
+
import { resolvePathWithinCwd } from './path-safety.js';
|
|
10
11
|
// ---------------------------------------------------------------------------
|
|
11
12
|
// Tool definition
|
|
12
13
|
// ---------------------------------------------------------------------------
|
|
@@ -33,16 +34,20 @@ export const fileReadTool = defineTool({
|
|
|
33
34
|
.describe('Maximum number of lines to return. ' +
|
|
34
35
|
'When omitted all lines from `offset` to the end of the file are returned.'),
|
|
35
36
|
}),
|
|
36
|
-
execute: async (input) => {
|
|
37
|
+
execute: async (input, context) => {
|
|
38
|
+
const safePath = await resolvePathWithinCwd(input.path, context);
|
|
39
|
+
if (!safePath.ok) {
|
|
40
|
+
return { data: safePath.error, isError: true };
|
|
41
|
+
}
|
|
37
42
|
let raw;
|
|
38
43
|
try {
|
|
39
|
-
const buffer = await readFile(
|
|
44
|
+
const buffer = await readFile(safePath.path);
|
|
40
45
|
raw = buffer.toString('utf8');
|
|
41
46
|
}
|
|
42
47
|
catch (err) {
|
|
43
48
|
const message = err instanceof Error ? err.message : 'Unknown error reading file.';
|
|
44
49
|
return {
|
|
45
|
-
data: `Could not read file "${
|
|
50
|
+
data: `Could not read file "${safePath.path}": ${message}`,
|
|
46
51
|
isError: true,
|
|
47
52
|
};
|
|
48
53
|
}
|
|
@@ -57,7 +62,7 @@ export const fileReadTool = defineTool({
|
|
|
57
62
|
const startIndex = input.offset !== undefined ? Math.max(0, input.offset - 1) : 0;
|
|
58
63
|
if (startIndex >= totalLines && totalLines > 0) {
|
|
59
64
|
return {
|
|
60
|
-
data: `File "${
|
|
65
|
+
data: `File "${safePath.path}" has ${totalLines} line${totalLines === 1 ? '' : 's'} ` +
|
|
61
66
|
`but offset ${input.offset} is beyond the end.`,
|
|
62
67
|
isError: true,
|
|
63
68
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-read.js","sourceRoot":"","sources":["../../../src/tool/built-in/file-read.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"file-read.js","sourceRoot":"","sources":["../../../src/tool/built-in/file-read.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-write.d.ts","sourceRoot":"","sources":["../../../src/tool/built-in/file-write.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"file-write.d.ts","sourceRoot":"","sources":["../../../src/tool/built-in/file-write.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAYH,eAAO,MAAM,aAAa;;;EAqExB,CAAA"}
|
|
@@ -8,6 +8,7 @@ import { mkdir, stat, writeFile } from 'fs/promises';
|
|
|
8
8
|
import { dirname } from 'path';
|
|
9
9
|
import { z } from 'zod';
|
|
10
10
|
import { defineTool } from '../framework.js';
|
|
11
|
+
import { resolvePathWithinCwd } from './path-safety.js';
|
|
11
12
|
// ---------------------------------------------------------------------------
|
|
12
13
|
// Tool definition
|
|
13
14
|
// ---------------------------------------------------------------------------
|
|
@@ -24,18 +25,22 @@ export const fileWriteTool = defineTool({
|
|
|
24
25
|
'The path must be absolute (starting with /).'),
|
|
25
26
|
content: z.string().describe('The full content to write to the file.'),
|
|
26
27
|
}),
|
|
27
|
-
execute: async (input) => {
|
|
28
|
+
execute: async (input, context) => {
|
|
29
|
+
const safePath = await resolvePathWithinCwd(input.path, context, { ensureRoot: true });
|
|
30
|
+
if (!safePath.ok) {
|
|
31
|
+
return { data: safePath.error, isError: true };
|
|
32
|
+
}
|
|
28
33
|
// Determine whether the file already exists so we can report create vs update.
|
|
29
34
|
let existed = false;
|
|
30
35
|
try {
|
|
31
|
-
await stat(
|
|
36
|
+
await stat(safePath.path);
|
|
32
37
|
existed = true;
|
|
33
38
|
}
|
|
34
39
|
catch {
|
|
35
40
|
// File does not exist — will be created.
|
|
36
41
|
}
|
|
37
42
|
// Ensure parent directory hierarchy exists.
|
|
38
|
-
const parentDir = dirname(
|
|
43
|
+
const parentDir = dirname(safePath.path);
|
|
39
44
|
try {
|
|
40
45
|
await mkdir(parentDir, { recursive: true });
|
|
41
46
|
}
|
|
@@ -48,12 +53,12 @@ export const fileWriteTool = defineTool({
|
|
|
48
53
|
}
|
|
49
54
|
// Write the file.
|
|
50
55
|
try {
|
|
51
|
-
await writeFile(
|
|
56
|
+
await writeFile(safePath.path, input.content, 'utf8');
|
|
52
57
|
}
|
|
53
58
|
catch (err) {
|
|
54
59
|
const message = err instanceof Error ? err.message : 'Unknown error writing file.';
|
|
55
60
|
return {
|
|
56
|
-
data: `Failed to write file "${
|
|
61
|
+
data: `Failed to write file "${safePath.path}": ${message}`,
|
|
57
62
|
isError: true,
|
|
58
63
|
};
|
|
59
64
|
}
|
|
@@ -61,7 +66,7 @@ export const fileWriteTool = defineTool({
|
|
|
61
66
|
const byteCount = Buffer.byteLength(input.content, 'utf8');
|
|
62
67
|
const action = existed ? 'Updated' : 'Created';
|
|
63
68
|
return {
|
|
64
|
-
data: `${action} "${
|
|
69
|
+
data: `${action} "${safePath.path}" ` +
|
|
65
70
|
`(${lineCount} line${lineCount === 1 ? '' : 's'}, ${byteCount} bytes).`,
|
|
66
71
|
isError: false,
|
|
67
72
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-write.js","sourceRoot":"","sources":["../../../src/tool/built-in/file-write.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAC9B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"file-write.js","sourceRoot":"","sources":["../../../src/tool/built-in/file-write.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-walk.d.ts","sourceRoot":"","sources":["../../../src/tool/built-in/fs-walk.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,4EAA4E;AAC5E,eAAO,MAAM,SAAS,aAQpB,CAAA;AAEF,MAAM,WAAW,mBAAmB;IAClC,mEAAmE;IACnE,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAC3B;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,MAAM,EAAE,CAAC,CAInB;
|
|
1
|
+
{"version":3,"file":"fs-walk.d.ts","sourceRoot":"","sources":["../../../src/tool/built-in/fs-walk.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,4EAA4E;AAC5E,eAAO,MAAM,SAAS,aAQpB,CAAA;AAEF,MAAM,WAAW,mBAAmB;IAClC,mEAAmE;IACnE,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAC3B;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,OAAO,CAAC,EAAE,mBAAmB,GAC5B,OAAO,CAAC,MAAM,EAAE,CAAC,CAInB;AA6CD;;;EAGE;AAGF,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAQnE"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Used by {@link grepTool} and {@link globTool} so glob filtering and skip
|
|
5
5
|
* rules stay consistent.
|
|
6
6
|
*/
|
|
7
|
-
import {
|
|
7
|
+
import { lstat, readdir } from 'fs/promises';
|
|
8
8
|
import { join } from 'path';
|
|
9
9
|
/** Directories that are almost never useful to traverse for code search. */
|
|
10
10
|
export const SKIP_DIRS = new Set([
|
|
@@ -45,12 +45,15 @@ async function walk(dir, glob, results, signal, maxFiles) {
|
|
|
45
45
|
const fullPath = join(dir, entryName);
|
|
46
46
|
let entryInfo;
|
|
47
47
|
try {
|
|
48
|
-
entryInfo = await
|
|
48
|
+
entryInfo = await lstat(fullPath);
|
|
49
49
|
}
|
|
50
50
|
catch {
|
|
51
51
|
continue;
|
|
52
52
|
}
|
|
53
|
-
if (entryInfo.
|
|
53
|
+
if (entryInfo.isSymbolicLink()) {
|
|
54
|
+
continue;
|
|
55
|
+
}
|
|
56
|
+
else if (entryInfo.isDirectory()) {
|
|
54
57
|
if (!SKIP_DIRS.has(entryName)) {
|
|
55
58
|
await walk(fullPath, glob, results, signal, maxFiles);
|
|
56
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-walk.js","sourceRoot":"","sources":["../../../src/tool/built-in/fs-walk.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"fs-walk.js","sourceRoot":"","sources":["../../../src/tool/built-in/fs-walk.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glob.d.ts","sourceRoot":"","sources":["../../../src/tool/built-in/glob.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"glob.d.ts","sourceRoot":"","sources":["../../../src/tool/built-in/glob.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAYH,eAAO,MAAM,QAAQ;;;;EAwFnB,CAAA"}
|
|
@@ -9,6 +9,7 @@ import { basename, relative } from 'path';
|
|
|
9
9
|
import { z } from 'zod';
|
|
10
10
|
import { collectFiles, matchesGlob } from './fs-walk.js';
|
|
11
11
|
import { defineTool } from '../framework.js';
|
|
12
|
+
import { defaultWorkspaceDir, resolvePathWithinCwd } from './path-safety.js';
|
|
12
13
|
const DEFAULT_MAX_FILES = 500;
|
|
13
14
|
export const globTool = defineTool({
|
|
14
15
|
name: 'glob',
|
|
@@ -21,7 +22,7 @@ export const globTool = defineTool({
|
|
|
21
22
|
path: z
|
|
22
23
|
.string()
|
|
23
24
|
.optional()
|
|
24
|
-
.describe('
|
|
25
|
+
.describe('Absolute directory or file path to list. Defaults to the tool working directory.'),
|
|
25
26
|
pattern: z
|
|
26
27
|
.string()
|
|
27
28
|
.optional()
|
|
@@ -35,7 +36,12 @@ export const globTool = defineTool({
|
|
|
35
36
|
.describe(`Maximum number of file paths to return. Defaults to ${DEFAULT_MAX_FILES}.`),
|
|
36
37
|
}),
|
|
37
38
|
execute: async (input, context) => {
|
|
38
|
-
const
|
|
39
|
+
const requestedRoot = input.path ?? context.cwd ?? defaultWorkspaceDir();
|
|
40
|
+
const safeRoot = await resolvePathWithinCwd(requestedRoot, context);
|
|
41
|
+
if (!safeRoot.ok) {
|
|
42
|
+
return { data: safeRoot.error, isError: true };
|
|
43
|
+
}
|
|
44
|
+
const root = safeRoot.path;
|
|
39
45
|
const maxFiles = input.maxFiles ?? DEFAULT_MAX_FILES;
|
|
40
46
|
const signal = context.abortSignal;
|
|
41
47
|
let linesOut;
|
|
@@ -48,7 +54,7 @@ export const globTool = defineTool({
|
|
|
48
54
|
!matchesGlob(name, input.pattern)) {
|
|
49
55
|
return { data: 'No files matched.', isError: false };
|
|
50
56
|
}
|
|
51
|
-
linesOut = [relative(
|
|
57
|
+
linesOut = [relative(safeRoot.root, root) || root];
|
|
52
58
|
}
|
|
53
59
|
else {
|
|
54
60
|
const collected = await collectFiles(root, input.pattern, signal, {
|
|
@@ -56,7 +62,7 @@ export const globTool = defineTool({
|
|
|
56
62
|
});
|
|
57
63
|
truncated = collected.length > maxFiles;
|
|
58
64
|
const capped = collected.slice(0, maxFiles);
|
|
59
|
-
linesOut = capped.map((f) => relative(
|
|
65
|
+
linesOut = capped.map((f) => relative(safeRoot.root, f) || f);
|
|
60
66
|
}
|
|
61
67
|
}
|
|
62
68
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glob.js","sourceRoot":"","sources":["../../../src/tool/built-in/glob.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"glob.js","sourceRoot":"","sources":["../../../src/tool/built-in/glob.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grep.d.ts","sourceRoot":"","sources":["../../../src/tool/built-in/grep.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"grep.d.ts","sourceRoot":"","sources":["../../../src/tool/built-in/grep.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAqBH,eAAO,MAAM,QAAQ;;;;;EAgFnB,CAAA"}
|
|
@@ -12,6 +12,7 @@ import { relative } from 'path';
|
|
|
12
12
|
import { z } from 'zod';
|
|
13
13
|
import { defineTool } from '../framework.js';
|
|
14
14
|
import { collectFiles } from './fs-walk.js';
|
|
15
|
+
import { defaultWorkspaceDir, resolvePathWithinCwd } from './path-safety.js';
|
|
15
16
|
// ---------------------------------------------------------------------------
|
|
16
17
|
// Constants
|
|
17
18
|
// ---------------------------------------------------------------------------
|
|
@@ -34,8 +35,8 @@ export const grepTool = defineTool({
|
|
|
34
35
|
path: z
|
|
35
36
|
.string()
|
|
36
37
|
.optional()
|
|
37
|
-
.describe('
|
|
38
|
-
'Defaults to the
|
|
38
|
+
.describe('Absolute directory or file path to search in. ' +
|
|
39
|
+
'Defaults to the tool working directory.'),
|
|
39
40
|
glob: z
|
|
40
41
|
.string()
|
|
41
42
|
.optional()
|
|
@@ -51,7 +52,12 @@ export const grepTool = defineTool({
|
|
|
51
52
|
`Defaults to ${DEFAULT_MAX_RESULTS}.`),
|
|
52
53
|
}),
|
|
53
54
|
execute: async (input, context) => {
|
|
54
|
-
const
|
|
55
|
+
const requestedPath = input.path ?? context.cwd ?? defaultWorkspaceDir();
|
|
56
|
+
const safePath = await resolvePathWithinCwd(requestedPath, context);
|
|
57
|
+
if (!safePath.ok) {
|
|
58
|
+
return { data: safePath.error, isError: true };
|
|
59
|
+
}
|
|
60
|
+
const searchPath = safePath.path;
|
|
55
61
|
const maxResults = input.maxResults ?? DEFAULT_MAX_RESULTS;
|
|
56
62
|
// Compile the regex once and surface bad patterns immediately.
|
|
57
63
|
let regex;
|
|
@@ -70,6 +76,7 @@ export const grepTool = defineTool({
|
|
|
70
76
|
return runRipgrep(input.pattern, searchPath, {
|
|
71
77
|
glob: input.glob,
|
|
72
78
|
maxResults,
|
|
79
|
+
root: safePath.root,
|
|
73
80
|
signal: context.abortSignal,
|
|
74
81
|
});
|
|
75
82
|
}
|
|
@@ -77,6 +84,7 @@ export const grepTool = defineTool({
|
|
|
77
84
|
return runNodeSearch(regex, searchPath, {
|
|
78
85
|
glob: input.glob,
|
|
79
86
|
maxResults,
|
|
87
|
+
root: safePath.root,
|
|
80
88
|
signal: context.abortSignal,
|
|
81
89
|
});
|
|
82
90
|
},
|
|
@@ -91,11 +99,12 @@ async function runRipgrep(pattern, searchPath, options) {
|
|
|
91
99
|
if (options.glob !== undefined) {
|
|
92
100
|
args.push('--glob', options.glob);
|
|
93
101
|
}
|
|
94
|
-
|
|
102
|
+
const targetPath = relative(options.root, searchPath) || '.';
|
|
103
|
+
args.push('--', pattern, targetPath);
|
|
95
104
|
return new Promise((resolve) => {
|
|
96
105
|
const chunks = [];
|
|
97
106
|
const errChunks = [];
|
|
98
|
-
const child = spawn('rg', args, { stdio: ['ignore', 'pipe', 'pipe'] });
|
|
107
|
+
const child = spawn('rg', args, { cwd: options.root, stdio: ['ignore', 'pipe', 'pipe'] });
|
|
99
108
|
child.stdout.on('data', (d) => chunks.push(d));
|
|
100
109
|
child.stderr.on('data', (d) => errChunks.push(d));
|
|
101
110
|
const onAbort = () => { child.kill('SIGKILL'); };
|
|
@@ -180,7 +189,7 @@ async function runNodeSearch(regex, searchPath, options) {
|
|
|
180
189
|
regex.lastIndex = 0;
|
|
181
190
|
if (regex.test(lines[i])) {
|
|
182
191
|
matches.push({
|
|
183
|
-
file: relative(
|
|
192
|
+
file: relative(options.root, file) || file,
|
|
184
193
|
lineNumber: i + 1,
|
|
185
194
|
text: lines[i],
|
|
186
195
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grep.js","sourceRoot":"","sources":["../../../src/tool/built-in/grep.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"grep.js","sourceRoot":"","sources":["../../../src/tool/built-in/grep.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import type { ToolUseContext } from '../../types.js';
|
|
2
|
+
/**
|
|
3
|
+
* Subdirectory name used as the default sandbox root, relative to
|
|
4
|
+
* `process.cwd()`. Narrower than `process.cwd()` so a freshly configured
|
|
5
|
+
* agent cannot, by default, read or write the user's project source,
|
|
6
|
+
* `.env`, or `.git/` simply because the host happened to launch from the
|
|
7
|
+
* repo root.
|
|
8
|
+
*
|
|
9
|
+
* Override per-orchestrator with `OrchestratorConfig.defaultCwd`, or
|
|
10
|
+
* per-agent with `AgentConfig.cwd`. Pass `null` to disable the sandbox.
|
|
11
|
+
*/
|
|
12
|
+
export declare const DEFAULT_WORKSPACE_DIRNAME = ".agent-workspace";
|
|
13
|
+
/**
|
|
14
|
+
* Resolve the default sandbox root: `<process.cwd()>/.agent-workspace`.
|
|
15
|
+
* Callers that want the legacy "entire current working directory"
|
|
16
|
+
* behaviour can pass `process.cwd()` explicitly to `defaultCwd` / `cwd`.
|
|
17
|
+
*/
|
|
18
|
+
export declare function defaultWorkspaceDir(): string;
|
|
19
|
+
export type SafePathResult = {
|
|
20
|
+
ok: true;
|
|
21
|
+
path: string;
|
|
22
|
+
root: string;
|
|
23
|
+
} | {
|
|
24
|
+
ok: false;
|
|
25
|
+
error: string;
|
|
26
|
+
};
|
|
27
|
+
export declare function resolvePathWithinCwd(inputPath: string, context: ToolUseContext, options?: {
|
|
28
|
+
ensureRoot?: boolean;
|
|
29
|
+
}): Promise<SafePathResult>;
|
|
30
|
+
//# sourceMappingURL=path-safety.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"path-safety.d.ts","sourceRoot":"","sources":["../../../src/tool/built-in/path-safety.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEpD;;;;;;;;;GASG;AACH,eAAO,MAAM,yBAAyB,qBAAqB,CAAA;AAE3D;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AAED,MAAM,MAAM,cAAc,GACtB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACxC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAEhC,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,cAAc,EACvB,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,GACrC,OAAO,CAAC,cAAc,CAAC,CA+DzB"}
|