Show initial-agent workspaces as Working

packages/app/src/components/sidebar-workspace-list.tsx

@@ -66,7 +66,7 @@ import {
   parseHostWorkspaceRouteFromPathname,
 } from "@/utils/host-routes";
 import {
-  createSidebarWorkspaceEntry,
+  useSidebarWorkspaceEntry,
   type SidebarProjectEntry,
   type SidebarWorkspaceEntry,
 } from "@/hooks/use-sidebar-workspaces-list";
@@ -105,8 +105,8 @@ import {
   SidebarWorkspaceTrailingActionSlot,
 } from "@/components/sidebar/sidebar-workspace-row-content";
 import {
-  useHydratedWorkspaceEntries,
   useProjectNamesMap,
+  useStatusModeWorkspaceEntries,
 } from "@/hooks/use-status-mode-workspaces";
 import { Button } from "@/components/ui/button";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
@@ -117,8 +117,7 @@ import { useKeyboardActionHandler } from "@/hooks/use-keyboard-action-handler";
 import { useClearWorkspaceAttention } from "@/hooks/use-clear-workspace-attention";
 import type { PrHint } from "@/git/use-pr-status-query";
 import { buildSidebarProjectRowModel } from "@/utils/sidebar-project-row-model";
-import { useSessionStore, type WorkspaceDescriptor } from "@/stores/session-store";
-import { useWorkspaceFields } from "@/stores/session-store-hooks";
+import { useSessionStore } from "@/stores/session-store";
 import { redirectIfArchivingActiveWorkspace } from "@/utils/sidebar-workspace-archive-redirect";
 import { openExternalUrl } from "@/utils/open-external-url";
 import {
@@ -293,19 +292,6 @@ function getWorkspaceArchiveStatus(
   return "idle";
 }
 
-export function useSidebarWorkspaceEntry(
-  serverId: string | null,
-  workspaceId: string | null,
-): SidebarWorkspaceEntry | null {
-  const projectWorkspaceEntry = useCallback(
-    (workspace: WorkspaceDescriptor): SidebarWorkspaceEntry =>
-      createSidebarWorkspaceEntry({ serverId: serverId ?? "", workspace }),
-    [serverId],
-  );
-
-  return useWorkspaceFields(serverId, workspaceId, projectWorkspaceEntry);
-}
-
 export function PrBadge({ hint }: { hint: PrHint }) {
   const [isHovered, setIsHovered] = useState(false);
 
@@ -2382,6 +2368,7 @@ export function SidebarWorkspaceList({
     return (
       <SidebarStatusModeWrapper
         serverId={serverId}
+        projects={projects}
         shortcutIndexByWorkspaceKey={shortcutIndexByWorkspaceKey}
         onWorkspacePress={onWorkspacePress}
       />
@@ -2406,14 +2393,16 @@ export function SidebarWorkspaceList({
 
 function SidebarStatusModeWrapper({
   serverId,
+  projects,
   shortcutIndexByWorkspaceKey: _projectShortcutIndex,
   onWorkspacePress,
 }: {
   serverId: string | null;
+  projects: SidebarProjectEntry[];
   shortcutIndexByWorkspaceKey: Map<string, number>;
   onWorkspacePress?: () => void;
 }) {
-  const hydratedWorkspaces = useHydratedWorkspaceEntries(serverId);
+  const hydratedWorkspaces = useStatusModeWorkspaceEntries({ serverId, projects });
   const projectNamesByKey = useProjectNamesMap(serverId);
   const showShortcutBadges = useShowShortcutBadges();
 

packages/app/src/components/sidebar/sidebar-status-list.tsx

@@ -26,7 +26,7 @@ import {
   Pencil,
 } from "lucide-react-native";
 import { DiffStat } from "@/components/diff-stat";
-import { useSidebarWorkspaceEntry } from "../sidebar-workspace-list";
+import { useSidebarWorkspaceEntry } from "@/hooks/use-sidebar-workspaces-list";
 import {
   DropdownMenu,
   DropdownMenuTrigger,

packages/app/src/components/sidebar/sidebar-workspace-row-content.tsx

@@ -186,7 +186,7 @@ function WorkspaceStatusIndicator({
 
   if (loading) {
     return (
-      <View style={styles.workspaceStatusDot}>
+      <View style={styles.workspaceStatusDot} testID="workspace-status-indicator-loading">
         <ThemedActivityIndicator size={8} uniProps={foregroundMutedColorMapping} />
       </View>
     );
@@ -194,7 +194,7 @@ function WorkspaceStatusIndicator({
 
   if (shouldShowSyncedLoader) {
     return (
-      <View style={styles.workspaceStatusDot}>
+      <View style={styles.workspaceStatusDot} testID="workspace-status-indicator-running">
         <ThemedSyncedLoader size={11} uniProps={syncedLoaderColorMapping} />
       </View>
     );

packages/app/src/components/workspace-shortcut-targets-subscriber.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useMemo } from "react";
 import {
-  useHydratedWorkspaceEntries,
   useProjectNamesMap,
+  useStatusModeWorkspaceEntries,
 } from "@/hooks/use-status-mode-workspaces";
 import { useSidebarWorkspacesList } from "@/hooks/use-sidebar-workspaces-list";
 import { useKeyboardShortcutsStore } from "@/stores/keyboard-shortcuts-store";
@@ -20,7 +20,10 @@ export function WorkspaceShortcutTargetsSubscriber({
   serverId: string | null;
 }) {
   const { projects } = useSidebarWorkspacesList({ serverId, enabled });
-  const statusWorkspaces = useHydratedWorkspaceEntries(enabled ? serverId : null);
+  const statusWorkspaces = useStatusModeWorkspaceEntries({
+    serverId: enabled ? serverId : null,
+    projects,
+  });
   const projectNamesByKey = useProjectNamesMap(enabled ? serverId : null);
   const groupMode = useSidebarViewStore((state) =>
     enabled && serverId ? state.getGroupMode(serverId) : "project",