🤖 fix: update after rebase on main with ProjectContext

- Remove useProjectManagement in favor of useProjectContext
- AppLoader now wraps with both ProjectProvider and WorkspaceProvider
- App.tsx and LeftSidebar.tsx get projects from ProjectContext
- Fix lint/typecheck errors from integration

Author: kylecarbs

src/App.tsx

@@ -1,6 +1,7 @@
 import { useState, useEffect, useCallback, useRef } from "react";
 import "./styles/globals.css";
 import { useApp } from "./contexts/AppContext";
+import { useProjectContext } from "./contexts/ProjectContext";
 import type { WorkspaceSelection } from "./components/ProjectSidebar";
 import type { FrontendWorkspaceMetadata } from "./types/workspace";
 import { LeftSidebar } from "./components/LeftSidebar";
@@ -36,17 +37,8 @@ const THINKING_LEVELS: ThinkingLevel[] = ["off", "low", "medium", "high"];
 
 function AppInner() {
   // Get app-level state from context
-  const {
-    projects,
-    addProject,
-    removeProject,
-    workspaceMetadata,
-    setWorkspaceMetadata,
-    removeWorkspace,
-    renameWorkspace,
-    selectedWorkspace,
-    setSelectedWorkspace,
-  } = useApp();
+  const { workspaceMetadata, setWorkspaceMetadata, removeWorkspace, renameWorkspace, selectedWorkspace, setSelectedWorkspace } = useApp();
+  const { projects, addProject, removeProject } = useProjectContext();
   const [projectCreateModalOpen, setProjectCreateModalOpen] = useState(false);
 
   // Track when we're in "new workspace creation" mode (show FirstMessageInput)
@@ -179,12 +171,7 @@ function AppInner() {
     [removeProject, selectedWorkspace, setSelectedWorkspace]
   );
 
-  const handleAddWorkspace = useCallback(
-    (projectPath: string) => {
-      startWorkspaceCreation(projectPath);
-    },
-    [startWorkspaceCreation]
-  );
+
 
   // Memoize callbacks to prevent LeftSidebar/ProjectSidebar re-renders
   const handleAddProjectCallback = useCallback(() => {

src/components/AppLoader.tsx

@@ -1,12 +1,12 @@
 import { useState, useEffect } from "react";
 import App from "../App";
 import { LoadingScreen } from "./LoadingScreen";
-import { useProjectManagement } from "../hooks/useProjectManagement";
 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";
 
 /**
@@ -20,27 +20,32 @@ import { WorkspaceProvider, useWorkspaceContext } from "../contexts/WorkspaceCon
  * 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
   );
 
-  // Load projects
-  const projectManagement = useProjectManagement();
+  const { refreshProjects } = useProjectContext();
 
   // Render App with WorkspaceProvider wrapping it
   return (
     <WorkspaceProvider
       selectedWorkspace={selectedWorkspace}
       onSelectedWorkspaceUpdate={setSelectedWorkspace}
-      onProjectsUpdate={projectManagement.setProjects}
+      onProjectsUpdate={() => {
+        void refreshProjects();
+      }}
     >
       <AppLoaderInner
-        projects={projectManagement.projects}
-        setProjects={projectManagement.setProjects}
-        addProject={projectManagement.addProject}
-        removeProject={projectManagement.removeProject}
         selectedWorkspace={selectedWorkspace}
         setSelectedWorkspace={setSelectedWorkspace}
       />
@@ -52,10 +57,6 @@ export function AppLoader() {
  * Inner component that has access to WorkspaceContext
  */
 function AppLoaderInner(props: {
-  projects: ReturnType<typeof useProjectManagement>["projects"];
-  setProjects: ReturnType<typeof useProjectManagement>["setProjects"];
-  addProject: ReturnType<typeof useProjectManagement>["addProject"];
-  removeProject: ReturnType<typeof useProjectManagement>["removeProject"];
   selectedWorkspace: WorkspaceSelection | null;
   setSelectedWorkspace: (workspace: WorkspaceSelection | null) => void;
 }) {
@@ -164,10 +165,6 @@ function AppLoaderInner(props: {
   // Render App with all initialized data via context
   return (
     <AppProvider
-      projects={props.projects}
-      setProjects={props.setProjects}
-      addProject={props.addProject}
-      removeProject={props.removeProject}
       workspaceMetadata={workspaceContext.workspaceMetadata}
       setWorkspaceMetadata={workspaceContext.setWorkspaceMetadata}
       createWorkspace={workspaceContext.createWorkspace}

src/components/LeftSidebar.tsx

@@ -4,7 +4,7 @@ import type { FrontendWorkspaceMetadata } from "@/types/workspace";
 import type { Secret } from "@/types/secrets";
 import ProjectSidebar from "./ProjectSidebar";
 import { TitleBar } from "./TitleBar";
-import { useApp } from "@/contexts/AppContext";
+import { useProjectContext } from "@/contexts/ProjectContext";
 
 interface LeftSidebarProps {
   onAddProject: () => void;
@@ -23,7 +23,7 @@ export function LeftSidebar(props: LeftSidebarProps) {
   const { collapsed, onToggleCollapsed, ...projectSidebarProps } = props;
 
   // Get app-level state from context
-  const { projects } = useApp();
+  const { projects } = useProjectContext();
 
   return (
     <>

src/components/ProjectSidebar.tsx

@@ -18,7 +18,7 @@ import { TooltipWrapper, Tooltip } from "./Tooltip";
 import SecretsModal from "./SecretsModal";
 import type { Secret } from "@/types/secrets";
 import { ForceDeleteModal } from "./ForceDeleteModal";
-import { WorkspaceListItem, type WorkspaceSelection } from "./WorkspaceListItem";
+import { WorkspaceListItem } from "./WorkspaceListItem";
 import { RenameProvider } from "@/contexts/WorkspaceRenameContext";
 import { useWorkspaceContext } from "@/contexts/WorkspaceContext";