@openchamber/web 1.16.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.
Files changed (54) hide show
  1. package/README.md +5 -5
  2. package/dist/assets/{DiagramView-he_RFVx5.js → DiagramView-Elkp8b4l.js} +1 -1
  3. package/dist/assets/{MarkdownRendererImpl-CdBIHSPZ.js → MarkdownRendererImpl-DLhrL6oX.js} +4 -4
  4. package/dist/assets/{MultiRunWindow-B_C-tvVq.js → MultiRunWindow-DVpNCqnE.js} +1 -1
  5. package/dist/assets/{OnboardingScreen-BBnTt-9w.js → OnboardingScreen-CpcR0gyq.js} +1 -1
  6. package/dist/assets/SessionSwitcherDropdown-DHO5Je6v.js +1 -0
  7. package/dist/assets/{SettingsWindow-CjqLdpTE.js → SettingsWindow-Bewo7vwh.js} +1 -1
  8. package/dist/assets/{TerminalView-DQcdegHp.js → TerminalView-D9C7fNLm.js} +1 -1
  9. package/dist/assets/es-D9nOo8Wx.js +15 -0
  10. package/dist/assets/fr-DEF71lgt.js +13 -0
  11. package/dist/assets/index-BklNmnVr.js +2 -0
  12. package/dist/assets/index-C3uMIExE.css +1 -0
  13. package/dist/assets/ja-CpNfaEje.js +15 -0
  14. package/dist/assets/ko-DLS_rnE-.js +15 -0
  15. package/dist/assets/main-B0CxEOP5.js +237 -0
  16. package/dist/assets/{main-Dfm-VKZ9.js → main-Ck3ZNw8-.js} +2 -2
  17. package/dist/assets/miniChat-BAJj2Ome.js +2 -0
  18. package/dist/assets/mobile-CJoX4Cdj.js +2 -0
  19. package/dist/assets/pl-BjtFn5-n.js +15 -0
  20. package/dist/assets/pt-BR-C0_4Rnzn.js +15 -0
  21. package/dist/assets/renderElectronMiniChatApp-D4-OXCXM.js +2 -0
  22. package/dist/assets/{renderMobileApp-o7Fs9EBx.js → renderMobileApp-DHWdI195.js} +3 -3
  23. package/dist/assets/runtimeEndpointReset-B0P2DED1.js +167 -0
  24. package/dist/assets/uk-BDu4E0s0.js +15 -0
  25. package/dist/assets/{useAppFontEffects-DkPuAMXD.js → useAppFontEffects-9LFMCKYW.js} +127 -127
  26. package/dist/assets/zh-CN-BcwMqxIR.js +15 -0
  27. package/dist/assets/zh-TW-bNDQjKEu.js +15 -0
  28. package/dist/index.html +3 -3
  29. package/dist/mini-chat.html +3 -3
  30. package/dist/mobile.html +3 -3
  31. package/package.json +1 -1
  32. package/server/lib/opencode/settings-helpers.js +9 -0
  33. package/server/lib/package-manager.js +1 -1
  34. package/server/lib/small-model/DOCUMENTATION.md +3 -1
  35. package/server/lib/small-model/call.js +45 -8
  36. package/server/lib/small-model/call.test.js +338 -0
  37. package/server/lib/small-model/index.js +1 -0
  38. package/dist/assets/SessionSwitcherDropdown-CWWrCFzr.js +0 -1
  39. package/dist/assets/es-r0_jT91q.js +0 -15
  40. package/dist/assets/fr-Bo8rtAJ1.js +0 -13
  41. package/dist/assets/index-8J6waVO6.js +0 -2
  42. package/dist/assets/index-DEMqM4Lz.css +0 -1
  43. package/dist/assets/ja-BPWtkG-c.js +0 -15
  44. package/dist/assets/ko-Bv0k-0E3.js +0 -15
  45. package/dist/assets/main-B-GA5Tg5.js +0 -237
  46. package/dist/assets/miniChat-CfmCFFfu.js +0 -2
  47. package/dist/assets/mobile-CXJqeDlm.js +0 -2
  48. package/dist/assets/pl-CiTP50bz.js +0 -15
  49. package/dist/assets/pt-BR-DadIjX5L.js +0 -15
  50. package/dist/assets/renderElectronMiniChatApp-DS7Dy2ii.js +0 -2
  51. package/dist/assets/runtimeEndpointReset-MTaPPm4F.js +0 -167
  52. package/dist/assets/uk-2RpsWGoZ.js +0 -15
  53. package/dist/assets/zh-CN-BwKWaTuz.js +0 -15
  54. package/dist/assets/zh-TW--f_BqBpD.js +0 -15
