@openchamber/web 1.15.0 → 1.16.1
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 +5 -5
- package/dist/assets/{DiagramView-HR2xZxJ8.js → DiagramView-Elkp8b4l.js} +1 -1
- package/dist/assets/{MarkdownRendererImpl-sm01Q7R7.js → MarkdownRendererImpl-DLhrL6oX.js} +3 -3
- package/dist/assets/{MultiRunWindow-DlFUaNQK.js → MultiRunWindow-DVpNCqnE.js} +1 -1
- package/dist/assets/{OnboardingScreen-DVRz82mJ.js → OnboardingScreen-CpcR0gyq.js} +1 -1
- package/dist/assets/SessionSwitcherDropdown-DHO5Je6v.js +1 -0
- package/dist/assets/{SettingsWindow-CkInZcj7.js → SettingsWindow-Bewo7vwh.js} +1 -1
- package/dist/assets/{TerminalView-D_9BAjtv.js → TerminalView-D9C7fNLm.js} +3 -3
- package/dist/assets/es-D9nOo8Wx.js +15 -0
- package/dist/assets/fr-DEF71lgt.js +13 -0
- package/dist/assets/index-BklNmnVr.js +2 -0
- package/dist/assets/index-C3uMIExE.css +1 -0
- package/dist/assets/ja-CpNfaEje.js +15 -0
- package/dist/assets/ko-DLS_rnE-.js +15 -0
- package/dist/assets/main-B0CxEOP5.js +237 -0
- package/dist/assets/{main-DzNa8r0N.js → main-Ck3ZNw8-.js} +2 -2
- package/dist/assets/miniChat-BAJj2Ome.js +2 -0
- package/dist/assets/mobile-CJoX4Cdj.js +2 -0
- package/dist/assets/pl-BjtFn5-n.js +15 -0
- package/dist/assets/pt-BR-C0_4Rnzn.js +15 -0
- package/dist/assets/renderElectronMiniChatApp-D4-OXCXM.js +2 -0
- package/dist/assets/renderMobileApp-DHWdI195.js +16 -0
- package/dist/assets/runtimeEndpointReset-B0P2DED1.js +167 -0
- package/dist/assets/uk-BDu4E0s0.js +15 -0
- package/dist/assets/{useAppFontEffects-DzBg8hrC.js → useAppFontEffects-9LFMCKYW.js} +195 -136
- package/dist/assets/zh-CN-BcwMqxIR.js +15 -0
- package/dist/assets/zh-TW-bNDQjKEu.js +15 -0
- package/dist/index.html +3 -3
- package/dist/mini-chat.html +3 -3
- package/dist/mobile.html +3 -3
- package/package.json +1 -1
- package/server/index.js +106 -1
- package/server/lib/notifications/DOCUMENTATION.md +1 -1
- package/server/lib/notifications/apns-runtime.js +3 -1
- package/server/lib/notifications/runtime.js +135 -33
- package/server/lib/opencode/DOCUMENTATION.md +1 -0
- package/server/lib/opencode/agents.js +3 -0
- package/server/lib/opencode/bootstrap-runtime.js +5 -0
- package/server/lib/opencode/core-routes.js +75 -2
- package/server/lib/opencode/core-routes.test.js +81 -0
- package/server/lib/opencode/feature-routes-runtime.js +6 -0
- package/server/lib/opencode/settings-helpers.js +30 -0
- package/server/lib/opencode/settings-helpers.test.js +14 -0
- package/server/lib/opencode/settings-normalization-runtime.js +19 -4
- package/server/lib/opencode/settings-normalization-runtime.test.js +21 -0
- package/server/lib/opencode/settings-runtime.js +25 -0
- package/server/lib/opencode/shutdown-runtime.js +2 -0
- package/server/lib/opencode/tunnel-auth.js +4 -9
- package/server/lib/package-manager.js +1 -1
- package/server/lib/permission-auto-accept/DOCUMENTATION.md +34 -0
- package/server/lib/permission-auto-accept/runtime.js +263 -0
- package/server/lib/permission-auto-accept/runtime.test.js +137 -0
- package/server/lib/projects/project-config.js +8 -0
- package/server/lib/quota/DOCUMENTATION.md +5 -2
- package/server/lib/quota/credentials/providers.js +43 -0
- package/server/lib/quota/credentials/store.js +48 -0
- package/server/lib/quota/credentials/store.test.js +26 -0
- package/server/lib/quota/opencode-go-credentials.js +11 -0
- package/server/lib/quota/opencode-go-credentials.test.js +32 -0
- package/server/lib/quota/providers/codex.js +7 -4
- package/server/lib/quota/providers/codex.test.js +48 -0
- package/server/lib/quota/providers/cursor.js +28 -39
- package/server/lib/quota/providers/index.js +7 -0
- package/server/lib/quota/providers/ollama-cloud.js +23 -42
- package/server/lib/quota/providers/ollama-cloud.test.js +12 -0
- package/server/lib/quota/providers/opencode-go.js +70 -0
- package/server/lib/quota/providers/opencode-go.test.js +17 -0
- package/server/lib/quota/routes.js +78 -7
- package/server/lib/quota/routes.test.js +40 -0
- package/server/lib/relay/DOCUMENTATION.md +20 -0
- package/server/lib/relay/host-lock.js +101 -0
- package/server/lib/relay/host-lock.test.js +129 -0
- package/server/lib/relay/identity.js +24 -4
- package/server/lib/relay/service.js +95 -8
- package/server/lib/relay/signing-key.js +30 -7
- package/server/lib/scheduled-tasks/runtime.js +104 -0
- package/server/lib/session-goal/DOCUMENTATION.md +176 -0
- package/server/lib/session-goal/objectives.js +61 -0
- package/server/lib/session-goal/routes.js +36 -0
- package/server/lib/session-goal/runtime.js +764 -0
- package/server/lib/small-model/DOCUMENTATION.md +3 -1
- package/server/lib/small-model/call.js +45 -8
- package/server/lib/small-model/call.test.js +338 -0
- package/server/lib/small-model/index.js +1 -0
- package/dist/assets/SessionSwitcherDropdown-DvoOalMY.js +0 -1
- package/dist/assets/es-cjUissX4.js +0 -15
- package/dist/assets/fr-DqbXnTdK.js +0 -13
- package/dist/assets/index-Dg0nmvQU.css +0 -1
- package/dist/assets/index-ltrmNGAf.js +0 -2
- package/dist/assets/ja-Cetyq6Eg.js +0 -15
- package/dist/assets/ko-DtunWisP.js +0 -15
- package/dist/assets/main-BC0m8s1v.js +0 -236
- package/dist/assets/miniChat-BRYDE-Se.js +0 -2
- package/dist/assets/mobile-C3QJVA97.js +0 -2
- package/dist/assets/pl-DctGLgve.js +0 -15
- package/dist/assets/pt-BR-CXPhf78S.js +0 -15
- package/dist/assets/renderElectronMiniChatApp-CVFbDC5A.js +0 -2
- package/dist/assets/renderMobileApp-wkBjh5WR.js +0 -16
- package/dist/assets/runtimeEndpointReset-C42u8PvG.js +0 -167
- package/dist/assets/uk-Bdrc-kqF.js +0 -15
- package/dist/assets/zh-CN-CeCVKrHP.js +0 -15
- package/dist/assets/zh-TW-CoqiQING.js +0 -15
|
@@ -47,7 +47,9 @@ other runtime API.
|
|
|
47
47
|
- **Anthropic** (`type: api`): `/v1/messages` with `x-api-key`.
|
|
48
48
|
- **Google** (`type: api`): `generateContent` with `x-goog-api-key`.
|
|
49
49
|
- Everything else: OpenAI-compatible `/chat/completions` against the
|
|
50
|
-
provider's
|
|
50
|
+
provider's base URL, resolved from (1) `provider.<id>.options.baseURL`
|
|
51
|
+
in the OpenCode config, (2) the hardcoded `https://api.openai.com/v1`
|
|
52
|
+
endpoint, or (3) the provider's `api` field from the models.dev catalog.
|
|
51
53
|
- `catalog.js` — models.dev catalog via the shared in-process cache
|
|
52
54
|
(`../opencode/models-metadata.js`, also serving
|
|
53
55
|
`/api/openchamber/models-metadata`).
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { readAuthFile, writeAuthFile } from '../opencode/auth.js';
|
|
2
|
+
import { readConfig } from '../opencode/shared.js';
|
|
2
3
|
import { getCatalogProvider } from './catalog.js';
|
|
3
4
|
import { getAuthEntryForProvider } from './resolve.js';
|
|
4
5
|
|
|
@@ -279,13 +280,41 @@ const callCodexResponses = async ({ accessToken, accountId, modelID, prompt, sys
|
|
|
279
280
|
return result;
|
|
280
281
|
};
|
|
281
282
|
|
|
283
|
+
// ---------------------------------------------------------------------------
|
|
284
|
+
// Custom provider configuration support
|
|
285
|
+
// ---------------------------------------------------------------------------
|
|
286
|
+
|
|
287
|
+
const readProviderConfig = (workingDirectory, providerID) => {
|
|
288
|
+
try {
|
|
289
|
+
const config = readConfig(workingDirectory);
|
|
290
|
+
const providerCfg = config?.provider?.[providerID];
|
|
291
|
+
if (!providerCfg || typeof providerCfg !== 'object') return null;
|
|
292
|
+
const baseURL = typeof providerCfg?.options?.baseURL === 'string' ? providerCfg.options.baseURL.trim() : null;
|
|
293
|
+
const apiKey = typeof providerCfg?.options?.apiKey === 'string' ? providerCfg.options.apiKey.trim() : null;
|
|
294
|
+
return {
|
|
295
|
+
baseURL,
|
|
296
|
+
// Shape the config-supplied key as a regular api-key auth entry so it
|
|
297
|
+
// can win the precedence check below and flow through the dispatch's
|
|
298
|
+
// `entry.type === 'api' ? entry.key : ...` branch unchanged.
|
|
299
|
+
auth: apiKey ? { type: 'api', key: apiKey } : null,
|
|
300
|
+
};
|
|
301
|
+
} catch {
|
|
302
|
+
// Provider config is non-essential — continue with catalog-only resolution.
|
|
303
|
+
return null;
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
|
|
282
307
|
// ---------------------------------------------------------------------------
|
|
283
308
|
// Dispatch
|
|
284
309
|
// ---------------------------------------------------------------------------
|
|
285
310
|
|
|
286
|
-
export async function callSmallModel({ auth, catalog, providerID, modelID, prompt, system, maxOutputTokens }) {
|
|
311
|
+
export async function callSmallModel({ auth, catalog, workingDirectory, providerID, modelID, prompt, system, maxOutputTokens }) {
|
|
287
312
|
const tokens = Number(maxOutputTokens) > 0 ? Number(maxOutputTokens) : DEFAULT_MAX_OUTPUT_TOKENS;
|
|
288
|
-
const
|
|
313
|
+
const providerConfig = readProviderConfig(workingDirectory, providerID);
|
|
314
|
+
// Match OpenCode's resolveSDK precedence:
|
|
315
|
+
// config provider.<id>.options.apiKey (providerConfig.auth) wins; the
|
|
316
|
+
// auth.json entry is only a fallback.
|
|
317
|
+
const entry = providerConfig?.auth || getAuthEntryForProvider(auth, providerID);
|
|
289
318
|
if (!entry) {
|
|
290
319
|
throw new Error(`No OpenCode login found for provider "${providerID}"`);
|
|
291
320
|
}
|
|
@@ -343,13 +372,21 @@ export async function callSmallModel({ auth, catalog, providerID, modelID, promp
|
|
|
343
372
|
}
|
|
344
373
|
|
|
345
374
|
// Everything else: OpenAI-compatible chat completions against the catalog's
|
|
346
|
-
// base URL for that provider (openai itself included).
|
|
375
|
+
// base URL for that provider (openai itself included). When a custom provider
|
|
376
|
+
// is not in the catalog (e.g. a user-configured OpenAI-compatible proxy),
|
|
377
|
+
// fall back to its baseURL from the OpenCode provider config. The openai
|
|
378
|
+
// provider also respects provider.openai.options.baseURL — OpenCode itself
|
|
379
|
+
// uses the same config for all providers including openai.
|
|
347
380
|
const provider = getCatalogProvider(catalog, providerID);
|
|
348
|
-
const
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
381
|
+
const providerConfigUrl = providerConfig?.baseURL;
|
|
382
|
+
const defaultOpenaiUrl = 'https://api.openai.com/v1';
|
|
383
|
+
const baseURL = typeof providerConfigUrl === 'string' && providerConfigUrl
|
|
384
|
+
? providerConfigUrl
|
|
385
|
+
: providerID === 'openai'
|
|
386
|
+
? defaultOpenaiUrl
|
|
387
|
+
: typeof provider?.api === 'string' && provider.api
|
|
388
|
+
? provider.api
|
|
389
|
+
: null;
|
|
353
390
|
if (!baseURL) {
|
|
354
391
|
throw new Error(`Provider "${providerID}" has no known API base URL`);
|
|
355
392
|
}
|
|
@@ -0,0 +1,338 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
2
|
+
|
|
3
|
+
// readConfig reads merged opencode config layers from disk; mock it so each
|
|
4
|
+
// test controls the provider config without touching the filesystem. call.js
|
|
5
|
+
// imports only readConfig from shared.js, so the rest of that module is left
|
|
6
|
+
// untouched for this file.
|
|
7
|
+
vi.mock('../opencode/shared.js', () => ({
|
|
8
|
+
readConfig: vi.fn(),
|
|
9
|
+
}));
|
|
10
|
+
|
|
11
|
+
const { callSmallModel } = await import('./call.js');
|
|
12
|
+
const { readConfig } = await import('../opencode/shared.js');
|
|
13
|
+
|
|
14
|
+
// Minimal catalog fragment used by the catalog-based base URL resolution case.
|
|
15
|
+
const CATALOG = {
|
|
16
|
+
mistral: {
|
|
17
|
+
id: 'mistral',
|
|
18
|
+
name: 'Mistral',
|
|
19
|
+
api: 'https://api.mistral.ai/v1',
|
|
20
|
+
models: {
|
|
21
|
+
'mistral-small-latest': { id: 'mistral-small-latest' },
|
|
22
|
+
},
|
|
23
|
+
},
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
const ok = (content) => ({
|
|
27
|
+
ok: true,
|
|
28
|
+
status: 200,
|
|
29
|
+
json: async () => ({
|
|
30
|
+
choices: [{ message: { content }, finish_reason: 'stop' }],
|
|
31
|
+
}),
|
|
32
|
+
text: async () => JSON.stringify({
|
|
33
|
+
choices: [{ message: { content }, finish_reason: 'stop' }],
|
|
34
|
+
}),
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
const lastCall = (mock) => {
|
|
38
|
+
const [url, init] = mock.mock.calls.at(-1);
|
|
39
|
+
return { url: String(url), init };
|
|
40
|
+
};
|
|
41
|
+
|
|
42
|
+
// Regression coverage for the small-model dispatch to custom OpenAI-compatible
|
|
43
|
+
// providers — credential and endpoint resolution, precedence, and non-leakage.
|
|
44
|
+
describe('callSmallModel — custom provider config', () => {
|
|
45
|
+
let fetchMock;
|
|
46
|
+
let originalFetch;
|
|
47
|
+
|
|
48
|
+
beforeEach(() => {
|
|
49
|
+
fetchMock = vi.fn();
|
|
50
|
+
originalFetch = globalThis.fetch;
|
|
51
|
+
globalThis.fetch = fetchMock;
|
|
52
|
+
readConfig.mockReset();
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
afterEach(() => {
|
|
56
|
+
globalThis.fetch = originalFetch;
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
describe('config-supplied credentials (no auth.json entry)', () => {
|
|
60
|
+
it('uses apiKey and baseURL from provider config when no auth.json entry exists', async () => {
|
|
61
|
+
readConfig.mockReturnValue({
|
|
62
|
+
provider: {
|
|
63
|
+
custom: {
|
|
64
|
+
options: { apiKey: 'test-key', baseURL: 'https://proxy.example.test/v1' },
|
|
65
|
+
},
|
|
66
|
+
},
|
|
67
|
+
});
|
|
68
|
+
fetchMock.mockResolvedValue(ok('hello'));
|
|
69
|
+
|
|
70
|
+
const text = await callSmallModel({
|
|
71
|
+
auth: {},
|
|
72
|
+
catalog: {},
|
|
73
|
+
workingDirectory: '/proj',
|
|
74
|
+
providerID: 'custom',
|
|
75
|
+
modelID: 'gpt-4o-mini',
|
|
76
|
+
prompt: 'hi',
|
|
77
|
+
});
|
|
78
|
+
|
|
79
|
+
expect(text).toBe('hello');
|
|
80
|
+
expect(fetchMock).toHaveBeenCalledTimes(1);
|
|
81
|
+
|
|
82
|
+
const { url, init } = lastCall(fetchMock);
|
|
83
|
+
// Config baseURL is used, never the hardcoded OpenAI endpoint.
|
|
84
|
+
expect(url).toBe('https://proxy.example.test/v1/chat/completions');
|
|
85
|
+
expect(url).not.toContain('api.openai.com');
|
|
86
|
+
// Config apiKey becomes the bearer credential.
|
|
87
|
+
expect(init.headers.Authorization).toBe('Bearer test-key');
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
it('trims a trailing slash from the configured baseURL', async () => {
|
|
91
|
+
readConfig.mockReturnValue({
|
|
92
|
+
provider: {
|
|
93
|
+
custom: { options: { apiKey: 'k', baseURL: 'https://proxy.example.test/v1/' } },
|
|
94
|
+
},
|
|
95
|
+
});
|
|
96
|
+
fetchMock.mockResolvedValue(ok('ok'));
|
|
97
|
+
|
|
98
|
+
await callSmallModel({
|
|
99
|
+
auth: {},
|
|
100
|
+
catalog: {},
|
|
101
|
+
workingDirectory: '/proj',
|
|
102
|
+
providerID: 'custom',
|
|
103
|
+
modelID: 'gpt-4o-mini',
|
|
104
|
+
prompt: 'hi',
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
expect(lastCall(fetchMock).url).toBe('https://proxy.example.test/v1/chat/completions');
|
|
108
|
+
});
|
|
109
|
+
|
|
110
|
+
it('throws "No OpenCode login found for provider" when neither auth.json nor config apiKey exists', async () => {
|
|
111
|
+
readConfig.mockReturnValue({
|
|
112
|
+
provider: { custom: { options: { baseURL: 'https://proxy.example.test/v1' } } },
|
|
113
|
+
});
|
|
114
|
+
|
|
115
|
+
await expect(callSmallModel({
|
|
116
|
+
auth: {},
|
|
117
|
+
catalog: {},
|
|
118
|
+
workingDirectory: '/proj',
|
|
119
|
+
providerID: 'custom',
|
|
120
|
+
modelID: 'gpt-4o-mini',
|
|
121
|
+
prompt: 'hi',
|
|
122
|
+
})).rejects.toThrow('No OpenCode login found for provider "custom"');
|
|
123
|
+
|
|
124
|
+
// The credential gate fires before any network call.
|
|
125
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
126
|
+
});
|
|
127
|
+
|
|
128
|
+
it('treats a blank/whitespace apiKey in config as absent', async () => {
|
|
129
|
+
readConfig.mockReturnValue({
|
|
130
|
+
provider: {
|
|
131
|
+
custom: { options: { apiKey: ' ', baseURL: 'https://proxy.example.test/v1' } },
|
|
132
|
+
},
|
|
133
|
+
});
|
|
134
|
+
|
|
135
|
+
await expect(callSmallModel({
|
|
136
|
+
auth: {},
|
|
137
|
+
catalog: {},
|
|
138
|
+
workingDirectory: '/proj',
|
|
139
|
+
providerID: 'custom',
|
|
140
|
+
modelID: 'gpt-4o-mini',
|
|
141
|
+
prompt: 'hi',
|
|
142
|
+
})).rejects.toThrow('No OpenCode login found for provider "custom"');
|
|
143
|
+
});
|
|
144
|
+
});
|
|
145
|
+
|
|
146
|
+
describe('resolution order when auth.json is also present', () => {
|
|
147
|
+
it('uses the auth.json credential with the config baseURL', async () => {
|
|
148
|
+
readConfig.mockReturnValue({
|
|
149
|
+
provider: { custom: { options: { baseURL: 'https://proxy.example.test/v1' } } },
|
|
150
|
+
});
|
|
151
|
+
fetchMock.mockResolvedValue(ok('done'));
|
|
152
|
+
|
|
153
|
+
const text = await callSmallModel({
|
|
154
|
+
auth: { custom: { type: 'api', key: 'authjson-key' } },
|
|
155
|
+
catalog: {},
|
|
156
|
+
workingDirectory: '/proj',
|
|
157
|
+
providerID: 'custom',
|
|
158
|
+
modelID: 'gpt-4o-mini',
|
|
159
|
+
prompt: 'hi',
|
|
160
|
+
});
|
|
161
|
+
|
|
162
|
+
expect(text).toBe('done');
|
|
163
|
+
const { url, init } = lastCall(fetchMock);
|
|
164
|
+
expect(url).toBe('https://proxy.example.test/v1/chat/completions');
|
|
165
|
+
expect(init.headers.Authorization).toBe('Bearer authjson-key');
|
|
166
|
+
});
|
|
167
|
+
|
|
168
|
+
it('prefers the config apiKey over an auth.json credential when both are present (matches OpenCode)', async () => {
|
|
169
|
+
readConfig.mockReturnValue({
|
|
170
|
+
provider: {
|
|
171
|
+
custom: { options: { apiKey: 'config-key', baseURL: 'https://proxy.example.test/v1' } },
|
|
172
|
+
},
|
|
173
|
+
});
|
|
174
|
+
fetchMock.mockResolvedValue(ok('done'));
|
|
175
|
+
|
|
176
|
+
await callSmallModel({
|
|
177
|
+
auth: { custom: { type: 'api', key: 'authjson-key' } },
|
|
178
|
+
catalog: {},
|
|
179
|
+
workingDirectory: '/proj',
|
|
180
|
+
providerID: 'custom',
|
|
181
|
+
modelID: 'gpt-4o-mini',
|
|
182
|
+
prompt: 'hi',
|
|
183
|
+
});
|
|
184
|
+
|
|
185
|
+
// OpenCode's resolveSDK reads options.apiKey first and only falls back to
|
|
186
|
+
// auth.json's key when config has none — so the config key wins and the
|
|
187
|
+
// auth.json credential must never be sent.
|
|
188
|
+
expect(lastCall(fetchMock).init.headers.Authorization).toBe('Bearer config-key');
|
|
189
|
+
expect(JSON.stringify(fetchMock.mock.calls[0][1])).not.toContain('authjson-key');
|
|
190
|
+
});
|
|
191
|
+
});
|
|
192
|
+
|
|
193
|
+
describe('openai provider custom baseURL override', () => {
|
|
194
|
+
it('respects provider.openai.options.baseURL over the hardcoded OpenAI endpoint', async () => {
|
|
195
|
+
readConfig.mockReturnValue({
|
|
196
|
+
provider: { openai: { options: { baseURL: 'https://gateway.example.test/v1' } } },
|
|
197
|
+
});
|
|
198
|
+
fetchMock.mockResolvedValue(ok('ok'));
|
|
199
|
+
|
|
200
|
+
await callSmallModel({
|
|
201
|
+
auth: { openai: { type: 'api', key: 'sk-openai' } },
|
|
202
|
+
catalog: {},
|
|
203
|
+
workingDirectory: '/proj',
|
|
204
|
+
providerID: 'openai',
|
|
205
|
+
modelID: 'gpt-4o-mini',
|
|
206
|
+
prompt: 'hi',
|
|
207
|
+
});
|
|
208
|
+
|
|
209
|
+
const { url, init } = lastCall(fetchMock);
|
|
210
|
+
expect(url).toBe('https://gateway.example.test/v1/chat/completions');
|
|
211
|
+
expect(url).not.toContain('api.openai.com');
|
|
212
|
+
expect(init.headers.Authorization).toBe('Bearer sk-openai');
|
|
213
|
+
});
|
|
214
|
+
|
|
215
|
+
it('falls back to https://api.openai.com/v1 when no openai baseURL override is configured', async () => {
|
|
216
|
+
readConfig.mockReturnValue({});
|
|
217
|
+
fetchMock.mockResolvedValue(ok('ok'));
|
|
218
|
+
|
|
219
|
+
await callSmallModel({
|
|
220
|
+
auth: { openai: { type: 'api', key: 'sk-openai' } },
|
|
221
|
+
catalog: {},
|
|
222
|
+
workingDirectory: '/proj',
|
|
223
|
+
providerID: 'openai',
|
|
224
|
+
modelID: 'gpt-4o-mini',
|
|
225
|
+
prompt: 'hi',
|
|
226
|
+
});
|
|
227
|
+
|
|
228
|
+
expect(lastCall(fetchMock).url).toBe('https://api.openai.com/v1/chat/completions');
|
|
229
|
+
});
|
|
230
|
+
|
|
231
|
+
it('still requires a credential: a baseURL alone does not authenticate openai', async () => {
|
|
232
|
+
readConfig.mockReturnValue({
|
|
233
|
+
provider: { openai: { options: { baseURL: 'https://gateway.example.test/v1' } } },
|
|
234
|
+
});
|
|
235
|
+
|
|
236
|
+
await expect(callSmallModel({
|
|
237
|
+
auth: {},
|
|
238
|
+
catalog: {},
|
|
239
|
+
workingDirectory: '/proj',
|
|
240
|
+
providerID: 'openai',
|
|
241
|
+
modelID: 'gpt-4o-mini',
|
|
242
|
+
prompt: 'hi',
|
|
243
|
+
})).rejects.toThrow('No OpenCode login found for provider "openai"');
|
|
244
|
+
});
|
|
245
|
+
});
|
|
246
|
+
|
|
247
|
+
describe('catalog-based base URL (no config override)', () => {
|
|
248
|
+
it('uses the catalog api field when no config baseURL is set', async () => {
|
|
249
|
+
readConfig.mockReturnValue({});
|
|
250
|
+
fetchMock.mockResolvedValue(ok('ok'));
|
|
251
|
+
|
|
252
|
+
await callSmallModel({
|
|
253
|
+
auth: { mistral: { type: 'api', key: 'mistral-key' } },
|
|
254
|
+
catalog: CATALOG,
|
|
255
|
+
workingDirectory: '/proj',
|
|
256
|
+
providerID: 'mistral',
|
|
257
|
+
modelID: 'mistral-small-latest',
|
|
258
|
+
prompt: 'hi',
|
|
259
|
+
});
|
|
260
|
+
|
|
261
|
+
const { url, init } = lastCall(fetchMock);
|
|
262
|
+
expect(url).toBe('https://api.mistral.ai/v1/chat/completions');
|
|
263
|
+
expect(init.headers.Authorization).toBe('Bearer mistral-key');
|
|
264
|
+
});
|
|
265
|
+
|
|
266
|
+
it('throws when a non-openai provider has no catalog api and no config baseURL', async () => {
|
|
267
|
+
readConfig.mockReturnValue({});
|
|
268
|
+
|
|
269
|
+
await expect(callSmallModel({
|
|
270
|
+
auth: { custom: { type: 'api', key: 'k' } },
|
|
271
|
+
catalog: {},
|
|
272
|
+
workingDirectory: '/proj',
|
|
273
|
+
providerID: 'custom',
|
|
274
|
+
modelID: 'gpt-4o-mini',
|
|
275
|
+
prompt: 'hi',
|
|
276
|
+
})).rejects.toThrow('Provider "custom" has no known API base URL');
|
|
277
|
+
});
|
|
278
|
+
});
|
|
279
|
+
|
|
280
|
+
describe('config-supplied key does not leak', () => {
|
|
281
|
+
// The config-supplied key must stay in-memory: never copied into catalog
|
|
282
|
+
// metadata, the response, or the request body.
|
|
283
|
+
it('does not mutate the catalog or echo the key in the request/response', async () => {
|
|
284
|
+
const catalog = { custom: { id: 'custom', models: {} } };
|
|
285
|
+
const catalogBefore = JSON.parse(JSON.stringify(catalog));
|
|
286
|
+
readConfig.mockReturnValue({
|
|
287
|
+
provider: {
|
|
288
|
+
custom: { options: { apiKey: 'test-key', baseURL: 'https://proxy.example.test/v1' } },
|
|
289
|
+
},
|
|
290
|
+
});
|
|
291
|
+
fetchMock.mockResolvedValue(ok('the answer'));
|
|
292
|
+
|
|
293
|
+
const text = await callSmallModel({
|
|
294
|
+
auth: {},
|
|
295
|
+
catalog,
|
|
296
|
+
workingDirectory: '/proj',
|
|
297
|
+
providerID: 'custom',
|
|
298
|
+
modelID: 'gpt-4o-mini',
|
|
299
|
+
prompt: 'hi',
|
|
300
|
+
});
|
|
301
|
+
|
|
302
|
+
// Response text is exactly the model output — no credential echoed back.
|
|
303
|
+
expect(text).toBe('the answer');
|
|
304
|
+
// Catalog object left untouched (key stays in-memory only).
|
|
305
|
+
expect(catalog).toEqual(catalogBefore);
|
|
306
|
+
|
|
307
|
+
const { url, init } = lastCall(fetchMock);
|
|
308
|
+
// The key rides only in the Authorization header.
|
|
309
|
+
expect(url).not.toContain('test-key');
|
|
310
|
+
const body = JSON.parse(init.body);
|
|
311
|
+
expect(JSON.stringify(body)).not.toContain('test-key');
|
|
312
|
+
});
|
|
313
|
+
});
|
|
314
|
+
|
|
315
|
+
describe('merged config layers', () => {
|
|
316
|
+
it('reads the provider config for the supplied working directory', async () => {
|
|
317
|
+
readConfig.mockReturnValue({
|
|
318
|
+
provider: {
|
|
319
|
+
custom: { options: { apiKey: 'test-key', baseURL: 'https://proxy.example.test/v1' } },
|
|
320
|
+
},
|
|
321
|
+
});
|
|
322
|
+
fetchMock.mockResolvedValue(ok('ok'));
|
|
323
|
+
|
|
324
|
+
await callSmallModel({
|
|
325
|
+
auth: {},
|
|
326
|
+
catalog: {},
|
|
327
|
+
workingDirectory: '/path/to/project',
|
|
328
|
+
providerID: 'custom',
|
|
329
|
+
modelID: 'gpt-4o-mini',
|
|
330
|
+
prompt: 'hi',
|
|
331
|
+
});
|
|
332
|
+
|
|
333
|
+
// readConfig merges global + project-scoped layers for this directory;
|
|
334
|
+
// confirm callSmallModel passes the working directory straight through.
|
|
335
|
+
expect(readConfig).toHaveBeenCalledWith('/path/to/project');
|
|
336
|
+
});
|
|
337
|
+
});
|
|
338
|
+
});
|
|
@@ -111,6 +111,7 @@ export async function generateSmallModelText({ prompt, system, maxOutputTokens,
|
|
|
111
111
|
const text = await callSmallModel({
|
|
112
112
|
auth,
|
|
113
113
|
catalog,
|
|
114
|
+
workingDirectory: directory,
|
|
114
115
|
providerID: resolved.providerID,
|
|
115
116
|
modelID: resolved.modelID,
|
|
116
117
|
prompt: clamped.prompt,
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
import{b as ne,R as je,j as r,r as Oe,a as Ue,af as Ae}from"./vendor-.bun-BE757pvp.js";import{c as _e,v as q,aJ as Be,ak as We,al as Ge,I as V,M as Ye,aI as He,aH as Je,b$ as Ke,c0 as Qe,bi as Re,u as Xe,b as qe,cu as Ve,r as ke,aB as Ze,aD as et,aE as tt,G as Pe,cS as st,cU as nt}from"./useAppFontEffects-DzBg8hrC.js";import{I as Se,a as rt,u as Ne}from"./index-ltrmNGAf.js";const Bt=s=>{const e=ne.c(129),{totalTokens:t,percentage:o,colorPercentage:n,contextLimit:i,outputLimit:a,size:c,isMobile:x,hideIcon:f,showPercentIcon:l,className:m,valueClassName:v,percentIconClassName:b,onClick:p,pressed:w}=s,S=c===void 0?"default":c,h=x===void 0?!1:x,j=f===void 0?!1:f,N=l===void 0?!1:l,C=w===void 0?!1:w,{t:d}=_e(),[_,y]=je.useState(!1),u=typeof n=="number"?n:o;let g,D,k,I,$,W,B,G;if(e[0]!==u||e[1]!==i||e[2]!==j||e[3]!==h||e[4]!==p||e[5]!==a||e[6]!==b||e[7]!==o||e[8]!==N||e[9]!==d||e[10]!==t||e[11]!==v){const z=We(o)??0,M=Ge(u),L=M==="critical"?"var(--status-error)":M==="warn"?"var(--status-warning)":"var(--status-success)";g=ot,D=it;const T=2*Math.PI*8.5,P=T*(1-z/100);I=typeof a=="number"?Math.max(a,0):0;let F;e[20]!==d||e[21]!==t?(F=d("contextUsage.tooltip.usedTokens",{tokens:g(t)}),e[20]=d,e[21]=t,e[22]=F):F=e[22];let O;e[23]!==i||e[24]!==d?(O=d("contextUsage.tooltip.contextLimit",{tokens:g(i)}),e[23]=i,e[24]=d,e[25]=O):O=e[25];let U;e[26]!==I||e[27]!==d?(U=d("contextUsage.tooltip.outputLimit",{tokens:g(I)}),e[26]=I,e[27]=d,e[28]=U):U=e[28];let R;e[29]!==O||e[30]!==U||e[31]!==F?(R=[F,O,U],e[29]=O,e[30]=U,e[31]=F,e[32]=R):R=e[32],G=R,k=!h&&typeof p=="function",e[33]!==j||e[34]!==h?(B=!h&&!j&&r.jsx(V,{name:"donut-chart",className:"h-4 w-4 flex-shrink-0"}),e[33]=j,e[34]=h,e[35]=B):B=e[35],e[36]!==v?($=q("font-medium inline-flex items-center gap-1.5",v),e[36]=v,e[37]=$):$=e[37],W=N?r.jsxs(r.Fragment,{children:[r.jsxs("svg",{viewBox:"0 0 20 20",className:q("h-3.5 w-3.5 -rotate-90",b),role:"progressbar","aria-valuenow":Math.round(z),"aria-valuemin":0,"aria-valuemax":100,children:[r.jsx("circle",{cx:10,cy:10,r:8.5,fill:"none",stroke:"var(--interactive-border)",strokeWidth:3}),r.jsx("circle",{cx:10,cy:10,r:8.5,fill:"none",stroke:L,strokeWidth:3,strokeLinecap:"round",strokeDasharray:T,strokeDashoffset:P,className:"transition-[stroke-dashoffset,stroke] duration-300"})]}),r.jsxs("span",{className:"text-foreground",children:[Math.min(o,999).toFixed(1),"%"]})]}):r.jsxs(r.Fragment,{children:[r.jsx("span",{className:D(u),children:Math.min(o,999).toFixed(1)}),"%"]}),e[0]=u,e[1]=i,e[2]=j,e[3]=h,e[4]=p,e[5]=a,e[6]=b,e[7]=o,e[8]=N,e[9]=d,e[10]=t,e[11]=v,e[12]=g,e[13]=D,e[14]=k,e[15]=I,e[16]=$,e[17]=W,e[18]=B,e[19]=G}else g=e[12],D=e[13],k=e[14],I=e[15],$=e[16],W=e[17],B=e[18],G=e[19];let Y;e[38]!==$||e[39]!==W?(Y=r.jsx("span",{className:$,children:W}),e[38]=$,e[39]=W,e[40]=Y):Y=e[40];let Z;e[41]!==B||e[42]!==Y?(Z=r.jsxs(r.Fragment,{children:[B,Y]}),e[41]=B,e[42]=Y,e[43]=Z):Z=e[43];const H=Z,ee=S==="compact"?"typography-micro":"typography-meta";let te;e[44]!==m||e[45]!==k||e[46]!==ee?(te=q("app-region-no-drag flex items-center gap-1.5 select-none",ee,k?q("rounded-md px-2 py-1.5 text-foreground transition-colors","hover:bg-interactive-hover","focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary"):"text-muted-foreground/60",m),e[44]=m,e[45]=k,e[46]=ee,e[47]=te):te=e[47];const J=te;let K;e[48]!==H||e[49]!==k||e[50]!==h||e[51]!==p||e[52]!==C||e[53]!==J||e[54]!==d?(K=k?r.jsx("button",{type:"button",className:J,"aria-label":d("contextUsage.aria.label"),"aria-pressed":C,onClick:p,children:H}):r.jsx("div",{className:J,"aria-label":d("contextUsage.aria.label"),onClick:h?()=>y(!0):void 0,children:H}),e[48]=H,e[49]=k,e[50]=h,e[51]=p,e[52]=C,e[53]=J,e[54]=d,e[55]=K):K=e[55];const X=K;if(h){let z;e[56]===Symbol.for("react.memo_cache_sentinel")?(z=()=>y(!1),e[56]=z):z=e[56];let M;e[57]!==d?(M=d("contextUsage.mobile.title"),e[57]=d,e[58]=M):M=e[58];let L;e[59]!==d?(L=d("contextUsage.mobile.usedTokens"),e[59]=d,e[60]=L):L=e[60];let T;e[61]!==L?(T=r.jsx("span",{className:"typography-meta text-muted-foreground",children:L}),e[61]=L,e[62]=T):T=e[62];let P;e[63]!==g||e[64]!==t?(P=g(t),e[63]=g,e[64]=t,e[65]=P):P=e[65];let F;e[66]!==P?(F=r.jsx("span",{className:"typography-meta text-foreground font-medium",children:P}),e[66]=P,e[67]=F):F=e[67];let O;e[68]!==T||e[69]!==F?(O=r.jsxs("div",{className:"flex justify-between items-center",children:[T,F]}),e[68]=T,e[69]=F,e[70]=O):O=e[70];let U;e[71]!==d?(U=d("contextUsage.mobile.contextLimit"),e[71]=d,e[72]=U):U=e[72];let R;e[73]!==U?(R=r.jsx("span",{className:"typography-meta text-muted-foreground",children:U}),e[73]=U,e[74]=R):R=e[74];let re;e[75]!==i||e[76]!==g?(re=g(i),e[75]=i,e[76]=g,e[77]=re):re=e[77];let oe;e[78]!==re?(oe=r.jsx("span",{className:"typography-meta text-foreground font-medium",children:re}),e[78]=re,e[79]=oe):oe=e[79];let ie;e[80]!==R||e[81]!==oe?(ie=r.jsxs("div",{className:"flex justify-between items-center",children:[R,oe]}),e[80]=R,e[81]=oe,e[82]=ie):ie=e[82];let ae;e[83]!==d?(ae=d("contextUsage.mobile.outputLimit"),e[83]=d,e[84]=ae):ae=e[84];let le;e[85]!==ae?(le=r.jsx("span",{className:"typography-meta text-muted-foreground",children:ae}),e[85]=ae,e[86]=le):le=e[86];let ce;e[87]!==g||e[88]!==I?(ce=g(I),e[87]=g,e[88]=I,e[89]=ce):ce=e[89];let de;e[90]!==ce?(de=r.jsx("span",{className:"typography-meta text-foreground font-medium",children:ce}),e[90]=ce,e[91]=de):de=e[91];let ue;e[92]!==le||e[93]!==de?(ue=r.jsxs("div",{className:"flex justify-between items-center",children:[le,de]}),e[92]=le,e[93]=de,e[94]=ue):ue=e[94];let fe;e[95]!==d?(fe=d("contextUsage.mobile.usage"),e[95]=d,e[96]=fe):fe=e[96];let me;e[97]!==fe?(me=r.jsx("span",{className:"typography-meta text-muted-foreground",children:fe}),e[97]=fe,e[98]=me):me=e[98];let he;e[99]!==u||e[100]!==D?(he=q("typography-meta font-semibold",D(u)),e[99]=u,e[100]=D,e[101]=he):he=e[101];const De=Math.min(o,999);let pe;e[102]!==De?(pe=De.toFixed(1),e[102]=De,e[103]=pe):pe=e[103];let ge;e[104]!==he||e[105]!==pe?(ge=r.jsxs("span",{className:he,children:[pe,"%"]}),e[104]=he,e[105]=pe,e[106]=ge):ge=e[106];let xe;e[107]!==me||e[108]!==ge?(xe=r.jsxs("div",{className:"flex justify-between items-center pt-1 border-t border-border/40",children:[me,ge]}),e[107]=me,e[108]=ge,e[109]=xe):xe=e[109];let be;e[110]!==O||e[111]!==ie||e[112]!==ue||e[113]!==xe?(be=r.jsx("div",{className:"flex flex-col gap-1.5",children:r.jsxs("div",{className:"rounded-xl border border-border/40 bg-sidebar/30 px-3 py-2 space-y-1",children:[O,ie,ue,xe]})}),e[110]=O,e[111]=ie,e[112]=ue,e[113]=xe,e[114]=be):be=e[114];let we;e[115]!==_||e[116]!==M||e[117]!==be?(we=r.jsx(Ye,{open:_,onClose:z,title:M,children:be}),e[115]=_,e[116]=M,e[117]=be,e[118]=we):we=e[118];let ve;return e[119]!==X||e[120]!==we?(ve=r.jsxs(r.Fragment,{children:[X,we]}),e[119]=X,e[120]=we,e[121]=ve):ve=e[121],ve}let A;e[122]!==X?(A=r.jsx(He,{asChild:!0,children:X}),e[122]=X,e[123]=A):A=e[123];let E;e[124]!==G?(E=r.jsx(Be,{children:r.jsx("div",{className:"space-y-0.5",children:G.map(at)})}),e[124]=G,e[125]=E):E=e[125];let Q;return e[126]!==A||e[127]!==E?(Q=r.jsxs(Je,{children:[A,E]}),e[126]=A,e[127]=E,e[128]=Q):Q=e[128],Q};function ot(s){return s>=1e6?`${(s/1e6).toFixed(1)}M`:s>=1e3?`${(s/1e3).toFixed(1)}K`:s.toFixed(1).replace(/\.0$/,"")}function it(s){return s>=90?"text-status-error":s>=75?"text-status-warning":"text-status-success"}function at(s){return r.jsx("p",{className:"typography-micro leading-tight",children:s},s)}const Wt=je.memo(function(e){const t=ne.c(40),{visible:o}=e,{t:n}=_e(),[i,a]=je.useState(!1);let c,x;if(t[0]!==o?(c=()=>{if(!o)return;let D=!1;Se("desktop_get_current_window_state").then(I=>{D||a(!!I?.maximized)}).catch(lt);const k=I=>{const $=I.detail;a(!!$?.maximized)};return window.addEventListener("openchamber:window-maximized-changed",k),()=>{D=!0,window.removeEventListener("openchamber:window-maximized-changed",k)}},x=[o],t[0]=o,t[1]=c,t[2]=x):(c=t[1],x=t[2]),Oe.useEffect(c,x),!o)return null;let f;t[3]!==n?(f=n("header.windowControls.groupAria"),t[3]=n,t[4]=f):f=t[4];let l;t[5]!==n?(l=n("header.windowControls.minimize"),t[5]=n,t[6]=l):l=t[6];let m;t[7]!==n?(m=n("header.windowControls.minimize"),t[7]=n,t[8]=m):m=t[8];let v;t[9]===Symbol.for("react.memo_cache_sentinel")?(v=r.jsx(V,{name:"subtract",className:"h-4 w-4"}),t[9]=v):v=t[9];let b;t[10]!==l||t[11]!==m?(b=r.jsx("button",{type:"button",className:"app-region-no-drag inline-flex h-12 w-11 items-center justify-center text-muted-foreground transition-colors hover:bg-interactive-hover hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary",onClick:ct,title:l,"aria-label":m,children:v}),t[10]=l,t[11]=m,t[12]=b):b=t[12];let p;t[13]===Symbol.for("react.memo_cache_sentinel")?(p=()=>{Se("desktop_toggle_current_window_maximized").then(D=>a(!!D?.maximized)).catch(dt)},t[13]=p):p=t[13];let w;t[14]!==i||t[15]!==n?(w=n(i?"header.windowControls.restore":"header.windowControls.maximize"),t[14]=i,t[15]=n,t[16]=w):w=t[16];let S;t[17]!==i||t[18]!==n?(S=n(i?"header.windowControls.restore":"header.windowControls.maximize"),t[17]=i,t[18]=n,t[19]=S):S=t[19];const h=i?"fullscreen-exit":"checkbox-blank";let j;t[20]!==h?(j=r.jsx(V,{name:h,className:"h-3.5 w-3.5"}),t[20]=h,t[21]=j):j=t[21];let N;t[22]!==S||t[23]!==j||t[24]!==w?(N=r.jsx("button",{type:"button",className:"app-region-no-drag inline-flex h-12 w-11 items-center justify-center text-muted-foreground transition-colors hover:bg-interactive-hover hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary",onClick:p,title:w,"aria-label":S,children:j}),t[22]=S,t[23]=j,t[24]=w,t[25]=N):N=t[25];let C;t[26]===Symbol.for("react.memo_cache_sentinel")?(C=q("app-region-no-drag inline-flex h-12 w-11 items-center justify-center text-muted-foreground transition-colors hover:bg-interactive-hover hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary","hover:bg-status-error hover:text-status-error-foreground"),t[26]=C):C=t[26];let d;t[27]!==n?(d=n("header.windowControls.close"),t[27]=n,t[28]=d):d=t[28];let _;t[29]!==n?(_=n("header.windowControls.close"),t[29]=n,t[30]=_):_=t[30];let y;t[31]===Symbol.for("react.memo_cache_sentinel")?(y=r.jsx(V,{name:"close",className:"h-4 w-4"}),t[31]=y):y=t[31];let u;t[32]!==d||t[33]!==_?(u=r.jsx("button",{type:"button",className:C,onClick:ut,title:d,"aria-label":_,children:y}),t[32]=d,t[33]=_,t[34]=u):u=t[34];let g;return t[35]!==N||t[36]!==u||t[37]!==f||t[38]!==b?(g=r.jsxs("div",{className:"app-region-no-drag -mr-3 ml-2 flex h-12 shrink-0 items-center","aria-label":f,children:[b,N,u]}),t[35]=N,t[36]=u,t[37]=f,t[38]=b,t[39]=g):g=t[39],g});function lt(){}function ct(){Se("desktop_minimize_current_window")}function dt(){}function ut(){Se("desktop_close_current_window")}const Ee="oc.sessions.pinned",ft=s=>{try{const e=s.getItem(Ee);if(!e)return new Set;const t=JSON.parse(e);return Array.isArray(t)?new Set(t.filter(o=>typeof o=="string")):new Set}catch{return new Set}},Me=(s,e)=>{try{s.setItem(Ee,JSON.stringify([...e]))}catch{}},Ce=rt(),mt=Ue((s,e)=>({ids:ft(Ce),setIds:t=>{const o=e().ids,n=typeof t=="function"?t(o):t;n!==o&&(s({ids:n}),Me(Ce,n))},toggle:t=>{const o=e().ids,n=new Set(o);n.has(t)?n.delete(t):n.add(t),s({ids:n}),Me(Ce,n)}})),se=(s,e)=>Ke(Qe.getState().dictionary,s,e),ht=s=>{const e=new Date(s),t=new Date,o=(a,c)=>a.getFullYear()===c.getFullYear()&&a.getMonth()===c.getMonth()&&a.getDate()===c.getDate(),n=new Date(t);return n.setDate(t.getDate()-1),o(e,t)?se("common.date.today"):o(e,n)?se("common.date.yesterday"):e.toLocaleDateString(Re(),{month:"short",day:"numeric",year:"numeric"}).replace(",","")},Gt=s=>{const e=new Date,t=new Date(s);if(((n,i)=>n.getFullYear()===i.getFullYear()&&n.getMonth()===i.getMonth()&&n.getDate()===i.getDate())(t,e)){const n=Date.now()-s;return n<6e4?se("common.relative.justNow"):n<36e5?se("common.relative.minutesAgoShort",{count:Math.floor(n/6e4)}):se("common.relative.hoursAgoShort",{count:Math.floor(n/36e5)})}return ht(s)},pt=s=>{const e=Math.max(0,Date.now()-s),t=6e4,o=60*t,n=24*o,i=7*n,a=30*n,c=365*n;return e<o?`${Math.max(1,Math.floor(e/t))}m`:e<n?`${Math.floor(e/o)}h`:e<i?se("common.relative.daysAgoCompact",{count:Math.floor(e/n)}):e<5*i?se("common.relative.weeksAgoCompact",{count:Math.floor(e/i)}):e<c?`${Math.floor(e/a)}mo`:se("common.relative.yearsAgoCompact",{count:Math.floor(e/c)})},ye=s=>{if(!s)return null;const e=s.replace(/\\/g,"/").replace(/\/+$/,"");return e.length===0?"/":e},gt=(s,e)=>{const t=ye(s),o=ye(e);return!t||!o?!1:t===o?!0:o==="/"?t.startsWith("/"):t.startsWith(`${o}/`)},$e=s=>s.toLowerCase().replace(/^opencode[/-]?/i,"").replace(/[-_]/g,"").trim(),Yt=(s,e)=>s?$e(s)!==$e(e):!1,Ie=s=>{if(typeof s=="number"&&Number.isFinite(s))return s;if(typeof s=="string"&&s.trim().length>0){const e=Number(s);if(Number.isFinite(e))return e}},Le=s=>Ie(s.time?.created)??0,ze=s=>Ie(s.time?.updated)??Ie(s.time?.created)??0,Te=(s,e,t)=>{const o=t.has(s.id),n=t.has(e.id);return o!==n?o?-1:1:o&&n?Le(e)-Le(s):ze(e)-ze(s)},Ht=s=>{const e=new Map;return s.forEach(t=>{e.set(t.id,t)}),Array.from(e.values())},Jt=s=>`__archived__:${s}`,Kt=(s,e)=>{const t=ye(s.directory??null),o=ye(s.project?.worktree??null),n=t??o;if(!n)return"unassigned";if(e&&n===e)return"project root";const a=(e&&n.startsWith(`${e}/`)?n.slice(e.length+1):n).split("/").filter(Boolean);return a[a.length-1]??"unassigned"},Qt=(s,e,t)=>{const o=ye(s.directory??null),n=ye(s.project?.worktree??null);return n&&(n===e||n.startsWith(`${e}/`))?!0:o?t&&t.has(o)?!0:o===e||o.startsWith(`${e}/`):!1},Rt=s=>s.replace(/[-_]/g," ").replace(/\b\w/g,e=>e.toUpperCase()),Xt=(s,e)=>{if(!e)return s;const t=s.toLowerCase(),o=e.toLowerCase(),n=o.length;if(n===0)return s;const i=[];let a=0,c=t.indexOf(o,a);for(;c!==-1;){c>a&&i.push(s.slice(a,c));const x=s.slice(c,c+n);i.push(r.jsx("mark",{className:"bg-primary text-primary-foreground ring-1 ring-primary/90",children:x},`${c}-${x}`)),a=c+n,c=t.indexOf(o,a)}return a<s.length&&i.push(s.slice(a)),i.length>0?i:s},xt=7,bt=s=>{if(!s)return null;const e=s.replace(/\\/g,"/");return e==="/"?"/":e.length>1?e.replace(/\/+$/,""):e},wt=s=>{if(!s)return null;const e=s.label?.trim();if(e)return e;const t=s.path.split(/[\\/]/).filter(Boolean);return t[t.length-1]??null},yt=(s,e)=>{const t=ne.c(18);let o;t[0]!==e?(o=e===void 0?{}:e,t[0]=e,t[1]=o):o=t[1];const n=o,{scopeProjectId:i}=n,a=i===void 0?null:i,c=Xe(vt),x=qe(jt),f=mt(St),l=Ve();let m;t[2]!==x?(m=x.map(Nt).filter(_t),t[2]=x,t[3]=m):m=t[3];const v=m;let b;t[4]!==v?(b=h=>h?v.filter(N=>gt(h,N.normalizedPath)).sort(Dt)[0]??null:null,t[4]=v,t[5]=b):b=t[5];const p=b;let w;{let h;if(t[7]!==c||t[8]!==l||t[9]!==p||t[10]!==f||t[11]!==a){const j=new Map;for(const y of c){const u=y.parentID;if(!u||y.time?.archived)continue;const g=j.get(u);g?g.push(y):j.set(u,[y])}j.forEach(y=>{y.sort((u,g)=>Te(u,g,f))});let N;t[13]!==p||t[14]!==a?(N=y=>{if(!a)return!0;const u=ke(y);return p(u)?.id===a},t[13]=p,t[14]=a,t[15]=N):N=t[15];let C;t[16]!==f?(C=(y,u)=>Te(y,u,f),t[16]=f,t[17]=C):C=t[17];const d=c.filter(Ct).filter(kt).filter(N).sort(C).slice(0,xt),_=y=>{const u=j.get(y.id)??[];return{session:y,children:u.map(g=>_(g)),worktree:null}};h=d.map(y=>{const u=ke(y),g=p(u),D=wt(g),k=u?l.get(u)??null:null;return{node:_(y),projectId:g?.id??null,groupDirectory:u,secondaryMeta:{projectLabel:D,branchLabel:k&&k!==D?k:null}}}),t[7]=c,t[8]=l,t[9]=p,t[10]=f,t[11]=a,t[12]=h}else h=t[12];w=h}return w};function vt(s){return s.activeSessions}function jt(s){return s.projects}function St(s){return s.ids}function Nt(s){return{...s,normalizedPath:bt(s.path)}}function _t(s){return s.normalizedPath}function Dt(s,e){return(e.normalizedPath?.length??0)-(s.normalizedPath?.length??0)}function Ct(s){return!s.time?.archived}function kt(s){return!s.parentID}function qt(s){const e=ne.c(18),{children:t,variant:o,scopeProjectId:n,align:i}=s,a=o===void 0?"default":o,c=n===void 0?null:n,x=i===void 0?"start":i,f=Ne(It),l=Ne(Pt);let m;e[0]!==t?(m=r.jsx(Ze,{asChild:!0,children:t}),e[0]=t,e[1]=m):m=e[1];const v=a==="compact"?"w-[280px]":"w-[360px]";let b;e[2]!==v?(b=q("overflow-hidden p-1 max-w-[calc(100vw-32px)]",v),e[2]=v,e[3]=b):b=e[3];let p;e[4]!==f||e[5]!==c||e[6]!==l||e[7]!==a?(p=f?r.jsx(Mt,{onSelect:()=>l(!1),variant:a,scopeProjectId:c}):null,e[4]=f,e[5]=c,e[6]=l,e[7]=a,e[8]=p):p=e[8];let w;e[9]!==x||e[10]!==b||e[11]!==p?(w=r.jsx(et,{align:x,sideOffset:6,className:b,children:p}),e[9]=x,e[10]=b,e[11]=p,e[12]=w):w=e[12];let S;return e[13]!==f||e[14]!==l||e[15]!==m||e[16]!==w?(S=r.jsxs(tt,{open:f,onOpenChange:l,modal:!1,children:[m,w]}),e[13]=f,e[14]=l,e[15]=m,e[16]=w,e[17]=S):S=e[17],S}function Pt(s){return s.setSessionDropdownOpen}function It(s){return s.isSessionDropdownOpen}function Mt(s){const e=ne.c(26),{onSelect:t,variant:o,scopeProjectId:n}=s;let i;e[0]!==n?(i={scopeProjectId:n},e[0]=n,e[1]=i):i=e[1];const a=yt(!0,i),c=Pe(Lt),x=Ne($t),{t:f}=_e();let l;e[2]!==t||e[3]!==c||e[4]!==x?(l=()=>{x("chat"),t(),c()},e[2]=t,e[3]=c,e[4]=x,e[5]=l):l=e[5];const m=l;let v;e[6]===Symbol.for("react.memo_cache_sentinel")?(v=new Set,e[6]=v):v=e[6];const[b,p]=je.useState(v);let w;e[7]===Symbol.for("react.memo_cache_sentinel")?(w=u=>{p(g=>{const D=new Set(g);return D.has(u)?D.delete(u):D.add(u),D})},e[7]=w):w=e[7];const S=w;let h,j;e[8]===Symbol.for("react.memo_cache_sentinel")?(h=q("group relative flex w-full cursor-pointer items-center gap-2 rounded-lg px-2 py-1.5 outline-hidden select-none","data-[highlighted]:bg-interactive-hover hover:bg-interactive-hover"),j=r.jsx(V,{name:"chat-new",className:"h-4 w-4 flex-shrink-0 text-muted-foreground"}),e[8]=h,e[9]=j):(h=e[8],j=e[9]);let N;e[10]!==f?(N=f("sessions.sidebar.header.actions.newSession"),e[10]=f,e[11]=N):N=e[11];let C;e[12]!==N?(C=r.jsx("span",{className:"truncate text-[14px] font-normal leading-tight text-foreground",children:N}),e[12]=N,e[13]=C):C=e[13];let d;e[14]!==m||e[15]!==C?(d=r.jsxs(Ae,{onClick:m,className:h,children:[j,C]}),e[14]=m,e[15]=C,e[16]=d):d=e[16];let _;e[17]!==b||e[18]!==a||e[19]!==t||e[20]!==f||e[21]!==o?(_=a.length===0?r.jsx("div",{className:"px-3 py-4 text-center typography-meta text-muted-foreground",children:f("sessions.switcher.empty")}):a.map(u=>r.jsx(Fe,{item:u,depth:0,variant:o,expandedParents:b,toggleParent:S,closeDropdown:t},u.node.session.id)),e[17]=b,e[18]=a,e[19]=t,e[20]=f,e[21]=o,e[22]=_):_=e[22];let y;return e[23]!==_||e[24]!==d?(y=r.jsx("div",{className:"max-h-[60vh] overflow-y-auto",children:r.jsxs("div",{className:"space-y-0.5",children:[d,_]})}),e[23]=_,e[24]=d,e[25]=y):y=e[25],y}function $t(s){return s.setActiveMainTab}function Lt(s){return s.openNewSessionDraft}function Fe(s){const e=ne.c(31),{item:t,depth:o,variant:n,expandedParents:i,toggleParent:a,closeDropdown:c}=s,{node:x,secondaryMeta:f}=t,l=x.session,m=x.children.length>0;let v;e[0]!==i||e[1]!==l.id?(v=i.has(l.id),e[0]=i,e[1]=l.id,e[2]=v):v=e[2];const b=v;let p;e[3]!==m||e[4]!==l.id||e[5]!==a?(p=m?()=>a(l.id):void 0,e[3]=m,e[4]=l.id,e[5]=a,e[6]=p):p=e[6];let w;e[7]!==c||e[8]!==o||e[9]!==m||e[10]!==b||e[11]!==f||e[12]!==l||e[13]!==p||e[14]!==n?(w=r.jsx(zt,{session:l,depth:o,variant:n,secondaryMeta:f,hasChildren:m,isExpanded:b,onToggleExpand:p,closeDropdown:c}),e[7]=c,e[8]=o,e[9]=m,e[10]=b,e[11]=f,e[12]=l,e[13]=p,e[14]=n,e[15]=w):w=e[15];let S;e[16]!==c||e[17]!==o||e[18]!==i||e[19]!==m||e[20]!==b||e[21]!==t.groupDirectory||e[22]!==t.projectId||e[23]!==x.children||e[24]!==f||e[25]!==a||e[26]!==n?(S=m&&b?x.children.map(j=>r.jsx(Fe,{item:{node:j,projectId:t.projectId,groupDirectory:t.groupDirectory,secondaryMeta:f},depth:o+1,variant:n,expandedParents:i,toggleParent:a,closeDropdown:c},j.session.id)):null,e[16]=c,e[17]=o,e[18]=i,e[19]=m,e[20]=b,e[21]=t.groupDirectory,e[22]=t.projectId,e[23]=x.children,e[24]=f,e[25]=a,e[26]=n,e[27]=S):S=e[27];let h;return e[28]!==w||e[29]!==S?(h=r.jsxs(r.Fragment,{children:[w,S]}),e[28]=w,e[29]=S,e[30]=h):h=e[30],h}function zt(s){const e=ne.c(57),{session:t,depth:o,variant:n,secondaryMeta:i,hasChildren:a,isExpanded:c,onToggleExpand:x,closeDropdown:f}=s,{t:l}=_e(),m=Pe(Et),v=Pe(At),b=Ne(Tt),p=st(t.id),w=nt(t.id),S=m===t.id;let h;e[0]!==t.title||e[1]!==l?(h=t.title?.trim()||l("sessions.sidebar.session.untitled"),e[0]=t.title,e[1]=l,e[2]=h):h=e[2];const j=h,N=!!t.parentID,C=w>0&&(!N||b),d=p?.type??"idle",_=d==="busy"||d==="retry",y=!_&&C&&!S;let u;e[3]!==t.time?.created||e[4]!==t.time?.updated?(u=t.time?.updated||t.time?.created||Date.now(),e[3]=t.time?.created,e[4]=t.time?.updated,e[5]=u):u=e[5];const g=u;let D;e[6]!==g?(D=pt(g),e[6]=g,e[7]=D):D=e[7];const k=D;let I;e[8]!==i?.projectLabel?(I=i?.projectLabel?.trim()||null,e[8]=i?.projectLabel,e[9]=I):I=e[9];const $=I;let W;e[10]!==i?.branchLabel?(W=i?.branchLabel?.trim()||null,e[10]=i?.branchLabel,e[11]=W):W=e[11];const B=W,G=B&&B!=="HEAD"?B:null;let Y;e[12]!==f||e[13]!==S||e[14]!==t||e[15]!==v?(Y=()=>{if(S){f();return}const P=ke(t);v(t.id,P??null),f()},e[12]=f,e[13]=S,e[14]=t,e[15]=v,e[16]=Y):Y=e[16];const Z=Y;let H;e[17]!==Z?(H=P=>{if(P.target?.closest("[data-switcher-expand]")){P.preventDefault();return}Z()},e[17]=Z,e[18]=H):H=e[18];let ee;e[19]===Symbol.for("react.memo_cache_sentinel")?(ee=q("group relative flex w-full cursor-pointer items-start gap-2 rounded-lg px-2 py-1.5 outline-hidden select-none","data-[highlighted]:bg-interactive-hover hover:bg-interactive-hover"),e[19]=ee):ee=e[19];const te=8+o*12;let J;e[20]!==te?(J={paddingLeft:te},e[20]=te,e[21]=J):J=e[21];let K;e[22]!==a||e[23]!==c||e[24]!==x||e[25]!==l||e[26]!==n?(K=n==="compact"&&a?r.jsx("span",{role:"button",tabIndex:-1,"data-switcher-expand":!0,onClick:P=>{P.preventDefault(),P.stopPropagation(),x?.()},className:"inline-flex h-3.5 w-3.5 flex-shrink-0 items-center justify-center rounded text-muted-foreground/70 hover:text-foreground","aria-label":l(c?"sessions.sidebar.session.subsessions.collapse":"sessions.sidebar.session.subsessions.expand"),children:c?r.jsx(V,{name:"arrow-down-s",className:"h-3.5 w-3.5"}):r.jsx(V,{name:"arrow-right-s",className:"h-3.5 w-3.5"})}):null,e[22]=a,e[23]=c,e[24]=x,e[25]=l,e[26]=n,e[27]=K):K=e[27];const X=S?"text-primary":"text-foreground";let A;e[28]!==X?(A=q("truncate text-[14px] font-normal leading-tight",X),e[28]=X,e[29]=A):A=e[29];let E;e[30]!==j||e[31]!==A?(E=r.jsx("span",{className:A,children:j}),e[30]=j,e[31]=A,e[32]=E):E=e[32];let Q;e[33]!==K||e[34]!==E?(Q=r.jsxs("div",{className:"flex min-w-0 items-center gap-1.5",children:[K,E]}),e[33]=K,e[34]=E,e[35]=Q):Q=e[35];let z;e[36]!==G||e[37]!==a||e[38]!==c||e[39]!==x||e[40]!==$||e[41]!==l||e[42]!==k||e[43]!==n?(z=n==="default"?r.jsxs("div",{className:"flex min-w-0 items-center gap-1.5 truncate text-muted-foreground/70 leading-tight",style:{fontSize:"calc(var(--text-ui-label) * 0.85)"},children:[a?r.jsx("span",{role:"button",tabIndex:-1,"data-switcher-expand":!0,onClick:P=>{P.preventDefault(),P.stopPropagation(),x?.()},className:"inline-flex h-3 w-3 flex-shrink-0 items-center justify-center rounded text-muted-foreground/70 hover:text-foreground","aria-label":l(c?"sessions.sidebar.session.subsessions.collapse":"sessions.sidebar.session.subsessions.expand"),children:c?r.jsx(V,{name:"arrow-down-s",className:"h-3 w-3"}):r.jsx(V,{name:"arrow-right-s",className:"h-3 w-3"})}):null,r.jsx("span",{className:"flex-shrink-0",children:k}),$?r.jsx("span",{className:"truncate",children:$}):null,G?r.jsxs("span",{className:"inline-flex min-w-0 items-center gap-0.5",children:[r.jsx(V,{name:"git-branch",className:"h-3 w-3 flex-shrink-0 text-muted-foreground/70"}),r.jsx("span",{className:"truncate",children:G})]}):null]}):null,e[36]=G,e[37]=a,e[38]=c,e[39]=x,e[40]=$,e[41]=l,e[42]=k,e[43]=n,e[44]=z):z=e[44];let M;e[45]!==Q||e[46]!==z?(M=r.jsxs("div",{className:"flex min-w-0 flex-1 flex-col gap-0.5",children:[Q,z]}),e[45]=Q,e[46]=z,e[47]=M):M=e[47];let L;e[48]!==_||e[49]!==y||e[50]!==l?(L=_||y?r.jsx("span",{className:"flex h-3 w-3 flex-shrink-0 items-center justify-center self-center",children:_?r.jsx("span",{className:"h-1.5 w-1.5 rounded-full bg-primary animate-busy-pulse","aria-label":l("sessions.sidebar.session.status.active"),title:l("sessions.sidebar.session.status.active")}):r.jsx("span",{className:"h-1.5 w-1.5 rounded-full bg-[var(--status-info)]","aria-label":l("sessions.sidebar.session.status.unread"),title:l("sessions.sidebar.session.status.unread")})}):null,e[48]=_,e[49]=y,e[50]=l,e[51]=L):L=e[51];let T;return e[52]!==J||e[53]!==M||e[54]!==L||e[55]!==H?(T=r.jsxs(Ae,{onClick:H,"data-slot":"session-switcher-item",className:ee,style:J,children:[M,L]}),e[52]=J,e[53]=M,e[54]=L,e[55]=H,e[56]=T):T=e[56],T}function Tt(s){return s.notifyOnSubtasks}function At(s){return s.setCurrentSession}function Et(s){return s.currentSessionId}export{Bt as C,qt as S,Wt as W,$e as a,Yt as b,Te as c,Ht as d,Xt as e,Rt as f,Jt as g,Gt as h,Qt as i,pt as j,ye as n,Kt as r,mt as u};
|