🤖 refactor: auto-cleanup

benchmarks/terminal_bench/prepare_leaderboard_submission.py

@@ -216,6 +216,11 @@ def get_model_from_config(config_path: Path) -> str | None:
         return None
 
 
+def _child_dirs(path: Path) -> list[Path]:
+    """List the immediate subdirectories of a directory, skipping plain files."""
+    return [child for child in path.iterdir() if child.is_dir()]
+
+
 def _is_job_folder(path: Path) -> bool:
     """Check if a directory looks like a job folder (contains trial dirs with config.json)."""
     if not path.is_dir():
@@ -249,20 +254,14 @@ def find_job_folders(artifacts_dir: Path) -> list[Path]:
     # Check for direct jobs/ folder
     direct_jobs = artifacts_dir / "jobs"
     if direct_jobs.exists():
-        for item in direct_jobs.iterdir():
-            if item.is_dir():
-                job_folders.append(item)
+        job_folders.extend(_child_dirs(direct_jobs))
         return job_folders
 
     # Check for per-artifact structure
-    for artifact_dir in artifacts_dir.iterdir():
-        if not artifact_dir.is_dir():
-            continue
+    for artifact_dir in _child_dirs(artifacts_dir):
         jobs_dir = artifact_dir / "jobs"
         if jobs_dir.exists():
-            for item in jobs_dir.iterdir():
-                if item.is_dir():
-                    job_folders.append(item)
+            job_folders.extend(_child_dirs(jobs_dir))
 
     return job_folders
 

scripts/postinstall.sh

@@ -81,40 +81,39 @@ else
   exit 0
 fi
 
-# 6) Rebuild node-pty (once per version/platform)
-if [ "$HAS_NODE_PTY" = "1" ]; then
-  if [ -f "$NODE_PTY_STAMP_FILE" ]; then
-    echo "✅ node-pty already rebuilt for Electron ${ELECTRON_VERSION} on ${PLATFORM}/${ARCH} – skipping"
-  else
-    echo "🔧 Rebuilding node-pty for Electron ${ELECTRON_VERSION} on ${PLATFORM}/${ARCH}..."
-    $REBUILD_CMD @electron/rebuild -f -m node_modules/node-pty || {
-      echo "⚠️  Failed to rebuild native modules"
-      echo "   Terminal functionality may not work in desktop mode."
-      echo "   Run 'make rebuild-native' manually to fix."
-      exit 0
-    }
-    touch "$NODE_PTY_STAMP_FILE"
-    echo "✅ node-pty rebuilt successfully (cached at $NODE_PTY_STAMP_FILE)"
+# 6) Rebuild one native module for Electron's ABI, skipping when its stamp exists.
+# A rebuild failure is non-fatal (desktop terminal/DB features degrade, install succeeds),
+# so the failure path exits the whole script with 0 rather than returning to the caller.
+rebuild_native_module() {
+  label="$1"
+  module_path="$2"
+  stamp_file="$3"
+
+  if [ -f "$stamp_file" ]; then
+    echo "✅ ${label} already rebuilt for Electron ${ELECTRON_VERSION} on ${PLATFORM}/${ARCH} – skipping"
+    return 0
   fi
+
+  echo "🔧 Rebuilding ${label} for Electron ${ELECTRON_VERSION} on ${PLATFORM}/${ARCH}..."
+  $REBUILD_CMD @electron/rebuild -f -m "$module_path" || {
+    echo "⚠️  Failed to rebuild native modules"
+    echo "   Terminal functionality may not work in desktop mode."
+    echo "   Run 'make rebuild-native' manually to fix."
+    exit 0
+  }
+  touch "$stamp_file"
+  echo "✅ ${label} rebuilt successfully (cached at $stamp_file)"
+}
+
+# 7) Rebuild native modules (once per version/platform)
+if [ "$HAS_NODE_PTY" = "1" ]; then
+  rebuild_native_module "node-pty" "node_modules/node-pty" "$NODE_PTY_STAMP_FILE"
 else
   echo "ℹ️  node-pty package missing – skipping node-pty rebuild"
 fi
 
