Merge remote-tracking branch 'origin/main' into merge-theme

# Conflicts:
#	src/components/Context1MCheckbox.tsx
#	src/components/NewWorkspaceModal.tsx
#	src/components/ThinkingSlider.tsx
#	src/components/WorkspaceListItem.tsx
#	src/components/tools/FileReadToolCall.tsx

Author: kylecarbs

.cmux/init

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+echo "Installing dependencies with bun..."
+bun install
+echo "Dependencies installed successfully!"
+

.github/actions/setup-cmux/action.yml

@@ -1,5 +1,10 @@
 name: "Setup Cmux"
 description: "Setup Bun and install dependencies with caching"
+inputs:
+  install-imagemagick:
+    description: "Install ImageMagick (needed for electron-builder icon generation)"
+    required: false
+    default: "false"
 runs:
   using: "composite"
   steps:
@@ -8,50 +13,52 @@ runs:
       with:
         bun-version: latest
 
-    - name: Cache bun dependencies
+    - name: Get Bun version
+      id: bun-version
+      shell: bash
+      run: echo "version=$(bun --version)" >> $GITHUB_OUTPUT
+
+    - name: Cache node_modules
       uses: actions/cache@v4
       with:
-        path: ~/.bun/install/cache
-        key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
+        path: node_modules
+        key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ steps.bun-version.outputs.version }}-node-modules-${{ hashFiles('**/bun.lock') }}
         restore-keys: |
-          ${{ runner.os }}-bun-
+          ${{ runner.os }}-${{ runner.arch }}-bun-${{ steps.bun-version.outputs.version }}-node-modules-
 
-    - name: Cache Homebrew (macOS)
-      if: runner.os == 'macOS'
+    - name: Cache bun install cache
       uses: actions/cache@v4
       with:
-        path: ~/Library/Caches/Homebrew
-        key: ${{ runner.os }}-brew-cache-${{ hashFiles('**/bun.lock') }}
+        path: ~/.bun/install/cache
+        key: ${{ runner.os }}-bun-cache-${{ hashFiles('**/bun.lock') }}
         restore-keys: |
-          ${{ runner.os }}-brew-cache-
+          ${{ runner.os }}-bun-cache-
 
     - name: Install dependencies
       shell: bash
       run: bun install --frozen-lockfile
 
     - name: Install ImageMagick (macOS)
-      if: runner.os == 'macOS'
+      if: inputs.install-imagemagick == 'true' && runner.os == 'macOS'
       shell: bash
       run: |
-        if ! brew list imagemagick &>/dev/null; then
-          echo "📦 Installing ImageMagick..."
-          time brew install imagemagick
+        if command -v magick &>/dev/null; then
+          echo "✅ ImageMagick already available"
         else
-          echo "✅ ImageMagick already installed"
-          brew list imagemagick --versions
+          echo "📦 Installing ImageMagick..."
+          HOMEBREW_NO_AUTO_UPDATE=1 brew install imagemagick
         fi
-        # Verify it's in PATH
-        which magick
         magick --version | head -1
 
     - name: Install ImageMagick (Linux)
-      if: runner.os == 'Linux'
+      if: inputs.install-imagemagick == 'true' && runner.os == 'Linux'
       shell: bash
       run: |
-        if ! command -v convert &> /dev/null; then
-          echo "Installing ImageMagick..."
-          sudo apt-get update -qq
-          sudo apt-get install -y imagemagick
+        if command -v convert &>/dev/null; then
+          echo "✅ ImageMagick already available"
         else
-          echo "ImageMagick already installed"
+          echo "📦 Installing ImageMagick..."
+          sudo apt-get update -qq
+          sudo apt-get install -y --no-install-recommends imagemagick
         fi
+        convert --version | head -1

.github/workflows/build.yml

@@ -17,6 +17,8 @@ jobs:
           fetch-depth: 0 # Required for git describe to find tags
 
       - uses: ./.github/actions/setup-cmux
+        with:
+          install-imagemagick: true
 
       - name: Build application
         run: bun run build
@@ -71,6 +73,8 @@ jobs:
           fetch-depth: 0 # Required for git describe to find tags
 
       - uses: ./.github/actions/setup-cmux
+        with:
+          install-imagemagick: true
 
       - name: Build application
         run: bun run build

.github/workflows/ci.yml

@@ -5,6 +5,13 @@ on:
     branches: ["**"]
   merge_group:
   workflow_dispatch:
+    inputs:
+      test_filter:
+        description: 'Optional test filter (e.g., "workspace", "tests/file.test.ts", or "-t pattern")'
+        required: false
+        type: string
+        # This filter is passed to unit tests, integration tests, e2e tests, and storybook tests
+        # to enable faster iteration when debugging specific test failures in CI
 
 jobs:
   static-check:
@@ -68,7 +75,7 @@ jobs:
       - uses: ./.github/actions/setup-cmux
 
       - name: Run tests with coverage
-        run: bun test --coverage --coverage-reporter=lcov src
+        run: bun test --coverage --coverage-reporter=lcov ${{ github.event.inputs.test_filter || 'src' }}
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5
@@ -80,7 +87,7 @@ jobs:
 
   integration-test:
     name: Integration Tests
-    runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
+    runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-24.04-32' || 'ubuntu-latest' }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -90,7 +97,7 @@ jobs:
       - uses: ./.github/actions/setup-cmux
 
       - name: Run integration tests with coverage
-        run: TEST_INTEGRATION=1 bun x jest --coverage tests
+        run: TEST_INTEGRATION=1 bun x jest --coverage --maxWorkers=200% --silent ${{ github.event.inputs.test_filter || 'tests' }}
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
@@ -106,6 +113,7 @@ jobs:
   storybook-test:
     name: Storybook Interaction Tests
     runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
+    if: github.event.inputs.test_filter == ''
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -131,6 +139,7 @@ jobs:
   e2e-test:
     name: End-to-End Tests
     runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
+    if: github.event.inputs.test_filter == ''
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/publish-npm.yml

@@ -23,6 +23,8 @@ jobs:
           fetch-depth: 0 # Required for git describe to find tags
 
       - uses: ./.github/actions/setup-cmux
+        with:
+          install-imagemagick: 'true'
 
       # Sets up .npmrc with the auth token
       - uses: actions/setup-node@v4

.github/workflows/release.yml

@@ -18,6 +18,8 @@ jobs:
           fetch-depth: 0 # Required for git describe to find tags
 
       - uses: ./.github/actions/setup-cmux
+        with:
+          install-imagemagick: true
 
       - name: Build application
         run: bun run build
@@ -46,6 +48,8 @@ jobs:
           fetch-depth: 0 # Required for git describe to find tags
 
       - uses: ./.github/actions/setup-cmux
+        with:
+          install-imagemagick: true
 
       - name: Build application
         run: bun run build

.gitignore

@@ -104,3 +104,4 @@ tmpfork
 .cmux-agent-cli
 storybook-static/
 *.tgz
+src/test-workspaces/