web: restore root sidebar chrome

web/workspace/src/routes/+layout.svelte

@@ -2,15 +2,30 @@
   import { page } from '$app/state';
   import WorkspaceAlerts from '$lib/workspace/alerts/WorkspaceAlerts.svelte';
   import GlobalSidebar from '$lib/workspace/sidebar/GlobalSidebar.svelte';
+  import WorkspaceSidebar from '$lib/workspace/sidebar/WorkspaceSidebar.svelte';
   import '../app.css';
   import type { LayoutProps } from './$types';
 
   let { data, children }: LayoutProps = $props();
+  let sidebarCollapsed = $state(false);
 </script>
 
 <WorkspaceAlerts />
 
-<div class="app-layout">
+<div class:sidebar-collapsed={data.workspaceScoped && sidebarCollapsed} class="workspace-layout">
+  {#if data.workspaceScoped}
+    <WorkspaceSidebar
+      workspace={data.workspace ?? null}
+      workspaceError={data.workspaceError ?? null}
+      repositories={data.repositories ?? null}
+      repositoriesError={data.repositoriesError ?? null}
+      currentPath={page.url.pathname}
+      collapsed={sidebarCollapsed}
+      onToggleCollapsed={() => (sidebarCollapsed = !sidebarCollapsed)}
+    />
+  {:else}
+    <GlobalSidebar currentPath={page.url.pathname} />
+  {/if}
   <header class="workspace-topbar">
     <nav class="workspace-topbar-actions" aria-label="Global navigation">
       <a class="topbar-icon-button" href="/account" aria-label="Open Account" title="Account">
@@ -21,12 +36,7 @@
       </a>
     </nav>
   </header>
-  <div class:global-sidebar-layout={!data.workspaceScoped} class="app-shell">
-    {#if !data.workspaceScoped}
-      <GlobalSidebar currentPath={page.url.pathname} />
-    {/if}
-    <div class="app-content">
-      {@render children()}
-    </div>
-  </div>
+  <main class="shell">
+    {@render children()}
+  </main>
 </div>

web/workspace/src/routes/+layout.ts

@@ -1,14 +1,26 @@
 import { redirect } from "@sveltejs/kit";
-import { loadJson, workspaceRoute } from "$lib/workspace/api/http";
-import type { WorkspaceResponse } from "$lib/workspace/sidebar/types";
+import { loadJson, workspaceApiPath, workspaceRoute } from "$lib/workspace/api/http";
+import type { RepositoryListResponse, WorkspaceResponse } from "$lib/workspace/sidebar/types";
 import type { LayoutLoad } from "./$types";
 
 export const ssr = false;
 export const prerender = false;
 
 export const load: LayoutLoad = async ({ fetch, params, url }) => {
-  if (params.workspaceId) {
-    return { workspaceScoped: true };
+  const workspaceId = params.workspaceId;
+  if (workspaceId) {
+    const apiPath = (path: string) => workspaceApiPath(workspaceId, path);
+    const [workspace, repositories] = await Promise.all([
+      loadJson<WorkspaceResponse>(fetch, apiPath("/workspace")),
+      loadJson<RepositoryListResponse>(fetch, apiPath("/repositories")),
+    ]);
+    return {
+      workspaceScoped: true,
+      workspace: workspace.data,
+      workspaceError: workspace.error,
+      repositories: repositories.data,
+      repositoriesError: repositories.error,
+    };
   }
 
   const publicRoutes = new Set(["/account", "/login/device"]);

web/workspace/src/routes/w/[workspaceId]/+layout.svelte

@@ -1,23 +0,0 @@
-<script lang="ts">
-  import { page } from '$app/state';
-  import WorkspaceSidebar from '$lib/workspace/sidebar/WorkspaceSidebar.svelte';
-  import type { LayoutProps } from './$types';
-
-  let { data, children }: LayoutProps = $props();
-  let sidebarCollapsed = $state(false);
-</script>
-
-<div class:sidebar-collapsed={sidebarCollapsed} class="workspace-layout">
-  <WorkspaceSidebar
-    workspace={data.workspace}
-    workspaceError={data.workspaceError}
-    repositories={data.repositories}
-    repositoriesError={data.repositoriesError}
-    currentPath={page.url.pathname}
-    collapsed={sidebarCollapsed}
-    onToggleCollapsed={() => (sidebarCollapsed = !sidebarCollapsed)}
-  />
-  <main class="shell">
-    {@render children()}
-  </main>
-</div>

web/workspace/src/routes/w/[workspaceId]/+layout.ts

@@ -1,18 +0,0 @@
-import { loadJson, workspaceApiPath } from "$lib/workspace/api/http";
-import type { RepositoryListResponse, WorkspaceResponse } from "$lib/workspace/sidebar/types";
-import type { LayoutLoad } from "./$types";
-
-export const load: LayoutLoad = async ({ fetch, params }) => {
-  const apiPath = (path: string) => workspaceApiPath(params.workspaceId, path);
-  const [workspace, repositories] = await Promise.all([
-    loadJson<WorkspaceResponse>(fetch, apiPath("/workspace")),
-    loadJson<RepositoryListResponse>(fetch, apiPath("/repositories")),
-  ]);
-
-  return {
-    workspace: workspace.data,
-    workspaceError: workspace.error,
-    repositories: repositories.data,
-    repositoriesError: repositories.error,
-  };
-};