🤖 refactor: move selectedWorkspace into WorkspaceContext

WorkspaceContext now owns all workspace state including selectedWorkspace:
- Uses usePersistedState internally for localStorage persistence
- Handles URL hash restoration (#workspace=<id>)
- Handles launch project detection (--add-project flag)

Benefits:
- Single source of truth for all workspace state
- Simplified AppLoader (eliminated AppLoaderMiddle layer)
- Cleaner separation of concerns
- ~60 net lines removed

Tests updated to set selectedWorkspace via context API instead of props.

Author: kylecarbs

src/components/AppLoader.tsx

@@ -3,63 +3,41 @@ import App from "../App";
 import { LoadingScreen } from "./LoadingScreen";
 import { useWorkspaceStoreRaw } from "../stores/WorkspaceStore";
 import { useGitStatusStoreRaw } from "../stores/GitStatusStore";
-import { usePersistedState } from "../hooks/usePersistedState";
-import type { WorkspaceSelection } from "./ProjectSidebar";
 import { AppProvider } from "../contexts/AppContext";
 import { ProjectProvider, useProjectContext } from "../contexts/ProjectContext";
 import { WorkspaceProvider, useWorkspaceContext } from "../contexts/WorkspaceContext";
 
 /**
  * AppLoader handles all initialization before rendering the main App:
- * 1. Load workspace metadata and projects
+ * 1. Load workspace metadata and projects (via contexts)
  * 2. Sync stores with loaded data
- * 3. Restore workspace selection from URL hash (if present)
- * 4. Only render App when everything is ready
+ * 3. Only render App when everything is ready
  *
+ * WorkspaceContext handles workspace selection restoration (localStorage, URL hash, launch project).
  * This ensures App.tsx can assume stores are always synced and removes
  * the need for conditional guards in effects.
  */
 export function AppLoader() {
-  return (
-    <ProjectProvider>
-      <AppLoaderMiddle />
-    </ProjectProvider>
-  );
-}
-
-function AppLoaderMiddle() {
-  // Workspace selection - restored from localStorage immediately
-  const [selectedWorkspace, setSelectedWorkspace] = usePersistedState<WorkspaceSelection | null>(
-    "selectedWorkspace",
-    null
-  );
-
   const { refreshProjects } = useProjectContext();
 
-  // Render App with WorkspaceProvider wrapping it
   return (
-    <WorkspaceProvider
-      selectedWorkspace={selectedWorkspace}
-      onSelectedWorkspaceUpdate={setSelectedWorkspace}
-      onProjectsUpdate={() => {
-        void refreshProjects();
-      }}
-    >
-      <AppLoaderInner
-        selectedWorkspace={selectedWorkspace}
-        setSelectedWorkspace={setSelectedWorkspace}
-      />
-    </WorkspaceProvider>
+    <ProjectProvider>
+      <WorkspaceProvider
+        onProjectsUpdate={() => {
+          void refreshProjects();
+        }}
+      >
+        <AppLoaderInner />
+      </WorkspaceProvider>
+    </ProjectProvider>
   );
 }
 
 /**
- * Inner component that has access to WorkspaceContext
+ * Inner component that has access to both ProjectContext and WorkspaceContext.
+ * Syncs stores and shows loading screen until ready.
  */
-function AppLoaderInner(props: {
-  selectedWorkspace: WorkspaceSelection | null;
-  setSelectedWorkspace: (workspace: WorkspaceSelection | null) => void;
-}) {
+function AppLoaderInner() {
   const workspaceContext = useWorkspaceContext();
 
   // Get store instances
@@ -85,78 +63,6 @@ function AppLoaderInner(props: {
     gitStatusStore,
   ]);
 
-  // Restore workspace from URL hash (runs once when stores are synced)
-  const [hasRestoredFromHash, setHasRestoredFromHash] = useState(false);
-
-  useEffect(() => {
-    const { setSelectedWorkspace } = props;
-    // Wait until stores are synced before attempting restoration
-    if (!storesSynced) return;
-
-    // Only run once
-    if (hasRestoredFromHash) return;
-
-    const hash = window.location.hash;
-    if (hash.startsWith("#workspace=")) {
-      const workspaceId = decodeURIComponent(hash.substring("#workspace=".length));
-
-      // Find workspace in metadata
-      const metadata = workspaceContext.workspaceMetadata.get(workspaceId);
-
-      if (metadata) {
-        // Restore from hash (overrides localStorage)
-        setSelectedWorkspace({
-          workspaceId: metadata.id,
-          projectPath: metadata.projectPath,
-          projectName: metadata.projectName,
-          namedWorkspacePath: metadata.namedWorkspacePath,
-        });
-      }
-    }
-
-    setHasRestoredFromHash(true);
-  }, [storesSynced, workspaceContext.workspaceMetadata, hasRestoredFromHash, props]);
-
-  // Check for launch project from server (for --add-project flag)
-  // This only applies in server mode
-  useEffect(() => {
-    const { selectedWorkspace, setSelectedWorkspace } = props;
-    // Wait until stores are synced and hash restoration is complete
-    if (!storesSynced || !hasRestoredFromHash) return;
-
-    // Skip if we already have a selected workspace (from localStorage or URL hash)
-    if (selectedWorkspace) return;
-
-    // Only check once
-    const checkLaunchProject = async () => {
-      // Only available in server mode
-      if (!window.api.server?.getLaunchProject) return;
-
-      const launchProjectPath = await window.api.server.getLaunchProject();
-      if (!launchProjectPath) return;
-
-      // Find first workspace in this project
-      const projectWorkspaces = Array.from(workspaceContext.workspaceMetadata.values()).filter(
-        (meta) => meta.projectPath === launchProjectPath
-      );
-
-      if (projectWorkspaces.length > 0) {
-        // Select the first workspace in the project
-        const metadata = projectWorkspaces[0];
-        setSelectedWorkspace({
-          workspaceId: metadata.id,
-          projectPath: metadata.projectPath,
-          projectName: metadata.projectName,
-          namedWorkspacePath: metadata.namedWorkspacePath,
-        });
-      }
-      // If no workspaces exist yet, just leave the project in the sidebar
-      // The user will need to create a workspace
-    };
-
-    void checkLaunchProject();
-  }, [storesSynced, hasRestoredFromHash, workspaceContext.workspaceMetadata, props]);
-
   // Show loading screen until stores are synced
   if (workspaceContext.loading || !storesSynced) {
     return <LoadingScreen />;
@@ -170,8 +76,8 @@ function AppLoaderInner(props: {
       createWorkspace={workspaceContext.createWorkspace}
       removeWorkspace={workspaceContext.removeWorkspace}
       renameWorkspace={workspaceContext.renameWorkspace}
-      selectedWorkspace={props.selectedWorkspace}
-      setSelectedWorkspace={props.setSelectedWorkspace}
+      selectedWorkspace={workspaceContext.selectedWorkspace}
+      setSelectedWorkspace={workspaceContext.setSelectedWorkspace}
     >
       <App />
     </AppProvider>