fix: sidebar project icons + render error boundary + tool state extraction

Three bundled changes from upstream PR 21st-dev#192:

- Sidebar: use ProjectIcon (custom project icon or FolderOpen fallback) for
  local chats and drafts. Remote GitHub chats keep the GitHub avatar.
- Error boundary: rename ViewerErrorBoundary -> RenderErrorBoundary with
  reset-on-key and reload-window options. Wrap App root, all ChatViewInner
  panes. Add render-process-gone recovery in main process (one-shot reload).
- Tool state: extract getToolStatus + getToolLifecycleState into shared
  agent-tool-state.ts module. Tool registry and components now share the
  same isInputStreaming logic.

Author: erenbertr

src/main/windows/main.ts

@@ -645,6 +645,7 @@ export function createWindow(options?: { chatId?: string; subChatId?: string }):
       partition: "persist:main", // Use persistent session for cookies
     },
   })
+  let attemptedRendererRecovery = false
 
   // Register window with manager and get stable ID for localStorage namespacing
   const stableWindowId = windowManager.register(window)
@@ -741,6 +742,22 @@ export function createWindow(options?: { chatId?: string; subChatId?: string }):
     return { action: "deny" }
   })
 
+  window.webContents.on("render-process-gone", (_event, details) => {
+    console.error("[Main] Renderer process gone in window", window.id, details)
+
+    if (attemptedRendererRecovery || window.isDestroyed()) {
+      return
+    }
+
+    attemptedRendererRecovery = true
+    setTimeout(() => {
+      if (!window.isDestroyed()) {
+        console.log("[Main] Attempting one-shot renderer recovery in window", window.id)
+        window.webContents.reloadIgnoringCache()
+      }
+    }, 150)
+  })
+
   // Prevent window close if there are active streaming sessions
   window.on("close", (event) => {
     // Skip confirmation if app quit was already confirmed by the user
@@ -808,6 +825,7 @@ export function createWindow(options?: { chatId?: string; subChatId?: string }):
 
   // Log page load - traffic light visibility is managed by the renderer
   window.webContents.on("did-finish-load", () => {
+    attemptedRendererRecovery = false
     console.log("[Main] Page finished loading in window", window.id)
   })
   window.webContents.on(

src/renderer/components/ui/error-boundary.tsx

@@ -2,6 +2,16 @@ import { Component, type ReactNode } from "react"
 import { AlertCircle } from "lucide-react"
 import { Button } from "./button"
 
+interface RenderErrorBoundaryProps {
+  children: ReactNode
+  title?: string
+  description?: string
+  resetKey?: string | number | null
+  onReset?: () => void
+  compact?: boolean
+  showReload?: boolean
+}
+
 interface ErrorBoundaryProps {
   children: ReactNode
   viewerType?: string
@@ -13,11 +23,11 @@ interface ErrorBoundaryState {
   error: Error | null
 }
 
-export class ViewerErrorBoundary extends Component<
-  ErrorBoundaryProps,
+export class RenderErrorBoundary extends Component<
+  RenderErrorBoundaryProps,
   ErrorBoundaryState
 > {
-  constructor(props: ErrorBoundaryProps) {
+  constructor(props: RenderErrorBoundaryProps) {
     super(props)
     this.state = { hasError: false, error: null }
   }
@@ -28,35 +38,87 @@ export class ViewerErrorBoundary extends Component<
 
   componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
     console.error(
-      `[ViewerErrorBoundary] ${this.props.viewerType || "viewer"} crashed:`,
+      `[RenderErrorBoundary] ${this.props.title || "section"} crashed:`,
       error,
       errorInfo,
     )
   }
 
+  componentDidUpdate(prevProps: RenderErrorBoundaryProps) {
+    if (
+      this.state.hasError &&
+      prevProps.resetKey !== this.props.resetKey
+    ) {
+      this.setState({ hasError: false, error: null })
+    }
+  }
+
   handleReset = () => {
     this.setState({ hasError: false, error: null })
     this.props.onReset?.()
   }
 
+  handleReload = () => {
+    window.location.reload()
+  }
+
   render() {
     if (this.state.hasError) {
       return (
-        <div className="flex flex-col items-center justify-center h-full gap-3 p-4 text-center">
+        <div
+          className={
+            this.props.compact
+              ? "flex h-full flex-col items-center justify-center gap-3 p-4 text-center"
+              : "flex h-full min-h-0 w-full flex-col items-center justify-center gap-4 p-6 text-center"
+          }
+        >
           <AlertCircle className="h-10 w-10 text-muted-foreground" />
-          <p className="font-medium text-foreground">
-            Failed to render {this.props.viewerType || "file"}
-          </p>
-          <p className="text-sm text-muted-foreground max-w-[300px]">
-            {this.state.error?.message || "An unexpected error occurred."}
-          </p>
-          <Button variant="outline" size="sm" onClick={this.handleReset}>
-            Try again
-          </Button>
+          <div className="space-y-1">
+            <p className="font-medium text-foreground">
+              {this.props.title || "Something went wrong"}
+            </p>
+            <p className="text-sm text-muted-foreground max-w-[420px]">
+              {this.props.description ||
+                this.state.error?.message ||
+                "An unexpected error occurred."}
+            </p>
+            {this.props.description && this.state.error?.message && (
+              <p className="text-xs text-muted-foreground/70 max-w-[420px] break-words">
+                {this.state.error.message}
+              </p>
+            )}
+          </div>
+          <div className="flex items-center gap-2">
+            <Button variant="outline" size="sm" onClick={this.handleReset}>
+              Try again
+            </Button>
+            {this.props.showReload !== false && (
+              <Button variant="outline" size="sm" onClick={this.handleReload}>
+                Reload window
+              </Button>
+            )}
+          </div>
         </div>
       )
     }
 
     return this.props.children
   }
 }
+
+export function ViewerErrorBoundary({
+  children,
+  viewerType,
+  onReset,
+}: ErrorBoundaryProps) {
+  return (
+    <RenderErrorBoundary
+      title={`Failed to render ${viewerType || "file"}`}
+      onReset={onReset}
+      compact
+      showReload={false}
+    >
+      {children}
+    </RenderErrorBoundary>
+  )
+}

src/renderer/features/agents/main/active-chat.tsx

@@ -4,6 +4,7 @@ import {
   stripEmojis
 } from "../../../components/chat-markdown-renderer"
 import { Button } from "../../../components/ui/button"
+import { RenderErrorBoundary } from "../../../components/ui/error-boundary"
 import {
   AgentIcon,
   AttachIcon,
@@ -7686,31 +7687,37 @@ Make sure to preserve all functionality from both branches when resolving confli
                             }
                           }}
                         >
-                          <ChatViewInner
-                            chat={chat}
-                            subChatId={paneId}
-                            parentChatId={chatId}
-                            provider={inferProviderFromMessages(paneId)}
-                            isFirstSubChat={isFirstSubChat}
-                            onAutoRename={handleAutoRename}
-                            onCreateNewSubChat={handleCreateNewSubChat}
-                            onProviderChange={handleProviderChange}
-                            teamId={selectedTeamId || undefined}
-                            repository={repository}
-                            streamId={agentChatStore.getStreamId(paneId)}
-                            isMobile={isMobileFullscreen}
-                            isSubChatsSidebarOpen={subChatsSidebarMode === "sidebar"}
-                            sandboxId={sandboxId || undefined}
-                            projectPath={worktreePath || undefined}
-                            isArchived={isArchived}
-                            onRestoreWorkspace={handleRestoreWorkspace}
-                            existingPrUrl={agentChat?.prUrl}
-                            isActive={paneId === activeSubChatId}
-                            isSplitPane={true}
-                            workspaceName={agentChat?.name ?? null}
-                            workspaceBranch={agentChat?.branch ?? null}
-                            workspaceRepoName={(agentChat as any)?.project?.gitRepo || (agentChat as any)?.project?.name || null}
-                          />
+                          <RenderErrorBoundary
+                            title="Chat pane failed to render"
+                            description="A workspace UI error interrupted this pane. Reload the window to recover."
+                            resetKey={paneId}
+                          >
+                            <ChatViewInner
+                              chat={chat}
+                              subChatId={paneId}
+                              parentChatId={chatId}
+                              provider={inferProviderFromMessages(paneId)}
+                              isFirstSubChat={isFirstSubChat}
+                              onAutoRename={handleAutoRename}
+                              onCreateNewSubChat={handleCreateNewSubChat}
+                              onProviderChange={handleProviderChange}
+                              teamId={selectedTeamId || undefined}
+                              repository={repository}
+                              streamId={agentChatStore.getStreamId(paneId)}
+                              isMobile={isMobileFullscreen}
+                              isSubChatsSidebarOpen={subChatsSidebarMode === "sidebar"}
+                              sandboxId={sandboxId || undefined}
+                              projectPath={worktreePath || undefined}
+                              isArchived={isArchived}
+                              onRestoreWorkspace={handleRestoreWorkspace}
+                              existingPrUrl={agentChat?.prUrl}
+                              isActive={paneId === activeSubChatId}
+                              isSplitPane={true}
+                              workspaceName={agentChat?.name ?? null}
+                              workspaceBranch={agentChat?.branch ?? null}
+                              workspaceRepoName={(agentChat as any)?.project?.gitRepo || (agentChat as any)?.project?.name || null}
+                            />
+                          </RenderErrorBoundary>
                         </div>
                       )
                     }]
