@qduc/term2 0.1.6 → 0.1.7
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/dist/agent.lite-mode.test.d.ts +2 -0
- package/dist/agent.lite-mode.test.d.ts.map +1 -0
- package/dist/agent.lite-mode.test.js +39 -0
- package/dist/agent.lite-mode.test.js.map +1 -0
- package/dist/components/TextInput.d.ts.map +1 -1
- package/dist/components/TextInput.js +2 -1
- package/dist/components/TextInput.js.map +1 -1
- package/dist/components/TextInput.test.js.map +1 -1
- package/dist/debug_ask_mentor.d.ts +2 -0
- package/dist/debug_ask_mentor.d.ts.map +1 -0
- package/dist/debug_ask_mentor.js +73 -0
- package/dist/debug_ask_mentor.js.map +1 -0
- package/dist/lib/openai-agent-client.d.ts.map +1 -1
- package/dist/lib/openai-agent-client.js +2 -1
- package/dist/lib/openai-agent-client.js.map +1 -1
- package/dist/lib/openai-strict-tool-schema.d.ts +10 -0
- package/dist/lib/openai-strict-tool-schema.d.ts.map +1 -0
- package/dist/lib/openai-strict-tool-schema.js +39 -0
- package/dist/lib/openai-strict-tool-schema.js.map +1 -0
- package/dist/lib/openai-strict-tool-schema.test.d.ts +2 -0
- package/dist/lib/openai-strict-tool-schema.test.d.ts.map +1 -0
- package/dist/lib/openai-strict-tool-schema.test.js +26 -0
- package/dist/lib/openai-strict-tool-schema.test.js.map +1 -0
- package/dist/modes/companion/command-index.d.ts +26 -0
- package/dist/modes/companion/command-index.d.ts.map +1 -0
- package/dist/modes/companion/command-index.js +50 -0
- package/dist/modes/companion/command-index.js.map +1 -0
- package/dist/modes/companion/command-index.test.d.ts +2 -0
- package/dist/modes/companion/command-index.test.d.ts.map +1 -0
- package/dist/modes/companion/command-index.test.js +86 -0
- package/dist/modes/companion/command-index.test.js.map +1 -0
- package/dist/modes/companion/companion-app.d.ts +12 -0
- package/dist/modes/companion/companion-app.d.ts.map +1 -0
- package/dist/modes/companion/companion-app.js +297 -0
- package/dist/modes/companion/companion-app.js.map +1 -0
- package/dist/modes/companion/companion-session.d.ts +63 -0
- package/dist/modes/companion/companion-session.d.ts.map +1 -0
- package/dist/modes/companion/companion-session.js +146 -0
- package/dist/modes/companion/companion-session.js.map +1 -0
- package/dist/modes/companion/companion-session.test.d.ts +2 -0
- package/dist/modes/companion/companion-session.test.d.ts.map +1 -0
- package/dist/modes/companion/companion-session.test.js +28 -0
- package/dist/modes/companion/companion-session.test.js.map +1 -0
- package/dist/modes/companion/components/status-bar.d.ts +13 -0
- package/dist/modes/companion/components/status-bar.d.ts.map +1 -0
- package/dist/modes/companion/components/status-bar.js +26 -0
- package/dist/modes/companion/components/status-bar.js.map +1 -0
- package/dist/modes/companion/context-buffer.d.ts +65 -0
- package/dist/modes/companion/context-buffer.d.ts.map +1 -0
- package/dist/modes/companion/context-buffer.js +156 -0
- package/dist/modes/companion/context-buffer.js.map +1 -0
- package/dist/modes/companion/context-buffer.test.d.ts +2 -0
- package/dist/modes/companion/context-buffer.test.d.ts.map +1 -0
- package/dist/modes/companion/context-buffer.test.js +154 -0
- package/dist/modes/companion/context-buffer.test.js.map +1 -0
- package/dist/modes/companion/event-detector.d.ts +46 -0
- package/dist/modes/companion/event-detector.d.ts.map +1 -0
- package/dist/modes/companion/event-detector.js +169 -0
- package/dist/modes/companion/event-detector.js.map +1 -0
- package/dist/modes/companion/event-detector.test.d.ts +2 -0
- package/dist/modes/companion/event-detector.test.d.ts.map +1 -0
- package/dist/modes/companion/event-detector.test.js +121 -0
- package/dist/modes/companion/event-detector.test.js.map +1 -0
- package/dist/modes/companion/index.d.ts +33 -0
- package/dist/modes/companion/index.d.ts.map +1 -0
- package/dist/modes/companion/index.js +21 -0
- package/dist/modes/companion/index.js.map +1 -0
- package/dist/modes/companion/input-key-mapper.d.ts +3 -0
- package/dist/modes/companion/input-key-mapper.d.ts.map +1 -0
- package/dist/modes/companion/input-key-mapper.js +31 -0
- package/dist/modes/companion/input-key-mapper.js.map +1 -0
- package/dist/modes/companion/input-key-mapper.test.d.ts +2 -0
- package/dist/modes/companion/input-key-mapper.test.d.ts.map +1 -0
- package/dist/modes/companion/input-key-mapper.test.js +26 -0
- package/dist/modes/companion/input-key-mapper.test.js.map +1 -0
- package/dist/modes/companion/input-parser.d.ts +53 -0
- package/dist/modes/companion/input-parser.d.ts.map +1 -0
- package/dist/modes/companion/input-parser.js +114 -0
- package/dist/modes/companion/input-parser.js.map +1 -0
- package/dist/modes/companion/input-parser.test.d.ts +2 -0
- package/dist/modes/companion/input-parser.test.d.ts.map +1 -0
- package/dist/modes/companion/input-parser.test.js +123 -0
- package/dist/modes/companion/input-parser.test.js.map +1 -0
- package/dist/modes/companion/mode-manager.d.ts +41 -0
- package/dist/modes/companion/mode-manager.d.ts.map +1 -0
- package/dist/modes/companion/mode-manager.js +56 -0
- package/dist/modes/companion/mode-manager.js.map +1 -0
- package/dist/modes/companion/mode-manager.test.d.ts +2 -0
- package/dist/modes/companion/mode-manager.test.d.ts.map +1 -0
- package/dist/modes/companion/mode-manager.test.js +65 -0
- package/dist/modes/companion/mode-manager.test.js.map +1 -0
- package/dist/modes/companion/output-classifier.d.ts +15 -0
- package/dist/modes/companion/output-classifier.d.ts.map +1 -0
- package/dist/modes/companion/output-classifier.js +77 -0
- package/dist/modes/companion/output-classifier.js.map +1 -0
- package/dist/modes/companion/output-classifier.test.d.ts +2 -0
- package/dist/modes/companion/output-classifier.test.d.ts.map +1 -0
- package/dist/modes/companion/output-classifier.test.js +133 -0
- package/dist/modes/companion/output-classifier.test.js.map +1 -0
- package/dist/modes/companion/pty-wrapper.d.ts +46 -0
- package/dist/modes/companion/pty-wrapper.d.ts.map +1 -0
- package/dist/modes/companion/pty-wrapper.js +143 -0
- package/dist/modes/companion/pty-wrapper.js.map +1 -0
- package/dist/modes/companion/safety-classifier.d.ts +31 -0
- package/dist/modes/companion/safety-classifier.d.ts.map +1 -0
- package/dist/modes/companion/safety-classifier.js +140 -0
- package/dist/modes/companion/safety-classifier.js.map +1 -0
- package/dist/modes/companion/safety-classifier.test.d.ts +2 -0
- package/dist/modes/companion/safety-classifier.test.d.ts.map +1 -0
- package/dist/modes/companion/safety-classifier.test.js +151 -0
- package/dist/modes/companion/safety-classifier.test.js.map +1 -0
- package/dist/modes/companion/summarizer.d.ts +24 -0
- package/dist/modes/companion/summarizer.d.ts.map +1 -0
- package/dist/modes/companion/summarizer.js +132 -0
- package/dist/modes/companion/summarizer.js.map +1 -0
- package/dist/modes/companion/terminal-history.d.ts +27 -0
- package/dist/modes/companion/terminal-history.d.ts.map +1 -0
- package/dist/modes/companion/terminal-history.js +142 -0
- package/dist/modes/companion/terminal-history.js.map +1 -0
- package/dist/prompts/simple-mentor.md +8 -0
- package/dist/providers/github-copilot/model.d.ts.map +1 -1
- package/dist/providers/github-copilot/model.js +25 -108
- package/dist/providers/github-copilot/model.js.map +1 -1
- package/dist/providers/github-copilot/model.test.d.ts +2 -0
- package/dist/providers/github-copilot/model.test.d.ts.map +1 -0
- package/dist/providers/github-copilot/model.test.js +63 -0
- package/dist/providers/github-copilot/model.test.js.map +1 -0
- package/dist/providers/github-copilot/provider.d.ts +0 -5
- package/dist/providers/github-copilot/provider.d.ts.map +1 -1
- package/dist/providers/github-copilot/provider.js +2 -7
- package/dist/providers/github-copilot/provider.js.map +1 -1
- package/dist/providers/openai-compatible/model.js +3 -3
- package/dist/providers/openai-compatible/model.js.map +1 -1
- package/dist/providers/openai-compatible/reasoning-content.test.js +70 -0
- package/dist/providers/openai-compatible/reasoning-content.test.js.map +1 -1
- package/dist/providers/openrouter/model.js +3 -3
- package/dist/providers/openrouter/model.js.map +1 -1
- package/dist/providers/openrouter/utils.d.ts +1 -0
- package/dist/providers/openrouter/utils.d.ts.map +1 -1
- package/dist/providers/openrouter/utils.js +3 -0
- package/dist/providers/openrouter/utils.js.map +1 -1
- package/dist/providers/openrouter.test.js +64 -0
- package/dist/providers/openrouter.test.js.map +1 -1
- package/dist/services/check_mock.d.ts +2 -0
- package/dist/services/check_mock.d.ts.map +1 -0
- package/dist/services/check_mock.js +22 -0
- package/dist/services/check_mock.js.map +1 -0
- package/dist/services/conversation-service.test.d.ts +2 -0
- package/dist/services/conversation-service.test.d.ts.map +1 -0
- package/dist/services/conversation-service.test.js +149 -183
- package/dist/services/conversation-service.test.js.map +1 -0
- package/dist/tools/ask-mentor.d.ts +1 -1
- package/dist/tools/ask-mentor.js +1 -1
- package/dist/tools/ask-mentor.js.map +1 -1
- package/dist/tools/ask-mentor.test.js +9 -3
- package/dist/tools/ask-mentor.test.js.map +1 -1
- package/dist/tools/find-files.d.ts +2 -2
- package/dist/tools/find-files.d.ts.map +1 -1
- package/dist/tools/find-files.js +2 -4
- package/dist/tools/find-files.js.map +1 -1
- package/dist/tools/find-files.test.js +7 -19
- package/dist/tools/find-files.test.js.map +1 -1
- package/dist/tools/grep.d.ts +1 -1
- package/dist/tools/grep.d.ts.map +1 -1
- package/dist/tools/grep.js +1 -5
- package/dist/tools/grep.js.map +1 -1
- package/dist/tools/read-file.d.ts +2 -2
- package/dist/tools/read-file.d.ts.map +1 -1
- package/dist/tools/read-file.js +2 -4
- package/dist/tools/read-file.js.map +1 -1
- package/dist/tools/read-file.test.js +7 -13
- package/dist/tools/read-file.test.js.map +1 -1
- package/dist/tools/search-replace.d.ts +1 -1
- package/dist/tools/search-replace.d.ts.map +1 -1
- package/dist/tools/search-replace.js +1 -0
- package/dist/tools/search-replace.js.map +1 -1
- package/dist/tools/search.d.ts +4 -4
- package/dist/tools/search.d.ts.map +1 -1
- package/dist/tools/search.js +5 -14
- package/dist/tools/search.js.map +1 -1
- package/dist/tools/shell.d.ts +2 -2
- package/dist/tools/shell.d.ts.map +1 -1
- package/dist/tools/shell.js +2 -4
- package/dist/tools/shell.js.map +1 -1
- package/dist/tools/tool-parameter-schema.test.d.ts +2 -0
- package/dist/tools/tool-parameter-schema.test.d.ts.map +1 -0
- package/dist/tools/tool-parameter-schema.test.js +88 -0
- package/dist/tools/tool-parameter-schema.test.js.map +1 -0
- package/dist/tools/web-fetch.d.ts +3 -3
- package/dist/tools/web-fetch.d.ts.map +1 -1
- package/dist/tools/web-fetch.js +3 -2
- package/dist/tools/web-fetch.js.map +1 -1
- package/dist/utils/command-safety.d.ts.map +1 -1
- package/dist/utils/command-safety.devnull.test.d.ts +2 -0
- package/dist/utils/command-safety.devnull.test.d.ts.map +1 -0
- package/dist/utils/command-safety.devnull.test.js +13 -0
- package/dist/utils/command-safety.devnull.test.js.map +1 -0
- package/dist/utils/command-safety.js +10 -364
- package/dist/utils/command-safety.js.map +1 -1
- package/dist/utils/extract-command-messages.test.d.ts +2 -0
- package/dist/utils/extract-command-messages.test.d.ts.map +1 -0
- package/dist/utils/extract-command-messages.test.js +58 -51
- package/dist/utils/extract-command-messages.test.js.map +1 -0
- package/package.json +1 -1
- package/dist/app.model-command-feedback.test.d.ts +0 -2
- package/dist/app.model-command-feedback.test.d.ts.map +0 -1
- package/dist/app.model-command-feedback.test.js +0 -19
- package/dist/app.model-command-feedback.test.js.map +0 -1
- package/dist/components/MentorMode.test.d.ts +0 -2
- package/dist/components/MentorMode.test.d.ts.map +0 -1
- package/dist/components/MentorMode.test.js.map +0 -1
- package/dist/components/StatusBar.test.d.ts +0 -2
- package/dist/components/StatusBar.test.d.ts.map +0 -1
- package/dist/components/StatusBar.test.js +0 -19
- package/dist/components/StatusBar.test.js.map +0 -1
- package/dist/debug-schema.d.ts +0 -2
- package/dist/debug-schema.d.ts.map +0 -1
- package/dist/debug-schema.js +0 -22
- package/dist/debug-schema.js.map +0 -1
- package/dist/hooks/use-model-selection.test.d.ts +0 -2
- package/dist/hooks/use-model-selection.test.d.ts.map +0 -1
- package/dist/hooks/use-model-selection.test.js +0 -28
- package/dist/hooks/use-model-selection.test.js.map +0 -1
- package/dist/hooks/use-path-completion.test.d.ts +0 -2
- package/dist/hooks/use-path-completion.test.d.ts.map +0 -1
- package/dist/hooks/use-path-completion.test.js +0 -29
- package/dist/hooks/use-path-completion.test.js.map +0 -1
- package/dist/lib/mentor-client.d.ts +0 -41
- package/dist/lib/mentor-client.d.ts.map +0 -1
- package/dist/lib/mentor-client.js +0 -146
- package/dist/lib/mentor-client.js.map +0 -1
- package/dist/lib/mentor-client.test.d.ts +0 -2
- package/dist/lib/mentor-client.test.d.ts.map +0 -1
- package/dist/lib/mentor-client.test.js +0 -440
- package/dist/lib/mentor-client.test.js.map +0 -1
- package/dist/lib/retry-strategy.d.ts +0 -43
- package/dist/lib/retry-strategy.d.ts.map +0 -1
- package/dist/lib/retry-strategy.js +0 -93
- package/dist/lib/retry-strategy.js.map +0 -1
- package/dist/lib/retry-strategy.test.d.ts +0 -2
- package/dist/lib/retry-strategy.test.d.ts.map +0 -1
- package/dist/lib/retry-strategy.test.js +0 -200
- package/dist/lib/retry-strategy.test.js.map +0 -1
- package/dist/prompts/default.md.bak +0 -77
- package/dist/providers/github-copilot/model-direct.d.ts +0 -34
- package/dist/providers/github-copilot/model-direct.d.ts.map +0 -1
- package/dist/providers/github-copilot/model-direct.js +0 -443
- package/dist/providers/github-copilot/model-direct.js.map +0 -1
- package/dist/providers/openrouter/merge-messages.test.d.ts +0 -2
- package/dist/providers/openrouter/merge-messages.test.d.ts.map +0 -1
- package/dist/providers/openrouter/merge-messages.test.js +0 -83
- package/dist/providers/openrouter/merge-messages.test.js.map +0 -1
- package/dist/providers/openrouter.history.test.d.ts +0 -2
- package/dist/providers/openrouter.history.test.d.ts.map +0 -1
- package/dist/providers/openrouter.history.test.js +0 -533
- package/dist/providers/openrouter.history.test.js.map +0 -1
- package/dist/reproduce_issue.test.d.ts +0 -2
- package/dist/reproduce_issue.test.d.ts.map +0 -1
- package/dist/reproduce_issue.test.js +0 -31
- package/dist/reproduce_issue.test.js.map +0 -1
- package/dist/services/conversation-result-builder.d.ts +0 -41
- package/dist/services/conversation-result-builder.d.ts.map +0 -1
- package/dist/services/conversation-result-builder.js +0 -110
- package/dist/services/conversation-result-builder.js.map +0 -1
- package/dist/services/conversation-result-builder.test.d.ts +0 -2
- package/dist/services/conversation-result-builder.test.d.ts.map +0 -1
- package/dist/services/conversation-result-builder.test.js +0 -76
- package/dist/services/conversation-result-builder.test.js.map +0 -1
- package/dist/services/conversation-session.usage.test.d.ts +0 -2
- package/dist/services/conversation-session.usage.test.d.ts.map +0 -1
- package/dist/services/conversation-session.usage.test.js +0 -59
- package/dist/services/conversation-session.usage.test.js.map +0 -1
- package/dist/services/stream-event-processor.d.ts +0 -32
- package/dist/services/stream-event-processor.d.ts.map +0 -1
- package/dist/services/stream-event-processor.js +0 -344
- package/dist/services/stream-event-processor.js.map +0 -1
- package/dist/services/stream-event-processor.test.d.ts +0 -2
- package/dist/services/stream-event-processor.test.d.ts.map +0 -1
- package/dist/services/stream-event-processor.test.js +0 -117
- package/dist/services/stream-event-processor.test.js.map +0 -1
- package/dist/test-search-tool.d.ts +0 -2
- package/dist/test-search-tool.d.ts.map +0 -1
- package/dist/test-search-tool.js +0 -36
- package/dist/test-search-tool.js.map +0 -1
- package/dist/types/messages.d.ts +0 -29
- package/dist/types/messages.d.ts.map +0 -1
- package/dist/types/messages.js +0 -2
- package/dist/types/messages.js.map +0 -1
- package/dist/utils/extract-command-messages.repro.test.d.ts +0 -2
- package/dist/utils/extract-command-messages.repro.test.d.ts.map +0 -1
- package/dist/utils/extract-command-messages.repro.test.js +0 -31
- package/dist/utils/extract-command-messages.repro.test.js.map +0 -1
- package/dist/utils/message-utils.d.ts +0 -17
- package/dist/utils/message-utils.d.ts.map +0 -1
- package/dist/utils/message-utils.js +0 -52
- package/dist/utils/message-utils.js.map +0 -1
- package/dist/utils/message-utils.test.d.ts +0 -2
- package/dist/utils/message-utils.test.d.ts.map +0 -1
- package/dist/utils/message-utils.test.js +0 -48
- package/dist/utils/message-utils.test.js.map +0 -1
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import test from 'ava';
|
|
2
|
+
import { extractCopilotTextDelta } from './model.js';
|
|
3
|
+
test('extractCopilotTextDelta - pure deltas', t => {
|
|
4
|
+
let accumulated = '';
|
|
5
|
+
let delta = extractCopilotTextDelta(accumulated, 'Hello');
|
|
6
|
+
t.is(delta, 'Hello');
|
|
7
|
+
accumulated += delta;
|
|
8
|
+
delta = extractCopilotTextDelta(accumulated, ' World');
|
|
9
|
+
t.is(delta, ' World');
|
|
10
|
+
accumulated += delta;
|
|
11
|
+
t.is(accumulated, 'Hello World');
|
|
12
|
+
});
|
|
13
|
+
test('extractCopilotTextDelta - accumulated chunks', t => {
|
|
14
|
+
let accumulated = '';
|
|
15
|
+
let delta = extractCopilotTextDelta(accumulated, 'Hello');
|
|
16
|
+
t.is(delta, 'Hello');
|
|
17
|
+
accumulated += delta;
|
|
18
|
+
delta = extractCopilotTextDelta(accumulated, 'Hello World');
|
|
19
|
+
t.is(delta, ' World');
|
|
20
|
+
accumulated += delta;
|
|
21
|
+
t.is(accumulated, 'Hello World');
|
|
22
|
+
});
|
|
23
|
+
test('extractCopilotTextDelta - duplicate chunks', t => {
|
|
24
|
+
let accumulated = '';
|
|
25
|
+
let delta = extractCopilotTextDelta(accumulated, 'Hello');
|
|
26
|
+
t.is(delta, 'Hello');
|
|
27
|
+
accumulated += delta;
|
|
28
|
+
delta = extractCopilotTextDelta(accumulated, 'Hello');
|
|
29
|
+
t.is(delta, '');
|
|
30
|
+
accumulated += delta;
|
|
31
|
+
t.is(accumulated, 'Hello');
|
|
32
|
+
});
|
|
33
|
+
test('extractCopilotTextDelta - empty chunks', t => {
|
|
34
|
+
let accumulated = '';
|
|
35
|
+
let delta = extractCopilotTextDelta(accumulated, 'Hello');
|
|
36
|
+
t.is(delta, 'Hello');
|
|
37
|
+
accumulated += delta;
|
|
38
|
+
delta = extractCopilotTextDelta(accumulated, '');
|
|
39
|
+
t.is(delta, '');
|
|
40
|
+
accumulated += delta;
|
|
41
|
+
t.is(accumulated, 'Hello');
|
|
42
|
+
});
|
|
43
|
+
test('extractCopilotTextDelta - tricky overlap', t => {
|
|
44
|
+
// If it's pure deltas but one delta happens to be a suffix that looks like accumulated?
|
|
45
|
+
// This shouldn't happen in reality but let's check.
|
|
46
|
+
let accumulated = 'Hello';
|
|
47
|
+
let incoming = 'Hello'; // This is a NEW delta "Hello"
|
|
48
|
+
let delta = extractCopilotTextDelta(accumulated, incoming);
|
|
49
|
+
t.is(delta, ''); // With overlap detection, "Hello" overlaps completely with "Hello"
|
|
50
|
+
});
|
|
51
|
+
test('extractCopilotTextDelta - partial overlap', t => {
|
|
52
|
+
let accumulated = 'Hello';
|
|
53
|
+
let incoming = 'lo World'; // Delta that overlaps by 'lo'
|
|
54
|
+
let delta = extractCopilotTextDelta(accumulated, incoming);
|
|
55
|
+
t.is(delta, ' World');
|
|
56
|
+
});
|
|
57
|
+
test('extractCopilotTextDelta - real world repeat', t => {
|
|
58
|
+
let accumulated = 'I can help you with that.';
|
|
59
|
+
let incoming = 'that. Let me see...'; // Overlaps by 'that.'
|
|
60
|
+
let delta = extractCopilotTextDelta(accumulated, incoming);
|
|
61
|
+
t.is(delta, ' Let me see...');
|
|
62
|
+
});
|
|
63
|
+
//# sourceMappingURL=model.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model.test.js","sourceRoot":"","sources":["../../../source/providers/github-copilot/model.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,5 @@
|
|
|
1
1
|
import { type ModelProvider, type Model } from '@openai/agents-core';
|
|
2
2
|
import type { ILoggingService, ISettingsService } from '../../services/service-interfaces.js';
|
|
3
|
-
/**
|
|
4
|
-
* GitHubCopilotProvider - Uses the Direct model that lets Copilot SDK
|
|
5
|
-
* control tool execution flow without trying to integrate with
|
|
6
|
-
* OpenAI Agents SDK's approval pattern.
|
|
7
|
-
*/
|
|
8
3
|
export declare class GitHubCopilotProvider implements ModelProvider {
|
|
9
4
|
#private;
|
|
10
5
|
constructor(deps: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../source/providers/github-copilot/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAErE,OAAO,KAAK,EACR,eAAe,EACf,gBAAgB,EACnB,MAAM,sCAAsC,CAAC;AAG9C
|
|
1
|
+
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../source/providers/github-copilot/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAErE,OAAO,KAAK,EACR,eAAe,EACf,gBAAgB,EACnB,MAAM,sCAAsC,CAAC;AAG9C,qBAAa,qBAAsB,YAAW,aAAa;;gBAM3C,IAAI,EAAE;QACd,eAAe,EAAE,gBAAgB,CAAC;QAClC,cAAc,EAAE,eAAe,CAAC;KACnC;IAKD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK;CASvD;AAGD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE;IAC9C,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;CACnC,GAAG,qBAAqB,CAExB"}
|
|
@@ -1,9 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
/**
|
|
3
|
-
* GitHubCopilotProvider - Uses the Direct model that lets Copilot SDK
|
|
4
|
-
* control tool execution flow without trying to integrate with
|
|
5
|
-
* OpenAI Agents SDK's approval pattern.
|
|
6
|
-
*/
|
|
1
|
+
import { GitHubCopilotModel } from './model.js';
|
|
7
2
|
export class GitHubCopilotProvider {
|
|
8
3
|
#settingsService;
|
|
9
4
|
#loggingService;
|
|
@@ -14,7 +9,7 @@ export class GitHubCopilotProvider {
|
|
|
14
9
|
this.#loggingService = deps.loggingService;
|
|
15
10
|
}
|
|
16
11
|
getModel(modelName) {
|
|
17
|
-
return new
|
|
12
|
+
return new GitHubCopilotModel({
|
|
18
13
|
settingsService: this.#settingsService,
|
|
19
14
|
loggingService: this.#loggingService,
|
|
20
15
|
modelId: modelName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../source/providers/github-copilot/provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../source/providers/github-copilot/provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,OAAO,qBAAqB;IAC9B,gBAAgB,CAAmB;IACnC,eAAe,CAAkB;IACjC,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC,CAAC,qCAAqC;IAC9E,eAAe,GAAG,IAAI,GAAG,EAA0B,CAAC,CAAC,8CAA8C;IAEnG,YAAY,IAGX;QACG,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC;QAC7C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC;IAC/C,CAAC;IAED,QAAQ,CAAC,SAAkB;QACvB,OAAO,IAAI,kBAAkB,CAAC;YAC1B,eAAe,EAAE,IAAI,CAAC,gBAAgB;YACtC,cAAc,EAAE,IAAI,CAAC,eAAe;YACpC,OAAO,EAAE,SAAS;YAClB,UAAU,EAAE,IAAI,CAAC,WAAW;YAC5B,cAAc,EAAE,IAAI,CAAC,eAAe;SACvC,CAAC,CAAC;IACP,CAAC;CACJ;AAED,mDAAmD;AACnD,MAAM,UAAU,2BAA2B,CAAC,IAG3C;IACG,OAAO,IAAI,qBAAqB,CAAC,IAAI,CAAC,CAAC;AAC3C,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
2
|
import { callOpenAICompatibleChatCompletions } from './api.js';
|
|
3
3
|
import { buildMessagesFromRequest, extractFunctionToolsFromRequest } from '../openrouter/converters.js';
|
|
4
|
-
import { normalizeUsage, decodeHtmlEntities } from '../openrouter/utils.js';
|
|
4
|
+
import { normalizeUsage, decodeHtmlEntities, normalizeToolCallName } from '../openrouter/utils.js';
|
|
5
5
|
export class OpenAICompatibleModel {
|
|
6
6
|
name;
|
|
7
7
|
#providerId;
|
|
@@ -109,7 +109,7 @@ export class OpenAICompatibleModel {
|
|
|
109
109
|
output.push({
|
|
110
110
|
type: 'function_call',
|
|
111
111
|
callId: toolCall.id,
|
|
112
|
-
name: toolCall.function.name,
|
|
112
|
+
name: normalizeToolCallName(toolCall.function.name),
|
|
113
113
|
arguments: decodedArgs,
|
|
114
114
|
status: 'completed',
|
|
115
115
|
...(typeof reasoning === 'string' ? { reasoning } : {}),
|
|
@@ -249,7 +249,7 @@ export class OpenAICompatibleModel {
|
|
|
249
249
|
output.push({
|
|
250
250
|
type: 'function_call',
|
|
251
251
|
callId: toolCall.callId,
|
|
252
|
-
name: toolCall.name,
|
|
252
|
+
name: normalizeToolCallName(toolCall.name),
|
|
253
253
|
arguments: args,
|
|
254
254
|
status: 'completed',
|
|
255
255
|
...(typeof reasoningText === 'string' && reasoningText.length > 0 ? { reasoning: reasoningText } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../source/providers/openai-compatible/model.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../source/providers/openai-compatible/model.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,4 +84,74 @@ test('OpenAICompatibleModel.getStreamedResponse support reasoning_content', asyn
|
|
|
84
84
|
t.is(assistantMessage.reasoning, 'thinking');
|
|
85
85
|
t.is(assistantMessage.content[0].text, 'Hi');
|
|
86
86
|
});
|
|
87
|
+
test('OpenAICompatibleModel.getResponse trims tool call names', async (t) => {
|
|
88
|
+
globalThis.fetch = async () => createJsonResponse({
|
|
89
|
+
id: 'resp-tools-trim',
|
|
90
|
+
choices: [
|
|
91
|
+
{
|
|
92
|
+
message: {
|
|
93
|
+
content: '',
|
|
94
|
+
tool_calls: [
|
|
95
|
+
{
|
|
96
|
+
id: 'call-trim-1',
|
|
97
|
+
type: 'function',
|
|
98
|
+
function: {
|
|
99
|
+
name: ' shell ',
|
|
100
|
+
arguments: '{"command":"ls"}',
|
|
101
|
+
},
|
|
102
|
+
},
|
|
103
|
+
],
|
|
104
|
+
},
|
|
105
|
+
},
|
|
106
|
+
],
|
|
107
|
+
usage: {},
|
|
108
|
+
});
|
|
109
|
+
const model = new OpenAICompatibleModel({
|
|
110
|
+
settingsService: mockSettingsService,
|
|
111
|
+
loggingService: logger,
|
|
112
|
+
providerId: 'custom',
|
|
113
|
+
baseUrl: 'https://api.example.com',
|
|
114
|
+
apiKey: 'mock-api-key',
|
|
115
|
+
modelId: 'test-model',
|
|
116
|
+
});
|
|
117
|
+
const response = await model.getResponse({
|
|
118
|
+
input: 'hi',
|
|
119
|
+
});
|
|
120
|
+
const toolCall = response.output.find((item) => item.type === 'function_call');
|
|
121
|
+
t.truthy(toolCall);
|
|
122
|
+
t.is(toolCall.name, 'shell');
|
|
123
|
+
});
|
|
124
|
+
test('OpenAICompatibleModel.getStreamedResponse trims tool call names', async (t) => {
|
|
125
|
+
const encoder = new TextEncoder();
|
|
126
|
+
const stream = new ReadableStream({
|
|
127
|
+
start(controller) {
|
|
128
|
+
controller.enqueue(encoder.encode('data: {"id":"resp-tools-stream","choices":[{"delta":{"tool_calls":[{"index":0,"id":"call-stream-1","type":"function","function":{"name":" shell ","arguments":"{\\"command\\":\\"ls\\"}"}}]}}]}\n'));
|
|
129
|
+
controller.enqueue(encoder.encode('data: [DONE]\n'));
|
|
130
|
+
controller.close();
|
|
131
|
+
},
|
|
132
|
+
});
|
|
133
|
+
globalThis.fetch = async () => new Response(stream, {
|
|
134
|
+
status: 200,
|
|
135
|
+
headers: { 'Content-Type': 'text/event-stream' },
|
|
136
|
+
});
|
|
137
|
+
const model = new OpenAICompatibleModel({
|
|
138
|
+
settingsService: mockSettingsService,
|
|
139
|
+
loggingService: logger,
|
|
140
|
+
providerId: 'custom',
|
|
141
|
+
baseUrl: 'https://api.example.com',
|
|
142
|
+
apiKey: 'mock-api-key',
|
|
143
|
+
modelId: 'test-model',
|
|
144
|
+
});
|
|
145
|
+
const events = [];
|
|
146
|
+
for await (const event of model.getStreamedResponse({
|
|
147
|
+
input: 'hi',
|
|
148
|
+
})) {
|
|
149
|
+
events.push(event);
|
|
150
|
+
}
|
|
151
|
+
const doneEvent = events.find((event) => event.type === 'response_done');
|
|
152
|
+
t.truthy(doneEvent);
|
|
153
|
+
const toolCall = doneEvent.response.output.find((item) => item.type === 'function_call');
|
|
154
|
+
t.truthy(toolCall);
|
|
155
|
+
t.is(toolCall.name, 'shell');
|
|
156
|
+
});
|
|
87
157
|
//# sourceMappingURL=reasoning-content.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reasoning-content.test.js","sourceRoot":"","sources":["../../../source/providers/openai-compatible/reasoning-content.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"reasoning-content.test.js","sourceRoot":"","sources":["../../../source/providers/openai-compatible/reasoning-content.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
2
|
import { callOpenRouter } from './api.js';
|
|
3
3
|
import { buildMessagesFromRequest, extractFunctionToolsFromRequest } from './converters.js';
|
|
4
|
-
import { normalizeUsage, decodeHtmlEntities } from './utils.js';
|
|
4
|
+
import { normalizeUsage, decodeHtmlEntities, normalizeToolCallName } from './utils.js';
|
|
5
5
|
export class OpenRouterModel {
|
|
6
6
|
name;
|
|
7
7
|
#modelId;
|
|
@@ -118,7 +118,7 @@ export class OpenRouterModel {
|
|
|
118
118
|
output.push({
|
|
119
119
|
type: 'function_call',
|
|
120
120
|
callId: toolCall.id,
|
|
121
|
-
name: toolCall.function.name,
|
|
121
|
+
name: normalizeToolCallName(toolCall.function.name),
|
|
122
122
|
arguments: decodeHtmlEntities(toolCall.function.arguments),
|
|
123
123
|
status: 'completed',
|
|
124
124
|
// Preserve reasoning blocks/tokens on tool calls so that when the
|
|
@@ -276,7 +276,7 @@ export class OpenRouterModel {
|
|
|
276
276
|
output.push({
|
|
277
277
|
type: 'function_call',
|
|
278
278
|
callId: toolCall.callId,
|
|
279
|
-
name: toolCall.name,
|
|
279
|
+
name: normalizeToolCallName(toolCall.name),
|
|
280
280
|
arguments: decodeHtmlEntities(toolCall.arguments),
|
|
281
281
|
status: 'completed',
|
|
282
282
|
...(typeof reasoningText === 'string' && reasoningText.length > 0 ? { reasoning: reasoningText } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../source/providers/openrouter/model.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../source/providers/openrouter/model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,wBAAwB,EAAE,+BAA+B,EAAE,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEvF,MAAM,OAAO,eAAe;IAC1B,IAAI,CAAS;IACb,QAAQ,CAAS;IACjB,gBAAgB,CAAmB;IACnC,eAAe,CAAkB;IAEjC,YAAY,IAA8F;QACxG,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;QACzB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC;QAC7C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC;QAC3C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,iBAAiB,CAAC;IAChG,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAqB;QACrC,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CACb,gGAAgG;gBAC9F,mDAAmD,CACtD,CAAC;QACJ,CAAC;QACD,yEAAyE;QACzE,sEAAsE;QACtE,qEAAqE;QACrE,6DAA6D;QAC7D,MAAM,eAAe,GAAG,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC;QAChF,MAAM,QAAQ,GAAG,wBAAwB,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QAE1F,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAE/D,2CAA2C;QAC3C,yCAAyC;QACzC,yEAAyE;QACzE,MAAM,KAAK,GAAG,+BAA+B,CAAC,OAAO,CAAC,CAAC;QAEvD,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC;YAC/B,MAAM;YACN,KAAK,EAAE,eAAe;YACtB,QAAQ;YACR,MAAM,EAAE,KAAK;YACb,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,QAAQ,EAAE,OAAO,CAAC,aAAa;YAC/B,KAAK;YACL,eAAe,EAAE,IAAI,CAAC,gBAAgB;SACvC,CAAC,CAAC;QACH,MAAM,IAAI,GAAQ,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,iBAAiB,GAAG,MAAM,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE,CAAC;QACzD,MAAM,WAAW,GAAG,OAAO,iBAAiB,KAAK,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;QAElH,MAAM,UAAU,GAAG,IAAI,EAAE,EAAE,IAAI,UAAU,EAAE,CAAC;QAE5C,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAQ,CAAC;QACvD,MAAM,SAAS,GAAG,MAAM,EAAE,OAAO,EAAE,SAAS,IAAI,MAAM,EAAE,OAAO,EAAE,iBAAiB,CAAC;QACnF,MAAM,gBAAgB,GAAG,MAAM,EAAE,OAAO,EAAE,iBAAiB,CAAC;QAC5D,MAAM,SAAS,GAAG,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC;QAE9C,6DAA6D;QAC7D,MAAM,MAAM,GAAU,EAAE,CAAC;QAEzB,4DAA4D;QAC5D,IAAI,gBAAgB,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACxD,KAAK,MAAM,aAAa,IAAI,gBAAgB,EAAE,CAAC;gBAC7C,MAAM,UAAU,GAAQ;oBACtB,IAAI,EAAE,WAAW;oBACjB,EAAE,EAAE,aAAa,CAAC,EAAE,IAAI,aAAa,IAAI,CAAC,GAAG,EAAE,IAAI,aAAa,CAAC,KAAK,IAAI,CAAC,EAAE;oBAC7E,OAAO,EAAE,EAAE;oBACX,YAAY,EAAE,aAAa;iBAC5B,CAAC;gBAEF,mCAAmC;gBACnC,IAAI,aAAa,CAAC,IAAI,KAAK,gBAAgB,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC;oBAClE,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;wBACtB,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,aAAa,CAAC,IAAI;wBACxB,YAAY,EAAE;4BACZ,MAAM,EAAE,aAAa,CAAC,MAAM;4BAC5B,KAAK,EAAE,aAAa,CAAC,KAAK;yBAC3B;qBACF,CAAC,CAAC;gBACL,CAAC;qBAAM,IAAI,aAAa,CAAC,IAAI,KAAK,mBAAmB,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;oBAC/E,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;wBACtB,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,aAAa,CAAC,OAAO;wBAC3B,YAAY,EAAE;4BACZ,MAAM,EAAE,aAAa,CAAC,MAAM;4BAC5B,KAAK,EAAE,aAAa,CAAC,KAAK;yBAC3B;qBACF,CAAC,CAAC;gBACL,CAAC;qBAAM,IAAI,aAAa,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;oBACxD,6DAA6D;oBAC7D,UAAU,CAAC,OAAO,GAAG,EAAE,CAAC;gBAC1B,CAAC;gBACD,+EAA+E;gBAE/E,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QAED,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;QAC9C,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;QACtE,MAAM,wBAAwB,GAAG,CAAC,cAAc,IAAI,CAAC,YAAY,CAAC;QAClE,MAAM,aAAa,GAAG,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,CAAC;QAE/G,gEAAgE;QAChE,2DAA2D;QAC3D,IAAI,cAAc,IAAI,wBAAwB,EAAE,CAAC;YAC/C,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,WAAW;gBACjB,MAAM,EAAE,WAAW;gBACnB,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,aAAa;wBACnB,IAAI,EAAE,aAAa;qBACpB;iBACF;gBACD,GAAG,CAAC,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvD,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACtE,CAAC,CAAC;QACZ,CAAC;QAED,0CAA0C;QAC1C,iFAAiF;QACjF,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBACjC,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBACjC,MAAM,CAAC,IAAI,CAAC;wBACV,IAAI,EAAE,eAAe;wBACrB,MAAM,EAAE,QAAQ,CAAC,EAAE;wBACnB,IAAI,EAAE,qBAAqB,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;wBACnD,SAAS,EAAE,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC;wBAC1D,MAAM,EAAE,WAAW;wBACnB,kEAAkE;wBAClE,qEAAqE;wBACrE,iDAAiD;wBACjD,GAAG,CAAC,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBACvD,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBACtE,CAAC,CAAC;gBACZ,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAkB;YAC9B,KAAK;YACL,MAAM;YACN,UAAU;YACV,YAAY,EAAE,IAAI;SACnB,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,CAAC,mBAAmB,CAAC,OAAqB;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CACb,gGAAgG;gBAC9F,mDAAmD,CACtD,CAAC;QACJ,CAAC;QACD,kFAAkF;QAClF,6DAA6D;QAC7D,MAAM,eAAe,GAAG,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC;QAChF,MAAM,QAAQ,GAAG,wBAAwB,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QAE1F,MAAM,KAAK,GAAG,+BAA+B,CAAC,OAAO,CAAC,CAAC;QAEvD,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,yBAAyB,EAAE;YACpD,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC3D,YAAY,EAAE,OAAO;YACrB,QAAQ;YACR,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACnD,KAAK;SACN,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC;YAC/B,MAAM;YACN,KAAK,EAAE,eAAe;YACtB,QAAQ;YACR,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,QAAQ,EAAE,OAAO,CAAC,aAAa;YAC/B,KAAK;YACL,eAAe,EAAE,IAAI,CAAC,gBAAgB;SACvC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAClC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,UAAU,GAAG,SAAS,CAAC;QAC3B,IAAI,SAAS,GAAQ,IAAI,CAAC;QAC1B,IAAI,wBAAwB,GAAG,EAAE,CAAC;QAClC,MAAM,oBAAoB,GAAU,EAAE,CAAC;QACvC,MAAM,oBAAoB,GAAU,EAAE,CAAC;QAEvC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC7C,MAAM;gBACJ,IAAI,EAAE,eAAe;gBACrB,QAAQ,EAAE;oBACR,EAAE,EAAE,IAAI,CAAC,UAAU,IAAI,SAAS;oBAChC,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC;oBACjC,MAAM,EAAE,IAAI,CAAC,MAAM;iBACpB;aACK,CAAC;YACT,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG;YACZ,WAAW;YACX,UAAU;YACV,SAAS;YACT,wBAAwB;YACxB,oBAAoB;YACpB,oBAAoB;SACrB,CAAC;QAEF,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YAC5C,IAAI,IAAI;gBAAE,MAAM;YAEhB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YAElD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC;gBACtD,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC;gBAC9B,IAAI,CAAC,IAAI,CAAC,OAAO;oBAAE,SAAS;gBAE5B,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBACzD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;oBAC3B,MAAM,KAAK,CAAC;gBACd,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,kBAAkB,CAAC,WAAmB,EAAE,gBAAsB,EAAE,SAAiB,EAAE,aAAsB;QACvG,MAAM,MAAM,GAAU,EAAE,CAAC;QAEzB,4DAA4D;QAC5D,IAAI,gBAAgB,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACxD,KAAK,MAAM,aAAa,IAAI,gBAAgB,EAAE,CAAC;gBAC7C,MAAM,UAAU,GAAQ;oBACtB,IAAI,EAAE,WAAW;oBACjB,EAAE,EAAE,aAAa,CAAC,EAAE,IAAI,aAAa,IAAI,CAAC,GAAG,EAAE,IAAI,aAAa,CAAC,KAAK,IAAI,CAAC,EAAE;oBAC7E,OAAO,EAAE,EAAE;oBACX,YAAY,EAAE,aAAa;iBAC5B,CAAC;gBAEF,mCAAmC;gBACnC,IAAI,aAAa,CAAC,IAAI,KAAK,gBAAgB,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC;oBAClE,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;wBACtB,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,aAAa,CAAC,IAAI;wBACxB,YAAY,EAAE;4BACZ,MAAM,EAAE,aAAa,CAAC,MAAM;4BAC5B,KAAK,EAAE,aAAa,CAAC,KAAK;yBAC3B;qBACF,CAAC,CAAC;gBACL,CAAC;qBAAM,IAAI,aAAa,CAAC,IAAI,KAAK,mBAAmB,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;oBAC/E,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;wBACtB,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,aAAa,CAAC,OAAO;wBAC3B,YAAY,EAAE;4BACZ,MAAM,EAAE,aAAa,CAAC,MAAM;4BAC5B,KAAK,EAAE,aAAa,CAAC,KAAK;yBAC3B;qBACF,CAAC,CAAC;gBACL,CAAC;qBAAM,IAAI,aAAa,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;oBACxD,6DAA6D;oBAC7D,UAAU,CAAC,OAAO,GAAG,EAAE,CAAC;gBAC1B,CAAC;gBACD,+EAA+E;gBAE/E,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QAED,qDAAqD;QACrD,2DAA2D;QAC3D,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,WAAW;gBACjB,MAAM,EAAE,WAAW;gBACnB,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,aAAa;wBACnB,IAAI,EAAE,WAAW;qBAClB;iBACF;gBACD,GAAG,CAAC,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtG,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACtE,CAAC,CAAC;QACZ,CAAC;QAED,0CAA0C;QAC1C,8DAA8D;QAC9D,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBACjC,IAAI,QAAQ,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;oBACtC,MAAM,CAAC,IAAI,CAAC;wBACV,IAAI,EAAE,eAAe;wBACrB,MAAM,EAAE,QAAQ,CAAC,MAAM;wBACvB,IAAI,EAAE,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC;wBAC1C,SAAS,EAAE,kBAAkB,CAAC,QAAQ,CAAC,SAAS,CAAC;wBACjD,MAAM,EAAE,WAAW;wBACnB,GAAG,CAAC,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBACtG,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBACtE,CAAC,CAAC;gBACZ,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,eAAe,CAAC,WAAkB,EAAE,MAAa;QAC/C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,WAAW,CAAC,MAAM,CAAC;YAChD,MAAM,QAAQ,GACZ,WAAW,CAAC,KAAK,CAAC;gBACjB;oBACC,IAAI,EAAE,eAAe;oBACrB,MAAM,EAAE,EAAE;oBACV,IAAI,EAAE,EAAE;oBACR,SAAS,EAAE,EAAE;iBACN,CAAC;YAEZ,6CAA6C;YAC7C,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;gBACb,QAAQ,CAAC,MAAM,IAAI,KAAK,CAAC,EAAE,CAAC;YAC9B,CAAC;YAED,yCAAyC;YACzC,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;gBACzB,QAAQ,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;YACvC,CAAC;YACD,IAAI,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC;gBAC9B,QAAQ,CAAC,SAAS,IAAI,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACrE,CAAC;YAED,WAAW,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;QAChC,CAAC;IACH,CAAC;IAED,CAAC,qBAAqB,CAAC,MAAc;QACnC,IAAI,GAAW,CAAC;QAChB,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YACzC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;YAC/B,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC;QACnD,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC;IACjD,CAAC;IAED,CAAC,eAAe,CAAC,IAAY,EAAE,KAAU;QACvC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;YAAE,OAAO;QAEtC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAClC,KAAK,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,CAAC,mBAAmB,CAAC,IAAY,EAAE,KAAU;QAC3C,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtB,KAAK,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;YAC7C,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC9B,4DAA4D;YAC5D,KAAK,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACnD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,2CAA2C;YAC3C,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,+BAA+B,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IAED,CAAC,yBAAyB,CAAC,KAAU;QACnC,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACxD,KAAK,CAAC,UAAU,GAAG,UAAU,EAAE,CAAC;QAClC,CAAC;QAED,MAAM,gBAAgB,GAAG,KAAK,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC;QAExG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,wBAAwB,EAAE;YACnD,IAAI,EAAE,KAAK,CAAC,WAAW;YACvB,gBAAgB;YAChB,SAAS,EAAE,KAAK,CAAC,oBAAoB;SACtC,CAAC,CAAC;QAEH,MAAM;YACJ,IAAI,EAAE,eAAe;YACrB,QAAQ,EAAE;gBACR,EAAE,EAAE,KAAK,CAAC,UAAU;gBACpB,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC;gBACtC,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAC7B,KAAK,CAAC,WAAW,EACjB,gBAAgB,EAChB,KAAK,CAAC,oBAAoB,EAC1B,KAAK,CAAC,wBAAwB,CAC/B;aACF;SACK,CAAC;QAET,MAAM;YACJ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,QAAQ;SAChB,CAAC;IACJ,CAAC;IAED,CAAC,uBAAuB,CAAC,IAAS,EAAE,KAAU;QAC5C,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,8BAA8B,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACjD,IAAI,CAAC,8BAA8B,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEjD,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACjE,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,iBAAiB,CAAC;QAC1B,CAAC;QAED,MAAM;YACJ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,IAAI;SACZ,CAAC;IACJ,CAAC;IAED,sBAAsB,CAAC,IAAS,EAAE,KAAU;QAC1C,IAAI,IAAI,EAAE,EAAE,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAC/C,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC;QAC7B,CAAC;QACD,IAAI,IAAI,EAAE,KAAK,EAAE,CAAC;YAChB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,8BAA8B,CAAC,IAAS,EAAE,KAAU;QAClD,MAAM,gBAAgB,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,iBAAiB,CAAC;QACtE,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,cAAc,GAAG;gBACrB,gBAAgB,EAAE,MAAM;gBACxB,mBAAmB,EAAE,SAAS;gBAC9B,qBAAqB,EAAE,MAAM;aAC9B,CAAC;YAEF,4DAA4D;YAC5D,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YAElH,MAAM,OAAO,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;YAEzF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;gBAC/B,MAAM,SAAS,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;gBACvC,IAAI,CAAC,SAAS;oBAAE,OAAO,CAAC,8BAA8B;gBAEtD,MAAM,GAAG,GAAG,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;gBAC/B,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAEvC,IAAI,QAAQ,EAAE,CAAC;oBACb,QAAQ,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC;gBAC3C,CAAC;qBAAM,CAAC;oBACN,MAAM,OAAO,GAAG;wBACd,GAAG,MAAM;wBACT,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC;qBAC/B,CAAC;oBACF,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACzC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;gBACjC,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,IAAI,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,iBAAiB,CAAC;QAC5G,IAAI,OAAO,cAAc,KAAK,QAAQ,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpE,KAAK,CAAC,wBAAwB,IAAI,cAAc,CAAC;QACnD,CAAC;IACH,CAAC;IAED,8BAA8B,CAAC,IAAS,EAAE,KAAU;QAClD,MAAM,cAAc,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC;QAC7D,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,oBAAoB,EAAE,cAAc,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED,oBAAoB,CAAC,IAAS,EAAE,KAAU;QACxC,MAAM,KAAK,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,IAAI,EAAE,CAAC;QACvD,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC;YAC3B,OAAO;gBACL,IAAI,EAAE,mBAAmB;gBACzB,KAAK;aACC,CAAC;QACX,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAwB,CAAC,GAAiB;QACxC,wFAAwF;QACxF,6DAA6D;QAC7D,IAAK,GAAW,EAAE,YAAY,EAAE,KAAK;YAAE,OAAQ,GAAW,CAAC,YAAY,CAAC,KAAK,CAAC;QAC9E,OAAO,SAAS,CAAC;IACnB,CAAC;CACF"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { ISettingsService } from '../../services/service-interfaces.js';
|
|
2
2
|
export declare function decodeHtmlEntities(text: string): string;
|
|
3
|
+
export declare function normalizeToolCallName(name: unknown): string;
|
|
3
4
|
export declare function getOpenRouterBaseUrl(settingsService: ISettingsService): string;
|
|
4
5
|
export declare function normalizeUsage(openRouterUsage: any): {
|
|
5
6
|
inputTokens: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../source/providers/openrouter/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAE7E,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQvD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,gBAAgB,GAAG,MAAM,CAE9E;AAED,wBAAgB,cAAc,CAAC,eAAe,EAAE,GAAG,GAAG;IACpD,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB,CAQA;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAGzD"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../source/providers/openrouter/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAE7E,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQvD;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAE3D;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,gBAAgB,GAAG,MAAM,CAE9E;AAED,wBAAgB,cAAc,CAAC,eAAe,EAAE,GAAG,GAAG;IACpD,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB,CAQA;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAGzD"}
|
|
@@ -7,6 +7,9 @@ export function decodeHtmlEntities(text) {
|
|
|
7
7
|
.replace(/'/g, "'")
|
|
8
8
|
.replace(/'/g, "'");
|
|
9
9
|
}
|
|
10
|
+
export function normalizeToolCallName(name) {
|
|
11
|
+
return typeof name === 'string' ? name.trim() : '';
|
|
12
|
+
}
|
|
10
13
|
export function getOpenRouterBaseUrl(settingsService) {
|
|
11
14
|
return settingsService.get('agent.openrouter.baseUrl') || 'https://openrouter.ai/api/v1';
|
|
12
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../source/providers/openrouter/utils.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,OAAO,IAAI;SACR,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;SACrB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;SACrB,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC;SACvB,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,eAAiC;IACpE,OAAO,eAAe,CAAC,GAAG,CAAC,0BAA0B,CAAC,IAAI,8BAA8B,CAAC;AAC3F,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,eAAoB;IAKjD,yEAAyE;IACzE,0DAA0D;IAC1D,OAAO;QACL,WAAW,EAAE,eAAe,EAAE,aAAa,IAAI,CAAC;QAChD,YAAY,EAAE,eAAe,EAAE,iBAAiB,IAAI,CAAC;QACrD,WAAW,EAAE,eAAe,EAAE,YAAY,IAAI,CAAC;KAChD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC9C,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAC3C,OAAO,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC/E,CAAC"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../source/providers/openrouter/utils.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,OAAO,IAAI;SACR,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;SACrB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;SACrB,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC;SACvB,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAa;IACjD,OAAO,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,eAAiC;IACpE,OAAO,eAAe,CAAC,GAAG,CAAC,0BAA0B,CAAC,IAAI,8BAA8B,CAAC;AAC3F,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,eAAoB;IAKjD,yEAAyE;IACzE,0DAA0D;IAC1D,OAAO;QACL,WAAW,EAAE,eAAe,EAAE,aAAa,IAAI,CAAC;QAChD,YAAY,EAAE,eAAe,EAAE,iBAAiB,IAAI,CAAC;QACrD,WAAW,EAAE,eAAe,EAAE,YAAY,IAAI,CAAC;KAChD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC9C,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAC3C,OAAO,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC/E,CAAC"}
|
|
@@ -897,6 +897,70 @@ test.serial('preserves assistant message content when tool calls are present', a
|
|
|
897
897
|
t.is(assistantMsg.tool_calls[0].id, 'call-456');
|
|
898
898
|
t.is(assistantMsg.tool_calls[0].function.name, 'search');
|
|
899
899
|
});
|
|
900
|
+
test.serial('trims tool call names in non-streaming responses', async (t) => {
|
|
901
|
+
globalThis.fetch = async () => createJsonResponse({
|
|
902
|
+
id: 'resp-tools-trim',
|
|
903
|
+
choices: [
|
|
904
|
+
{
|
|
905
|
+
message: {
|
|
906
|
+
content: '',
|
|
907
|
+
tool_calls: [
|
|
908
|
+
{
|
|
909
|
+
id: 'call-trim-1',
|
|
910
|
+
type: 'function',
|
|
911
|
+
function: {
|
|
912
|
+
name: ' shell ',
|
|
913
|
+
arguments: '{"command":"ls"}',
|
|
914
|
+
},
|
|
915
|
+
},
|
|
916
|
+
],
|
|
917
|
+
},
|
|
918
|
+
},
|
|
919
|
+
],
|
|
920
|
+
usage: {},
|
|
921
|
+
});
|
|
922
|
+
const model = new OpenRouterModel({
|
|
923
|
+
settingsService: mockSettingsService,
|
|
924
|
+
loggingService: logger,
|
|
925
|
+
modelId: 'mock-model',
|
|
926
|
+
});
|
|
927
|
+
const response = await model.getResponse({
|
|
928
|
+
input: 'list files',
|
|
929
|
+
});
|
|
930
|
+
const toolCall = response.output.find((item) => item.type === 'function_call');
|
|
931
|
+
t.truthy(toolCall);
|
|
932
|
+
t.is(toolCall.name, 'shell');
|
|
933
|
+
});
|
|
934
|
+
test.serial('trims tool call names in streamed responses', async (t) => {
|
|
935
|
+
const encoder = new TextEncoder();
|
|
936
|
+
const stream = new ReadableStream({
|
|
937
|
+
start(controller) {
|
|
938
|
+
controller.enqueue(encoder.encode('data: {"id":"resp-tools-stream","choices":[{"delta":{"tool_calls":[{"index":0,"id":"call-stream-1","type":"function","function":{"name":" shell ","arguments":"{\\"command\\":\\"ls\\"}"}}]}}]}\n'));
|
|
939
|
+
controller.enqueue(encoder.encode('data: [DONE]\n'));
|
|
940
|
+
controller.close();
|
|
941
|
+
},
|
|
942
|
+
});
|
|
943
|
+
globalThis.fetch = async () => new Response(stream, {
|
|
944
|
+
status: 200,
|
|
945
|
+
headers: { 'Content-Type': 'text/event-stream' },
|
|
946
|
+
});
|
|
947
|
+
const model = new OpenRouterModel({
|
|
948
|
+
settingsService: mockSettingsService,
|
|
949
|
+
loggingService: logger,
|
|
950
|
+
modelId: 'mock-model',
|
|
951
|
+
});
|
|
952
|
+
const events = [];
|
|
953
|
+
for await (const event of model.getStreamedResponse({
|
|
954
|
+
input: 'list files',
|
|
955
|
+
})) {
|
|
956
|
+
events.push(event);
|
|
957
|
+
}
|
|
958
|
+
const doneEvent = events.find((event) => event.type === 'response_done');
|
|
959
|
+
t.truthy(doneEvent);
|
|
960
|
+
const toolCall = doneEvent.response.output.find((item) => item.type === 'function_call');
|
|
961
|
+
t.truthy(toolCall);
|
|
962
|
+
t.is(toolCall.name, 'shell');
|
|
963
|
+
});
|
|
900
964
|
// ========== Error Recovery Tests: OpenRouterError and Retry Classification ==========
|
|
901
965
|
test('OpenRouterError includes status and headers', (t) => {
|
|
902
966
|
const error = new OpenRouterError('Test error', 429, { 'retry-after': '5', 'x-custom': 'value' }, 'response body');
|