diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/RepoScanUnavailableIndicator.tsx b/src/renderer/src/components/sidebar/worktree-list/rows/RepoScanUnavailableIndicator.tsx
index 3d3b1dc91ea..bcc08529218 100644
--- a/src/renderer/src/components/sidebar/worktree-list/rows/RepoScanUnavailableIndicator.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/rows/RepoScanUnavailableIndicator.tsx
@@ -18,16 +18,10 @@ import {
 const WORKTREE_SCAN_FIX_COMMANDS = {
   'xcode-license': 'sudo xcodebuild -license',
   'developer-tools': 'xcode-select --install'
-} as const
+} as const satisfies Partial<Record<WorktreeScanFailureKind, string>>
 
 function fixCommandForFailureKind(kind: WorktreeScanFailureKind): string | undefined {
-  if (kind === 'xcode-license') {
-    return WORKTREE_SCAN_FIX_COMMANDS['xcode-license']
-  }
-  if (kind === 'developer-tools') {
-    return WORKTREE_SCAN_FIX_COMMANDS['developer-tools']
-  }
-  return undefined
+  return WORKTREE_SCAN_FIX_COMMANDS[kind]
 }
 
 /**
@@ -50,11 +44,12 @@ export function RepoScanUnavailableIndicator({ repo }: { repo: Repo }): React.JS
     'auto.components.sidebar.RepoScanUnavailableIndicator.retry',
     'Retry scan'
   )
-  const isLocalHost = getRepoExecutionHostId(repo) === 'local' && !repo.connectionId
+  const executionHostId = getRepoExecutionHostId(repo)
+  const isLocalHost = executionHostId === 'local' && !repo.connectionId
   const isLocalMac = isLocalHost && navigator.userAgent.includes('Mac')
-  const failureKind: WorktreeScanFailureKind = isLocalMac
-    ? (detected.failureKind ?? classifyWorktreeScanFailure(detected.unavailableReason))
-    : 'unknown'
+  const failureKind: WorktreeScanFailureKind =
+    detected.failureKind ??
+    (isLocalMac ? classifyWorktreeScanFailure(detected.unavailableReason) : 'unknown')
   const failureMessageByKind: Partial<Record<WorktreeScanFailureKind, string>> = {
     'xcode-license': translate(
       'auto.components.sidebar.RepoScanUnavailableIndicator.xcodeLicense',
@@ -70,12 +65,12 @@ export function RepoScanUnavailableIndicator({ repo }: { repo: Repo }): React.JS
     )
   }
   const failureMessage = failureMessageByKind[failureKind] ?? detected.unavailableReason
-  const fixCommand = fixCommandForFailureKind(failureKind)
+  const fixCommand = isLocalMac ? fixCommandForFailureKind(failureKind) : undefined
   const diagnosticText = [
     `Repository: ${repo.displayName}`,
     ...(isLocalMac
       ? [`Path: ${repo.path}`, 'Client platform: macOS']
-      : [`Execution host: ${getRepoExecutionHostId(repo)}`]),
+      : [`Execution host: ${executionHostId}`]),
     `Failure: ${detected.unavailableReason}`
   ].join('\n')
   const copyText = async (value: string): Promise<void> => {
@@ -83,7 +78,7 @@ export function RepoScanUnavailableIndicator({ repo }: { repo: Repo }): React.JS
   }
   return (
     <TooltipProvider disableHoverableContent={false}>
-      <Tooltip>
+      <Tooltip delayDuration={400}>
         <TooltipTrigger asChild>
           <button
             type="button"
@@ -102,7 +97,7 @@ export function RepoScanUnavailableIndicator({ repo }: { repo: Repo }): React.JS
               event.stopPropagation()
               setPending(true)
               void fetchWorktrees(repo.id, {
-                executionHostId: getRepoExecutionHostId(repo)
+                executionHostId
               }).finally(() => setPending(false))
             }}
           >
diff --git a/src/renderer/src/store/slices/worktrees/listing/detected-worktree-provider-request.ts b/src/renderer/src/store/slices/worktrees/listing/detected-worktree-provider-request.ts
index fe7bca3384c..4f13b4a6105 100644
--- a/src/renderer/src/store/slices/worktrees/listing/detected-worktree-provider-request.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/detected-worktree-provider-request.ts
@@ -16,13 +16,7 @@ import type {
 } from './worktree-slice-types'
 import { isRuntimeMethodNotFoundError } from './runtime-worktree-rpc-errors'
 import { toLegacyDetectedWorktreeResult } from './worktree-host-ownership'
-
-const detectedWorktreeFailureKinds = new Set([
-  'xcode-license',
-  'developer-tools',
-  'architecture-mismatch',
-  'unknown'
-])
+import { isWorktreeScanFailureKind } from '../../../../../../shared/worktree-scan-failure'
 
 export async function listDetectedWorktreesForRepo(
   settings: AppState['settings'],
@@ -94,7 +88,7 @@ export function isDetectedWorktreeListResult(value: unknown): value is DetectedW
       result.source === 'metadata-fallback' ||
       result.source === 'session-fallback') &&
     Array.isArray(result.worktrees) &&
-    (result.failureKind === undefined || detectedWorktreeFailureKinds.has(result.failureKind))
+    (result.failureKind === undefined || isWorktreeScanFailureKind(result.failureKind))
   )
 }
 
diff --git a/src/shared/worktree-scan-failure.ts b/src/shared/worktree-scan-failure.ts
index 3c33324d67a..80c9d2db810 100644
--- a/src/shared/worktree-scan-failure.ts
+++ b/src/shared/worktree-scan-failure.ts
@@ -1,8 +1,15 @@
-export type WorktreeScanFailureKind =
-  | 'xcode-license'
-  | 'developer-tools'
-  | 'architecture-mismatch'
-  | 'unknown'
+export const WORKTREE_SCAN_FAILURE_KINDS = [
+  'xcode-license',
+  'developer-tools',
+  'architecture-mismatch',
+  'unknown'
+] as const
+
+export type WorktreeScanFailureKind = (typeof WORKTREE_SCAN_FAILURE_KINDS)[number]
+
+export function isWorktreeScanFailureKind(value: unknown): value is WorktreeScanFailureKind {
+  return WORKTREE_SCAN_FAILURE_KINDS.some((kind) => kind === value)
+}
 
 export function classifyWorktreeScanFailure(reason: string): WorktreeScanFailureKind {
   if (/Agreeing to the Xcode\/iOS license requires admin privileges/i.test(reason)) {