@botbotgo/runtime 1.0.0 → 1.0.2
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/.github/workflows/release.yml +65 -0
- package/config/examples/runtime.yaml +14 -0
- package/config/examples/tool.yaml +1 -1
- package/dist/config/resolveRuntimeConfig.d.ts +3 -1
- package/dist/config/resolveRuntimeConfig.d.ts.map +1 -1
- package/dist/config/resolveRuntimeConfig.js +2 -0
- package/dist/config/resolveRuntimeConfig.js.map +1 -1
- package/dist/config/resources.d.ts +17 -0
- package/dist/config/resources.d.ts.map +1 -1
- package/dist/config/resources.js.map +1 -1
- package/dist/runtime/bootstrap/runtimeFactory.d.ts.map +1 -1
- package/dist/runtime/bootstrap/runtimeFactory.js +4 -0
- package/dist/runtime/bootstrap/runtimeFactory.js.map +1 -1
- package/dist/runtime/execution/agentRunExecutor.d.ts +1 -0
- package/dist/runtime/execution/agentRunExecutor.d.ts.map +1 -1
- package/dist/runtime/execution/agentRunExecutor.js +3 -0
- package/dist/runtime/execution/agentRunExecutor.js.map +1 -1
- package/dist/runtime/execution/agentRunExecutor.types.d.ts +2 -0
- package/dist/runtime/execution/agentRunExecutor.types.d.ts.map +1 -1
- package/dist/runtime/middleware/agentToolMiddleware.d.ts +2 -0
- package/dist/runtime/middleware/agentToolMiddleware.d.ts.map +1 -1
- package/dist/runtime/middleware/agentToolMiddleware.js +17 -4
- package/dist/runtime/middleware/agentToolMiddleware.js.map +1 -1
- package/dist/runtime/middleware/commandPolicy.d.ts +2 -1
- package/dist/runtime/middleware/commandPolicy.d.ts.map +1 -1
- package/dist/runtime/middleware/commandPolicy.js +14 -11
- package/dist/runtime/middleware/commandPolicy.js.map +1 -1
- package/dist/runtime/middleware/frameworkPrompt.d.ts.map +1 -1
- package/dist/runtime/middleware/frameworkPrompt.js +2 -3
- package/dist/runtime/middleware/frameworkPrompt.js.map +1 -1
- package/dist/runtime/middleware/toolArgsNormalizer.d.ts +1 -0
- package/dist/runtime/middleware/toolArgsNormalizer.d.ts.map +1 -1
- package/dist/runtime/middleware/toolArgsNormalizer.js +32 -0
- package/dist/runtime/middleware/toolArgsNormalizer.js.map +1 -1
- package/dist/runtime/middleware/toolCallGuard.d.ts +3 -1
- package/dist/runtime/middleware/toolCallGuard.d.ts.map +1 -1
- package/dist/runtime/middleware/toolCallGuard.js +24 -4
- package/dist/runtime/middleware/toolCallGuard.js.map +1 -1
- package/dist/runtime/middleware/types.d.ts +2 -0
- package/dist/runtime/middleware/types.d.ts.map +1 -1
- package/dist/runtime/middleware/types.js.map +1 -1
- package/dist/runtime/runtimeService.d.ts +2 -0
- package/dist/runtime/runtimeService.d.ts.map +1 -1
- package/dist/runtime/runtimeService.js +1 -0
- package/dist/runtime/runtimeService.js.map +1 -1
- package/dist/runtime/stream/runArtifacts.d.ts.map +1 -1
- package/dist/runtime/stream/runArtifacts.js +3 -1
- package/dist/runtime/stream/runArtifacts.js.map +1 -1
- package/dist/state/runState.d.ts +1 -0
- package/dist/state/runState.d.ts.map +1 -1
- package/dist/state/runState.js +18 -1
- package/dist/state/runState.js.map +1 -1
- package/dist/state/workspaceState.d.ts +2 -0
- package/dist/state/workspaceState.d.ts.map +1 -1
- package/dist/state/workspaceState.js +12 -10
- package/dist/state/workspaceState.js.map +1 -1
- package/example/config/model.yaml +2 -2
- package/example/config/runtime.yaml +19 -1
- package/example/package.json +0 -1
- package/package.json +1 -1
- package/src/config/resolveRuntimeConfig.ts +5 -0
- package/src/config/resources.ts +19 -0
- package/src/runtime/bootstrap/runtimeFactory.ts +7 -0
- package/src/runtime/execution/agentRunExecutor.ts +3 -0
- package/src/runtime/execution/agentRunExecutor.types.ts +2 -0
- package/src/runtime/middleware/agentToolMiddleware.ts +19 -3
- package/src/runtime/middleware/commandPolicy.ts +22 -10
- package/src/runtime/middleware/frameworkPrompt.ts +2 -3
- package/src/runtime/middleware/toolArgsNormalizer.ts +36 -0
- package/src/runtime/middleware/toolCallGuard.ts +37 -3
- package/src/runtime/middleware/types.ts +2 -0
- package/src/runtime/runtimeService.ts +3 -0
- package/src/runtime/stream/runArtifacts.ts +3 -1
- package/src/state/runState.ts +19 -1
- package/src/state/workspaceState.ts +19 -11
- package/test/unit/config/loader.test.ts +10 -0
- package/test/unit/runtime/agentToolMiddleware.test.ts +51 -0
- package/test/unit/runtime/toolArgsNormalizer.test.ts +34 -0
- package/test/unit/runtime/toolCallGuard.test.ts +71 -0
- package/test/unit/runtime/workspaceState.test.ts +94 -0
- package/example/.tsbuildinfo +0 -1
- package/example/build/.tsbuildinfo +0 -1
- package/example/serve-output.mjs +0 -52
|
@@ -1,31 +1,34 @@
|
|
|
1
1
|
export class CommandPolicy {
|
|
2
|
-
static maybeBlockExecuteCommand(command, toolCallId, ToolMessage, rootDir, allowedPathPrefixes = []) {
|
|
3
|
-
const message = this.getViolationMessage(command, rootDir, allowedPathPrefixes);
|
|
2
|
+
static maybeBlockExecuteCommand(command, toolCallId, ToolMessage, rootDir, allowedPathPrefixes = [], policy) {
|
|
3
|
+
const message = this.getViolationMessage(command, rootDir, allowedPathPrefixes, policy);
|
|
4
4
|
return message ? new ToolMessage({ content: message, tool_call_id: toolCallId ?? "execute" }) : null;
|
|
5
5
|
}
|
|
6
|
-
static getViolationMessage(command, rootDir, allowedPathPrefixes) {
|
|
7
|
-
if (/\bls\b/.test(command) && command.includes("?")) {
|
|
6
|
+
static getViolationMessage(command, rootDir, allowedPathPrefixes, policy) {
|
|
7
|
+
if (policy?.blockFuzzyLsProbes !== false && /\bls\b/.test(command) && command.includes("?")) {
|
|
8
8
|
return "Error: Do not run fuzzy ls probes with unknown paths. Continue with known workflow commands.";
|
|
9
9
|
}
|
|
10
|
-
if (
|
|
10
|
+
if (policy?.blockShellWrappedSkillScripts !== false
|
|
11
|
+
&& (/\bbash\b/i.test(command) || /\/bin\/bash\b/i.test(command) || /\bzsh\b/i.test(command))
|
|
12
|
+
&& command.includes("/scripts/")) {
|
|
11
13
|
return "Error: Do not wrap skill scripts with `bash`. Execute the script path directly.";
|
|
12
14
|
}
|
|
13
|
-
if (/\bchmod\s+\+x\b/i.test(command)) {
|
|
15
|
+
if (policy?.blockChmodX !== false && /\bchmod\s+\+x\b/i.test(command)) {
|
|
14
16
|
return "Error: Do not run chmod +x. Use direct execution of the target command or script.";
|
|
15
17
|
}
|
|
16
|
-
if (/\b(?:ba)?sh\s+-lc\b/i.test(command)) {
|
|
18
|
+
if (policy?.blockShellDashLc !== false && /\b(?:ba)?sh\s+-lc\b/i.test(command)) {
|
|
17
19
|
return "Error: Do not wrap command execution with shell -lc. Execute the target command directly.";
|
|
18
20
|
}
|
|
19
|
-
if (/\b(curl|wget)\b/i.test(command)) {
|
|
21
|
+
if (policy?.blockDirectNetworkFetch !== false && /\b(curl|wget)\b/i.test(command)) {
|
|
20
22
|
return "Error: Do not execute direct network fetch commands. Use provided scripts/tools and then write results with write_file/edit_file.";
|
|
21
23
|
}
|
|
22
|
-
if (/\|\s*reportgen\b/i.test(command)) {
|
|
24
|
+
if (policy?.blockReportgenPipe !== false && /\|\s*reportgen\b/i.test(command)) {
|
|
23
25
|
return "Error: Do not pipe output to ad-hoc generators. Use write_file/edit_file for artifact generation.";
|
|
24
26
|
}
|
|
25
|
-
if (/(^|[\s;|&])(?:echo|cat|printf)[^|&;]*>\s*[^\s]+/i.test(command)) {
|
|
27
|
+
if (policy?.blockShellFileRedirection !== false && /(^|[\s;|&])(?:echo|cat|printf)[^|&;]*>\s*[^\s]+/i.test(command)) {
|
|
26
28
|
return "Error: Do not write files via shell redirection in execute. Use write_file/edit_file tools.";
|
|
27
29
|
}
|
|
28
|
-
return
|
|
30
|
+
return (policy?.blockAbsolutePathsOutsideWorkspace !== false)
|
|
31
|
+
&& this.containsAbsolutePathOutsideWorkspace(command, rootDir, allowedPathPrefixes)
|
|
29
32
|
? "Error: Do not execute commands with absolute paths outside workspace root. Use workspace-relative paths only."
|
|
30
33
|
: null;
|
|
31
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandPolicy.js","sourceRoot":"","sources":["../../../src/runtime/middleware/commandPolicy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"commandPolicy.js","sourceRoot":"","sources":["../../../src/runtime/middleware/commandPolicy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frameworkPrompt.d.ts","sourceRoot":"","sources":["../../../src/runtime/middleware/frameworkPrompt.ts"],"names":[],"mappings":"AAAA,qBAAa,eAAe;WACZ,KAAK,CACjB,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,aAAa,EAAE,OAAO,EACtB,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAC3B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,MAAM;
|
|
1
|
+
{"version":3,"file":"frameworkPrompt.d.ts","sourceRoot":"","sources":["../../../src/runtime/middleware/frameworkPrompt.ts"],"names":[],"mappings":"AAAA,qBAAa,eAAe;WACZ,KAAK,CACjB,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,aAAa,EAAE,OAAO,EACtB,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAC3B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,MAAM;CA2CV"}
|
|
@@ -30,9 +30,8 @@ export class FrameworkPrompt {
|
|
|
30
30
|
if (skillEntries.length === 1) {
|
|
31
31
|
baseRules.push("- Because only one skill is active, `${SKILL_PATH}` also resolves to that skill directory.");
|
|
32
32
|
}
|
|
33
|
-
baseRules.push("- `${SKILL_PATH...}` is only for skill-owned
|
|
34
|
-
baseRules.push("-
|
|
35
|
-
baseRules.push("- If a SKILL provides an explicit script command using `${SKILL_PATH...}` and `${WORKSPACE}`, execute that command directly instead of exploring the skill directory first.");
|
|
33
|
+
baseRules.push("- `${SKILL_PATH...}` is only for exact skill-owned files explicitly required by the active SKILL.");
|
|
34
|
+
baseRules.push("- If a SKILL provides an explicit script command using `${SKILL_PATH...}` and `${WORKSPACE}`, execute that command directly without exploring the skill directory.");
|
|
36
35
|
}
|
|
37
36
|
const frameworkPrompt = baseRules.join("\n");
|
|
38
37
|
if (!currentPrompt?.trim() || currentPrompt.includes("Framework execution rules:")) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frameworkPrompt.js","sourceRoot":"","sources":["../../../src/runtime/middleware/frameworkPrompt.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,eAAe;IACnB,MAAM,CAAC,KAAK,CACjB,aAAiC,EACjC,aAAsB,EACtB,gBAA2B,EAC3B,YAAqC;QAErC,MAAM,SAAS,GAAG;YAChB,4BAA4B;YAC5B,6DAA6D;YAC7D,yEAAyE;YACzE,oFAAoF;YACpF,yGAAyG;YACzG,yGAAyG;YACzG,qGAAqG;YACrG,6GAA6G;YAC7G,oFAAoF;YACpF,uHAAuH;YACvH,mEAAmE;YACnE,uEAAuE;SACxE,CAAC;QAEF,IAAI,aAAa,EAAE,CAAC;YAClB,SAAS,CAAC,IAAI,CAAC,qGAAqG,CAAC,CAAC;QACxH,CAAC;QACD,IAAI,gBAAgB,EAAE,MAAM,EAAE,CAAC;YAC7B,SAAS,CAAC,IAAI,CAAC,kEAAkE,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnH,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;QACxD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,SAAS,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;YAChD,KAAK,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,YAAY,EAAE,CAAC;gBAChD,SAAS,CAAC,IAAI,CAAC,OAAO,OAAO,OAAO,SAAS,EAAE,CAAC,CAAC;YACnD,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,+GAA+G,CAAC,CAAC;YAChI,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9B,SAAS,CAAC,IAAI,CAAC,4FAA4F,CAAC,CAAC;YAC/G,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"frameworkPrompt.js","sourceRoot":"","sources":["../../../src/runtime/middleware/frameworkPrompt.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,eAAe;IACnB,MAAM,CAAC,KAAK,CACjB,aAAiC,EACjC,aAAsB,EACtB,gBAA2B,EAC3B,YAAqC;QAErC,MAAM,SAAS,GAAG;YAChB,4BAA4B;YAC5B,6DAA6D;YAC7D,yEAAyE;YACzE,oFAAoF;YACpF,yGAAyG;YACzG,yGAAyG;YACzG,qGAAqG;YACrG,6GAA6G;YAC7G,oFAAoF;YACpF,uHAAuH;YACvH,mEAAmE;YACnE,uEAAuE;SACxE,CAAC;QAEF,IAAI,aAAa,EAAE,CAAC;YAClB,SAAS,CAAC,IAAI,CAAC,qGAAqG,CAAC,CAAC;QACxH,CAAC;QACD,IAAI,gBAAgB,EAAE,MAAM,EAAE,CAAC;YAC7B,SAAS,CAAC,IAAI,CAAC,kEAAkE,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnH,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;QACxD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,SAAS,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;YAChD,KAAK,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,YAAY,EAAE,CAAC;gBAChD,SAAS,CAAC,IAAI,CAAC,OAAO,OAAO,OAAO,SAAS,EAAE,CAAC,CAAC;YACnD,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,+GAA+G,CAAC,CAAC;YAChI,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9B,SAAS,CAAC,IAAI,CAAC,4FAA4F,CAAC,CAAC;YAC/G,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,mGAAmG,CAAC,CAAC;YACpH,SAAS,CAAC,IAAI,CAAC,oKAAoK,CAAC,CAAC;QACvL,CAAC;QAED,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,aAAa,CAAC,QAAQ,CAAC,4BAA4B,CAAC,EAAE,CAAC;YACnF,OAAO,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC;QACjE,CAAC;QACD,OAAO,GAAG,aAAa,OAAO,eAAe,EAAE,CAAC;IAClD,CAAC;CACF"}
|
|
@@ -12,6 +12,7 @@ export declare class ToolArgsNormalizer {
|
|
|
12
12
|
private static tokenizeCommand;
|
|
13
13
|
private static resolveSkillRelativeCommandArg;
|
|
14
14
|
private static looksLikeRelativePath;
|
|
15
|
+
private static normalizeWorkspaceRelativePath;
|
|
15
16
|
private static quoteCommandPart;
|
|
16
17
|
private static normalizeWriteTodosArgs;
|
|
17
18
|
private static extractTodoText;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolArgsNormalizer.d.ts","sourceRoot":"","sources":["../../../src/runtime/middleware/toolArgsNormalizer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE/D,qBAAa,kBAAkB;WACf,iBAAiB,CAC7B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAAE,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,EACd,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,QAAQ;IAoBX,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAMhC,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAgCtC,OAAO,CAAC,MAAM,CAAC,iBAAiB;
|
|
1
|
+
{"version":3,"file":"toolArgsNormalizer.d.ts","sourceRoot":"","sources":["../../../src/runtime/middleware/toolArgsNormalizer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE/D,qBAAa,kBAAkB;WACf,iBAAiB,CAC7B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAAE,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,EACd,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,QAAQ;IAoBX,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAMhC,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAgCtC,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAwBhC,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAkBjC,OAAO,CAAC,MAAM,CAAC,wBAAwB;IAcvC,OAAO,CAAC,MAAM,CAAC,2BAA2B;IAgB1C,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAIlC,OAAO,CAAC,MAAM,CAAC,wBAAwB;IAOvC,OAAO,CAAC,MAAM,CAAC,eAAe;IA4C9B,OAAO,CAAC,MAAM,CAAC,8BAA8B;IAuB7C,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAIpC,OAAO,CAAC,MAAM,CAAC,8BAA8B;IA0B7C,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAM/B,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAqBtC,OAAO,CAAC,MAAM,CAAC,eAAe;IAU9B,OAAO,CAAC,MAAM,CAAC,aAAa;WAoBd,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;CAM9E"}
|
|
@@ -53,6 +53,12 @@ export class ToolArgsNormalizer {
|
|
|
53
53
|
for (const key of TOOL_PATH_ARG_KEYS) {
|
|
54
54
|
const value = nextArgs[key];
|
|
55
55
|
if (!this.shouldNormalizePath(value)) {
|
|
56
|
+
if (typeof value === "string") {
|
|
57
|
+
const normalizedRelative = this.normalizeWorkspaceRelativePath(rootDir, value);
|
|
58
|
+
if (normalizedRelative !== value) {
|
|
59
|
+
nextArgs = { ...nextArgs, [key]: normalizedRelative };
|
|
60
|
+
}
|
|
61
|
+
}
|
|
56
62
|
continue;
|
|
57
63
|
}
|
|
58
64
|
if (this.isResolvableAbsolutePath(rootDir, value)) {
|
|
@@ -151,6 +157,10 @@ export class ToolArgsNormalizer {
|
|
|
151
157
|
if (!this.looksLikeRelativePath(value) || value.startsWith("./") || value.startsWith("../")) {
|
|
152
158
|
return value;
|
|
153
159
|
}
|
|
160
|
+
const normalizedRelative = this.normalizeWorkspaceRelativePath(rootDir, value);
|
|
161
|
+
if (normalizedRelative !== value) {
|
|
162
|
+
return normalizedRelative;
|
|
163
|
+
}
|
|
154
164
|
if (existsSync(resolve(rootDir, value))) {
|
|
155
165
|
return value;
|
|
156
166
|
}
|
|
@@ -166,6 +176,28 @@ export class ToolArgsNormalizer {
|
|
|
166
176
|
static looksLikeRelativePath(value) {
|
|
167
177
|
return value.includes("/") && !value.startsWith("/") && !value.startsWith("~") && !value.startsWith("-");
|
|
168
178
|
}
|
|
179
|
+
static normalizeWorkspaceRelativePath(rootDir, value) {
|
|
180
|
+
const normalizedValue = value.replace(/\\/g, "/").replace(/^\.\/+/, "");
|
|
181
|
+
if (!this.looksLikeRelativePath(normalizedValue)) {
|
|
182
|
+
return value;
|
|
183
|
+
}
|
|
184
|
+
const rootSegments = rootDir.replace(/\\/g, "/").split("/").filter(Boolean);
|
|
185
|
+
const valueSegments = normalizedValue.split("/").filter(Boolean);
|
|
186
|
+
if (valueSegments.length < 2 || rootSegments.length < 2) {
|
|
187
|
+
return value;
|
|
188
|
+
}
|
|
189
|
+
for (let index = 0; index <= rootSegments.length - 2; index += 1) {
|
|
190
|
+
const suffixSegments = rootSegments.slice(index);
|
|
191
|
+
if (valueSegments.length <= suffixSegments.length) {
|
|
192
|
+
continue;
|
|
193
|
+
}
|
|
194
|
+
const matches = suffixSegments.every((segment, suffixIndex) => valueSegments[suffixIndex] === segment);
|
|
195
|
+
if (matches) {
|
|
196
|
+
return valueSegments.slice(suffixSegments.length).join("/");
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
return value;
|
|
200
|
+
}
|
|
169
201
|
static quoteCommandPart(value) {
|
|
170
202
|
return /^[A-Za-z0-9_./:@=-]+$/.test(value)
|
|
171
203
|
? value
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolArgsNormalizer.js","sourceRoot":"","sources":["../../../src/runtime/middleware/toolArgsNormalizer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"toolArgsNormalizer.js","sourceRoot":"","sources":["../../../src/runtime/middleware/toolArgsNormalizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import type { AgentRuntimeMiddlewareSpec } from "../../config/resources.js";
|
|
1
2
|
import { type ToolArgs, type ToolMessageConstructorLike, type ToolMessageLike } from "./types.js";
|
|
2
3
|
export declare class ToolCallGuard {
|
|
3
|
-
static maybeBlock(name: string, args: ToolArgs, toolCallId: string | undefined, ToolMessage: ToolMessageConstructorLike, rootDir: string, allowedToolNames?: string[], allowedPathPrefixes?: string[]): ToolMessageLike | null;
|
|
4
|
+
static maybeBlock(name: string, args: ToolArgs, toolCallId: string | undefined, ToolMessage: ToolMessageConstructorLike, rootDir: string, allowedToolNames?: string[], allowedPathPrefixes?: string[], policy?: AgentRuntimeMiddlewareSpec): ToolMessageLike | null;
|
|
4
5
|
private static isToolAllowed;
|
|
5
6
|
private static hasAbsolutePathArgOutsideWorkspace;
|
|
6
7
|
private static isScriptSourcePath;
|
|
8
|
+
private static isInternalStatePath;
|
|
7
9
|
}
|
|
8
10
|
//# sourceMappingURL=toolCallGuard.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolCallGuard.d.ts","sourceRoot":"","sources":["../../../src/runtime/middleware/toolCallGuard.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"toolCallGuard.d.ts","sourceRoot":"","sources":["../../../src/runtime/middleware/toolCallGuard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAG5E,OAAO,EAAsB,KAAK,QAAQ,EAAE,KAAK,0BAA0B,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAEtH,qBAAa,aAAa;WACV,UAAU,CACtB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,WAAW,EAAE,0BAA0B,EACvC,OAAO,EAAE,MAAM,EACf,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAC3B,mBAAmB,GAAE,MAAM,EAAO,EAClC,MAAM,CAAC,EAAE,0BAA0B,GAClC,eAAe,GAAG,IAAI;IA6CzB,OAAO,CAAC,MAAM,CAAC,aAAa;IAQ5B,OAAO,CAAC,MAAM,CAAC,kCAAkC;IAmBjD,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAQjC,OAAO,CAAC,MAAM,CAAC,mBAAmB;CAWnC"}
|
|
@@ -2,27 +2,36 @@ import { CommandPolicy } from "./commandPolicy.js";
|
|
|
2
2
|
import { ToolArgsNormalizer } from "./toolArgsNormalizer.js";
|
|
3
3
|
import { TOOL_PATH_ARG_KEYS } from "./types.js";
|
|
4
4
|
export class ToolCallGuard {
|
|
5
|
-
static maybeBlock(name, args, toolCallId, ToolMessage, rootDir, allowedToolNames, allowedPathPrefixes = []) {
|
|
5
|
+
static maybeBlock(name, args, toolCallId, ToolMessage, rootDir, allowedToolNames, allowedPathPrefixes = [], policy) {
|
|
6
6
|
if (allowedToolNames?.length && !this.isToolAllowed(name, allowedToolNames)) {
|
|
7
7
|
return new ToolMessage({
|
|
8
8
|
content: `Error: Tool "${name}" is not allowed by tool config allowlist.`,
|
|
9
9
|
tool_call_id: toolCallId ?? name,
|
|
10
10
|
});
|
|
11
11
|
}
|
|
12
|
-
if (
|
|
12
|
+
if (policy?.forbidScriptSourceRead !== false
|
|
13
|
+
&& (name === "read_file" || name === "edit_file")
|
|
14
|
+
&& this.isScriptSourcePath(args, rootDir)) {
|
|
13
15
|
return new ToolMessage({
|
|
14
16
|
content: "Error: Do not inspect script source files unless the user explicitly asks for script code.",
|
|
15
17
|
tool_call_id: toolCallId ?? name,
|
|
16
18
|
});
|
|
17
19
|
}
|
|
18
|
-
if (this.
|
|
20
|
+
if ((name === "read_file" || name === "edit_file") && this.isInternalStatePath(args, rootDir)) {
|
|
21
|
+
return new ToolMessage({
|
|
22
|
+
content: "Error: Do not inspect internal runtime state files under .agent/. Follow the SKILL workflow instead.",
|
|
23
|
+
tool_call_id: toolCallId ?? name,
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
if (policy?.forbidAbsolutePathsOutsideWorkspace !== false
|
|
27
|
+
&& this.hasAbsolutePathArgOutsideWorkspace(args, rootDir, allowedPathPrefixes)) {
|
|
19
28
|
return new ToolMessage({
|
|
20
29
|
content: "Error: Do not use absolute filesystem paths outside workspace root. Use workspace-relative paths only.",
|
|
21
30
|
tool_call_id: toolCallId ?? name,
|
|
22
31
|
});
|
|
23
32
|
}
|
|
24
33
|
if (name === "execute" && typeof args.command === "string") {
|
|
25
|
-
return CommandPolicy.maybeBlockExecuteCommand(args.command, toolCallId, ToolMessage, rootDir, allowedPathPrefixes);
|
|
34
|
+
return CommandPolicy.maybeBlockExecuteCommand(args.command, toolCallId, ToolMessage, rootDir, allowedPathPrefixes, policy?.commandPolicy);
|
|
26
35
|
}
|
|
27
36
|
return null;
|
|
28
37
|
}
|
|
@@ -56,5 +65,16 @@ export class ToolCallGuard {
|
|
|
56
65
|
ToolArgsNormalizer.resolveScriptSourcePath(rootDir, value).includes("/scripts/");
|
|
57
66
|
});
|
|
58
67
|
}
|
|
68
|
+
static isInternalStatePath(args, rootDir) {
|
|
69
|
+
const normalizedRoot = rootDir.replace(/\\/g, "/");
|
|
70
|
+
return TOOL_PATH_ARG_KEYS.some((key) => {
|
|
71
|
+
const value = args[key];
|
|
72
|
+
if (typeof value !== "string" || !value.trim()) {
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
const resolved = ToolArgsNormalizer.resolveScriptSourcePath(rootDir, value);
|
|
76
|
+
return resolved === `${normalizedRoot}/.agent` || resolved.startsWith(`${normalizedRoot}/.agent/`);
|
|
77
|
+
});
|
|
78
|
+
}
|
|
59
79
|
}
|
|
60
80
|
//# sourceMappingURL=toolCallGuard.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolCallGuard.js","sourceRoot":"","sources":["../../../src/runtime/middleware/toolCallGuard.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"toolCallGuard.js","sourceRoot":"","sources":["../../../src/runtime/middleware/toolCallGuard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { HumanLoopService, HumanLoopToolPolicy } from "../human-loop/humanLoop.js";
|
|
2
|
+
import type { AgentRuntimeMiddlewareSpec } from "../../config/resources.js";
|
|
2
3
|
export declare const TOOL_PATH_ARG_KEYS: readonly ["file_path", "path"];
|
|
3
4
|
export declare const MAX_LS_ENTRIES = 200;
|
|
4
5
|
export type ToolArgs = Record<string, unknown>;
|
|
@@ -71,6 +72,7 @@ export interface CreateAgentToolMiddlewareOptions {
|
|
|
71
72
|
executeTimeoutMs?: number;
|
|
72
73
|
blockTaskTool?: boolean;
|
|
73
74
|
allowedToolNames?: string[];
|
|
75
|
+
policy?: AgentRuntimeMiddlewareSpec;
|
|
74
76
|
logger?: (message: string) => void;
|
|
75
77
|
persistTodos?: (todos: unknown[]) => Promise<void> | void;
|
|
76
78
|
humanLoop?: HumanLoopService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/runtime/middleware/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/runtime/middleware/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/runtime/middleware/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/runtime/middleware/types.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,WAAW,EAAE,MAAM,CAAU,CAAC;AACjE,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAAC"}
|
|
@@ -25,6 +25,7 @@ export interface CreateAgentRuntimeOptions extends Omit<CreateAgentWorkspaceStat
|
|
|
25
25
|
emptyRunMaxRetries?: number;
|
|
26
26
|
malformedToolCallMaxRetries?: number;
|
|
27
27
|
idleTimeoutMaxRetries?: number;
|
|
28
|
+
resumeInterruptedRun?: boolean;
|
|
28
29
|
heartbeatIntervalMs?: number;
|
|
29
30
|
idleTimeoutMs?: number;
|
|
30
31
|
artifactValidator?: (context: {
|
|
@@ -86,6 +87,7 @@ export declare class AgentRuntimeService implements AgentRuntime {
|
|
|
86
87
|
defaultEmptyRunMaxRetries?: number;
|
|
87
88
|
defaultMalformedToolCallMaxRetries?: number;
|
|
88
89
|
defaultIdleTimeoutMaxRetries?: number;
|
|
90
|
+
defaultResumeInterruptedRun?: boolean;
|
|
89
91
|
defaultHeartbeatIntervalMs?: number;
|
|
90
92
|
defaultIdleTimeoutMs?: number;
|
|
91
93
|
artifactValidator?: CreateAgentRuntimeOptions["artifactValidator"];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtimeService.d.ts","sourceRoot":"","sources":["../../src/runtime/runtimeService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"runtimeService.d.ts","sourceRoot":"","sources":["../../src/runtime/runtimeService.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,7 @@ export class AgentRuntimeService {
|
|
|
36
36
|
defaultEmptyRunMaxRetries: params.defaultEmptyRunMaxRetries,
|
|
37
37
|
defaultMalformedToolCallMaxRetries: params.defaultMalformedToolCallMaxRetries,
|
|
38
38
|
defaultIdleTimeoutMaxRetries: params.defaultIdleTimeoutMaxRetries,
|
|
39
|
+
defaultResumeInterruptedRun: params.defaultResumeInterruptedRun,
|
|
39
40
|
defaultHeartbeatIntervalMs: params.defaultHeartbeatIntervalMs,
|
|
40
41
|
defaultIdleTimeoutMs: params.defaultIdleTimeoutMs,
|
|
41
42
|
artifactValidator: params.artifactValidator,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtimeService.js","sourceRoot":"","sources":["../../src/runtime/runtimeService.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,gBAAgB,GACjB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"runtimeService.js","sourceRoot":"","sources":["../../src/runtime/runtimeService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runArtifacts.d.ts","sourceRoot":"","sources":["../../../src/runtime/stream/runArtifacts.ts"],"names":[],"mappings":"AAIA,qBAAa,kBAAkB;WACf,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;WAKlD,2BAA2B,CACvC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,MAAM,EAAE,MAAM,GACb,MAAM,EAAE;WASG,iBAAiB,CAC7B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,EACjB,oBAAoB,EAAE,MAAM,EAAE,GAC7B,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"runArtifacts.d.ts","sourceRoot":"","sources":["../../../src/runtime/stream/runArtifacts.ts"],"names":[],"mappings":"AAIA,qBAAa,kBAAkB;WACf,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE;WAKlD,2BAA2B,CACvC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,MAAM,EAAE,MAAM,GACb,MAAM,EAAE;WASG,iBAAiB,CAC7B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,EACjB,oBAAoB,EAAE,MAAM,EAAE,GAC7B,MAAM,EAAE;WAQS,gCAAgC,CAClD,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,IAAI,CAAC;WAYF,kBAAkB,CAAC,oBAAoB,EAAE,MAAM,EAAE,GAAG,OAAO;IAKzE,OAAO,CAAC,MAAM,CAAC,gBAAgB;CAiBhC"}
|
|
@@ -14,7 +14,9 @@ export class RunArtifactService {
|
|
|
14
14
|
return RunArtifactService.inferPromptArtifactPaths(prompt).map((file) => resolve(rootDir, file));
|
|
15
15
|
}
|
|
16
16
|
static buildTrackedPaths(rootDir, runStateFile, todosFile, trackedArtifactFiles) {
|
|
17
|
-
|
|
17
|
+
void runStateFile;
|
|
18
|
+
void todosFile;
|
|
19
|
+
return trackedArtifactFiles
|
|
18
20
|
.map((file) => relative(rootDir, file))
|
|
19
21
|
.filter(Boolean);
|
|
20
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runArtifacts.js","sourceRoot":"","sources":["../../../src/runtime/stream/runArtifacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,OAAO,kBAAkB;IACtB,MAAM,CAAC,wBAAwB,CAAC,MAAc;QACnD,MAAM,OAAO,GAAG,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,4DAA4D,CAAC,CAAC,CAAC;QACnG,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAEM,MAAM,CAAC,2BAA2B,CACvC,OAAe,EACf,aAAqC,EACrC,MAAc;QAEd,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACzD,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,OAAO,mBAAmB,CAAC;QAC7B,CAAC;QAED,OAAO,kBAAkB,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IACnG,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAC7B,OAAe,EACf,YAAoB,EACpB,SAAiB,EACjB,oBAA8B;QAE9B,
|
|
1
|
+
{"version":3,"file":"runArtifacts.js","sourceRoot":"","sources":["../../../src/runtime/stream/runArtifacts.ts"],"names":[],"mappings":"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"}
|
package/dist/state/runState.d.ts
CHANGED
|
@@ -31,6 +31,7 @@ export declare class AgentRunStateStore {
|
|
|
31
31
|
update(params: UpdateAgentRunStateOptions): Promise<AgentRunState>;
|
|
32
32
|
buildResumePrompt(basePrompt: string, previousState: AgentRunState | null, resumeHint: string): string;
|
|
33
33
|
getThreadId(previousState: AgentRunState | null, fallbackThreadId: string): string;
|
|
34
|
+
private summarizeArtifacts;
|
|
34
35
|
}
|
|
35
36
|
export declare function createAgentRunStateStore(options: CreateAgentRunStateStoreOptions): AgentRunStateStore;
|
|
36
37
|
//# sourceMappingURL=runState.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runState.d.ts","sourceRoot":"","sources":["../../src/state/runState.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;AAEhE,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,+BAA+B;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC9C;AAED,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,kBAAkB;IAC7B,SAAgB,QAAQ,EAAE,MAAM,CAAC;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgC;gBAE1C,OAAO,EAAE,+BAA+B;IAK9C,IAAI,IAAI,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAQrC,KAAK,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1C,MAAM,CAAC,MAAM,EAAE,0BAA0B,GAAG,OAAO,CAAC,aAAa,CAAC;IAkBxE,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;
|
|
1
|
+
{"version":3,"file":"runState.d.ts","sourceRoot":"","sources":["../../src/state/runState.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;AAEhE,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,+BAA+B;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC9C;AAED,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,kBAAkB;IAC7B,SAAgB,QAAQ,EAAE,MAAM,CAAC;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgC;gBAE1C,OAAO,EAAE,+BAA+B;IAK9C,IAAI,IAAI,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAQrC,KAAK,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1C,MAAM,CAAC,MAAM,EAAE,0BAA0B,GAAG,OAAO,CAAC,aAAa,CAAC;IAkBxE,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAgBtG,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI,EAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM;IAIzF,OAAO,CAAC,kBAAkB;CAM3B;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,+BAA+B,sBAEhF"}
|
package/dist/state/runState.js
CHANGED
|
@@ -39,11 +39,28 @@ export class AgentRunStateStore {
|
|
|
39
39
|
buildResumePrompt(basePrompt, previousState, resumeHint) {
|
|
40
40
|
if (previousState?.status !== "running")
|
|
41
41
|
return basePrompt;
|
|
42
|
-
|
|
42
|
+
const checkpoint = {
|
|
43
|
+
threadId: previousState.threadId,
|
|
44
|
+
stepCount: previousState.stepCount,
|
|
45
|
+
lastSummary: previousState.lastSummary?.trim() || "n/a",
|
|
46
|
+
artifacts: this.summarizeArtifacts(previousState.artifacts),
|
|
47
|
+
rules: [
|
|
48
|
+
"Do not read .agent/*",
|
|
49
|
+
"Do not re-read existing outputs unless verification is required",
|
|
50
|
+
],
|
|
51
|
+
resumeHint: resumeHint.trim() || undefined,
|
|
52
|
+
};
|
|
53
|
+
return `${basePrompt}\n\nRESUME_CHECKPOINT\n${JSON.stringify(checkpoint, null, 2)}`;
|
|
43
54
|
}
|
|
44
55
|
getThreadId(previousState, fallbackThreadId) {
|
|
45
56
|
return previousState?.status === "running" ? previousState.threadId : fallbackThreadId;
|
|
46
57
|
}
|
|
58
|
+
summarizeArtifacts(artifacts) {
|
|
59
|
+
const entries = Object.entries(artifacts)
|
|
60
|
+
.filter(([key]) => /Present$/.test(key))
|
|
61
|
+
.map(([key, value]) => [key.replace(/Present$/, ""), value === true ? "ready" : "missing"]);
|
|
62
|
+
return entries.length > 0 ? Object.fromEntries(entries) : undefined;
|
|
63
|
+
}
|
|
47
64
|
}
|
|
48
65
|
export function createAgentRunStateStore(options) {
|
|
49
66
|
return new AgentRunStateStore(options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runState.js","sourceRoot":"","sources":["../../src/state/runState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA8BpC,MAAM,OAAO,kBAAkB;IACb,QAAQ,CAAS;IAChB,YAAY,CAAgC;IAE7D,YAAmB,OAAwC;QACzD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAkB,CAAC;QAC5E,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,KAAoB;QACrC,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAChF,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,MAAkC;QACpD,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACzD,MAAM,KAAK,GAAkB;YAC3B,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,SAAS,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,KAAK,SAAS;gBACnD,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS;gBAChC,CAAC,CAAC,GAAG;YACP,SAAS,EAAE,GAAG;YACd,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE;SAC/B,CAAC;QACF,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACxB,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,iBAAiB,CAAC,UAAkB,EAAE,aAAmC,EAAE,UAAkB;QAClG,IAAI,aAAa,EAAE,MAAM,KAAK,SAAS;YAAE,OAAO,UAAU,CAAC;QAC3D,
|
|
1
|
+
{"version":3,"file":"runState.js","sourceRoot":"","sources":["../../src/state/runState.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ export interface AgentWorkspaceState {
|
|
|
19
19
|
artifactFiles: Record<string, string>;
|
|
20
20
|
prepareRun(params: {
|
|
21
21
|
prompt: string;
|
|
22
|
+
resumeInterruptedRun?: boolean;
|
|
22
23
|
fallbackThreadId?: string;
|
|
23
24
|
resumeHint: string;
|
|
24
25
|
}): Promise<PreparedWorkspaceRun>;
|
|
@@ -61,6 +62,7 @@ export declare class AgentWorkspaceStateManager implements AgentWorkspaceState {
|
|
|
61
62
|
constructor(options: CreateAgentWorkspaceStateOptions);
|
|
62
63
|
prepareRun(params: {
|
|
63
64
|
prompt: string;
|
|
65
|
+
resumeInterruptedRun?: boolean;
|
|
64
66
|
fallbackThreadId?: string;
|
|
65
67
|
resumeHint: string;
|
|
66
68
|
}): Promise<PreparedWorkspaceRun>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspaceState.d.ts","sourceRoot":"","sources":["../../src/state/workspaceState.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgD,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AAEjG,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACtF,OAAO,EAA8B,KAAK,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEjG,MAAM,WAAW,gCAAgC;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,0BAA0B,CAAC;CACrC;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,UAAU,CAAC,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"workspaceState.d.ts","sourceRoot":"","sources":["../../src/state/workspaceState.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,18 +37,19 @@ export class AgentWorkspaceStateManager {
|
|
|
37
37
|
}
|
|
38
38
|
async prepareRun(params) {
|
|
39
39
|
const previousState = await this.runState.read();
|
|
40
|
-
const
|
|
40
|
+
const effectivePreviousState = params.resumeInterruptedRun ? previousState : null;
|
|
41
|
+
const threadId = this.runState.getThreadId(effectivePreviousState, params.fallbackThreadId ?? `t-${Date.now()}`);
|
|
41
42
|
this.events?.emit({
|
|
42
43
|
name: "agent.runtime2.workspace.prepare",
|
|
43
44
|
from: "agent-runtime2.runtime",
|
|
44
45
|
to: "agent-runtime2.workspace",
|
|
45
|
-
payload: { threadId, previousState },
|
|
46
|
+
payload: { threadId, previousState: effectivePreviousState },
|
|
46
47
|
});
|
|
47
|
-
await this.resetForFreshRun(
|
|
48
|
+
await this.resetForFreshRun(effectivePreviousState);
|
|
48
49
|
return WorkspaceRunSessionFactory.create({
|
|
49
50
|
prompt: params.prompt,
|
|
50
51
|
threadId,
|
|
51
|
-
previousState,
|
|
52
|
+
previousState: effectivePreviousState,
|
|
52
53
|
resumeHint: params.resumeHint,
|
|
53
54
|
runState: this.runState,
|
|
54
55
|
events: this.events,
|
|
@@ -97,14 +98,15 @@ export class AgentWorkspaceStateManager {
|
|
|
97
98
|
});
|
|
98
99
|
}
|
|
99
100
|
async resetForFreshRun(previousState) {
|
|
100
|
-
if (previousState?.status
|
|
101
|
+
if (previousState?.status === "running")
|
|
101
102
|
return;
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
103
|
+
await Promise.all([
|
|
104
|
+
unlink(this.todosFile).catch(() => { }),
|
|
105
|
+
unlink(this.legacyTodosFile).catch(() => { }),
|
|
106
|
+
...(!this.legacyOutputState ? [
|
|
105
107
|
unlink(this.legacyRunStateFile).catch(() => { }),
|
|
106
|
-
])
|
|
107
|
-
|
|
108
|
+
] : []),
|
|
109
|
+
]);
|
|
108
110
|
}
|
|
109
111
|
async persistTodos(todos) {
|
|
110
112
|
await this.persistTodosHandler(todos);
|