-# 7) Rebuild DuckDB (once per version/platform)
 if [ "$HAS_DUCKDB" = "1" ]; then
-  if [ -f "$DUCKDB_STAMP_FILE" ]; then
-    echo "✅ DuckDB already rebuilt for Electron ${ELECTRON_VERSION} on ${PLATFORM}/${ARCH} – skipping"
-  else
-    echo "🔧 Rebuilding DuckDB for Electron ${ELECTRON_VERSION} on ${PLATFORM}/${ARCH}..."
-    $REBUILD_CMD @electron/rebuild -f -m node_modules/@duckdb/node-bindings || {
-      echo "⚠️  Failed to rebuild native modules"
-      echo "   Terminal functionality may not work in desktop mode."
-      echo "   Run 'make rebuild-native' manually to fix."
-      exit 0
-    }
-    touch "$DUCKDB_STAMP_FILE"
-    echo "✅ DuckDB rebuilt successfully (cached at $DUCKDB_STAMP_FILE)"
-  fi
+  rebuild_native_module "DuckDB" "node_modules/@duckdb/node-bindings" "$DUCKDB_STAMP_FILE"
 else
   echo "ℹ️  DuckDB packages missing – skipping DuckDB rebuild"
 fi

src/browser/App.tsx

@@ -45,6 +45,7 @@ import {
   LEFT_SIDEBAR_DEFAULT_WIDTH_PX,
   LEFT_SIDEBAR_MAX_WIDTH_PX,
   LEFT_SIDEBAR_MIN_WIDTH_PX,
+  MOBILE_TOUCH_MEDIA_QUERY,
 } from "@/constants/layout";
 import { XUM_PRODUCT_SLUG } from "@/common/constants/product";
 import { buildCoreSources, type BuildSourcesParams } from "./utils/commands/sources";
@@ -232,8 +233,7 @@ function AppInner() {
       // because the sidebar width is controlled by CSS and shouldn't rewrite the user's desktop
       // width preference.
       const isMobileTouch =
-        typeof window !== "undefined" &&
-        window.matchMedia("(max-width: 768px) and (pointer: coarse)").matches;
+        typeof window !== "undefined" && window.matchMedia(MOBILE_TOUCH_MEDIA_QUERY).matches;
       if (isMobileTouch) {
         return Number.POSITIVE_INFINITY;
       }

src/browser/components/AgentListItem/AgentListItem.tsx

@@ -218,8 +218,13 @@ function HeartbeatFallbackIcon() {
   );
 }
 
