🤖 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
 

src/browser/App.tsx

@@ -44,6 +44,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 { buildCoreSources, type BuildSourcesParams } from "./utils/commands/sources";
 
@@ -225,8 +226,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/ChatPane/ChatPane.tsx

@@ -40,6 +40,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";
@@ -103,6 +104,7 @@ import {
   useBackgroundBashError,
 } from "@/browser/contexts/BackgroundBashContext";
 import { hasWorkspaceRepository } from "@/browser/utils/workspaceCapabilities";
+import { isPrimaryMouseButton } from "@/browser/utils/events";
 import {
   buildEditingStateFromDisplayed,
   canEditDisplayedUserMessage,
@@ -837,7 +839,7 @@ const ChatPaneContent: React.FC<ChatPaneContentProps> = (props) => {
   );
 
   const handleComposerDockMouseDown = (event: React.MouseEvent<HTMLDivElement>) => {
-    if (event.defaultPrevented || event.button !== 0) {
+    if (event.defaultPrevented || !isPrimaryMouseButton(event)) {
       return;
     }
     const control = resolveComposerControlFocusTarget(event.target, composerDockRef.current);
@@ -895,7 +897,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

@@ -143,6 +143,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);
 
@@ -161,7 +166,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>
@@ -238,7 +243,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/TaskGroupListItem.tsx

@@ -54,6 +54,12 @@ function getAggregateVisualState(props: TaskGroupListItemProps): VisualState {
 
 export function TaskGroupListItem(props: TaskGroupListItemProps) {
   const contextMenu = useContextMenuPosition();
+  // Variant-group archive is fire-and-forget from the row.
+  const archiveAll = (buttonElement: HTMLElement) => {
+    props.onArchiveAll?.(buttonElement).catch(() => {
+      // The sidebar owner surfaces archive failures through its shared error UI.
+    });
+  };
   const hasRunningWork = props.runningCount > 0;
   const aggregateState = getAggregateVisualState(props);
   const statusDescriptionId = `task-group-status-${props.groupId}`;
@@ -104,9 +110,7 @@ export function TaskGroupListItem(props: TaskGroupListItemProps) {
         if (props.onArchiveAll && matchesKeybind(event, KEYBINDS.ARCHIVE_WORKSPACE)) {
           event.preventDefault();
           stopKeyboardPropagation(event);
-          props.onArchiveAll(event.currentTarget).catch(() => {
-            // The sidebar owner surfaces archive failures through its shared error UI.
-          });
+          archiveAll(event.currentTarget);
           return;
         }
         if (event.target !== event.currentTarget) {
@@ -191,9 +195,7 @@ export function TaskGroupListItem(props: TaskGroupListItemProps) {
             variant="destructive"
             onClick={(event) => {
               contextMenu.close();
-              props.onArchiveAll?.(event.currentTarget).catch(() => {
-                // The sidebar owner surfaces archive failures through its shared error UI.
-              });
+              archiveAll(event.currentTarget);
             }}
           />
         </PositionedMenu>

src/browser/components/WorkspaceMenuBar/WorkspaceMenuBar.tsx

@@ -48,7 +48,10 @@ import { forkWorkspace } from "@/browser/utils/chatCommands";
 import { SCRATCH_PROJECT_CONFIG_KEY, SCRATCH_PROJECT_NAME } from "@/common/constants/scratch";
 import { hasWorkspaceRepository } from "@/browser/utils/workspaceCapabilities";
 import { stopKeyboardPropagation } from "@/browser/utils/events";
-import { WORKSPACE_MENU_BAR_LEFT_SIDEBAR_COLLAPSED_PADDING_PX } from "@/constants/layout";
+import {
+  MOBILE_TOUCH_MEDIA_QUERY,
+  WORKSPACE_MENU_BAR_LEFT_SIDEBAR_COLLAPSED_PADDING_PX,
+} from "@/constants/layout";
 import type { AgentSkillDescriptor, AgentSkillIssue } from "@/common/types/agentSkill";
 
 interface WorkspaceMenuBarProps {
@@ -163,7 +166,7 @@ export const WorkspaceMenuBar: React.FC<WorkspaceMenuBarProps> = ({
 
   const handleOpenTerminal = useCallback(() => {
     // On mobile touch devices, always use popout since the right sidebar is hidden
-    const isMobileTouch = window.matchMedia("(max-width: 768px) and (pointer: coarse)").matches;
+    const isMobileTouch = window.matchMedia(MOBILE_TOUCH_MEDIA_QUERY).matches;
     if (onOpenTerminal && !isMobileTouch) {
       onOpenTerminal();
     } else {
@@ -173,8 +176,7 @@ export const WorkspaceMenuBar: React.FC<WorkspaceMenuBarProps> = ({
   }, [workspaceId, openTerminalPopout, runtimeConfig, onOpenTerminal]);
 
   const isTouchMobileScreen =
-    typeof window !== "undefined" &&
-    window.matchMedia("(max-width: 768px) and (pointer: coarse)").matches;
+    typeof window !== "undefined" && window.matchMedia(MOBILE_TOUCH_MEDIA_QUERY).matches;
 
   const isDevcontainerWorkspace = isDevcontainerRuntime(runtimeConfig);
   const isRuntimeRunning = isDevcontainerWorkspace && runtimeStatus === "running";

src/browser/components/WorkspaceModeAISync/WorkspaceModeAISync.tsx

@@ -43,7 +43,7 @@ export function WorkspaceModeAISync(props: { workspaceId: string }): null {
     const modelKey = getModelKey(workspaceId);
     const thinkingKey = getThinkingLevelKey(workspaceId);
 
-    const normalizedAgentId = normalizeAgentId(agentId, "exec");
+    const normalizedAgentId = normalizeAgentId(agentId);
 
     const isExplicitAgentSwitch =
       prevAgentIdRef.current !== null &&

src/browser/components/WorkspaceShell/WorkspaceShell.tsx

@@ -24,6 +24,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 { ChatPane } from "../ChatPane/ChatPane";
 
@@ -157,7 +158,7 @@ export const WorkspaceShell: React.FC<WorkspaceShellProps> = (props) => {
   const handleOpenTerminal = useCallback(
     (options?: TerminalSessionCreateOptions) => {
       // On mobile touch devices, always use popout since the right sidebar is hidden
-      const isMobileTouch = window.matchMedia("(max-width: 768px) and (pointer: coarse)").matches;
+      const isMobileTouch = window.matchMedia(MOBILE_TOUCH_MEDIA_QUERY).matches;
       if (isMobileTouch) {
         void openTerminalPopout(props.workspaceId, props.runtimeConfig, options);
       } else {

src/browser/features/ChatInput/ChatInputToast.tsx

@@ -2,6 +2,7 @@ import type { ReactNode } from "react";
 import { AlertTriangle, Check } from "lucide-react";
 import React, { useEffect, useCallback } from "react";
 import { cn } from "@/common/lib/utils";
+import { CHAT_DOCK_TOAST_OVERLAY_CLASS } from "@/constants/layout";
 
 const toastTypeStyles: Record<"success" | "error", string> = {
   success: "bg-toast-success-bg border border-accent-dark text-toast-success-text",
@@ -31,9 +32,6 @@ export const SolutionLabel: React.FC<{ children: ReactNode }> = ({ children }) =
   <div className="text-muted-light mb-1 text-[10px] uppercase">{children}</div>
 );
 
-const wrapperClassName =
-  "pointer-events-none absolute right-[15px] bottom-full left-[15px] z-[1000] mb-2 [&>*]:pointer-events-auto";
-
 export const ChatInputToast: React.FC<ChatInputToastProps> = ({
   toast,
   onDismiss,
@@ -149,5 +147,5 @@ export const ChatInputToast: React.FC<ChatInputToastProps> = ({
 
   if (!wrap) return content;
 
-  return <div className={wrapperClassName}>{content}</div>;
+  return <div className={CHAT_DOCK_TOAST_OVERLAY_CLASS}>{content}</div>;
 };

src/browser/features/ChatInput/index.tsx

@@ -230,7 +230,9 @@ import {
   COMPOSER_PRO_HIDE_CLASS,
   COMPOSER_WORKSPACE_ICON_ONLY_HIDE_CLASS,
   CHAT_DOCK_GUTTER_CLASS,
+  CHAT_DOCK_TOAST_OVERLAY_CLASS,
   CREATION_COLUMN_MAX_WIDTH_CLASS,
+  MOBILE_TOUCH_MEDIA_QUERY,
 } from "@/constants/layout";
 import { useChatDockColumnWidthClass } from "@/browser/components/ChatPane/chatDockColumn";
 
@@ -353,14 +355,12 @@ const ChatInputInner: React.FC<ChatInputProps> = (props) => {
   const isStreamStarting = variant === "workspace" ? (props.isStreamStarting ?? false) : false;
   const isCompacting = variant === "workspace" ? (props.isCompacting ?? false) : false;
   const [isMobileTouch, setIsMobileTouch] = useState(
-    () =>
-      typeof window !== "undefined" &&
-      window.matchMedia("(max-width: 768px) and (pointer: coarse)").matches
+    () => typeof window !== "undefined" && window.matchMedia(MOBILE_TOUCH_MEDIA_QUERY).matches
   );
   useEffect(() => {
     if (typeof window === "undefined") return;
 
-    const mobileTouchMediaQuery = window.matchMedia("(max-width: 768px) and (pointer: coarse)");
+    const mobileTouchMediaQuery = window.matchMedia(MOBILE_TOUCH_MEDIA_QUERY);
     const handleMobileTouchChange = () => {
       setIsMobileTouch(mobileTouchMediaQuery.matches);
     };
@@ -895,7 +895,7 @@ const ChatInputInner: React.FC<ChatInputProps> = (props) => {
         return;
       }
 
-      const normalizedAgentId = normalizeAgentId(agentId, "exec");
+      const normalizedAgentId = normalizeAgentId(agentId);
 
       updatePersistedState<WorkspaceAISettingsByAgentCache>(
         getWorkspaceAISettingsByAgentKey(workspaceId),
@@ -1240,7 +1240,7 @@ const ChatInputInner: React.FC<ChatInputProps> = (props) => {
 
     const fallbackModel = defaultModel;
 
-    const normalizedAgentId = normalizeAgentId(agentId, "exec");
+    const normalizedAgentId = normalizeAgentId(agentId);
 
     const isExplicitAgentSwitch =
       prevCreationAgentIdRef.current !== null &&
@@ -2548,13 +2548,16 @@ const ChatInputInner: React.FC<ChatInputProps> = (props) => {
       discovery: skillDiscovery,
     });
 
+    // The initial /goal path sets a goal without sending a user message, so
+    // attachments would be silently dropped. With attachments present, skip
+    // command processing and send the raw text as a normal message instead.
+    // Shared by the creation route below and the workspace path (transferred
+    // creation drafts retried in the composer), which resolve `parsed` and
+    // `attachments` identically.
+    const goalCommandBypassedForAttachments = parsed?.type === "goal-set" && attachments.length > 0;
+
     // Route to creation handler for creation variant
     if (variant === "creation") {
-      // The initial /goal path sets a goal without sending a user message, so
-      // attachments would be silently dropped. With attachments present, skip
-      // command processing and send the raw text as a normal message instead.
-      const goalCommandBypassedForAttachments =
-        parsed?.type === "goal-set" && attachments.length > 0;
       const initialSlashCommand =
         parsed?.type === "goal-set" && !goalCommandBypassedForAttachments ? parsed : undefined;
       if (
@@ -2659,12 +2662,6 @@ const ChatInputInner: React.FC<ChatInputProps> = (props) => {
 
     try {
       const modelOneShot = parsed?.type === "model-oneshot" ? parsed : null;
-      // Mirror the creation-composer /goal bypass: with attachments present,
-      // send the raw text as a normal message instead of processing the
-      // command, which would drop the files. Transferred staging-failure
-      // drafts (raw /goal text + staged/pending chips) retry through here.
-      const goalCommandBypassedForAttachments =
-        parsed?.type === "goal-set" && attachments.length > 0;
       const commandHandled =
         modelOneShot || goalCommandBypassedForAttachments
           ? false
@@ -3253,7 +3250,7 @@ const ChatInputInner: React.FC<ChatInputProps> = (props) => {
       >
         <div className={cn(variant === "creation" ? "w-full" : chatDockColumnWidthClass)}>
           {/* Toasts (overlay) */}
-          <div className="pointer-events-none absolute right-[15px] bottom-full left-[15px] z-[1000] mb-2 flex flex-col gap-2 [&>*]:pointer-events-auto">
+          <div className={cn(CHAT_DOCK_TOAST_OVERLAY_CLASS, "flex flex-col gap-2")}>
             <ConnectionStatusToast wrap={false} />
             <ChatInputToast
               toast={activeToast}