@qduc/term2 0.1.1 → 0.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent.d.ts +2 -0
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +9 -5
- package/dist/agent.js.map +1 -1
- 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/app.d.ts.map +1 -1
- package/dist/app.js +3 -1
- package/dist/app.js.map +1 -1
- package/dist/components/ApprovalPrompt.d.ts.map +1 -1
- package/dist/components/ApprovalPrompt.js +26 -6
- package/dist/components/ApprovalPrompt.js.map +1 -1
- package/dist/components/BottomArea.js +1 -1
- package/dist/components/BottomArea.js.map +1 -1
- package/dist/components/ChatMessage.js +1 -1
- package/dist/components/ChatMessage.js.map +1 -1
- package/dist/components/CommandMessage.js +7 -7
- package/dist/components/CommandMessage.js.map +1 -1
- package/dist/components/ErrorBoundary.js +2 -2
- package/dist/components/ErrorBoundary.js.map +1 -1
- package/dist/components/Input/PopupManager.d.ts +10 -0
- package/dist/components/Input/PopupManager.d.ts.map +1 -1
- package/dist/components/Input/PopupManager.js +4 -2
- package/dist/components/Input/PopupManager.js.map +1 -1
- package/dist/components/InputBox.d.ts.map +1 -1
- package/dist/components/InputBox.js +102 -18
- package/dist/components/InputBox.js.map +1 -1
- package/dist/components/LiveResponse.d.ts +1 -1
- package/dist/components/LiveResponse.js +1 -1
- package/dist/components/MarkdownRenderer.js +13 -14
- package/dist/components/MarkdownRenderer.js.map +1 -1
- package/dist/components/ModelSelectionMenu.d.ts.map +1 -1
- package/dist/components/ModelSelectionMenu.js +11 -11
- package/dist/components/ModelSelectionMenu.js.map +1 -1
- package/dist/components/PathSelectionMenu.js +3 -3
- package/dist/components/PathSelectionMenu.js.map +1 -1
- package/dist/components/SettingsSelectionMenu.d.ts +1 -0
- package/dist/components/SettingsSelectionMenu.d.ts.map +1 -1
- package/dist/components/SettingsSelectionMenu.js +127 -14
- package/dist/components/SettingsSelectionMenu.js.map +1 -1
- package/dist/components/SettingsSelectionMenu.test.d.ts +2 -0
- package/dist/components/SettingsSelectionMenu.test.d.ts.map +1 -0
- package/dist/components/SettingsSelectionMenu.test.js +40 -0
- package/dist/components/SettingsSelectionMenu.test.js.map +1 -0
- package/dist/components/SettingsValueSelectionMenu.d.ts +12 -0
- package/dist/components/SettingsValueSelectionMenu.d.ts.map +1 -0
- package/dist/components/SettingsValueSelectionMenu.js +63 -0
- package/dist/components/SettingsValueSelectionMenu.js.map +1 -0
- package/dist/components/SettingsValueSelectionMenu.test.d.ts +2 -0
- package/dist/components/SettingsValueSelectionMenu.test.d.ts.map +1 -0
- package/dist/components/SettingsValueSelectionMenu.test.js +38 -0
- package/dist/components/SettingsValueSelectionMenu.test.js.map +1 -0
- package/dist/components/SlashCommandMenu.js +2 -2
- package/dist/components/SlashCommandMenu.js.map +1 -1
- 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/context/InputContext.d.ts +1 -1
- package/dist/context/InputContext.d.ts.map +1 -1
- package/dist/context/InputContext.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/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 +1 -1
- package/dist/hooks/use-settings-completion.d.ts.map +1 -1
- package/dist/hooks/use-settings-completion.js +70 -10
- package/dist/hooks/use-settings-completion.js.map +1 -1
- package/dist/hooks/use-settings-completion.test.js +17 -10
- package/dist/hooks/use-settings-completion.test.js.map +1 -1
- package/dist/hooks/use-settings-value-completion.d.ts +23 -0
- package/dist/hooks/use-settings-value-completion.d.ts.map +1 -0
- package/dist/hooks/use-settings-value-completion.js +214 -0
- package/dist/hooks/use-settings-value-completion.js.map +1 -0
- package/dist/hooks/use-settings-value-completion.test.d.ts +2 -0
- package/dist/hooks/use-settings-value-completion.test.d.ts.map +1 -0
- package/dist/hooks/use-settings-value-completion.test.js +65 -0
- package/dist/hooks/use-settings-value-completion.test.js.map +1 -0
- package/dist/lib/openai-agent-client.d.ts.map +1 -1
- package/dist/lib/openai-agent-client.flex-tier.test.d.ts +2 -0
- package/dist/lib/openai-agent-client.flex-tier.test.d.ts.map +1 -0
- package/dist/lib/openai-agent-client.flex-tier.test.js +70 -0
- package/dist/lib/openai-agent-client.flex-tier.test.js.map +1 -0
- package/dist/lib/openai-agent-client.js +71 -36
- package/dist/lib/openai-agent-client.js.map +1 -1
- package/dist/lib/tool-invoke.test.js +1 -1
- package/dist/lib/tool-invoke.test.js.map +1 -1
- 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/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/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/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/services/conversation-store.test.js +12 -11
- package/dist/services/conversation-store.test.js.map +1 -1
- package/dist/services/settings-service.d.ts +8 -2
- package/dist/services/settings-service.d.ts.map +1 -1
- package/dist/services/settings-service.js +24 -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/find-files.d.ts +2 -2
- package/dist/tools/find-files.js +2 -2
- package/dist/tools/find-files.js.map +1 -1
- package/dist/tools/find-files.test.js +15 -0
- package/dist/tools/find-files.test.js.map +1 -1
- package/dist/tools/grep.d.ts +1 -1
- package/dist/tools/grep.js +1 -1
- 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 +14 -11
- package/dist/tools/read-file.js.map +1 -1
- package/dist/tools/read-file.test.js +37 -19
- 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 +129 -1
- package/dist/tools/search-replace.js.map +1 -1
- package/dist/tools/search-replace.test.js +18 -0
- 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.js +2 -2
- 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/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/dist/utils/settings-command.d.ts.map +1 -1
- package/dist/utils/settings-command.js +18 -4
- package/dist/utils/settings-command.js.map +1 -1
- package/package.json +2 -2
- 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/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/prompts/default.md.bak +0 -77
- 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/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/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/{README.md → readme.md} +0 -0
|
@@ -1,190 +1,156 @@
|
|
|
1
1
|
import test from 'ava';
|
|
2
|
-
import { ConversationService } from '
|
|
2
|
+
import { ConversationService } from './conversation-service.js';
|
|
3
3
|
class MockStream {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
}
|
|
14
|
-
async *[Symbol.asyncIterator]() {
|
|
15
|
-
for (const event of this.events) {
|
|
16
|
-
yield event;
|
|
4
|
+
constructor(events) {
|
|
5
|
+
this.events = events;
|
|
6
|
+
this.completed = Promise.resolve();
|
|
7
|
+
this.lastResponseId = 'resp_test';
|
|
8
|
+
this.interruptions = [];
|
|
9
|
+
this.state = {};
|
|
10
|
+
this.newItems = [];
|
|
11
|
+
this.history = [];
|
|
12
|
+
this.finalOutput = '';
|
|
17
13
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const events = [{
|
|
23
|
-
type: 'response.output_text.delta',
|
|
24
|
-
delta: 'Hello'
|
|
25
|
-
}, {
|
|
26
|
-
type: 'response.output_text.delta',
|
|
27
|
-
delta: ' world'
|
|
28
|
-
}];
|
|
29
|
-
const mockClient = {
|
|
30
|
-
async startStream() {
|
|
31
|
-
return new MockStream(events);
|
|
32
|
-
}
|
|
33
|
-
};
|
|
34
|
-
const chunks = [];
|
|
35
|
-
const service = new ConversationService({
|
|
36
|
-
agentClient: mockClient
|
|
37
|
-
});
|
|
38
|
-
const result = await service.sendMessage('hi', {
|
|
39
|
-
onTextChunk(full, chunk) {
|
|
40
|
-
chunks.push({
|
|
41
|
-
full,
|
|
42
|
-
chunk
|
|
43
|
-
});
|
|
14
|
+
async *[Symbol.asyncIterator]() {
|
|
15
|
+
for (const event of this.events) {
|
|
16
|
+
yield event;
|
|
17
|
+
}
|
|
44
18
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
19
|
+
}
|
|
20
|
+
test('emits live text chunks for response.output_text.delta events', async (t) => {
|
|
21
|
+
t.plan(3);
|
|
22
|
+
const events = [
|
|
23
|
+
{ type: 'response.output_text.delta', delta: 'Hello' },
|
|
24
|
+
{ type: 'response.output_text.delta', delta: ' world' },
|
|
25
|
+
];
|
|
26
|
+
const mockClient = {
|
|
27
|
+
async startStream() {
|
|
28
|
+
return new MockStream(events);
|
|
29
|
+
},
|
|
30
|
+
};
|
|
31
|
+
const chunks = [];
|
|
32
|
+
const service = new ConversationService({ agentClient: mockClient });
|
|
33
|
+
const result = await service.sendMessage('hi', {
|
|
34
|
+
onTextChunk(full, chunk) {
|
|
35
|
+
chunks.push({ full, chunk });
|
|
36
|
+
},
|
|
37
|
+
});
|
|
38
|
+
t.deepEqual(chunks, [
|
|
39
|
+
{ full: 'Hello', chunk: 'Hello' },
|
|
40
|
+
{ full: 'Hello world', chunk: ' world' },
|
|
41
|
+
]);
|
|
42
|
+
t.is(result.type, 'response');
|
|
43
|
+
t.is(result.finalText, 'Hello world');
|
|
55
44
|
});
|
|
56
|
-
test('passes previous response ids into subsequent runs', async t => {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
text: 'first',
|
|
80
|
-
options: {
|
|
81
|
-
previousResponseId: null
|
|
82
|
-
}
|
|
83
|
-
}, {
|
|
84
|
-
text: 'second',
|
|
85
|
-
options: {
|
|
86
|
-
previousResponseId: 'resp-1'
|
|
87
|
-
}
|
|
88
|
-
}]);
|
|
89
|
-
t.is(secondResult.type, 'response');
|
|
90
|
-
t.is(secondResult.finalText, 'Second run done.');
|
|
45
|
+
test('passes previous response ids into subsequent runs', async (t) => {
|
|
46
|
+
const streams = [new MockStream([]), new MockStream([])];
|
|
47
|
+
streams[0].lastResponseId = 'resp-1';
|
|
48
|
+
streams[0].finalOutput = 'First run done.';
|
|
49
|
+
streams[1].lastResponseId = 'resp-2';
|
|
50
|
+
streams[1].finalOutput = 'Second run done.';
|
|
51
|
+
const startCalls = [];
|
|
52
|
+
const mockClient = {
|
|
53
|
+
async startStream(text, options) {
|
|
54
|
+
const index = startCalls.length;
|
|
55
|
+
startCalls.push({ text, options });
|
|
56
|
+
return streams[index];
|
|
57
|
+
},
|
|
58
|
+
};
|
|
59
|
+
const service = new ConversationService({ agentClient: mockClient });
|
|
60
|
+
await service.sendMessage('first');
|
|
61
|
+
const secondResult = await service.sendMessage('second');
|
|
62
|
+
t.deepEqual(startCalls, [
|
|
63
|
+
{ text: 'first', options: { previousResponseId: null } },
|
|
64
|
+
{ text: 'second', options: { previousResponseId: 'resp-1' } },
|
|
65
|
+
]);
|
|
66
|
+
t.is(secondResult.type, 'response');
|
|
67
|
+
t.is(secondResult.finalText, 'Second run done.');
|
|
91
68
|
});
|
|
92
|
-
test('emits approval interruptions and resumes after approval', async t => {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
}
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
t.is(approvalResult.approval.argumentsText, 'echo hi');
|
|
135
|
-
const finalResult = await service.handleApprovalDecision('y');
|
|
136
|
-
t.truthy(finalResult);
|
|
137
|
-
t.is(finalResult.type, 'response');
|
|
138
|
-
t.is(finalResult.finalText, 'Approved run');
|
|
139
|
-
t.deepEqual(initialStream.state.approveCalls, [interruption]);
|
|
140
|
-
t.deepEqual(initialStream.state.rejectCalls, []);
|
|
69
|
+
test('emits approval interruptions and resumes after approval', async (t) => {
|
|
70
|
+
const interruption = {
|
|
71
|
+
name: 'bash',
|
|
72
|
+
agent: { name: 'CLI Agent' },
|
|
73
|
+
arguments: JSON.stringify({ command: 'echo hi' }),
|
|
74
|
+
};
|
|
75
|
+
const initialStream = new MockStream([]);
|
|
76
|
+
initialStream.interruptions = [interruption];
|
|
77
|
+
initialStream.state = {
|
|
78
|
+
approveCalls: [],
|
|
79
|
+
rejectCalls: [],
|
|
80
|
+
approve(arg) {
|
|
81
|
+
this.approveCalls.push(arg);
|
|
82
|
+
},
|
|
83
|
+
reject(arg) {
|
|
84
|
+
this.rejectCalls.push(arg);
|
|
85
|
+
},
|
|
86
|
+
};
|
|
87
|
+
const continuationStream = new MockStream([
|
|
88
|
+
{ type: 'response.output_text.delta', delta: 'Approved run' },
|
|
89
|
+
]);
|
|
90
|
+
continuationStream.finalOutput = 'Approved run';
|
|
91
|
+
const mockClient = {
|
|
92
|
+
async startStream() {
|
|
93
|
+
return initialStream;
|
|
94
|
+
},
|
|
95
|
+
async continueRunStream(state) {
|
|
96
|
+
t.is(state, initialStream.state);
|
|
97
|
+
return continuationStream;
|
|
98
|
+
},
|
|
99
|
+
};
|
|
100
|
+
const service = new ConversationService({ agentClient: mockClient });
|
|
101
|
+
const approvalResult = await service.sendMessage('run command');
|
|
102
|
+
t.is(approvalResult.type, 'approval_required');
|
|
103
|
+
t.is(approvalResult.approval.toolName, 'bash');
|
|
104
|
+
t.is(approvalResult.approval.argumentsText, 'echo hi');
|
|
105
|
+
const finalResult = await service.handleApprovalDecision('y');
|
|
106
|
+
t.truthy(finalResult);
|
|
107
|
+
t.is(finalResult.type, 'response');
|
|
108
|
+
t.is(finalResult.finalText, 'Approved run');
|
|
109
|
+
t.deepEqual(initialStream.state.approveCalls, [interruption]);
|
|
110
|
+
t.deepEqual(initialStream.state.rejectCalls, []);
|
|
141
111
|
});
|
|
142
|
-
test('dedupes command messages emitted live from run events', async t => {
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
success: true
|
|
188
|
-
}]);
|
|
189
|
-
t.deepEqual(result.commandMessages, []);
|
|
190
|
-
});
|
|
112
|
+
test('dedupes command messages emitted live from run events', async (t) => {
|
|
113
|
+
const commandPayload = JSON.stringify({
|
|
114
|
+
command: 'ls',
|
|
115
|
+
stdout: 'file.txt',
|
|
116
|
+
success: true,
|
|
117
|
+
});
|
|
118
|
+
const rawItem = {
|
|
119
|
+
id: 'call-123',
|
|
120
|
+
type: 'function_call_result',
|
|
121
|
+
name: 'bash',
|
|
122
|
+
arguments: JSON.stringify({ command: 'ls' }),
|
|
123
|
+
};
|
|
124
|
+
const commandItem = {
|
|
125
|
+
type: 'tool_call_output_item',
|
|
126
|
+
name: 'bash',
|
|
127
|
+
output: commandPayload,
|
|
128
|
+
rawItem,
|
|
129
|
+
};
|
|
130
|
+
const events = [{ type: 'run_item_stream_event', item: commandItem }];
|
|
131
|
+
const stream = new MockStream(events);
|
|
132
|
+
stream.newItems = [commandItem];
|
|
133
|
+
const emitted = [];
|
|
134
|
+
const mockClient = {
|
|
135
|
+
async startStream() {
|
|
136
|
+
return stream;
|
|
137
|
+
},
|
|
138
|
+
};
|
|
139
|
+
const service = new ConversationService({ agentClient: mockClient });
|
|
140
|
+
const result = await service.sendMessage('run bash', {
|
|
141
|
+
onCommandMessage(message) {
|
|
142
|
+
emitted.push(message);
|
|
143
|
+
},
|
|
144
|
+
});
|
|
145
|
+
t.deepEqual(emitted, [
|
|
146
|
+
{
|
|
147
|
+
id: 'call-123',
|
|
148
|
+
sender: 'command',
|
|
149
|
+
command: 'ls',
|
|
150
|
+
output: 'file.txt',
|
|
151
|
+
success: true,
|
|
152
|
+
},
|
|
153
|
+
]);
|
|
154
|
+
t.deepEqual(result.commandMessages, []);
|
|
155
|
+
});
|
|
156
|
+
//# sourceMappingURL=conversation-service.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conversation-service.test.js","sourceRoot":"","sources":["../../source/services/conversation-service.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,8 @@ test('getHistory() returns a copy (external mutation does not affect store)', t
|
|
|
17
17
|
history1.push({
|
|
18
18
|
role: 'assistant',
|
|
19
19
|
type: 'message',
|
|
20
|
-
|
|
20
|
+
status: 'completed',
|
|
21
|
+
content: [{ type: 'output_text', text: 'Injected' }],
|
|
21
22
|
});
|
|
22
23
|
const history2 = store.getHistory();
|
|
23
24
|
t.is(history2.length, 1);
|
|
@@ -36,27 +37,27 @@ test('updateFromResult() merges run history without duplicating overlap', t => {
|
|
|
36
37
|
store.updateFromResult({
|
|
37
38
|
history: [
|
|
38
39
|
{ role: 'user', type: 'message', content: 'Hi' },
|
|
39
|
-
{ role: 'assistant', type: 'message', content: 'Hello!' },
|
|
40
|
+
{ role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Hello!' }] },
|
|
40
41
|
],
|
|
41
42
|
});
|
|
42
43
|
let history = store.getHistory();
|
|
43
44
|
t.is(history.length, 2);
|
|
44
45
|
let last = history[history.length - 1];
|
|
45
46
|
t.is(last.role, 'assistant');
|
|
46
|
-
t.is(last.content, 'Hello!');
|
|
47
|
+
t.is(last.content[0].text, 'Hello!');
|
|
47
48
|
// Next turn: user message is already in store; incoming history contains it too.
|
|
48
49
|
store.addUserMessage('How are you?');
|
|
49
50
|
store.updateFromResult({
|
|
50
51
|
history: [
|
|
51
52
|
{ role: 'user', type: 'message', content: 'How are you?' },
|
|
52
|
-
{ role: 'assistant', type: 'message', content: 'Doing great.' },
|
|
53
|
+
{ role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Doing great.' }] },
|
|
53
54
|
],
|
|
54
55
|
});
|
|
55
56
|
history = store.getHistory();
|
|
56
57
|
t.is(history.length, 4);
|
|
57
58
|
last = history[history.length - 1];
|
|
58
59
|
t.is(last.role, 'assistant');
|
|
59
|
-
t.is(last.content, 'Doing great.');
|
|
60
|
+
t.is(last.content[0].text, 'Doing great.');
|
|
60
61
|
});
|
|
61
62
|
test('updateFromResult() replaces history when incoming history is a superset', t => {
|
|
62
63
|
const store = new ConversationStore();
|
|
@@ -64,22 +65,22 @@ test('updateFromResult() replaces history when incoming history is a superset',
|
|
|
64
65
|
store.updateFromResult({
|
|
65
66
|
history: [
|
|
66
67
|
{ role: 'user', type: 'message', content: 'One' },
|
|
67
|
-
{ role: 'assistant', type: 'message', content: 'Ack' },
|
|
68
|
+
{ role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Ack' }] },
|
|
68
69
|
],
|
|
69
70
|
});
|
|
70
71
|
store.addUserMessage('Two');
|
|
71
72
|
store.updateFromResult({
|
|
72
73
|
history: [
|
|
73
74
|
{ role: 'user', type: 'message', content: 'One' },
|
|
74
|
-
{ role: 'assistant', type: 'message', content: 'Ack' },
|
|
75
|
+
{ role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Ack' }] },
|
|
75
76
|
{ role: 'user', type: 'message', content: 'Two' },
|
|
76
|
-
{ role: 'assistant', type: 'message', content: 'Ack2' },
|
|
77
|
+
{ role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Ack2' }] },
|
|
77
78
|
],
|
|
78
79
|
});
|
|
79
80
|
const history = store.getHistory();
|
|
80
81
|
t.is(history.length, 4);
|
|
81
82
|
const last = history[3];
|
|
82
|
-
t.is(last.content, 'Ack2');
|
|
83
|
+
t.is(last.content[0].text, 'Ack2');
|
|
83
84
|
});
|
|
84
85
|
test('updateFromResult() preserves reasoning_details across overlap merges', t => {
|
|
85
86
|
const store = new ConversationStore();
|
|
@@ -87,7 +88,7 @@ test('updateFromResult() preserves reasoning_details across overlap merges', t =
|
|
|
87
88
|
store.updateFromResult({
|
|
88
89
|
history: [
|
|
89
90
|
{ role: 'user', type: 'message', content: 'First' },
|
|
90
|
-
{ role: 'assistant', type: 'message', content: 'Hello' },
|
|
91
|
+
{ role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Hello' }] },
|
|
91
92
|
],
|
|
92
93
|
});
|
|
93
94
|
// Later, the SDK returns incremental history starting with the last assistant
|
|
@@ -122,7 +123,7 @@ test('updateFromResult() preserves reasoning (reasoning tokens) across overlap m
|
|
|
122
123
|
store.updateFromResult({
|
|
123
124
|
history: [
|
|
124
125
|
{ role: 'user', type: 'message', content: 'First' },
|
|
125
|
-
{ role: 'assistant', type: 'message', content: 'Hello' },
|
|
126
|
+
{ role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Hello' }] },
|
|
126
127
|
],
|
|
127
128
|
});
|
|
128
129
|
// Later, the SDK returns incremental history starting with the last assistant
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation-store.test.js","sourceRoot":"","sources":["../../source/services/conversation-store.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AAEvB,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAE1D,IAAI,CAAC,8CAA8C,EAAE,CAAC,CAAC,EAAE;IACrD,MAAM,KAAK,GAAG,IAAI,iBAAiB,EAAE,CAAC;IACtC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAE9B,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;IACnC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACxB,MAAM,IAAI,GAAQ,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC3B,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uEAAuE,EAAE,CAAC,CAAC,EAAE;IAC9E,MAAM,KAAK,GAAG,IAAI,iBAAiB,EAAE,CAAC;IACtC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IAE1B,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;IACpC,QAAQ,CAAC,IAAI,CAAC;QACV,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,UAAU;
|
|
1
|
+
{"version":3,"file":"conversation-store.test.js","sourceRoot":"","sources":["../../source/services/conversation-store.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,8 @@ import '../providers/index.js';
|
|
|
4
4
|
declare const AgentSettingsSchema: z.ZodObject<{
|
|
5
5
|
model: z.ZodDefault<z.ZodString>;
|
|
6
6
|
reasoningEffort: z.ZodDefault<z.ZodEnum<{
|
|
7
|
-
default: "default";
|
|
8
7
|
none: "none";
|
|
8
|
+
default: "default";
|
|
9
9
|
medium: "medium";
|
|
10
10
|
minimal: "minimal";
|
|
11
11
|
low: "low";
|
|
@@ -22,14 +22,16 @@ declare const AgentSettingsSchema: z.ZodObject<{
|
|
|
22
22
|
title: z.ZodOptional<z.ZodString>;
|
|
23
23
|
}, z.core.$strip>>;
|
|
24
24
|
mentorModel: z.ZodOptional<z.ZodString>;
|
|
25
|
+
mentorProvider: z.ZodOptional<z.ZodString>;
|
|
25
26
|
mentorReasoningEffort: z.ZodDefault<z.ZodEnum<{
|
|
26
|
-
default: "default";
|
|
27
27
|
none: "none";
|
|
28
|
+
default: "default";
|
|
28
29
|
medium: "medium";
|
|
29
30
|
minimal: "minimal";
|
|
30
31
|
low: "low";
|
|
31
32
|
high: "high";
|
|
32
33
|
}>>;
|
|
34
|
+
useFlexServiceTier: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
|
|
33
35
|
}, z.core.$strip>;
|
|
34
36
|
declare const ShellSettingsSchema: z.ZodObject<{
|
|
35
37
|
timeout: z.ZodDefault<z.ZodNumber>;
|
|
@@ -112,7 +114,9 @@ export interface SettingsWithSources {
|
|
|
112
114
|
provider: SettingWithSource<string>;
|
|
113
115
|
openrouter: SettingWithSource<any>;
|
|
114
116
|
mentorModel: SettingWithSource<string | undefined>;
|
|
117
|
+
mentorProvider: SettingWithSource<string | undefined>;
|
|
115
118
|
mentorReasoningEffort: SettingWithSource<string>;
|
|
119
|
+
useFlexServiceTier: SettingWithSource<boolean>;
|
|
116
120
|
};
|
|
117
121
|
shell: {
|
|
118
122
|
timeout: SettingWithSource<number>;
|
|
@@ -173,7 +177,9 @@ export declare const SETTING_KEYS: {
|
|
|
173
177
|
readonly AGENT_OPENROUTER_REFERRER: "agent.openrouter.referrer";
|
|
174
178
|
readonly AGENT_OPENROUTER_TITLE: "agent.openrouter.title";
|
|
175
179
|
readonly AGENT_MENTOR_MODEL: "agent.mentorModel";
|
|
180
|
+
readonly AGENT_MENTOR_PROVIDER: "agent.mentorProvider";
|
|
176
181
|
readonly AGENT_MENTOR_REASONING_EFFORT: "agent.mentorReasoningEffort";
|
|
182
|
+
readonly AGENT_USE_FLEX_SERVICE_TIER: "agent.useFlexServiceTier";
|
|
177
183
|
readonly SHELL_TIMEOUT: "shell.timeout";
|
|
178
184
|
readonly SHELL_MAX_OUTPUT_LINES: "shell.maxOutputLines";
|
|
179
185
|
readonly SHELL_MAX_OUTPUT_CHARS: "shell.maxOutputChars";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-service.d.ts","sourceRoot":"","sources":["../../source/services/settings-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AAEpD,OAAO,uBAAuB,CAAC;AAY/B,QAAA,MAAM,mBAAmB
|
|
1
|
+
{"version":3,"file":"settings-service.d.ts","sourceRoot":"","sources":["../../source/services/settings-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,10 +40,20 @@ const AgentSettingsSchema = z.object({
|
|
|
40
40
|
})
|
|
41
41
|
.optional(),
|
|
42
42
|
mentorModel: z.string().optional().describe('Model to use as a mentor'),
|
|
43
|
+
mentorProvider: z
|
|
44
|
+
.string()
|
|
45
|
+
.min(1)
|
|
46
|
+
.optional()
|
|
47
|
+
.describe('Provider to use for the mentor model (defaults to agent.provider when unset)'),
|
|
43
48
|
mentorReasoningEffort: z
|
|
44
49
|
.enum(['default', 'none', 'minimal', 'low', 'medium', 'high'])
|
|
45
50
|
.default('default')
|
|
46
51
|
.describe('Reasoning effort for the mentor model'),
|
|
52
|
+
useFlexServiceTier: z
|
|
53
|
+
.boolean()
|
|
54
|
+
.optional()
|
|
55
|
+
.default(false)
|
|
56
|
+
.describe('Use OpenAI Flex Service Tier to reduce costs (OpenAI only)'),
|
|
47
57
|
});
|
|
48
58
|
const ShellSettingsSchema = z.object({
|
|
49
59
|
timeout: z.number().int().positive().default(120000),
|
|
@@ -152,7 +162,9 @@ export const SETTING_KEYS = {
|
|
|
152
162
|
AGENT_OPENROUTER_REFERRER: 'agent.openrouter.referrer', // Sensitive - env only
|
|
153
163
|
AGENT_OPENROUTER_TITLE: 'agent.openrouter.title', // Sensitive - env only
|
|
154
164
|
AGENT_MENTOR_MODEL: 'agent.mentorModel',
|
|
165
|
+
AGENT_MENTOR_PROVIDER: 'agent.mentorProvider',
|
|
155
166
|
AGENT_MENTOR_REASONING_EFFORT: 'agent.mentorReasoningEffort',
|
|
167
|
+
AGENT_USE_FLEX_SERVICE_TIER: 'agent.useFlexServiceTier',
|
|
156
168
|
SHELL_TIMEOUT: 'shell.timeout',
|
|
157
169
|
SHELL_MAX_OUTPUT_LINES: 'shell.maxOutputLines',
|
|
158
170
|
SHELL_MAX_OUTPUT_CHARS: 'shell.maxOutputChars',
|
|
@@ -183,7 +195,9 @@ const RUNTIME_MODIFIABLE_SETTINGS = new Set([
|
|
|
183
195
|
SETTING_KEYS.AGENT_TEMPERATURE,
|
|
184
196
|
SETTING_KEYS.AGENT_PROVIDER,
|
|
185
197
|
SETTING_KEYS.AGENT_MENTOR_MODEL,
|
|
198
|
+
SETTING_KEYS.AGENT_MENTOR_PROVIDER,
|
|
186
199
|
SETTING_KEYS.AGENT_MENTOR_REASONING_EFFORT,
|
|
200
|
+
SETTING_KEYS.AGENT_USE_FLEX_SERVICE_TIER,
|
|
187
201
|
SETTING_KEYS.SHELL_TIMEOUT,
|
|
188
202
|
SETTING_KEYS.SHELL_MAX_OUTPUT_LINES,
|
|
189
203
|
SETTING_KEYS.SHELL_MAX_OUTPUT_CHARS,
|
|
@@ -213,7 +227,9 @@ const DEFAULT_SETTINGS = {
|
|
|
213
227
|
// defaults empty; can be provided via env or config
|
|
214
228
|
},
|
|
215
229
|
mentorModel: undefined,
|
|
230
|
+
mentorProvider: undefined,
|
|
216
231
|
mentorReasoningEffort: 'default',
|
|
232
|
+
useFlexServiceTier: false,
|
|
217
233
|
},
|
|
218
234
|
shell: {
|
|
219
235
|
timeout: 120000,
|
|
@@ -625,10 +641,18 @@ export class SettingsService {
|
|
|
625
641
|
value: this.settings.agent.mentorModel,
|
|
626
642
|
source: this.getSource('agent.mentorModel'),
|
|
627
643
|
},
|
|
644
|
+
mentorProvider: {
|
|
645
|
+
value: this.settings.agent.mentorProvider,
|
|
646
|
+
source: this.getSource('agent.mentorProvider'),
|
|
647
|
+
},
|
|
628
648
|
mentorReasoningEffort: {
|
|
629
649
|
value: this.settings.agent.mentorReasoningEffort,
|
|
630
650
|
source: this.getSource('agent.mentorReasoningEffort'),
|
|
631
651
|
},
|
|
652
|
+
useFlexServiceTier: {
|
|
653
|
+
value: this.settings.agent.useFlexServiceTier,
|
|
654
|
+
source: this.getSource('agent.useFlexServiceTier'),
|
|
655
|
+
},
|
|
632
656
|
},
|
|
633
657
|
shell: {
|
|
634
658
|
timeout: {
|