Fix App.tsx to use correct NewWorkspaceModal props after rebase

Author: ammar-agent

src/App.tsx

@@ -149,6 +149,13 @@ function AppInner() {
   );
   const [workspaceModalOpen, setWorkspaceModalOpen] = useState(false);
   const [workspaceModalProject, setWorkspaceModalProject] = useState<string | null>(null);
+  const [workspaceModalProjectName, setWorkspaceModalProjectName] = useState<string>("");
+  const [workspaceModalBranches, setWorkspaceModalBranches] = useState<string[]>([]);
+  const [workspaceModalDefaultTrunk, setWorkspaceModalDefaultTrunk] = useState<string | undefined>(
+    undefined
+  );
+  const [workspaceModalLoadError, setWorkspaceModalLoadError] = useState<string | null>(null);
+  const workspaceModalProjectRef = useRef<string | null>(null);
   const [sidebarCollapsed, setSidebarCollapsed] = usePersistedState("sidebarCollapsed", false);
 
   const handleToggleSidebar = useCallback(() => {
@@ -311,9 +318,45 @@ function AppInner() {
     [removeProject, selectedWorkspace, setSelectedWorkspace]
   );
 
-  const handleAddWorkspace = useCallback((projectPath: string) => {
+  const handleAddWorkspace = useCallback(async (projectPath: string) => {
+    const projectName = projectPath.split("/").pop() ?? projectPath.split("\\").pop() ?? "project";
+
+    workspaceModalProjectRef.current = projectPath;
     setWorkspaceModalProject(projectPath);
+    setWorkspaceModalProjectName(projectName);
+    setWorkspaceModalBranches([]);
+    setWorkspaceModalDefaultTrunk(undefined);
+    setWorkspaceModalLoadError(null);
     setWorkspaceModalOpen(true);
+
+    try {
+      const branchResult = await window.api.projects.listBranches(projectPath);
+
+      // Guard against race condition: only update state if this is still the active project
+      if (workspaceModalProjectRef.current !== projectPath) {
+        return;
+      }
+
+      const sanitizedBranches = Array.isArray(branchResult?.branches)
+        ? branchResult.branches.filter((branch): branch is string => typeof branch === "string")
+        : [];
+
+      const recommended =
+        typeof branchResult?.recommendedTrunk === "string" &&
+        sanitizedBranches.includes(branchResult.recommendedTrunk)
+          ? branchResult.recommendedTrunk
+          : sanitizedBranches[0];
+
+      setWorkspaceModalBranches(sanitizedBranches);
+      setWorkspaceModalDefaultTrunk(recommended);
+      setWorkspaceModalLoadError(null);
+    } catch (err) {
+      console.error("Failed to load branches for modal:", err);
+      const message = err instanceof Error ? err.message : "Unknown error";
+      setWorkspaceModalLoadError(
+        `Unable to load branches automatically: ${message}. You can still enter the trunk branch manually.`
+      );
+    }
   }, []);
 
   // Memoize callbacks to prevent LeftSidebar/ProjectSidebar re-renders
@@ -712,10 +755,18 @@ function AppInner() {
         {workspaceModalOpen && workspaceModalProject && (
           <NewWorkspaceModal
             isOpen={workspaceModalOpen}
-            projectPath={workspaceModalProject}
+            projectName={workspaceModalProjectName}
+            branches={workspaceModalBranches}
+            defaultTrunkBranch={workspaceModalDefaultTrunk}
+            loadErrorMessage={workspaceModalLoadError}
             onClose={() => {
+              workspaceModalProjectRef.current = null;
               setWorkspaceModalOpen(false);
               setWorkspaceModalProject(null);
+              setWorkspaceModalProjectName("");
+              setWorkspaceModalBranches([]);
+              setWorkspaceModalDefaultTrunk(undefined);
+              setWorkspaceModalLoadError(null);
             }}
             onAdd={handleCreateWorkspace}
           />

src/services/ipcMain.ts

@@ -269,7 +269,9 @@ export class IpcMain {
           // Block rename during active streaming to prevent race conditions
           // (bash processes would have stale cwd, system message would be wrong)
           if (this.aiService.isStreaming(workspaceId)) {
-            return Err("Cannot rename workspace while AI stream is active. Please wait for the stream to complete.");
+            return Err(
+              "Cannot rename workspace while AI stream is active. Please wait for the stream to complete."
+            );
           }
 
           // Validate workspace name

tests/ipcMain/renameWorkspace.test.ts

@@ -438,18 +438,19 @@ describeIntegration("IpcMain rename workspace integration tests", () => {
   test.concurrent(
     "should fail to rename if workspace is currently streaming",
     async () => {
-      const { env, workspaceId, tempGitRepo, branchName, cleanup } = await setupWorkspace("anthropic");
+      const { env, workspaceId, tempGitRepo, branchName, cleanup } =
+        await setupWorkspace("anthropic");
       try {
         // Add project and workspace to config via IPC
         await env.mockIpcRenderer.invoke(IPC_CHANNELS.PROJECT_CREATE, tempGitRepo);
         const projectsConfig = env.config.loadConfigOrDefault();
         const projectConfig = projectsConfig.projects.get(tempGitRepo);
         if (projectConfig) {
           const workspacePath = env.config.getWorkspacePath(tempGitRepo, branchName);
-          projectConfig.workspaces.push({ 
+          projectConfig.workspaces.push({
             path: workspacePath,
             id: workspaceId,
-            name: branchName
+            name: branchName,
           });
           env.config.saveConfig(projectsConfig);
         }
@@ -485,5 +486,4 @@ describeIntegration("IpcMain rename workspace integration tests", () => {
     },
     20000
   );
-
 });