psadk 1.3.7 → 1.4.3
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 +52 -0
- package/README.md +150 -0
- package/build/main/index.d.ts +1 -0
- package/build/main/index.js +2 -1
- package/build/main/lib/PSAI.d.ts +16 -1
- package/build/main/lib/PSAI.js +264 -79
- package/build/main/lib/PSAgent.js +77 -60
- package/build/main/lib/PSAgentConfig.d.ts +3 -0
- package/build/main/lib/PSAgentLogger.js +12 -9
- package/build/main/lib/PSAgentTask.js +4 -1
- package/build/main/lib/PSAgentTool.js +12 -2
- package/build/main/lib/agent-core/agent-loop.d.ts +23 -0
- package/build/main/lib/agent-core/agent-loop.js +483 -0
- package/build/main/lib/agent-core/agent.d.ts +124 -0
- package/build/main/lib/agent-core/agent.js +419 -0
- package/build/main/lib/agent-core/harness/agent-harness.d.ts +84 -0
- package/build/main/lib/agent-core/harness/agent-harness.js +772 -0
- package/build/main/lib/agent-core/harness/compaction/branch-summarization.d.ts +87 -0
- package/build/main/lib/agent-core/harness/compaction/branch-summarization.js +246 -0
- package/build/main/lib/agent-core/harness/compaction/compaction.d.ts +121 -0
- package/build/main/lib/agent-core/harness/compaction/compaction.js +637 -0
- package/build/main/lib/agent-core/harness/compaction/utils.d.ts +37 -0
- package/build/main/lib/agent-core/harness/compaction/utils.js +153 -0
- package/build/main/lib/agent-core/harness/env/nodejs.d.ts +43 -0
- package/build/main/lib/agent-core/harness/env/nodejs.js +353 -0
- package/build/main/lib/agent-core/harness/execution-env.d.ts +3 -0
- package/build/main/lib/agent-core/harness/execution-env.js +3 -0
- package/build/main/lib/agent-core/harness/messages.d.ts +50 -0
- package/build/main/lib/agent-core/harness/messages.js +116 -0
- package/build/main/lib/agent-core/harness/prompt-templates.d.ts +44 -0
- package/build/main/lib/agent-core/harness/prompt-templates.js +204 -0
- package/build/main/lib/agent-core/harness/session/repo/jsonl.d.ts +19 -0
- package/build/main/lib/agent-core/harness/session/repo/jsonl.js +98 -0
- package/build/main/lib/agent-core/harness/session/repo/memory.d.ts +17 -0
- package/build/main/lib/agent-core/harness/session/repo/memory.js +46 -0
- package/build/main/lib/agent-core/harness/session/repo/shared.d.ts +9 -0
- package/build/main/lib/agent-core/harness/session/repo/shared.js +31 -0
- package/build/main/lib/agent-core/harness/session/session.d.ts +31 -0
- package/build/main/lib/agent-core/harness/session/session.js +199 -0
- package/build/main/lib/agent-core/harness/session/storage/jsonl.d.ts +29 -0
- package/build/main/lib/agent-core/harness/session/storage/jsonl.js +170 -0
- package/build/main/lib/agent-core/harness/session/storage/memory.d.ts +25 -0
- package/build/main/lib/agent-core/harness/session/storage/memory.js +94 -0
- package/build/main/lib/agent-core/harness/skills.d.ts +40 -0
- package/build/main/lib/agent-core/harness/skills.js +266 -0
- package/build/main/lib/agent-core/harness/system-prompt.d.ts +2 -0
- package/build/main/lib/agent-core/harness/system-prompt.js +30 -0
- package/build/main/lib/agent-core/harness/types.d.ts +524 -0
- package/build/main/lib/agent-core/harness/types.js +16 -0
- package/build/main/lib/agent-core/harness/utils/shell-output.d.ts +13 -0
- package/build/main/lib/agent-core/harness/utils/shell-output.js +101 -0
- package/build/main/lib/agent-core/harness/utils/truncate.d.ts +69 -0
- package/build/main/lib/agent-core/harness/utils/truncate.js +208 -0
- package/build/main/lib/agent-core/index.d.ts +19 -0
- package/build/main/lib/agent-core/index.js +25 -0
- package/build/main/lib/agent-core/package.json +3 -0
- package/build/main/lib/agent-core/proxy.d.ts +68 -0
- package/build/main/lib/agent-core/proxy.js +294 -0
- package/build/main/lib/agent-core/types.d.ts +385 -0
- package/build/main/lib/agent-core/types.js +2 -0
- package/build/main/lib/skills/constants.js +6 -4
- package/build/main/lib/skills/skillParser.js +2 -2
- package/build/main/lib/skills/utils.js +8 -10
- package/build/main/lib/tools/BraveWebSearchTool.js +4 -3
- package/build/main/lib/tools/PSArtifactTool.js +3 -3
- package/build/main/lib/tools/PSClarifyTool.js +3 -2
- package/build/main/lib/tools/PSCommandLineTool.js +8 -7
- package/build/main/lib/tools/PSMemoryTool.js +9 -7
- package/build/main/lib/tools/PSReadFileTool.js +3 -3
- package/build/main/lib/tools/PSRetrievalTool.d.ts +127 -0
- package/build/main/lib/tools/PSRetrievalTool.js +172 -0
- package/build/main/lib/tools/PSSkillTool.js +6 -4
- package/build/main/lib/tools/PSSubAgentTool.js +4 -5
- package/build/main/lib/tools/PSWriteFileTool.js +3 -3
- package/build/main/lib/tools/TodoTool.js +8 -4
- package/build/main/lib/utils/helpers.d.ts +34 -0
- package/build/main/lib/utils/helpers.js +281 -13
- package/build/module/index.d.ts +1 -0
- package/build/module/index.js +2 -1
- package/build/module/lib/PSAI.d.ts +16 -1
- package/build/module/lib/PSAI.js +229 -85
- package/build/module/lib/PSAgentConfig.d.ts +3 -0
- package/build/module/lib/agent-core/agent-loop.d.ts +23 -0
- package/build/module/lib/agent-core/agent-loop.js +483 -0
- package/build/module/lib/agent-core/agent.d.ts +124 -0
- package/build/module/lib/agent-core/agent.js +419 -0
- package/build/module/lib/agent-core/harness/agent-harness.d.ts +84 -0
- package/build/module/lib/agent-core/harness/agent-harness.js +772 -0
- package/build/module/lib/agent-core/harness/compaction/branch-summarization.d.ts +87 -0
- package/build/module/lib/agent-core/harness/compaction/branch-summarization.js +246 -0
- package/build/module/lib/agent-core/harness/compaction/compaction.d.ts +121 -0
- package/build/module/lib/agent-core/harness/compaction/compaction.js +637 -0
- package/build/module/lib/agent-core/harness/compaction/utils.d.ts +37 -0
- package/build/module/lib/agent-core/harness/compaction/utils.js +153 -0
- package/build/module/lib/agent-core/harness/env/nodejs.d.ts +43 -0
- package/build/module/lib/agent-core/harness/env/nodejs.js +353 -0
- package/build/module/lib/agent-core/harness/execution-env.d.ts +3 -0
- package/build/module/lib/agent-core/harness/execution-env.js +3 -0
- package/build/module/lib/agent-core/harness/messages.d.ts +50 -0
- package/build/module/lib/agent-core/harness/messages.js +116 -0
- package/build/module/lib/agent-core/harness/prompt-templates.d.ts +44 -0
- package/build/module/lib/agent-core/harness/prompt-templates.js +204 -0
- package/build/module/lib/agent-core/harness/session/repo/jsonl.d.ts +19 -0
- package/build/module/lib/agent-core/harness/session/repo/jsonl.js +98 -0
- package/build/module/lib/agent-core/harness/session/repo/memory.d.ts +17 -0
- package/build/module/lib/agent-core/harness/session/repo/memory.js +46 -0
- package/build/module/lib/agent-core/harness/session/repo/shared.d.ts +9 -0
- package/build/module/lib/agent-core/harness/session/repo/shared.js +31 -0
- package/build/module/lib/agent-core/harness/session/session.d.ts +31 -0
- package/build/module/lib/agent-core/harness/session/session.js +199 -0
- package/build/module/lib/agent-core/harness/session/storage/jsonl.d.ts +29 -0
- package/build/module/lib/agent-core/harness/session/storage/jsonl.js +170 -0
- package/build/module/lib/agent-core/harness/session/storage/memory.d.ts +25 -0
- package/build/module/lib/agent-core/harness/session/storage/memory.js +94 -0
- package/build/module/lib/agent-core/harness/skills.d.ts +40 -0
- package/build/module/lib/agent-core/harness/skills.js +266 -0
- package/build/module/lib/agent-core/harness/system-prompt.d.ts +2 -0
- package/build/module/lib/agent-core/harness/system-prompt.js +30 -0
- package/build/module/lib/agent-core/harness/types.d.ts +524 -0
- package/build/module/lib/agent-core/harness/types.js +16 -0
- package/build/module/lib/agent-core/harness/utils/shell-output.d.ts +13 -0
- package/build/module/lib/agent-core/harness/utils/shell-output.js +101 -0
- package/build/module/lib/agent-core/harness/utils/truncate.d.ts +69 -0
- package/build/module/lib/agent-core/harness/utils/truncate.js +208 -0
- package/build/module/lib/agent-core/index.d.ts +19 -0
- package/build/module/lib/agent-core/index.js +25 -0
- package/build/module/lib/agent-core/proxy.d.ts +68 -0
- package/build/module/lib/agent-core/proxy.js +294 -0
- package/build/module/lib/agent-core/types.d.ts +385 -0
- package/build/module/lib/agent-core/types.js +2 -0
- package/build/module/lib/tools/PSRetrievalTool.d.ts +127 -0
- package/build/module/lib/tools/PSRetrievalTool.js +172 -0
- package/build/module/lib/tools/PSSkillTool.js +1 -1
- package/build/module/lib/utils/helpers.d.ts +34 -0
- package/build/module/lib/utils/helpers.js +280 -1
- package/package.json +20 -3
|
@@ -8,17 +8,21 @@ exports.PSAgentLogger = void 0;
|
|
|
8
8
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
9
9
|
const debuglogger_1 = __importDefault(require("./utils/debuglogger"));
|
|
10
10
|
class PSAgentLogger {
|
|
11
|
+
static id = 1000;
|
|
12
|
+
logFn = (0, debuglogger_1.default)('PSAI:');
|
|
13
|
+
logFilePath;
|
|
14
|
+
taskId;
|
|
15
|
+
task;
|
|
11
16
|
constructor(options) {
|
|
12
|
-
|
|
13
|
-
if ((options === null || options === void 0 ? void 0 : options.startcounter) !== undefined) {
|
|
17
|
+
if (options?.startcounter !== undefined) {
|
|
14
18
|
PSAgentLogger.id = options.startcounter;
|
|
15
19
|
}
|
|
16
|
-
if (options
|
|
20
|
+
if (options?.prefix) {
|
|
17
21
|
this.logFn = (0, debuglogger_1.default)(options.prefix);
|
|
18
22
|
}
|
|
19
|
-
this.logFilePath = options
|
|
20
|
-
this.taskId = options
|
|
21
|
-
this.task = options
|
|
23
|
+
this.logFilePath = options?.logFilePath;
|
|
24
|
+
this.taskId = options?.taskId;
|
|
25
|
+
this.task = options?.task;
|
|
22
26
|
}
|
|
23
27
|
log(type, message, ...optionalParams) {
|
|
24
28
|
const logId = PSAgentLogger.id++;
|
|
@@ -31,7 +35,7 @@ class PSAgentLogger {
|
|
|
31
35
|
taskId: this.taskId,
|
|
32
36
|
task: this.task,
|
|
33
37
|
message,
|
|
34
|
-
params:
|
|
38
|
+
params: { ...optionalParams },
|
|
35
39
|
})}\n`, { encoding: 'utf-8' });
|
|
36
40
|
return logId;
|
|
37
41
|
}
|
|
@@ -70,5 +74,4 @@ class PSAgentLogger {
|
|
|
70
74
|
}
|
|
71
75
|
}
|
|
72
76
|
exports.PSAgentLogger = PSAgentLogger;
|
|
73
|
-
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUFNBZ2VudExvZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvUFNBZ2VudExvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx1REFBdUQ7QUFDdkQsc0RBQXlCO0FBRXpCLHNFQUE4QztBQWtCOUMsTUFBYSxhQUFhO0lBTXhCLFlBQVksT0FNWDtRQVZPLFVBQUssR0FBRyxJQUFBLHFCQUFXLEVBQUMsT0FBTyxDQUFDLENBQUM7UUFXbkMsSUFBSSxDQUFBLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxZQUFZLE1BQUssU0FBUyxFQUFFLENBQUM7WUFDeEMsYUFBYSxDQUFDLEVBQUUsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDO1FBQzFDLENBQUM7UUFDRCxJQUFJLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxNQUFNLEVBQUUsQ0FBQztZQUNwQixJQUFJLENBQUMsS0FBSyxHQUFHLElBQUEscUJBQVcsRUFBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDM0MsQ0FBQztRQUNELElBQUksQ0FBQyxXQUFXLEdBQUcsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLFdBQVcsQ0FBQztRQUN4QyxJQUFJLENBQUMsTUFBTSxHQUFHLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxNQUFNLENBQUM7UUFDOUIsSUFBSSxDQUFDLElBQUksR0FBRyxPQUFPLGFBQVAsT0FBTyx1QkFBUCxPQUFPLENBQUUsSUFBSSxDQUFDO0lBQzVCLENBQUM7SUFFRCxHQUFHLENBQUMsSUFBWSxFQUFFLE9BQVksRUFBRSxHQUFHLGNBQXFCO1FBQ3RELE1BQU0sS0FBSyxHQUFHLGFBQWEsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNqQyxJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNyQixNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7WUFD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
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUFNBZ2VudExvZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvUFNBZ2VudExvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx1REFBdUQ7QUFDdkQsc0RBQXlCO0FBRXpCLHNFQUE4QztBQWtCOUMsTUFBYSxhQUFhO0lBQ3hCLE1BQU0sQ0FBQyxFQUFFLEdBQUcsSUFBSSxDQUFDO0lBQ1QsS0FBSyxHQUFHLElBQUEscUJBQVcsRUFBQyxPQUFPLENBQUMsQ0FBQztJQUNwQixXQUFXLENBQXFCO0lBQ3pDLE1BQU0sQ0FBVTtJQUNoQixJQUFJLENBQVU7SUFDdEIsWUFBWSxPQU1YO1FBQ0MsSUFBSSxPQUFPLEVBQUUsWUFBWSxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQ3hDLGFBQWEsQ0FBQyxFQUFFLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQztRQUMxQyxDQUFDO1FBQ0QsSUFBSSxPQUFPLEVBQUUsTUFBTSxFQUFFLENBQUM7WUFDcEIsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFBLHFCQUFXLEVBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzNDLENBQUM7UUFDRCxJQUFJLENBQUMsV0FBVyxHQUFHLE9BQU8sRUFBRSxXQUFXLENBQUM7UUFDeEMsSUFBSSxDQUFDLE1BQU0sR0FBRyxPQUFPLEVBQUUsTUFBTSxDQUFDO1FBQzlCLElBQUksQ0FBQyxJQUFJLEdBQUcsT0FBTyxFQUFFLElBQUksQ0FBQztJQUM1QixDQUFDO0lBRUQsR0FBRyxDQUFDLElBQVksRUFBRSxPQUFZLEVBQUUsR0FBRyxjQUFxQjtRQUN0RCxNQUFNLEtBQUssR0FBRyxhQUFhLENBQUMsRUFBRSxFQUFFLENBQUM7UUFDakMsSUFBSSxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDckIsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ3ZCLGlCQUFFLENBQUMsY0FBYyxDQUNmLElB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
|
|
@@ -2,6 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PSAgentTask = void 0;
|
|
4
4
|
class PSAgentTask {
|
|
5
|
+
name;
|
|
6
|
+
description;
|
|
7
|
+
examples;
|
|
5
8
|
constructor(name, description, examples) {
|
|
6
9
|
this.name = name;
|
|
7
10
|
this.description = description;
|
|
@@ -27,4 +30,4 @@ class PSAgentTask {
|
|
|
27
30
|
}
|
|
28
31
|
}
|
|
29
32
|
exports.PSAgentTask = PSAgentTask;
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUFNBZ2VudFRhc2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL1BTQWdlbnRUYXNrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLE1BQWEsV0FBVztJQUNkLElBQUksQ0FBUztJQUNiLFdBQVcsQ0FBUztJQUNwQixRQUFRLENBQVk7SUFDNUIsWUFBWSxJQUFZLEVBQUUsV0FBbUIsRUFBRSxRQUFtQjtRQUNoRSxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsV0FBVyxHQUFHLFdBQVcsQ0FBQztRQUMvQixJQUFJLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQztJQUMzQixDQUFDO0lBQ0QsSUFBVyxJQUFJO1FBQ2IsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDO0lBQ25CLENBQUM7SUFDRCxJQUFXLElBQUksQ0FBQyxLQUFhO1FBQzNCLElBQUksQ0FBQyxJQUFJLEdBQUcsS0FBSyxDQUFDO0lBQ3BCLENBQUM7SUFDRCxJQUFXLFdBQVc7UUFDcEIsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDO0lBQzFCLENBQUM7SUFDRCxJQUFXLFdBQVcsQ0FBQyxLQUFhO1FBQ2xDLElBQUksQ0FBQyxXQUFXLEdBQUcsS0FBSyxDQUFDO0lBQzNCLENBQUM7SUFDRCxJQUFXLFFBQVE7UUFDakIsT0FBTyxJQUFJLENBQUMsUUFBUSxJQUFJLEVBQUUsQ0FBQztJQUM3QixDQUFDO0lBQ0QsSUFBVyxRQUFRLENBQUMsS0FBZTtRQUNqQyxJQUFJLENBQUMsUUFBUSxHQUFHLEtBQUssSUFBSSxFQUFFLENBQUM7SUFDOUIsQ0FBQztDQUNGO0FBM0JELGtDQTJCQyJ9
|
|
@@ -3,6 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.PSAgentTool = void 0;
|
|
4
4
|
const helpers_1 = require("./utils/helpers");
|
|
5
5
|
class PSAgentTool {
|
|
6
|
+
name;
|
|
7
|
+
description;
|
|
8
|
+
type;
|
|
9
|
+
local_execution;
|
|
10
|
+
hitl;
|
|
11
|
+
inputschema;
|
|
12
|
+
runCallback;
|
|
6
13
|
constructor({ name, description, type = 'API', local_execution = true, hitl = true, inputschema, runCallback, }) {
|
|
7
14
|
this.name = name;
|
|
8
15
|
this.description = description;
|
|
@@ -52,7 +59,10 @@ class PSAgentTool {
|
|
|
52
59
|
this.hitl = value;
|
|
53
60
|
}
|
|
54
61
|
get Inputs() {
|
|
55
|
-
return
|
|
62
|
+
return {
|
|
63
|
+
...this.inputschema,
|
|
64
|
+
requestBody: (0, helpers_1.removeSchemaMetadata)(this.inputschema.requestBody),
|
|
65
|
+
};
|
|
56
66
|
}
|
|
57
67
|
set Inputs(value) {
|
|
58
68
|
this.inputschema = value;
|
|
@@ -82,4 +92,4 @@ class PSAgentTool {
|
|
|
82
92
|
}
|
|
83
93
|
}
|
|
84
94
|
exports.PSAgentTool = PSAgentTool;
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUFNBZ2VudFRvb2wuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL1BTQWdlbnRUb29sLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUlBLDZDQUF1RDtBQWV2RCxNQUFhLFdBQVc7SUFDZCxJQUFJLENBQVM7SUFDYixXQUFXLENBQVM7SUFDcEIsSUFBSSxDQUFTO0lBQ2IsZUFBZSxDQUFVO0lBQ3pCLElBQUksQ0FJVjtJQUNNLFdBQVcsQ0FBb0I7SUFDL0IsV0FBVyxDQUdlO0lBRWxDLFlBQVksRUFDVixJQUFJLEVBQ0osV0FBVyxFQUNYLElBQUksR0FBRyxLQUFLLEVBQ1osZUFBZSxHQUFHLElBQUksRUFDdEIsSUFBSSxHQUFHLElBQUksRUFDWCxXQUFXLEVBQ1gsV0FBVyxHQVlaO1FBQ0MsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7UUFDakIsSUFBSSxDQUFDLFdBQVcsR0FBRyxXQUFXLENBQUM7UUFDL0IsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7UUFDakIsSUFBSSxDQUFDLGVBQWUsR0FBRyxlQUFlLENBQUM7UUFDdkMsSUFBSSxDQUFDLElBQUksR0FBRztZQUNWLFFBQVEsRUFBRSxJQUFJO1lBQ2QsU0FBUyxFQUFFLFFBQVE7WUFDbkIsS0FBSyxFQUFFLENBQUM7U0FDVCxDQUFDO1FBQ0YsSUFBSSxDQUFDLFdBQVcsR0FBRyxXQUFXLENBQUM7UUFDL0IsSUFBSSxXQUFXLEVBQUUsQ0FBQztZQUNoQixJQUFJLE9BQU8sV0FBVyxLQUFLLFVBQVUsRUFBRSxDQUFDO2dCQUN0QyxNQUFNLElBQUksS0FBSyxDQUFDLGdDQUFnQyxDQUFDLENBQUM7WUFDcEQsQ0FBQztZQUNELElBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO1FBQ2pDLENBQUM7SUFDSCxDQUFDO0lBQ0QsSUFBVyxJQUFJO1FBQ2IsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDO0lBQ25CLENBQUM7SUFDRCxJQUFXLElBQUksQ0FBQyxLQUFhO1FBQzNCLElBQUksQ0FBQyxJQUFJLEdBQUcsS0FBSyxDQUFDO0lBQ3BCLENBQUM7SUFDRCxJQUFXLFdBQVc7UUFDcEIsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDO0lBQzFCLENBQUM7SUFDRCxJQUFXLFdBQVcsQ0FBQyxLQUFhO1FBQ2xDLElBQUksQ0FBQyxXQUFXLEdBQUcsS0FBSyxDQUFDO0lBQzNCLENBQUM7SUFDRCxJQUFXLElBQUk7UUFDYixPQUFPLElBQUksQ0FBQyxJQUFJLENBQUM7SUFDbkIsQ0FBQztJQUNELElBQVcsSUFBSSxDQUFDLEtBQWE7UUFDM0IsSUFBSSxDQUFDLElBQUksR0FBRyxLQUFLLENBQUM7SUFDcEIsQ0FBQztJQUNELElBQVcsY0FBYztRQUN2QixPQUFPLElBQUksQ0FBQyxlQUFlLENBQUM7SUFDOUIsQ0FBQztJQUNELElBQVcsY0FBYyxDQUFDLEtBQWM7UUFDdEMsSUFBSSxDQUFDLGVBQWUsR0FBRyxLQUFLLENBQUM7SUFDL0IsQ0FBQztJQUNELElBQVcsSUFBSTtRQUNiLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQztJQUNuQixDQUFDO0lBQ0QsSUFBVyxJQUFJLENBQUMsS0FJZjtRQUNDLElBQUksQ0FBQyxJQUFJLEdBQUcsS0FBSyxDQUFDO0lBQ3BCLENBQUM7SUFDRCxJQUFXLE1BQU07UUFDZixPQUFPO1lBQ0wsR0FBRyxJQUFJLENBQUMsV0FBVztZQUNuQixXQUFXLEVBQUUsSUFBQSw4QkFBb0IsRUFBQyxJQUFJLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FBQztTQUNoRSxDQUFDO0lBQ0osQ0FBQztJQUNELElBQVcsTUFBTSxDQUFDLEtBQXdCO1FBQ3hDLElBQUksQ0FBQyxXQUFXLEdBQUcsS0FBSyxDQUFDO0lBQzNCLENBQUM7SUFFTSxHQUFHLENBQ1IsS0FBMEIsRUFDMUIsR0FBbUI7UUFFbkIsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN0QixNQUFNLElBQUksS0FBSyxDQUFDLG9EQUFvRCxDQUFDLENBQUM7UUFDeEUsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUVNLE1BQU0sQ0FBQyxTQUFTLENBQUMsRUFDdEIsSUFBSSxFQUNKLFdBQVcsRUFDWCxhQUFhLEVBQ2IsV0FBVyxHQVNaO1FBQ0MsT0FBTyxJQUFJLFdBQVcsQ0FBQztZQUNyQixJQUFJO1lBQ0osV0FBVztZQUNYLElBQUksRUFBRSxLQUFLO1lBQ1gsZUFBZSxFQUFFLElBQUk7WUFDckIsSUFBSSxFQUFFLElBQUk7WUFDVixXQUFXLEVBQUU7Z0JBQ1gsMkJBQTJCO2dCQUMzQiwwQ0FBMEM7Z0JBQzFDLEdBQUcsRUFBRSxvQkFBb0IsSUFBSSxFQUFFO2dCQUMvQixNQUFNLEVBQUUsTUFBTTtnQkFDZCxXQUFXLEVBQUUsYUFBYTthQUMzQjtZQUNELFdBQVc7U0FDWixDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0Y7QUF6SUQsa0NBeUlDIn0=
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Agent loop that works with AgentMessage throughout.
|
|
3
|
+
* Transforms to Message[] only at the LLM call boundary.
|
|
4
|
+
*/
|
|
5
|
+
import { EventStream } from '@earendil-works/pi-ai';
|
|
6
|
+
import type { AgentContext, AgentEvent, AgentLoopConfig, AgentMessage, StreamFn } from './types.js';
|
|
7
|
+
export type AgentEventSink = (event: AgentEvent) => Promise<void> | void;
|
|
8
|
+
/**
|
|
9
|
+
* Start an agent loop with a new prompt message.
|
|
10
|
+
* The prompt is added to the context and events are emitted for it.
|
|
11
|
+
*/
|
|
12
|
+
export declare function agentLoop(prompts: AgentMessage[], context: AgentContext, config: AgentLoopConfig, signal?: AbortSignal, streamFn?: StreamFn): EventStream<AgentEvent, AgentMessage[]>;
|
|
13
|
+
/**
|
|
14
|
+
* Continue an agent loop from the current context without adding a new message.
|
|
15
|
+
* Used for retries - context already has user message or tool results.
|
|
16
|
+
*
|
|
17
|
+
* **Important:** The last message in context must convert to a `user` or `toolResult` message
|
|
18
|
+
* via `convertToLlm`. If it doesn't, the LLM provider will reject the request.
|
|
19
|
+
* This cannot be validated here since `convertToLlm` is only called once per turn.
|
|
20
|
+
*/
|
|
21
|
+
export declare function agentLoopContinue(context: AgentContext, config: AgentLoopConfig, signal?: AbortSignal, streamFn?: StreamFn): EventStream<AgentEvent, AgentMessage[]>;
|
|
22
|
+
export declare function runAgentLoop(prompts: AgentMessage[], context: AgentContext, config: AgentLoopConfig, emit: AgentEventSink, signal?: AbortSignal, streamFn?: StreamFn): Promise<AgentMessage[]>;
|
|
23
|
+
export declare function runAgentLoopContinue(context: AgentContext, config: AgentLoopConfig, emit: AgentEventSink, signal?: AbortSignal, streamFn?: StreamFn): Promise<AgentMessage[]>;
|
|
@@ -0,0 +1,483 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Agent loop that works with AgentMessage throughout.
|
|
3
|
+
* Transforms to Message[] only at the LLM call boundary.
|
|
4
|
+
*/
|
|
5
|
+
import { EventStream, streamSimple, validateToolArguments, } from '@earendil-works/pi-ai';
|
|
6
|
+
/**
|
|
7
|
+
* Start an agent loop with a new prompt message.
|
|
8
|
+
* The prompt is added to the context and events are emitted for it.
|
|
9
|
+
*/
|
|
10
|
+
export function agentLoop(prompts, context, config, signal, streamFn) {
|
|
11
|
+
const stream = createAgentStream();
|
|
12
|
+
void runAgentLoop(prompts, context, config, async (event) => {
|
|
13
|
+
stream.push(event);
|
|
14
|
+
}, signal, streamFn).then((messages) => {
|
|
15
|
+
stream.end(messages);
|
|
16
|
+
});
|
|
17
|
+
return stream;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Continue an agent loop from the current context without adding a new message.
|
|
21
|
+
* Used for retries - context already has user message or tool results.
|
|
22
|
+
*
|
|
23
|
+
* **Important:** The last message in context must convert to a `user` or `toolResult` message
|
|
24
|
+
* via `convertToLlm`. If it doesn't, the LLM provider will reject the request.
|
|
25
|
+
* This cannot be validated here since `convertToLlm` is only called once per turn.
|
|
26
|
+
*/
|
|
27
|
+
export function agentLoopContinue(context, config, signal, streamFn) {
|
|
28
|
+
if (context.messages.length === 0) {
|
|
29
|
+
throw new Error('Cannot continue: no messages in context');
|
|
30
|
+
}
|
|
31
|
+
if (context.messages[context.messages.length - 1].role === 'assistant') {
|
|
32
|
+
throw new Error('Cannot continue from message role: assistant');
|
|
33
|
+
}
|
|
34
|
+
const stream = createAgentStream();
|
|
35
|
+
void runAgentLoopContinue(context, config, async (event) => {
|
|
36
|
+
stream.push(event);
|
|
37
|
+
}, signal, streamFn).then((messages) => {
|
|
38
|
+
stream.end(messages);
|
|
39
|
+
});
|
|
40
|
+
return stream;
|
|
41
|
+
}
|
|
42
|
+
export async function runAgentLoop(prompts, context, config, emit, signal, streamFn) {
|
|
43
|
+
const newMessages = [...prompts];
|
|
44
|
+
const currentContext = {
|
|
45
|
+
...context,
|
|
46
|
+
messages: [...context.messages, ...prompts],
|
|
47
|
+
};
|
|
48
|
+
await emit({ type: 'agent_start' });
|
|
49
|
+
await emit({ type: 'turn_start' });
|
|
50
|
+
for (const prompt of prompts) {
|
|
51
|
+
await emit({ type: 'message_start', message: prompt });
|
|
52
|
+
await emit({ type: 'message_end', message: prompt });
|
|
53
|
+
}
|
|
54
|
+
await runLoop(currentContext, newMessages, config, signal, emit, streamFn);
|
|
55
|
+
return newMessages;
|
|
56
|
+
}
|
|
57
|
+
export async function runAgentLoopContinue(context, config, emit, signal, streamFn) {
|
|
58
|
+
if (context.messages.length === 0) {
|
|
59
|
+
throw new Error('Cannot continue: no messages in context');
|
|
60
|
+
}
|
|
61
|
+
if (context.messages[context.messages.length - 1].role === 'assistant') {
|
|
62
|
+
throw new Error('Cannot continue from message role: assistant');
|
|
63
|
+
}
|
|
64
|
+
const newMessages = [];
|
|
65
|
+
const currentContext = { ...context };
|
|
66
|
+
await emit({ type: 'agent_start' });
|
|
67
|
+
await emit({ type: 'turn_start' });
|
|
68
|
+
await runLoop(currentContext, newMessages, config, signal, emit, streamFn);
|
|
69
|
+
return newMessages;
|
|
70
|
+
}
|
|
71
|
+
function createAgentStream() {
|
|
72
|
+
return new EventStream((event) => event.type === 'agent_end', (event) => (event.type === 'agent_end' ? event.messages : []));
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Main loop logic shared by agentLoop and agentLoopContinue.
|
|
76
|
+
*/
|
|
77
|
+
async function runLoop(initialContext, newMessages, initialConfig, signal, emit, streamFn) {
|
|
78
|
+
let currentContext = initialContext;
|
|
79
|
+
let config = initialConfig;
|
|
80
|
+
let firstTurn = true;
|
|
81
|
+
// Check for steering messages at start (user may have typed while waiting)
|
|
82
|
+
let pendingMessages = (await config.getSteeringMessages?.()) || [];
|
|
83
|
+
// Outer loop: continues when queued follow-up messages arrive after agent would stop
|
|
84
|
+
while (true) {
|
|
85
|
+
let hasMoreToolCalls = true;
|
|
86
|
+
// Inner loop: process tool calls and steering messages
|
|
87
|
+
while (hasMoreToolCalls || pendingMessages.length > 0) {
|
|
88
|
+
if (!firstTurn) {
|
|
89
|
+
await emit({ type: 'turn_start' });
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
firstTurn = false;
|
|
93
|
+
}
|
|
94
|
+
// Process pending messages (inject before next assistant response)
|
|
95
|
+
if (pendingMessages.length > 0) {
|
|
96
|
+
for (const message of pendingMessages) {
|
|
97
|
+
await emit({ type: 'message_start', message });
|
|
98
|
+
await emit({ type: 'message_end', message });
|
|
99
|
+
currentContext.messages.push(message);
|
|
100
|
+
newMessages.push(message);
|
|
101
|
+
}
|
|
102
|
+
pendingMessages = [];
|
|
103
|
+
}
|
|
104
|
+
// Stream assistant response
|
|
105
|
+
const message = await streamAssistantResponse(currentContext, config, signal, emit, streamFn);
|
|
106
|
+
newMessages.push(message);
|
|
107
|
+
if (message.stopReason === 'error' || message.stopReason === 'aborted') {
|
|
108
|
+
await emit({ type: 'turn_end', message, toolResults: [] });
|
|
109
|
+
await emit({ type: 'agent_end', messages: newMessages });
|
|
110
|
+
return;
|
|
111
|
+
}
|
|
112
|
+
// Check for tool calls
|
|
113
|
+
const toolCalls = message.content.filter((c) => c.type === 'toolCall');
|
|
114
|
+
const toolResults = [];
|
|
115
|
+
hasMoreToolCalls = false;
|
|
116
|
+
if (toolCalls.length > 0) {
|
|
117
|
+
const executedToolBatch = await executeToolCalls(currentContext, message, config, signal, emit);
|
|
118
|
+
toolResults.push(...executedToolBatch.messages);
|
|
119
|
+
hasMoreToolCalls = !executedToolBatch.terminate;
|
|
120
|
+
for (const result of toolResults) {
|
|
121
|
+
currentContext.messages.push(result);
|
|
122
|
+
newMessages.push(result);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
await emit({ type: 'turn_end', message, toolResults });
|
|
126
|
+
const nextTurnContext = {
|
|
127
|
+
message,
|
|
128
|
+
toolResults,
|
|
129
|
+
context: currentContext,
|
|
130
|
+
newMessages,
|
|
131
|
+
};
|
|
132
|
+
const nextTurnSnapshot = await config.prepareNextTurn?.(nextTurnContext);
|
|
133
|
+
if (nextTurnSnapshot) {
|
|
134
|
+
currentContext = nextTurnSnapshot.context ?? currentContext;
|
|
135
|
+
config = {
|
|
136
|
+
...config,
|
|
137
|
+
model: nextTurnSnapshot.model ?? config.model,
|
|
138
|
+
reasoning: nextTurnSnapshot.thinkingLevel === undefined
|
|
139
|
+
? config.reasoning
|
|
140
|
+
: nextTurnSnapshot.thinkingLevel === 'off'
|
|
141
|
+
? undefined
|
|
142
|
+
: nextTurnSnapshot.thinkingLevel,
|
|
143
|
+
};
|
|
144
|
+
}
|
|
145
|
+
if (await config.shouldStopAfterTurn?.({
|
|
146
|
+
message,
|
|
147
|
+
toolResults,
|
|
148
|
+
context: currentContext,
|
|
149
|
+
newMessages,
|
|
150
|
+
})) {
|
|
151
|
+
await emit({ type: 'agent_end', messages: newMessages });
|
|
152
|
+
return;
|
|
153
|
+
}
|
|
154
|
+
pendingMessages = (await config.getSteeringMessages?.()) || [];
|
|
155
|
+
}
|
|
156
|
+
// Agent would stop here. Check for follow-up messages.
|
|
157
|
+
const followUpMessages = (await config.getFollowUpMessages?.()) || [];
|
|
158
|
+
if (followUpMessages.length > 0) {
|
|
159
|
+
// Set as pending so inner loop processes them
|
|
160
|
+
pendingMessages = followUpMessages;
|
|
161
|
+
continue;
|
|
162
|
+
}
|
|
163
|
+
// No more messages, exit
|
|
164
|
+
break;
|
|
165
|
+
}
|
|
166
|
+
await emit({ type: 'agent_end', messages: newMessages });
|
|
167
|
+
}
|
|
168
|
+
/**
|
|
169
|
+
* Stream an assistant response from the LLM.
|
|
170
|
+
* This is where AgentMessage[] gets transformed to Message[] for the LLM.
|
|
171
|
+
*/
|
|
172
|
+
async function streamAssistantResponse(context, config, signal, emit, streamFn) {
|
|
173
|
+
// Apply context transform if configured (AgentMessage[] → AgentMessage[])
|
|
174
|
+
let messages = context.messages;
|
|
175
|
+
if (config.transformContext) {
|
|
176
|
+
messages = await config.transformContext(messages, signal);
|
|
177
|
+
}
|
|
178
|
+
// Convert to LLM-compatible messages (AgentMessage[] → Message[])
|
|
179
|
+
const llmMessages = await config.convertToLlm(messages);
|
|
180
|
+
// Build LLM context
|
|
181
|
+
const llmContext = {
|
|
182
|
+
systemPrompt: context.systemPrompt,
|
|
183
|
+
messages: llmMessages,
|
|
184
|
+
tools: context.tools,
|
|
185
|
+
};
|
|
186
|
+
const streamFunction = streamFn || streamSimple;
|
|
187
|
+
// Resolve API key (important for expiring tokens)
|
|
188
|
+
const resolvedApiKey = (config.getApiKey
|
|
189
|
+
? await config.getApiKey(config.model.provider)
|
|
190
|
+
: undefined) || config.apiKey;
|
|
191
|
+
const response = await streamFunction(config.model, llmContext, {
|
|
192
|
+
...config,
|
|
193
|
+
apiKey: resolvedApiKey,
|
|
194
|
+
signal,
|
|
195
|
+
});
|
|
196
|
+
let partialMessage = null;
|
|
197
|
+
let addedPartial = false;
|
|
198
|
+
for await (const event of response) {
|
|
199
|
+
switch (event.type) {
|
|
200
|
+
case 'start':
|
|
201
|
+
partialMessage = event.partial;
|
|
202
|
+
context.messages.push(partialMessage);
|
|
203
|
+
addedPartial = true;
|
|
204
|
+
await emit({ type: 'message_start', message: { ...partialMessage } });
|
|
205
|
+
break;
|
|
206
|
+
case 'text_start':
|
|
207
|
+
case 'text_delta':
|
|
208
|
+
case 'text_end':
|
|
209
|
+
case 'thinking_start':
|
|
210
|
+
case 'thinking_delta':
|
|
211
|
+
case 'thinking_end':
|
|
212
|
+
case 'toolcall_start':
|
|
213
|
+
case 'toolcall_delta':
|
|
214
|
+
case 'toolcall_end':
|
|
215
|
+
if (partialMessage) {
|
|
216
|
+
partialMessage = event.partial;
|
|
217
|
+
context.messages[context.messages.length - 1] = partialMessage;
|
|
218
|
+
await emit({
|
|
219
|
+
type: 'message_update',
|
|
220
|
+
assistantMessageEvent: event,
|
|
221
|
+
message: { ...partialMessage },
|
|
222
|
+
});
|
|
223
|
+
}
|
|
224
|
+
break;
|
|
225
|
+
case 'done':
|
|
226
|
+
case 'error': {
|
|
227
|
+
const finalMessage = await response.result();
|
|
228
|
+
if (addedPartial) {
|
|
229
|
+
context.messages[context.messages.length - 1] = finalMessage;
|
|
230
|
+
}
|
|
231
|
+
else {
|
|
232
|
+
context.messages.push(finalMessage);
|
|
233
|
+
}
|
|
234
|
+
if (!addedPartial) {
|
|
235
|
+
await emit({ type: 'message_start', message: { ...finalMessage } });
|
|
236
|
+
}
|
|
237
|
+
await emit({ type: 'message_end', message: finalMessage });
|
|
238
|
+
return finalMessage;
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
const finalMessage = await response.result();
|
|
243
|
+
if (addedPartial) {
|
|
244
|
+
context.messages[context.messages.length - 1] = finalMessage;
|
|
245
|
+
}
|
|
246
|
+
else {
|
|
247
|
+
context.messages.push(finalMessage);
|
|
248
|
+
await emit({ type: 'message_start', message: { ...finalMessage } });
|
|
249
|
+
}
|
|
250
|
+
await emit({ type: 'message_end', message: finalMessage });
|
|
251
|
+
return finalMessage;
|
|
252
|
+
}
|
|
253
|
+
/**
|
|
254
|
+
* Execute tool calls from an assistant message.
|
|
255
|
+
*/
|
|
256
|
+
async function executeToolCalls(currentContext, assistantMessage, config, signal, emit) {
|
|
257
|
+
const toolCalls = assistantMessage.content.filter((c) => c.type === 'toolCall');
|
|
258
|
+
const hasSequentialToolCall = toolCalls.some((tc) => currentContext.tools?.find((t) => t.name === tc.name)?.executionMode ===
|
|
259
|
+
'sequential');
|
|
260
|
+
if (config.toolExecution === 'sequential' || hasSequentialToolCall) {
|
|
261
|
+
return executeToolCallsSequential(currentContext, assistantMessage, toolCalls, config, signal, emit);
|
|
262
|
+
}
|
|
263
|
+
return executeToolCallsParallel(currentContext, assistantMessage, toolCalls, config, signal, emit);
|
|
264
|
+
}
|
|
265
|
+
async function executeToolCallsSequential(currentContext, assistantMessage, toolCalls, config, signal, emit) {
|
|
266
|
+
const finalizedCalls = [];
|
|
267
|
+
const messages = [];
|
|
268
|
+
for (const toolCall of toolCalls) {
|
|
269
|
+
await emit({
|
|
270
|
+
type: 'tool_execution_start',
|
|
271
|
+
toolCallId: toolCall.id,
|
|
272
|
+
toolName: toolCall.name,
|
|
273
|
+
args: toolCall.arguments,
|
|
274
|
+
});
|
|
275
|
+
const preparation = await prepareToolCall(currentContext, assistantMessage, toolCall, config, signal);
|
|
276
|
+
let finalized;
|
|
277
|
+
if (preparation.kind === 'immediate') {
|
|
278
|
+
finalized = {
|
|
279
|
+
toolCall,
|
|
280
|
+
result: preparation.result,
|
|
281
|
+
isError: preparation.isError,
|
|
282
|
+
};
|
|
283
|
+
}
|
|
284
|
+
else {
|
|
285
|
+
const executed = await executePreparedToolCall(preparation, signal, emit);
|
|
286
|
+
finalized = await finalizeExecutedToolCall(currentContext, assistantMessage, preparation, executed, config, signal);
|
|
287
|
+
}
|
|
288
|
+
await emitToolExecutionEnd(finalized, emit);
|
|
289
|
+
const toolResultMessage = createToolResultMessage(finalized);
|
|
290
|
+
await emitToolResultMessage(toolResultMessage, emit);
|
|
291
|
+
finalizedCalls.push(finalized);
|
|
292
|
+
messages.push(toolResultMessage);
|
|
293
|
+
}
|
|
294
|
+
return {
|
|
295
|
+
messages,
|
|
296
|
+
terminate: shouldTerminateToolBatch(finalizedCalls),
|
|
297
|
+
};
|
|
298
|
+
}
|
|
299
|
+
async function executeToolCallsParallel(currentContext, assistantMessage, toolCalls, config, signal, emit) {
|
|
300
|
+
const finalizedCalls = [];
|
|
301
|
+
for (const toolCall of toolCalls) {
|
|
302
|
+
await emit({
|
|
303
|
+
type: 'tool_execution_start',
|
|
304
|
+
toolCallId: toolCall.id,
|
|
305
|
+
toolName: toolCall.name,
|
|
306
|
+
args: toolCall.arguments,
|
|
307
|
+
});
|
|
308
|
+
const preparation = await prepareToolCall(currentContext, assistantMessage, toolCall, config, signal);
|
|
309
|
+
if (preparation.kind === 'immediate') {
|
|
310
|
+
const finalized = {
|
|
311
|
+
toolCall,
|
|
312
|
+
result: preparation.result,
|
|
313
|
+
isError: preparation.isError,
|
|
314
|
+
};
|
|
315
|
+
await emitToolExecutionEnd(finalized, emit);
|
|
316
|
+
finalizedCalls.push(finalized);
|
|
317
|
+
continue;
|
|
318
|
+
}
|
|
319
|
+
finalizedCalls.push(async () => {
|
|
320
|
+
const executed = await executePreparedToolCall(preparation, signal, emit);
|
|
321
|
+
const finalized = await finalizeExecutedToolCall(currentContext, assistantMessage, preparation, executed, config, signal);
|
|
322
|
+
await emitToolExecutionEnd(finalized, emit);
|
|
323
|
+
return finalized;
|
|
324
|
+
});
|
|
325
|
+
}
|
|
326
|
+
const orderedFinalizedCalls = await Promise.all(finalizedCalls.map((entry) => typeof entry === 'function' ? entry() : Promise.resolve(entry)));
|
|
327
|
+
const messages = [];
|
|
328
|
+
for (const finalized of orderedFinalizedCalls) {
|
|
329
|
+
const toolResultMessage = createToolResultMessage(finalized);
|
|
330
|
+
await emitToolResultMessage(toolResultMessage, emit);
|
|
331
|
+
messages.push(toolResultMessage);
|
|
332
|
+
}
|
|
333
|
+
return {
|
|
334
|
+
messages,
|
|
335
|
+
terminate: shouldTerminateToolBatch(orderedFinalizedCalls),
|
|
336
|
+
};
|
|
337
|
+
}
|
|
338
|
+
function shouldTerminateToolBatch(finalizedCalls) {
|
|
339
|
+
return (finalizedCalls.length > 0 &&
|
|
340
|
+
finalizedCalls.every((finalized) => finalized.result.terminate === true));
|
|
341
|
+
}
|
|
342
|
+
function prepareToolCallArguments(tool, toolCall) {
|
|
343
|
+
if (!tool.prepareArguments) {
|
|
344
|
+
return toolCall;
|
|
345
|
+
}
|
|
346
|
+
const preparedArguments = tool.prepareArguments(toolCall.arguments);
|
|
347
|
+
if (preparedArguments === toolCall.arguments) {
|
|
348
|
+
return toolCall;
|
|
349
|
+
}
|
|
350
|
+
return {
|
|
351
|
+
...toolCall,
|
|
352
|
+
arguments: preparedArguments,
|
|
353
|
+
};
|
|
354
|
+
}
|
|
355
|
+
async function prepareToolCall(currentContext, assistantMessage, toolCall, config, signal) {
|
|
356
|
+
const tool = currentContext.tools?.find((t) => t.name === toolCall.name);
|
|
357
|
+
if (!tool) {
|
|
358
|
+
return {
|
|
359
|
+
kind: 'immediate',
|
|
360
|
+
result: createErrorToolResult(`Tool ${toolCall.name} not found`),
|
|
361
|
+
isError: true,
|
|
362
|
+
};
|
|
363
|
+
}
|
|
364
|
+
try {
|
|
365
|
+
const preparedToolCall = prepareToolCallArguments(tool, toolCall);
|
|
366
|
+
const validatedArgs = validateToolArguments(tool, preparedToolCall);
|
|
367
|
+
if (config.beforeToolCall) {
|
|
368
|
+
const beforeResult = await config.beforeToolCall({
|
|
369
|
+
assistantMessage,
|
|
370
|
+
toolCall,
|
|
371
|
+
args: validatedArgs,
|
|
372
|
+
context: currentContext,
|
|
373
|
+
}, signal);
|
|
374
|
+
if (beforeResult?.block) {
|
|
375
|
+
return {
|
|
376
|
+
kind: 'immediate',
|
|
377
|
+
result: createErrorToolResult(beforeResult.reason || 'Tool execution was blocked'),
|
|
378
|
+
isError: true,
|
|
379
|
+
};
|
|
380
|
+
}
|
|
381
|
+
}
|
|
382
|
+
return {
|
|
383
|
+
kind: 'prepared',
|
|
384
|
+
toolCall,
|
|
385
|
+
tool,
|
|
386
|
+
args: validatedArgs,
|
|
387
|
+
};
|
|
388
|
+
}
|
|
389
|
+
catch (error) {
|
|
390
|
+
return {
|
|
391
|
+
kind: 'immediate',
|
|
392
|
+
result: createErrorToolResult(error instanceof Error ? error.message : String(error)),
|
|
393
|
+
isError: true,
|
|
394
|
+
};
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
async function executePreparedToolCall(prepared, signal, emit) {
|
|
398
|
+
const updateEvents = [];
|
|
399
|
+
try {
|
|
400
|
+
const result = await prepared.tool.execute(prepared.toolCall.id, prepared.args, signal, (partialResult) => {
|
|
401
|
+
updateEvents.push(Promise.resolve(emit({
|
|
402
|
+
type: 'tool_execution_update',
|
|
403
|
+
toolCallId: prepared.toolCall.id,
|
|
404
|
+
toolName: prepared.toolCall.name,
|
|
405
|
+
args: prepared.toolCall.arguments,
|
|
406
|
+
partialResult,
|
|
407
|
+
})));
|
|
408
|
+
});
|
|
409
|
+
await Promise.all(updateEvents);
|
|
410
|
+
return { result, isError: false };
|
|
411
|
+
}
|
|
412
|
+
catch (error) {
|
|
413
|
+
await Promise.all(updateEvents);
|
|
414
|
+
return {
|
|
415
|
+
result: createErrorToolResult(error instanceof Error ? error.message : String(error)),
|
|
416
|
+
isError: true,
|
|
417
|
+
};
|
|
418
|
+
}
|
|
419
|
+
}
|
|
420
|
+
async function finalizeExecutedToolCall(currentContext, assistantMessage, prepared, executed, config, signal) {
|
|
421
|
+
let result = executed.result;
|
|
422
|
+
let isError = executed.isError;
|
|
423
|
+
if (config.afterToolCall) {
|
|
424
|
+
try {
|
|
425
|
+
const afterResult = await config.afterToolCall({
|
|
426
|
+
assistantMessage,
|
|
427
|
+
toolCall: prepared.toolCall,
|
|
428
|
+
args: prepared.args,
|
|
429
|
+
result,
|
|
430
|
+
isError,
|
|
431
|
+
context: currentContext,
|
|
432
|
+
}, signal);
|
|
433
|
+
if (afterResult) {
|
|
434
|
+
result = {
|
|
435
|
+
content: afterResult.content ?? result.content,
|
|
436
|
+
details: afterResult.details ?? result.details,
|
|
437
|
+
terminate: afterResult.terminate ?? result.terminate,
|
|
438
|
+
};
|
|
439
|
+
isError = afterResult.isError ?? isError;
|
|
440
|
+
}
|
|
441
|
+
}
|
|
442
|
+
catch (error) {
|
|
443
|
+
result = createErrorToolResult(error instanceof Error ? error.message : String(error));
|
|
444
|
+
isError = true;
|
|
445
|
+
}
|
|
446
|
+
}
|
|
447
|
+
return {
|
|
448
|
+
toolCall: prepared.toolCall,
|
|
449
|
+
result,
|
|
450
|
+
isError,
|
|
451
|
+
};
|
|
452
|
+
}
|
|
453
|
+
function createErrorToolResult(message) {
|
|
454
|
+
return {
|
|
455
|
+
content: [{ type: 'text', text: message }],
|
|
456
|
+
details: {},
|
|
457
|
+
};
|
|
458
|
+
}
|
|
459
|
+
async function emitToolExecutionEnd(finalized, emit) {
|
|
460
|
+
await emit({
|
|
461
|
+
type: 'tool_execution_end',
|
|
462
|
+
toolCallId: finalized.toolCall.id,
|
|
463
|
+
toolName: finalized.toolCall.name,
|
|
464
|
+
result: finalized.result,
|
|
465
|
+
isError: finalized.isError,
|
|
466
|
+
});
|
|
467
|
+
}
|
|
468
|
+
function createToolResultMessage(finalized) {
|
|
469
|
+
return {
|
|
470
|
+
role: 'toolResult',
|
|
471
|
+
toolCallId: finalized.toolCall.id,
|
|
472
|
+
toolName: finalized.toolCall.name,
|
|
473
|
+
content: finalized.result.content,
|
|
474
|
+
details: finalized.result.details,
|
|
475
|
+
isError: finalized.isError,
|
|
476
|
+
timestamp: Date.now(),
|
|
477
|
+
};
|
|
478
|
+
}
|
|
479
|
+
async function emitToolResultMessage(toolResultMessage, emit) {
|
|
480
|
+
await emit({ type: 'message_start', message: toolResultMessage });
|
|
481
|
+
await emit({ type: 'message_end', message: toolResultMessage });
|
|
482
|
+
}
|
|
483
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"agent-loop.js","sourceRoot":"","sources":["../../../../src/lib/agent-core/agent-loop.ts"],"names":[],"mappings":"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"}
|