@zhijiewang/openharness 0.10.1 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +79 -13
- package/dist/Tool.d.ts.map +1 -1
- package/dist/Tool.js +7 -1
- package/dist/Tool.js.map +1 -1
- package/dist/Tool.test.js +8 -2
- package/dist/Tool.test.js.map +1 -1
- package/dist/agents/roles.d.ts +25 -0
- package/dist/agents/roles.d.ts.map +1 -0
- package/dist/agents/roles.js +116 -0
- package/dist/agents/roles.js.map +1 -0
- package/dist/agents/roles.test.d.ts +2 -0
- package/dist/agents/roles.test.d.ts.map +1 -0
- package/dist/agents/roles.test.js +38 -0
- package/dist/agents/roles.test.js.map +1 -0
- package/dist/commands/commands-new.test.d.ts +5 -0
- package/dist/commands/commands-new.test.d.ts.map +1 -0
- package/dist/commands/commands-new.test.js +132 -0
- package/dist/commands/commands-new.test.js.map +1 -0
- package/dist/commands/commands.test.js +31 -0
- package/dist/commands/commands.test.js.map +1 -1
- package/dist/commands/index.d.ts +2 -0
- package/dist/commands/index.d.ts.map +1 -1
- package/dist/commands/index.js +199 -6
- package/dist/commands/index.js.map +1 -1
- package/dist/components/REPL.js +1 -1
- package/dist/components/REPL.js.map +1 -1
- package/dist/git/git.test.js +33 -1
- package/dist/git/git.test.js.map +1 -1
- package/dist/git/index.d.ts +12 -0
- package/dist/git/index.d.ts.map +1 -1
- package/dist/git/index.js +47 -2
- package/dist/git/index.js.map +1 -1
- package/dist/harness/checkpoints.d.ts +36 -0
- package/dist/harness/checkpoints.d.ts.map +1 -0
- package/dist/harness/checkpoints.js +156 -0
- package/dist/harness/checkpoints.js.map +1 -0
- package/dist/harness/config.d.ts +3 -0
- package/dist/harness/config.d.ts.map +1 -1
- package/dist/harness/config.js +35 -2
- package/dist/harness/config.js.map +1 -1
- package/dist/harness/config.test.js +21 -1
- package/dist/harness/config.test.js.map +1 -1
- package/dist/harness/hooks-env.test.d.ts +5 -0
- package/dist/harness/hooks-env.test.d.ts.map +1 -0
- package/dist/harness/hooks-env.test.js +41 -0
- package/dist/harness/hooks-env.test.js.map +1 -0
- package/dist/harness/hooks.d.ts +7 -0
- package/dist/harness/hooks.d.ts.map +1 -1
- package/dist/harness/hooks.js +14 -0
- package/dist/harness/hooks.js.map +1 -1
- package/dist/harness/keybindings.d.ts.map +1 -1
- package/dist/harness/keybindings.js +4 -0
- package/dist/harness/keybindings.js.map +1 -1
- package/dist/harness/memory.d.ts +19 -0
- package/dist/harness/memory.d.ts.map +1 -1
- package/dist/harness/memory.js +85 -0
- package/dist/harness/memory.js.map +1 -1
- package/dist/harness/onboarding.d.ts +1 -1
- package/dist/harness/onboarding.d.ts.map +1 -1
- package/dist/harness/onboarding.js +59 -4
- package/dist/harness/onboarding.js.map +1 -1
- package/dist/harness/onboarding.test.d.ts +5 -0
- package/dist/harness/onboarding.test.d.ts.map +1 -0
- package/dist/harness/onboarding.test.js +93 -0
- package/dist/harness/onboarding.test.js.map +1 -0
- package/dist/harness/rules.d.ts +6 -1
- package/dist/harness/rules.d.ts.map +1 -1
- package/dist/harness/rules.js +52 -5
- package/dist/harness/rules.js.map +1 -1
- package/dist/harness/rules.test.js +30 -1
- package/dist/harness/rules.test.js.map +1 -1
- package/dist/harness/session.d.ts +8 -1
- package/dist/harness/session.d.ts.map +1 -1
- package/dist/harness/session.js +13 -5
- package/dist/harness/session.js.map +1 -1
- package/dist/harness/store.d.ts +46 -0
- package/dist/harness/store.d.ts.map +1 -0
- package/dist/harness/store.js +56 -0
- package/dist/harness/store.js.map +1 -0
- package/dist/harness/store.test.d.ts +2 -0
- package/dist/harness/store.test.d.ts.map +1 -0
- package/dist/harness/store.test.js +71 -0
- package/dist/harness/store.test.js.map +1 -0
- package/dist/harness/submit-handler.d.ts +2 -0
- package/dist/harness/submit-handler.d.ts.map +1 -1
- package/dist/harness/submit-handler.js +3 -0
- package/dist/harness/submit-handler.js.map +1 -1
- package/dist/main.js +153 -26
- package/dist/main.js.map +1 -1
- package/dist/mcp/client.d.ts +2 -0
- package/dist/mcp/client.d.ts.map +1 -1
- package/dist/mcp/client.js +10 -2
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/loader.d.ts +2 -0
- package/dist/mcp/loader.d.ts.map +1 -1
- package/dist/mcp/loader.js +34 -18
- package/dist/mcp/loader.js.map +1 -1
- package/dist/mcp/loader.test.d.ts +7 -0
- package/dist/mcp/loader.test.d.ts.map +1 -0
- package/dist/mcp/loader.test.js +25 -0
- package/dist/mcp/loader.test.js.map +1 -0
- package/dist/providers/anthropic-convert.test.d.ts +5 -0
- package/dist/providers/anthropic-convert.test.d.ts.map +1 -0
- package/dist/providers/anthropic-convert.test.js +98 -0
- package/dist/providers/anthropic-convert.test.js.map +1 -0
- package/dist/providers/anthropic.d.ts.map +1 -1
- package/dist/providers/anthropic.js +23 -4
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/stream-parsing.test.d.ts +6 -0
- package/dist/providers/stream-parsing.test.d.ts.map +1 -0
- package/dist/providers/stream-parsing.test.js +174 -0
- package/dist/providers/stream-parsing.test.js.map +1 -0
- package/dist/query/compress.d.ts +17 -0
- package/dist/query/compress.d.ts.map +1 -0
- package/dist/query/compress.js +115 -0
- package/dist/query/compress.js.map +1 -0
- package/dist/query/errors.d.ts +10 -0
- package/dist/query/errors.d.ts.map +1 -0
- package/dist/query/errors.js +22 -0
- package/dist/query/errors.js.map +1 -0
- package/dist/query/index.d.ts +15 -0
- package/dist/query/index.d.ts.map +1 -0
- package/dist/query/index.js +199 -0
- package/dist/query/index.js.map +1 -0
- package/dist/query/tools.d.ts +17 -0
- package/dist/query/tools.d.ts.map +1 -0
- package/dist/query/tools.js +129 -0
- package/dist/query/tools.js.map +1 -0
- package/dist/query/types.d.ts +31 -0
- package/dist/query/types.d.ts.map +1 -0
- package/dist/query/types.js +5 -0
- package/dist/query/types.js.map +1 -0
- package/dist/query.d.ts +8 -38
- package/dist/query.d.ts.map +1 -1
- package/dist/query.js +7 -444
- package/dist/query.js.map +1 -1
- package/dist/query.test.js +1 -1
- package/dist/query.test.js.map +1 -1
- package/dist/renderer/cells.d.ts.map +1 -1
- package/dist/renderer/cells.js +15 -2
- package/dist/renderer/cells.js.map +1 -1
- package/dist/renderer/colors.d.ts +8 -0
- package/dist/renderer/colors.d.ts.map +1 -0
- package/dist/renderer/colors.js +18 -0
- package/dist/renderer/colors.js.map +1 -0
- package/dist/renderer/diff.test.d.ts +5 -0
- package/dist/renderer/diff.test.d.ts.map +1 -0
- package/dist/renderer/diff.test.js +140 -0
- package/dist/renderer/diff.test.js.map +1 -0
- package/dist/renderer/differ.d.ts.map +1 -1
- package/dist/renderer/differ.js +1 -10
- package/dist/renderer/differ.js.map +1 -1
- package/dist/renderer/e2e.test.js +1 -0
- package/dist/renderer/e2e.test.js.map +1 -1
- package/dist/renderer/image.test.d.ts +5 -0
- package/dist/renderer/image.test.d.ts.map +1 -0
- package/dist/renderer/image.test.js +66 -0
- package/dist/renderer/image.test.js.map +1 -0
- package/dist/renderer/index.d.ts +21 -4
- package/dist/renderer/index.d.ts.map +1 -1
- package/dist/renderer/index.js +191 -116
- package/dist/renderer/index.js.map +1 -1
- package/dist/renderer/layout.d.ts +5 -1
- package/dist/renderer/layout.d.ts.map +1 -1
- package/dist/renderer/layout.js +504 -614
- package/dist/renderer/layout.js.map +1 -1
- package/dist/renderer/markdown.d.ts.map +1 -1
- package/dist/renderer/markdown.js +42 -36
- package/dist/renderer/markdown.js.map +1 -1
- package/dist/renderer/perf.test.js +1 -0
- package/dist/renderer/perf.test.js.map +1 -1
- package/dist/renderer/session-browser.test.d.ts +6 -0
- package/dist/renderer/session-browser.test.d.ts.map +1 -0
- package/dist/renderer/session-browser.test.js +95 -0
- package/dist/renderer/session-browser.test.js.map +1 -0
- package/dist/renderer/ui-ux.test.d.ts +15 -0
- package/dist/renderer/ui-ux.test.d.ts.map +1 -0
- package/dist/renderer/ui-ux.test.js +470 -0
- package/dist/renderer/ui-ux.test.js.map +1 -0
- package/dist/repl.d.ts.map +1 -1
- package/dist/repl.js +178 -14
- package/dist/repl.js.map +1 -1
- package/dist/services/StreamingToolExecutor.d.ts.map +1 -1
- package/dist/services/StreamingToolExecutor.js +4 -2
- package/dist/services/StreamingToolExecutor.js.map +1 -1
- package/dist/services/agent-messaging.d.ts +68 -0
- package/dist/services/agent-messaging.d.ts.map +1 -0
- package/dist/services/agent-messaging.js +121 -0
- package/dist/services/agent-messaging.js.map +1 -0
- package/dist/services/agent-messaging.test.d.ts +2 -0
- package/dist/services/agent-messaging.test.d.ts.map +1 -0
- package/dist/services/agent-messaging.test.js +88 -0
- package/dist/services/agent-messaging.test.js.map +1 -0
- package/dist/services/cron.d.ts +40 -0
- package/dist/services/cron.d.ts.map +1 -0
- package/dist/services/cron.js +90 -0
- package/dist/services/cron.js.map +1 -0
- package/dist/services/cron.test.d.ts +2 -0
- package/dist/services/cron.test.d.ts.map +1 -0
- package/dist/services/cron.test.js +49 -0
- package/dist/services/cron.test.js.map +1 -0
- package/dist/tools/AgentTool/index.d.ts +9 -0
- package/dist/tools/AgentTool/index.d.ts.map +1 -1
- package/dist/tools/AgentTool/index.js +89 -6
- package/dist/tools/AgentTool/index.js.map +1 -1
- package/dist/tools/BashTool/index.d.ts +6 -0
- package/dist/tools/BashTool/index.d.ts.map +1 -1
- package/dist/tools/BashTool/index.js +39 -1
- package/dist/tools/BashTool/index.js.map +1 -1
- package/dist/tools/FileEditTool/index.js +4 -4
- package/dist/tools/FileEditTool/index.js.map +1 -1
- package/dist/tools/FileReadTool/index.d.ts +3 -0
- package/dist/tools/FileReadTool/index.d.ts.map +1 -1
- package/dist/tools/FileReadTool/index.js +102 -4
- package/dist/tools/FileReadTool/index.js.map +1 -1
- package/dist/tools/FileWriteTool/index.d.ts.map +1 -1
- package/dist/tools/FileWriteTool/index.js +20 -5
- package/dist/tools/FileWriteTool/index.js.map +1 -1
- package/dist/tools/GlobTool/index.d.ts.map +1 -1
- package/dist/tools/GlobTool/index.js +4 -61
- package/dist/tools/GlobTool/index.js.map +1 -1
- package/dist/tools/GrepTool/index.d.ts +30 -0
- package/dist/tools/GrepTool/index.d.ts.map +1 -1
- package/dist/tools/GrepTool/index.js +153 -72
- package/dist/tools/GrepTool/index.js.map +1 -1
- package/dist/tools/LSTool/index.d.ts +3 -0
- package/dist/tools/LSTool/index.d.ts.map +1 -1
- package/dist/tools/LSTool/index.js +44 -29
- package/dist/tools/LSTool/index.js.map +1 -1
- package/dist/tools/TaskCreateTool/index.d.ts +6 -0
- package/dist/tools/TaskCreateTool/index.d.ts.map +1 -1
- package/dist/tools/TaskCreateTool/index.js +8 -2
- package/dist/tools/TaskCreateTool/index.js.map +1 -1
- package/dist/tools/TaskGetTool/index.d.ts +12 -0
- package/dist/tools/TaskGetTool/index.d.ts.map +1 -0
- package/dist/tools/TaskGetTool/index.js +50 -0
- package/dist/tools/TaskGetTool/index.js.map +1 -0
- package/dist/tools/TaskOutputTool/index.d.ts +15 -0
- package/dist/tools/TaskOutputTool/index.d.ts.map +1 -0
- package/dist/tools/TaskOutputTool/index.js +45 -0
- package/dist/tools/TaskOutputTool/index.js.map +1 -0
- package/dist/tools/TaskStopTool/index.d.ts +15 -0
- package/dist/tools/TaskStopTool/index.d.ts.map +1 -0
- package/dist/tools/TaskStopTool/index.js +51 -0
- package/dist/tools/TaskStopTool/index.js.map +1 -0
- package/dist/tools/TaskUpdateTool/index.d.ts +21 -3
- package/dist/tools/TaskUpdateTool/index.d.ts.map +1 -1
- package/dist/tools/TaskUpdateTool/index.js +48 -3
- package/dist/tools/TaskUpdateTool/index.js.map +1 -1
- package/dist/tools/tools-basic.test.js +191 -2
- package/dist/tools/tools-basic.test.js.map +1 -1
- package/dist/tools.d.ts.map +1 -1
- package/dist/tools.js +6 -0
- package/dist/tools.js.map +1 -1
- package/dist/types/permissions.d.ts +2 -2
- package/dist/types/permissions.d.ts.map +1 -1
- package/dist/types/permissions.js +59 -13
- package/dist/types/permissions.js.map +1 -1
- package/dist/types/permissions.test.js +57 -0
- package/dist/types/permissions.test.js.map +1 -1
- package/dist/utils/bash-safety.d.ts +18 -0
- package/dist/utils/bash-safety.d.ts.map +1 -0
- package/dist/utils/bash-safety.js +227 -0
- package/dist/utils/bash-safety.js.map +1 -0
- package/dist/utils/bash-safety.test.d.ts +2 -0
- package/dist/utils/bash-safety.test.d.ts.map +1 -0
- package/dist/utils/bash-safety.test.js +112 -0
- package/dist/utils/bash-safety.test.js.map +1 -0
- package/dist/utils/fs.d.ts +15 -0
- package/dist/utils/fs.d.ts.map +1 -0
- package/dist/utils/fs.js +64 -0
- package/dist/utils/fs.js.map +1 -0
- package/dist/utils/fs.test.d.ts +5 -0
- package/dist/utils/fs.test.d.ts.map +1 -0
- package/dist/utils/fs.test.js +82 -0
- package/dist/utils/fs.test.js.map +1 -0
- package/dist/utils/safe-env.d.ts +10 -0
- package/dist/utils/safe-env.d.ts.map +1 -0
- package/dist/utils/safe-env.js +40 -0
- package/dist/utils/safe-env.js.map +1 -0
- package/package.json +3 -1
|
@@ -0,0 +1,174 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests for provider stream parsing — Anthropic and OpenAI SSE event handling.
|
|
3
|
+
* Mocks fetch() to return controlled SSE streams and verifies parsed events.
|
|
4
|
+
*/
|
|
5
|
+
import { describe, it, afterEach } from 'node:test';
|
|
6
|
+
import assert from 'node:assert/strict';
|
|
7
|
+
import { AnthropicProvider } from './anthropic.js';
|
|
8
|
+
import { OpenAIProvider } from './openai.js';
|
|
9
|
+
import { createUserMessage } from '../types/message.js';
|
|
10
|
+
const originalFetch = globalThis.fetch;
|
|
11
|
+
function mockSSE(lines) {
|
|
12
|
+
const body = lines.join('\n') + '\n';
|
|
13
|
+
globalThis.fetch = (async () => ({
|
|
14
|
+
ok: true,
|
|
15
|
+
status: 200,
|
|
16
|
+
headers: new Headers({ 'content-type': 'text/event-stream' }),
|
|
17
|
+
body: new ReadableStream({
|
|
18
|
+
start(controller) {
|
|
19
|
+
controller.enqueue(new TextEncoder().encode(body));
|
|
20
|
+
controller.close();
|
|
21
|
+
},
|
|
22
|
+
}),
|
|
23
|
+
}));
|
|
24
|
+
return () => { globalThis.fetch = originalFetch; };
|
|
25
|
+
}
|
|
26
|
+
async function collectEvents(gen) {
|
|
27
|
+
const events = [];
|
|
28
|
+
for await (const e of gen)
|
|
29
|
+
events.push(e);
|
|
30
|
+
return events;
|
|
31
|
+
}
|
|
32
|
+
describe('Anthropic stream parsing', () => {
|
|
33
|
+
let cleanup = null;
|
|
34
|
+
afterEach(() => { if (cleanup) {
|
|
35
|
+
cleanup();
|
|
36
|
+
cleanup = null;
|
|
37
|
+
} });
|
|
38
|
+
it('parses text_delta events', async () => {
|
|
39
|
+
cleanup = mockSSE([
|
|
40
|
+
'event: content_block_start',
|
|
41
|
+
'data: {"content_block":{"type":"text"}}',
|
|
42
|
+
'event: content_block_delta',
|
|
43
|
+
'data: {"delta":{"type":"text_delta","text":"Hello "}}',
|
|
44
|
+
'event: content_block_delta',
|
|
45
|
+
'data: {"delta":{"type":"text_delta","text":"world"}}',
|
|
46
|
+
'event: content_block_stop',
|
|
47
|
+
'data: {}',
|
|
48
|
+
'event: message_delta',
|
|
49
|
+
'data: {"usage":{"output_tokens":10}}',
|
|
50
|
+
'event: message_stop',
|
|
51
|
+
'data: {}',
|
|
52
|
+
]);
|
|
53
|
+
const provider = new AnthropicProvider({ name: 'anthropic', apiKey: 'test' });
|
|
54
|
+
const events = await collectEvents(provider.stream([createUserMessage('hi')], 'system'));
|
|
55
|
+
const textEvents = events.filter(e => e.type === 'text_delta');
|
|
56
|
+
assert.equal(textEvents.length, 2);
|
|
57
|
+
assert.equal(textEvents[0].content, 'Hello ');
|
|
58
|
+
assert.equal(textEvents[1].content, 'world');
|
|
59
|
+
});
|
|
60
|
+
it('parses tool_call events with JSON accumulation', async () => {
|
|
61
|
+
cleanup = mockSSE([
|
|
62
|
+
'event: content_block_start',
|
|
63
|
+
'data: {"content_block":{"type":"tool_use","id":"tc1","name":"Bash"}}',
|
|
64
|
+
'event: content_block_delta',
|
|
65
|
+
'data: {"delta":{"type":"input_json_delta","partial_json":"{\\"com"}}',
|
|
66
|
+
'event: content_block_delta',
|
|
67
|
+
'data: {"delta":{"type":"input_json_delta","partial_json":"mand\\":\\"echo hi\\"}"}}',
|
|
68
|
+
'event: content_block_stop',
|
|
69
|
+
'data: {}',
|
|
70
|
+
'event: message_stop',
|
|
71
|
+
'data: {}',
|
|
72
|
+
]);
|
|
73
|
+
const provider = new AnthropicProvider({ name: 'anthropic', apiKey: 'test' });
|
|
74
|
+
const events = await collectEvents(provider.stream([createUserMessage('hi')], 'system'));
|
|
75
|
+
const starts = events.filter(e => e.type === 'tool_call_start');
|
|
76
|
+
const completes = events.filter(e => e.type === 'tool_call_complete');
|
|
77
|
+
assert.equal(starts.length, 1);
|
|
78
|
+
assert.equal(starts[0].toolName, 'Bash');
|
|
79
|
+
assert.equal(completes.length, 1);
|
|
80
|
+
assert.deepEqual(completes[0].arguments, { command: 'echo hi' });
|
|
81
|
+
});
|
|
82
|
+
it('handles malformed tool args gracefully', async () => {
|
|
83
|
+
cleanup = mockSSE([
|
|
84
|
+
'event: content_block_start',
|
|
85
|
+
'data: {"content_block":{"type":"tool_use","id":"tc1","name":"Bash"}}',
|
|
86
|
+
'event: content_block_delta',
|
|
87
|
+
'data: {"delta":{"type":"input_json_delta","partial_json":"not valid json"}}',
|
|
88
|
+
'event: content_block_stop',
|
|
89
|
+
'data: {}',
|
|
90
|
+
'event: message_stop',
|
|
91
|
+
'data: {}',
|
|
92
|
+
]);
|
|
93
|
+
const provider = new AnthropicProvider({ name: 'anthropic', apiKey: 'test' });
|
|
94
|
+
const events = await collectEvents(provider.stream([createUserMessage('hi')], 'system'));
|
|
95
|
+
const errors = events.filter(e => e.type === 'error');
|
|
96
|
+
assert.ok(errors.length > 0, 'Should yield error for malformed JSON');
|
|
97
|
+
assert.ok(errors[0].message.includes('Malformed'));
|
|
98
|
+
});
|
|
99
|
+
it('parses thinking_delta events', async () => {
|
|
100
|
+
cleanup = mockSSE([
|
|
101
|
+
'event: content_block_start',
|
|
102
|
+
'data: {"content_block":{"type":"thinking"}}',
|
|
103
|
+
'event: content_block_delta',
|
|
104
|
+
'data: {"delta":{"type":"thinking_delta","thinking":"Let me think..."}}',
|
|
105
|
+
'event: content_block_stop',
|
|
106
|
+
'data: {}',
|
|
107
|
+
'event: message_stop',
|
|
108
|
+
'data: {}',
|
|
109
|
+
]);
|
|
110
|
+
const provider = new AnthropicProvider({ name: 'anthropic', apiKey: 'test' });
|
|
111
|
+
const events = await collectEvents(provider.stream([createUserMessage('hi')], 'system'));
|
|
112
|
+
const thinking = events.filter(e => e.type === 'thinking_delta');
|
|
113
|
+
assert.equal(thinking.length, 1);
|
|
114
|
+
assert.equal(thinking[0].content, 'Let me think...');
|
|
115
|
+
});
|
|
116
|
+
it('yields error on HTTP failure', async () => {
|
|
117
|
+
globalThis.fetch = (async () => ({
|
|
118
|
+
ok: false,
|
|
119
|
+
status: 500,
|
|
120
|
+
text: async () => 'Internal Server Error',
|
|
121
|
+
}));
|
|
122
|
+
cleanup = () => { globalThis.fetch = originalFetch; };
|
|
123
|
+
const provider = new AnthropicProvider({ name: 'anthropic', apiKey: 'test' });
|
|
124
|
+
const events = await collectEvents(provider.stream([createUserMessage('hi')], 'system'));
|
|
125
|
+
const errors = events.filter(e => e.type === 'error');
|
|
126
|
+
assert.ok(errors.length > 0);
|
|
127
|
+
assert.ok(errors[0].message.includes('500'));
|
|
128
|
+
});
|
|
129
|
+
});
|
|
130
|
+
describe('OpenAI stream parsing', () => {
|
|
131
|
+
let cleanup = null;
|
|
132
|
+
afterEach(() => { if (cleanup) {
|
|
133
|
+
cleanup();
|
|
134
|
+
cleanup = null;
|
|
135
|
+
} });
|
|
136
|
+
it('parses text content deltas', async () => {
|
|
137
|
+
cleanup = mockSSE([
|
|
138
|
+
'data: {"choices":[{"delta":{"role":"assistant","content":"Hi"},"index":0}]}',
|
|
139
|
+
'data: {"choices":[{"delta":{"content":" there"},"index":0}]}',
|
|
140
|
+
'data: [DONE]',
|
|
141
|
+
]);
|
|
142
|
+
const provider = new OpenAIProvider({ name: 'openai', apiKey: 'test' });
|
|
143
|
+
const events = await collectEvents(provider.stream([createUserMessage('hi')], 'system'));
|
|
144
|
+
const textEvents = events.filter(e => e.type === 'text_delta');
|
|
145
|
+
assert.ok(textEvents.length >= 1);
|
|
146
|
+
});
|
|
147
|
+
it('parses tool call with function arguments', async () => {
|
|
148
|
+
cleanup = mockSSE([
|
|
149
|
+
'data: {"choices":[{"delta":{"role":"assistant","tool_calls":[{"index":0,"id":"tc1","type":"function","function":{"name":"Read","arguments":""}}]},"index":0}]}',
|
|
150
|
+
'data: {"choices":[{"delta":{"tool_calls":[{"index":0,"function":{"arguments":"{\\"file_"}}]},"index":0}]}',
|
|
151
|
+
'data: {"choices":[{"delta":{"tool_calls":[{"index":0,"function":{"arguments":"path\\":\\"test.ts\\"}"}}]},"index":0}]}',
|
|
152
|
+
'data: {"choices":[{"delta":{},"finish_reason":"tool_calls","index":0}]}',
|
|
153
|
+
'data: [DONE]',
|
|
154
|
+
]);
|
|
155
|
+
const provider = new OpenAIProvider({ name: 'openai', apiKey: 'test' });
|
|
156
|
+
const events = await collectEvents(provider.stream([createUserMessage('hi')], 'system'));
|
|
157
|
+
const completes = events.filter(e => e.type === 'tool_call_complete');
|
|
158
|
+
assert.equal(completes.length, 1);
|
|
159
|
+
assert.equal(completes[0].toolName, 'Read');
|
|
160
|
+
});
|
|
161
|
+
it('yields error on HTTP failure', async () => {
|
|
162
|
+
globalThis.fetch = (async () => ({
|
|
163
|
+
ok: false,
|
|
164
|
+
status: 429,
|
|
165
|
+
text: async () => 'Rate limited',
|
|
166
|
+
}));
|
|
167
|
+
cleanup = () => { globalThis.fetch = originalFetch; };
|
|
168
|
+
const provider = new OpenAIProvider({ name: 'openai', apiKey: 'test' });
|
|
169
|
+
const events = await collectEvents(provider.stream([createUserMessage('hi')], 'system'));
|
|
170
|
+
const errors = events.filter(e => e.type === 'error');
|
|
171
|
+
assert.ok(errors.length > 0);
|
|
172
|
+
});
|
|
173
|
+
});
|
|
174
|
+
//# sourceMappingURL=stream-parsing.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stream-parsing.test.js","sourceRoot":"","sources":["../../src/providers/stream-parsing.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Message compression — multi-phase strategies to keep conversation
|
|
3
|
+
* within the context window.
|
|
4
|
+
*/
|
|
5
|
+
import type { Message } from "../types/message.js";
|
|
6
|
+
import type { Provider } from "../providers/base.js";
|
|
7
|
+
export declare function makeTokenEstimator(provider: Provider): (text: string) => number;
|
|
8
|
+
export declare function estimateMessagesTokens(messages: Message[], estimateTokens?: (text: string) => number): number;
|
|
9
|
+
/**
|
|
10
|
+
* Multi-phase compression: MicroCompact → AutoCompact → Orphan cleanup.
|
|
11
|
+
*/
|
|
12
|
+
export declare function compressMessages(messages: Message[], targetTokens: number): Message[];
|
|
13
|
+
/**
|
|
14
|
+
* LLM-assisted summarization of older messages.
|
|
15
|
+
*/
|
|
16
|
+
export declare function summarizeConversation(provider: Provider, messages: Message[], model: string | undefined, targetTokens: number): Promise<Message[]>;
|
|
17
|
+
//# sourceMappingURL=compress.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../../src/query/compress.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAMrD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAG/E;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,OAAO,EAAE,EACnB,cAAc,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAuC,GACxE,MAAM,CAeR;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,EAAE,CAkDrF;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,EAAE,CAAC,CAuCpB"}
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Message compression — multi-phase strategies to keep conversation
|
|
3
|
+
* within the context window.
|
|
4
|
+
*/
|
|
5
|
+
import { createUserMessage } from "../types/message.js";
|
|
6
|
+
import { defaultEstimateTokens } from "../providers/base.js";
|
|
7
|
+
const DEFAULT_KEEP_LAST = 10;
|
|
8
|
+
export function makeTokenEstimator(provider) {
|
|
9
|
+
if (provider.estimateTokens)
|
|
10
|
+
return provider.estimateTokens.bind(provider);
|
|
11
|
+
return (text) => defaultEstimateTokens(text, provider.name);
|
|
12
|
+
}
|
|
13
|
+
export function estimateMessagesTokens(messages, estimateTokens = (t) => Math.ceil(t.length / 4)) {
|
|
14
|
+
return messages.reduce((sum, m) => {
|
|
15
|
+
let tokens = estimateTokens(m.content) + 10;
|
|
16
|
+
if (m.toolCalls) {
|
|
17
|
+
for (const tc of m.toolCalls) {
|
|
18
|
+
tokens += estimateTokens(JSON.stringify(tc.arguments));
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
if (m.toolResults) {
|
|
22
|
+
for (const tr of m.toolResults) {
|
|
23
|
+
tokens += estimateTokens(tr.output);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
return sum + tokens;
|
|
27
|
+
}, 0);
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Multi-phase compression: MicroCompact → AutoCompact → Orphan cleanup.
|
|
31
|
+
*/
|
|
32
|
+
export function compressMessages(messages, targetTokens) {
|
|
33
|
+
if (messages.length <= 2)
|
|
34
|
+
return messages;
|
|
35
|
+
const result = [...messages];
|
|
36
|
+
const keepLast = DEFAULT_KEEP_LAST;
|
|
37
|
+
// MicroCompact: Truncate long tool results and assistant messages
|
|
38
|
+
for (let i = 0; i < result.length - keepLast; i++) {
|
|
39
|
+
if (result[i].meta?.pinned)
|
|
40
|
+
continue;
|
|
41
|
+
if (result[i].role === "tool" && result[i].content.length > 500) {
|
|
42
|
+
const c = result[i].content;
|
|
43
|
+
result[i] = { ...result[i], content: c.slice(0, 200) + "\n...[truncated]...\n" + c.slice(-100) };
|
|
44
|
+
}
|
|
45
|
+
if (result[i].role === "assistant" && result[i].content.length > 2000) {
|
|
46
|
+
const c = result[i].content;
|
|
47
|
+
result[i] = { ...result[i], content: c.slice(0, 500) + "\n...[truncated]...\n" + c.slice(-200) };
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
// AutoCompact Phase 1: Replace old tool results with stub
|
|
51
|
+
let toolResultCount = 0;
|
|
52
|
+
for (let i = result.length - 1; i >= 0; i--) {
|
|
53
|
+
if (result[i].meta?.pinned)
|
|
54
|
+
continue;
|
|
55
|
+
if (result[i].role === "tool")
|
|
56
|
+
toolResultCount++;
|
|
57
|
+
if (result[i].role === "tool" && toolResultCount > keepLast) {
|
|
58
|
+
result[i] = { ...result[i], content: "[previous tool result truncated]" };
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
// AutoCompact Phase 2: Drop oldest non-system, non-pinned messages
|
|
62
|
+
while (estimateMessagesTokens(result) > targetTokens && result.length > keepLast + 1) {
|
|
63
|
+
const firstDroppable = result.findIndex((m) => m.role !== "system" && !m.meta?.pinned);
|
|
64
|
+
if (firstDroppable === -1 || firstDroppable >= result.length - keepLast)
|
|
65
|
+
break;
|
|
66
|
+
result.splice(firstDroppable, 1);
|
|
67
|
+
}
|
|
68
|
+
// Phase 3: Remove orphaned tool results
|
|
69
|
+
const validCallIds = new Set();
|
|
70
|
+
for (const msg of result) {
|
|
71
|
+
if (msg.role === "assistant" && msg.toolCalls) {
|
|
72
|
+
for (const tc of msg.toolCalls)
|
|
73
|
+
validCallIds.add(tc.id);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
return result.filter((msg) => {
|
|
77
|
+
if (msg.role !== "tool")
|
|
78
|
+
return true;
|
|
79
|
+
return (msg.toolResults?.length ?? 0) > 0 &&
|
|
80
|
+
msg.toolResults.every((tr) => validCallIds.has(tr.callId));
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
/**
|
|
84
|
+
* LLM-assisted summarization of older messages.
|
|
85
|
+
*/
|
|
86
|
+
export async function summarizeConversation(provider, messages, model, targetTokens) {
|
|
87
|
+
const keepRecent = Math.min(6, messages.length - 1);
|
|
88
|
+
const older = messages.slice(0, messages.length - keepRecent);
|
|
89
|
+
const recent = messages.slice(messages.length - keepRecent);
|
|
90
|
+
if (older.length < 2)
|
|
91
|
+
return messages;
|
|
92
|
+
const pinned = older.filter(m => m.meta?.pinned);
|
|
93
|
+
const summarizable = older.filter(m => !m.meta?.pinned);
|
|
94
|
+
if (summarizable.length < 2)
|
|
95
|
+
return messages;
|
|
96
|
+
const olderText = summarizable.map(m => {
|
|
97
|
+
const prefix = m.role === 'user' ? 'User' : m.role === 'assistant' ? 'Assistant' : 'System';
|
|
98
|
+
let text = `${prefix}: ${m.content.slice(0, 500)}`;
|
|
99
|
+
if (m.toolCalls?.length) {
|
|
100
|
+
text += `\n [Used tools: ${m.toolCalls.map(tc => tc.toolName).join(', ')}]`;
|
|
101
|
+
}
|
|
102
|
+
return text;
|
|
103
|
+
}).join('\n\n');
|
|
104
|
+
const summaryPrompt = `Summarize this conversation history in 2-4 sentences, preserving key decisions, file paths mentioned, and what was accomplished:\n\n${olderText.slice(0, 3000)}`;
|
|
105
|
+
const summaryResponse = await provider.complete([createUserMessage(summaryPrompt)], 'You are a conversation summarizer. Be concise and factual. Preserve important details like file paths and decisions.', undefined, model);
|
|
106
|
+
const summaryMessage = {
|
|
107
|
+
role: 'system',
|
|
108
|
+
content: `[Conversation summary: ${summaryResponse.content}]`,
|
|
109
|
+
uuid: `summary-${Date.now()}`,
|
|
110
|
+
timestamp: Date.now(),
|
|
111
|
+
meta: { isInfo: true },
|
|
112
|
+
};
|
|
113
|
+
return [...pinned, summaryMessage, ...recent];
|
|
114
|
+
}
|
|
115
|
+
//# sourceMappingURL=compress.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compress.js","sourceRoot":"","sources":["../../src/query/compress.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Error classification and recovery helpers for the query loop.
|
|
3
|
+
*/
|
|
4
|
+
export declare const MAX_CONSECUTIVE_ERRORS = 3;
|
|
5
|
+
export declare const MAX_RATE_LIMIT_RETRIES = 3;
|
|
6
|
+
export declare function isRateLimitError(err: Error): boolean;
|
|
7
|
+
export declare function isOverloadError(err: Error): boolean;
|
|
8
|
+
export declare function isPromptTooLongError(err: Error): boolean;
|
|
9
|
+
export declare function isNetworkError(err: Error): boolean;
|
|
10
|
+
//# sourceMappingURL=errors.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/query/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,KAAK,GAAG,OAAO,CAGpD;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,KAAK,GAAG,OAAO,CAGnD;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,KAAK,GAAG,OAAO,CAGxD;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,KAAK,GAAG,OAAO,CAGlD"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Error classification and recovery helpers for the query loop.
|
|
3
|
+
*/
|
|
4
|
+
export const MAX_CONSECUTIVE_ERRORS = 3;
|
|
5
|
+
export const MAX_RATE_LIMIT_RETRIES = 3;
|
|
6
|
+
export function isRateLimitError(err) {
|
|
7
|
+
const msg = err.message.toLowerCase();
|
|
8
|
+
return msg.includes("429") || msg.includes("rate limit") || msg.includes("too many requests");
|
|
9
|
+
}
|
|
10
|
+
export function isOverloadError(err) {
|
|
11
|
+
const msg = err.message.toLowerCase();
|
|
12
|
+
return msg.includes("503") || msg.includes("overloaded") || msg.includes("service unavailable") || msg.includes("529");
|
|
13
|
+
}
|
|
14
|
+
export function isPromptTooLongError(err) {
|
|
15
|
+
const msg = err.message.toLowerCase();
|
|
16
|
+
return msg.includes("prompt") && msg.includes("long");
|
|
17
|
+
}
|
|
18
|
+
export function isNetworkError(err) {
|
|
19
|
+
const msg = err.message.toLowerCase();
|
|
20
|
+
return msg.includes("network") || msg.includes("fetch") || msg.includes("econnrefused");
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=errors.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/query/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AACxC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAExC,MAAM,UAAU,gBAAgB,CAAC,GAAU;IACzC,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IACtC,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;AAChG,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAU;IACxC,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IACtC,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,qBAAqB,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACzH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAU;IAC7C,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IACtC,OAAO,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAU;IACvC,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IACtC,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAC1F,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Agent loop — the core LLM-to-Tool orchestration cycle.
|
|
3
|
+
*
|
|
4
|
+
* This is the coordinator that delegates to sub-modules:
|
|
5
|
+
* - compress.ts — message compression strategies
|
|
6
|
+
* - tools.ts — tool execution, permission checking, batching
|
|
7
|
+
* - errors.ts — error classification and recovery
|
|
8
|
+
* - types.ts — shared types
|
|
9
|
+
*/
|
|
10
|
+
import type { StreamEvent } from "../types/events.js";
|
|
11
|
+
import type { QueryConfig } from "./types.js";
|
|
12
|
+
export type { QueryConfig, QueryLoopState } from "./types.js";
|
|
13
|
+
export { compressMessages } from "./compress.js";
|
|
14
|
+
export declare function query(userMessage: string, config: QueryConfig, existingMessages?: import("../types/message.js").Message[]): AsyncGenerator<StreamEvent, void>;
|
|
15
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAOtD,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,YAAY,CAAC;AAM9D,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAIjD,wBAAuB,KAAK,CAC1B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,WAAW,EACnB,gBAAgB,GAAE,OAAO,qBAAqB,EAAE,OAAO,EAAO,GAC7D,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,CAiNnC"}
|
|
@@ -0,0 +1,199 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Agent loop — the core LLM-to-Tool orchestration cycle.
|
|
3
|
+
*
|
|
4
|
+
* This is the coordinator that delegates to sub-modules:
|
|
5
|
+
* - compress.ts — message compression strategies
|
|
6
|
+
* - tools.ts — tool execution, permission checking, batching
|
|
7
|
+
* - errors.ts — error classification and recovery
|
|
8
|
+
* - types.ts — shared types
|
|
9
|
+
*/
|
|
10
|
+
import { toolToAPIFormat } from "../Tool.js";
|
|
11
|
+
import { createAssistantMessage, createUserMessage } from "../types/message.js";
|
|
12
|
+
import { StreamingToolExecutor } from "../services/StreamingToolExecutor.js";
|
|
13
|
+
import { getContextWindow } from "../harness/cost.js";
|
|
14
|
+
import { createToolResultMessage } from "../types/message.js";
|
|
15
|
+
import { makeTokenEstimator, estimateMessagesTokens, compressMessages, summarizeConversation } from "./compress.js";
|
|
16
|
+
import { executeToolCalls } from "./tools.js";
|
|
17
|
+
import { isRateLimitError, isOverloadError, isPromptTooLongError, isNetworkError, MAX_CONSECUTIVE_ERRORS, MAX_RATE_LIMIT_RETRIES } from "./errors.js";
|
|
18
|
+
export { compressMessages } from "./compress.js";
|
|
19
|
+
const DEFAULT_MAX_TURNS = 50;
|
|
20
|
+
export async function* query(userMessage, config, existingMessages = []) {
|
|
21
|
+
const maxTurns = config.maxTurns ?? DEFAULT_MAX_TURNS;
|
|
22
|
+
const toolContext = {
|
|
23
|
+
workingDir: process.cwd(),
|
|
24
|
+
abortSignal: config.abortSignal,
|
|
25
|
+
provider: config.provider,
|
|
26
|
+
model: config.model,
|
|
27
|
+
tools: config.tools,
|
|
28
|
+
systemPrompt: config.systemPrompt,
|
|
29
|
+
permissionMode: config.permissionMode,
|
|
30
|
+
askUserQuestion: config.askUserQuestion,
|
|
31
|
+
};
|
|
32
|
+
const estimateTokens = makeTokenEstimator(config.provider);
|
|
33
|
+
// Check provider capabilities
|
|
34
|
+
const modelInfo = config.provider.getModelInfo?.(config.model ?? '');
|
|
35
|
+
const toolsSupported = !modelInfo || modelInfo.supportsTools;
|
|
36
|
+
const apiTools = toolsSupported ? config.tools.map(toolToAPIFormat) : undefined;
|
|
37
|
+
const toolPrompts = toolsSupported
|
|
38
|
+
? config.tools.map((t) => t.prompt()).join("\n\n")
|
|
39
|
+
: "";
|
|
40
|
+
const fullSystemPrompt = toolPrompts
|
|
41
|
+
? config.systemPrompt + "\n\n# Available Tools\n\n" + toolPrompts
|
|
42
|
+
: config.systemPrompt;
|
|
43
|
+
const state = {
|
|
44
|
+
messages: [...existingMessages, createUserMessage(userMessage)],
|
|
45
|
+
turn: 0,
|
|
46
|
+
totalCost: 0,
|
|
47
|
+
totalInputTokens: 0,
|
|
48
|
+
totalOutputTokens: 0,
|
|
49
|
+
consecutiveErrors: 0,
|
|
50
|
+
};
|
|
51
|
+
// ── Main loop ──
|
|
52
|
+
while (state.turn < maxTurns) {
|
|
53
|
+
state.turn++;
|
|
54
|
+
if (config.abortSignal?.aborted) {
|
|
55
|
+
yield { type: "turn_complete", reason: "aborted" };
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
if (config.maxCost && config.maxCost > 0 && state.totalCost >= config.maxCost) {
|
|
59
|
+
yield { type: "error", message: `Budget exceeded: $${state.totalCost.toFixed(4)}` };
|
|
60
|
+
yield { type: "turn_complete", reason: "budget_exceeded" };
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
// Context window management
|
|
64
|
+
const contextWindow = getContextWindow(config.model);
|
|
65
|
+
const estimatedTokens = estimateMessagesTokens(state.messages, estimateTokens);
|
|
66
|
+
if (estimatedTokens > contextWindow * 0.8) {
|
|
67
|
+
state.messages = compressMessages(state.messages, Math.floor(contextWindow * 0.6));
|
|
68
|
+
const afterBasic = estimateMessagesTokens(state.messages, estimateTokens);
|
|
69
|
+
if (afterBasic > contextWindow * 0.7 && state.messages.length > 4) {
|
|
70
|
+
try {
|
|
71
|
+
state.messages = await summarizeConversation(config.provider, state.messages, config.model, Math.floor(contextWindow * 0.5));
|
|
72
|
+
yield { type: "error", message: "Context compressed with LLM summarization." };
|
|
73
|
+
}
|
|
74
|
+
catch { /* continue with basic compression */ }
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
// ── LLM call with streaming ──
|
|
78
|
+
let assistantContent = "";
|
|
79
|
+
const toolCalls = [];
|
|
80
|
+
let streamError = null;
|
|
81
|
+
const streamingExecutor = new StreamingToolExecutor(config.tools, toolContext, config.permissionMode, config.askUser, config.abortSignal);
|
|
82
|
+
try {
|
|
83
|
+
for await (const event of config.provider.stream(state.messages, fullSystemPrompt, apiTools, config.model)) {
|
|
84
|
+
if (config.abortSignal?.aborted)
|
|
85
|
+
break;
|
|
86
|
+
switch (event.type) {
|
|
87
|
+
case "text_delta":
|
|
88
|
+
assistantContent += event.content;
|
|
89
|
+
yield event;
|
|
90
|
+
break;
|
|
91
|
+
case "tool_call_start":
|
|
92
|
+
toolCalls.push({ id: event.callId, toolName: event.toolName, arguments: {} });
|
|
93
|
+
yield event;
|
|
94
|
+
break;
|
|
95
|
+
case "tool_call_complete": {
|
|
96
|
+
const tc = toolCalls.find((t) => t.id === event.callId);
|
|
97
|
+
if (tc) {
|
|
98
|
+
const idx = toolCalls.indexOf(tc);
|
|
99
|
+
toolCalls[idx] = { ...tc, arguments: event.arguments };
|
|
100
|
+
}
|
|
101
|
+
if (streamingExecutor) {
|
|
102
|
+
streamingExecutor.addTool({ id: event.callId, toolName: event.toolName, arguments: event.arguments });
|
|
103
|
+
}
|
|
104
|
+
break;
|
|
105
|
+
}
|
|
106
|
+
case "cost_update":
|
|
107
|
+
state.totalCost += event.cost;
|
|
108
|
+
state.totalInputTokens += event.inputTokens;
|
|
109
|
+
state.totalOutputTokens += event.outputTokens;
|
|
110
|
+
yield event;
|
|
111
|
+
break;
|
|
112
|
+
case "error":
|
|
113
|
+
yield event;
|
|
114
|
+
break;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
state.consecutiveErrors = 0;
|
|
118
|
+
}
|
|
119
|
+
catch (err) {
|
|
120
|
+
streamError = err instanceof Error ? err : new Error(String(err));
|
|
121
|
+
state.consecutiveErrors++;
|
|
122
|
+
// Circuit breaker
|
|
123
|
+
if (state.consecutiveErrors >= MAX_CONSECUTIVE_ERRORS) {
|
|
124
|
+
yield { type: "error", message: `Too many consecutive errors (${state.consecutiveErrors}): ${streamError.message}` };
|
|
125
|
+
yield { type: "turn_complete", reason: "error" };
|
|
126
|
+
return;
|
|
127
|
+
}
|
|
128
|
+
// Error recovery cascade
|
|
129
|
+
if (isRateLimitError(streamError) || isOverloadError(streamError)) {
|
|
130
|
+
const attempt = state.consecutiveErrors;
|
|
131
|
+
const isOverload = isOverloadError(streamError);
|
|
132
|
+
if (attempt <= MAX_RATE_LIMIT_RETRIES) {
|
|
133
|
+
const baseRetry = Math.pow(2, attempt) * (isOverload ? 2 : 1);
|
|
134
|
+
const retryIn = baseRetry * (0.5 + Math.random());
|
|
135
|
+
yield { type: "rate_limited", retryIn: Math.round(retryIn), attempt };
|
|
136
|
+
await new Promise((r) => setTimeout(r, retryIn * 1000));
|
|
137
|
+
continue;
|
|
138
|
+
}
|
|
139
|
+
yield { type: "error", message: `${isOverload ? "Server overloaded" : "Rate limit exceeded"} after ${MAX_RATE_LIMIT_RETRIES} retries.` };
|
|
140
|
+
yield { type: "turn_complete", reason: "error" };
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
if (isPromptTooLongError(streamError)) {
|
|
144
|
+
state.promptTooLongRetries = (state.promptTooLongRetries ?? 0) + 1;
|
|
145
|
+
if (state.promptTooLongRetries > 2) {
|
|
146
|
+
yield { type: "error", message: "Context still too long after 2 compression attempts." };
|
|
147
|
+
yield { type: "turn_complete", reason: "error" };
|
|
148
|
+
return;
|
|
149
|
+
}
|
|
150
|
+
state.messages = compressMessages(state.messages, Math.floor(contextWindow * 0.5));
|
|
151
|
+
state.transition = "retry_prompt_too_long";
|
|
152
|
+
yield { type: "error", message: "Context too long, compressing history..." };
|
|
153
|
+
continue;
|
|
154
|
+
}
|
|
155
|
+
if (isNetworkError(streamError)) {
|
|
156
|
+
state.transition = "retry_network";
|
|
157
|
+
const delay = 1000 * Math.pow(2, state.consecutiveErrors - 1);
|
|
158
|
+
yield { type: "error", message: `Network error, retrying in ${delay / 1000}s...` };
|
|
159
|
+
await new Promise((r) => setTimeout(r, delay));
|
|
160
|
+
continue;
|
|
161
|
+
}
|
|
162
|
+
yield { type: "error", message: streamError.message };
|
|
163
|
+
yield { type: "turn_complete", reason: "error" };
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
if (config.abortSignal?.aborted) {
|
|
167
|
+
yield { type: "turn_complete", reason: "aborted" };
|
|
168
|
+
return;
|
|
169
|
+
}
|
|
170
|
+
if (assistantContent === "" && toolCalls.length === 0) {
|
|
171
|
+
yield { type: "error", message: "No response received. Check that your model server is running and the model name is correct." };
|
|
172
|
+
return;
|
|
173
|
+
}
|
|
174
|
+
state.messages.push(createAssistantMessage(assistantContent, toolCalls.length > 0 ? toolCalls : undefined));
|
|
175
|
+
if (toolCalls.length === 0) {
|
|
176
|
+
yield { type: "turn_complete", reason: "completed" };
|
|
177
|
+
return;
|
|
178
|
+
}
|
|
179
|
+
// Collect streaming tool results
|
|
180
|
+
await streamingExecutor.waitForAll();
|
|
181
|
+
const completedResults = [...streamingExecutor.getCompletedResults()];
|
|
182
|
+
const executedIds = new Set(completedResults.map(r => r.toolCall.id));
|
|
183
|
+
for (const { callId, chunk } of streamingExecutor.outputChunks) {
|
|
184
|
+
yield { type: 'tool_output_delta', callId, chunk };
|
|
185
|
+
}
|
|
186
|
+
for (const { toolCall: tc, result } of completedResults) {
|
|
187
|
+
yield { type: "tool_call_end", callId: tc.id, output: result.output, isError: result.isError };
|
|
188
|
+
state.messages.push(createToolResultMessage({ callId: tc.id, output: result.output, isError: result.isError }));
|
|
189
|
+
}
|
|
190
|
+
// Execute remaining tools not started during streaming
|
|
191
|
+
const remaining = toolCalls.filter(tc => !executedIds.has(tc.id));
|
|
192
|
+
if (remaining.length > 0) {
|
|
193
|
+
yield* executeToolCalls(remaining, config.tools, toolContext, config.permissionMode, config.askUser, state);
|
|
194
|
+
}
|
|
195
|
+
state.transition = "next_turn";
|
|
196
|
+
}
|
|
197
|
+
yield { type: "turn_complete", reason: "max_turns" };
|
|
198
|
+
}
|
|
199
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tool execution — permission checking, batching, output capping.
|
|
3
|
+
*/
|
|
4
|
+
import type { ToolContext, ToolResult, Tools } from "../Tool.js";
|
|
5
|
+
import type { StreamEvent } from "../types/events.js";
|
|
6
|
+
import type { ToolCall } from "../types/message.js";
|
|
7
|
+
import type { AskUserFn, PermissionMode } from "../types/permissions.js";
|
|
8
|
+
import type { QueryLoopState } from "./types.js";
|
|
9
|
+
type Batch = {
|
|
10
|
+
concurrent: boolean;
|
|
11
|
+
calls: ToolCall[];
|
|
12
|
+
};
|
|
13
|
+
export declare function partitionToolCalls(toolCalls: ToolCall[], tools: Tools): Batch[];
|
|
14
|
+
export declare function executeSingleTool(toolCall: ToolCall, tools: Tools, context: ToolContext, permissionMode: PermissionMode, askUser?: AskUserFn): Promise<ToolResult>;
|
|
15
|
+
export declare function executeToolCalls(toolCalls: ToolCall[], tools: Tools, context: ToolContext, permissionMode: PermissionMode, askUser?: AskUserFn, state?: QueryLoopState): AsyncGenerator<StreamEvent, void>;
|
|
16
|
+
export {};
|
|
17
|
+
//# sourceMappingURL=tools.d.ts.map
|