@@ -7736,31 +7743,37 @@ Make sure to preserve all functionality from both branches when resolving confli
                               }}
                               aria-hidden
                             >
-                              <ChatViewInner
-                                chat={chat}
-                                subChatId={subChatId}
-                                parentChatId={chatId}
-                                provider={inferProviderFromMessages(subChatId)}
-                                isFirstSubChat={isFirstSubChat}
-                                onAutoRename={handleAutoRename}
-                                onCreateNewSubChat={handleCreateNewSubChat}
-                                onProviderChange={handleProviderChange}
-                                teamId={selectedTeamId || undefined}
-                                repository={repository}
-                                streamId={agentChatStore.getStreamId(subChatId)}
-                                isMobile={isMobileFullscreen}
-                                isSubChatsSidebarOpen={subChatsSidebarMode === "sidebar"}
-                                sandboxId={sandboxId || undefined}
-                                projectPath={worktreePath || undefined}
-                                isArchived={isArchived}
-                                onRestoreWorkspace={handleRestoreWorkspace}
-                                existingPrUrl={agentChat?.prUrl}
-                                isActive={false}
-                                isSplitPane={false}
-                                workspaceName={agentChat?.name ?? null}
-                                workspaceBranch={agentChat?.branch ?? null}
-                                workspaceRepoName={(agentChat as any)?.project?.gitRepo || (agentChat as any)?.project?.name || null}
-                              />
+                              <RenderErrorBoundary
+                                title="Chat pane failed to render"
+                                description="A workspace UI error interrupted this pane. Reload the window to recover."
+                                resetKey={subChatId}
+                              >
+                                <ChatViewInner
+                                  chat={chat}
+                                  subChatId={subChatId}
+                                  parentChatId={chatId}
+                                  provider={inferProviderFromMessages(subChatId)}
+                                  isFirstSubChat={isFirstSubChat}
+                                  onAutoRename={handleAutoRename}
+                                  onCreateNewSubChat={handleCreateNewSubChat}
+                                  onProviderChange={handleProviderChange}
+                                  teamId={selectedTeamId || undefined}
+                                  repository={repository}
+                                  streamId={agentChatStore.getStreamId(subChatId)}
+                                  isMobile={isMobileFullscreen}
+                                  isSubChatsSidebarOpen={subChatsSidebarMode === "sidebar"}
+                                  sandboxId={sandboxId || undefined}
+                                  projectPath={worktreePath || undefined}
+                                  isArchived={isArchived}
+                                  onRestoreWorkspace={handleRestoreWorkspace}
+                                  existingPrUrl={agentChat?.prUrl}
+                                  isActive={false}
+                                  isSplitPane={false}
+                                  workspaceName={agentChat?.name ?? null}
+                                  workspaceBranch={agentChat?.branch ?? null}
+                                  workspaceRepoName={(agentChat as any)?.project?.gitRepo || (agentChat as any)?.project?.name || null}
+                                />
+                              </RenderErrorBoundary>
                             </div>
                           )
                         })}
