@pheem49/mint 1.16.0 → 1.18.0

package/src/renderer/shared/components/workspace/BackgroundTerminals.test.tsx

@@ -0,0 +1,63 @@
+import { describe, expect, it } from 'vitest'
+import { backgroundPollIntervalMs, filterScopedJobs } from './BackgroundTerminals'
+import { shouldPollSessionSources } from '../../utils/useSessionSources'
+import type { BackgroundJob } from '../../types'
+
+describe('BackgroundTerminals scoping and polling optimization', () => {
+  const sampleJobs: BackgroundJob[] = [
+    {
+      id: 'job-1',
+      command: 'npm run dev',
+      workspacePath: '/home/user/project-a',
+      status: 'running',
+      createdAt: '2026-10-21T00:00:00Z',
+      exitCode: null,
+    },
+    {
+      id: 'job-2',
+      command: 'cargo build',
+      workspacePath: '/home/user/project-b',
+      status: 'completed',
+      createdAt: '2026-10-21T00:00:00Z',
+      exitCode: 0,
+    },
+    {
+      id: 'job-3',
+      command: 'vite preview',
+      workspacePath: '/home/user/project-a',
+      status: 'running',
+      createdAt: '2026-10-21T00:00:00Z',
+      exitCode: null,
+    },
+  ]
+
+  it('filters scoped jobs in memory without needing a second API request', () => {
+    const scopedA = filterScopedJobs(sampleJobs, '/home/user/project-a')
+    expect(scopedA.map(j => j.id)).toEqual(['job-1', 'job-3'])
+
+    const scopedB = filterScopedJobs(sampleJobs, '/home/user/project-b')
+    expect(scopedB.map(j => j.id)).toEqual(['job-2'])
+  })
+
+  it('returns empty array when workspacePath is null or undefined', () => {
+    expect(filterScopedJobs(sampleJobs, null)).toEqual([])
+    expect(filterScopedJobs(sampleJobs, undefined)).toEqual([])
+    expect(filterScopedJobs(sampleJobs, '')).toEqual([])
+  })
+
+  it('uses adaptive polling interval when background panel is closed and no jobs are running', () => {
+    const idleJobs = sampleJobs.filter(j => j.status === 'completed')
+    expect(backgroundPollIntervalMs(false, [])).toBe(10000)
+    expect(backgroundPollIntervalMs(false, idleJobs)).toBe(10000)
+    expect(backgroundPollIntervalMs(true, idleJobs)).toBe(3000)
+    expect(backgroundPollIntervalMs(false, sampleJobs)).toBe(3000)
+  })
+
+  it('polls session sources only when the Tools launcher or Sources tab is active', () => {
+    expect(shouldPollSessionSources(false, null)).toBe(false)
+    expect(shouldPollSessionSources(true, null)).toBe(true)
+    expect(shouldPollSessionSources(true, 'sources')).toBe(true)
+    expect(shouldPollSessionSources(true, 'term-1')).toBe(false)
+    expect(shouldPollSessionSources(true, 'review:1')).toBe(false)
+  })
+})

package/src/renderer/shared/components/{BackgroundTerminals.tsx → workspace/BackgroundTerminals.tsx}

@@ -1,20 +1,30 @@
 import { useEffect, useRef, useState } from 'react'
 import { createPortal } from 'react-dom'
 import { Trash2, X } from 'lucide-react'
-import { backgroundPlatform, runtimePlatform } from '../platform'
-import type { BackgroundJob, BackgroundJobOutput } from '../types'
+import { backgroundPlatform, runtimePlatform } from '../../platform'
+import type { BackgroundJob, BackgroundJobOutput } from '../../types'
 import './background-terminals.css'
 
 const active = (job: BackgroundJob) => job.status === 'running' || job.status === 'stopping'
 const elapsed = (seconds: number) => `${Math.floor(seconds / 60).toString().padStart(2, '0')}:${(seconds % 60).toString().padStart(2, '0')}`
 const workspaceName = (path: string) => path.split(/[\\/]/).filter(Boolean).pop() || path
 