package/dist/index.html CHANGED
@@ -515,11 +515,11 @@
515
515
  pointer-events: none;
516
516
  }
517
517
  </style>
518
- <script type="module" crossorigin src="/assets/main-Dfm-VKZ9.js"></script>
518
+ <script type="module" crossorigin src="/assets/main-Ck3ZNw8-.js"></script>
519
519
  <link rel="modulepreload" crossorigin href="/assets/vendor-.bun-BE757pvp.js">
520
- <link rel="modulepreload" crossorigin href="/assets/index-8J6waVO6.js">
520
+ <link rel="modulepreload" crossorigin href="/assets/index-BklNmnVr.js">
521
521
  <link rel="modulepreload" crossorigin href="/assets/mobileLayoutPreference-Dio-WWkI.js">
522
- <link rel="stylesheet" crossorigin href="/assets/index-DEMqM4Lz.css">
522
+ <link rel="stylesheet" crossorigin href="/assets/index-C3uMIExE.css">
523
523
  </head>
524
524
  <body class="h-full bg-background text-foreground">
525
525
  <div id="root" class="h-full">
@@ -74,10 +74,10 @@
74
74
  }
75
75
  </style>
76
76
 
77
- <script type="module" crossorigin src="/assets/miniChat-CfmCFFfu.js"></script>
77
+ <script type="module" crossorigin src="/assets/miniChat-BAJj2Ome.js"></script>
78
78
  <link rel="modulepreload" crossorigin href="/assets/vendor-.bun-BE757pvp.js">
79
- <link rel="modulepreload" crossorigin href="/assets/index-8J6waVO6.js">
80
- <link rel="stylesheet" crossorigin href="/assets/index-DEMqM4Lz.css">
79
+ <link rel="modulepreload" crossorigin href="/assets/index-BklNmnVr.js">
80
+ <link rel="stylesheet" crossorigin href="/assets/index-C3uMIExE.css">
81
81
  </head>
82
82
  <body class="h-full bg-background text-foreground">
83
83
  <div id="root" class="h-full">
package/dist/mobile.html CHANGED
@@ -63,10 +63,10 @@
63
63
  })();
64
64
  </script>
65
65
 
66
- <script type="module" crossorigin src="/assets/mobile-CXJqeDlm.js"></script>
66
+ <script type="module" crossorigin src="/assets/mobile-CJoX4Cdj.js"></script>
67
67
  <link rel="modulepreload" crossorigin href="/assets/vendor-.bun-BE757pvp.js">
68
- <link rel="modulepreload" crossorigin href="/assets/index-8J6waVO6.js">
69
- <link rel="stylesheet" crossorigin href="/assets/index-DEMqM4Lz.css">
68
+ <link rel="modulepreload" crossorigin href="/assets/index-BklNmnVr.js">
69
+ <link rel="stylesheet" crossorigin href="/assets/index-C3uMIExE.css">
70
70
  </head>
71
71
  <body class="h-full bg-background text-foreground">
72
72
  <div id="root" class="h-full"></div>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openchamber/web",
3
- "version": "1.16.0",
3
+ "version": "1.16.1",
4
4
  "private": false,
5
5
  "type": "module",
6
6
  "main": "./server/index.js",