@@ -7799,31 +7812,37 @@ Make sure to preserve all functionality from both branches when resolving confli
                     }}
                     aria-hidden={!isActive}
                   >
-                    <ChatViewInner
-                      chat={chat}
-                      subChatId={subChatId}
-                      parentChatId={chatId}
-                      provider={inferProviderFromMessages(subChatId)}
-                      isFirstSubChat={isFirstSubChat}
-                      onAutoRename={handleAutoRename}
-                      onCreateNewSubChat={handleCreateNewSubChat}
-                      onProviderChange={handleProviderChange}
-                      teamId={selectedTeamId || undefined}
-                      repository={repository}
-                      streamId={agentChatStore.getStreamId(subChatId)}
-                      isMobile={isMobileFullscreen}
-                      isSubChatsSidebarOpen={subChatsSidebarMode === "sidebar"}
-                      sandboxId={sandboxId || undefined}
-                      projectPath={worktreePath || undefined}
-                      isArchived={isArchived}
-                      onRestoreWorkspace={handleRestoreWorkspace}
-                      existingPrUrl={agentChat?.prUrl}
-                      isActive={isActive}
-                      isSplitPane={false}
-                      workspaceName={agentChat?.name ?? null}
-                      workspaceBranch={agentChat?.branch ?? null}
-                      workspaceRepoName={(agentChat as any)?.project?.gitRepo || (agentChat as any)?.project?.name || null}
-                    />
+                    <RenderErrorBoundary
+                      title="Chat pane failed to render"
+                      description="A workspace UI error interrupted this pane. Reload the window to recover."
+                      resetKey={subChatId}
+                    >
+                      <ChatViewInner
+                        chat={chat}
+                        subChatId={subChatId}
+                        parentChatId={chatId}
+                        provider={inferProviderFromMessages(subChatId)}
+                        isFirstSubChat={isFirstSubChat}
+                        onAutoRename={handleAutoRename}
+                        onCreateNewSubChat={handleCreateNewSubChat}
+                        onProviderChange={handleProviderChange}
+                        teamId={selectedTeamId || undefined}
+                        repository={repository}
+                        streamId={agentChatStore.getStreamId(subChatId)}
+                        isMobile={isMobileFullscreen}
+                        isSubChatsSidebarOpen={subChatsSidebarMode === "sidebar"}
+                        sandboxId={sandboxId || undefined}
+                        projectPath={worktreePath || undefined}
+                        isArchived={isArchived}
+                        onRestoreWorkspace={handleRestoreWorkspace}
+                        existingPrUrl={agentChat?.prUrl}
+                        isActive={isActive}
+                        isSplitPane={false}
+                        workspaceName={agentChat?.name ?? null}
+                        workspaceBranch={agentChat?.branch ?? null}
+                        workspaceRepoName={(agentChat as any)?.project?.gitRepo || (agentChat as any)?.project?.name || null}
+                      />
+                    </RenderErrorBoundary>
                   </div>
                 )
               })

src/renderer/features/agents/ui/agent-bash-tool.tsx

@@ -61,7 +61,7 @@ export const AgentBashTool = memo(function AgentBashTool({
   chatStatus,
 }: AgentBashToolProps) {
   const [isOutputExpanded, setIsOutputExpanded] = useState(false)
-  const { isPending } = getToolStatus(part, chatStatus)
+  const { isPending, isInputStreaming } = getToolStatus(part, chatStatus)
   const selectedProject = useAtomValue(selectedProjectAtom)
   const projectPath = selectedProject?.path
 
@@ -97,12 +97,6 @@ export const AgentBashTool = memo(function AgentBashTool({
     [displayCommand],
   )
 
-  // Check if command input is still being streamed
-  // Only consider streaming if chat is actively streaming (prevents hang on stop)
-  // Include "submitted" status - this is when request was sent but streaming hasn't started yet
-  const isActivelyStreaming = chatStatus === "streaming" || chatStatus === "submitted"
-  const isInputStreaming = part.state === "input-streaming" && isActivelyStreaming
-
   // If command is still being generated (input-streaming state), show loading state
   if (isInputStreaming) {
     return (