Skip to content

Open-source AI teammates in Slack, Teams, Discord, Telegram and Mattermost. Self-host it, with any agent harness and any model.

fix(switchdash): break the import cycle that leaves view-registry half-built

Louis Amaudruz80703d7ad63d
diff --git a/dash/apps/switchdash-desktop/src/renderer/app/app-menu-events.tsx b/dash/apps/switchdash-desktop/src/renderer/app/app-menu-events.tsx
index 5391164d6..09ce7c037 100644
--- a/dash/apps/switchdash-desktop/src/renderer/app/app-menu-events.tsx
+++ b/dash/apps/switchdash-desktop/src/renderer/app/app-menu-events.tsx
@@ -1,7 +1,8 @@
import { useEffect } from 'react';
import { toast } from '@renderer/lib/hooks/use-toast';
import { events, rpc } from '@renderer/lib/ipc';
-import { useNavigate, useWorkspaceSlots } from '@renderer/lib/layout/navigation-provider';
+import { useNavigate } from '@renderer/lib/layout/navigation-provider';
+import { useWorkspaceSlots } from '@renderer/lib/layout/workspace-slots';
import { toggleSettingsView } from '@renderer/lib/layout/settings-toggle';
import { useShowModal } from '@renderer/lib/modal/modal-provider';
import {
diff --git a/dash/apps/switchdash-desktop/src/renderer/app/workspace.tsx b/dash/apps/switchdash-desktop/src/renderer/app/workspace.tsx
index 217f4ec9e..88e9ae1e3 100644
--- a/dash/apps/switchdash-desktop/src/renderer/app/workspace.tsx
+++ b/dash/apps/switchdash-desktop/src/renderer/app/workspace.tsx
@@ -5,9 +5,9 @@ import { AppKeyboardShortcuts } from '@renderer/lib/components/app-keyboard-shor
import { MonacoKeyboardBridge } from '@renderer/lib/components/monaco-keyboard-bridge';
import { useTheme } from '@renderer/lib/hooks/useTheme';
import {
- useWorkspaceSlots,
useWorkspaceWrapParams,
} from '@renderer/lib/layout/navigation-provider';
+import { useWorkspaceSlots } from '@renderer/lib/layout/workspace-slots';
import { WorkspaceContentLayout, WorkspaceLayout } from '@renderer/lib/layout/workspace-layout';
import { Toaster } from '@renderer/lib/ui/toaster';
diff --git a/dash/apps/switchdash-desktop/src/renderer/features/sessions/hooks/use-is-active-session.ts b/dash/apps/switchdash-desktop/src/renderer/features/sessions/hooks/use-is-active-session.ts
index 2898bd395..014d592e9 100644
--- a/dash/apps/switchdash-desktop/src/renderer/features/sessions/hooks/use-is-active-session.ts
+++ b/dash/apps/switchdash-desktop/src/renderer/features/sessions/hooks/use-is-active-session.ts
@@ -1,7 +1,10 @@
-import { useParams, useWorkspaceSlots } from '@renderer/lib/layout/navigation-provider';
+import { useCurrentViewId, useParams } from '@renderer/lib/layout/navigation-provider';
export function useIsActiveSession(sessionId: string): boolean {
- const { currentView } = useWorkspaceSlots();
+ // Deliberately not useWorkspaceSlots: this hook is reachable from the session
+ // view, so loading the view registry here would make the registry depend on
+ // its own members being initialised first.
+ const currentView = useCurrentViewId();
const { params } = useParams('session');
return currentView === 'session' && params.sessionId === sessionId;
}
diff --git a/dash/apps/switchdash-desktop/src/renderer/features/sidebar/agent-item.tsx b/dash/apps/switchdash-desktop/src/renderer/features/sidebar/agent-item.tsx
index 63d8af0f5..a77b16eef 100644
--- a/dash/apps/switchdash-desktop/src/renderer/features/sidebar/agent-item.tsx
+++ b/dash/apps/switchdash-desktop/src/renderer/features/sidebar/agent-item.tsx
@@ -25,8 +25,8 @@ import { rpc } from '@renderer/lib/ipc';
import {
useNavigate,
useParams,
- useWorkspaceSlots,
} from '@renderer/lib/layout/navigation-provider';
+import { useWorkspaceSlots } from '@renderer/lib/layout/workspace-slots';
import { useShowModal } from '@renderer/lib/modal/modal-provider';
import { sidebarStore } from '@renderer/lib/stores/app-state';
import {
diff --git a/dash/apps/switchdash-desktop/src/renderer/features/sidebar/left-sidebar.tsx b/dash/apps/switchdash-desktop/src/renderer/features/sidebar/left-sidebar.tsx
index c13768392..5c4671053 100644
--- a/dash/apps/switchdash-desktop/src/renderer/features/sidebar/left-sidebar.tsx
+++ b/dash/apps/switchdash-desktop/src/renderer/features/sidebar/left-sidebar.tsx
@@ -4,8 +4,8 @@ import React from 'react';
import {
isCurrentView,
useNavigate,
- useWorkspaceSlots,
} from '@renderer/lib/layout/navigation-provider';
+import { useWorkspaceSlots } from '@renderer/lib/layout/workspace-slots';
import { BoundShortcut } from '@renderer/lib/ui/shortcut';
import { cn } from '@renderer/utils/utils';
import { ServersSidebarSection } from '../switch-servers/ServersSidebarSection';
diff --git a/dash/apps/switchdash-desktop/src/renderer/features/sidebar/session-item.tsx b/dash/apps/switchdash-desktop/src/renderer/features/sidebar/session-item.tsx
index 3cb274ce8..1f7999be0 100644
--- a/dash/apps/switchdash-desktop/src/renderer/features/sidebar/session-item.tsx
+++ b/dash/apps/switchdash-desktop/src/renderer/features/sidebar/session-item.tsx
@@ -10,8 +10,8 @@ import { SessionSidebarTrailingSlot } from '@renderer/features/sidebar/session-s
import {
useNavigate,
useParams,
- useWorkspaceSlots,
} from '@renderer/lib/layout/navigation-provider';
+import { useWorkspaceSlots } from '@renderer/lib/layout/workspace-slots';
import { useShowModal } from '@renderer/lib/modal/modal-provider';
import { sidebarStore } from '@renderer/lib/stores/app-state';
import { cn } from '@renderer/utils/utils';
diff --git a/dash/apps/switchdash-desktop/src/renderer/features/sidebar/sidebar-search-trigger.tsx b/dash/apps/switchdash-desktop/src/renderer/features/sidebar/sidebar-search-trigger.tsx
index 6f9ff19b2..6fca11f81 100644
--- a/dash/apps/switchdash-desktop/src/renderer/features/sidebar/sidebar-search-trigger.tsx
+++ b/dash/apps/switchdash-desktop/src/renderer/features/sidebar/sidebar-search-trigger.tsx
@@ -1,6 +1,7 @@
import { Search } from 'lucide-react';
import { observer } from 'mobx-react-lite';
-import { useParams, useWorkspaceSlots } from '@renderer/lib/layout/navigation-provider';
+import { useParams } from '@renderer/lib/layout/navigation-provider';
+import { useWorkspaceSlots } from '@renderer/lib/layout/workspace-slots';
import { useShowModal } from '@renderer/lib/modal/modal-provider';
import { BoundShortcut } from '@renderer/lib/ui/shortcut';
import { SidebarMenuButton } from './sidebar-primitives';
diff --git a/dash/apps/switchdash-desktop/src/renderer/features/switch-servers/ServersSidebarSection.tsx b/dash/apps/switchdash-desktop/src/renderer/features/switch-servers/ServersSidebarSection.tsx
index a4aa8ba2f..8d2d733d2 100644
--- a/dash/apps/switchdash-desktop/src/renderer/features/switch-servers/ServersSidebarSection.tsx
+++ b/dash/apps/switchdash-desktop/src/renderer/features/switch-servers/ServersSidebarSection.tsx
@@ -17,8 +17,8 @@ import {
isCurrentView,
useNavigate,
useParams,
- useWorkspaceSlots,
} from '@renderer/lib/layout/navigation-provider';
+import { useWorkspaceSlots } from '@renderer/lib/layout/workspace-slots';
import { useShowModal } from '@renderer/lib/modal/modal-provider';
import { buttonVariants } from '@renderer/lib/ui/button';
import {
diff --git a/dash/apps/switchdash-desktop/src/renderer/lib/commands/registry.ts b/dash/apps/switchdash-desktop/src/renderer/lib/commands/registry.ts
index df393ab39..068d4f9ed 100644
--- a/dash/apps/switchdash-desktop/src/renderer/lib/commands/registry.ts
+++ b/dash/apps/switchdash-desktop/src/renderer/lib/commands/registry.ts
@@ -1,5 +1,4 @@
import { comparer, makeAutoObservable, reaction } from 'mobx';
-import { views } from '@renderer/app/view-registry';
import type { ShortcutSettingsKey } from '@renderer/lib/hooks/useKeyboardShortcuts';
import { appState } from '@renderer/lib/stores/app-state';
import { SCOPE_LEVELS, type AppCommand, type CommandProvider, type ScopeId } from './types';
@@ -66,12 +65,22 @@ class CommandRegistry {
export const commandRegistry = new CommandRegistry();
+export type ViewCommandProviders = Record<
+ string,
+ { commandProvider?: (params: unknown) => CommandProvider }
+>;
+
/**
* Wires a MobX reaction that keeps the session-scope CommandProvider in sync
* with the active view. Must be called once at app startup (after navigation
* state is restored). No React dependency — runs entirely off MobX observables.
+ *
+ * The view map is passed in rather than imported: this module is reachable from
+ * the modal tree, so importing the registry's value here closed a cycle back
+ * into view-registry and left its initialisation order load-order dependent.
+ * The caller is the app entry point, which already owns the registry.
*/
-export function setupViewCommandProvider(): void {
+export function setupViewCommandProvider(views: ViewCommandProviders): void {
reaction(
() => {
const viewId = appState.navigation.currentViewId;
@@ -79,9 +88,7 @@ export function setupViewCommandProvider(): void {
},
({ viewId, params }) => {
commandRegistry.unregister('session');
- const def = (
- views as unknown as Record<string, { commandProvider?: (p: unknown) => CommandProvider }>
- )[viewId];
+ const def = views[viewId];
if (def?.commandProvider) commandRegistry.register(def.commandProvider(params));
},
{ fireImmediately: true, equals: comparer.structural }
diff --git a/dash/apps/switchdash-desktop/src/renderer/lib/components/app-keyboard-shortcuts.tsx b/dash/apps/switchdash-desktop/src/renderer/lib/components/app-keyboard-shortcuts.tsx
index eed0b354f..3b6c164ba 100644
--- a/dash/apps/switchdash-desktop/src/renderer/lib/components/app-keyboard-shortcuts.tsx
+++ b/dash/apps/switchdash-desktop/src/renderer/lib/components/app-keyboard-shortcuts.tsx
@@ -8,8 +8,8 @@ import { useWorkspaceLayoutContext } from '@renderer/lib/layout/layout-provider'
import {
useNavigate,
useParams,
- useWorkspaceSlots,
} from '@renderer/lib/layout/navigation-provider';
+import { useWorkspaceSlots } from '@renderer/lib/layout/workspace-slots';
import { useShowModal } from '@renderer/lib/modal/modal-provider';
import { modalStore } from '@renderer/lib/modal/modal-store';
diff --git a/dash/apps/switchdash-desktop/src/renderer/lib/layout/navigation-provider.tsx b/dash/apps/switchdash-desktop/src/renderer/lib/layout/navigation-provider.tsx
index a22b66bc2..6f020c14a 100644
--- a/dash/apps/switchdash-desktop/src/renderer/lib/layout/navigation-provider.tsx
+++ b/dash/apps/switchdash-desktop/src/renderer/lib/layout/navigation-provider.tsx
@@ -1,11 +1,8 @@
import { useObserver } from 'mobx-react-lite';
-import { Fragment, useCallback, type ComponentType, type ReactNode } from 'react';
-import {
- views,
- type ViewDefinition,
- type ViewId,
- type WrapParams,
-} from '@renderer/app/view-registry';
+import { useCallback, type ComponentType, type ReactNode } from 'react';
+// Type-only, and it must stay that way: importing the registry's value here
+// would close a cycle back through every view module. See workspace-slots.ts.
+import type { ViewId, WrapParams } from '@renderer/app/view-registry';
import { appState } from '@renderer/lib/stores/app-state';
export type NonSettingsViewId = Exclude<ViewId, 'settings'>;
@@ -52,23 +49,15 @@ export function useNavigate(): { navigate: NavigateFnTyped } {
return { navigate };
}
-export function useWorkspaceSlots(): SlotsContextValue {
- return useObserver(() => {
- const viewId = appState.navigation.currentViewId;
- const registry = views as unknown as Record<string, ViewDefinition<Record<string, unknown>>>;
- const viewDef = registry[viewId];
- const def = viewDef ?? registry.home;
- const resolvedViewId = viewDef ? viewId : 'home';
- return {
- WrapView: (def.WrapView ?? Fragment) as ComponentType<
- { children: ReactNode } & Record<string, unknown>
- >,
- TitlebarSlot: def.TitlebarSlot ?? (() => null),
- MainPanel: def.MainPanel,
- currentView: resolvedViewId,
- lastNonSettingsView: appState.navigation.lastNonSettingsView,
- };
- });
+/**
+ * The active view id, without consulting the view registry.
+ *
+ * `useWorkspaceSlots` also reports this, but resolving it there means loading
+ * the registry — which view modules cannot do without closing an import cycle.
+ * Callers that only need to know *which* view is active should use this.
+ */
+export function useCurrentViewId(): ViewId {
+ return useObserver(() => appState.navigation.currentViewId);
}
export function useWorkspaceWrapParams(): WrapParamsContextValue {
diff --git a/dash/apps/switchdash-desktop/src/renderer/lib/layout/workspace-slots.ts b/dash/apps/switchdash-desktop/src/renderer/lib/layout/workspace-slots.ts
new file mode 100644
index 000000000..dcf3463e5
--- /dev/null
+++ b/dash/apps/switchdash-desktop/src/renderer/lib/layout/workspace-slots.ts
@@ -0,0 +1,35 @@
+import { useObserver } from 'mobx-react-lite';
+import { Fragment, type ComponentType, type ReactNode } from 'react';
+import { views, type ViewDefinition } from '@renderer/app/view-registry';
+import type { SlotsContextValue } from '@renderer/lib/layout/navigation-provider';
+import { appState } from '@renderer/lib/stores/app-state';
+
+/**
+ * Resolve the active view's slots from the view registry.
+ *
+ * Kept out of navigation-provider deliberately. This is the only navigation
+ * hook that needs the registry's *value*, and view modules import
+ * navigation-provider for `useNavigate` / `useParams`. Holding this here too
+ * closed a cycle — view-registry → a view → navigation-provider → view-registry
+ * — that made the registry's own initialisation order load-order dependent, and
+ * it would intermittently evaluate the `views` object while one of the view
+ * bindings it reads was still in its temporal dead zone.
+ */
+export function useWorkspaceSlots(): SlotsContextValue {
+ return useObserver(() => {
+ const viewId = appState.navigation.currentViewId;
+ const registry = views as unknown as Record<string, ViewDefinition<Record<string, unknown>>>;
+ const viewDef = registry[viewId];
+ const def = viewDef ?? registry.home;
+ const resolvedViewId = viewDef ? viewId : 'home';
+ return {
+ WrapView: (def.WrapView ?? Fragment) as ComponentType<
+ { children: ReactNode } & Record<string, unknown>
+ >,
+ TitlebarSlot: def.TitlebarSlot ?? (() => null),
+ MainPanel: def.MainPanel,
+ currentView: resolvedViewId,
+ lastNonSettingsView: appState.navigation.lastNonSettingsView,
+ };
+ });
+}
diff --git a/dash/apps/switchdash-desktop/src/renderer/main.tsx b/dash/apps/switchdash-desktop/src/renderer/main.tsx
index 8f77faa1d..18eab1f8d 100644
--- a/dash/apps/switchdash-desktop/src/renderer/main.tsx
+++ b/dash/apps/switchdash-desktop/src/renderer/main.tsx
@@ -1,11 +1,11 @@
import ReactDOM from 'react-dom/client';
-import { setupNavigationGuards } from '@renderer/app/view-registry';
+import { setupNavigationGuards, views } from '@renderer/app/view-registry';
import { prefetchAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
import './index.css';
import 'devicon/devicon.min.css';
import 'katex/dist/katex.min.css';
import { setupAppCommandProvider } from '@renderer/lib/commands/app-commands';
-import { setupViewCommandProvider } from '@renderer/lib/commands/registry';
+import { setupViewCommandProvider, type ViewCommandProviders } from '@renderer/lib/commands/registry';
import { wireExternalLinkRequests } from '@renderer/lib/external-link-requests';
import { rpc } from '@renderer/lib/ipc';
import { viewStateCache } from '@renderer/lib/stores/view-state-cache';
@@ -35,7 +35,7 @@ async function bootstrap() {
setupNavigationGuards();
if (navResult) appState.navigation.restoreSnapshot(navResult);
setupAppCommandProvider();
- setupViewCommandProvider();
+ setupViewCommandProvider(views as unknown as ViewCommandProviders);
if (sidebarResult) {
appState.sidebar.restoreSnapshot(sidebarResult as Partial<SidebarSnapshot>);
} else {