+export const filterScopedJobs = (jobs: BackgroundJob[], workspacePath?: string | null): BackgroundJob[] =>
+  workspacePath ? jobs.filter(job => job.workspacePath === workspacePath) : []
+
+export const backgroundPollIntervalMs = (open: boolean, jobs: BackgroundJob[]): number =>
+  open || jobs.some(active) ? 3000 : 10000
+
 export function BackgroundTerminals({ workspacePath, panelTarget, onCountChange }: {
   workspacePath?: string | null; panelTarget: HTMLElement | null; onCountChange: (count: number) => void
 }) {
   const [jobs, setJobs] = useState<BackgroundJob[]>([])
   const [scope, setScope] = useState<{ workspace: string | null | undefined; ids: Set<string> }>({ workspace: undefined, ids: new Set() })
   const open = Boolean(panelTarget)
+  const openRef = useRef(open)
+  openRef.current = open
+  const jobsRef = useRef(jobs)
+  jobsRef.current = jobs
   const [all, setAll] = useState(false)
   const [selected, setSelected] = useState<string | null>(null)
   const [output, setOutput] = useState<BackgroundJobOutput | null>(null)
@@ -30,13 +40,25 @@ export function BackgroundTerminals({ workspacePath, panelTarget, onCountChange
   useEffect(() => {
     let disposed = false
     let busy = false
+    let timer: ReturnType<typeof window.setTimeout> | undefined
     setLoading(true)
+    const scheduleNext = (latestJobs: BackgroundJob[]) => {
+      if (disposed) return
+      if (timer !== undefined) window.clearTimeout(timer)
+      timer = window.setTimeout(() => void refresh(), backgroundPollIntervalMs(openRef.current, latestJobs))
+    }
     const refresh = async () => {
-      if (busy || document.hidden) return
+      if (busy || document.hidden) {
+        scheduleNext(jobsRef.current)
+        return
+      }
       busy = true
+      let latestJobs = jobsRef.current
       try {
-        const [next, scoped] = await Promise.all([backgroundPlatform.list(), workspacePath ? backgroundPlatform.list(workspacePath) : Promise.resolve([])])
+        const next = await backgroundPlatform.list()
         if (disposed) return
+        latestJobs = next
+        const scoped = filterScopedJobs(next, workspacePath)
         let message = ''
         for (const job of next) {
           const previous = statuses.current.get(job.id)
@@ -53,16 +75,25 @@ export function BackgroundTerminals({ workspacePath, panelTarget, onCountChange
         if (!disposed) {
           const message = String(cause)
           setError(`Status unavailable · ${message}`)
-          if (/401:|403:/.test(message)) { setJobs([]); setOutput(null); statuses.current.clear() }
+          if (/401:|403:/.test(message)) { latestJobs = []; setJobs([]); setOutput(null); statuses.current.clear() }
         }
-      } finally { busy = false; if (!disposed) setLoading(false) }
+      } finally {
+        busy = false
+        if (!disposed) {
+          setLoading(false)
+          scheduleNext(latestJobs)
+        }
+      }
     }
     void refresh()
-    const timer = window.setInterval(() => void refresh(), 1000)
     const resume = () => { if (!document.hidden) void refresh() }
     document.addEventListener('visibilitychange', resume)
-    return () => { disposed = true; window.clearInterval(timer); document.removeEventListener('visibilitychange', resume) }
-  }, [workspacePath])
+    return () => {
+      disposed = true
+      if (timer !== undefined) window.clearTimeout(timer)
+      document.removeEventListener('visibilitychange', resume)
+    }
+  }, [workspacePath, open])
 
   useEffect(() => {
     if (!open || !selected) { setOutput(null); return }

package/src/renderer/shared/components/workspace/CodeReviewPage.test.tsx

@@ -0,0 +1,50 @@
+import React from 'react'
+import { renderToStaticMarkup } from 'react-dom/server'
+import { describe, expect, it } from 'vitest'
+import CodeReviewPage from './CodeReviewPage'
+import type { FileChange } from '../../types'
+
+describe('CodeReviewPage', () => {
+  const sampleChanges: FileChange[] = [
+    {
+      path: 'src/generate_harness_pdf.py',
+      created: false,
+      additions: 10,
+      deletions: 2,
+      hunks: [
+        {
+          oldStart: 1,
+          oldLines: 1,
+          newStart: 1,
+          newLines: 2,
+          oldText: 'print("hello")',
+          newText: 'print("hello")\nprint("world")',
+        },
+      ],
+    },
+  ]
+
+  it('renders tree items with draggable attributes and drag tooltip for chat input', () => {
+    const html = renderToStaticMarkup(
+      <CodeReviewPage
+        changes={sampleChanges}
+        workspacePath="/home/user/project"
+      />
+    )
+
+    // Tree file button is draggable
+    expect(html).toContain('class="code-review-tree-file')
+    expect(html).toMatch(/class="code-review-tree-file[^"]*"[^>]*draggable="true"/)
+    expect(html).toContain('title="src/generate_harness_pdf.py (Drag to chat)"')
+
+    // Tree folder button is draggable
+    expect(html).toContain('class="code-review-tree-folder-btn"')
+    expect(html).toMatch(/class="code-review-tree-folder-btn"[^>]*draggable="true"/)
+    expect(html).toContain('title="src (Drag to chat)"')
+
+    // Diff view file bar path is draggable
+    expect(html).toContain('class="code-review-file-bar-path"')
+    expect(html).toMatch(/class="code-review-file-bar-path"[^>]*draggable="true"/)
+    expect(html).toContain('title="src/generate_harness_pdf.py (Drag to chat)"')
+  })
+})

package/src/renderer/shared/components/{CodeReviewPage.tsx → workspace/CodeReviewPage.tsx}

@@ -1,10 +1,9 @@
-import SelectField from './SelectField'
+import SelectField from '../ui/SelectField'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import type { PointerEvent as ReactPointerEvent } from 'react'
-import type { FileChange, GitBranchInfo, WorkspaceHistoryEntry } from '../types'
-import { workspacePlatform } from '../platform'
-import { useWorkspaceUndo } from '../workspaceUndo'
-import { HistoryDetails, UndoConfirmation } from './ReviewHistory'
+import type { FileChange, GitBranchInfo, WorkspaceHistoryEntry } from '../../types'
+import { workspacePlatform } from '../../platform'
+import { useWorkspaceUndo } from '../../workspaceUndo'
 import GitBranchSelector from './GitBranchSelector'
 import {
   materialFolderIcon,
@@ -13,8 +12,50 @@ import {
   folderOpenIcon,
   folderIcon,
   documentIcon,
-} from '../utils/fileIcons'
-import '../css/code-review.css'
+} from '../../utils/fileIcons'
+import { tokenizeLine } from '../../utils/syntaxHighlight'
+import { setWorkspaceDragData } from '../../utils/workspaceDrag'
+import '../../css/code-review.css'
+
+export function undoDescription(entry: WorkspaceHistoryEntry) {
+  switch (entry.kind) {
+    case 'edit': return entry.backup ? 'Restore the saved content from before this edit.' : 'Move the file created by this edit to Trash.'
+    case 'create': return 'Move this created file or folder to Trash.'
+    case 'trash': return 'Restore this file or folder to its original location.'
+    case 'move': return `Move ${entry.destination || entry.path} back to ${entry.path}.`
+    default: return entry.label
+  }
+}
+
+export function HistoryDetails({ entry }: { entry: WorkspaceHistoryEntry }) {
+  return <dl className="review-history-details">
+    <dt>File</dt><dd>{entry.path}</dd>
+    <dt>Action</dt><dd>{entry.label.replace(/^Undo /, '')}</dd>
+    {entry.destination && <><dt>Destination</dt><dd>{entry.destination}</dd></>}
+    <dt>Undo will</dt><dd>{undoDescription(entry)}</dd>
+  </dl>
+}
+
+export function UndoConfirmation({ entry, busy, error, onCancel, onConfirm }: {
+  entry: WorkspaceHistoryEntry; busy: boolean; error: string; onCancel: () => void; onConfirm: () => void
+}) {
+  const dialog = useRef<HTMLDialogElement>(null)
+  useEffect(() => {
+    const element = dialog.current
+    element?.showModal()
+    return () => element?.close()
+  }, [])
+  return <dialog ref={dialog} className="review-undo-dialog" aria-labelledby="review-undo-title" onCancel={event => { event.preventDefault(); if (!busy) onCancel() }}>
+    <h3 id="review-undo-title">Confirm Undo</h3>
+    <HistoryDetails entry={entry} />
+    <p>Undo is refused if the file has changed since this action or the destination is occupied.</p>
+    {error && <p role="alert">{error}</p>}
+    <div className="review-undo-actions">
+      <button type="button" autoFocus disabled={busy} onClick={onCancel}>Cancel</button>
+      <button type="button" disabled={busy} onClick={onConfirm}>{busy ? 'Undoing…' : 'Confirm Undo'}</button>
+    </div>
+  </dialog>
+}
 
 interface Props {
   title: string
@@ -329,6 +370,16 @@ export default function CodeReviewPage({
               style={{ paddingLeft: `${depth * 14 + 10}px` }}
               onClick={() => toggleFolder(node.path)}
               aria-expanded={!isCollapsed}
+              draggable="true"
+              onDragStart={(event) => {
+                event.stopPropagation()
+                setWorkspaceDragData(event.dataTransfer, {
+                  path: node.path,
+                  root: workspacePath,
+                  kind: 'directory',
+                })
+              }}
+              title={`${node.path} (Drag to chat)`}
             >
               <span className="code-review-chevron">{isCollapsed ? '›' : '⌄'}</span>
               <span className="code-review-tree-icon material-icon folder" aria-hidden="true">
@@ -350,6 +401,7 @@ export default function CodeReviewPage({
       const ext = getExtension(node.name)
       const fileIconSrc = materialFileIcon(node.name, ext) || documentIcon
       const isCreated = Boolean(node.change?.created)
+      const targetPath = node.change?.path || node.path
 
       return (
         <button
@@ -358,7 +410,16 @@ export default function CodeReviewPage({
           className={`code-review-tree-file${isSelected ? ' is-selected' : ''}`}
           style={{ paddingLeft: `${depth * 14 + 12}px` }}
           onClick={() => setSelectedPath(node.path)}
-          title={node.path}
+          title={`${node.path} (Drag to chat)`}
+          draggable="true"
+          onDragStart={(event) => {
+            event.stopPropagation()
+            setWorkspaceDragData(event.dataTransfer, {
+              path: targetPath,
+              root: workspacePath,
+              kind: 'file',
+            })
+          }}
         >
           <span className="code-review-tree-icon material-icon file" aria-hidden="true">
             {fileIconSrc && <img src={fileIconSrc} alt="" draggable={false} />}
@@ -552,7 +613,19 @@ export default function CodeReviewPage({
                 <span className={`code-review-file-bar-status ${selectedChange.created ? 'is-created' : 'is-modified'}`}>
                   {selectedChange.created ? 'A' : 'M'}
                 </span>
-                <span className="code-review-file-bar-path" title={selectedChange.path}>
+                <span
+                  className="code-review-file-bar-path"
+                  title={`${selectedChange.path} (Drag to chat)`}
+                  draggable="true"
+                  onDragStart={(event) => {
+                    event.stopPropagation()
+                    setWorkspaceDragData(event.dataTransfer, {
+                      path: selectedChange.path,
+                      root: workspacePath,
+                      kind: 'file',
+                    })
+                  }}
+                >
                   {selectedChange.path}
                 </span>
                 <button type="button" className="review-undo-button" disabled={!canUndoFile || history.busy} title={canUndoFile ? selectedFileHistory?.label : selectedFileHistory ? 'Undo newer workspace actions first in File history.' : 'No saved undo action for this file.'} onClick={() => selectedFileHistory && requestUndo(selectedFileHistory)}>Undo edit…</button>
@@ -563,25 +636,52 @@ export default function CodeReviewPage({
               <div className="code-review-code-container">
                 {selectedChange.hunks && selectedChange.hunks.length > 0 ? (
                   selectedChange.hunks.map((hunk, hunkIdx) => {
+                    const fileExt = getExtension(selectedChange.path)
                     const oldLines = diffLines(hunk.oldText)
                     const newLines = diffLines(hunk.newText)
                     let lineCounter = 1
                     return (
                       <div className="code-review-hunk-block" key={`${selectedChange.path}-hunk-${hunkIdx}`}>
-                        {oldLines.map((line, idx) => (
-                          <div className="code-review-line is-del" key={`del-${idx}`}>
-                            <span className="code-review-gutter">{lineCounter++}</span>
-                            <span className="code-review-sign">−</span>
-                            <code className="code-review-code-text">{line || ' '}</code>
-                          </div>
-                        ))}
-                        {newLines.map((line, idx) => (
-                          <div className="code-review-line is-add" key={`add-${idx}`}>
-                            <span className="code-review-gutter">{lineCounter++}</span>
-                            <span className="code-review-sign">+</span>
-                            <code className="code-review-code-text">{line || ' '}</code>
-                          </div>
-                        ))}
+                        {oldLines.map((line, idx) => {
+                          const tokens = tokenizeLine(line, fileExt)
+                          return (
+                            <div className="code-review-line is-del" key={`del-${idx}`}>
+                              <span className="code-review-gutter">{lineCounter++}</span>
+                              <span className="code-review-sign">−</span>
+                              <code className="code-review-code-text">
+                                {tokens.length === 0 ? (
+                                  ' '
+                                ) : (
+                                  tokens.map((tok, tIdx) => (
+                                    <span key={tIdx} className={tok.type}>
+                                      {tok.text}
+                                    </span>
+                                  ))
+                                )}
+                              </code>
+                            </div>
+                          )
+                        })}
+                        {newLines.map((line, idx) => {
+                          const tokens = tokenizeLine(line, fileExt)
+                          return (
+                            <div className="code-review-line is-add" key={`add-${idx}`}>
+                              <span className="code-review-gutter">{lineCounter++}</span>
+                              <span className="code-review-sign">+</span>
+                              <code className="code-review-code-text">
+                                {tokens.length === 0 ? (
+                                  ' '
+                                ) : (
+                                  tokens.map((tok, tIdx) => (
+                                    <span key={tIdx} className={tok.type}>
+                                      {tok.text}
+                                    </span>
+                                  ))
+                                )}
+                              </code>
+                            </div>
+                          )
+                        })}
                       </div>
                     )
                   })
@@ -592,7 +692,7 @@ export default function CodeReviewPage({
             </article>
           ) : (
             <div className="code-review-clean-state">
-              <svg width="44" height="44" viewBox="0 0 24 24" fill="none" stroke="#22c55e" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
+              <svg width="44" height="44" viewBox="0 0 24 24" fill="none" stroke="var(--status-success, #22c55e)" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
                 <path d="M22 11.08V12a10 10 0 1 1-5.93-9.14" />
                 <polyline points="22 4 12 14.01 9 11.01" />
               </svg>

package/src/renderer/shared/components/{GitBranchSelector.tsx → workspace/GitBranchSelector.tsx}

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState, type FormEvent } from 'react'
-import { workspacePlatform } from '../platform'
-import type { GitBranchChangeOutcome, GitBranchInfo } from '../types'
+import { workspacePlatform } from '../../platform'
+import type { GitBranchChangeOutcome, GitBranchInfo } from '../../types'
 
 type MenuView = 'branches' | 'create' | 'graph'
 type MenuDirection = 'up' | 'down'
@@ -11,6 +11,56 @@ interface GitBranchSelectorProps {
   onBranchChanged?: () => void
 }
 
+function BranchIcon({ className = '', width = 14, height = 14 }: { className?: string; width?: number; height?: number }) {
+  return (
+    <svg className={className} width={width} height={height} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
+      <line x1="6" y1="3" x2="6" y2="15" />
+      <circle cx="18" cy="6" r="3" />
+      <circle cx="6" cy="18" r="3" />
+      <path d="M18 9a9 9 0 0 1-9 9" />
+    </svg>
+  )
+}
+
+function RemoteGlobeIcon({ className = '', width = 14, height = 14 }: { className?: string; width?: number; height?: number }) {
+  return (
+    <svg className={className} width={width} height={height} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
+      <circle cx="12" cy="12" r="10" />
+      <path d="M12 2a14.5 14.5 0 0 0 0 20 14.5 14.5 0 0 0 0-20" />
+      <path d="M2 12h20" />
+    </svg>
+  )
+}
+
+function PlusIcon({ className = '', width = 14, height = 14 }: { className?: string; width?: number; height?: number }) {
+  return (
+    <svg className={className} width={width} height={height} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
+      <line x1="12" y1="5" x2="12" y2="19" />
+      <line x1="5" y1="12" x2="19" y2="12" />
+    </svg>
+  )
+}
+
+function GitGraphIcon({ className = '', width = 14, height = 14 }: { className?: string; width?: number; height?: number }) {
+  return (
+    <svg className={className} width={width} height={height} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
+      <circle cx="5" cy="6" r="3" />
+      <circle cx="5" cy="18" r="3" />
+      <line x1="5" y1="9" x2="5" y2="15" />
+      <circle cx="19" cy="9" r="3" />
+      <path d="M5 9c0 4 4 6 8 6h3" />
+    </svg>
+  )
+}
+
+function ChevronBackIcon({ className = '', width = 14, height = 14 }: { className?: string; width?: number; height?: number }) {
+  return (
+    <svg className={className} width={width} height={height} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
+      <polyline points="15 18 9 12 15 6" />
+    </svg>
+  )
+}
+
 function errorMessage(reason: unknown): string {
   if (reason instanceof Error) return reason.message
   if (typeof reason === 'string') return reason
@@ -139,6 +189,7 @@ export default function GitBranchSelector({ workspacePath, disabled = false, onB
           title={`${error} Select to retry.`}
           aria-label="Git branch unavailable. Retry"
         >
+          <BranchIcon className="git-branch-icon" width={14} height={14} />
           <span className="git-branch-name">Git unavailable</span>
         </button>
       </div>
@@ -289,16 +340,11 @@ export default function GitBranchSelector({ workspacePath, disabled = false, onB
         aria-controls="workspace-branch-menu"
         title={`${branchLabel}${info.isDirty ? ' — uncommitted changes' : ''}`}
       >
-        <svg className="git-branch-icon" width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.8" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
-          <circle cx="6" cy="5" r="2" />
-          <circle cx="18" cy="6" r="2" />
-          <circle cx="6" cy="19" r="2" />
-          <path d="M6 7v10M8 7c2 4 8 1 8-1" />
-        </svg>
+        <BranchIcon className="git-branch-icon" width={14} height={14} />
         <span className="git-branch-name">{switchingBranch || branchLabel}</span>
         {info.isDirty && <span className="git-branch-dirty" aria-label="Uncommitted changes" />}
-        <svg className="git-branch-chevron" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
-          <path d="m6 9 6 6 6-6" />
+        <svg className="git-branch-chevron" width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.2" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
+          <polyline points="6 9 12 15 18 9" />
         </svg>
       </button>
 
@@ -313,9 +359,9 @@ export default function GitBranchSelector({ workspacePath, disabled = false, onB
           {menuView === 'branches' && (
             <>
               <label className="git-branch-search">
-                <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" aria-hidden="true">
-                  <circle cx="11" cy="11" r="7" />
-                  <path d="m20 20-4-4" />
+                <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
+                  <circle cx="11" cy="11" r="8" />
+                  <path d="m21 21-4.3-4.3" />
                 </svg>
                 <input
                   autoFocus
@@ -339,12 +385,16 @@ export default function GitBranchSelector({ workspacePath, disabled = false, onB
                       disabled={Boolean(switchingBranch)}
                       onClick={() => handleSwitch(branch)}
                     >
-                      <span className="git-branch-option-icon" aria-hidden="true">⑂</span>
+                      <span className="git-branch-option-icon" aria-hidden="true">
+                        <BranchIcon width={14} height={14} />
+                      </span>
                       <span>{branch}</span>
                       {selected && (
-                        <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
-                          <path d="m5 12 4 4L19 6" />
-                        </svg>
+                        <span className="git-branch-option-check" aria-hidden="true">
+                          <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round" strokeLinejoin="round">
+                            <polyline points="20 6 9 17 4 12" />
+                          </svg>
+                        </span>
                       )}
                     </button>
                   )
@@ -365,7 +415,9 @@ export default function GitBranchSelector({ workspacePath, disabled = false, onB
                         onClick={() => handleRemoteCheckout(remoteBranch)}
                         title={`Create a local tracking branch from ${remoteBranch}`}
                       >
-                        <span className="git-branch-option-icon" aria-hidden="true">⇄</span>
+                        <span className="git-branch-option-icon" aria-hidden="true">
+                          <RemoteGlobeIcon width={14} height={14} />
+                        </span>
                         <span>{remoteBranch}</span>
                         <span className="git-branch-track-label">Track</span>
                       </button>
@@ -378,12 +430,12 @@ export default function GitBranchSelector({ workspacePath, disabled = false, onB
               )}
               <div className="git-branch-actions">
                 <button type="button" onClick={() => { setMenuView('create'); setError('') }}>
-                  <span aria-hidden="true">＋</span>
-                  Create branch
+                  <PlusIcon width={14} height={14} />
+                  <span>Create branch</span>
                 </button>
                 <button type="button" onClick={openGraph}>
-                  <span aria-hidden="true">⑂</span>
-                  Git graph
+                  <GitGraphIcon width={14} height={14} />
+                  <span>Git graph</span>
                 </button>
               </div>
             </>
@@ -392,7 +444,9 @@ export default function GitBranchSelector({ workspacePath, disabled = false, onB
           {menuView === 'create' && (
             <form className="git-branch-create" onSubmit={handleCreateBranch}>
               <div className="git-branch-view-header">
-                <button type="button" onClick={() => { setMenuView('branches'); setError('') }} aria-label="Back to branches">←</button>
+                <button type="button" onClick={() => { setMenuView('branches'); setError('') }} aria-label="Back to branches">
+                  <ChevronBackIcon width={14} height={14} />
+                </button>
                 <strong>Create branch</strong>
               </div>
               <label htmlFor="new-git-branch-name">Branch name</label>
@@ -415,7 +469,9 @@ export default function GitBranchSelector({ workspacePath, disabled = false, onB
           {menuView === 'graph' && (
             <div className="git-graph-view">
               <div className="git-branch-view-header">
-                <button type="button" onClick={() => { setMenuView('branches'); setError('') }} aria-label="Back to branches">←</button>
+                <button type="button" onClick={() => { setMenuView('branches'); setError('') }} aria-label="Back to branches">
+                  <ChevronBackIcon width={14} height={14} />
+                </button>
                 <strong>Git graph</strong>
                 <button type="button" className="git-graph-refresh" onClick={loadGraph} disabled={graphLoading}>Refresh</button>
               </div>