Skip to content

Commit 3f9f73a

Browse files
fix(web): terminal and dictation settings render inside the settings layout (#1910)
## Problem Settings → Terminal and Settings → Dictation crash to the error boundary: `Settings scope must be read inside SettingsScopeProvider.` Upstream `9db433f4bab` moved settings pages under the `_chat.settings` layout, which provides the scope. The two fork pages stayed root-level routes, so they render outside it. ## Change - **Routes:** moved under `_chat.settings.*` - **Route tree:** regenerated - **Guard test:** each nav path has a layout child The test fails when a later upstream sync strands a fork settings page outside the layout. ## Scope and approval Closes #1908. ## Verification - `vp run check:changed` → exit 0 - `vp run fork:ci` → exit 0 - Dark dev Electron: all 22 settings pages open **Before** ![05-terminal-settings.png](https://github.com/user-attachments/assets/7effbe44-365b-45b7-a7ed-f265a5eec5c6) ![06-dictation-settings.png](https://github.com/user-attachments/assets/7eff6bce-d93f-4ab0-81ea-6a0c2339802d) **After** ![20-fixed-Terminal.png](https://github.com/user-attachments/assets/b8f1e0dd-ef49-4e06-b460-5d950ed117c9) ![20-fixed-Dictation.png](https://github.com/user-attachments/assets/97dbf595-f9b0-4884-81d5-b4f33f33795b) Claude Opus 5.5, Claude Code. ## Fork trailers Fork-Domain: zmux-estate Fork-Tier: bugfix Fork-Upstreamable: no Co-authored-by: donjor <[email protected]>
1 parent 9c32ad7 commit 3f9f73a

4 files changed

Lines changed: 64 additions & 45 deletions

File tree

‎apps/web/src/components/settings/settingsSearch.fork.test.ts‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
import { describe, expect, it } from "vite-plus/test";
22

3-
import { searchSettings } from "./settingsSearch";
3+
import { SETTINGS_NAV_GROUPS, searchSettings } from "./settingsSearch";
4+
5+
// Pages outside the `_chat.settings` layout lose SettingsScopeProvider and crash
6+
// (RSI-Software/t3code-hyprws#1908). Keys only; no route modules load.
7+
const settingsRouteFiles = new Set(
8+
Object.keys(import.meta.glob("../../routes/_chat.settings.*.tsx")).map((file) =>
9+
file.replace("../../routes/_chat.settings.", "/settings/").replace(/\.tsx$/, ""),
10+
),
11+
);
12+
13+
describe("settings nav routes (fork)", () => {
14+
it("renders every nav page inside the settings layout", () => {
15+
const paths = SETTINGS_NAV_GROUPS.flatMap((group) => group.paths);
16+
expect(paths.filter((path) => !settingsRouteFiles.has(path))).toEqual([]);
17+
});
18+
});
419

520
// Fork-owned assertions for the external workspace symlinks settings entry
621
// (RSI-Software/t3code-hyprws#951, reshaping 565594bd75). The upstream search

‎apps/web/src/routeTree.gen.ts‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ import { Route as ConnectAgentRouteImport } from './routes/connect-agent'
1616
import { Route as ConnectRouteImport } from './routes/connect'
1717
import { Route as ChatRouteImport } from './routes/_chat'
1818
import { Route as ChatIndexRouteImport } from './routes/_chat.index'
19-
import { Route as SettingsTerminalRouteImport } from './routes/settings.terminal'
20-
import { Route as SettingsDictationRouteImport } from './routes/settings.dictation'
2119
import { Route as ProjectsProjectKeyRouteImport } from './routes/projects.$projectKey'
2220
import { Route as ProjectSplatRouteImport } from './routes/project.$'
2321
import { Route as ChatUsageRouteImport } from './routes/_chat.usage'
@@ -27,6 +25,7 @@ import { Route as ChatNewRouteImport } from './routes/_chat.new'
2725
import { Route as ChatIssuesRouteImport } from './routes/_chat.issues'
2826
import { Route as ChatSettingsWorktreesRouteImport } from './routes/_chat.settings.worktrees'
2927
import { Route as ChatSettingsThreadsRouteImport } from './routes/_chat.settings.threads'
28+
import { Route as ChatSettingsTerminalRouteImport } from './routes/_chat.settings.terminal'
3029
import { Route as ChatSettingsStorageRouteImport } from './routes/_chat.settings.storage'
3130
import { Route as ChatSettingsSourceControlRouteImport } from './routes/_chat.settings.source-control'
3231
import { Route as ChatSettingsSnapShotRouteImport } from './routes/_chat.settings.snap-shot'
@@ -40,6 +39,7 @@ import { Route as ChatSettingsKeybindingsRouteImport } from './routes/_chat.sett
4039
import { Route as ChatSettingsIntegrationsRouteImport } from './routes/_chat.settings.integrations'
4140
import { Route as ChatSettingsGeneralRouteImport } from './routes/_chat.settings.general'
4241
import { Route as ChatSettingsDiffsRouteImport } from './routes/_chat.settings.diffs'
42+
import { Route as ChatSettingsDictationRouteImport } from './routes/_chat.settings.dictation'
4343
import { Route as ChatSettingsDiagnosticsRouteImport } from './routes/_chat.settings.diagnostics'
4444
import { Route as ChatSettingsDevicesRouteImport } from './routes/_chat.settings.devices'
4545
import { Route as ChatSettingsConnectionsRouteImport } from './routes/_chat.settings.connections'
@@ -87,16 +87,6 @@ const ChatIndexRoute = ChatIndexRouteImport.update({
8787
path: '/',
8888
getParentRoute: () => ChatRoute,
8989
} as any)
90-
const SettingsTerminalRoute = SettingsTerminalRouteImport.update({
91-
id: '/settings/terminal',
92-
path: '/settings/terminal',
93-
getParentRoute: () => rootRouteImport,
94-
} as any)
95-
const SettingsDictationRoute = SettingsDictationRouteImport.update({
96-
id: '/settings/dictation',
97-
path: '/settings/dictation',
98-
getParentRoute: () => rootRouteImport,
99-
} as any)
10090
const ProjectsProjectKeyRoute = ProjectsProjectKeyRouteImport.update({
10191
id: '/projects/$projectKey',
10292
path: '/projects/$projectKey',
@@ -142,6 +132,11 @@ const ChatSettingsThreadsRoute = ChatSettingsThreadsRouteImport.update({
142132
path: '/threads',
143133
getParentRoute: () => ChatSettingsRoute,
144134
} as any)
135+
const ChatSettingsTerminalRoute = ChatSettingsTerminalRouteImport.update({
136+
id: '/terminal',
137+
path: '/terminal',
138+
getParentRoute: () => ChatSettingsRoute,
139+
} as any)
145140
const ChatSettingsStorageRoute = ChatSettingsStorageRouteImport.update({
146141
id: '/storage',
147142
path: '/storage',
@@ -211,6 +206,11 @@ const ChatSettingsDiffsRoute = ChatSettingsDiffsRouteImport.update({
211206
path: '/diffs',
212207
getParentRoute: () => ChatSettingsRoute,
213208
} as any)
209+
const ChatSettingsDictationRoute = ChatSettingsDictationRouteImport.update({
210+
id: '/dictation',
211+
path: '/dictation',
212+
getParentRoute: () => ChatSettingsRoute,
213+
} as any)
214214
const ChatSettingsDiagnosticsRoute = ChatSettingsDiagnosticsRouteImport.update({
215215
id: '/diagnostics',
216216
path: '/diagnostics',
@@ -287,8 +287,6 @@ export interface FileRoutesByFullPath {
287287
'/usage': typeof ChatUsageRoute
288288
'/project/$': typeof ProjectSplatRoute
289289
'/projects/$projectKey': typeof ProjectsProjectKeyRoute
290-
'/settings/dictation': typeof SettingsDictationRoute
291-
'/settings/terminal': typeof SettingsTerminalRoute
292290
'/$environmentId/$threadId': typeof ChatEnvironmentIdThreadIdRoute
293291
'/draft/$draftId': typeof ChatDraftDraftIdRoute
294292
'/settings/about': typeof ChatSettingsAboutRoute
@@ -301,6 +299,7 @@ export interface FileRoutesByFullPath {
301299
'/settings/connections': typeof ChatSettingsConnectionsRoute
302300
'/settings/devices': typeof ChatSettingsDevicesRoute
303301
'/settings/diagnostics': typeof ChatSettingsDiagnosticsRoute
302+
'/settings/dictation': typeof ChatSettingsDictationRoute
304303
'/settings/diffs': typeof ChatSettingsDiffsRoute
305304
'/settings/general': typeof ChatSettingsGeneralRoute
306305
'/settings/integrations': typeof ChatSettingsIntegrationsRoute
@@ -314,6 +313,7 @@ export interface FileRoutesByFullPath {
314313
'/settings/snap-shot': typeof ChatSettingsSnapShotRoute
315314
'/settings/source-control': typeof ChatSettingsSourceControlRoute
316315
'/settings/storage': typeof ChatSettingsStorageRoute
316+
'/settings/terminal': typeof ChatSettingsTerminalRoute
317317
'/settings/threads': typeof ChatSettingsThreadsRoute
318318
'/settings/worktrees': typeof ChatSettingsWorktreesRoute
319319
}
@@ -330,8 +330,6 @@ export interface FileRoutesByTo {
330330
'/usage': typeof ChatUsageRoute
331331
'/project/$': typeof ProjectSplatRoute
332332
'/projects/$projectKey': typeof ProjectsProjectKeyRoute
333-
'/settings/dictation': typeof SettingsDictationRoute
334-
'/settings/terminal': typeof SettingsTerminalRoute
335333
'/': typeof ChatIndexRoute
336334
'/$environmentId/$threadId': typeof ChatEnvironmentIdThreadIdRoute
337335
'/draft/$draftId': typeof ChatDraftDraftIdRoute
@@ -345,6 +343,7 @@ export interface FileRoutesByTo {
345343
'/settings/connections': typeof ChatSettingsConnectionsRoute
346344
'/settings/devices': typeof ChatSettingsDevicesRoute
347345
'/settings/diagnostics': typeof ChatSettingsDiagnosticsRoute
346+
'/settings/dictation': typeof ChatSettingsDictationRoute
348347
'/settings/diffs': typeof ChatSettingsDiffsRoute
349348
'/settings/general': typeof ChatSettingsGeneralRoute
350349
'/settings/integrations': typeof ChatSettingsIntegrationsRoute
@@ -358,6 +357,7 @@ export interface FileRoutesByTo {
358357
'/settings/snap-shot': typeof ChatSettingsSnapShotRoute
359358
'/settings/source-control': typeof ChatSettingsSourceControlRoute
360359
'/settings/storage': typeof ChatSettingsStorageRoute
360+
'/settings/terminal': typeof ChatSettingsTerminalRoute
361361
'/settings/threads': typeof ChatSettingsThreadsRoute
362362
'/settings/worktrees': typeof ChatSettingsWorktreesRoute
363363
}
@@ -376,8 +376,6 @@ export interface FileRoutesById {
376376
'/_chat/usage': typeof ChatUsageRoute
377377
'/project/$': typeof ProjectSplatRoute
378378
'/projects/$projectKey': typeof ProjectsProjectKeyRoute
379-
'/settings/dictation': typeof SettingsDictationRoute
380-
'/settings/terminal': typeof SettingsTerminalRoute
381379
'/_chat/': typeof ChatIndexRoute
382380
'/_chat/$environmentId/$threadId': typeof ChatEnvironmentIdThreadIdRoute
383381
'/_chat/draft/$draftId': typeof ChatDraftDraftIdRoute
@@ -391,6 +389,7 @@ export interface FileRoutesById {
391389
'/_chat/settings/connections': typeof ChatSettingsConnectionsRoute
392390
'/_chat/settings/devices': typeof ChatSettingsDevicesRoute
393391
'/_chat/settings/diagnostics': typeof ChatSettingsDiagnosticsRoute
392+
'/_chat/settings/dictation': typeof ChatSettingsDictationRoute
394393
'/_chat/settings/diffs': typeof ChatSettingsDiffsRoute
395394
'/_chat/settings/general': typeof ChatSettingsGeneralRoute
396395
'/_chat/settings/integrations': typeof ChatSettingsIntegrationsRoute
@@ -404,6 +403,7 @@ export interface FileRoutesById {
404403
'/_chat/settings/snap-shot': typeof ChatSettingsSnapShotRoute
405404
'/_chat/settings/source-control': typeof ChatSettingsSourceControlRoute
406405
'/_chat/settings/storage': typeof ChatSettingsStorageRoute
406+
'/_chat/settings/terminal': typeof ChatSettingsTerminalRoute
407407
'/_chat/settings/threads': typeof ChatSettingsThreadsRoute
408408
'/_chat/settings/worktrees': typeof ChatSettingsWorktreesRoute
409409
}
@@ -423,8 +423,6 @@ export interface FileRouteTypes {
423423
| '/usage'
424424
| '/project/$'
425425
| '/projects/$projectKey'
426-
| '/settings/dictation'
427-
| '/settings/terminal'
428426
| '/$environmentId/$threadId'
429427
| '/draft/$draftId'
430428
| '/settings/about'
@@ -437,6 +435,7 @@ export interface FileRouteTypes {
437435
| '/settings/connections'
438436
| '/settings/devices'
439437
| '/settings/diagnostics'
438+
| '/settings/dictation'
440439
| '/settings/diffs'
441440
| '/settings/general'
442441
| '/settings/integrations'
@@ -450,6 +449,7 @@ export interface FileRouteTypes {
450449
| '/settings/snap-shot'
451450
| '/settings/source-control'
452451
| '/settings/storage'
452+
| '/settings/terminal'
453453
| '/settings/threads'
454454
| '/settings/worktrees'
455455
fileRoutesByTo: FileRoutesByTo
@@ -466,8 +466,6 @@ export interface FileRouteTypes {
466466
| '/usage'
467467
| '/project/$'
468468
| '/projects/$projectKey'
469-
| '/settings/dictation'
470-
| '/settings/terminal'
471469
| '/'
472470
| '/$environmentId/$threadId'
473471
| '/draft/$draftId'
@@ -481,6 +479,7 @@ export interface FileRouteTypes {
481479
| '/settings/connections'
482480
| '/settings/devices'
483481
| '/settings/diagnostics'
482+
| '/settings/dictation'
484483
| '/settings/diffs'
485484
| '/settings/general'
486485
| '/settings/integrations'
@@ -494,6 +493,7 @@ export interface FileRouteTypes {
494493
| '/settings/snap-shot'
495494
| '/settings/source-control'
496495
| '/settings/storage'
496+
| '/settings/terminal'
497497
| '/settings/threads'
498498
| '/settings/worktrees'
499499
id:
@@ -511,8 +511,6 @@ export interface FileRouteTypes {
511511
| '/_chat/usage'
512512
| '/project/$'
513513
| '/projects/$projectKey'
514-
| '/settings/dictation'
515-
| '/settings/terminal'
516514
| '/_chat/'
517515
| '/_chat/$environmentId/$threadId'
518516
| '/_chat/draft/$draftId'
@@ -526,6 +524,7 @@ export interface FileRouteTypes {
526524
| '/_chat/settings/connections'
527525
| '/_chat/settings/devices'
528526
| '/_chat/settings/diagnostics'
527+
| '/_chat/settings/dictation'
529528
| '/_chat/settings/diffs'
530529
| '/_chat/settings/general'
531530
| '/_chat/settings/integrations'
@@ -539,6 +538,7 @@ export interface FileRouteTypes {
539538
| '/_chat/settings/snap-shot'
540539
| '/_chat/settings/source-control'
541540
| '/_chat/settings/storage'
541+
| '/_chat/settings/terminal'
542542
| '/_chat/settings/threads'
543543
| '/_chat/settings/worktrees'
544544
fileRoutesById: FileRoutesById
@@ -552,8 +552,6 @@ export interface RootRouteChildren {
552552
WelcomeRoute: typeof WelcomeRoute
553553
ProjectSplatRoute: typeof ProjectSplatRoute
554554
ProjectsProjectKeyRoute: typeof ProjectsProjectKeyRoute
555-
SettingsDictationRoute: typeof SettingsDictationRoute
556-
SettingsTerminalRoute: typeof SettingsTerminalRoute
557555
}
558556

559557
declare module '@tanstack/react-router' {
@@ -607,20 +605,6 @@ declare module '@tanstack/react-router' {
607605
preLoaderRoute: typeof ChatIndexRouteImport
608606
parentRoute: typeof ChatRoute
609607
}
610-
'/settings/terminal': {
611-
id: '/settings/terminal'
612-
path: '/settings/terminal'
613-
fullPath: '/settings/terminal'
614-
preLoaderRoute: typeof SettingsTerminalRouteImport
615-
parentRoute: typeof rootRouteImport
616-
}
617-
'/settings/dictation': {
618-
id: '/settings/dictation'
619-
path: '/settings/dictation'
620-
fullPath: '/settings/dictation'
621-
preLoaderRoute: typeof SettingsDictationRouteImport
622-
parentRoute: typeof rootRouteImport
623-
}
624608
'/projects/$projectKey': {
625609
id: '/projects/$projectKey'
626610
path: '/projects/$projectKey'
@@ -684,6 +668,13 @@ declare module '@tanstack/react-router' {
684668
preLoaderRoute: typeof ChatSettingsThreadsRouteImport
685669
parentRoute: typeof ChatSettingsRoute
686670
}
671+
'/_chat/settings/terminal': {
672+
id: '/_chat/settings/terminal'
673+
path: '/terminal'
674+
fullPath: '/settings/terminal'
675+
preLoaderRoute: typeof ChatSettingsTerminalRouteImport
676+
parentRoute: typeof ChatSettingsRoute
677+
}
687678
'/_chat/settings/storage': {
688679
id: '/_chat/settings/storage'
689680
path: '/storage'
@@ -775,6 +766,13 @@ declare module '@tanstack/react-router' {
775766
preLoaderRoute: typeof ChatSettingsDiffsRouteImport
776767
parentRoute: typeof ChatSettingsRoute
777768
}
769+
'/_chat/settings/dictation': {
770+
id: '/_chat/settings/dictation'
771+
path: '/dictation'
772+
fullPath: '/settings/dictation'
773+
preLoaderRoute: typeof ChatSettingsDictationRouteImport
774+
parentRoute: typeof ChatSettingsRoute
775+
}
778776
'/_chat/settings/diagnostics': {
779777
id: '/_chat/settings/diagnostics'
780778
path: '/diagnostics'
@@ -873,6 +871,7 @@ interface ChatSettingsRouteChildren {
873871
ChatSettingsConnectionsRoute: typeof ChatSettingsConnectionsRoute
874872
ChatSettingsDevicesRoute: typeof ChatSettingsDevicesRoute
875873
ChatSettingsDiagnosticsRoute: typeof ChatSettingsDiagnosticsRoute
874+
ChatSettingsDictationRoute: typeof ChatSettingsDictationRoute
876875
ChatSettingsDiffsRoute: typeof ChatSettingsDiffsRoute
877876
ChatSettingsGeneralRoute: typeof ChatSettingsGeneralRoute
878877
ChatSettingsIntegrationsRoute: typeof ChatSettingsIntegrationsRoute
@@ -886,6 +885,7 @@ interface ChatSettingsRouteChildren {
886885
ChatSettingsSnapShotRoute: typeof ChatSettingsSnapShotRoute
887886
ChatSettingsSourceControlRoute: typeof ChatSettingsSourceControlRoute
888887
ChatSettingsStorageRoute: typeof ChatSettingsStorageRoute
888+
ChatSettingsTerminalRoute: typeof ChatSettingsTerminalRoute
889889
ChatSettingsThreadsRoute: typeof ChatSettingsThreadsRoute
890890
ChatSettingsWorktreesRoute: typeof ChatSettingsWorktreesRoute
891891
}
@@ -901,6 +901,7 @@ const ChatSettingsRouteChildren: ChatSettingsRouteChildren = {
901901
ChatSettingsConnectionsRoute: ChatSettingsConnectionsRoute,
902902
ChatSettingsDevicesRoute: ChatSettingsDevicesRoute,
903903
ChatSettingsDiagnosticsRoute: ChatSettingsDiagnosticsRoute,
904+
ChatSettingsDictationRoute: ChatSettingsDictationRoute,
904905
ChatSettingsDiffsRoute: ChatSettingsDiffsRoute,
905906
ChatSettingsGeneralRoute: ChatSettingsGeneralRoute,
906907
ChatSettingsIntegrationsRoute: ChatSettingsIntegrationsRoute,
@@ -914,6 +915,7 @@ const ChatSettingsRouteChildren: ChatSettingsRouteChildren = {
914915
ChatSettingsSnapShotRoute: ChatSettingsSnapShotRoute,
915916
ChatSettingsSourceControlRoute: ChatSettingsSourceControlRoute,
916917
ChatSettingsStorageRoute: ChatSettingsStorageRoute,
918+
ChatSettingsTerminalRoute: ChatSettingsTerminalRoute,
917919
ChatSettingsThreadsRoute: ChatSettingsThreadsRoute,
918920
ChatSettingsWorktreesRoute: ChatSettingsWorktreesRoute,
919921
}
@@ -955,8 +957,6 @@ const rootRouteChildren: RootRouteChildren = {
955957
WelcomeRoute: WelcomeRoute,
956958
ProjectSplatRoute: ProjectSplatRoute,
957959
ProjectsProjectKeyRoute: ProjectsProjectKeyRoute,
958-
SettingsDictationRoute: SettingsDictationRoute,
959-
SettingsTerminalRoute: SettingsTerminalRoute,
960960
}
961961
export const routeTree = rootRouteImport
962962
._addFileChildren(rootRouteChildren)

apps/web/src/routes/settings.dictation.tsx renamed to apps/web/src/routes/_chat.settings.dictation.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,6 @@ function DictationSettingsRoute() {
2727
);
2828
}
2929

30-
export const Route = createFileRoute("/settings/dictation")({ component: DictationSettingsRoute });
30+
export const Route = createFileRoute("/_chat/settings/dictation")({
31+
component: DictationSettingsRoute,
32+
});

apps/web/src/routes/settings.terminal.tsx renamed to apps/web/src/routes/_chat.settings.terminal.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@ function TerminalSettingsRoute() {
1212
);
1313
}
1414

15-
export const Route = createFileRoute("/settings/terminal")({ component: TerminalSettingsRoute });
15+
export const Route = createFileRoute("/_chat/settings/terminal")({
16+
component: TerminalSettingsRoute,
17+
});

0 commit comments

Comments
 (0)