kumo-cli 1.0.3 → 1.0.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/README.md +13 -5
- package/dist/auth/credentialsStore.js +61 -14
- package/dist/auth/credentialsStore.js.map +1 -1
- package/dist/auth/credentialsStore.test.js +60 -0
- package/dist/auth/credentialsStore.test.js.map +1 -0
- package/dist/claude/fileHistory.js +35 -0
- package/dist/claude/fileHistory.js.map +1 -0
- package/dist/claude/sessionScanner.js +7 -95
- package/dist/claude/sessionScanner.js.map +1 -1
- package/dist/claude/sessionScanner.test.js +24 -0
- package/dist/claude/sessionScanner.test.js.map +1 -0
- package/dist/claude/transcriptParser.js +83 -0
- package/dist/claude/transcriptParser.js.map +1 -0
- package/dist/claude/transcriptParser.test.js +78 -0
- package/dist/claude/transcriptParser.test.js.map +1 -0
- package/dist/commands/agentPrompt.js +18 -0
- package/dist/commands/agentPrompt.js.map +1 -0
- package/dist/commands/cliArgs.js +56 -0
- package/dist/commands/cliArgs.js.map +1 -0
- package/dist/commands/cliArgs.test.js +25 -0
- package/dist/commands/cliArgs.test.js.map +1 -0
- package/dist/core/logger.js +7 -2
- package/dist/core/logger.js.map +1 -1
- package/dist/core/projectFileWatcher.js +56 -0
- package/dist/core/projectFileWatcher.js.map +1 -0
- package/dist/handlers/fileHandlerPayloads.js +72 -0
- package/dist/handlers/fileHandlerPayloads.js.map +1 -0
- package/dist/handlers/fileHandlerPayloads.test.js +55 -0
- package/dist/handlers/fileHandlerPayloads.test.js.map +1 -0
- package/dist/handlers/fileHandlers.js +74 -0
- package/dist/handlers/fileHandlers.js.map +1 -0
- package/dist/handlers/messageRouter.js +8 -205
- package/dist/handlers/messageRouter.js.map +1 -1
- package/dist/handlers/router.types.js +2 -0
- package/dist/handlers/router.types.js.map +1 -0
- package/dist/handlers/runtimeHandlers.js +55 -0
- package/dist/handlers/runtimeHandlers.js.map +1 -0
- package/dist/handlers/sessionHandlers.js +68 -0
- package/dist/handlers/sessionHandlers.js.map +1 -0
- package/dist/handlers/terminalHandlers.js +40 -0
- package/dist/handlers/terminalHandlers.js.map +1 -0
- package/dist/index.js +59 -145
- package/dist/index.js.map +1 -1
- package/dist/pty/notificationDetector.js +29 -0
- package/dist/pty/notificationDetector.js.map +1 -0
- package/dist/pty/notificationDetector.test.js +24 -0
- package/dist/pty/notificationDetector.test.js.map +1 -0
- package/dist/pty/ptyMenuParser.js +11 -277
- package/dist/pty/ptyMenuParser.js.map +1 -1
- package/dist/pty/ptyMenuParser.test.js +26 -0
- package/dist/pty/ptyMenuParser.test.js.map +1 -0
- package/dist/pty/selectionMenuDetector.js +49 -0
- package/dist/pty/selectionMenuDetector.js.map +1 -0
- package/dist/pty/selectionMenuDetector.test.js +62 -0
- package/dist/pty/selectionMenuDetector.test.js.map +1 -0
- package/dist/pty/selectionMenuMeta.js +54 -0
- package/dist/pty/selectionMenuMeta.js.map +1 -0
- package/dist/pty/selectionMenuMeta.test.js +26 -0
- package/dist/pty/selectionMenuMeta.test.js.map +1 -0
- package/dist/pty/selectionMenuParser.js +83 -0
- package/dist/pty/selectionMenuParser.js.map +1 -0
- package/dist/pty/selectionMenuParser.test.js +30 -0
- package/dist/pty/selectionMenuParser.test.js.map +1 -0
- package/dist/pty/statusSessionDetector.js +28 -0
- package/dist/pty/statusSessionDetector.js.map +1 -0
- package/dist/pty/statusSessionDetector.test.js +23 -0
- package/dist/pty/statusSessionDetector.test.js.map +1 -0
- package/dist/pty/terminalManager.js +11 -6
- package/dist/pty/terminalManager.js.map +1 -1
- package/dist/pty/textInputDetector.js +60 -0
- package/dist/pty/textInputDetector.js.map +1 -0
- package/dist/pty/textInputDetector.test.js +32 -0
- package/dist/pty/textInputDetector.test.js.map +1 -0
- package/dist/services/bootstrapService.js +28 -0
- package/dist/services/bootstrapService.js.map +1 -0
- package/dist/services/claudeMenuBridge.js +116 -0
- package/dist/services/claudeMenuBridge.js.map +1 -0
- package/dist/services/claudeMenuBridge.test.js +90 -0
- package/dist/services/claudeMenuBridge.test.js.map +1 -0
- package/dist/services/claudeService.js +5 -98
- package/dist/services/claudeService.js.map +1 -1
- package/dist/services/cliRuntime.js +49 -0
- package/dist/services/cliRuntime.js.map +1 -0
- package/dist/services/cliRuntime.test.js +55 -0
- package/dist/services/cliRuntime.test.js.map +1 -0
- package/dist/services/fileService.js +19 -23
- package/dist/services/fileService.js.map +1 -1
- package/dist/services/modelAdapter.test.js +47 -0
- package/dist/services/modelAdapter.test.js.map +1 -0
- package/dist/services/modelArgs.test.js +64 -0
- package/dist/services/modelArgs.test.js.map +1 -0
- package/dist/services/modelBaseUrl.test.js +32 -0
- package/dist/services/modelBaseUrl.test.js.map +1 -0
- package/dist/services/modelService.js +20 -9
- package/dist/services/modelService.js.map +1 -1
- package/dist/services/modelService.test.js +60 -0
- package/dist/services/modelService.test.js.map +1 -1
- package/dist/services/notificationDedupe.js +23 -0
- package/dist/services/notificationDedupe.js.map +1 -0
- package/dist/services/notificationDedupe.test.js +20 -0
- package/dist/services/notificationDedupe.test.js.map +1 -0
- package/dist/services/pairingService.js +17 -8
- package/dist/services/pairingService.js.map +1 -1
- package/dist/services/sessionListService.js +19 -0
- package/dist/services/sessionListService.js.map +1 -0
- package/dist/services/sessionListService.test.js +22 -0
- package/dist/services/sessionListService.test.js.map +1 -0
- package/dist/services/sessionService.js +8 -45
- package/dist/services/sessionService.js.map +1 -1
- package/dist/services/tunnelHelpers.js +69 -0
- package/dist/services/tunnelHelpers.js.map +1 -0
- package/dist/services/tunnelHelpers.test.js +42 -0
- package/dist/services/tunnelHelpers.test.js.map +1 -0
- package/dist/services/tunnelService.js +69 -25
- package/dist/services/tunnelService.js.map +1 -1
- package/dist/services/tunnelService.test.js +91 -0
- package/dist/services/tunnelService.test.js.map +1 -0
- package/dist/transport/webrtcTransport.js +145 -0
- package/dist/transport/webrtcTransport.js.map +1 -0
- package/dist/transport/webrtcTransport.test.js +104 -0
- package/dist/transport/webrtcTransport.test.js.map +1 -0
- package/dist/transport/webrtcTypes.js +29 -0
- package/dist/transport/webrtcTypes.js.map +1 -0
- package/dist/transport/webrtcTypes.test.js +20 -0
- package/dist/transport/webrtcTypes.test.js.map +1 -0
- package/dist/transport/wsClient.js +16 -3
- package/dist/transport/wsClient.js.map +1 -1
- package/dist/utils/safePath.js +18 -6
- package/dist/utils/safePath.js.map +1 -1
- package/package.json +4 -1
- package/scripts/run-tests.mjs +45 -0
|
@@ -3,8 +3,7 @@ import { PtyMenuParser } from '../pty/ptyMenuParser.js';
|
|
|
3
3
|
import { PtySnapshotRenderer } from '../pty/ptySnapshotRenderer.js';
|
|
4
4
|
import { PtyBuffer } from '../utils/ptyBuffer.js';
|
|
5
5
|
import { log, debugWrite } from '../core/logger.js';
|
|
6
|
-
|
|
7
|
-
const NOTIFICATION_DEDUPE_WINDOW_MS = 5 * 60 * 1000;
|
|
6
|
+
import { ClaudeMenuBridge } from './claudeMenuBridge.js';
|
|
8
7
|
// manage the lifecycle of a claude pty process plus its snapshot/parser
|
|
9
8
|
export class ClaudeService {
|
|
10
9
|
send;
|
|
@@ -14,14 +13,12 @@ export class ClaudeService {
|
|
|
14
13
|
process = null;
|
|
15
14
|
cleanup = null;
|
|
16
15
|
isRespawning = false;
|
|
17
|
-
autoAcceptedApiKeyDialog = false;
|
|
18
|
-
menuIdCounter = 0;
|
|
19
16
|
pendingSelectNudgeTimer = null;
|
|
20
17
|
menuParser;
|
|
18
|
+
menuBridge;
|
|
21
19
|
snapshotRenderer;
|
|
22
20
|
buffer;
|
|
23
21
|
lastWsSendAt = 0;
|
|
24
|
-
notificationDedupes = new Map();
|
|
25
22
|
args = [];
|
|
26
23
|
settingsPath = '';
|
|
27
24
|
onExit = null;
|
|
@@ -32,6 +29,7 @@ export class ClaudeService {
|
|
|
32
29
|
this.getDeviceToken = getDeviceToken;
|
|
33
30
|
this.snapshotRenderer = new PtySnapshotRenderer(process.stdout.columns ?? 120, process.stdout.rows ?? 30);
|
|
34
31
|
this.buffer = new PtyBuffer(this.snapshotRenderer);
|
|
32
|
+
this.menuBridge = new ClaudeMenuBridge(this.send, () => this.effort.getEffective(), () => process.cwd());
|
|
35
33
|
this.menuParser = new PtyMenuParser((el) => this.handleMenuElement(el));
|
|
36
34
|
}
|
|
37
35
|
// expose a wrapper so wsClient can stamp the last-send timestamp here
|
|
@@ -117,7 +115,7 @@ export class ClaudeService {
|
|
|
117
115
|
}
|
|
118
116
|
this.cleanup?.();
|
|
119
117
|
this.cleanup = null;
|
|
120
|
-
this.
|
|
118
|
+
this.menuBridge.reset();
|
|
121
119
|
this.resetSnapshot();
|
|
122
120
|
this.args = await this.model.ensureBeforeSpawn(this.args, this.getDeviceToken());
|
|
123
121
|
this.args = this.effort.ensureBeforeSpawn(this.args);
|
|
@@ -126,7 +124,6 @@ export class ClaudeService {
|
|
|
126
124
|
this.cleanup = cleanup;
|
|
127
125
|
this.send({
|
|
128
126
|
type: 'cli_status',
|
|
129
|
-
model: this.model.getCurrent()?.model,
|
|
130
127
|
effort: this.effort.getEffective(),
|
|
131
128
|
workingDir: process.cwd(),
|
|
132
129
|
});
|
|
@@ -143,97 +140,7 @@ export class ClaudeService {
|
|
|
143
140
|
}
|
|
144
141
|
// handle a parsed pty menu element and translate into ws message
|
|
145
142
|
handleMenuElement(element) {
|
|
146
|
-
|
|
147
|
-
case 'selection': {
|
|
148
|
-
if (element.options.length === 0) {
|
|
149
|
-
log(`[parser] ignoring empty menu`);
|
|
150
|
-
break;
|
|
151
|
-
}
|
|
152
|
-
if (element.title.includes('Bypass Permissions')) {
|
|
153
|
-
if (this.tryAcceptYes(element, 'auto-accepted bypass permissions dialog'))
|
|
154
|
-
break;
|
|
155
|
-
}
|
|
156
|
-
if (!this.autoAcceptedApiKeyDialog &&
|
|
157
|
-
(element.title.includes('Detected a custom API key') || element.title.includes('Do you want to use this API key'))) {
|
|
158
|
-
if (this.tryAcceptYes(element, 'auto-accepted custom api key dialog', true)) {
|
|
159
|
-
this.autoAcceptedApiKeyDialog = true;
|
|
160
|
-
break;
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
this.menuIdCounter++;
|
|
164
|
-
const id = `menu-${this.menuIdCounter}`;
|
|
165
|
-
log(`[parser] menu detected: "${element.title}" (${element.options.length} opts, selected: ${element.selectedIndex})`);
|
|
166
|
-
log(`[parser] options: ${JSON.stringify(element.options)}`);
|
|
167
|
-
this.send({
|
|
168
|
-
type: 'prompt_options',
|
|
169
|
-
id,
|
|
170
|
-
title: element.title,
|
|
171
|
-
description: element.description,
|
|
172
|
-
options: element.options,
|
|
173
|
-
selectedIndex: element.selectedIndex,
|
|
174
|
-
hint: element.hint,
|
|
175
|
-
footer: element.footer,
|
|
176
|
-
});
|
|
177
|
-
break;
|
|
178
|
-
}
|
|
179
|
-
case 'input':
|
|
180
|
-
log(`[parser] input: "${element.label}" = "${element.value}"`);
|
|
181
|
-
this.send({ type: 'text_input', label: element.label, value: element.value, placeholder: element.placeholder, cursorPosition: element.cursorPosition });
|
|
182
|
-
break;
|
|
183
|
-
case 'notification':
|
|
184
|
-
log(`[parser] notification: [${element.level}] ${element.message}`);
|
|
185
|
-
if (this.shouldSendNotification(element.level, element.message)) {
|
|
186
|
-
this.send({ type: 'notification', level: element.level, message: element.message });
|
|
187
|
-
}
|
|
188
|
-
if (element.level === 'warning' && element.message.trim().toLowerCase() === LOGIN_WARNING_MESSAGE.toLowerCase()) {
|
|
189
|
-
const effort = this.effort.getEffective();
|
|
190
|
-
this.send({ type: 'cli_status', loggedIn: false, model: 'no model', effort, workingDir: process.cwd() });
|
|
191
|
-
}
|
|
192
|
-
break;
|
|
193
|
-
case 'status': {
|
|
194
|
-
const effort = element.effort ?? this.effort.getEffective();
|
|
195
|
-
log(`[parser] status: model=${element.model}, effort=${effort}, logged=${element.loggedIn}`);
|
|
196
|
-
this.send({ type: 'cli_status', loggedIn: element.loggedIn, model: element.model, effort, workingDir: element.workingDir });
|
|
197
|
-
break;
|
|
198
|
-
}
|
|
199
|
-
case 'session':
|
|
200
|
-
log(`[parser] session: ${element.sessionId}`);
|
|
201
|
-
this.send({ type: 'session_info', sessionId: element.sessionId, resumeCommand: element.resumeCommand });
|
|
202
|
-
break;
|
|
203
|
-
case 'prompt':
|
|
204
|
-
break;
|
|
205
|
-
}
|
|
206
|
-
}
|
|
207
|
-
// try to auto-press "yes" inside a selection dialog
|
|
208
|
-
tryAcceptYes(element, logMsg, exact = false) {
|
|
209
|
-
const yesIndex = element.options.findIndex((o) => exact
|
|
210
|
-
? o.label.trim().toLowerCase() === 'yes'
|
|
211
|
-
: o.label.trim().toLowerCase().includes('yes'));
|
|
212
|
-
if (yesIndex < 0 || !this.process)
|
|
213
|
-
return false;
|
|
214
|
-
const delta = yesIndex - element.selectedIndex;
|
|
215
|
-
const key = delta < 0 ? '\x1b[A' : '\x1b[B';
|
|
216
|
-
for (let i = 0; i < Math.abs(delta); i++)
|
|
217
|
-
this.process.write(key);
|
|
218
|
-
this.process.write('\r');
|
|
219
|
-
log(`[parser] ${logMsg}`);
|
|
220
|
-
return true;
|
|
221
|
-
}
|
|
222
|
-
shouldSendNotification(level, message) {
|
|
223
|
-
const now = Date.now();
|
|
224
|
-
const key = this.buildNotificationKey(level, message);
|
|
225
|
-
for (const [existingKey, expiresAt] of this.notificationDedupes) {
|
|
226
|
-
if (expiresAt <= now)
|
|
227
|
-
this.notificationDedupes.delete(existingKey);
|
|
228
|
-
}
|
|
229
|
-
const expiresAt = this.notificationDedupes.get(key);
|
|
230
|
-
if (expiresAt && expiresAt > now)
|
|
231
|
-
return false;
|
|
232
|
-
this.notificationDedupes.set(key, now + NOTIFICATION_DEDUPE_WINDOW_MS);
|
|
233
|
-
return true;
|
|
234
|
-
}
|
|
235
|
-
buildNotificationKey(level, message) {
|
|
236
|
-
return `${level.trim().toLowerCase()}::${message.trim().replace(/\s+/g, ' ').toLowerCase()}`;
|
|
143
|
+
this.menuBridge.handleElement(element, this.process);
|
|
237
144
|
}
|
|
238
145
|
}
|
|
239
146
|
//# sourceMappingURL=claudeService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claudeService.js","sourceRoot":"","sources":["../../src/services/claudeService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAsB,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"claudeService.js","sourceRoot":"","sources":["../../src/services/claudeService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { log } from '../core/logger.js';
|
|
2
|
+
import { SessionScanner } from '../claude/sessionScanner.js';
|
|
3
|
+
import { loadSessionList } from './sessionListService.js';
|
|
4
|
+
// ensure claude always runs with the permissions bypass flag expected by the app flow
|
|
5
|
+
export function ensureClaudeArgs(args) {
|
|
6
|
+
return args.includes('--dangerously-skip-permissions') ? [...args] : [...args, '--dangerously-skip-permissions'];
|
|
7
|
+
}
|
|
8
|
+
// create the hook-server callback that keeps scanner state, prompt replay, and assistant completion in sync
|
|
9
|
+
export function createSessionStartHandler(params) {
|
|
10
|
+
return (sessionId) => {
|
|
11
|
+
params.state.currentSessionId = sessionId;
|
|
12
|
+
params.resetSnapshot();
|
|
13
|
+
params.send({ type: 'session_start', sessionId });
|
|
14
|
+
params.state.scanner?.stop();
|
|
15
|
+
params.state.scanner = (params.scannerFactory?.(sessionId, params.state.startScannerAtEnd) ?? new SessionScanner(sessionId, params.state.startScannerAtEnd));
|
|
16
|
+
params.state.startScannerAtEnd = false;
|
|
17
|
+
params.state.scanner.on('message', (message) => {
|
|
18
|
+
params.send({ type: 'transcript', message });
|
|
19
|
+
if (message.role === 'assistant' && message.stopReason === 'end_turn') {
|
|
20
|
+
log(`[scanner] assistant_done detected, stopReason=${message.stopReason}`);
|
|
21
|
+
params.send({ type: 'assistant_done' });
|
|
22
|
+
}
|
|
23
|
+
});
|
|
24
|
+
params.state.scanner.start();
|
|
25
|
+
if (!params.state.pendingPrompt)
|
|
26
|
+
return;
|
|
27
|
+
const queuedPrompt = params.state.pendingPrompt;
|
|
28
|
+
params.state.pendingPrompt = null;
|
|
29
|
+
params.dispatchPrompt(queuedPrompt);
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
// create the ws onOpen hook that registers the cli, refreshes sessions, and restarts file watching
|
|
33
|
+
export function createWsOpenHandler(params) {
|
|
34
|
+
return async () => {
|
|
35
|
+
const credentials = params.credentials();
|
|
36
|
+
params.send({
|
|
37
|
+
type: 'register',
|
|
38
|
+
clientType: 'cli',
|
|
39
|
+
deviceToken: credentials?.deviceToken,
|
|
40
|
+
deviceUuid: credentials?.deviceUuid,
|
|
41
|
+
cwd: process.cwd(),
|
|
42
|
+
});
|
|
43
|
+
params.resetMenu();
|
|
44
|
+
params.restartWatcher();
|
|
45
|
+
const sessions = await loadSessionList(undefined, params.currentSessionId());
|
|
46
|
+
params.send({ type: 'session_list', sessions });
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=cliRuntime.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cliRuntime.js","sourceRoot":"","sources":["../../src/services/cliRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAW1D,sFAAsF;AACtF,MAAM,UAAU,gBAAgB,CAAC,IAAc;IAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,gCAAgC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,gCAAgC,CAAC,CAAC;AACnH,CAAC;AAED,4GAA4G;AAC5G,MAAM,UAAU,yBAAyB,CAAC,MAMzC;IACC,OAAO,CAAC,SAAiB,EAAE,EAAE;QAC3B,MAAM,CAAC,KAAK,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAC1C,MAAM,CAAC,aAAa,EAAE,CAAC;QACvB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,CAAC,CAAC;QAClD,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;QAC7B,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,IAAI,cAAc,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAmB,CAAC;QAC/K,MAAM,CAAC,KAAK,CAAC,iBAAiB,GAAG,KAAK,CAAC;QACvC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;YAC7C,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC;YAC7C,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,IAAI,OAAO,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;gBACtE,GAAG,CAAC,iDAAiD,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;gBAC3E,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa;YAAE,OAAO;QACxC,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC;QAChD,MAAM,CAAC,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;QAClC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;IACtC,CAAC,CAAC;AACJ,CAAC;AAED,mGAAmG;AACnG,MAAM,UAAU,mBAAmB,CAAC,MAMnC;IACC,OAAO,KAAK,IAAI,EAAE;QAChB,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,KAAK;YACjB,WAAW,EAAE,WAAW,EAAE,WAAW;YACrC,UAAU,EAAE,WAAW,EAAE,UAAU;YACnC,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;SACnB,CAAC,CAAC;QACH,MAAM,CAAC,SAAS,EAAE,CAAC;QACnB,MAAM,CAAC,cAAc,EAAE,CAAC;QACxB,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAC7E,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,CAAC;IAClD,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import test from 'node:test';
|
|
2
|
+
import assert from 'node:assert/strict';
|
|
3
|
+
import { createSessionStartHandler, createWsOpenHandler, ensureClaudeArgs } from './cliRuntime.js';
|
|
4
|
+
test('ensureClaudeArgs appends the bypass flag only once', () => {
|
|
5
|
+
assert.deepEqual(ensureClaudeArgs(['--debug']), ['--debug', '--dangerously-skip-permissions']);
|
|
6
|
+
assert.deepEqual(ensureClaudeArgs(['--dangerously-skip-permissions']), ['--dangerously-skip-permissions']);
|
|
7
|
+
});
|
|
8
|
+
test('createSessionStartHandler replays pending prompt and announces assistant completion', async () => {
|
|
9
|
+
const sent = [];
|
|
10
|
+
const dispatched = [];
|
|
11
|
+
const state = {
|
|
12
|
+
currentSessionId: null,
|
|
13
|
+
pendingPrompt: 'hello',
|
|
14
|
+
startScannerAtEnd: false,
|
|
15
|
+
scanner: null,
|
|
16
|
+
};
|
|
17
|
+
const handler = createSessionStartHandler({
|
|
18
|
+
state,
|
|
19
|
+
send: (data) => sent.push(data),
|
|
20
|
+
resetSnapshot: () => { },
|
|
21
|
+
dispatchPrompt: (text) => dispatched.push(text),
|
|
22
|
+
scannerFactory: () => ({
|
|
23
|
+
stop() { },
|
|
24
|
+
on(_event, handler) {
|
|
25
|
+
handler({ role: 'assistant', stopReason: 'end_turn' });
|
|
26
|
+
return this;
|
|
27
|
+
},
|
|
28
|
+
start() { },
|
|
29
|
+
}),
|
|
30
|
+
});
|
|
31
|
+
handler('session-1');
|
|
32
|
+
assert.equal(state.currentSessionId, 'session-1');
|
|
33
|
+
assert.equal(state.pendingPrompt, null);
|
|
34
|
+
assert.equal(dispatched[0], 'hello');
|
|
35
|
+
assert.equal(sent[0]?.type, 'session_start');
|
|
36
|
+
});
|
|
37
|
+
test('createWsOpenHandler registers the cli and sends a session list', async () => {
|
|
38
|
+
const sent = [];
|
|
39
|
+
let menuReset = false;
|
|
40
|
+
let watcherRestarted = false;
|
|
41
|
+
const handler = createWsOpenHandler({
|
|
42
|
+
send: (data) => sent.push(data),
|
|
43
|
+
credentials: () => ({ deviceUuid: 'device-1', deviceToken: 'token-1', serverUrl: 'http://localhost' }),
|
|
44
|
+
currentSessionId: () => 'session-1',
|
|
45
|
+
resetMenu: () => { menuReset = true; },
|
|
46
|
+
restartWatcher: () => { watcherRestarted = true; },
|
|
47
|
+
});
|
|
48
|
+
await handler();
|
|
49
|
+
assert.equal(sent[0]?.type, 'register');
|
|
50
|
+
assert.equal(sent[0]?.deviceToken, 'token-1');
|
|
51
|
+
assert.equal(sent.at(-1)?.type, 'session_list');
|
|
52
|
+
assert.equal(menuReset, true);
|
|
53
|
+
assert.equal(watcherRestarted, true);
|
|
54
|
+
});
|
|
55
|
+
//# sourceMappingURL=cliRuntime.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cliRuntime.test.js","sourceRoot":"","sources":["../../src/services/cliRuntime.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,12 +18,10 @@ function guard(fn) {
|
|
|
18
18
|
// list directory entries (non-hidden) sorted dirs first
|
|
19
19
|
export function list(requestedPath, cwd) {
|
|
20
20
|
return guard(() => {
|
|
21
|
-
const projectRoot = cwd && path.isAbsolute(cwd) ?
|
|
21
|
+
const projectRoot = cwd && path.isAbsolute(cwd) ? safePath(cwd) : process.cwd();
|
|
22
22
|
const resolved = requestedPath
|
|
23
|
-
? safePath(requestedPath)
|
|
23
|
+
? safePath(requestedPath, projectRoot)
|
|
24
24
|
: projectRoot;
|
|
25
|
-
if (!resolved.startsWith(projectRoot))
|
|
26
|
-
throw new Error('path traversal blocked');
|
|
27
25
|
const entries = fs.readdirSync(resolved, { withFileTypes: true })
|
|
28
26
|
.filter((e) => !e.name.startsWith('.'))
|
|
29
27
|
.map((e) => ({
|
|
@@ -36,21 +34,18 @@ export function list(requestedPath, cwd) {
|
|
|
36
34
|
return { entries, projectName: path.basename(projectRoot) };
|
|
37
35
|
});
|
|
38
36
|
}
|
|
39
|
-
export function read(filePath) {
|
|
40
|
-
return guard(() => fs.readFileSync(safePath(filePath), 'utf-8'));
|
|
37
|
+
export function read(filePath, cwd) {
|
|
38
|
+
return guard(() => fs.readFileSync(safePath(filePath, cwd), 'utf-8'));
|
|
41
39
|
}
|
|
42
|
-
export function write(filePath, content) {
|
|
40
|
+
export function write(filePath, content, cwd) {
|
|
43
41
|
return guard(() => {
|
|
44
|
-
const
|
|
45
|
-
const resolved = path.resolve(projectRoot, path.normalize(filePath || '.'));
|
|
46
|
-
if (!resolved.startsWith(projectRoot))
|
|
47
|
-
throw new Error('path traversal blocked');
|
|
42
|
+
const resolved = safePath(filePath, cwd);
|
|
48
43
|
fs.writeFileSync(resolved, content, 'utf-8');
|
|
49
44
|
});
|
|
50
45
|
}
|
|
51
|
-
export function create(targetPath, isDir) {
|
|
46
|
+
export function create(targetPath, isDir, cwd) {
|
|
52
47
|
return guard(() => {
|
|
53
|
-
const resolved = safePath(targetPath);
|
|
48
|
+
const resolved = safePath(targetPath, cwd);
|
|
54
49
|
if (isDir)
|
|
55
50
|
fs.mkdirSync(resolved, { recursive: true });
|
|
56
51
|
else {
|
|
@@ -59,23 +54,24 @@ export function create(targetPath, isDir) {
|
|
|
59
54
|
}
|
|
60
55
|
});
|
|
61
56
|
}
|
|
62
|
-
export function remove(targetPath) {
|
|
63
|
-
return guard(() => fs.rmSync(safePath(targetPath), { recursive: true, force:
|
|
57
|
+
export function remove(targetPath, cwd) {
|
|
58
|
+
return guard(() => fs.rmSync(safePath(targetPath, cwd), { recursive: true, force: false }));
|
|
64
59
|
}
|
|
65
|
-
export function rename(oldPath, newName) {
|
|
60
|
+
export function rename(oldPath, newName, cwd) {
|
|
66
61
|
return guard(() => {
|
|
67
|
-
const
|
|
62
|
+
const projectRoot = cwd ? path.resolve(cwd) : process.cwd();
|
|
63
|
+
const resolvedOld = safePath(oldPath, projectRoot);
|
|
68
64
|
const resolvedNew = path.join(path.dirname(resolvedOld), newName);
|
|
69
|
-
safePath(path.relative(
|
|
65
|
+
safePath(path.relative(projectRoot, resolvedNew), projectRoot);
|
|
70
66
|
fs.renameSync(resolvedOld, resolvedNew);
|
|
71
|
-
return { newPath: path.relative(
|
|
67
|
+
return { newPath: path.relative(projectRoot, resolvedNew).replace(/\\/g, '/') };
|
|
72
68
|
});
|
|
73
69
|
}
|
|
74
|
-
export function copy(src, dest) {
|
|
75
|
-
return guard(() => copyRecursive(safePath(src), safePath(dest)));
|
|
70
|
+
export function copy(src, dest, cwd) {
|
|
71
|
+
return guard(() => copyRecursive(safePath(src, cwd), safePath(dest, cwd)));
|
|
76
72
|
}
|
|
77
|
-
export function move(src, dest) {
|
|
78
|
-
return guard(() => fs.renameSync(safePath(src), safePath(dest)));
|
|
73
|
+
export function move(src, dest, cwd) {
|
|
74
|
+
return guard(() => fs.renameSync(safePath(src, cwd), safePath(dest, cwd)));
|
|
79
75
|
}
|
|
80
76
|
// recursive case-insensitive name search, bounded by limit
|
|
81
77
|
export function search(query, basePath, limit) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileService.js","sourceRoot":"","sources":["../../src/services/fileService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAe3D,mDAAmD;AACnD,SAAS,MAAM,CAAC,CAAU;IACxB,OAAO,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,wCAAwC;AACxC,SAAS,KAAK,CAAI,EAAW;IAC3B,IAAI,CAAC;QAAC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC;IAAC,CAAC;IACxC,OAAO,CAAC,EAAE,CAAC;QAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IAAC,CAAC;AACvD,CAAC;AAED,wDAAwD;AACxD,MAAM,UAAU,IAAI,CAAC,aAAqB,EAAE,GAAY;IACtD,OAAO,KAAK,CAAC,GAAG,EAAE;QAChB,MAAM,WAAW,GAAG,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"fileService.js","sourceRoot":"","sources":["../../src/services/fileService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import test from 'node:test';
|
|
2
|
+
import assert from 'node:assert/strict';
|
|
3
|
+
import { convertRequestToOpenAI } from 'claude-adapter';
|
|
4
|
+
test('xml tool format avoids tool role messages for strict providers', () => {
|
|
5
|
+
const request = {
|
|
6
|
+
model: 'claude-sonnet-4',
|
|
7
|
+
max_tokens: 128,
|
|
8
|
+
messages: [
|
|
9
|
+
{ role: 'user', content: 'list files' },
|
|
10
|
+
{
|
|
11
|
+
role: 'assistant',
|
|
12
|
+
content: [
|
|
13
|
+
{
|
|
14
|
+
type: 'tool_use',
|
|
15
|
+
id: 'toolu_1',
|
|
16
|
+
name: 'ls',
|
|
17
|
+
input: { path: '.' },
|
|
18
|
+
},
|
|
19
|
+
],
|
|
20
|
+
},
|
|
21
|
+
{
|
|
22
|
+
role: 'user',
|
|
23
|
+
content: [
|
|
24
|
+
{
|
|
25
|
+
type: 'tool_result',
|
|
26
|
+
tool_use_id: 'toolu_1',
|
|
27
|
+
content: 'package.json',
|
|
28
|
+
},
|
|
29
|
+
],
|
|
30
|
+
},
|
|
31
|
+
],
|
|
32
|
+
tools: [
|
|
33
|
+
{
|
|
34
|
+
name: 'ls',
|
|
35
|
+
description: 'list files',
|
|
36
|
+
input_schema: {
|
|
37
|
+
type: 'object',
|
|
38
|
+
properties: { path: { type: 'string' } },
|
|
39
|
+
},
|
|
40
|
+
},
|
|
41
|
+
],
|
|
42
|
+
};
|
|
43
|
+
const converted = convertRequestToOpenAI(request, 'deepseek-v4-flash-free', 'xml');
|
|
44
|
+
assert.deepEqual([...new Set(converted.messages.map((message) => message.role))].sort(), ['assistant', 'system', 'user']);
|
|
45
|
+
assert.equal(converted.messages.some((message) => message.role === 'tool'), false);
|
|
46
|
+
});
|
|
47
|
+
//# sourceMappingURL=modelAdapter.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"modelAdapter.test.js","sourceRoot":"","sources":["../../src/services/modelAdapter.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAGxD,IAAI,CAAC,gEAAgE,EAAE,GAAG,EAAE;IAC1E,MAAM,OAAO,GAA4B;QACvC,KAAK,EAAE,iBAAiB;QACxB,UAAU,EAAE,GAAG;QACf,QAAQ,EAAE;YACR,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE;YACvC;gBACE,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,UAAU;wBAChB,EAAE,EAAE,SAAS;wBACb,IAAI,EAAE,IAAI;wBACV,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE;qBACrB;iBACF;aACF;YACD;gBACE,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,aAAa;wBACnB,WAAW,EAAE,SAAS;wBACtB,OAAO,EAAE,cAAc;qBACxB;iBACF;aACF;SACF;QACD,KAAK,EAAE;YACL;gBACE,IAAI,EAAE,IAAI;gBACV,WAAW,EAAE,YAAY;gBACzB,YAAY,EAAE;oBACZ,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;iBACzC;aACF;SACF;KACF,CAAC;IACF,MAAM,SAAS,GAAG,sBAAsB,CAAC,OAAO,EAAE,wBAAwB,EAAE,KAAK,CAAC,CAAC;IACnF,MAAM,CAAC,SAAS,CACd,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EACtE,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,CAChC,CAAC;IACF,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;AACrF,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import test from 'node:test';
|
|
2
|
+
import assert from 'node:assert/strict';
|
|
3
|
+
import { ModelService } from './modelService.js';
|
|
4
|
+
test('apply replaces legacy model args with the selected model flag', async () => {
|
|
5
|
+
const service = new ModelService();
|
|
6
|
+
const args = service.apply({
|
|
7
|
+
model: 'claude-sonnet-4',
|
|
8
|
+
baseURL: 'https://provider.example.com/custom',
|
|
9
|
+
apiKey: 'sk-test',
|
|
10
|
+
}, ['--verbose', '--model', 'legacy-model']);
|
|
11
|
+
const env = await service.buildEnv();
|
|
12
|
+
assert.deepEqual(args, ['--verbose', '--model', 'claude-sonnet-4']);
|
|
13
|
+
assert.equal(env.ANTHROPIC_BASE_URL, 'https://provider.example.com/custom');
|
|
14
|
+
assert.equal(env.ANTHROPIC_API_KEY, 'sk-test');
|
|
15
|
+
await service.dispose();
|
|
16
|
+
});
|
|
17
|
+
test('apply accepts payloads without legacy model name', async () => {
|
|
18
|
+
const service = new ModelService();
|
|
19
|
+
const args = service.apply({
|
|
20
|
+
baseURL: 'https://api.example.com/root/v1/messages',
|
|
21
|
+
apiKey: 'sk-test',
|
|
22
|
+
}, ['-m', 'legacy-model', '--debug']);
|
|
23
|
+
const env = await service.buildEnv();
|
|
24
|
+
assert.deepEqual(args, ['--debug']);
|
|
25
|
+
assert.equal(env.ANTHROPIC_BASE_URL, 'https://api.example.com/root');
|
|
26
|
+
assert.equal(env.ANTHROPIC_API_KEY, 'sk-test');
|
|
27
|
+
await service.dispose();
|
|
28
|
+
});
|
|
29
|
+
test('apply keeps no-set requests free of model flags', async () => {
|
|
30
|
+
const service = new ModelService();
|
|
31
|
+
const args = service.apply(null, ['--model', 'legacy-model', '--debug']);
|
|
32
|
+
const env = await service.buildEnv();
|
|
33
|
+
assert.deepEqual(args, ['--debug']);
|
|
34
|
+
assert.equal(service.getCurrent(), null);
|
|
35
|
+
assert.equal(env.ANTHROPIC_BASE_URL, undefined);
|
|
36
|
+
assert.equal(env.ANTHROPIC_API_KEY, undefined);
|
|
37
|
+
await service.dispose();
|
|
38
|
+
});
|
|
39
|
+
test('ensureBeforeSpawn does not fallback to default after no-set request', async () => {
|
|
40
|
+
const service = new ModelService();
|
|
41
|
+
service.apply(null, ['--debug']);
|
|
42
|
+
service.fetchDefault = async () => ({
|
|
43
|
+
model: 'claude-sonnet-4',
|
|
44
|
+
baseURL: 'https://provider.example.com/custom',
|
|
45
|
+
apiKey: 'sk-test',
|
|
46
|
+
});
|
|
47
|
+
const args = await service.ensureBeforeSpawn(['--debug'], 'device-token');
|
|
48
|
+
assert.deepEqual(args, ['--debug']);
|
|
49
|
+
assert.equal(service.getCurrent(), null);
|
|
50
|
+
await service.dispose();
|
|
51
|
+
});
|
|
52
|
+
test('ensureBeforeSpawn still loads default when no selection was applied', async () => {
|
|
53
|
+
const service = new ModelService();
|
|
54
|
+
service.fetchDefault = async () => ({
|
|
55
|
+
model: 'claude-sonnet-4',
|
|
56
|
+
baseURL: 'https://provider.example.com/custom',
|
|
57
|
+
apiKey: 'sk-test',
|
|
58
|
+
});
|
|
59
|
+
const args = await service.ensureBeforeSpawn(['--debug'], 'device-token');
|
|
60
|
+
assert.deepEqual(args, ['--debug', '--model', 'claude-sonnet-4']);
|
|
61
|
+
assert.equal(service.getCurrent()?.model, 'claude-sonnet-4');
|
|
62
|
+
await service.dispose();
|
|
63
|
+
});
|
|
64
|
+
//# sourceMappingURL=modelArgs.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"modelArgs.test.js","sourceRoot":"","sources":["../../src/services/modelArgs.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import test from 'node:test';
|
|
2
|
+
import assert from 'node:assert/strict';
|
|
3
|
+
import { ModelService } from './modelService.js';
|
|
4
|
+
test('strips v1 messages suffix for Claude-compatible providers', async () => {
|
|
5
|
+
const service = new ModelService();
|
|
6
|
+
const url = await service.resolveClaudeBaseURL({
|
|
7
|
+
model: 'claude-haiku-4.5',
|
|
8
|
+
baseURL: 'https://api.example.com/root/v1/messages',
|
|
9
|
+
apiKey: 'sk-test',
|
|
10
|
+
});
|
|
11
|
+
assert.equal(url, 'https://api.example.com/root');
|
|
12
|
+
});
|
|
13
|
+
test('uses local adapter proxy for OpenAI chat completions providers', async () => {
|
|
14
|
+
const service = new ModelService();
|
|
15
|
+
const url = await service.resolveClaudeBaseURL({
|
|
16
|
+
model: 'deepseek-v4-flash-free',
|
|
17
|
+
baseURL: 'https://opencode.ai/zen/v1/chat/completions',
|
|
18
|
+
apiKey: 'public',
|
|
19
|
+
});
|
|
20
|
+
assert.match(url, /^http:\/\/127\.0\.0\.1:\d+$/);
|
|
21
|
+
await service.dispose();
|
|
22
|
+
});
|
|
23
|
+
test('keeps unknown provider url unchanged', async () => {
|
|
24
|
+
const service = new ModelService();
|
|
25
|
+
const url = await service.resolveClaudeBaseURL({
|
|
26
|
+
model: 'custom',
|
|
27
|
+
baseURL: 'https://provider.example.com/custom',
|
|
28
|
+
apiKey: 'sk-test',
|
|
29
|
+
});
|
|
30
|
+
assert.equal(url, 'https://provider.example.com/custom');
|
|
31
|
+
});
|
|
32
|
+
//# sourceMappingURL=modelBaseUrl.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"modelBaseUrl.test.js","sourceRoot":"","sources":["../../src/services/modelBaseUrl.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,IAAI,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;IAC3E,MAAM,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;IACnC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC;QAC7C,KAAK,EAAE,kBAAkB;QACzB,OAAO,EAAE,0CAA0C;QACnD,MAAM,EAAE,SAAS;KAClB,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,8BAA8B,CAAC,CAAC;AACpD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;IAChF,MAAM,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;IACnC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC;QAC7C,KAAK,EAAE,wBAAwB;QAC/B,OAAO,EAAE,6CAA6C;QACtD,MAAM,EAAE,QAAQ;KACjB,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,6BAA6B,CAAC,CAAC;IACjD,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;AAC1B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;IACtD,MAAM,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;IACnC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC;QAC7C,KAAK,EAAE,QAAQ;QACf,OAAO,EAAE,qCAAqC;QAC9C,MAAM,EAAE,SAAS;KAClB,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,qCAAqC,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC"}
|
|
@@ -19,25 +19,31 @@ export function removeModelArgs(args) {
|
|
|
19
19
|
// orchestrates the currently-active model pushed from backend via ws
|
|
20
20
|
export class ModelService {
|
|
21
21
|
current = null;
|
|
22
|
+
suppressDefaultFallback = false;
|
|
22
23
|
adapterProxy = new ClaudeAdapterProxy();
|
|
23
24
|
getCurrent() { return this.current; }
|
|
24
|
-
//
|
|
25
|
+
// cache incoming connection settings and rebuild the runtime model args
|
|
25
26
|
apply(payload, args) {
|
|
26
27
|
const cleaned = removeModelArgs(args);
|
|
27
28
|
if (payload && typeof payload === 'object') {
|
|
28
29
|
const p = payload;
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
model,
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
30
|
+
const current = {
|
|
31
|
+
model: typeof p['model'] === 'string' && p['model'].trim()
|
|
32
|
+
? p['model'].trim()
|
|
33
|
+
: this.current?.model ?? '',
|
|
34
|
+
baseURL: typeof p['baseURL'] === 'string' ? p['baseURL'] : undefined,
|
|
35
|
+
apiKey: typeof p['apiKey'] === 'string' ? p['apiKey'] : undefined,
|
|
36
|
+
};
|
|
37
|
+
if (current.model || current.baseURL || current.apiKey) {
|
|
38
|
+
this.current = current;
|
|
39
|
+
this.suppressDefaultFallback = false;
|
|
40
|
+
if (current.model)
|
|
41
|
+
cleaned.push('--model', current.model);
|
|
37
42
|
return cleaned;
|
|
38
43
|
}
|
|
39
44
|
}
|
|
40
45
|
this.current = null;
|
|
46
|
+
this.suppressDefaultFallback = payload === null;
|
|
41
47
|
return cleaned;
|
|
42
48
|
}
|
|
43
49
|
// build env overrides for claude pty based on current model
|
|
@@ -51,6 +57,9 @@ export class ModelService {
|
|
|
51
57
|
env.ANTHROPIC_BASE_URL = await this.resolveClaudeBaseURL(this.current);
|
|
52
58
|
env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
|
|
53
59
|
}
|
|
60
|
+
else {
|
|
61
|
+
await this.adapterProxy.stop();
|
|
62
|
+
}
|
|
54
63
|
if (this.current?.apiKey)
|
|
55
64
|
env.ANTHROPIC_API_KEY = this.current.apiKey;
|
|
56
65
|
if (env.ANTHROPIC_BASE_URL?.startsWith('http://127.0.0.1:'))
|
|
@@ -102,6 +111,8 @@ export class ModelService {
|
|
|
102
111
|
async ensureBeforeSpawn(args, deviceToken) {
|
|
103
112
|
if (this.current)
|
|
104
113
|
return args;
|
|
114
|
+
if (this.suppressDefaultFallback)
|
|
115
|
+
return args;
|
|
105
116
|
const def = await this.fetchDefault(deviceToken);
|
|
106
117
|
if (def)
|
|
107
118
|
return this.apply({ model: def.model, baseURL: def.baseURL, apiKey: def.apiKey }, args);
|