@qduc/term2 0.1.2 → 0.1.4
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.d.ts.map +1 -1
- package/dist/agent.js +5 -0
- package/dist/agent.js.map +1 -1
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +3 -1
- package/dist/app.js.map +1 -1
- package/dist/cli.js +2 -1
- package/dist/cli.js.map +1 -1
- package/dist/components/ApprovalPrompt.d.ts.map +1 -1
- package/dist/components/ApprovalPrompt.js +20 -0
- package/dist/components/ApprovalPrompt.js.map +1 -1
- package/dist/components/ChatMessage.js +1 -1
- package/dist/components/ChatMessage.js.map +1 -1
- package/dist/components/InputBox.d.ts.map +1 -1
- package/dist/components/InputBox.js +3 -8
- package/dist/components/InputBox.js.map +1 -1
- package/dist/components/MarkdownRenderer.js +1 -1
- package/dist/components/MarkdownRenderer.js.map +1 -1
- package/dist/components/ModelSelectionMenu.error-tabs.test.d.ts +2 -0
- package/dist/components/ModelSelectionMenu.error-tabs.test.d.ts.map +1 -0
- package/dist/components/ModelSelectionMenu.error-tabs.test.js +18 -0
- package/dist/components/ModelSelectionMenu.error-tabs.test.js.map +1 -0
- package/dist/components/SettingsSelectionMenu.js +1 -1
- package/dist/components/SettingsSelectionMenu.js.map +1 -1
- package/dist/components/SlashCommandMenu.js +2 -2
- package/dist/components/SlashCommandMenu.js.map +1 -1
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +53 -508
- package/dist/hooks/use-conversation.js.map +1 -1
- package/dist/hooks/use-model-selection.d.ts.map +1 -1
- package/dist/hooks/use-model-selection.js +7 -3
- package/dist/hooks/use-model-selection.js.map +1 -1
- package/dist/hooks/use-settings-completion.d.ts.map +1 -1
- package/dist/hooks/use-settings-completion.js +5 -0
- package/dist/hooks/use-settings-completion.js.map +1 -1
- package/dist/hooks/use-settings-completion.test.js +6 -0
- package/dist/hooks/use-settings-completion.test.js.map +1 -1
- package/dist/hooks/use-settings-value-completion.d.ts.map +1 -1
- package/dist/hooks/use-settings-value-completion.js +1 -0
- package/dist/hooks/use-settings-value-completion.js.map +1 -1
- package/dist/lib/editor-impl.test.d.ts +2 -0
- package/dist/lib/editor-impl.test.d.ts.map +1 -0
- package/dist/lib/editor-impl.test.js +188 -0
- package/dist/lib/editor-impl.test.js.map +1 -0
- package/dist/lib/openai-agent-client.d.ts.map +1 -1
- package/dist/lib/openai-agent-client.js +35 -15
- package/dist/lib/openai-agent-client.js.map +1 -1
- package/dist/lib/openai-agent-client.public-methods.test.d.ts +2 -0
- package/dist/lib/openai-agent-client.public-methods.test.d.ts.map +1 -0
- package/dist/lib/openai-agent-client.public-methods.test.js +188 -0
- package/dist/lib/openai-agent-client.public-methods.test.js.map +1 -0
- package/dist/lib/tool-invoke.test.js +1 -1
- package/dist/lib/tool-invoke.test.js.map +1 -1
- package/dist/providers/github-copilot/converters.d.ts +45 -0
- package/dist/providers/github-copilot/converters.d.ts.map +1 -0
- package/dist/providers/github-copilot/converters.js +118 -0
- package/dist/providers/github-copilot/converters.js.map +1 -0
- package/dist/providers/github-copilot/converters.test.d.ts +2 -0
- package/dist/providers/github-copilot/converters.test.d.ts.map +1 -0
- package/dist/providers/github-copilot/converters.test.js +162 -0
- package/dist/providers/github-copilot/converters.test.js.map +1 -0
- package/dist/providers/github-copilot/github-copilot.provider.d.ts +2 -0
- package/dist/providers/github-copilot/github-copilot.provider.d.ts.map +1 -0
- package/dist/providers/github-copilot/github-copilot.provider.js +75 -0
- package/dist/providers/github-copilot/github-copilot.provider.js.map +1 -0
- package/dist/providers/github-copilot/github-copilot.provider.test.d.ts +2 -0
- package/dist/providers/github-copilot/github-copilot.provider.test.d.ts.map +1 -0
- package/dist/providers/github-copilot/github-copilot.provider.test.js +26 -0
- package/dist/providers/github-copilot/github-copilot.provider.test.js.map +1 -0
- package/dist/providers/github-copilot/index.d.ts +4 -0
- package/dist/providers/github-copilot/index.d.ts.map +1 -0
- package/dist/providers/github-copilot/index.js +4 -0
- package/dist/providers/github-copilot/index.js.map +1 -0
- package/dist/providers/github-copilot/model-direct.d.ts +34 -0
- package/dist/providers/github-copilot/model-direct.d.ts.map +1 -0
- package/dist/providers/github-copilot/model-direct.js +443 -0
- package/dist/providers/github-copilot/model-direct.js.map +1 -0
- package/dist/providers/github-copilot/model.d.ts +24 -0
- package/dist/providers/github-copilot/model.d.ts.map +1 -0
- package/dist/providers/github-copilot/model.delta.test.d.ts +2 -0
- package/dist/providers/github-copilot/model.delta.test.d.ts.map +1 -0
- package/dist/providers/github-copilot/model.delta.test.js +15 -0
- package/dist/providers/github-copilot/model.delta.test.js.map +1 -0
- package/dist/providers/github-copilot/model.js +581 -0
- package/dist/providers/github-copilot/model.js.map +1 -0
- package/dist/providers/github-copilot/provider.d.ts +20 -0
- package/dist/providers/github-copilot/provider.d.ts.map +1 -0
- package/dist/providers/github-copilot/provider.js +30 -0
- package/dist/providers/github-copilot/provider.js.map +1 -0
- package/dist/providers/github-copilot/provider.test.d.ts +2 -0
- package/dist/providers/github-copilot/provider.test.d.ts.map +1 -0
- package/dist/providers/github-copilot/provider.test.js +52 -0
- package/dist/providers/github-copilot/provider.test.js.map +1 -0
- package/dist/providers/github-copilot/utils.d.ts +20 -0
- package/dist/providers/github-copilot/utils.d.ts.map +1 -0
- package/dist/providers/github-copilot/utils.js +142 -0
- package/dist/providers/github-copilot/utils.js.map +1 -0
- package/dist/providers/github-copilot/utils.test.d.ts +2 -0
- package/dist/providers/github-copilot/utils.test.d.ts.map +1 -0
- package/dist/providers/github-copilot/utils.test.js +21 -0
- package/dist/providers/github-copilot/utils.test.js.map +1 -0
- package/dist/providers/openai-compatible/model.d.ts.map +1 -1
- package/dist/providers/openai-compatible/model.js +13 -2
- package/dist/providers/openai-compatible/model.js.map +1 -1
- package/dist/providers/openai-compatible/reasoning-content.test.js +2 -2
- package/dist/providers/openai-compatible/reasoning-content.test.js.map +1 -1
- package/dist/providers/openrouter/converters.d.ts.map +1 -1
- package/dist/providers/openrouter/converters.js +64 -46
- package/dist/providers/openrouter/converters.js.map +1 -1
- package/dist/providers/openrouter/converters.test.js +13 -12
- package/dist/providers/openrouter/converters.test.js.map +1 -1
- package/dist/providers/openrouter/merge-messages.test.d.ts +2 -0
- package/dist/providers/openrouter/merge-messages.test.d.ts.map +1 -0
- package/dist/providers/openrouter/merge-messages.test.js +83 -0
- package/dist/providers/openrouter/merge-messages.test.js.map +1 -0
- package/dist/providers/openrouter/reasoning-content.test.js +2 -2
- package/dist/providers/openrouter/reasoning-content.test.js.map +1 -1
- package/dist/providers/openrouter.test.js +30 -21
- package/dist/providers/openrouter.test.js.map +1 -1
- package/dist/reproduce_issue.test.d.ts +2 -0
- package/dist/reproduce_issue.test.d.ts.map +1 -0
- package/dist/reproduce_issue.test.js +31 -0
- package/dist/reproduce_issue.test.js.map +1 -0
- package/dist/services/conversation-store.test.js +12 -11
- package/dist/services/conversation-store.test.js.map +1 -1
- package/dist/services/settings-service.d.ts +12 -3
- package/dist/services/settings-service.d.ts.map +1 -1
- package/dist/services/settings-service.js +26 -0
- package/dist/services/settings-service.js.map +1 -1
- package/dist/tools/ask-mentor.d.ts +1 -1
- package/dist/tools/ask-mentor.d.ts.map +1 -1
- package/dist/tools/ask-mentor.js +1 -0
- package/dist/tools/ask-mentor.js.map +1 -1
- package/dist/tools/edit-healing.d.ts +24 -0
- package/dist/tools/edit-healing.d.ts.map +1 -0
- package/dist/tools/edit-healing.js +230 -0
- package/dist/tools/edit-healing.js.map +1 -0
- package/dist/tools/edit-healing.test.d.ts +2 -0
- package/dist/tools/edit-healing.test.d.ts.map +1 -0
- package/dist/tools/edit-healing.test.js +34 -0
- package/dist/tools/edit-healing.test.js.map +1 -0
- 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 -0
- package/dist/tools/find-files.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 -0
- package/dist/tools/grep.js.map +1 -1
- package/dist/tools/read-file.d.ts.map +1 -1
- package/dist/tools/read-file.js +10 -9
- package/dist/tools/read-file.js.map +1 -1
- package/dist/tools/read-file.test.js +24 -19
- package/dist/tools/read-file.test.js.map +1 -1
- package/dist/tools/search-replace.d.ts +3 -1
- package/dist/tools/search-replace.d.ts.map +1 -1
- package/dist/tools/search-replace.js +331 -19
- package/dist/tools/search-replace.js.map +1 -1
- package/dist/tools/search-replace.test.js +241 -2
- package/dist/tools/search-replace.test.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 +4 -0
- 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 -0
- package/dist/tools/shell.js.map +1 -1
- package/dist/tools/types.d.ts +2 -2
- package/dist/tools/types.d.ts.map +1 -1
- package/dist/tools/web-fetch.d.ts +20 -0
- package/dist/tools/web-fetch.d.ts.map +1 -0
- package/dist/tools/web-fetch.js +300 -0
- package/dist/tools/web-fetch.js.map +1 -0
- package/dist/tools/web-fetch.test.d.ts +2 -0
- package/dist/tools/web-fetch.test.d.ts.map +1 -0
- package/dist/tools/web-fetch.test.js +94 -0
- package/dist/tools/web-fetch.test.js.map +1 -0
- package/dist/utils/command-safety/index.d.ts +2 -2
- package/dist/utils/command-safety/index.d.ts.map +1 -1
- package/dist/utils/command-safety/index.js +7 -6
- package/dist/utils/command-safety/index.js.map +1 -1
- package/dist/utils/command-safety.find.test.js +19 -21
- package/dist/utils/command-safety.find.test.js.map +1 -1
- package/dist/utils/conversation-event-handler.d.ts +63 -0
- package/dist/utils/conversation-event-handler.d.ts.map +1 -0
- package/dist/utils/conversation-event-handler.js +132 -0
- package/dist/utils/conversation-event-handler.js.map +1 -0
- package/dist/utils/conversation-event-handler.test.d.ts +2 -0
- package/dist/utils/conversation-event-handler.test.d.ts.map +1 -0
- package/dist/utils/conversation-event-handler.test.js +281 -0
- package/dist/utils/conversation-event-handler.test.js.map +1 -0
- package/dist/utils/conversation-utils.d.ts +41 -0
- package/dist/utils/conversation-utils.d.ts.map +1 -0
- package/dist/utils/conversation-utils.js +109 -0
- package/dist/utils/conversation-utils.js.map +1 -0
- package/dist/utils/conversation-utils.test.d.ts +2 -0
- package/dist/utils/conversation-utils.test.d.ts.map +1 -0
- package/dist/utils/conversation-utils.test.js +190 -0
- package/dist/utils/conversation-utils.test.js.map +1 -0
- package/dist/utils/ink-render-options.d.ts +9 -0
- package/dist/utils/ink-render-options.d.ts.map +1 -0
- package/dist/utils/ink-render-options.js +8 -0
- package/dist/utils/ink-render-options.js.map +1 -0
- package/dist/utils/message-utils.d.ts +17 -0
- package/dist/utils/message-utils.d.ts.map +1 -0
- package/dist/utils/message-utils.js +52 -0
- package/dist/utils/message-utils.js.map +1 -0
- package/dist/utils/message-utils.test.d.ts +2 -0
- package/dist/utils/message-utils.test.d.ts.map +1 -0
- package/dist/utils/message-utils.test.js +48 -0
- package/dist/utils/message-utils.test.js.map +1 -0
- package/dist/utils/settings-command.d.ts.map +1 -1
- package/dist/utils/settings-command.js +13 -4
- package/dist/utils/settings-command.js.map +1 -1
- package/package.json +10 -4
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../source/providers/github-copilot/provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAE7D;;;;GAIG;AACH,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,wBAAwB,CAAC;YAChC,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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider.test.d.ts","sourceRoot":"","sources":["../../../source/providers/github-copilot/provider.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import test from 'ava';
|
|
2
|
+
import { GitHubCopilotProvider, createGitHubCopilotProvider } from './provider.js';
|
|
3
|
+
// Mock services
|
|
4
|
+
const mockSettingsService = {
|
|
5
|
+
get: (key) => {
|
|
6
|
+
if (key === 'agent.model')
|
|
7
|
+
return 'gpt-4o';
|
|
8
|
+
if (key === 'agent.github-copilot.model')
|
|
9
|
+
return 'gpt-4o';
|
|
10
|
+
return undefined;
|
|
11
|
+
},
|
|
12
|
+
set: () => { },
|
|
13
|
+
};
|
|
14
|
+
const mockLoggingService = {
|
|
15
|
+
info: () => { },
|
|
16
|
+
warn: () => { },
|
|
17
|
+
error: () => { },
|
|
18
|
+
debug: () => { },
|
|
19
|
+
security: () => { },
|
|
20
|
+
setCorrelationId: () => { },
|
|
21
|
+
getCorrelationId: () => undefined,
|
|
22
|
+
clearCorrelationId: () => { },
|
|
23
|
+
};
|
|
24
|
+
test('GitHubCopilotProvider - getModel returns GitHubCopilotModel', async (t) => {
|
|
25
|
+
const provider = new GitHubCopilotProvider({
|
|
26
|
+
settingsService: mockSettingsService,
|
|
27
|
+
loggingService: mockLoggingService,
|
|
28
|
+
});
|
|
29
|
+
const model = await provider.getModel();
|
|
30
|
+
t.truthy(model);
|
|
31
|
+
// Check that it's our model by verifying the name property we add
|
|
32
|
+
t.is(model.name, 'GitHubCopilot');
|
|
33
|
+
});
|
|
34
|
+
test('GitHubCopilotProvider - getModel accepts model override', async (t) => {
|
|
35
|
+
const provider = new GitHubCopilotProvider({
|
|
36
|
+
settingsService: mockSettingsService,
|
|
37
|
+
loggingService: mockLoggingService,
|
|
38
|
+
});
|
|
39
|
+
const model = await provider.getModel('claude-3.5-sonnet');
|
|
40
|
+
t.truthy(model);
|
|
41
|
+
// Check that it's our model by verifying the name property we add
|
|
42
|
+
t.is(model.name, 'GitHubCopilot');
|
|
43
|
+
});
|
|
44
|
+
test('createGitHubCopilotProvider - factory function works', (t) => {
|
|
45
|
+
const provider = createGitHubCopilotProvider({
|
|
46
|
+
settingsService: mockSettingsService,
|
|
47
|
+
loggingService: mockLoggingService,
|
|
48
|
+
});
|
|
49
|
+
t.truthy(provider);
|
|
50
|
+
t.true(provider instanceof GitHubCopilotProvider);
|
|
51
|
+
});
|
|
52
|
+
//# sourceMappingURL=provider.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider.test.js","sourceRoot":"","sources":["../../../source/providers/github-copilot/provider.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAC;AAGnF,gBAAgB;AAChB,MAAM,mBAAmB,GAAqB;IAC1C,GAAG,EAAE,CAAI,GAAW,EAAK,EAAE;QACvB,IAAI,GAAG,KAAK,aAAa;YAAE,OAAO,QAAa,CAAC;QAChD,IAAI,GAAG,KAAK,4BAA4B;YAAE,OAAO,QAAa,CAAC;QAC/D,OAAO,SAAc,CAAC;IAC1B,CAAC;IACD,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC;CAChB,CAAC;AAEF,MAAM,kBAAkB,GAAoB;IACxC,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;IAClB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC1B,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;IACjC,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;CAC/B,CAAC;AAEF,IAAI,CAAC,6DAA6D,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC5E,MAAM,QAAQ,GAAG,IAAI,qBAAqB,CAAC;QACvC,eAAe,EAAE,mBAAmB;QACpC,cAAc,EAAE,kBAAkB;KACrC,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAExC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAChB,kEAAkE;IAClE,CAAC,CAAC,EAAE,CAAE,KAAa,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yDAAyD,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACxE,MAAM,QAAQ,GAAG,IAAI,qBAAqB,CAAC;QACvC,eAAe,EAAE,mBAAmB;QACpC,cAAc,EAAE,kBAAkB;KACrC,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAE3D,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAChB,kEAAkE;IAClE,CAAC,CAAC,EAAE,CAAE,KAAa,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sDAAsD,EAAE,CAAC,CAAC,EAAE,EAAE;IAC/D,MAAM,QAAQ,GAAG,2BAA2B,CAAC;QACzC,eAAe,EAAE,mBAAmB;QACpC,cAAc,EAAE,kBAAkB;KACrC,CAAC,CAAC;IAEH,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnB,CAAC,CAAC,IAAI,CAAC,QAAQ,YAAY,qBAAqB,CAAC,CAAC;AACtD,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Check if the GitHub Copilot CLI is available.
|
|
3
|
+
* Supports both standalone `copilot` command and `gh copilot` extension.
|
|
4
|
+
* This is the synchronous version, which may block the Event Loop.
|
|
5
|
+
*/
|
|
6
|
+
export declare function isCopilotCliAvailable(): boolean;
|
|
7
|
+
/**
|
|
8
|
+
* Async version of isCopilotCliAvailable.
|
|
9
|
+
*/
|
|
10
|
+
export declare function isCopilotCliAvailableAsync(): Promise<boolean>;
|
|
11
|
+
/**
|
|
12
|
+
* Verify that the CLI is authenticated.
|
|
13
|
+
* This is the synchronous version, which may block the Event Loop.
|
|
14
|
+
*/
|
|
15
|
+
export declare function isGhAuthenticated(): boolean;
|
|
16
|
+
/**
|
|
17
|
+
* Async version of isGhAuthenticated.
|
|
18
|
+
*/
|
|
19
|
+
export declare function isGhAuthenticatedAsync(): Promise<boolean>;
|
|
20
|
+
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../source/providers/github-copilot/utils.ts"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,OAAO,CA4C/C;AAED;;GAEG;AACH,wBAAsB,0BAA0B,IAAI,OAAO,CAAC,OAAO,CAAC,CA6BnE;AAOD;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAgC3C;AAED;;GAEG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC,CAsB/D"}
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
import { spawnSync, spawn } from 'node:child_process';
|
|
2
|
+
/**
|
|
3
|
+
* Check if the GitHub Copilot CLI is available.
|
|
4
|
+
* Supports both standalone `copilot` command and `gh copilot` extension.
|
|
5
|
+
*/
|
|
6
|
+
let copilotAvailableCache = null;
|
|
7
|
+
/**
|
|
8
|
+
* Check if the GitHub Copilot CLI is available.
|
|
9
|
+
* Supports both standalone `copilot` command and `gh copilot` extension.
|
|
10
|
+
* This is the synchronous version, which may block the Event Loop.
|
|
11
|
+
*/
|
|
12
|
+
export function isCopilotCliAvailable() {
|
|
13
|
+
if (copilotAvailableCache !== null) {
|
|
14
|
+
return copilotAvailableCache;
|
|
15
|
+
}
|
|
16
|
+
try {
|
|
17
|
+
// Check for standalone copilot command first
|
|
18
|
+
const copilotResult = spawnSync('copilot', ['--version'], {
|
|
19
|
+
encoding: 'utf-8',
|
|
20
|
+
timeout: 5000,
|
|
21
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
22
|
+
});
|
|
23
|
+
if (copilotResult.status === 0) {
|
|
24
|
+
copilotAvailableCache = true;
|
|
25
|
+
return true;
|
|
26
|
+
}
|
|
27
|
+
// Fallback: Check if gh CLI is installed
|
|
28
|
+
const ghResult = spawnSync('gh', ['--version'], {
|
|
29
|
+
encoding: 'utf-8',
|
|
30
|
+
timeout: 5000,
|
|
31
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
32
|
+
});
|
|
33
|
+
if (ghResult.status !== 0) {
|
|
34
|
+
copilotAvailableCache = false;
|
|
35
|
+
return false;
|
|
36
|
+
}
|
|
37
|
+
// Check if copilot extension is installed
|
|
38
|
+
const ghCopilotResult = spawnSync('gh', ['copilot', '--help'], {
|
|
39
|
+
encoding: 'utf-8',
|
|
40
|
+
timeout: 5000,
|
|
41
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
42
|
+
});
|
|
43
|
+
const result = ghCopilotResult.status === 0;
|
|
44
|
+
copilotAvailableCache = result;
|
|
45
|
+
return result;
|
|
46
|
+
}
|
|
47
|
+
catch {
|
|
48
|
+
copilotAvailableCache = false;
|
|
49
|
+
return false;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* Async version of isCopilotCliAvailable.
|
|
54
|
+
*/
|
|
55
|
+
export async function isCopilotCliAvailableAsync() {
|
|
56
|
+
if (copilotAvailableCache !== null) {
|
|
57
|
+
return copilotAvailableCache;
|
|
58
|
+
}
|
|
59
|
+
const checkCommand = (command, args) => {
|
|
60
|
+
return new Promise((resolve) => {
|
|
61
|
+
const child = spawn(command, args, { stdio: 'ignore' });
|
|
62
|
+
child.on('error', () => resolve(false));
|
|
63
|
+
child.on('close', (code) => resolve(code === 0));
|
|
64
|
+
});
|
|
65
|
+
};
|
|
66
|
+
// Check for standalone copilot command first
|
|
67
|
+
if (await checkCommand('copilot', ['--version'])) {
|
|
68
|
+
copilotAvailableCache = true;
|
|
69
|
+
return true;
|
|
70
|
+
}
|
|
71
|
+
// Fallback: Check if gh CLI is installed
|
|
72
|
+
if (!(await checkCommand('gh', ['--version']))) {
|
|
73
|
+
copilotAvailableCache = false;
|
|
74
|
+
return false;
|
|
75
|
+
}
|
|
76
|
+
// Check if copilot extension is installed
|
|
77
|
+
const result = await checkCommand('gh', ['copilot', '--help']);
|
|
78
|
+
copilotAvailableCache = result;
|
|
79
|
+
return result;
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
* Verify that the CLI is authenticated.
|
|
83
|
+
*/
|
|
84
|
+
let ghAuthenticatedCache = null;
|
|
85
|
+
/**
|
|
86
|
+
* Verify that the CLI is authenticated.
|
|
87
|
+
* This is the synchronous version, which may block the Event Loop.
|
|
88
|
+
*/
|
|
89
|
+
export function isGhAuthenticated() {
|
|
90
|
+
if (ghAuthenticatedCache !== null) {
|
|
91
|
+
return ghAuthenticatedCache;
|
|
92
|
+
}
|
|
93
|
+
try {
|
|
94
|
+
// If we have standalone copilot, we consider it authenticated if it exists
|
|
95
|
+
// as there's no standardized 'auth status' for the standalone version yet.
|
|
96
|
+
const copilotResult = spawnSync('copilot', ['--version'], {
|
|
97
|
+
encoding: 'utf-8',
|
|
98
|
+
timeout: 5000,
|
|
99
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
100
|
+
});
|
|
101
|
+
if (copilotResult.status === 0) {
|
|
102
|
+
ghAuthenticatedCache = true;
|
|
103
|
+
return true;
|
|
104
|
+
}
|
|
105
|
+
const result = spawnSync('gh', ['auth', 'status'], {
|
|
106
|
+
encoding: 'utf-8',
|
|
107
|
+
timeout: 5000,
|
|
108
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
109
|
+
});
|
|
110
|
+
const status = result.status === 0;
|
|
111
|
+
ghAuthenticatedCache = status;
|
|
112
|
+
return status;
|
|
113
|
+
}
|
|
114
|
+
catch {
|
|
115
|
+
ghAuthenticatedCache = false;
|
|
116
|
+
return false;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
/**
|
|
120
|
+
* Async version of isGhAuthenticated.
|
|
121
|
+
*/
|
|
122
|
+
export async function isGhAuthenticatedAsync() {
|
|
123
|
+
if (ghAuthenticatedCache !== null) {
|
|
124
|
+
return ghAuthenticatedCache;
|
|
125
|
+
}
|
|
126
|
+
const checkCommand = (command, args) => {
|
|
127
|
+
return new Promise((resolve) => {
|
|
128
|
+
const child = spawn(command, args, { stdio: 'ignore' });
|
|
129
|
+
child.on('error', () => resolve(false));
|
|
130
|
+
child.on('close', (code) => resolve(code === 0));
|
|
131
|
+
});
|
|
132
|
+
};
|
|
133
|
+
// If we have standalone copilot, we consider it authenticated if it exists
|
|
134
|
+
if (await checkCommand('copilot', ['--version'])) {
|
|
135
|
+
ghAuthenticatedCache = true;
|
|
136
|
+
return true;
|
|
137
|
+
}
|
|
138
|
+
const result = await checkCommand('gh', ['auth', 'status']);
|
|
139
|
+
ghAuthenticatedCache = result;
|
|
140
|
+
return result;
|
|
141
|
+
}
|
|
142
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../source/providers/github-copilot/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.test.d.ts","sourceRoot":"","sources":["../../../source/providers/github-copilot/utils.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import test from 'ava';
|
|
2
|
+
import { isCopilotCliAvailable, isGhAuthenticated, isCopilotCliAvailableAsync, isGhAuthenticatedAsync, } from './utils.js';
|
|
3
|
+
// Note: These tests verify the function signatures work correctly.
|
|
4
|
+
// The actual behavior depends on the system state (whether gh CLI is installed).
|
|
5
|
+
test('isCopilotCliAvailable - returns boolean', (t) => {
|
|
6
|
+
const result = isCopilotCliAvailable();
|
|
7
|
+
t.is(typeof result, 'boolean');
|
|
8
|
+
});
|
|
9
|
+
test('isGhAuthenticated - returns boolean', (t) => {
|
|
10
|
+
const result = isGhAuthenticated();
|
|
11
|
+
t.is(typeof result, 'boolean');
|
|
12
|
+
});
|
|
13
|
+
test('isCopilotCliAvailableAsync - returns Promise<boolean>', async (t) => {
|
|
14
|
+
const result = await isCopilotCliAvailableAsync();
|
|
15
|
+
t.is(typeof result, 'boolean');
|
|
16
|
+
});
|
|
17
|
+
test('isGhAuthenticatedAsync - returns Promise<boolean>', async (t) => {
|
|
18
|
+
const result = await isGhAuthenticatedAsync();
|
|
19
|
+
t.is(typeof result, 'boolean');
|
|
20
|
+
});
|
|
21
|
+
//# sourceMappingURL=utils.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../source/providers/github-copilot/utils.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EACH,qBAAqB,EACrB,iBAAiB,EACjB,0BAA0B,EAC1B,sBAAsB,GACzB,MAAM,YAAY,CAAC;AAEpB,mEAAmE;AACnE,iFAAiF;AAEjF,IAAI,CAAC,yCAAyC,EAAE,CAAC,CAAC,EAAE,EAAE;IAClD,MAAM,MAAM,GAAG,qBAAqB,EAAE,CAAC;IACvC,CAAC,CAAC,EAAE,CAAC,OAAO,MAAM,EAAE,SAAS,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qCAAqC,EAAE,CAAC,CAAC,EAAE,EAAE;IAC9C,MAAM,MAAM,GAAG,iBAAiB,EAAE,CAAC;IACnC,CAAC,CAAC,EAAE,CAAC,OAAO,MAAM,EAAE,SAAS,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uDAAuD,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,MAAM,0BAA0B,EAAE,CAAC;IAClD,CAAC,CAAC,EAAE,CAAC,OAAO,MAAM,EAAE,SAAS,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mDAAmD,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAClE,MAAM,MAAM,GAAG,MAAM,sBAAsB,EAAE,CAAC;IAC9C,CAAC,CAAC,EAAE,CAAC,OAAO,MAAM,EAAE,SAAS,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../source/providers/openai-compatible/model.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,KAAK,EACV,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,mBAAmB,EAC3B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EACR,eAAe,EACf,gBAAgB,EACnB,MAAM,sCAAsC,CAAC;AAQ9C,qBAAa,qBAAsB,YAAW,KAAK;;IAC/C,IAAI,EAAE,MAAM,CAAC;gBASD,IAAI,EAAE;QACd,eAAe,EAAE,gBAAgB,CAAC;QAClC,cAAc,EAAE,eAAe,CAAC;QAChC,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;KACpB;IAaK,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../source/providers/openai-compatible/model.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,KAAK,EACV,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,mBAAmB,EAC3B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EACR,eAAe,EACf,gBAAgB,EACnB,MAAM,sCAAsC,CAAC;AAQ9C,qBAAa,qBAAsB,YAAW,KAAK;;IAC/C,IAAI,EAAE,MAAM,CAAC;gBASD,IAAI,EAAE;QACd,eAAe,EAAE,gBAAgB,CAAC;QAClC,cAAc,EAAE,eAAe,CAAC;QAChC,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;KACpB;IAaK,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IA4IzD,mBAAmB,CACtB,OAAO,EAAE,YAAY,GACtB,aAAa,CAAC,mBAAmB,CAAC;CA+WxC"}
|
|
@@ -47,6 +47,14 @@ export class OpenAICompatibleModel {
|
|
|
47
47
|
const reasoning = choice?.message?.reasoning || choice?.message?.reasoning_content;
|
|
48
48
|
const reasoningDetails = choice?.message?.reasoning_details;
|
|
49
49
|
const toolCalls = choice?.message?.tool_calls;
|
|
50
|
+
// Log raw tool calls from API response
|
|
51
|
+
if (toolCalls && toolCalls.length > 0) {
|
|
52
|
+
this.#loggingService.debug('OpenAI-compatible raw tool calls (non-streaming)', {
|
|
53
|
+
provider: this.#providerId,
|
|
54
|
+
toolCallsCount: toolCalls.length,
|
|
55
|
+
toolCalls: JSON.stringify(toolCalls),
|
|
56
|
+
});
|
|
57
|
+
}
|
|
50
58
|
const output = [];
|
|
51
59
|
// Preserve reasoning blocks when present (OpenRouter-compatible shape).
|
|
52
60
|
if (reasoningDetails && Array.isArray(reasoningDetails)) {
|
|
@@ -107,11 +115,12 @@ export class OpenAICompatibleModel {
|
|
|
107
115
|
if (toolCalls && toolCalls.length > 0) {
|
|
108
116
|
for (const toolCall of toolCalls) {
|
|
109
117
|
if (toolCall.type === 'function') {
|
|
118
|
+
const decodedArgs = decodeHtmlEntities(toolCall.function.arguments);
|
|
110
119
|
output.push({
|
|
111
120
|
type: 'function_call',
|
|
112
121
|
callId: toolCall.id,
|
|
113
122
|
name: toolCall.function.name,
|
|
114
|
-
arguments:
|
|
123
|
+
arguments: decodedArgs,
|
|
115
124
|
status: 'completed',
|
|
116
125
|
...(typeof reasoning === 'string' ? { reasoning } : {}),
|
|
117
126
|
...(reasoningDetails != null
|
|
@@ -257,11 +266,13 @@ export class OpenAICompatibleModel {
|
|
|
257
266
|
if (toolCalls && toolCalls.length > 0) {
|
|
258
267
|
for (const toolCall of toolCalls) {
|
|
259
268
|
if (toolCall.type === 'function_call') {
|
|
269
|
+
// Note: arguments already decoded in #mergeToolCalls, don't double-decode
|
|
270
|
+
const args = toolCall.arguments;
|
|
260
271
|
output.push({
|
|
261
272
|
type: 'function_call',
|
|
262
273
|
callId: toolCall.callId,
|
|
263
274
|
name: toolCall.name,
|
|
264
|
-
arguments:
|
|
275
|
+
arguments: args,
|
|
265
276
|
status: 'completed',
|
|
266
277
|
...(typeof reasoningText === 'string' &&
|
|
267
278
|
reasoningText.length > 0
|
|
@@ -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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"}
|
|
@@ -44,9 +44,9 @@ test('OpenAICompatibleModel.getResponse support reasoning_content', async (t) =>
|
|
|
44
44
|
const response = await model.getResponse({
|
|
45
45
|
input: 'hi',
|
|
46
46
|
});
|
|
47
|
-
const assistantMessage = response.output.find(o => o.type === 'message');
|
|
47
|
+
const assistantMessage = response.output.find((o) => o.type === 'message');
|
|
48
48
|
t.truthy(assistantMessage);
|
|
49
|
-
t.is(assistantMessage
|
|
49
|
+
t.is(assistantMessage?.reasoning, 'thinking about user greeting');
|
|
50
50
|
});
|
|
51
51
|
test('OpenAICompatibleModel.getStreamedResponse support reasoning_content', async (t) => {
|
|
52
52
|
const encoder = new TextEncoder();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reasoning-content.test.js","sourceRoot":"","sources":["../../../source/providers/openai-compatible/reasoning-content.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;
|
|
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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converters.d.ts","sourceRoot":"","sources":["../../../source/providers/openrouter/converters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,sCAAsC,CAAC;AAoK1E,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CA4BtE;AAED,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CA4BtE;AAED,wBAAgB,wBAAwB,CACpC,GAAG,EAAE,YAAY,EACjB,OAAO,CAAC,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,eAAe,GACjC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"converters.d.ts","sourceRoot":"","sources":["../../../source/providers/openrouter/converters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,sCAAsC,CAAC;AAoK1E,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CA4BtE;AAED,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CA4BtE;AAED,wBAAgB,wBAAwB,CACpC,GAAG,EAAE,YAAY,EACjB,OAAO,CAAC,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,eAAe,GACjC,GAAG,EAAE,CA0KP;AAED,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,YAAY,GAAG,GAAG,EAAE,CAsBxE;AAED,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,CAgDjE"}
|
|
@@ -211,13 +211,6 @@ export function buildMessagesFromRequest(req, modelId, loggingService) {
|
|
|
211
211
|
? req.input.substring(0, 100)
|
|
212
212
|
: 'non-string, non-array',
|
|
213
213
|
});
|
|
214
|
-
const isToolCallOnlyAssistant = (m) => {
|
|
215
|
-
return (m != null &&
|
|
216
|
-
m.role === 'assistant' &&
|
|
217
|
-
m.content == null &&
|
|
218
|
-
Array.isArray(m.tool_calls) &&
|
|
219
|
-
m.tool_calls.length > 0);
|
|
220
|
-
};
|
|
221
214
|
if (req.systemInstructions && req.systemInstructions.trim().length > 0) {
|
|
222
215
|
// For Anthropic models, use array format with cache_control for prompt caching.
|
|
223
216
|
// This enables caching of the system message (agent instructions) which is large and rarely changes.
|
|
@@ -268,49 +261,74 @@ export function buildMessagesFromRequest(req, modelId, loggingService) {
|
|
|
268
261
|
converted.reasoning_details = pendingReasoningDetails;
|
|
269
262
|
pendingReasoningDetails = [];
|
|
270
263
|
}
|
|
271
|
-
// Merge consecutive assistant messages with tool_calls to fix incorrect conversation flow
|
|
272
|
-
// when parallel tool calls are stored as separate history items.
|
|
273
264
|
const lastMessage = messages[messages.length - 1];
|
|
274
|
-
//
|
|
275
|
-
if (
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
265
|
+
// Merge consecutive messages with the same role
|
|
266
|
+
if (lastMessage && lastMessage.role === converted.role) {
|
|
267
|
+
if (converted.role === 'assistant') {
|
|
268
|
+
// Merge content
|
|
269
|
+
if (converted.content != null) {
|
|
270
|
+
if (lastMessage.content == null) {
|
|
271
|
+
lastMessage.content = converted.content;
|
|
272
|
+
}
|
|
273
|
+
else {
|
|
274
|
+
lastMessage.content =
|
|
275
|
+
String(lastMessage.content) +
|
|
276
|
+
'\n' +
|
|
277
|
+
String(converted.content);
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
// Merge tool calls
|
|
281
|
+
if (converted.tool_calls) {
|
|
282
|
+
if (!lastMessage.tool_calls) {
|
|
283
|
+
lastMessage.tool_calls = [];
|
|
284
|
+
}
|
|
285
|
+
lastMessage.tool_calls.push(...converted.tool_calls);
|
|
286
|
+
}
|
|
287
|
+
// Merge reasoning tokens
|
|
288
|
+
if (converted.reasoning != null) {
|
|
289
|
+
if (!lastMessage.reasoning) {
|
|
290
|
+
lastMessage.reasoning = converted.reasoning;
|
|
291
|
+
}
|
|
292
|
+
else {
|
|
293
|
+
lastMessage.reasoning += converted.reasoning;
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
if (converted.reasoning_content != null) {
|
|
297
|
+
if (!lastMessage.reasoning_content) {
|
|
298
|
+
lastMessage.reasoning_content =
|
|
299
|
+
converted.reasoning_content;
|
|
300
|
+
}
|
|
301
|
+
else {
|
|
302
|
+
lastMessage.reasoning_content +=
|
|
303
|
+
converted.reasoning_content;
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
// Merge reasoning details
|
|
307
|
+
if (converted.reasoning_details) {
|
|
308
|
+
if (!lastMessage.reasoning_details) {
|
|
309
|
+
lastMessage.reasoning_details = [];
|
|
310
|
+
}
|
|
311
|
+
lastMessage.reasoning_details.push(...(Array.isArray(converted.reasoning_details)
|
|
312
|
+
? converted.reasoning_details
|
|
313
|
+
: [converted.reasoning_details]));
|
|
314
|
+
}
|
|
296
315
|
continue;
|
|
297
316
|
}
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
317
|
+
if (converted.role === 'user') {
|
|
318
|
+
// Merge content
|
|
319
|
+
if (converted.content != null) {
|
|
320
|
+
if (lastMessage.content == null) {
|
|
321
|
+
lastMessage.content = converted.content;
|
|
322
|
+
}
|
|
323
|
+
else {
|
|
324
|
+
lastMessage.content =
|
|
325
|
+
String(lastMessage.content) +
|
|
326
|
+
'\n' +
|
|
327
|
+
String(converted.content);
|
|
328
|
+
}
|
|
329
|
+
}
|
|
330
|
+
continue;
|
|
312
331
|
}
|
|
313
|
-
continue;
|
|
314
332
|
}
|
|
315
333
|
messages.push(converted);
|
|
316
334
|
}
|