refactor: cleanup and simplify pending workspace code

- Extract sanitizeBranchName() to deduplicate validation logic
- Remove redundant Map.set() after in-place sort
- Add isDisabled flag to consolidate isCreating || isDeleting checks
- Improve aria-label for deleting state

Author: ammar-agent

src/browser/components/WorkspaceListItem.tsx

@@ -46,6 +46,7 @@ const WorkspaceListItemInner: React.FC<WorkspaceListItemProps> = ({
   // Destructure metadata for convenience
   const { id: workspaceId, name: workspaceName, namedWorkspacePath, status } = metadata;
   const isCreating = status === "creating";
+  const isDisabled = isCreating || isDeleting;
   const gitStatus = useGitStatus(workspaceId);
 
   // Get rename context
@@ -102,14 +103,14 @@ const WorkspaceListItemInner: React.FC<WorkspaceListItemProps> = ({
       <div
         className={cn(
           "py-1.5 pl-4 pr-2 border-l-[3px] border-transparent transition-all duration-150 text-[13px] relative flex gap-2",
-          isCreating || isDeleting
+          isDisabled
             ? "cursor-default opacity-70"
             : "cursor-pointer hover:bg-hover [&:hover_button]:opacity-100",
-          isSelected && !isCreating && "bg-hover border-l-blue-400",
+          isSelected && !isDisabled && "bg-hover border-l-blue-400",
           isDeleting && "pointer-events-none"
         )}
         onClick={() => {
-          if (isCreating) return; // Disable click while creating
+          if (isDisabled) return;
           onSelectWorkspace({
             projectPath,
             projectName,
@@ -118,7 +119,7 @@ const WorkspaceListItemInner: React.FC<WorkspaceListItemProps> = ({
           });
         }}
         onKeyDown={(e) => {
-          if (isCreating) return; // Disable keyboard while creating
+          if (isDisabled) return;
           if (e.key === "Enter" || e.key === " ") {
             e.preventDefault();
             onSelectWorkspace({
@@ -130,12 +131,16 @@ const WorkspaceListItemInner: React.FC<WorkspaceListItemProps> = ({
           }
         }}
         role="button"
-        tabIndex={isCreating ? -1 : 0}
+        tabIndex={isDisabled ? -1 : 0}
         aria-current={isSelected ? "true" : undefined}
         aria-label={
-          isCreating ? `Creating workspace ${displayName}` : `Select workspace ${displayName}`
+          isCreating
+            ? `Creating workspace ${displayName}`
+            : isDeleting
+              ? `Deleting workspace ${displayName}`
+              : `Select workspace ${displayName}`
         }
-        aria-disabled={isCreating}
+        aria-disabled={isDisabled}
         data-workspace-path={namedWorkspacePath}
         data-workspace-id={workspaceId}
       >
@@ -158,14 +163,14 @@ const WorkspaceListItemInner: React.FC<WorkspaceListItemProps> = ({
               <span
                 className={cn(
                   "text-foreground -mx-1 min-w-0 flex-1 truncate rounded-sm px-1 text-left text-[14px] transition-colors duration-200",
-                  !isCreating && "cursor-pointer hover:bg-white/5"
+                  !isDisabled && "cursor-pointer hover:bg-white/5"
                 )}
                 onDoubleClick={(e) => {
-                  if (isCreating) return; // Disable rename while creating
+                  if (isDisabled) return;
                   e.stopPropagation();
                   startRenaming();
                 }}
-                title={isCreating ? "Creating workspace..." : "Double-click to rename"}
+                title={isDisabled ? undefined : "Double-click to rename"}
               >
                 {canInterrupt || isCreating ? (
                   <Shimmer className="w-full truncate" colorClass="var(--color-foreground)">

src/browser/contexts/WorkspaceContext.tsx

@@ -214,6 +214,9 @@ export function WorkspaceProvider(props: WorkspaceProviderProps) {
         setWorkspaceMetadata((prev) => {
           const updated = new Map(prev);
           const isNewWorkspace = !prev.has(event.workspaceId) && event.metadata !== null;
+          const existingMeta = prev.get(event.workspaceId);
+          const wasCreating = existingMeta?.status === "creating";
+          const isNowReady = event.metadata !== null && event.metadata.status !== "creating";
 
           if (event.metadata === null) {
             // Workspace deleted - remove from map
@@ -223,9 +226,10 @@ export function WorkspaceProvider(props: WorkspaceProviderProps) {
             updated.set(event.workspaceId, event.metadata);
           }
 
-          // If this is a new workspace (e.g., from fork), reload projects
-          // to ensure the sidebar shows the updated workspace list
-          if (isNewWorkspace) {
+          // Reload projects when:
+          // 1. New workspace appears (e.g., from fork)
+          // 2. Workspace transitions from "creating" to ready (now saved to config)
+          if (isNewWorkspace || (wasCreating && isNowReady)) {
             void refreshProjects();
           }
 

src/browser/utils/ui/workspaceFiltering.ts

@@ -48,14 +48,13 @@ export function buildSortedWorkspacesByProject(
     }
   }
 
-  // Sort each project's workspaces by recency
-  for (const [projectPath, metadataList] of result) {
+  // Sort each project's workspaces by recency (sort mutates in place)
+  for (const metadataList of result.values()) {
     metadataList.sort((a, b) => {
       const aTimestamp = workspaceRecency[a.id] ?? 0;
       const bTimestamp = workspaceRecency[b.id] ?? 0;
       return bTimestamp - aTimestamp;
     });
-    result.set(projectPath, metadataList);
   }
 
   return result;

src/node/services/workspaceTitleGenerator.ts

@@ -46,30 +46,29 @@ export async function generateWorkspaceName(
 }
 
 /**
- * Validate and sanitize branch name to be git-safe
+ * Sanitize a string to be git-safe: lowercase, hyphens only, no leading/trailing hyphens.
  */
-function validateBranchName(name: string): string {
-  // Ensure git-safe
-  const cleaned = name.toLowerCase().replace(/[^a-z0-9-]/g, "-");
-  // Remove leading/trailing hyphens and collapse multiple hyphens
-  return cleaned
+function sanitizeBranchName(name: string, maxLength: number): string {
+  return name
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "-")
     .replace(/^-+|-+$/g, "")
     .replace(/-+/g, "-")
-    .substring(0, 50);
+    .substring(0, maxLength);
+}
+
+/**
+ * Validate and sanitize branch name to be git-safe
+ */
+function validateBranchName(name: string): string {
+  return sanitizeBranchName(name, 50);
 }
 
 /**
  * Generate a placeholder name from the user's message for immediate display
  * while the AI generates the real title. This is git-safe and human-readable.
  */
 export function generatePlaceholderName(message: string): string {
-  // Take first ~40 chars, sanitize for git branch name
   const truncated = message.slice(0, 40).trim();
-  const sanitized = truncated
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, "-")
-    .replace(/^-+|-+$/g, "")
-    .replace(/-+/g, "-")
-    .substring(0, 30);
-  return sanitized || "new-workspace";
+  return sanitizeBranchName(truncated, 30) || "new-workspace";
 }