@@ -184,6 +184,12 @@ export const createSettingsHelpers = (dependencies) => {
184
184
  if (typeof candidate.desktopMinimizeToTrayEnabled === 'boolean') {
185
185
  result.desktopMinimizeToTrayEnabled = candidate.desktopMinimizeToTrayEnabled;
186
186
  }
187
+ if (typeof candidate.desktopWindowControlsPosition === 'string') {
188
+ const mode = candidate.desktopWindowControlsPosition.trim();
189
+ if (mode === 'auto' || mode === 'left' || mode === 'right') {
190
+ result.desktopWindowControlsPosition = mode;
191
+ }
192
+ }
187
193
  if (candidate.permissionAutoAccept && typeof candidate.permissionAutoAccept === 'object' && !Array.isArray(candidate.permissionAutoAccept)) {
188
194
  const sessions = {};
189
195
  const sourceSessions = candidate.permissionAutoAccept.sessions;
@@ -526,6 +532,9 @@ export const createSettingsHelpers = (dependencies) => {
526
532
  if (typeof candidate.stickyUserHeader === 'boolean') {
527
533
  result.stickyUserHeader = candidate.stickyUserHeader;
528
534
  }
535
+ if (typeof candidate.promptNavigatorEnabled === 'boolean') {
536
+ result.promptNavigatorEnabled = candidate.promptNavigatorEnabled;
537
+ }
529
538
  if (typeof candidate.expandedEditorToolbar === 'boolean') {
530
539
  result.expandedEditorToolbar = candidate.expandedEditorToolbar;
531
540
  }
@@ -11,7 +11,7 @@ const __dirname = path.dirname(__filename);
11
11
  const PACKAGE_NAME = '@openchamber/web';
12
12
  const PACKAGE_PATH_SEGMENTS = PACKAGE_NAME.split('/');
13
13
  const NPM_REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}`;
14
- const CHANGELOG_URL = 'https://raw.githubusercontent.com/btriapitsyn/openchamber/main/CHANGELOG.md';
14
+ const CHANGELOG_URL = 'https://raw.githubusercontent.com/openchamber/openchamber/main/CHANGELOG.md';
15
15
  const GITHUB_RELEASES_URL = 'https://github.com/openchamber/openchamber/releases';
16
16
  let cachedDetectedPm = null;
17
17
 
@@ -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 models.dev base URL with `Authorization: Bearer <key>`.
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 entry = getAuthEntryForProvider(auth, providerID);
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 baseURL = providerID === 'openai'
349
- ? 'https://api.openai.com/v1'
350
- : typeof provider?.api === 'string' && provider.api
351
- ? provider.api
352
- : null;
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 re,R as je,j as r,r as Ue,a as Be,af as Ae}from"./vendor-.bun-BE757pvp.js";import{c as _e,v as q,aL as We,am as Ge,an as Je,I as V,M as Ke,aK as Ye,aJ as He,c1 as Re,c2 as Xe,bk as Qe,cJ as ne,u as qe,b as Ve,cy as Ze,r as Pe,aD as et,aF as tt,aG as st,G as ke,cX as nt,d0 as rt}from"./useAppFontEffects-DkPuAMXD.js";import{J as Se,a as ot,u as Ne}from"./index-8J6waVO6.js";const Wt=s=>{const e=re.c(129),{totalTokens:t,percentage:o,colorPercentage:n,contextLimit:a,outputLimit:i,size:l,isMobile:x,hideIcon:f,showPercentIcon:c,className:m,valueClassName:v,percentIconClassName:b,onClick:p,pressed:w}=s,S=l===void 0?"default":l,h=x===void 0?!1:x,j=f===void 0?!1:f,N=c===void 0?!1:c,C=w===void 0?!1:w,{t:d}=_e(),[_,y]=je.useState(!1),u=typeof n=="number"?n:o;let g,D,P,M,L,W,B,G;if(e[0]!==u||e[1]!==a||e[2]!==j||e[3]!==h||e[4]!==p||e[5]!==i||e[6]!==b||e[7]!==o||e[8]!==N||e[9]!==d||e[10]!==t||e[11]!==v){const z=Ge(o)??0,I=Je(u),$=I==="critical"?"var(--status-error)":I==="warn"?"var(--status-warning)":"var(--status-success)";g=it,D=at;const T=2*Math.PI*8.5,k=T*(1-z/100);M=typeof i=="number"?Math.max(i,0):0;let E;e[20]!==d||e[21]!==t?(E=d("contextUsage.tooltip.usedTokens",{tokens:g(t)}),e[20]=d,e[21]=t,e[22]=E):E=e[22];let O;e[23]!==a||e[24]!==d?(O=d("contextUsage.tooltip.contextLimit",{tokens:g(a)}),e[23]=a,e[24]=d,e[25]=O):O=e[25];let U;e[26]!==M||e[27]!==d?(U=d("contextUsage.tooltip.outputLimit",{tokens:g(M)}),e[26]=M,e[27]=d,e[28]=U):U=e[28];let X;e[29]!==O||e[30]!==U||e[31]!==E?(X=[E,O,U],e[29]=O,e[30]=U,e[31]=E,e[32]=X):X=e[32],G=X,P=!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?(L=q("font-medium inline-flex items-center gap-1.5",v),e[36]=v,e[37]=L):L=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:$,strokeWidth:3,strokeLinecap:"round",strokeDasharray:T,strokeDashoffset:k,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]=a,e[2]=j,e[3]=h,e[4]=p,e[5]=i,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]=P,e[15]=M,e[16]=L,e[17]=W,e[18]=B,e[19]=G}else g=e[12],D=e[13],P=e[14],M=e[15],L=e[16],W=e[17],B=e[18],G=e[19];let J;e[38]!==L||e[39]!==W?(J=r.jsx("span",{className:L,children:W}),e[38]=L,e[39]=W,e[40]=J):J=e[40];let Z;e[41]!==B||e[42]!==J?(Z=r.jsxs(r.Fragment,{children:[B,J]}),e[41]=B,e[42]=J,e[43]=Z):Z=e[43];const K=Z,ee=S==="compact"?"typography-micro":"typography-meta";let te;e[44]!==m||e[45]!==P||e[46]!==ee?(te=q("app-region-no-drag flex items-center gap-1.5 select-none",ee,P?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]=P,e[46]=ee,e[47]=te):te=e[47];const Y=te;let H;e[48]!==K||e[49]!==P||e[50]!==h||e[51]!==p||e[52]!==C||e[53]!==Y||e[54]!==d?(H=P?r.jsx("button",{type:"button",className:Y,"aria-label":d("contextUsage.aria.label"),"aria-pressed":C,onClick:p,children:K}):r.jsx("div",{className:Y,"aria-label":d("contextUsage.aria.label"),onClick:h?()=>y(!0):void 0,children:K}),e[48]=K,e[49]=P,e[50]=h,e[51]=p,e[52]=C,e[53]=Y,e[54]=d,e[55]=H):H=e[55];const Q=H;if(h){let z;e[56]===Symbol.for("react.memo_cache_sentinel")?(z=()=>y(!1),e[56]=z):z=e[56];let I;e[57]!==d?(I=d("contextUsage.mobile.title"),e[57]=d,e[58]=I):I=e[58];let $;e[59]!==d?($=d("contextUsage.mobile.usedTokens"),e[59]=d,e[60]=$):$=e[60];let T;e[61]!==$?(T=r.jsx("span",{className:"typography-meta text-muted-foreground",children:$}),e[61]=$,e[62]=T):T=e[62];let k;e[63]!==g||e[64]!==t?(k=g(t),e[63]=g,e[64]=t,e[65]=k):k=e[65];let E;e[66]!==k?(E=r.jsx("span",{className:"typography-meta text-foreground font-medium",children:k}),e[66]=k,e[67]=E):E=e[67];let O;e[68]!==T||e[69]!==E?(O=r.jsxs("div",{className:"flex justify-between items-center",children:[T,E]}),e[68]=T,e[69]=E,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 X;e[73]!==U?(X=r.jsx("span",{className:"typography-meta text-muted-foreground",children:U}),e[73]=U,e[74]=X):X=e[74];let oe;e[75]!==a||e[76]!==g?(oe=g(a),e[75]=a,e[76]=g,e[77]=oe):oe=e[77];let ie;e[78]!==oe?(ie=r.jsx("span",{className:"typography-meta text-foreground font-medium",children:oe}),e[78]=oe,e[79]=ie):ie=e[79];let ae;e[80]!==X||e[81]!==ie?(ae=r.jsxs("div",{className:"flex justify-between items-center",children:[X,ie]}),e[80]=X,e[81]=ie,e[82]=ae):ae=e[82];let le;e[83]!==d?(le=d("contextUsage.mobile.outputLimit"),e[83]=d,e[84]=le):le=e[84];let ce;e[85]!==le?(ce=r.jsx("span",{className:"typography-meta text-muted-foreground",children:le}),e[85]=le,e[86]=ce):ce=e[86];let de;e[87]!==g||e[88]!==M?(de=g(M),e[87]=g,e[88]=M,e[89]=de):de=e[89];let ue;e[90]!==de?(ue=r.jsx("span",{className:"typography-meta text-foreground font-medium",children:de}),e[90]=de,e[91]=ue):ue=e[91];let fe;e[92]!==ce||e[93]!==ue?(fe=r.jsxs("div",{className:"flex justify-between items-center",children:[ce,ue]}),e[92]=ce,e[93]=ue,e[94]=fe):fe=e[94];let me;e[95]!==d?(me=d("contextUsage.mobile.usage"),e[95]=d,e[96]=me):me=e[96];let he;e[97]!==me?(he=r.jsx("span",{className:"typography-meta text-muted-foreground",children:me}),e[97]=me,e[98]=he):he=e[98];let pe;e[99]!==u||e[100]!==D?(pe=q("typography-meta font-semibold",D(u)),e[99]=u,e[100]=D,e[101]=pe):pe=e[101];const De=Math.min(o,999);let ge;e[102]!==De?(ge=De.toFixed(1),e[102]=De,e[103]=ge):ge=e[103];let xe;e[104]!==pe||e[105]!==ge?(xe=r.jsxs("span",{className:pe,children:[ge,"%"]}),e[104]=pe,e[105]=ge,e[106]=xe):xe=e[106];let be;e[107]!==he||e[108]!==xe?(be=r.jsxs("div",{className:"flex justify-between items-center pt-1 border-t border-border/40",children:[he,xe]}),e[107]=he,e[108]=xe,e[109]=be):be=e[109];let we;e[110]!==O||e[111]!==ae||e[112]!==fe||e[113]!==be?(we=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,ae,fe,be]})}),e[110]=O,e[111]=ae,e[112]=fe,e[113]=be,e[114]=we):we=e[114];let ye;e[115]!==_||e[116]!==I||e[117]!==we?(ye=r.jsx(Ke,{open:_,onClose:z,title:I,children:we}),e[115]=_,e[116]=I,e[117]=we,e[118]=ye):ye=e[118];let ve;return e[119]!==Q||e[120]!==ye?(ve=r.jsxs(r.Fragment,{children:[Q,ye]}),e[119]=Q,e[120]=ye,e[121]=ve):ve=e[121],ve}let A;e[122]!==Q?(A=r.jsx(Ye,{asChild:!0,children:Q}),e[122]=Q,e[123]=A):A=e[123];let F;e[124]!==G?(F=r.jsx(We,{children:r.jsx("div",{className:"space-y-0.5",children:G.map(lt)})}),e[124]=G,e[125]=F):F=e[125];let R;return e[126]!==A||e[127]!==F?(R=r.jsxs(He,{children:[A,F]}),e[126]=A,e[127]=F,e[128]=R):R=e[128],R};function it(s){return s>=1e6?`${(s/1e6).toFixed(1)}M`:s>=1e3?`${(s/1e3).toFixed(1)}K`:s.toFixed(1).replace(/\.0$/,"")}function at(s){return s>=90?"text-status-error":s>=75?"text-status-warning":"text-status-success"}function lt(s){return r.jsx("p",{className:"typography-micro leading-tight",children:s},s)}const Gt=je.memo(function(e){const t=re.c(40),{visible:o}=e,{t:n}=_e(),[a,i]=je.useState(!1);let l,x;if(t[0]!==o?(l=()=>{if(!o)return;let D=!1;Se("desktop_get_current_window_state").then(M=>{D||i(!!M?.maximized)}).catch(ct);const P=M=>{const L=M.detail;i(!!L?.maximized)};return window.addEventListener("openchamber:window-maximized-changed",P),()=>{D=!0,window.removeEventListener("openchamber:window-maximized-changed",P)}},x=[o],t[0]=o,t[1]=l,t[2]=x):(l=t[1],x=t[2]),Ue.useEffect(l,x),!o)return null;let f;t[3]!==n?(f=n("header.windowControls.groupAria"),t[3]=n,t[4]=f):f=t[4];let c;t[5]!==n?(c=n("header.windowControls.minimize"),t[5]=n,t[6]=c):c=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]!==c||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:dt,title:c,"aria-label":m,children:v}),t[10]=c,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=>i(!!D?.maximized)).catch(ut)},t[13]=p):p=t[13];let w;t[14]!==a||t[15]!==n?(w=n(a?"header.windowControls.restore":"header.windowControls.maximize"),t[14]=a,t[15]=n,t[16]=w):w=t[16];let S;t[17]!==a||t[18]!==n?(S=n(a?"header.windowControls.restore":"header.windowControls.maximize"),t[17]=a,t[18]=n,t[19]=S):S=t[19];const h=a?"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:ft,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 ct(){}function dt(){Se("desktop_minimize_current_window")}function ut(){}function ft(){Se("desktop_close_current_window")}const Fe="oc.sessions.pinned",mt=s=>{try{const e=s.getItem(Fe);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}},Ie=(s,e)=>{try{s.setItem(Fe,JSON.stringify([...e]))}catch{}},Ce=ot(),ht=Be((s,e)=>({ids:mt(Ce),setIds:t=>{const o=e().ids,n=typeof t=="function"?t(o):t;n!==o&&(s({ids:n}),Ie(Ce,n))},toggle:t=>{const o=e().ids,n=new Set(o);n.has(t)?n.delete(t):n.add(t),s({ids:n}),Ie(Ce,n)}})),se=(s,e)=>Re(Xe.getState().dictionary,s,e),pt=s=>{const e=new Date(s),t=new Date,o=(i,l)=>i.getFullYear()===l.getFullYear()&&i.getMonth()===l.getMonth()&&i.getDate()===l.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(Qe(),{month:"short",day:"numeric",year:"numeric"}).replace(",","")},Jt=s=>{const e=new Date,t=new Date(s);if(((n,a)=>n.getFullYear()===a.getFullYear()&&n.getMonth()===a.getMonth()&&n.getDate()===a.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 pt(s)},gt=s=>{const e=Math.max(0,Date.now()-s),t=6e4,o=60*t,n=24*o,a=7*n,i=30*n,l=365*n;return e<o?`${Math.max(1,Math.floor(e/t))}m`:e<n?`${Math.floor(e/o)}h`:e<a?se("common.relative.daysAgoCompact",{count:Math.floor(e/n)}):e<5*a?se("common.relative.weeksAgoCompact",{count:Math.floor(e/a)}):e<l?`${Math.floor(e/i)}mo`:se("common.relative.yearsAgoCompact",{count:Math.floor(e/l)})},Ee=(s,e)=>{const t=ne(s),o=ne(e);return!t||!o?!1:t===o?!0:o==="/"?t.startsWith("/"):t.startsWith(`${o}/`)},Kt=(s,e,t)=>{const o=new Set;if(s.forEach(n=>{n.normalizedPath&&o.add(n.normalizedPath)}),t)return o;for(const n of e.values())for(const a of n){const i=ne(a.path);i&&o.add(i)}return o},xt=(s,e)=>{if(!s||!e)return null;let t=null;for(const o of e){const n=ne(o);!n||!Ee(s,n)||(!t||n.length>t.length)&&(t=n)}return t},Le=s=>s.toLowerCase().replace(/^opencode[/-]?/i,"").replace(/[-_]/g,"").trim(),Yt=(s,e)=>s?Le(s)!==Le(e):!1,Me=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}},$e=s=>Me(s.time?.created)??0,ze=s=>Me(s.time?.updated)??Me(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?$e(e)-$e(s):ze(e)-ze(s)},Ht=s=>{const e=new Map;return s.forEach(t=>{e.set(t.id,t)}),Array.from(e.values())},Rt=s=>`__archived__:${s}`,Xt=(s,e)=>{const t=ne(s.directory??null),o=ne(s.project?.worktree??null),n=t??o;if(!n)return"unassigned";if(e&&n===e)return"project root";const i=(e&&n.startsWith(`${e}/`)?n.slice(e.length+1):n).split("/").filter(Boolean);return i[i.length-1]??"unassigned"},Qt=(s,e,t,o)=>{const n=ne(s.directory??null),a=ne(s.project?.worktree??null),i=n??a;if(i&&t?.has(i))return!0;if(!i)return!1;const l=xt(i,o);return l?t?t.has(l):l===e:i===e||i.startsWith(`${e}/`)},qt=s=>s.replace(/[-_]/g," ").replace(/\b\w/g,e=>e.toUpperCase()),Vt=(s,e)=>{if(!e)return s;const t=s.toLowerCase(),o=e.toLowerCase(),n=o.length;if(n===0)return s;const a=[];let i=0,l=t.indexOf(o,i);for(;l!==-1;){l>i&&a.push(s.slice(i,l));const x=s.slice(l,l+n);a.push(r.jsx("mark",{className:"bg-primary text-primary-foreground ring-1 ring-primary/90",children:x},`${l}-${x}`)),i=l+n,l=t.indexOf(o,i)}return i<s.length&&a.push(s.slice(i)),a.length>0?a:s},bt=7,wt=s=>{if(!s)return null;const e=s.replace(/\\/g,"/");return e==="/"?"/":e.length>1?e.replace(/\/+$/,""):e},yt=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},vt=(s,e)=>{const t=re.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:a}=n,i=a===void 0?null:a,l=qe(jt),x=Ve(St),f=ht(Nt),c=Ze();let m;t[2]!==x?(m=x.map(_t).filter(Dt),t[2]=x,t[3]=m):m=t[3];const v=m;let b;t[4]!==v?(b=h=>h?v.filter(N=>Ee(h,N.normalizedPath)).sort(Ct)[0]??null:null,t[4]=v,t[5]=b):b=t[5];const p=b;let w;{let h;if(t[7]!==l||t[8]!==c||t[9]!==p||t[10]!==f||t[11]!==i){const j=new Map;for(const y of l){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]!==i?(N=y=>{if(!i)return!0;const u=Pe(y);return p(u)?.id===i},t[13]=p,t[14]=i,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=l.filter(Pt).filter(kt).filter(N).sort(C).slice(0,bt),_=y=>{const u=j.get(y.id)??[];return{session:y,children:u.map(g=>_(g)),worktree:null}};h=d.map(y=>{const u=Pe(y),g=p(u),D=yt(g),P=u?c.get(u)??null:null;return{node:_(y),projectId:g?.id??null,groupDirectory:u,secondaryMeta:{projectLabel:D,branchLabel:P&&P!==D?P:null}}}),t[7]=l,t[8]=c,t[9]=p,t[10]=f,t[11]=i,t[12]=h}else h=t[12];w=h}return w};function jt(s){return s.activeSessions}function St(s){return s.projects}function Nt(s){return s.ids}function _t(s){return{...s,normalizedPath:wt(s.path)}}function Dt(s){return s.normalizedPath}function Ct(s,e){return(e.normalizedPath?.length??0)-(s.normalizedPath?.length??0)}function Pt(s){return!s.time?.archived}function kt(s){return!s.parentID}function Zt(s){const e=re.c(18),{children:t,variant:o,scopeProjectId:n,align:a}=s,i=o===void 0?"default":o,l=n===void 0?null:n,x=a===void 0?"start":a,f=Ne(It),c=Ne(Mt);let m;e[0]!==t?(m=r.jsx(et,{asChild:!0,children:t}),e[0]=t,e[1]=m):m=e[1];const v=i==="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]!==l||e[6]!==c||e[7]!==i?(p=f?r.jsx(Lt,{onSelect:()=>c(!1),variant:i,scopeProjectId:l}):null,e[4]=f,e[5]=l,e[6]=c,e[7]=i,e[8]=p):p=e[8];let w;e[9]!==x||e[10]!==b||e[11]!==p?(w=r.jsx(tt,{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]!==c||e[15]!==m||e[16]!==w?(S=r.jsxs(st,{open:f,onOpenChange:c,modal:!1,children:[m,w]}),e[13]=f,e[14]=c,e[15]=m,e[16]=w,e[17]=S):S=e[17],S}function Mt(s){return s.setSessionDropdownOpen}function It(s){return s.isSessionDropdownOpen}function Lt(s){const e=re.c(26),{onSelect:t,variant:o,scopeProjectId:n}=s;let a;e[0]!==n?(a={scopeProjectId:n},e[0]=n,e[1]=a):a=e[1];const i=vt(!0,a),l=ke(zt),x=Ne($t),{t:f}=_e();let c;e[2]!==t||e[3]!==l||e[4]!==x?(c=()=>{x("chat"),t(),l()},e[2]=t,e[3]=l,e[4]=x,e[5]=c):c=e[5];const m=c;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]!==i||e[19]!==t||e[20]!==f||e[21]!==o?(_=i.length===0?r.jsx("div",{className:"px-3 py-4 text-center typography-meta text-muted-foreground",children:f("sessions.switcher.empty")}):i.map(u=>r.jsx(Oe,{item:u,depth:0,variant:o,expandedParents:b,toggleParent:S,closeDropdown:t},u.node.session.id)),e[17]=b,e[18]=i,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 zt(s){return s.openNewSessionDraft}function Oe(s){const e=re.c(31),{item:t,depth:o,variant:n,expandedParents:a,toggleParent:i,closeDropdown:l}=s,{node:x,secondaryMeta:f}=t,c=x.session,m=x.children.length>0;let v;e[0]!==a||e[1]!==c.id?(v=a.has(c.id),e[0]=a,e[1]=c.id,e[2]=v):v=e[2];const b=v;let p;e[3]!==m||e[4]!==c.id||e[5]!==i?(p=m?()=>i(c.id):void 0,e[3]=m,e[4]=c.id,e[5]=i,e[6]=p):p=e[6];let w;e[7]!==l||e[8]!==o||e[9]!==m||e[10]!==b||e[11]!==f||e[12]!==c||e[13]!==p||e[14]!==n?(w=r.jsx(Tt,{session:c,depth:o,variant:n,secondaryMeta:f,hasChildren:m,isExpanded:b,onToggleExpand:p,closeDropdown:l}),e[7]=l,e[8]=o,e[9]=m,e[10]=b,e[11]=f,e[12]=c,e[13]=p,e[14]=n,e[15]=w):w=e[15];let S;e[16]!==l||e[17]!==o||e[18]!==a||e[19]!==m||e[20]!==b||e[21]!==t.groupDirectory||e[22]!==t.projectId||e[23]!==x.children||e[24]!==f||e[25]!==i||e[26]!==n?(S=m&&b?x.children.map(j=>r.jsx(Oe,{item:{node:j,projectId:t.projectId,groupDirectory:t.groupDirectory,secondaryMeta:f},depth:o+1,variant:n,expandedParents:a,toggleParent:i,closeDropdown:l},j.session.id)):null,e[16]=l,e[17]=o,e[18]=a,e[19]=m,e[20]=b,e[21]=t.groupDirectory,e[22]=t.projectId,e[23]=x.children,e[24]=f,e[25]=i,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 Tt(s){const e=re.c(57),{session:t,depth:o,variant:n,secondaryMeta:a,hasChildren:i,isExpanded:l,onToggleExpand:x,closeDropdown:f}=s,{t:c}=_e(),m=ke(Et),v=ke(Ft),b=Ne(At),p=nt(t.id),w=rt(t.id),S=m===t.id;let h;e[0]!==t.title||e[1]!==c?(h=t.title?.trim()||c("sessions.sidebar.session.untitled"),e[0]=t.title,e[1]=c,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=gt(g),e[6]=g,e[7]=D):D=e[7];const P=D;let M;e[8]!==a?.projectLabel?(M=a?.projectLabel?.trim()||null,e[8]=a?.projectLabel,e[9]=M):M=e[9];const L=M;let W;e[10]!==a?.branchLabel?(W=a?.branchLabel?.trim()||null,e[10]=a?.branchLabel,e[11]=W):W=e[11];const B=W,G=B&&B!=="HEAD"?B:null;let J;e[12]!==f||e[13]!==S||e[14]!==t||e[15]!==v?(J=()=>{if(S){f();return}const k=Pe(t);v(t.id,k??null),f()},e[12]=f,e[13]=S,e[14]=t,e[15]=v,e[16]=J):J=e[16];const Z=J;let K;e[17]!==Z?(K=k=>{if(k.target?.closest("[data-switcher-expand]")){k.preventDefault();return}Z()},e[17]=Z,e[18]=K):K=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 Y;e[20]!==te?(Y={paddingLeft:te},e[20]=te,e[21]=Y):Y=e[21];let H;e[22]!==i||e[23]!==l||e[24]!==x||e[25]!==c||e[26]!==n?(H=n==="compact"&&i?r.jsx("span",{role:"button",tabIndex:-1,"data-switcher-expand":!0,onClick:k=>{k.preventDefault(),k.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":c(l?"sessions.sidebar.session.subsessions.collapse":"sessions.sidebar.session.subsessions.expand"),children:l?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]=i,e[23]=l,e[24]=x,e[25]=c,e[26]=n,e[27]=H):H=e[27];const Q=S?"text-primary":"text-foreground";let A;e[28]!==Q?(A=q("truncate text-[14px] font-normal leading-tight",Q),e[28]=Q,e[29]=A):A=e[29];let F;e[30]!==j||e[31]!==A?(F=r.jsx("span",{className:A,children:j}),e[30]=j,e[31]=A,e[32]=F):F=e[32];let R;e[33]!==H||e[34]!==F?(R=r.jsxs("div",{className:"flex min-w-0 items-center gap-1.5",children:[H,F]}),e[33]=H,e[34]=F,e[35]=R):R=e[35];let z;e[36]!==G||e[37]!==i||e[38]!==l||e[39]!==x||e[40]!==L||e[41]!==c||e[42]!==P||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:[i?r.jsx("span",{role:"button",tabIndex:-1,"data-switcher-expand":!0,onClick:k=>{k.preventDefault(),k.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":c(l?"sessions.sidebar.session.subsessions.collapse":"sessions.sidebar.session.subsessions.expand"),children:l?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:P}),L?r.jsx("span",{className:"truncate",children:L}):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]=i,e[38]=l,e[39]=x,e[40]=L,e[41]=c,e[42]=P,e[43]=n,e[44]=z):z=e[44];let I;e[45]!==R||e[46]!==z?(I=r.jsxs("div",{className:"flex min-w-0 flex-1 flex-col gap-0.5",children:[R,z]}),e[45]=R,e[46]=z,e[47]=I):I=e[47];let $;e[48]!==_||e[49]!==y||e[50]!==c?($=_||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":c("sessions.sidebar.session.status.active"),title:c("sessions.sidebar.session.status.active")}):r.jsx("span",{className:"h-1.5 w-1.5 rounded-full bg-[var(--status-info)]","aria-label":c("sessions.sidebar.session.status.unread"),title:c("sessions.sidebar.session.status.unread")})}):null,e[48]=_,e[49]=y,e[50]=c,e[51]=$):$=e[51];let T;return e[52]!==Y||e[53]!==I||e[54]!==$||e[55]!==K?(T=r.jsxs(Ae,{onClick:K,"data-slot":"session-switcher-item",className:ee,style:Y,children:[I,$]}),e[52]=Y,e[53]=I,e[54]=$,e[55]=K,e[56]=T):T=e[56],T}function At(s){return s.notifyOnSubtasks}function Ft(s){return s.setCurrentSession}function Et(s){return s.currentSessionId}export{Wt as C,Zt as S,Gt as W,Te as a,Yt as b,Kt as c,Ht as d,Vt as e,qt as f,Rt as g,Jt as h,Qt as i,gt as j,Le as n,Xt as r,ht as u};