+/** Plural "s" for the sidebar activity counts, which are all regular nouns. */
+function pluralSuffix(count: number): string {
+  return count === 1 ? "" : "s";
+}
+
 function formatSubAgentCount(count: number, label: "active" | "queued"): string {
-  return `${count} sub-agent${count === 1 ? "" : "s"} ${label}`;
+  return `${count} sub-agent${pluralSuffix(count)} ${label}`;
 }
 
 function formatDelegatedActivityText(activity: WorkspaceDelegatedActivity): string | null {
@@ -295,8 +300,7 @@ function formatHiddenSubAgentsPresentation(
         ? summary.runningWorkflowAgentCount
         : summary.queuedWorkflowAgentCount;
       // Gap-only runs have no countable workers; skip the "(0 agents)" noise.
-      const agentSuffix =
-        agentCount > 0 ? ` (${agentCount} agent${agentCount === 1 ? "" : "s"})` : "";
+      const agentSuffix = agentCount > 0 ? ` (${agentCount} agent${pluralSuffix(agentCount)})` : "";
       const queuedSuffix =
         hasRunningRun && summary.queuedWorkflowAgentCount > 0
           ? ` · ${summary.queuedWorkflowAgentCount} queued`

src/browser/components/ArchivedWorkspaces/ArchivedWorkspaces.tsx

@@ -8,7 +8,7 @@ import { getErrorMessage } from "@/common/utils/errors";
 import { useAPI } from "@/browser/contexts/API";
 import { useWorkspaceContext } from "@/browser/contexts/WorkspaceContext";
 import { usePersistedState } from "@/browser/hooks/usePersistedState";
-import { usePopoverError } from "@/browser/hooks/usePopoverError";
+import { resolvePopoverErrorAnchor, usePopoverError } from "@/browser/hooks/usePopoverError";
 import { ChevronDown, ChevronRight, FolderX, Loader2, Search, Trash2 } from "lucide-react";
 import { ArchiveIcon, ArchiveRestoreIcon } from "../icons/ArchiveIcon/ArchiveIcon";
 import { Tooltip, TooltipTrigger, TooltipContent } from "../Tooltip/Tooltip";
@@ -584,15 +584,11 @@ export const ArchivedWorkspaces: React.FC<ArchivedWorkspacesProps> = ({
         return;
       }
 
-      if (anchorEl) {
-        const rect = anchorEl.getBoundingClientRect();
-        unarchiveError.showError(workspaceId, result.error ?? "Failed to restore workspace", {
-          top: rect.top + window.scrollY,
-          left: rect.right + 10,
-        });
-      } else {
-        unarchiveError.showError(workspaceId, result.error ?? "Failed to restore workspace");
-      }
+      unarchiveError.showError(
+        workspaceId,
+        result.error ?? "Failed to restore workspace",
+        resolvePopoverErrorAnchor(anchorEl)
+      );
     } finally {
       setProcessingIds((prev) => {
         const next = new Set(prev);
@@ -675,8 +671,7 @@ export const ArchivedWorkspaces: React.FC<ArchivedWorkspacesProps> = ({
   };
 
   const handleDeleteWorktree = async (workspaceId: string, anchorEl?: HTMLElement) => {
-    const rect = anchorEl?.getBoundingClientRect();
-    const anchor = rect ? { top: rect.top + window.scrollY, left: rect.right + 10 } : undefined;
+    const anchor = resolvePopoverErrorAnchor(anchorEl);
 
     if (!api) {
       deleteWorktreeError.showError(workspaceId, "Not connected to server", anchor);

src/browser/components/ChatPane/ChatPane.tsx

@@ -41,6 +41,7 @@ import {
   mergeConsecutiveStreamErrors,
   computeBashOutputGroupInfos,
   shouldBypassDeferredMessages,
+  isBashMonitorWakeMessage,
 } from "@/browser/utils/messages/messageUtils";
 import { computeTaskReportLinking } from "@/browser/utils/messages/taskReportLinking";
 import { BashCollapsedSummaryModeProvider } from "@/browser/features/Tools/BashCollapsedSummaryModeContext";
@@ -764,7 +765,7 @@ const ChatPaneContent: React.FC<ChatPaneContentProps> = (props) => {
     const userHistoryIds: string[] = [];
     for (const message of deferredMessages) {
       // Monitor wake events should not interrupt navigation between human prompts.
-      if (message.type === "user" && message.bashMonitorWake == null) {
+      if (message.type === "user" && !isBashMonitorWakeMessage(message)) {
         userHistoryIds.push(message.historyId);
       }
     }

src/browser/components/ChatPane/WorkspaceFooterBar.tsx

@@ -151,6 +151,11 @@ function WorkspaceBranchControls(props: {
   );
 }
 
+// Shared by the footer's interactive pills (repository link, "Last prompt") so they keep reading as
+// one affordance family: restyling one silently drifting from the other is the failure mode here.
+const FOOTER_PILL_CLASS =
+  "text-muted hover:bg-hover hover:text-foreground focus-visible:ring-accent flex h-5 shrink-0 items-center gap-1 rounded-md px-1.5 transition-colors focus-visible:ring-1";
+
 function FooterRepositoryLabel(props: { workspaceId: string; projectLabel: string }) {
   const workspacePR = useWorkspacePR(props.workspaceId);
 
@@ -169,7 +174,7 @@ function FooterRepositoryLabel(props: { workspaceId: string; projectLabel: strin
           target="_blank"
           rel="noopener noreferrer"
           data-testid="workspace-footer-repository"
-          className="text-muted hover:bg-hover hover:text-foreground focus-visible:ring-accent flex h-5 shrink-0 items-center gap-1 rounded-md px-1.5 transition-colors focus-visible:ring-1"
+          className={FOOTER_PILL_CLASS}
         >
           <Github className="h-3 w-3 shrink-0" aria-hidden="true" />
           <span className="font-mono">{slug}</span>
@@ -320,7 +325,8 @@ function FooterLastPrompt(props: { workspaceId: string }) {
           <PopoverTrigger asChild>
             <button
               type="button"
-              className="text-muted hover:bg-hover hover:text-foreground focus-visible:ring-accent flex h-5 shrink-0 cursor-pointer items-center gap-1 rounded-md border-0 bg-transparent px-1.5 transition-colors focus-visible:ring-1"
+              // The extra classes are <button> resets; the pill styling itself is shared.
+              className={cn(FOOTER_PILL_CLASS, "cursor-pointer border-0 bg-transparent")}
               data-testid="workspace-footer-last-prompt"
               onKeyDown={stopKeyboardPropagation}
             >

src/browser/components/ConnectionStatusToast/ConnectionStatusToast.tsx

@@ -1,8 +1,6 @@
 import React from "react";
 import { useAPI } from "@/browser/contexts/API";
-
-const wrapperClassName =
-  "pointer-events-none absolute right-[15px] bottom-full left-[15px] z-[1000] mb-2 [&>*]:pointer-events-auto";
+import { CHAT_DOCK_TOAST_OVERLAY_CLASS } from "@/constants/layout";
 
 /**
  * Connection status banner that uses the same *overlay placement* as ChatInputToast.
@@ -55,7 +53,7 @@ export const ConnectionStatusToast: React.FC<ConnectionStatusToastProps> = ({ wr
 
     if (!wrap) return content;
 
-    return <div className={wrapperClassName}>{content}</div>;
+    return <div className={CHAT_DOCK_TOAST_OVERLAY_CLASS}>{content}</div>;
   }
 
   if (apiState.status === "error") {
@@ -75,7 +73,7 @@ export const ConnectionStatusToast: React.FC<ConnectionStatusToastProps> = ({ wr
 
     if (!wrap) return content;
 
-    return <div className={wrapperClassName}>{content}</div>;
+    return <div className={CHAT_DOCK_TOAST_OVERLAY_CLASS}>{content}</div>;
   }
 
   return null;

src/browser/components/ModelSelector/ModelSelector.tsx

@@ -406,33 +406,34 @@ export const ModelSelector = forwardRef<ModelSelectorRef, ModelSelectorProps>(
                   const modelProvider = getModelProvider(model);
                   const showProviderLabel =
                     modelProvider.length > 0 && duplicateModelNames.has(modelName);
+                  // Name the row's selection/highlight state once so the option class, ARIA state,
+                  // and accent styling below can't drift apart (mirrors AgentModePicker).
+                  const isHighlighted = index === highlightedIndex;
+                  const isSelected = value === model;
 
                   return (
                     <div
                       key={model}
-                      data-highlighted={index === highlightedIndex}
+                      data-highlighted={isHighlighted}
                       onMouseEnter={() => setHighlightedIndex(index)}
                       className={composerPickerOptionClass(
-                        {
-                          isHighlighted: index === highlightedIndex,
-                          isSelected: value === model,
-                        },
+                        { isHighlighted, isSelected },
                         "py-1",
                         hiddenSet.has(model) && "opacity-50"
                       )}
                       onClick={() => handleSelectModel(model)}
                       role="option"
-                      aria-selected={value === model}
+                      aria-selected={isSelected}
                     >
                       <ProviderIcon
                         provider={modelProvider}
                         className={cn(
                           "h-3 w-3 shrink-0",
-                          value === model ? "text-accent" : "text-muted"
+                          isSelected ? "text-accent" : "text-muted"
                         )}
                       />
                       <span className="flex min-w-0 flex-1 items-baseline gap-1">
-                        <span className={cn("min-w-0 truncate", value === model && "text-accent")}>
+                        <span className={cn("min-w-0 truncate", isSelected && "text-accent")}>
                           {formatModelDisplayName(modelName)}
                         </span>
                         {showProviderLabel && (

src/browser/components/ProjectSidebar/ProjectSidebar.tsx

@@ -126,7 +126,7 @@ import {
 } from "lucide-react";
 import { useWorkspaceActions } from "@/browser/contexts/WorkspaceContext";
 import { useRouter } from "@/browser/contexts/RouterContext";
-import { usePopoverError } from "@/browser/hooks/usePopoverError";
+import { resolvePopoverErrorAnchor, usePopoverError } from "@/browser/hooks/usePopoverError";
 import { forkWorkspace } from "@/browser/utils/chatCommands";
 import { PopoverError } from "../PopoverError/PopoverError";
 import { SectionHeader } from "../SectionHeader/SectionHeader";
@@ -1017,14 +1017,7 @@ const ProjectSidebarInner: React.FC<ProjectSidebarProps> = ({
         return;
       }
 
-      let anchor: { top: number; left: number } | undefined;
-      if (buttonElement) {
-        const rect = buttonElement.getBoundingClientRect();
-        anchor = {
-          top: rect.top + window.scrollY,
-          left: rect.right + 10,
-        };
-      }
+      const anchor = resolvePopoverErrorAnchor(buttonElement);
 
       try {
         const result = await forkWorkspace({
@@ -1046,14 +1039,7 @@ const ProjectSidebarInner: React.FC<ProjectSidebarProps> = ({
 
   const handleStopRuntime = useCallback(
     async (workspaceId: string, buttonElement?: HTMLElement) => {
-      let anchor: { top: number; left: number } | undefined;
-      if (buttonElement) {
-        const rect = buttonElement.getBoundingClientRect();
-        anchor = {
-          top: rect.top + window.scrollY,
-          left: rect.right + 10,
-        };
-      }
+      const anchor = resolvePopoverErrorAnchor(buttonElement);
 
       if (!api) {
         workspaceStopRuntimeError.showError(workspaceId, "Not connected to server", anchor);
@@ -1306,14 +1292,7 @@ const ProjectSidebarInner: React.FC<ProjectSidebarProps> = ({
         message = error.message ?? "Failed to remove project";
       }
 
-      let anchor: { top: number; left: number } | undefined;
-      if (buttonElement) {
-        const rect = buttonElement.getBoundingClientRect();
-        anchor = {
-          top: rect.top + window.scrollY,
-          left: rect.right + 10,
-        };
-      }
+      const anchor = resolvePopoverErrorAnchor(buttonElement);
 
       projectRemoveError.showError(projectPath, message, anchor);
     },
@@ -1378,16 +1357,7 @@ const ProjectSidebarInner: React.FC<ProjectSidebarProps> = ({
   ) => {
     // Capture the anchor location up front because the sub-project action menu unmounts its
     // button immediately after click; failures still need stable error placement.
-    const anchor =
-      buttonElement != null
-        ? (() => {
-            const buttonRect = buttonElement.getBoundingClientRect();
-            return {
-              top: buttonRect.top + window.scrollY,
-              left: buttonRect.right + 10,
-            };
-          })()
-        : undefined;
+    const anchor = resolvePopoverErrorAnchor(buttonElement);
 
     // Removing a sub-project unregisters it and clears the cwd pointer from its workspaces.
     const workspacesInSection = (userProjects.get(projectPath)?.workspaces ?? []).filter(