agentx-sdk 0.6.1 → 0.6.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/README.md +164 -160
- package/dist/agent.d.ts +5 -3
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +63 -30
- package/dist/agent.js.map +1 -1
- package/dist/config/config.d.ts.map +1 -1
- package/dist/config/config.js +8 -4
- package/dist/config/config.js.map +1 -1
- package/dist/contracts/entities/agent-event.d.ts.map +1 -1
- package/dist/contracts/entities/index.d.ts +1 -1
- package/dist/contracts/entities/index.d.ts.map +1 -1
- package/dist/core/compaction/autocompact.d.ts.map +1 -1
- package/dist/core/compaction/autocompact.js +9 -12
- package/dist/core/compaction/autocompact.js.map +1 -1
- package/dist/core/compaction/microcompact.js +1 -1
- package/dist/core/compaction/microcompact.js.map +1 -1
- package/dist/core/compaction/snip-compact.d.ts.map +1 -1
- package/dist/core/compaction/snip-compact.js.map +1 -1
- package/dist/core/compaction/tool-result-budget.js.map +1 -1
- package/dist/core/context-analysis.js.map +1 -1
- package/dist/core/context-builder.d.ts.map +1 -1
- package/dist/core/context-builder.js +8 -5
- package/dist/core/context-builder.js.map +1 -1
- package/dist/core/conversation-manager.d.ts +1 -1
- package/dist/core/conversation-manager.d.ts.map +1 -1
- package/dist/core/conversation-manager.js +4 -2
- package/dist/core/conversation-manager.js.map +1 -1
- package/dist/core/execution-context.d.ts.map +1 -1
- package/dist/core/execution-context.js.map +1 -1
- package/dist/core/message-normalize.js +1 -1
- package/dist/core/message-normalize.js.map +1 -1
- package/dist/core/prompt-builders.d.ts.map +1 -1
- package/dist/core/prompt-builders.js +2 -2
- package/dist/core/prompt-builders.js.map +1 -1
- package/dist/core/react-loop.d.ts.map +1 -1
- package/dist/core/react-loop.js +79 -23
- package/dist/core/react-loop.js.map +1 -1
- package/dist/core/stream-emitter.js +17 -18
- package/dist/core/stream-emitter.js.map +1 -1
- package/dist/core/streaming-tool-executor.d.ts.map +1 -1
- package/dist/core/streaming-tool-executor.js +18 -8
- package/dist/core/streaming-tool-executor.js.map +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/knowledge/chunking.js +1 -1
- package/dist/knowledge/chunking.js.map +1 -1
- package/dist/knowledge/embedding-service.d.ts.map +1 -1
- package/dist/knowledge/embedding-service.js +5 -2
- package/dist/knowledge/embedding-service.js.map +1 -1
- package/dist/knowledge/knowledge-manager.d.ts.map +1 -1
- package/dist/knowledge/knowledge-manager.js +3 -2
- package/dist/knowledge/knowledge-manager.js.map +1 -1
- package/dist/knowledge/sqlite-vector-store.d.ts.map +1 -1
- package/dist/knowledge/sqlite-vector-store.js +12 -6
- package/dist/knowledge/sqlite-vector-store.js.map +1 -1
- package/dist/llm/errors.d.ts.map +1 -1
- package/dist/llm/errors.js +4 -2
- package/dist/llm/errors.js.map +1 -1
- package/dist/llm/llm-client.d.ts.map +1 -1
- package/dist/llm/llm-client.js +31 -13
- package/dist/llm/llm-client.js.map +1 -1
- package/dist/memory/file-memory-system.d.ts.map +1 -1
- package/dist/memory/file-memory-system.js +34 -17
- package/dist/memory/file-memory-system.js.map +1 -1
- package/dist/memory/memory-extractor.d.ts +9 -9
- package/dist/memory/memory-extractor.d.ts.map +1 -1
- package/dist/memory/memory-extractor.js +4 -2
- package/dist/memory/memory-extractor.js.map +1 -1
- package/dist/memory/memory-paths.d.ts.map +1 -1
- package/dist/memory/memory-paths.js +11 -4
- package/dist/memory/memory-paths.js.map +1 -1
- package/dist/memory/memory-prompts.d.ts.map +1 -1
- package/dist/memory/memory-prompts.js +1 -1
- package/dist/memory/memory-prompts.js.map +1 -1
- package/dist/memory/memory-relevance.d.ts +2 -1
- package/dist/memory/memory-relevance.d.ts.map +1 -1
- package/dist/memory/memory-relevance.js +1 -1
- package/dist/memory/memory-relevance.js.map +1 -1
- package/dist/memory/memory-scanner.d.ts.map +1 -1
- package/dist/memory/memory-scanner.js +7 -6
- package/dist/memory/memory-scanner.js.map +1 -1
- package/dist/memory/memory-tools.d.ts.map +1 -1
- package/dist/memory/memory-tools.js +16 -6
- package/dist/memory/memory-tools.js.map +1 -1
- package/dist/memory/memory-types.js +1 -1
- package/dist/memory/memory-types.js.map +1 -1
- package/dist/skills/skill-glob.js +1 -1
- package/dist/skills/skill-glob.js.map +1 -1
- package/dist/skills/skill-loader.d.ts.map +1 -1
- package/dist/skills/skill-loader.js +29 -25
- package/dist/skills/skill-loader.js.map +1 -1
- package/dist/skills/skill-manager.d.ts.map +1 -1
- package/dist/skills/skill-manager.js +18 -17
- package/dist/skills/skill-manager.js.map +1 -1
- package/dist/storage/sqlite-conversation-store.d.ts.map +1 -1
- package/dist/storage/sqlite-conversation-store.js +15 -7
- package/dist/storage/sqlite-conversation-store.js.map +1 -1
- package/dist/storage/sqlite-database.js +3 -1
- package/dist/storage/sqlite-database.js.map +1 -1
- package/dist/tools/builtin/ask-user.d.ts.map +1 -1
- package/dist/tools/builtin/ask-user.js +4 -1
- package/dist/tools/builtin/ask-user.js.map +1 -1
- package/dist/tools/builtin/bash.d.ts.map +1 -1
- package/dist/tools/builtin/bash.js +5 -3
- package/dist/tools/builtin/bash.js.map +1 -1
- package/dist/tools/builtin/file-edit.d.ts.map +1 -1
- package/dist/tools/builtin/file-edit.js +16 -4
- package/dist/tools/builtin/file-edit.js.map +1 -1
- package/dist/tools/builtin/file-read.d.ts.map +1 -1
- package/dist/tools/builtin/file-read.js +9 -5
- package/dist/tools/builtin/file-read.js.map +1 -1
- package/dist/tools/builtin/file-write.d.ts.map +1 -1
- package/dist/tools/builtin/file-write.js +4 -1
- package/dist/tools/builtin/file-write.js.map +1 -1
- package/dist/tools/builtin/glob.d.ts.map +1 -1
- package/dist/tools/builtin/glob.js +9 -4
- package/dist/tools/builtin/glob.js.map +1 -1
- package/dist/tools/builtin/grep.d.ts.map +1 -1
- package/dist/tools/builtin/grep.js +6 -2
- package/dist/tools/builtin/grep.js.map +1 -1
- package/dist/tools/builtin/path-guard.d.ts.map +1 -1
- package/dist/tools/builtin/path-guard.js.map +1 -1
- package/dist/tools/builtin/web-fetch.d.ts.map +1 -1
- package/dist/tools/builtin/web-fetch.js +16 -8
- package/dist/tools/builtin/web-fetch.js.map +1 -1
- package/dist/tools/json-schema-to-zod.d.ts +2 -2
- package/dist/tools/json-schema-to-zod.d.ts.map +1 -1
- package/dist/tools/json-schema-to-zod.js +3 -5
- package/dist/tools/json-schema-to-zod.js.map +1 -1
- package/dist/tools/mcp-adapter.d.ts +2 -2
- package/dist/tools/mcp-adapter.d.ts.map +1 -1
- package/dist/tools/mcp-adapter.js +40 -24
- package/dist/tools/mcp-adapter.js.map +1 -1
- package/dist/tools/skill-tool.d.ts.map +1 -1
- package/dist/tools/skill-tool.js +12 -13
- package/dist/tools/skill-tool.js.map +1 -1
- package/dist/tools/sql/sql-tool-factory.d.ts.map +1 -1
- package/dist/tools/sql/sql-tool-factory.js +8 -6
- package/dist/tools/sql/sql-tool-factory.js.map +1 -1
- package/dist/tools/tool-executor.d.ts +3 -3
- package/dist/tools/tool-executor.d.ts.map +1 -1
- package/dist/tools/tool-executor.js +17 -8
- package/dist/tools/tool-executor.js.map +1 -1
- package/dist/utils/logger.d.ts.map +1 -1
- package/dist/utils/logger.js.map +1 -1
- package/dist/utils/model-context.js.map +1 -1
- package/dist/utils/retry.d.ts.map +1 -1
- package/dist/utils/retry.js +5 -2
- package/dist/utils/retry.js.map +1 -1
- package/dist/utils/token-counter.d.ts.map +1 -1
- package/dist/utils/token-counter.js.map +1 -1
- package/package.json +22 -3
|
@@ -25,8 +25,8 @@ export function buildContext(options) {
|
|
|
25
25
|
messages.push({ role: 'system', content: systemContent });
|
|
26
26
|
}
|
|
27
27
|
// 3. History — pinned messages always included, then recent messages
|
|
28
|
-
const pinned = history.filter(m => m.pinned).slice(0, maxPinnedMessages);
|
|
29
|
-
const unpinned = history.filter(m => !m.pinned);
|
|
28
|
+
const pinned = history.filter((m) => m.pinned).slice(0, maxPinnedMessages);
|
|
29
|
+
const unpinned = history.filter((m) => !m.pinned);
|
|
30
30
|
// Include pinned first. Track how many did not fit so the caller can surface
|
|
31
31
|
// a warning instead of silently losing critical context.
|
|
32
32
|
let droppedPinnedCount = 0;
|
|
@@ -90,7 +90,7 @@ function chatMessageToLLM(msg) {
|
|
|
90
90
|
content: typeof msg.content === 'string' ? msg.content : contentPartsToLLM(msg.content),
|
|
91
91
|
};
|
|
92
92
|
if (msg.toolCalls) {
|
|
93
|
-
result.tool_calls = msg.toolCalls.map(tc => ({
|
|
93
|
+
result.tool_calls = msg.toolCalls.map((tc) => ({
|
|
94
94
|
id: tc.id,
|
|
95
95
|
type: 'function',
|
|
96
96
|
function: { name: tc.function.name, arguments: tc.function.arguments },
|
|
@@ -106,12 +106,15 @@ function chatMessageToLLM(msg) {
|
|
|
106
106
|
return result;
|
|
107
107
|
}
|
|
108
108
|
function contentPartsToLLM(parts) {
|
|
109
|
-
return parts
|
|
109
|
+
return parts
|
|
110
|
+
.map((p) => {
|
|
110
111
|
if (p.type === 'text')
|
|
111
112
|
return p.text;
|
|
112
113
|
if (p.type === 'image_url' && p.image_url?.url)
|
|
113
114
|
return `[image: ${p.image_url.url}]`;
|
|
114
115
|
return '';
|
|
115
|
-
})
|
|
116
|
+
})
|
|
117
|
+
.filter(Boolean)
|
|
118
|
+
.join('');
|
|
116
119
|
}
|
|
117
120
|
//# sourceMappingURL=context-builder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-builder.js","sourceRoot":"","sources":["../../src/core/context-builder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAiB3D;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,OAO5B;IACC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"context-builder.js","sourceRoot":"","sources":["../../src/core/context-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ export declare class ConversationManager {
|
|
|
10
10
|
/**
|
|
11
11
|
* Acquires mutex for a thread, executes fn, then releases.
|
|
12
12
|
*/
|
|
13
|
-
withThread<T>(threadId: string, fn: () => Promise<T>): Promise<T>;
|
|
13
|
+
withThread<T>(threadId: string, fn: () => T | Promise<T>): Promise<T>;
|
|
14
14
|
appendMessage(message: ChatMessage, threadId: string): void;
|
|
15
15
|
getHistory(threadId: string): ChatMessage[];
|
|
16
16
|
getPinnedMessages(threadId: string): ChatMessage[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-manager.d.ts","sourceRoot":"","sources":["../../src/core/conversation-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AA0BzE;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoB;IAC1C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoC;gBAE9C,KAAK,CAAC,EAAE,iBAAiB;IAIrC;;OAEG;IACG,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation-manager.d.ts","sourceRoot":"","sources":["../../src/core/conversation-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AA0BzE;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoB;IAC1C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoC;gBAE9C,KAAK,CAAC,EAAE,iBAAiB;IAIrC;;OAEG;IACG,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAoB3E,aAAa,CAAC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAI3D,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,EAAE;IAI3C,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,EAAE;IAIlD,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;CAGpC"}
|
|
@@ -12,7 +12,7 @@ class InMemoryConversationStore {
|
|
|
12
12
|
return this.threads.get(threadId) ?? [];
|
|
13
13
|
}
|
|
14
14
|
listPinned(threadId) {
|
|
15
|
-
return this.listThread(threadId).filter(m => m.pinned);
|
|
15
|
+
return this.listThread(threadId).filter((m) => m.pinned);
|
|
16
16
|
}
|
|
17
17
|
clearThread(threadId) {
|
|
18
18
|
this.threads.delete(threadId);
|
|
@@ -36,7 +36,9 @@ export class ConversationManager {
|
|
|
36
36
|
await this.locks.get(threadId);
|
|
37
37
|
}
|
|
38
38
|
let releaseLock;
|
|
39
|
-
const lockPromise = new Promise(resolve => {
|
|
39
|
+
const lockPromise = new Promise((resolve) => {
|
|
40
|
+
releaseLock = resolve;
|
|
41
|
+
});
|
|
40
42
|
this.locks.set(threadId, lockPromise);
|
|
41
43
|
try {
|
|
42
44
|
return await fn();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-manager.js","sourceRoot":"","sources":["../../src/core/conversation-manager.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,yBAAyB;IACZ,OAAO,GAAG,IAAI,GAAG,EAAyB,CAAC;IAE5D,aAAa,CAAC,OAAoB,EAAE,QAAgB;QAClD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,UAAU,CAAC,QAAgB;QACzB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC1C,CAAC;IAED,UAAU,CAAC,QAAgB;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation-manager.js","sourceRoot":"","sources":["../../src/core/conversation-manager.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,yBAAyB;IACZ,OAAO,GAAG,IAAI,GAAG,EAAyB,CAAC;IAE5D,aAAa,CAAC,OAAoB,EAAE,QAAgB;QAClD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,UAAU,CAAC,QAAgB;QACzB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC1C,CAAC;IAED,UAAU,CAAC,QAAgB;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC3D,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,mBAAmB;IACb,KAAK,CAAoB;IACzB,KAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;IAE1D,YAAY,KAAyB;QACnC,IAAI,CAAC,KAAK,GAAG,KAAK,IAAI,IAAI,yBAAyB,EAAE,CAAC;IACxD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU,CAAI,QAAgB,EAAE,EAAwB;QAC5D,4CAA4C;QAC5C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,WAAuB,CAAC;QAC5B,MAAM,WAAW,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAChD,WAAW,GAAG,OAAO,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAEtC,IAAI,CAAC;YACH,OAAO,MAAM,EAAE,EAAE,CAAC;QACpB,CAAC;gBAAS,CAAC;YACT,WAAY,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,aAAa,CAAC,OAAoB,EAAE,QAAgB;QAClD,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,UAAU,CAAC,QAAgB;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,iBAAiB,CAAC,QAAgB;QAChC,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-context.d.ts","sourceRoot":"","sources":["../../src/core/execution-context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,IAAI,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAExG;;GAEG;AACH,wBAAgB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"execution-context.d.ts","sourceRoot":"","sources":["../../src/core/execution-context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,IAAI,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAExG;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,MAAM,GACrB,iBAAiB,CAQnB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-context.js","sourceRoot":"","sources":["../../src/core/execution-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC;;GAEG;AACH,MAAM,UAAU,sBAAsB,
|
|
1
|
+
{"version":3,"file":"execution-context.js","sourceRoot":"","sources":["../../src/core/execution-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,QAAgB,EAChB,KAAa,EACb,aAAsB;IAEtB,OAAO;QACL,OAAO,EAAE,UAAU,EAAE;QACrB,QAAQ;QACR,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,KAAK;QACL,aAAa;KACd,CAAC;AACJ,CAAC"}
|
|
@@ -51,7 +51,7 @@ export function normalizeMessagesForAPI(messages) {
|
|
|
51
51
|
const result = [];
|
|
52
52
|
for (const msg of positionallyValid) {
|
|
53
53
|
if (msg.role === 'assistant' && msg.tool_calls) {
|
|
54
|
-
const validCalls = msg.tool_calls.filter(tc => presentToolResultIds.has(tc.id));
|
|
54
|
+
const validCalls = msg.tool_calls.filter((tc) => presentToolResultIds.has(tc.id));
|
|
55
55
|
if (validCalls.length === 0) {
|
|
56
56
|
if (msg.content && typeof msg.content === 'string' && msg.content.trim()) {
|
|
57
57
|
result.push({ ...msg, tool_calls: undefined });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-normalize.js","sourceRoot":"","sources":["../../src/core/message-normalize.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CAAC,QAA+B;IACrE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,sCAAsC;IACtC,8EAA8E;IAC9E,iFAAiF;IACjF,6EAA6E;IAC7E,wCAAwC;IACxC,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAC1C,MAAM,iBAAiB,GAAiB,EAAE,CAAC;IAC3C,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YAC/C,KAAK,MAAM,EAAE,IAAI,GAAG,CAAC,UAAU;gBAAE,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAC5D,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC5B,SAAS;QACX,CAAC;QACD,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;YAC5C,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC;gBAAE,SAAS,CAAC,qBAAqB;YAC3E,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC5B,SAAS;QACX,CAAC;QACD,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,4EAA4E;IAC5E,uCAAuC;IACvC,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/C,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE,CAAC;QACpC,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;YAC5C,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE,CAAC;QACpC,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YAC/C,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"message-normalize.js","sourceRoot":"","sources":["../../src/core/message-normalize.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-builders.d.ts","sourceRoot":"","sources":["../../src/core/prompt-builders.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAMrE;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"prompt-builders.d.ts","sourceRoot":"","sources":["../../src/core/prompt-builders.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAMrE;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,CAgE/D;AAMD,MAAM,WAAW,eAAe;IAC9B,gCAAgC;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,gCAAgC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uBAAuB;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uCAAuC;IACvC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wCAAwC;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,CAmBpE"}
|
|
@@ -51,12 +51,12 @@ export function buildToolUsagePrompt(tools) {
|
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
// Concurrency hints
|
|
54
|
-
const safeConcurrent = tools.filter(t => typeof t.isConcurrencySafe === 'function' ? false : t.isConcurrencySafe === true);
|
|
54
|
+
const safeConcurrent = tools.filter((t) => typeof t.isConcurrencySafe === 'function' ? false : t.isConcurrencySafe === true);
|
|
55
55
|
if (safeConcurrent.length > 0 && safeConcurrent.length < tools.length) {
|
|
56
56
|
lines.push('');
|
|
57
57
|
lines.push('## Concurrency');
|
|
58
58
|
lines.push('');
|
|
59
|
-
lines.push(`The following tools are safe to call in parallel: ${safeConcurrent.map(t => t.name).join(', ')}. Other tools should be called one at a time.`);
|
|
59
|
+
lines.push(`The following tools are safe to call in parallel: ${safeConcurrent.map((t) => t.name).join(', ')}. Other tools should be called one at a time.`);
|
|
60
60
|
}
|
|
61
61
|
return lines.join('\n');
|
|
62
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-builders.js","sourceRoot":"","sources":["../../src/core/prompt-builders.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,8EAA8E;AAC9E,oBAAoB;AACpB,8EAA8E;AAE9E;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAAkB;IACrD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAElC,MAAM,KAAK,GAAa;QACtB,mBAAmB;QACnB,EAAE;QACF,iKAAiK;QACjK,EAAE;KACH,CAAC;IAEF,mBAAmB;IACnB,MAAM,WAAW,GAAgB,EAAE,CAAC;IAEpC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,OAAO,IAAI,CAAC,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC;QAC5F,IAAI,IAAI;YAAE,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,mCAAmC;IACnC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,KAAK,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACvC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,KAAK,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"prompt-builders.js","sourceRoot":"","sources":["../../src/core/prompt-builders.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-loop.d.ts","sourceRoot":"","sources":["../../src/core/react-loop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,sCAAsC,CAAC;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAa,MAAM,iBAAiB,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"react-loop.d.ts","sourceRoot":"","sources":["../../src/core/react-loop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,sCAAsC,CAAC;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAa,MAAM,iBAAiB,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAwB/C,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,SAAS,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,CAAC,EAAE;QACX,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC;KACjC,CAAC;IACF,MAAM,CAAC,EAAE,WAAW,CAAC;IAErB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAElC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,IAAI,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACzB,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAEhC;wFACoF;IACpF,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,CAAC;CACpD;AAED;;;;GAIG;AACH,wBAAuB,gBAAgB,CACrC,eAAe,EAAE,UAAU,EAAE,EAC7B,MAAM,EAAE,eAAe,GACtB,cAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,CAmgBtC"}
|
package/dist/core/react-loop.js
CHANGED
|
@@ -5,7 +5,7 @@ import { applyToolResultBudget } from './compaction/tool-result-budget.js';
|
|
|
5
5
|
import { snipCompact } from './compaction/snip-compact.js';
|
|
6
6
|
import { autocompact } from './compaction/autocompact.js';
|
|
7
7
|
import { runStopHooks } from './stop-hooks.js';
|
|
8
|
-
import { PromptTooLongError, OverloadedError, InsufficientCreditsError, classifyAPIError } from '../llm/errors.js';
|
|
8
|
+
import { PromptTooLongError, OverloadedError, InsufficientCreditsError, classifyAPIError, } from '../llm/errors.js';
|
|
9
9
|
import { SKILL_TOOL_NAME } from '../tools/skill-tool.js';
|
|
10
10
|
import { normalizeMessagesForAPI } from './message-normalize.js';
|
|
11
11
|
const MAX_OUTPUT_TOKENS_RECOVERY_LIMIT = 3;
|
|
@@ -37,7 +37,8 @@ export async function* executeReactLoop(initialMessages, config) {
|
|
|
37
37
|
return { reason: 'abort', usage };
|
|
38
38
|
}
|
|
39
39
|
// --- Check cost policy ---
|
|
40
|
-
if (costPolicy?.maxTokensPerExecution &&
|
|
40
|
+
if (costPolicy?.maxTokensPerExecution &&
|
|
41
|
+
usage.totalTokens >= costPolicy.maxTokensPerExecution) {
|
|
41
42
|
if (costPolicy.onLimitReached === 'stop') {
|
|
42
43
|
return { reason: 'cost_limit', usage };
|
|
43
44
|
}
|
|
@@ -53,7 +54,9 @@ export async function* executeReactLoop(initialMessages, config) {
|
|
|
53
54
|
// 0. Tool result budget — aggregate truncation (largest first)
|
|
54
55
|
if (maxContextTokens) {
|
|
55
56
|
const budgetChars = Math.floor(maxContextTokens * 4 * 0.5); // 50% of context in chars
|
|
56
|
-
const budgetResult = applyToolResultBudget(compactedMessages, {
|
|
57
|
+
const budgetResult = applyToolResultBudget(compactedMessages, {
|
|
58
|
+
maxTotalToolResultChars: budgetChars,
|
|
59
|
+
});
|
|
57
60
|
if (budgetResult.truncatedCount > 0) {
|
|
58
61
|
compactedMessages = budgetResult.messages;
|
|
59
62
|
}
|
|
@@ -129,7 +132,11 @@ export async function* executeReactLoop(initialMessages, config) {
|
|
|
129
132
|
toolCalls.push({ id: chunk.id, name: chunk.name, arguments: chunk.arguments });
|
|
130
133
|
yield {
|
|
131
134
|
type: 'tool_call_start',
|
|
132
|
-
toolCall: {
|
|
135
|
+
toolCall: {
|
|
136
|
+
id: chunk.id,
|
|
137
|
+
type: 'function',
|
|
138
|
+
function: { name: chunk.name, arguments: chunk.arguments },
|
|
139
|
+
},
|
|
133
140
|
};
|
|
134
141
|
streamingExecutor.addTool(chunk.id, chunk.name, chunk.arguments);
|
|
135
142
|
break;
|
|
@@ -145,12 +152,26 @@ export async function* executeReactLoop(initialMessages, config) {
|
|
|
145
152
|
}
|
|
146
153
|
// Yield progress events from tools executing during streaming
|
|
147
154
|
for (const progress of streamingExecutor.getProgressEvents()) {
|
|
148
|
-
yield {
|
|
155
|
+
yield {
|
|
156
|
+
type: 'tool_progress',
|
|
157
|
+
toolCallId: progress.toolCallId,
|
|
158
|
+
toolName: progress.toolName,
|
|
159
|
+
data: progress.data,
|
|
160
|
+
};
|
|
149
161
|
}
|
|
150
162
|
// Yield completed tool results during streaming and collect for message history
|
|
151
163
|
for (const completed of streamingExecutor.getCompletedResults()) {
|
|
152
|
-
yield {
|
|
153
|
-
|
|
164
|
+
yield {
|
|
165
|
+
type: 'tool_call_end',
|
|
166
|
+
toolCallId: completed.id,
|
|
167
|
+
result: completed.result,
|
|
168
|
+
duration: completed.duration,
|
|
169
|
+
};
|
|
170
|
+
earlyToolResults.push({
|
|
171
|
+
role: 'tool',
|
|
172
|
+
content: completed.result.content,
|
|
173
|
+
tool_call_id: completed.id,
|
|
174
|
+
});
|
|
154
175
|
if (completed.result.isError && onToolError === 'stop') {
|
|
155
176
|
yield { type: 'turn_end', iteration: turnCount - 1, hasToolCalls: true };
|
|
156
177
|
return { reason: 'error', usage };
|
|
@@ -160,7 +181,7 @@ export async function* executeReactLoop(initialMessages, config) {
|
|
|
160
181
|
// --- Build assistant message ---
|
|
161
182
|
const assistantMessage = { role: 'assistant', content: fullText };
|
|
162
183
|
if (toolCalls.length > 0) {
|
|
163
|
-
assistantMessage.tool_calls = toolCalls.map(tc => ({
|
|
184
|
+
assistantMessage.tool_calls = toolCalls.map((tc) => ({
|
|
164
185
|
id: tc.id,
|
|
165
186
|
type: 'function',
|
|
166
187
|
function: { name: tc.name, arguments: tc.arguments },
|
|
@@ -169,8 +190,7 @@ export async function* executeReactLoop(initialMessages, config) {
|
|
|
169
190
|
// --- Max Output Tokens Recovery (two steps: escalate first, then resume) ---
|
|
170
191
|
if (finishReason === 'length' && toolCalls.length === 0) {
|
|
171
192
|
// Step 1: Escalate maxTokens (retry same request with higher limit)
|
|
172
|
-
if (escalatedMaxOutputTokens &&
|
|
173
|
-
state.maxOutputTokensOverride === undefined) {
|
|
193
|
+
if (escalatedMaxOutputTokens && state.maxOutputTokensOverride === undefined) {
|
|
174
194
|
yield { type: 'recovery', reason: 'max_output_tokens_escalate', attempt: 1 };
|
|
175
195
|
state = {
|
|
176
196
|
...state,
|
|
@@ -217,7 +237,7 @@ export async function* executeReactLoop(initialMessages, config) {
|
|
|
217
237
|
}
|
|
218
238
|
if (hookResult.blockingErrors.length > 0) {
|
|
219
239
|
yield { type: 'recovery', reason: 'stop_hook_blocking', attempt: 1 };
|
|
220
|
-
const errorMessages = hookResult.blockingErrors.map(err => ({
|
|
240
|
+
const errorMessages = hookResult.blockingErrors.map((err) => ({
|
|
221
241
|
role: 'user',
|
|
222
242
|
content: `[Stop hook error: ${err}]`,
|
|
223
243
|
}));
|
|
@@ -239,7 +259,11 @@ export async function* executeReactLoop(initialMessages, config) {
|
|
|
239
259
|
const notDiminishing = turnOutputTokens >= MIN_DELTA_TOKENS || budgetContinuationCount === 0;
|
|
240
260
|
if (belowThreshold && notExhausted && notDiminishing) {
|
|
241
261
|
budgetContinuationCount++;
|
|
242
|
-
yield {
|
|
262
|
+
yield {
|
|
263
|
+
type: 'recovery',
|
|
264
|
+
reason: 'token_budget_continuation',
|
|
265
|
+
attempt: budgetContinuationCount,
|
|
266
|
+
};
|
|
243
267
|
const nudgeMessage = {
|
|
244
268
|
role: 'user',
|
|
245
269
|
content: '[System: Continue working. You still have budget remaining.]',
|
|
@@ -265,28 +289,46 @@ export async function* executeReactLoop(initialMessages, config) {
|
|
|
265
289
|
const touchedFilePaths = [];
|
|
266
290
|
// Drain remaining progress events
|
|
267
291
|
for (const progress of streamingExecutor.getProgressEvents()) {
|
|
268
|
-
yield {
|
|
292
|
+
yield {
|
|
293
|
+
type: 'tool_progress',
|
|
294
|
+
toolCallId: progress.toolCallId,
|
|
295
|
+
toolName: progress.toolName,
|
|
296
|
+
data: progress.data,
|
|
297
|
+
};
|
|
269
298
|
}
|
|
270
299
|
for await (const completed of streamingExecutor.getRemainingResults()) {
|
|
271
|
-
yield {
|
|
300
|
+
yield {
|
|
301
|
+
type: 'tool_call_end',
|
|
302
|
+
toolCallId: completed.id,
|
|
303
|
+
result: completed.result,
|
|
304
|
+
duration: completed.duration,
|
|
305
|
+
};
|
|
272
306
|
if (completed.result.isError && onToolError === 'stop') {
|
|
273
|
-
toolResultMessages.push({
|
|
307
|
+
toolResultMessages.push({
|
|
308
|
+
role: 'tool',
|
|
309
|
+
content: completed.result.content,
|
|
310
|
+
tool_call_id: completed.id,
|
|
311
|
+
});
|
|
274
312
|
yield { type: 'turn_end', iteration: turnCount - 1, hasToolCalls: true };
|
|
275
313
|
return { reason: 'error', usage };
|
|
276
314
|
}
|
|
277
315
|
if (completed.result.isError)
|
|
278
316
|
hasToolError = true;
|
|
279
317
|
// Pin skill tool results so they survive compaction
|
|
280
|
-
const toolResultMsg = {
|
|
318
|
+
const toolResultMsg = {
|
|
319
|
+
role: 'tool',
|
|
320
|
+
content: completed.result.content,
|
|
321
|
+
tool_call_id: completed.id,
|
|
322
|
+
};
|
|
281
323
|
if (completed.name === SKILL_TOOL_NAME) {
|
|
282
324
|
toolResultMsg._pinned = true;
|
|
283
325
|
}
|
|
284
326
|
toolResultMessages.push(toolResultMsg);
|
|
285
327
|
// Extract file paths for conditional skill activation
|
|
286
328
|
if (config.onFilePathsTouched) {
|
|
287
|
-
const toolDef = toolExecutor.listTools().find(t => t.name === completed.name);
|
|
329
|
+
const toolDef = toolExecutor.listTools().find((t) => t.name === completed.name);
|
|
288
330
|
if (toolDef?.getFilePath) {
|
|
289
|
-
const tc = toolCalls.find(c => c.id === completed.id);
|
|
331
|
+
const tc = toolCalls.find((c) => c.id === completed.id);
|
|
290
332
|
if (tc) {
|
|
291
333
|
try {
|
|
292
334
|
const parsed = JSON.parse(tc.arguments);
|
|
@@ -297,9 +339,13 @@ export async function* executeReactLoop(initialMessages, config) {
|
|
|
297
339
|
touchedFilePaths.push(...arr);
|
|
298
340
|
}
|
|
299
341
|
}
|
|
300
|
-
catch {
|
|
342
|
+
catch {
|
|
343
|
+
/* getFilePath error — skip */
|
|
344
|
+
}
|
|
345
|
+
}
|
|
346
|
+
catch {
|
|
347
|
+
/* JSON parse error — skip */
|
|
301
348
|
}
|
|
302
|
-
catch { /* JSON parse error — skip */ }
|
|
303
349
|
}
|
|
304
350
|
}
|
|
305
351
|
// Also check metadata.filePaths
|
|
@@ -318,7 +364,11 @@ export async function* executeReactLoop(initialMessages, config) {
|
|
|
318
364
|
}
|
|
319
365
|
// --- onToolError: 'retry' — re-run LLM turn so model can correct its args ---
|
|
320
366
|
if (hasToolError && onToolError === 'retry' && state.toolRetryCount < 1) {
|
|
321
|
-
yield {
|
|
367
|
+
yield {
|
|
368
|
+
type: 'recovery',
|
|
369
|
+
reason: 'tool_retry',
|
|
370
|
+
attempt: state.toolRetryCount + 1,
|
|
371
|
+
};
|
|
322
372
|
state = {
|
|
323
373
|
...state,
|
|
324
374
|
messages: [...messages, assistantMessage, ...toolResultMessages],
|
|
@@ -353,7 +403,11 @@ export async function* executeReactLoop(initialMessages, config) {
|
|
|
353
403
|
});
|
|
354
404
|
if (compactResult) {
|
|
355
405
|
yield { type: 'recovery', reason: 'reactive_compact_retry', attempt: 1 };
|
|
356
|
-
yield {
|
|
406
|
+
yield {
|
|
407
|
+
type: 'compaction',
|
|
408
|
+
strategy: 'autocompact',
|
|
409
|
+
tokensFreed: compactResult.tokensFreed,
|
|
410
|
+
};
|
|
357
411
|
state = {
|
|
358
412
|
...state,
|
|
359
413
|
messages: compactResult.messages,
|
|
@@ -374,7 +428,9 @@ export async function* executeReactLoop(initialMessages, config) {
|
|
|
374
428
|
return { reason: 'error', usage, error: classified };
|
|
375
429
|
}
|
|
376
430
|
// --- Model Fallback (529/503) ---
|
|
377
|
-
if (classified instanceof OverloadedError &&
|
|
431
|
+
if (classified instanceof OverloadedError &&
|
|
432
|
+
fallbackModel &&
|
|
433
|
+
currentModel !== fallbackModel) {
|
|
378
434
|
yield { type: 'model_fallback', from: currentModel, to: fallbackModel };
|
|
379
435
|
currentModel = fallbackModel;
|
|
380
436
|
state = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-loop.js","sourceRoot":"","sources":["../../src/core/react-loop.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"react-loop.js","sourceRoot":"","sources":["../../src/core/react-loop.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,25 +41,24 @@ export class StreamEmitter {
|
|
|
41
41
|
* Returns an AsyncIterableIterator for consuming events.
|
|
42
42
|
*/
|
|
43
43
|
iterator() {
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
self.resolve = resolve;
|
|
57
|
-
});
|
|
58
|
-
},
|
|
59
|
-
[Symbol.asyncIterator]() {
|
|
60
|
-
return this;
|
|
61
|
-
},
|
|
44
|
+
const next = () => {
|
|
45
|
+
// Drain queue first
|
|
46
|
+
if (this.queue.length > 0) {
|
|
47
|
+
return Promise.resolve({ value: this.queue.shift(), done: false });
|
|
48
|
+
}
|
|
49
|
+
if (this.done) {
|
|
50
|
+
return Promise.resolve({ value: undefined, done: true });
|
|
51
|
+
}
|
|
52
|
+
// Wait for next emit
|
|
53
|
+
return new Promise((resolve) => {
|
|
54
|
+
this.resolve = resolve;
|
|
55
|
+
});
|
|
62
56
|
};
|
|
57
|
+
const iter = {
|
|
58
|
+
next,
|
|
59
|
+
[Symbol.asyncIterator]: () => iter,
|
|
60
|
+
};
|
|
61
|
+
return iter;
|
|
63
62
|
}
|
|
64
63
|
}
|
|
65
64
|
//# sourceMappingURL=stream-emitter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-emitter.js","sourceRoot":"","sources":["../../src/core/stream-emitter.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,OAAO,aAAa;IACP,KAAK,GAAiB,EAAE,CAAC;IACzB,YAAY,CAAS;IAC9B,OAAO,GAAyD,IAAI,CAAC;IACrE,IAAI,GAAG,KAAK,CAAC;IAErB,YAAY,YAAY,GAAG,IAAI;QAC7B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,IAAI,CAAC,KAAiB;QACpB,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO;QAEtB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,yCAAyC;YACzC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;YACvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACnC,CAAC;aAAM,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YACjD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;QACD,8CAA8C;IAChD,CAAC;IAED;;OAEG;IACH,KAAK;QACH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;YACvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,CAAC,CAAC,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"stream-emitter.js","sourceRoot":"","sources":["../../src/core/stream-emitter.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,OAAO,aAAa;IACP,KAAK,GAAiB,EAAE,CAAC;IACzB,YAAY,CAAS;IAC9B,OAAO,GAAyD,IAAI,CAAC;IACrE,IAAI,GAAG,KAAK,CAAC;IAErB,YAAY,YAAY,GAAG,IAAI;QAC7B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,IAAI,CAAC,KAAiB;QACpB,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO;QAEtB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,yCAAyC;YACzC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;YACvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACnC,CAAC;aAAM,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YACjD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;QACD,8CAA8C;IAChD,CAAC;IAED;;OAEG;IACH,KAAK;QACH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;YACvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,QAAQ;QACN,MAAM,IAAI,GAAG,GAAwC,EAAE;YACrD,oBAAoB;YACpB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YACtE,CAAC;YAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACd,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAkC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACpF,CAAC;YAED,qBAAqB;YACrB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACzB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,MAAM,IAAI,GAAsC;YAC9C,IAAI;YACJ,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI;SACnC,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streaming-tool-executor.d.ts","sourceRoot":"","sources":["../../src/core/streaming-tool-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAE1E,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/B;AAiBD;;;;;GAKG;AACH,qBAAa,qBAAqB;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAe;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAc;IACtC,OAAO,CAAC,UAAU,CAAS;IAC3B,gFAAgF;IAChF,OAAO,CAAC,eAAe,CAA0B;gBAErC,QAAQ,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,WAAW;IAKxD,iEAAiE;IACjE,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"streaming-tool-executor.d.ts","sourceRoot":"","sources":["../../src/core/streaming-tool-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAE1E,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/B;AAiBD;;;;;GAKG;AACH,qBAAa,qBAAqB;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAC3C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAe;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAc;IACtC,OAAO,CAAC,UAAU,CAAS;IAC3B,gFAAgF;IAChF,OAAO,CAAC,eAAe,CAA0B;gBAErC,QAAQ,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,WAAW;IAKxD,iEAAiE;IACjE,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IA0CrD;;;OAGG;IACF,mBAAmB,IAAI,SAAS,CAAC,mBAAmB,CAAC;IAqBtD;;;OAGG;IACF,iBAAiB,IAAI,SAAS,CAAC,gBAAgB,CAAC;IAMjD;;;OAGG;IACI,mBAAmB,IAAI,cAAc,CAAC,mBAAmB,CAAC;IAsBjE;;;;OAIG;YACW,YAAY;IAgC1B,OAAO,CAAC,SAAS;YAKH,WAAW;CAgC1B"}
|
|
@@ -23,7 +23,9 @@ export class StreamingToolExecutor {
|
|
|
23
23
|
}
|
|
24
24
|
catch (e) {
|
|
25
25
|
this.tools.push({
|
|
26
|
-
id,
|
|
26
|
+
id,
|
|
27
|
+
name,
|
|
28
|
+
args,
|
|
27
29
|
parsedArgs: {},
|
|
28
30
|
isSafe: true,
|
|
29
31
|
status: 'completed',
|
|
@@ -36,13 +38,21 @@ export class StreamingToolExecutor {
|
|
|
36
38
|
});
|
|
37
39
|
return;
|
|
38
40
|
}
|
|
39
|
-
const toolDef = this.executor.listTools().find(t => t.name === name);
|
|
41
|
+
const toolDef = this.executor.listTools().find((t) => t.name === name);
|
|
40
42
|
const isSafe = toolDef
|
|
41
43
|
? typeof toolDef.isConcurrencySafe === 'function'
|
|
42
44
|
? toolDef.isConcurrencySafe(parsedArgs)
|
|
43
45
|
: toolDef.isConcurrencySafe === true
|
|
44
46
|
: false;
|
|
45
|
-
const tracked = {
|
|
47
|
+
const tracked = {
|
|
48
|
+
id,
|
|
49
|
+
name,
|
|
50
|
+
args,
|
|
51
|
+
parsedArgs,
|
|
52
|
+
isSafe,
|
|
53
|
+
status: 'queued',
|
|
54
|
+
progressEvents: [],
|
|
55
|
+
};
|
|
46
56
|
this.tools.push(tracked);
|
|
47
57
|
void this.processQueue();
|
|
48
58
|
}
|
|
@@ -110,21 +120,21 @@ export class StreamingToolExecutor {
|
|
|
110
120
|
this.processing = true;
|
|
111
121
|
try {
|
|
112
122
|
while (true) {
|
|
113
|
-
const nextQueued = this.tools.find(t => t.status === 'queued');
|
|
123
|
+
const nextQueued = this.tools.find((t) => t.status === 'queued');
|
|
114
124
|
if (!nextQueued)
|
|
115
125
|
break;
|
|
116
|
-
const executing = this.tools.filter(t => t.status === 'executing');
|
|
126
|
+
const executing = this.tools.filter((t) => t.status === 'executing');
|
|
117
127
|
if (nextQueued.isSafe) {
|
|
118
|
-
const hasUnsafeExecuting = executing.some(t => !t.isSafe);
|
|
128
|
+
const hasUnsafeExecuting = executing.some((t) => !t.isSafe);
|
|
119
129
|
if (hasUnsafeExecuting) {
|
|
120
|
-
await Promise.all(executing.map(t => t.promise));
|
|
130
|
+
await Promise.all(executing.map((t) => t.promise).filter((p) => p !== undefined));
|
|
121
131
|
continue;
|
|
122
132
|
}
|
|
123
133
|
this.startTool(nextQueued);
|
|
124
134
|
}
|
|
125
135
|
else {
|
|
126
136
|
if (executing.length > 0) {
|
|
127
|
-
await Promise.all(executing.map(t => t.promise));
|
|
137
|
+
await Promise.all(executing.map((t) => t.promise).filter((p) => p !== undefined));
|
|
128
138
|
continue;
|
|
129
139
|
}
|
|
130
140
|
this.startTool(nextQueued);
|