Merge pull request #1880 from AndyMik90/develop

Release v2.7.6

.github/workflows/beta-release.yml

@@ -405,11 +405,11 @@ jobs:
       - name: Setup Node.js and install dependencies
         uses: ./.github/actions/setup-node-frontend
 
-      - name: Setup Flatpak
+      - name: Setup Flatpak and verification tools
         run: |
           set -e
           sudo apt-get update
-          sudo apt-get install -y flatpak flatpak-builder
+          sudo apt-get install -y flatpak flatpak-builder libarchive-tools
           flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           flatpak install -y --user flathub org.freedesktop.Platform//25.08 org.freedesktop.Sdk//25.08
           flatpak install -y --user flathub org.electronjs.Electron2.BaseApp//25.08
@@ -447,6 +447,9 @@ jobs:
           SENTRY_TRACES_SAMPLE_RATE: ${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}
           SENTRY_PROFILES_SAMPLE_RATE: ${{ secrets.SENTRY_PROFILES_SAMPLE_RATE }}
 
+      - name: Verify Linux packages
+        run: cd apps/frontend && npm run verify:linux
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:

.github/workflows/release.yml

@@ -344,10 +344,10 @@ jobs:
       - name: Setup Node.js and install dependencies
         uses: ./.github/actions/setup-node-frontend
 
-      - name: Setup Flatpak
+      - name: Setup Flatpak and verification tools
         run: |
           sudo apt-get update
-          sudo apt-get install -y flatpak flatpak-builder
+          sudo apt-get install -y flatpak flatpak-builder libarchive-tools
           flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           flatpak install -y --user flathub org.freedesktop.Platform//25.08 org.freedesktop.Sdk//25.08
           flatpak install -y --user flathub org.electronjs.Electron2.BaseApp//25.08
@@ -383,6 +383,9 @@ jobs:
           SENTRY_TRACES_SAMPLE_RATE: ${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}
           SENTRY_PROFILES_SAMPLE_RATE: ${{ secrets.SENTRY_PROFILES_SAMPLE_RATE }}
 
+      - name: Verify Linux packages
+        run: cd apps/frontend && npm run verify:linux
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:

.gitignore

@@ -7,6 +7,7 @@
 Thumbs.db
 ehthumbs.db
 Desktop.ini
+nul
 
 # ===========================
 # Security - Environment & Secrets

.husky/pre-commit

@@ -1,52 +1,36 @@
 #!/bin/sh
 
 # =============================================================================
-# GIT WORKTREE CONTEXT HANDLING
+# GIT WORKTREE ENVIRONMENT CLEANUP
 # =============================================================================
-# When running in a worktree, we need to preserve git context to prevent HEAD
-# corruption. However, we must also CLEAR these variables when NOT in a worktree
-# to prevent cross-worktree contamination (files leaking between worktrees).
+# Git automatically sets GIT_DIR (and CWD to the working tree root) before
+# running hooks -- even in worktrees. We do NOT need to manually parse .git
+# files or export GIT_DIR/GIT_WORK_TREE.
 #
-# The bug: If GIT_DIR/GIT_WORK_TREE are set from a previous worktree session
-# and this hook runs in the main repo (where .git is a directory, not a file),
-# git commands will target the wrong repository, causing files to appear as
-# untracked in the wrong location.
-#
-# Fix: Explicitly unset these variables when NOT in a worktree context.
+# However, external tools (IDEs, agents, parent shells) may leave stale
+# GIT_DIR/GIT_WORK_TREE values in the environment. If these point to a
+# different repo or worktree, git commands in this hook would target the
+# wrong repository. Unsetting them lets git re-resolve the correct values
+# from the working directory.
 # =============================================================================
-
-if [ -f ".git" ]; then
-  # We're in a worktree (.git is a file pointing to the actual git dir)
-  # Use -n with /p to only print lines that match the gitdir: prefix, head -1 for safety
-  WORKTREE_GIT_DIR=$(sed -n 's/^gitdir: //p' .git | head -1)
-  if [ -n "$WORKTREE_GIT_DIR" ] && [ -d "$WORKTREE_GIT_DIR" ]; then
-    export GIT_DIR="$WORKTREE_GIT_DIR"
-    export GIT_WORK_TREE="$(pwd)"
-  else
-    # .git file exists but is malformed or points to non-existent directory
-    # CRITICAL: Clear any inherited GIT_DIR/GIT_WORK_TREE to prevent cross-worktree leakage
-    unset GIT_DIR
-    unset GIT_WORK_TREE
-  fi
-else
-  # We're in the main repo (.git is a directory)
-  # CRITICAL: Clear any inherited GIT_DIR/GIT_WORK_TREE to prevent cross-worktree leakage
-  unset GIT_DIR
-  unset GIT_WORK_TREE
-fi
+unset GIT_DIR
+unset GIT_WORK_TREE
 
 # =============================================================================
 # SAFETY CHECK: Detect and fix corrupted core.worktree configuration
 # =============================================================================
-# If core.worktree is set in the main repo's config (pointing to a worktree),
-# this indicates previous corruption. Fix it automatically.
-if [ ! -f ".git" ]; then
-  CORE_WORKTREE=$(git config --get core.worktree 2>/dev/null || true)
-  if [ -n "$CORE_WORKTREE" ]; then
-    echo "Warning: Detected corrupted core.worktree setting, removing it..."
-    if ! git config --unset core.worktree 2>/dev/null; then
-      echo "Warning: Failed to unset core.worktree. Manual intervention may be needed."
-    fi
+# core.worktree lives in the SHARED .git/config (not per-worktree). If any
+# process accidentally writes it (e.g., running `git init` with a leaked
+# GIT_WORK_TREE), ALL repos and worktrees see the wrong working tree root,
+# causing files from one worktree to "leak" into others.
+#
+# This check runs from both main repo and worktree contexts since the config
+# is shared and corruption can happen from either.
+CORE_WORKTREE=$(git config --get core.worktree 2>/dev/null || true)
+if [ -n "$CORE_WORKTREE" ]; then
+  echo "Warning: Detected corrupted core.worktree setting ('$CORE_WORKTREE'), removing it..."
+  if ! git config --unset core.worktree 2>/dev/null; then
+    echo "Warning: Failed to unset core.worktree. Manual intervention may be needed."
   fi
 fi
 
@@ -143,6 +127,13 @@ fi
 if git diff --cached --name-only | grep -q "^apps/backend/.*\.py$"; then
   echo "Python changes detected, running backend checks..."
 
+  # Detect if we're in a worktree
+  IS_WORKTREE=false
+  if [ -f ".git" ]; then
+    # .git is a file (not directory) in worktrees
+    IS_WORKTREE=true
+  fi
+
   # Determine ruff command (venv or global)
   RUFF=""
   if [ -f "apps/backend/.venv/bin/ruff" ]; then
@@ -174,49 +165,71 @@ if git diff --cached --name-only | grep -q "^apps/backend/.*\.py$"; then
       echo "$STAGED_PY_FILES" | xargs git add
     fi
   else
-    echo "Warning: ruff not found, skipping Python linting. Install with: uv pip install ruff"
+    if [ "$IS_WORKTREE" = true ]; then
+      echo ""
+      echo "⚠️  WARNING: ruff not available in this worktree."
+      echo "   Python linting checks will be skipped."
+      echo "   This is expected for auto-claude worktrees."
+      echo "   Full validation will occur when PR is created/merged."
+      echo ""
+    else
+      echo "Warning: ruff not found, skipping Python linting. Install with: uv pip install ruff"
+    fi
   fi
 
   # Run pytest (skip slow/integration tests and Windows-incompatible tests for pre-commit speed)
-  # Use subshell to isolate directory changes and prevent worktree corruption
+  # Run from repo root (not apps/backend) so tests that use Path.resolve() get correct CWD.
+  # PYTHONPATH includes apps/backend so imports resolve correctly.
   echo "Running Python tests..."
   (
-    cd apps/backend
     # Tests to skip: graphiti (external deps), merge_file_tracker/service_orchestrator/worktree/workspace (Windows path/git issues)
     # Also skip tests that require optional dependencies (pydantic structured outputs)
-    IGNORE_TESTS="--ignore=../../tests/test_graphiti.py --ignore=../../tests/test_merge_file_tracker.py --ignore=../../tests/test_service_orchestrator.py --ignore=../../tests/test_worktree.py --ignore=../../tests/test_workspace.py --ignore=../../tests/test_finding_validation.py --ignore=../../tests/test_sdk_structured_output.py --ignore=../../tests/test_structured_outputs.py"
-
+    # Also skip gitlab_e2e (e2e test sensitive to test-ordering env contamination, validated by CI)
+    IGNORE_TESTS="--ignore=tests/test_graphiti.py --ignore=tests/test_merge_file_tracker.py --ignore=tests/test_service_orchestrator.py --ignore=tests/test_worktree.py --ignore=tests/test_workspace.py --ignore=tests/test_finding_validation.py --ignore=tests/test_sdk_structured_output.py --ignore=tests/test_structured_outputs.py --ignore=tests/test_gitlab_e2e.py"
     # Determine Python executable from venv
     VENV_PYTHON=""
-    if [ -f ".venv/bin/python" ]; then
-      VENV_PYTHON=".venv/bin/python"
-    elif [ -f ".venv/Scripts/python.exe" ]; then
-      VENV_PYTHON=".venv/Scripts/python.exe"
+    if [ -f "apps/backend/.venv/bin/python" ]; then
+      VENV_PYTHON="apps/backend/.venv/bin/python"
+    elif [ -f "apps/backend/.venv/Scripts/python.exe" ]; then
+      VENV_PYTHON="apps/backend/.venv/Scripts/python.exe"
     fi
 
+    # -k "not windows_path": skip tests using fake Windows paths that break
+    # Path.resolve() on macOS/Linux. These are validated by CI on all platforms.
     if [ -n "$VENV_PYTHON" ]; then
       # Check if pytest is installed in venv
       if $VENV_PYTHON -c "import pytest" 2>/dev/null; then
-        PYTHONPATH=. $VENV_PYTHON -m pytest ../../tests/ -v --tb=short -x -m "not slow and not integration" $IGNORE_TESTS
+        PYTHONPATH=apps/backend $VENV_PYTHON -m pytest tests/ -v --tb=short -x -m "not slow and not integration" -k "not windows_path" $IGNORE_TESTS
       else
         echo "Warning: pytest not installed in venv. Installing test dependencies..."
-        $VENV_PYTHON -m pip install -q -r ../../tests/requirements-test.txt
-        PYTHONPATH=. $VENV_PYTHON -m pytest ../../tests/ -v --tb=short -x -m "not slow and not integration" $IGNORE_TESTS
+        $VENV_PYTHON -m pip install -q -r tests/requirements-test.txt
+        PYTHONPATH=apps/backend $VENV_PYTHON -m pytest tests/ -v --tb=short -x -m "not slow and not integration" -k "not windows_path" $IGNORE_TESTS
       fi
-    elif [ -d ".venv" ]; then
+    elif [ -d "apps/backend/.venv" ]; then
       echo "Warning: venv exists but Python not found in it, using system Python"
-      PYTHONPATH=. python -m pytest ../../tests/ -v --tb=short -x -m "not slow and not integration" $IGNORE_TESTS
+      PYTHONPATH=apps/backend python -m pytest tests/ -v --tb=short -x -m "not slow and not integration" -k "not windows_path" $IGNORE_TESTS
+    elif [ "$IS_WORKTREE" = true ]; then
+      echo ""
+      echo "⚠️  WARNING: Python venv not available in this worktree."
+      echo "   Python tests will be skipped."
+      echo "   This is expected for auto-claude worktrees."
+      echo "   Full validation will occur when PR is created/merged."
+      echo ""
+      exit 77  # GNU convention for 'test skipped' (avoids pytest exit-code collision)
     else
       echo "Warning: No .venv found in apps/backend, using system Python"
-      PYTHONPATH=. python -m pytest ../../tests/ -v --tb=short -x -m "not slow and not integration" $IGNORE_TESTS
+      PYTHONPATH=apps/backend python -m pytest tests/ -v --tb=short -x -m "not slow and not integration" -k "not windows_path" $IGNORE_TESTS
     fi
   )
-  if [ $? -ne 0 ]; then
+  PYTHON_EXIT=$?
+  if [ $PYTHON_EXIT -eq 77 ]; then
+    echo "Backend checks passed! (Python tests skipped — worktree)"
+  elif [ $PYTHON_EXIT -ne 0 ]; then
     echo "Python tests failed. Please fix failing tests before committing."
     exit 1
+  else
+    echo "Backend checks passed!"
   fi
-
-  echo "Backend checks passed!"
 fi
 
 # =============================================================================

.pre-commit-config.yaml

@@ -97,9 +97,8 @@ repos:
       - id: ruff-format
         files: ^apps/backend/
 
-  # Python tests (apps/backend/) - skip slow/integration tests for pre-commit speed
+  # Python tests (apps/backend/) - run full test suite from project root
   # Tests to skip: graphiti (external deps), merge_file_tracker/service_orchestrator/worktree/workspace (Windows path/git issues)
-  # NOTE: Skip this hook in worktrees (where .git is a file, not a directory)
   - repo: local
     hooks:
       - id: pytest
@@ -108,31 +107,24 @@ repos:
         args:
           - -c
           - |
-            # Skip in worktrees - .git is a file pointing to main repo, not a directory
-            # This prevents path resolution issues with ../../tests/ in worktree context
-            if [ -f ".git" ]; then
-              echo "Skipping pytest in worktree (path resolution would fail)"
-              exit 0
-            fi
-            cd apps/backend
-            if [ -f ".venv/bin/pytest" ]; then
-              PYTEST_CMD=".venv/bin/pytest"
-            elif [ -f ".venv/Scripts/pytest.exe" ]; then
-              PYTEST_CMD=".venv/Scripts/pytest.exe"
+            # Run pytest directly from project root
+            if [ -f "apps/backend/.venv/bin/pytest" ]; then
+              PYTEST_CMD="apps/backend/.venv/bin/pytest"
+            elif [ -f "apps/backend/.venv/Scripts/pytest.exe" ]; then
+              PYTEST_CMD="apps/backend/.venv/Scripts/pytest.exe"
             else
               PYTEST_CMD="python -m pytest"
             fi
-            PYTHONPATH=. $PYTEST_CMD \
-              ../../tests/ \
+            $PYTEST_CMD tests/ \
               -v \
               --tb=short \
               -x \
               -m "not slow and not integration" \
-              --ignore=../../tests/test_graphiti.py \
-              --ignore=../../tests/test_merge_file_tracker.py \
-              --ignore=../../tests/test_service_orchestrator.py \
-              --ignore=../../tests/test_worktree.py \
-              --ignore=../../tests/test_workspace.py
+              --ignore=tests/test_graphiti.py \
+              --ignore=tests/test_merge_file_tracker.py \
+              --ignore=tests/test_service_orchestrator.py \
+              --ignore=tests/test_worktree.py \
+              --ignore=tests/test_workspace.py
         language: system
         files: ^(apps/backend/.*\.py$|tests/.*\.py$)
         pass_filenames: false

CHANGELOG.md

@@ -1,3 +1,234 @@
+## 2.7.6 - Stability & Feature Enhancements
+
+### ✨ New Features
+
+- **Multi-profile account management** — Unified profile swapping with automatic token refresh and rate limit recovery for both OAuth and API-compatible providers
+
+- **Enhanced terminal experience** — Customizable terminal fonts with OS-specific defaults, Claude Code CLI settings injection, and improved worktree integration
+
+- **Advanced roadmap management** — Expand/collapse functionality for phase features and real-time sync with task lifecycle
+
+- **Queue System v2** — Smart task prioritization with auto-promotion and intelligent rate limit recovery
+
+- **GitHub integration enhancements** — AI-powered PR template generation, user-friendly API error handling, and improved review visibility
+
+- **UI/UX improvements** — Spell check support for text inputs, collapsible sidebar toggle, task screenshot capture, expandable task descriptions, and bulk worktree operations
+
+- **Evidence-based PR validation** — Advanced review system with trigger-driven exploration and enhanced recovery mechanisms
+
+### 🛠️ Improvements
+
+- **Performance optimizations** — Async parallel worktree listing prevents UI freezes and improves responsiveness
+
+- **Robustness enhancements** — Atomic file writes, better error detection in AI responses, and improved OOM/orphaned agent management for overnight builds
+
+- **Terminal stability** — Fixed GPU context exhaustion from large pastes, SIGABRT crashes on macOS shutdown, and session restoration on app restart
+
+- **Build & packaging** — XState bundling for packaged apps, aligned Linux package builds, and improved auto-updater for beta releases and DMG installations
+
+- **Diagnostic improvements** — Sentry instrumentation for Python subprocesses and better error tracking across the system
+
+### 🐛 Bug Fixes
+
+- **Terminal & PTY** — Fixed paste size limits, race conditions, rendering issues, text alignment, worktree crashes, and terminal content resizing on expansion
+
+- **PR review system** — Resolved error visibility in bundled apps, improved structured output validation with three-tier recovery, preserved findings during crashes, and fixed UTC timestamp detection for comment tracking
+
+- **Planning & task execution** — Fixed handling of empty/greenfield projects, atomic writes to prevent 0-byte file corruption, planning phase crashes, and implementation plan file watching
+
+- **Authentication & profiles** — Resolved OAuth token revocation loops, API profile mode support without OAuth requirement, subscription type preservation during token refresh, and Linux credential file detection
+
+- **Windows/cross-platform** — Complete System32 executable path fixes for where.exe and taskkill.exe, Windows credential normalization, and proper shell detection for Windows terminals
+
+- **Agent management** — Fixed infinite retry loops for tool concurrency errors, auth error detection, and title generator production path resolution
+
+- **UI/UX fixes** — Resolved Insights scroll-to-blank-space issues, infinite re-render loops in terminal font settings, kanban board scaling collisions, ideation stuck states, and panel constraint errors during terminal exit
+
+- **Worktree & Git** — Improved branch pattern validation, removed auto-commit on deletion, support for detached HEAD state during PR creation, and better merge conflict resolution with progress tracking
+
+- **Integrations** — Fixed Ollama infinite subprocess spawning, Graphiti import paths, OpenRouter API URL suffix, and GitLab authentication bugs
+
+- **Settings & configuration** — Corrected .auto-claude path discovery timeout, z.AI China preset URL, log order sorting, and onboarding completion state persistence
+
+### 📚 Documentation
+
+- Added Awesome Claude Code badge to README
+
+- Added instructions for resetting PR review state in CLAUDE.md
+
+---
+
+## What's Changed
+
+- fix: handle unknown SDK message types (rate_limit_event) to prevent session crashes by @AndyMik90 in 4a75ea9f9
+- fix: PR review error visibility and gh CLI resolution in bundled apps by @AndyMik90 in 732fc1cd3
+- fix: handle empty/greenfield projects in spec creation (#1426) (#1841) by @Andy in 819f98d9f
+- fix: clear terminalEventSeen on task restart to prevent stuck-after-planning (#1828) (#1840) by @Andy in 28a620079
+- fix: watch worktree path for implementation_plan.json changes (#1805) (#1842) by @Andy in fb3a3fbda
+- fix: resolve Claude CLI not found on Windows - PATH, prompt size, cwd (#1661) (#1843) by @Andy in 76d1d3b03
+- fix: handle planning phase crash and resume recovery (#1562) (#1844) by @Andy in 3cb05781f
+- fix: show dismissed PR review findings in UI instead of silently dropping them (#1852) by @Andy in d98ff7d19
+- fix: preserve file/line info in PR review extraction recovery (#1857) by @Andy in 635b53eea
+- docs: add Awesome Claude Code badge to README (#1838) by @Andy in 2e4b5ac65
+- test: achieve 100% test coverage for backend CLI commands (#1772) by @StillKnotKnown in 385f04414
+- fix: cap terminal paste size to 1MB to prevent GPU context exhaustion by @AndyMik90 in 7b0f3a2c0
+- fix: prevent OOM, orphaned agents, and unbounded growth during overnight builds (#1813) by @Andy in 4091d1d4b
+- docs: add instructions for resetting PR review state in CLAUDE.md by @AndyMik90 in ecb615802
+- auto-claude: 217-investigate-symlink-issues-in-work-tree-creation-f (#1808) by @Andy in ae13ce14c
+- auto-claude: 218-enable-claude-code-features-in-worktree-terminals (#1809) by @Andy in e3b219288
+- auto-claude: 219-investigate-and-fix-authentication-subscription-sy (#1810) by @Andy in 6204d5fc2
+- feat(roadmap): add expand/collapse functionality for phase features (#1796) by @Burak in f735f0b49
+- auto-claude: 216-display-ongoing-pr-review-logs-in-progress (#1807) by @Andy in a4870fa0c
+- fix(pr-review): reduce structured output failures and preserve findings in recovery (#1806) by @Andy in f1b8cd3a7
+- fix(sentry): enable Sentry for Python subprocesses and add diagnostic instrumentation (#1804) by @Andy in 4d4234378
+- fix(pr-review): add three-tier recovery for structured output validation failure (#1797) by @Andy in d1fbccde3
+- test: improve backend agent test coverage to 94% (#1779) by @StillKnotKnown in ed93df698
+- fix(github): use UTC timestamps for reviewed_at to fix comment detection (#1795) by @Andy in 8872d33e3
+- feat: add user-friendly GitHub API error handling (#1790) by @StillKnotKnown in 8ece0009e
+- fix(roadmap): sync roadmap features with task lifecycle (#1791) by @Andy in 115576e85
+- fix(github): resolve PR review hanging in bundled app (#1793) by @Andy in 3791b37bb
+- feat(profiles): implement unified profile swapping across OAuth and API accounts (#1794) by @StillKnotKnown in 282387356
+- test: improve backend memory system test coverage to 100% (#1780) by @StillKnotKnown in 4f1b7b2a9
+- fix(ideation): guard against non-string properties in IdeaCard badges by @AndyMik90 in 5e78d748e
+- fix(updater): convert HTML release notes to markdown before rendering by @AndyMik90 in aa5fc7f95
+- fix(pr-review): simplify structured output schema to reduce validation failures (#1787) by @Andy in cd8914700
+- fix(qa): enforce visual verification for UI changes and inject startup commands (#1784) by @Andy in f149a7fbd
+- fix(plan-files): use atomic writes to prevent 0-byte corruption (#1785) by @Andy in c2245b812
+- fix(terminal): make worktree dropdown scrollable and show all items by @AndyMik90 in 950da45e4
+- auto-claude: subtask-1-1 - Add adaptive thinking badge to thinking level label (#1782) by @Andy in 25acf2826
+- auto-claude: subtask-1-1 - Add overflow-hidden and break-words to subtask cards by @AndyMik90 in 39aa08872
+- refactor(app-updater): disable automatic downloads and allow intentional downgrades by @AndyMik90 in 8de8039db
+- fix(auth): detect auth errors in AI response text and prevent retry loops (#1776) by @Andy in f4788e4af
+- test: achieve 100% coverage for backend core workspace module (#1774) by @StillKnotKnown in 3f95765cf
+- fix(title-generator): add production path resolution for backend source (#1778) by @Andy in 923880f5b
+- fix(fast-mode): use setting_sources instead of env var for CLI fast mode (#1771) by @Andy in 390ba6a58
+- fix(windows): complete System32 executable path fixes for where.exe and taskkill.exe (#1715) by @VDT-91 in aa7f56e5d
+- fix(worktree): remove auto-commit on deletion and add uncommitted changes warning by @AndyMik90 in cec8e65ee
+- Smart PR Status Polling System (#1766) by @Andy in 48d5f7a32
+- feat: simplify thinking system and remove opus-1m model variant (#1760) by @Andy in bb7e18937
+- auto-claude: 203-fix-pr-review-ui-update-issue (#1732) by @Andy in 7589f8e4f
+- auto-claude: subtask-2-1 - Create isAPIProfileAuthenticated() function to val (#1745) by @Andy in 57e38a692
+- auto-claude: 202-fix-kanban-board-scaling-collisions (#1731) by @Andy in d09ebb850
+- auto-claude: 204-fix-pr-review-ui-not-updating-without-manual-navig (#1734) by @Andy in 087091cef
+- auto-claude: 203-fix-ui-not-updating-during-pr-review-operations (#1733) by @Andy in f085c08bd
+- auto-claude: 205-fix-insights-chat-only-shows-last-task-suggestion- (#1735) by @Andy in f121f9cdd
+- auto-claude: 197-roadmap-generation-stuck-at-50-file-locking-race-c (#1746) by @Andy in f41f15e59
+- auto-claude: 193-fix-update-context7-mcp-tool-name-from-get-library (#1744) by @Andy in bdff9141a
+- auto-claude: 192-changelog-generation-multiple-critical-bugs-tasks- (#1725) by @Andy in 8c9a504df
+- auto-claude: 194-bug-rate-limit-during-task-execution-causes-subtas (#1726) by @Andy in 8a7443d24
+- auto-claude: 201-bug-pr-review-logs-and-analysis (#1730) by @Andy in e0d53adb4
+- auto-claude: 196-fix-worktrees-dialog-auto-close-race-condition-and (#1727) by @Andy in 323b0d3be
+- auto-claude: 199-bug-logs-disappear-after-restart (#1728) by @Andy in d639f6ef8
+- auto-claude: 198-critical-oauth-token-revocation-causes-infinite-40 (#1747) by @Andy in 4438c0b10
+- Fix Panel Constraints Error During Terminal Exit (#1757) by @Andy in 32bf353da
+- auto-claude: 190-bug-context-page-crash-multiple-root-causes-when-v (#1724) by @Andy in 2db36982f
+- feat: add search/filter to WorktreeSelector dropdown (#1754) by @Andy in 09f059ca3
+- fix(terminal): push worktree branch to remote with tracking on creation (#1753) by @Andy in b5de0d9ff
+- auto-claude: 189-subtask-execution-stuck-in-infinite-retry-loop-whe (#1723) by @Andy in 445da186c
+- auto-claude: 188-terminal-claude-sessions-require-manual-click-to-r (#1743) by @Andy in f8499e965
+- auto-claude: 200-bug-changelog-and-release-generation (#1729) by @Andy in 826583b82
+- fix(terminal): use each terminal's cwd for invoke Claude all button (#1756) by @Andy in ac4fe4f42
+- feat(terminal): read Claude Code CLI settings and inject env vars into PTY sessions (#1750) by @Andy in 152e54093
+- fix: correct .auto-claude path mismatch causing discovery phase timeout (#1748) by @VDT-91 in 2c2a8a754
+- fix: remove incorrect /v1 suffix from OpenRouter API URL (#1749) by @StillKnotKnown in 7e799ee57
+- fix: prevent terminal worktree crash with race condition fixes (#1586) (#1658) by @VDT-91 in 216b58bcf
+- fix: correct log order sorting and add configurable log order setting (#1720) by @Burak in 2e2b82365
+- fix(ollama): stop infinite subprocess spawning from useEffect re-render loop (#1716) by @Quentin Veys in acb131b72
+- fix(graphiti): migrate graphiti_memory imports to canonical paths (#1714) by @Quentin Veys in df528f065
+- fix: improve auto-updater for beta releases and DMG installs (#1681) by @Andy in ff91a1af0
+- feat: unified operation registry for intelligent auth/rate limit recovery (#1698) by @Andy in 6d0222fa9
+- fix: Prevent stale worktree data from overriding correct task status (#1710) by @Burak in fe08c644c
+- feat: add subscriptionType and rateLimitTier to ClaudeProfile (#1688) by @Andy in a5e3cc9a2
+- auto-claude: subtask-1-1 - Add useTaskStore import and update task state after successful PR creation (#1683) by @Andy in 4587162e4
+- auto-claude: 182-implement-pagination-and-filtering-for-github-pr-l (#1654) by @Andy in b4e6b2fe4
+- auto-claude: 181-add-expand-button-for-long-task-descriptions (#1653) by @Andy in d9cd300fe
+- fix(terminal): resolve text alignment issues on expand/minimize (#1650) by @VDT-91 in f5a7e26d9
+- fix(windows): use full path to where.exe for reliable executable lookup (#1659) by @VDT-91 in 5f63daa3c
+- fix: resolve ideation stuck at 3/6 types bug (#1660) by @VDT-91 in e6e8da17c
+- Clarify Local and Origin Branch Distinction (#1652) by @Andy in 9317148b6
+- auto-claude: 186-set-default-dark-mode-on-startup (#1656) by @Andy in 473020621
+- auto-claude: subtask-1-1 - Add min-h-0 to enable scrolling in Roadmap tabs (#1655) by @Andy in ae703be9f
+- fix: XState status lifecycle & cross-project contamination fixes (#1647) by @kaigler in 5293fb399
+- refactor(frontend): complete XState task state machine migration (#1338) (#1575) by @kaigler in e2f9abadb
+- Merge conflict resolution progress bar and log viewer (#1620) by @Andy in d16be3077
+- fix: align Linux package builds (AppImage/deb/Flatpak) with target-specific extraResources (#1623) by @StillKnotKnown in bad1a9b2c
+- Fix/gitlab bugs (#1519 and #1521) (#1544) by @bu5hm4nn in cd423c65c
+- feat(kanban): add bulk task delete and worktree cleanup improvements (#1588) by @kaigler in 02ed91c91
+- fix: add worktree isolation warning to prevent agent escape (#1528) by @kaigler in fe5cc582b
+- feat(ui): add spell check support for text inputs (#1304) by @kaigler in 8f02a5129
+- fix(windows): complete Windows credential fixes with path normalization (#1585) by @kaigler in 1e1997167
+- AI-Powered GitHub PR Template Generation (#1618) by @Andy in 900dd4360
+- Fix pty.node SIGABRT crash on macOS shutdown (#1619) by @Andy in f355e09d7
+- fix(merge): use git merge for diverged branches with progress tracking (#1605) by @Andy in bde2ca4b2
+- Surface Billing/Credit Exhaustion Errors to UI (Issue #1580) (#1617) by @Andy in 7bf12e856
+- auto-claude: subtask-1-1 - Change $teamId type from ID! to String! in the team query (#1627) by @Andy in 54d0cd2f4
+- fix(auth): support API profile mode without OAuth requirement (#1616) by @StillKnotKnown in f8cc63af4
+- fix: agent retry loop for tool concurrency errors (#1546) [v3] (#1606) by @Michael Ludlow in 0aea4fb5e
+- fix(queue): enforce max parallel tasks and auto-refresh UI (#1594) by @Andy in 4070a4c29
+- Persist Kanban column collapse state per project via main process (#1579) by @Andy in a1114664e
+- feat(pr-review): evidence-based validation and trigger-driven exploration (#1593) by @Andy in bfc232825
+- fix(ui): smart auto-scroll for Insights streaming responses (#1591) by @kaigler in eee97e7ea
+- fix(changelog): validate Claude CLI exists before generation (#1305) by @kaigler in c1f24c07f
+- auto-claude: subtask-1-1 - Add min-w-0 class to subtask title row flex container (#1578) by @Andy in 286591c02
+- auto-claude: subtask-1-1 - Remove Popover wrapper and related functionality from ClaudeCodeStatusBadge (#1566) by @Andy in 8d18cc81a
+- fix(claude-profile): preserve subscriptionType and rateLimitTier during token refresh (#1556) by @Andy in 52e426a48
+- auto-claude: subtask-1-1 - Update cancelReview callback to handle both success and failure cases (#1551) by @Andy in d8f00fe5a
+- fix(backend): prioritize git remote detection over env var for repo (#1555) by @Andy in 9b07ed464
+- fix(backend): handle detached HEAD state when pushing branch for PR creation (#1560) by @Andy in 2b72694d0
+- fix: add explicit UTF-8 encoding across all Electron main process I/O (#1554) by @Andy in 4243530e9
+- fix(backend): pass OAuth token to Python subprocess for authentication by @AndyMik90 in 6f1002dd7
+- perf(frontend): async parallel worktree listing to prevent UI freezes (#1553) by @Andy in 399a7e736
+- auto-claude: subtask-1-1 - Remove amber lock indicator line from kanban resize handle (#1557) by @Andy in 83a64b88e
+- fix(frontend): resolve TerminalFontSettings infinite re-render loop (#1536) by @StillKnotKnown in 1c6266025
+- fix(frontend): respect hasCompletedOnboarding from ~/.claude.json (#1537) by @StillKnotKnown in 1860c2c43
+- fix: prevent planner from generating invalid verification types (#1388) (#1529) by @kaigler in 94d941333
+- fix(frontend): resolve Insights scroll-to-blank-space issue on macOS (ACS-382) (#1535) by @StillKnotKnown in 496b2b96a
+- feat: add customizable terminal fonts with OS-specific defaults (#1412) by @StillKnotKnown in f289107b8
+- Add dev mode screenshot capture warning (#1516) by @Andy in 16eeb301a
+- fix: add worktree isolation warnings to prevent agent escape (ACS-394) (#1495) by @StillKnotKnown in 1e453653b
+- fix: resolve flaky subprocess-spawn test on Windows CI (ACS-392) (#1494) by @StillKnotKnown in f6b264d56
+- feat(task-logger): strip ANSI escape codes from logs and extend coverage (#1411) by @StillKnotKnown in 988ec0c25
+- fix(frontend): use spawn() instead of exec() for Windows terminal launching (#1498) by @StillKnotKnown in 26c9083d3
+- fix(api-profiles): correct z.AI China preset URL and rename provider presets (#1500) by @StillKnotKnown in 05cf0a516
+- fix: validate branch pattern before worktree cleanup to prevent deleting wrong branch (#1493) by @StillKnotKnown in 8576754a1
+- Real-Time Updates for Insights Chat (#1511) by @Andy in d940b6ade
+- Fix Terminal UI Rendering Issues (#1514) by @Andy in 8d8306b8e
+- Fix terminal content resizing on expansion (#1512) by @Andy in 9f6c0026b
+- Restore Terminal Session History on App Restart (#1515) by @Andy in 63e2847fc
+- Move Reference Images Above Task Title & Fix Image Display Issues (#1513) by @Andy in b269ac305
+- auto-claude: 143-fix-github-integration-ui-refresh-issues (#1467) by @Andy in aa2cb4fa6
+- feat: Multi-profile account swapping with token refresh and queue routing (#1496) by @Andy in 1e72c8d77
+- Simplified Testing Strategy for Regression Prevention (#1379) by @Andy in ae4e48e8b
+- auto-claude: 152-persist-tasks-during-roadmap-regeneration (#1463) by @Andy in 9bd3d7e3b
+- Debug Kanban Memory & Add Sentry Monitoring (#1380) by @Andy in bc5f550ee
+- auto-claude: 147-remove-outdated-compatibility-shims (#1465) by @Andy in 53111dbb9
+- auto-claude: 162-fix-worktree-error-on-repeated-task-starts (#1453) by @Andy in b955badf7
+- auto-claude: 155-fix-pr-list-diff-display-metrics (#1458) by @Andy in 31f116db5
+- auto-claude: 151-fix-pr-review-agent-token-refresh-on-account-swap (#1456) by @Andy in d081af042
+- auto-claude: 148-add-progress-persistence-and-status-indicators (#1464) by @Andy in 4937d5745
+- auto-claude: 154-fix-task-modal-conflict-check-status-refresh (#1462) by @Andy in 0299009df
+- auto-claude: 153-widen-kanban-columns-and-add-collapse-feature (#1457) by @Andy in d65973075
+- auto-claude: subtask-1-1 - Add filter after map operation to remove empty str (#1466) by @Andy in 783f0fe0e
+- fix: add formatReleaseNotes helper for markdown changelog rendering (#1468) by @Andy in 43a97e1b3
+- feat(sidebar): add collapsible sidebar toggle (#1501) by @Michael Ludlow in d17c17887
+- fix(auth): check .credentials.json for Linux profile authentication (#1492) by @StillKnotKnown in 8d2f66291
+- auto-claude: subtask-1-1 - Replace ReleaseNotesRenderer with ReactMarkdown (#1454) by @Andy in 1185a558c
+- auto-claude: 156-fix-electron-app-version-detection-bug (#1459) by @Andy in 9a3b48c25
+- auto-claude: subtask-1-1 - Add --no-track flag to git worktree add command (#1455) by @Andy in 0c2990815
+- auto-claude: subtask-1-1 - Change task.specId to taskId in 3 startSpecCreation calls (#1461) by @Andy in 91edc0e14
+- fix(onboarding): align MemoryStep layout with Settings MemoryBackendSection (#1445) by @Michael Ludlow in e9de26d59
+- auto-claude: subtask-1-1 - Add metadata?.requireReviewBeforeCoding check (#1460) by @Andy in 426d56571
+- fix: use API profile environment variables for task title generation (#1471) by @JoshuaRileyDev in c5a0f042d
+- fix(auth): Long-lived OAuth authentication with multi-profile usage display (#1443) by @Andy in 12e788417
+- feat: Add screenshot capture to task creation modal (#1429) by @JoshuaRileyDev in 1a2a1b1fc
+- fix: prevent queue settings modal from disappearing when tasks change (#1430) by @JoshuaRileyDev in 33acc1430
+- feat: Queue System v2 with Auto-Promotion and Smart Task Management (#1203) by @JoshuaRileyDev in 3b87e24d7
+- feat: Add API profile providers usage endpoints support (#1279) by @StillKnotKnown in cfe7dedd0
+
+## Thanks to all contributors
+
+@AndyMik90, @Andy, @Burak, @StillKnotKnown, @VDT-91, @kaigler, @Michael Ludlow, @JoshuaRileyDev, @Quentin Veys, @bu5hm4nn
+
 ## 2.7.5 - Security & Platform Improvements
 
 ### ✨ New Features
@@ -74,6 +305,8 @@
 
 ### 🐛 Bug Fixes
 
+- Fixed task logs disappearing after app restart in development mode (issue #1657)
+
 - Fixed Kanban board status flip-flopping and multi-location task deletion
 
 - Fixed Windows CLI detection and version selection UX issues

CLAUDE.md

@@ -40,6 +40,29 @@ Auto Claude is a desktop application (+ CLI) where users describe a goal and AI
 
 **PR target** — Always target the `develop` branch for PRs to AndyMik90/Auto-Claude, NOT `main`.
 
+**No console.log for debugging production issues** — `console.log` output is not visible in bundled/packaged versions of the Electron app. Use Sentry for error tracking and diagnostics in production. Reserve `console.log` for development only.
+
+## Work Approach
+
+**Investigate before speculating** — Always read the actual code before proposing root causes. Spawn agents to grep and read relevant source files before forming any hypothesis. Never guess at causes without evidence from the codebase.
+
+**Spawn agents for complex tasks** — When tackling complex tasks, spawn sub-agents/agent teams immediately rather than trying to handle everything in a single context window. Never attempt to analyze large codebases or multiple features monolithically.
+
+**Minimal fixes only** — Prefer the simplest approach (e.g., prompt-only changes, single guard clause) before suggesting multi-component solutions. If the user asks for X, implement X — don't bundle additional fixes they didn't request.
+
+## Known Gotchas
+
+**Electron path resolution** — For bug fixes in the Electron app, always check path resolution differences between dev and production builds (`app.isPackaged`, `process.resourcesPath`). Paths that work in dev often break when Electron is bundled for production — verify both contexts.
+
+### Resetting PR Review State
+
+To fully clear all PR review data so reviews run fresh, delete/reset these three things in `.auto-claude/github/`:
+
+1. `rm .auto-claude/github/pr/logs_*.json` — review log files
+2. `rm .auto-claude/github/pr/review_*.json` — review result files
+3. Reset `pr/index.json` to `{"reviews": [], "last_updated": null}`
+4. Reset `bot_detection_state.json` to `{"reviewed_commits": {}}` — this is the gatekeeper; without clearing it, the bot detector skips already-seen commits
+
 ## Project Structure
 
 ```
@@ -98,30 +121,6 @@ cd apps/backend && uv venv && uv pip install -r requirements.txt
 cd apps/frontend && npm install
 ```
 
-### Backend
-```bash
-cd apps/backend
-python spec_runner.py --interactive            # Create spec interactively
-python spec_runner.py --task "description"      # Create from task
-python run.py --spec 001                        # Run autonomous build
-python run.py --spec 001 --qa                   # Run QA validation
-python run.py --spec 001 --merge                # Merge completed build
-python run.py --list                            # List all specs
-```
-
-### Frontend
-```bash
-cd apps/frontend
-npm run dev              # Dev mode (Electron + Vite HMR)
-npm run build            # Production build
-npm run test             # Vitest unit tests
-npm run test:watch       # Vitest watch mode
-npm run lint             # Biome check
-npm run lint:fix         # Biome auto-fix
-npm run typecheck        # TypeScript strict check
-npm run package          # Package for distribution
-```
-
 ### Testing
 
 | Stack | Command | Tool |
@@ -145,30 +144,7 @@ See [RELEASE.md](RELEASE.md) for full release process.
 
 Client: `apps/backend/core/client.py` — `create_client()` returns a configured `ClaudeSDKClient` with security hooks, tool permissions, and MCP server integration.
 
-Model and thinking level are user-configurable (via the Electron UI settings or CLI override). Use `phase_config.py` helpers to resolve the correct values:
-
-```python
-from core.client import create_client
-from phase_config import get_phase_model, get_phase_thinking_budget
-
-# Resolve model/thinking from user settings (Electron UI or CLI override)
-phase_model = get_phase_model(spec_dir, "coding", cli_model=None)
-phase_thinking = get_phase_thinking_budget(spec_dir, "coding", cli_thinking=None)
-
-client = create_client(
-    project_dir=project_dir,
-    spec_dir=spec_dir,
-    model=phase_model,
-    agent_type="coder",          # planner | coder | qa_reviewer | qa_fixer
-    max_thinking_tokens=phase_thinking,
-)
-
-# Run agent session (uses context manager + run_agent_session helper)
-async with client:
-    status, response = await run_agent_session(client, prompt, spec_dir)
-```
-
-Working examples: `agents/planner.py`, `agents/coder.py`, `qa/reviewer.py`, `qa/fixer.py`, `spec/`
+Model and thinking level are user-configurable (via the Electron UI settings or CLI override). Use `phase_config.py` helpers to resolve the correct values
 
 ### Agent Prompts (`apps/backend/prompts/`)
 
@@ -323,6 +299,8 @@ cd apps/backend && python run.py --spec 001
 # Desktop app
 npm start          # Production build + run
 npm run dev        # Development mode with HMR
+npm run dev:debug  # Debug mode with verbose output
+npm run dev:mcp    # Electron MCP server for AI debugging
 
 # Project data: .auto-claude/specs/ (gitignored)
 ```

README.md

@@ -8,6 +8,7 @@
 [![Discord](https://img.shields.io/badge/Discord-Join%20Community-5865F2?style=flat-square&logo=discord&logoColor=white)](https://discord.gg/KCXaPBr4Dj)
 [![YouTube](https://img.shields.io/badge/YouTube-Subscribe-FF0000?style=flat-square&logo=youtube&logoColor=white)](https://www.youtube.com/@AndreMikalsen)
 [![CI](https://img.shields.io/github/actions/workflow/status/AndyMik90/Auto-Claude/ci.yml?branch=main&style=flat-square&label=CI)](https://github.com/AndyMik90/Auto-Claude/actions)
+[![Mentioned in Awesome Claude Code](https://awesome.re/mentioned-badge-flat.svg)](https://github.com/hesreallyhim/awesome-claude-code)
 
 ---
 
@@ -16,18 +17,18 @@
 ### Stable Release
 
 <!-- STABLE_VERSION_BADGE -->
-[![Stable](https://img.shields.io/badge/stable-2.7.5-blue?style=flat-square)](https://github.com/AndyMik90/Auto-Claude/releases/tag/v2.7.5)
+[![Stable](https://img.shields.io/badge/stable-2.7.6-blue?style=flat-square)](https://github.com/AndyMik90/Auto-Claude/releases/tag/v2.7.6)
 <!-- STABLE_VERSION_BADGE_END -->
 
 <!-- STABLE_DOWNLOADS -->
 | Platform | Download |
 |----------|----------|
-| **Windows** | [Auto-Claude-2.7.5-win32-x64.exe](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.5/Auto-Claude-2.7.5-win32-x64.exe) |
-| **macOS (Apple Silicon)** | [Auto-Claude-2.7.5-darwin-arm64.dmg](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.5/Auto-Claude-2.7.5-darwin-arm64.dmg) |
-| **macOS (Intel)** | [Auto-Claude-2.7.5-darwin-x64.dmg](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.5/Auto-Claude-2.7.5-darwin-x64.dmg) |
-| **Linux** | [Auto-Claude-2.7.5-linux-x86_64.AppImage](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.5/Auto-Claude-2.7.5-linux-x86_64.AppImage) |
-| **Linux (Debian)** | [Auto-Claude-2.7.5-linux-amd64.deb](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.5/Auto-Claude-2.7.5-linux-amd64.deb) |
-| **Linux (Flatpak)** | [Auto-Claude-2.7.5-linux-x86_64.flatpak](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.5/Auto-Claude-2.7.5-linux-x86_64.flatpak) |
+| **Windows** | [Auto-Claude-2.7.6-win32-x64.exe](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.6/Auto-Claude-2.7.6-win32-x64.exe) |
+| **macOS (Apple Silicon)** | [Auto-Claude-2.7.6-darwin-arm64.dmg](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.6/Auto-Claude-2.7.6-darwin-arm64.dmg) |
+| **macOS (Intel)** | [Auto-Claude-2.7.6-darwin-x64.dmg](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.6/Auto-Claude-2.7.6-darwin-x64.dmg) |
+| **Linux** | [Auto-Claude-2.7.6-linux-x86_64.AppImage](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.6/Auto-Claude-2.7.6-linux-x86_64.AppImage) |
+| **Linux (Debian)** | [Auto-Claude-2.7.6-linux-amd64.deb](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.6/Auto-Claude-2.7.6-linux-amd64.deb) |
+| **Linux (Flatpak)** | [Auto-Claude-2.7.6-linux-x86_64.flatpak](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.6/Auto-Claude-2.7.6-linux-x86_64.flatpak) |
 <!-- STABLE_DOWNLOADS_END -->
 
 ### Beta Release
@@ -35,18 +36,18 @@
 > ⚠️ Beta releases may contain bugs and breaking changes. [View all releases](https://github.com/AndyMik90/Auto-Claude/releases)
 
 <!-- BETA_VERSION_BADGE -->
-[![Beta](https://img.shields.io/badge/beta-2.7.2--beta.10-orange?style=flat-square)](https://github.com/AndyMik90/Auto-Claude/releases/tag/v2.7.2-beta.10)
+[![Beta](https://img.shields.io/badge/beta-2.7.6--beta.6-orange?style=flat-square)](https://github.com/AndyMik90/Auto-Claude/releases/tag/v2.7.6-beta.6)
 <!-- BETA_VERSION_BADGE_END -->
 
 <!-- BETA_DOWNLOADS -->
 | Platform | Download |
 |----------|----------|
-| **Windows** | [Auto-Claude-2.7.2-beta.10-win32-x64.exe](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.2-beta.10/Auto-Claude-2.7.2-beta.10-win32-x64.exe) |
-| **macOS (Apple Silicon)** | [Auto-Claude-2.7.2-beta.10-darwin-arm64.dmg](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.2-beta.10/Auto-Claude-2.7.2-beta.10-darwin-arm64.dmg) |
-| **macOS (Intel)** | [Auto-Claude-2.7.2-beta.10-darwin-x64.dmg](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.2-beta.10/Auto-Claude-2.7.2-beta.10-darwin-x64.dmg) |
-| **Linux** | [Auto-Claude-2.7.2-beta.10-linux-x86_64.AppImage](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.2-beta.10/Auto-Claude-2.7.2-beta.10-linux-x86_64.AppImage) |
-| **Linux (Debian)** | [Auto-Claude-2.7.2-beta.10-linux-amd64.deb](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.2-beta.10/Auto-Claude-2.7.2-beta.10-linux-amd64.deb) |
-| **Linux (Flatpak)** | [Auto-Claude-2.7.2-beta.10-linux-x86_64.flatpak](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.2-beta.10/Auto-Claude-2.7.2-beta.10-linux-x86_64.flatpak) |
+| **Windows** | [Auto-Claude-2.7.6-beta.6-win32-x64.exe](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.6-beta.6/Auto-Claude-2.7.6-beta.6-win32-x64.exe) |
+| **macOS (Apple Silicon)** | [Auto-Claude-2.7.6-beta.6-darwin-arm64.dmg](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.6-beta.6/Auto-Claude-2.7.6-beta.6-darwin-arm64.dmg) |
+| **macOS (Intel)** | [Auto-Claude-2.7.6-beta.6-darwin-x64.dmg](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.6-beta.6/Auto-Claude-2.7.6-beta.6-darwin-x64.dmg) |
+| **Linux** | [Auto-Claude-2.7.6-beta.6-linux-x86_64.AppImage](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.6-beta.6/Auto-Claude-2.7.6-beta.6-linux-x86_64.AppImage) |
+| **Linux (Debian)** | [Auto-Claude-2.7.6-beta.6-linux-amd64.deb](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.6-beta.6/Auto-Claude-2.7.6-beta.6-linux-amd64.deb) |
+| **Linux (Flatpak)** | [Auto-Claude-2.7.6-beta.6-linux-x86_64.flatpak](https://github.com/AndyMik90/Auto-Claude/releases/download/v2.7.6-beta.6/Auto-Claude-2.7.6-beta.6-linux-x86_64.flatpak) |
 <!-- BETA_DOWNLOADS_END -->
 
 > All releases include SHA256 checksums and VirusTotal scan results for security verification.

apps/backend/.env.example

@@ -32,8 +32,8 @@
 # API_TIMEOUT_MS=600000
 
 # Model override (OPTIONAL)
-# Default: claude-opus-4-5-20251101
-# AUTO_BUILD_MODEL=claude-opus-4-5-20251101
+# Default: claude-opus-4-6
+# AUTO_BUILD_MODEL=claude-opus-4-6
 
 
 # =============================================================================

apps/backend/.gitignore

@@ -62,6 +62,14 @@ Thumbs.db
 # Tests (development only)
 tests/
 
+# Exception: Allow colocated tests within integrations/graphiti
+!integrations/graphiti/tests/
+
 # Auto Claude data directory
 .auto-claude/
-/gitlab-integration-tests/
+
+# Auto Claude generated files
+.auto-claude-security.json
+.auto-claude-status
+.security-key
+logs/security/

apps/backend/INVESTIGATION.md

@@ -1,421 +0,0 @@
-# Token Encryption Investigation
-
-## Issue Summary
-
-Auto-Claude users are experiencing API 401 errors ("Invalid bearer token") because the Python backend is passing encrypted tokens (with `enc:` prefix) directly to the Claude Agent SDK without decryption. Standalone Claude Code terminals work correctly because they decrypt these tokens before use.
-
-**Key insight from user thehaffk:** "python cant unencrypt claude token and it launches session with CLAUDE_CODE_OAUTH_TOKEN=enc:djEwtxMGISt3tQ..."
-
-## Token Storage Format
-
-### Encrypted Token Format
-
-Claude Code CLI stores OAuth tokens in an encrypted format with the prefix `enc:`:
-
-```text
-enc:djEwtxMGISt3tQ...
-```
-
-This format is used when tokens are stored in:
-- **macOS**: Keychain (service: "Claude Code-credentials")
-- **Linux**: Secret Service API (DBus, via secretstorage library)
-- **Windows**: Credential Manager / .credentials.json files
-
-### Decrypted Token Format
-
-Valid Claude OAuth tokens have the format:
-```text
-sk-ant-oat01-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-```
-
-## Current Token Flow (BROKEN)
-
-1. **Token Storage**: Claude Code CLI stores encrypted token with `enc:` prefix in system keychain
-2. **Token Retrieval**: `apps/backend/core/auth.py::get_auth_token()` retrieves token from:
-   - Environment variable `CLAUDE_CODE_OAUTH_TOKEN`
-   - OR system keychain via `get_token_from_keychain()`
-3. **❌ NO DECRYPTION**: Token is returned as-is with `enc:` prefix intact
-4. **SDK Initialization**: Encrypted token passed to Claude Agent SDK
-5. **API Call Fails**: SDK sends encrypted token to API → 401 error
-
-### Proof of Broken Flow
-
-Test in `apps/backend`:
-```python
-import os
-os.environ['CLAUDE_CODE_OAUTH_TOKEN'] = 'enc:test123'
-
-from core.auth import get_auth_token
-token = get_auth_token()
-print(f"Token: {token}")  # Output: "enc:test123"
-print(f"Encrypted: {token.startswith('enc:')}")  # Output: True
-```
-
-## How Standalone Claude Code CLI Handles Tokens
-
-### Current Understanding
-
-1. **Token Detection**: CLI checks if token starts with `enc:` prefix
-2. **Decryption**: If encrypted, CLI decrypts using platform-specific keyring access
-3. **Authentication**: Decrypted `sk-ant-oat01-` token is used for API calls
-
-### Missing Documentation
-
-Web search for "Claude Code CLI encrypted token enc: prefix decryption" found:
-- Token storage formats (JSON with accessToken, refreshToken, expiresAt)
-- Security issues (tokens exposed in debug logs before v2.1.0)
-- Keychain access patterns for macOS/Linux/Windows
-
-**❌ NOT FOUND**: Specific documentation on how Claude Code CLI decrypts `enc:` tokens
-
-Sources:
-- [Claude Code CLI over SSH on macOS: Fixing Keychain Access](https://phoenixtrap.com/2025/10/26/claude-code-cli-over-ssh-on-macos-fixing-keychain-access/)
-- [Identity and Access Management - Claude Code Docs](https://code.claude.com/docs/en/iam)
-- [Claude Code sessions should be encrypted | yoav.blog](https://yoav.blog/2026/01/09/claude-code-sessions-should-be-encrypted/)
-
-## Decryption Approach Options
-
-### Option 1: Claude Agent SDK Built-in Decryption
-
-**Status**: NEEDS VERIFICATION
-
-The Claude Agent SDK (`claude-agent-sdk>=0.1.19`) may handle decryption internally if:
-- Token is passed to SDK still encrypted
-- SDK detects `enc:` prefix
-- SDK has access to system keyring for decryption
-
-**Action Required**: Check if SDK has decryption capabilities by examining:
-- SDK source code or documentation
-- Whether SDK expects encrypted vs decrypted tokens
-- If SDK requires specific environment variables for decryption
-
-### Option 2: Python Backend Decryption (Recommended)
-
-**Approach**: Implement decryption in `apps/backend/core/auth.py` before passing to SDK
-
-**Implementation Pattern**:
-```python
-def get_auth_token() -> str | None:
-    """Get authentication token (decrypted if necessary)."""
-    token = _retrieve_token_from_sources()  # From env or keychain
-
-    if token and token.startswith("enc:"):
-        # Decrypt the token
-        token = decrypt_token(token)
-
-    return token
-
-def decrypt_token(encrypted_token: str) -> str:
-    """
-    Decrypt Claude Code encrypted token.
-
-    Args:
-        encrypted_token: Token with 'enc:' prefix
-
-    Returns:
-        Decrypted token in format 'sk-ant-oat01-...'
-    """
-    # Remove 'enc:' prefix
-    encrypted_data = encrypted_token[4:]
-
-    # TODO: Implement decryption logic
-    # Questions to answer:
-    # 1. What encryption algorithm does Claude Code use?
-    # 2. Where is the decryption key stored?
-    # 3. Is the decryption key platform-specific (per-user)?
-    # 4. Can we reuse Claude Code's decryption mechanism?
-
-    raise NotImplementedError("Token decryption not yet implemented")
-```
-
-### Option 3: Call Claude Code CLI for Decryption
-
-**Approach**: Use the Claude Code CLI binary to decrypt tokens
-
-```python
-def decrypt_token(encrypted_token: str) -> str:
-    """Decrypt token by invoking Claude Code CLI."""
-    # Find claude binary
-    claude_path = shutil.which("claude") or "~/.local/bin/claude"
-
-    # Use CLI command to get decrypted token
-    # (if such a command exists - needs research)
-    result = subprocess.run(
-        [claude_path, "auth", "decrypt", encrypted_token],
-        capture_output=True,
-        text=True
-    )
-
-    return result.stdout.strip()
-```
-
-**Issues**:
-- Requires Claude Code CLI to be installed
-- No documented CLI command for token decryption
-- Adds external dependency
-
-## Required Investigation Steps
-
-### 1. Verify SDK Decryption Capabilities
-
-**Task**: Check if `claude-agent-sdk` handles `enc:` tokens automatically
-
-**Method**:
-```bash
-# In environment with SDK installed
-python3 << 'EOF'
-import os
-os.environ['CLAUDE_CODE_OAUTH_TOKEN'] = 'enc:...'  # Real encrypted token
-
-from claude_agent_sdk import Client
-# Try creating client - does it decrypt internally?
-client = Client()
-# Check if authentication works
-EOF
-```
-
-### 2. Reverse Engineer Claude Code CLI Decryption
-
-**Task**: Understand how Claude CLI decrypts tokens
-
-**Method**:
-- Examine Claude CLI binary (if possible)
-- Trace system calls when CLI runs (strace on Linux, dtruss on macOS)
-- Check if CLI accesses specific keychain entries for decryption keys
-- Look for encryption/decryption libraries used by CLI
-
-### 3. Find Decryption Key Storage
-
-**Task**: Locate where decryption keys are stored
-
-**Hypothesis**: Decryption key stored in:
-- macOS: Keychain (separate entry from encrypted token)
-- Linux: Secret Service API
-- Windows: Credential Manager
-
-**Verification**:
-```bash
-# macOS: List all keychain entries
-security find-generic-password -a "$(whoami)" | grep -i claude
-
-# Linux: Use secretstorage to list all items
-python3 -c "import secretstorage; ..."
-```
-
-## Recommended Decryption Approach for Python Backend
-
-Based on investigation so far, the recommended approach is:
-
-1. **Detect encrypted tokens**: Check for `enc:` prefix in `get_auth_token()`
-2. **Decrypt before use**: Implement `decrypt_token()` function
-3. **Platform-specific decryption**: Use appropriate keyring library:
-   - macOS: Use `subprocess` with `/usr/bin/security` to access decryption key
-   - Linux: Use `secretstorage` library to access Secret Service API
-   - Windows: Access Credential Manager or credentials.json
-4. **Backward compatibility**: Support both encrypted and plaintext tokens
-5. **Error handling**: Provide clear error messages if decryption fails
-
-## Complete Token Flow Trace (Frontend → Backend)
-
-### 1. Token Retrieval (Frontend)
-
-**File**: `apps/frontend/src/main/services/profile-service.ts`
-
-The frontend retrieves the OAuth token from the system keychain but **does not decrypt it**. When no API profile is active (OAuth mode), the frontend returns an empty environment object, which means it relies on:
-- The token already being in the environment as `CLAUDE_CODE_OAUTH_TOKEN`
-- OR the Python backend retrieving it from the keychain
-
-**Key Code**:
-```typescript
-// Line 223: Returns empty object in OAuth mode, allowing
-// CLAUDE_CODE_OAUTH_TOKEN to be used from system keychain
-```
-
-### 2. Environment Variable Passing (Frontend → PTY)
-
-**File**: `apps/frontend/src/main/terminal/pty-manager.ts`
-
-The PTY manager spawns the terminal shell with environment variables, including `CLAUDE_CODE_OAUTH_TOKEN`:
-
-**Key Code** (Lines 149-152):
-```typescript
-// Remove ANTHROPIC_API_KEY to ensure Claude Code uses OAuth tokens
-// (CLAUDE_CODE_OAUTH_TOKEN from profileEnv) instead of API keys
-const { DEBUG: _DEBUG, ANTHROPIC_API_KEY: _ANTHROPIC_API_KEY, ...cleanEnv } = process.env;
-```
-
-**Important**: The frontend passes through whatever token value exists in the environment - it does NOT check for `enc:` prefix or decrypt it.
-
-### 3. Token Retrieval (Backend)
-
-**File**: `apps/backend/core/auth.py`
-
-#### 3.1. get_auth_token()
-
-This function retrieves the token from multiple sources:
-
-```python
-def get_auth_token() -> str | None:
-    # First check environment variables
-    for var in AUTH_TOKEN_ENV_VARS:  # CLAUDE_CODE_OAUTH_TOKEN, ANTHROPIC_AUTH_TOKEN
-        token = os.environ.get(var)
-        if token:
-            return token  # ❌ Returns immediately without checking for enc: prefix
-
-    # Fallback to system credential store
-    return get_token_from_keychain()  # ❌ Also returns without decryption
-```
-
-**Issue**: Returns token as-is with `enc:` prefix intact.
-
-#### 3.2. require_auth_token()
-
-This function calls `get_auth_token()` and raises an error if no token is found:
-
-```python
-def require_auth_token() -> str:
-    token = get_auth_token()  # ❌ Gets encrypted token
-    if not token:
-        raise ValueError("No OAuth token found...")
-    return token  # ❌ Returns encrypted token
-```
-
-**Issue**: No decryption step between retrieval and return.
-
-#### 3.3. ensure_claude_code_oauth_token()
-
-This function ensures the environment variable is set:
-
-```python
-def ensure_claude_code_oauth_token() -> None:
-    if os.environ.get("CLAUDE_CODE_OAUTH_TOKEN"):
-        return
-
-    token = get_auth_token()  # ❌ Gets encrypted token
-    if token:
-        os.environ["CLAUDE_CODE_OAUTH_TOKEN"] = token  # ❌ Sets encrypted token
-```
-
-**Issue**: Propagates encrypted token to environment variable.
-
-### 4. Token Usage in SDK Client Creation (Backend)
-
-#### 4.1. Full Client Creation
-
-**File**: `apps/backend/core/client.py` (see `create_client()` function)
-
-```python
-def create_client(...):
-    oauth_token = require_auth_token()  # ❌ Gets encrypted token
-    # Ensure SDK can access it via its expected env var
-    os.environ["CLAUDE_CODE_OAUTH_TOKEN"] = oauth_token  # ❌ Sets encrypted token
-```
-
-**Issue**: Encrypted token is passed to the Claude Agent SDK, which expects a decrypted `sk-ant-oat01-` token.
-
-#### 4.2. Simple Client Creation
-
-**File**: `apps/backend/core/simple_client.py` (see `create_simple_client()` function)
-
-```python
-def create_simple_client(...):
-    # Get authentication
-    oauth_token = require_auth_token()  # ❌ Gets encrypted token
-    import os
-    os.environ["CLAUDE_CODE_OAUTH_TOKEN"] = oauth_token  # ❌ Sets encrypted token
-```
-
-**Issue**: Same problem - encrypted token passed to SDK.
-
-#### 4.3. Other Usages
-
-**Files**:
-- `apps/backend/core/workspace.py` (Line 1966) - AI merge operations
-- `apps/backend/runners/insights_runner.py` - Insights analysis
-- `apps/backend/runners/github/batch_issues.py` - GitHub batch operations
-- `apps/backend/integrations/linear/updater.py` - Linear integration
-- `apps/backend/commit_message.py` - Commit message generation
-- `apps/backend/analysis/insight_extractor.py` - Code insights
-- `apps/backend/merge/ai_resolver/claude_client.py` - Merge resolution
-
-**All follow the same pattern**: Call `ensure_claude_code_oauth_token()` → encrypted token in environment → SDK receives encrypted token → API 401 error.
-
-### 5. Where Decryption Should Be Inserted
-
-Based on the flow analysis, decryption should be added at **the earliest point of token retrieval** to avoid duplicating decryption logic:
-
-**RECOMMENDED INSERTION POINT**: `apps/backend/core/auth.py::get_auth_token()`
-
-```python
-def get_auth_token() -> str | None:
-    # First check environment variables
-    for var in AUTH_TOKEN_ENV_VARS:
-        token = os.environ.get(var)
-        if token:
-            # ✅ INSERT DECRYPTION HERE
-            if token.startswith("enc:"):
-                token = decrypt_token(token)
-            return token
-
-    # Fallback to system credential store
-    token = get_token_from_keychain()
-    # ✅ ALSO DECRYPT KEYCHAIN TOKENS
-    if token and token.startswith("enc:"):
-        token = decrypt_token(token)
-    return token
-```
-
-**Benefits of this approach**:
-1. Single location for decryption logic
-2. All downstream functions automatically get decrypted tokens
-3. Backward compatible (plaintext tokens pass through unchanged)
-4. Consistent behavior across all token sources (env vars and keychain)
-
-**Alternative insertion points** (NOT recommended):
-- `require_auth_token()` - Would need similar logic in `get_auth_token()` for non-required usage
-- `create_client()` - Would need duplication in `create_simple_client()` and all other clients
-- `ensure_claude_code_oauth_token()` - Would miss direct `get_auth_token()` calls
-
-## Next Steps
-
-1. ✅ Document current token flow and identify issue (THIS FILE - COMPLETED)
-2. ✅ Trace token flow from frontend to backend (THIS FILE - COMPLETED)
-3. ✅ Identify where decryption should be inserted (THIS FILE - COMPLETED)
-4. ⏳ Verify if Claude Agent SDK handles decryption internally
-5. ⏳ Reverse engineer or document Claude Code CLI decryption mechanism
-6. ⏳ Implement `decrypt_token()` function in `apps/backend/core/auth.py`
-7. ⏳ Add encryption detection and auto-decryption to `get_auth_token()`
-8. ⏳ Test with real encrypted tokens on macOS and Linux
-9. ⏳ Add comprehensive error handling for decryption failures
-
-## Open Questions
-
-1. **What encryption algorithm does Claude Code use for `enc:` tokens?**
-   - Possible: AES-256, ChaCha20, or similar
-   - Key derivation method?
-
-2. **Where is the decryption key stored?**
-   - Same keychain entry as encrypted token?
-   - Separate keychain entry?
-   - Derived from system/user credentials?
-
-3. **Does Claude Agent SDK expect encrypted or decrypted tokens?**
-   - If it expects decrypted: we must decrypt before passing
-   - If it handles encryption: we may be missing SDK configuration
-
-4. **Is there a Claude Code CLI command to decrypt tokens?**
-   - `claude auth decrypt <token>`?
-   - `claude auth get-token`?
-   - No documented command found in research
-
-5. **Can we reuse Claude Code's decryption mechanism?**
-   - Import decryption functions from CLI?
-   - Call CLI as subprocess?
-   - Implement decryption ourselves?
-
-## References
-
-- Issue: [GitHub #1223: API Error 401](https://github.com/AndyMik90/Auto-Claude/issues/1223)
-- Current auth implementation: `apps/backend/core/auth.py`
-- SDK client initialization: `apps/backend/core/client.py`
-- Requirements: `apps/backend/requirements.txt` (includes `secretstorage>=3.3.3` for Linux)

apps/backend/__init__.py

@@ -19,5 +19,5 @@ Quick Start:
 See README.md for full documentation.
 """
 
-__version__ = "2.7.5"
+__version__ = "2.7.6"
 __author__ = "Auto Claude Team"

apps/backend/__tests__/fixtures/gitlab.py

@@ -1,289 +0,0 @@
-"""
-GitLab Test Fixtures
-====================
-
-Mock data and fixtures for GitLab integration tests.
-"""
-
-# Sample GitLab MR data
-SAMPLE_MR_DATA = {
-    "iid": 123,
-    "id": 12345,
-    "title": "Add user authentication feature",
-    "description": "Implement OAuth2 login with Google and GitHub providers",
-    "author": {
-        "id": 1,
-        "username": "john_doe",
-        "name": "John Doe",
-        "email": "john@example.com",
-    },
-    "source_branch": "feature/oauth-auth",
-    "target_branch": "main",
-    "state": "opened",
-    "draft": False,
-    "merge_status": "can_be_merged",
-    "web_url": "https://gitlab.com/group/project/-/merge_requests/123",
-    "created_at": "2025-01-14T10:00:00.000Z",
-    "updated_at": "2025-01-14T12:00:00.000Z",
-    "labels": ["feature", "authentication"],
-    "assignees": [],
-}
-
-SAMPLE_MR_CHANGES = {
-    "id": 12345,
-    "iid": 123,
-    "project_id": 1,
-    "title": "Add user authentication feature",
-    "description": "Implement OAuth2 login",
-    "state": "opened",
-    "created_at": "2025-01-14T10:00:00.000Z",
-    "updated_at": "2025-01-14T12:00:00.000Z",
-    "merge_status": "can_be_merged",
-    "additions": 150,
-    "deletions": 20,
-    "changed_files_count": 5,
-    "changes": [
-        {
-            "old_path": "src/auth/__init__.py",
-            "new_path": "src/auth/__init__.py",
-            "diff": "@@ -0,0 +1,5 @@\n+from .oauth import OAuthHandler\n+from .providers import GoogleProvider, GitHubProvider",
-            "new_file": False,
-            "renamed_file": False,
-            "deleted_file": False,
-        },
-        {
-            "old_path": "src/auth/oauth.py",
-            "new_path": "src/auth/oauth.py",
-            "diff": "@@ -0,0 +1,50 @@\n+class OAuthHandler:\n+    def handle_callback(self, request):\n+        pass",
-            "new_file": True,
-            "renamed_file": False,
-            "deleted_file": False,
-        },
-    ],
-}
-
-SAMPLE_MR_COMMITS = [
-    {
-        "id": "abc123def456",
-        "short_id": "abc123de",
-        "title": "Add OAuth handler",
-        "message": "Add OAuth handler",
-        "author_name": "John Doe",
-        "author_email": "john@example.com",
-        "authored_date": "2025-01-14T10:00:00.000Z",
-        "created_at": "2025-01-14T10:00:00.000Z",
-    },
-    {
-        "id": "def456ghi789",
-        "short_id": "def456gh",
-        "title": "Add Google provider",
-        "message": "Add Google provider",
-        "author_name": "John Doe",
-        "author_email": "john@example.com",
-        "authored_date": "2025-01-14T11:00:00.000Z",
-        "created_at": "2025-01-14T11:00:00.000Z",
-    },
-]
-
-# Sample GitLab issue data
-SAMPLE_ISSUE_DATA = {
-    "iid": 42,
-    "id": 42,
-    "title": "Bug: Login button not working",
-    "description": "Clicking the login button does nothing",
-    "author": {
-        "id": 2,
-        "username": "jane_smith",
-        "name": "Jane Smith",
-        "email": "jane@example.com",
-    },
-    "state": "opened",
-    "labels": ["bug", "urgent"],
-    "assignees": [],
-    "milestone": None,
-    "web_url": "https://gitlab.com/group/project/-/issues/42",
-    "created_at": "2025-01-14T09:00:00.000Z",
-    "updated_at": "2025-01-14T09:30:00.000Z",
-}
-
-# Sample GitLab pipeline data
-SAMPLE_PIPELINE_DATA = {
-    "id": 1001,
-    "iid": 1,
-    "project_id": 1,
-    "ref": "feature/oauth-auth",
-    "sha": "abc123def456",
-    "status": "success",
-    "source": "merge_request_event",
-    "created_at": "2025-01-14T10:30:00.000Z",
-    "updated_at": "2025-01-14T10:35:00.000Z",
-    "finished_at": "2025-01-14T10:35:00.000Z",
-    "duration": 300,
-    "web_url": "https://gitlab.com/group/project/-/pipelines/1001",
-}
-
-SAMPLE_PIPELINE_JOBS = [
-    {
-        "id": 5001,
-        "name": "test",
-        "stage": "test",
-        "status": "success",
-        "started_at": "2025-01-14T10:31:00.000Z",
-        "finished_at": "2025-01-14T10:34:00.000Z",
-        "duration": 180,
-        "allow_failure": False,
-    },
-    {
-        "id": 5002,
-        "name": "lint",
-        "stage": "test",
-        "status": "success",
-        "started_at": "2025-01-14T10:31:00.000Z",
-        "finished_at": "2025-01-14T10:32:00.000Z",
-        "duration": 60,
-        "allow_failure": False,
-    },
-]
-
-# Sample GitLab discussion/note data
-SAMPLE_MR_DISCUSSIONS = [
-    {
-        "id": "d1",
-        "notes": [
-            {
-                "id": 1001,
-                "type": "DiscussionNote",
-                "author": {"username": "coderabbit[bot]"},
-                "body": "Consider adding error handling for OAuth failures",
-                "created_at": "2025-01-14T11:00:00.000Z",
-                "system": False,
-                "resolvable": True,
-            }
-        ],
-    }
-]
-
-SAMPLE_MR_NOTES = [
-    {
-        "id": 2001,
-        "type": "DiscussionNote",
-        "author": {"username": "reviewer_user"},
-        "body": "LGTM, just one comment",
-        "created_at": "2025-01-14T12:00:00.000Z",
-        "system": False,
-    }
-]
-
-# Mock GitLab config
-MOCK_GITLAB_CONFIG = {
-    "token": "glpat-test-token-12345",
-    "project": "group/project",
-    "instance_url": "https://gitlab.example.com",
-}
-
-
-def create_mock_client(project_dir=None):
-    """Create a mock GitLab client for testing.
-
-    Args:
-        project_dir: Optional project directory path (uses temp dir if None)
-
-    Returns:
-        Configured GitLabClient instance
-    """
-    import tempfile
-    from pathlib import Path
-
-    from runners.gitlab.glab_client import GitLabClient, GitLabConfig
-
-    if project_dir is None:
-        project_dir = Path(tempfile.mkdtemp())
-    else:
-        project_dir = Path(project_dir)
-
-    config = GitLabConfig(**MOCK_GITLAB_CONFIG)
-    return GitLabClient(project_dir=project_dir, config=config)
-
-
-def mock_mr_data(**overrides):
-    """Create mock MR data with optional overrides."""
-    import copy
-
-    data = copy.deepcopy(SAMPLE_MR_DATA)
-
-    # Handle special case for author override
-    if "author" in overrides:
-        author_value = overrides.pop("author")
-        if isinstance(author_value, str):
-            # If author is a string, update the username field
-            data["author"]["username"] = author_value
-        else:
-            # Otherwise, merge the author dict
-            data["author"].update(author_value)
-
-    data.update(overrides)
-    return data
-
-
-def mock_mr_changes(**overrides):
-    """Create mock MR changes with optional overrides."""
-    data = SAMPLE_MR_CHANGES.copy()
-    data.update(overrides)
-    return data
-
-
-def mock_issue_data(**overrides):
-    """Create mock issue data with optional overrides."""
-    data = SAMPLE_ISSUE_DATA.copy()
-    data.update(overrides)
-    return data
-
-
-def mock_pipeline_data(**overrides):
-    """Create mock pipeline data with optional overrides."""
-    data = SAMPLE_PIPELINE_DATA.copy()
-    data.update(overrides)
-    return data
-
-
-def mock_pipeline_jobs(**overrides):
-    """Create mock pipeline jobs with optional overrides."""
-    data = SAMPLE_PIPELINE_JOBS.copy()
-    if overrides:
-        data[0].update(overrides)
-    return data
-
-
-def mock_mr_commits(**overrides):
-    """Create mock MR commits with optional overrides."""
-    import copy
-
-    data = copy.deepcopy(SAMPLE_MR_COMMITS)
-    if overrides and data:
-        data[0].update(overrides)
-    return data
-
-
-def get_mock_diff() -> str:
-    """Get a mock diff string for testing."""
-    return """diff --git a/src/auth/oauth.py b/src/auth/oauth.py
-new file mode 100644
-index 0000000..abc1234
---- /dev/null
-+++ b/src/auth/oauth.py
-@@ -0,0 +1,50 @@
-+class OAuthHandler:
-+    def handle_callback(self, request):
-+        pass
-diff --git a/src/auth/providers.py b/src/auth/providers.py
-new file mode 100644
-index 0000000..def5678
---- /dev/null
-+++ b/src/auth/providers.py
-@@ -0,0 +1,30 @@
-+class GoogleProvider:
-+    pass
-+
-+class GitHubProvider:
-+    pass
-"""

apps/backend/__tests__/test_gitlab_autofix_processor.py

@@ -1,391 +0,0 @@
-"""
-Tests for GitLab Auto-fix Processor
-======================================
-
-Tests for auto-fix workflow, permission verification, and state management.
-"""
-
-from pathlib import Path
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-try:
-    from runners.gitlab.autofix_processor import AutoFixProcessor
-    from runners.gitlab.models import AutoFixState, AutoFixStatus, GitLabRunnerConfig
-    from runners.gitlab.permissions import GitLabPermissionChecker
-except ImportError:
-    from models import AutoFixState, AutoFixStatus, GitLabRunnerConfig
-    from runners.gitlab.autofix_processor import AutoFixProcessor
-    from runners.gitlab.permissions import GitLabPermissionChecker
-
-
-@pytest.fixture
-def mock_config():
-    """Create a mock GitLab config."""
-    config = MagicMock(spec=GitLabRunnerConfig)
-    config.project = "namespace/test-project"
-    config.instance_url = "https://gitlab.example.com"
-    config.auto_fix_enabled = True
-    config.auto_fix_labels = ["auto-fix", "autofix"]
-    config.token = "test-token"
-    return config
-
-
-@pytest.fixture
-def mock_permission_checker():
-    """Create a mock permission checker."""
-    checker = MagicMock(spec=GitLabPermissionChecker)
-    checker.verify_automation_trigger = AsyncMock()
-    return checker
-
-
-@pytest.fixture
-def tmp_gitlab_dir(tmp_path):
-    """Create a temporary GitLab directory."""
-    gitlab_dir = tmp_path / ".auto-claude" / "gitlab"
-    gitlab_dir.mkdir(parents=True, exist_ok=True)
-    return gitlab_dir
-
-
-@pytest.fixture
-def processor(mock_config, mock_permission_checker, tmp_path, tmp_gitlab_dir):
-    """Create an AutoFixProcessor instance."""
-    return AutoFixProcessor(
-        gitlab_dir=tmp_gitlab_dir,
-        config=mock_config,
-        permission_checker=mock_permission_checker,
-        progress_callback=None,
-    )
-
-
-class TestProcessIssue:
-    """Tests for issue processing."""
-
-    @pytest.mark.asyncio
-    async def test_process_issue_success(
-        self, processor, mock_permission_checker, tmp_gitlab_dir
-    ):
-        """Test successful issue processing."""
-        issue = {
-            "iid": 123,
-            "title": "Fix this bug",
-            "description": "Please fix",
-            "labels": ["auto-fix"],
-        }
-
-        mock_permission_checker.verify_automation_trigger.return_value = MagicMock(
-            allowed=True,
-            username="developer",
-            role="MAINTAINER",
-        )
-
-        result = await processor.process_issue(
-            issue_iid=123,
-            issue=issue,
-            trigger_label="auto-fix",
-        )
-
-        assert result.issue_iid == 123
-        assert result.status == AutoFixStatus.CREATING_SPEC
-
-    @pytest.mark.asyncio
-    async def test_process_issue_permission_denied(
-        self, processor, mock_permission_checker, tmp_gitlab_dir
-    ):
-        """Test issue processing with permission denied."""
-        issue = {
-            "iid": 456,
-            "title": "Unauthorized fix",
-            "labels": ["auto-fix"],
-        }
-
-        mock_permission_checker.verify_automation_trigger.return_value = MagicMock(
-            allowed=False,
-            username="outsider",
-            role="NONE",
-            reason="Not a maintainer",
-        )
-
-        with pytest.raises(PermissionError):
-            await processor.process_issue(
-                issue_iid=456,
-                issue=issue,
-                trigger_label="auto-fix",
-            )
-
-    @pytest.mark.asyncio
-    async def test_process_issue_in_progress(
-        self, processor, mock_permission_checker, tmp_gitlab_dir
-    ):
-        """Test that in-progress issues are not reprocessed."""
-        issue = {
-            "iid": 789,
-            "title": "Already processing",
-            "labels": ["auto-fix"],
-        }
-
-        # Create existing state in progress
-        existing_state = AutoFixState(
-            issue_iid=789,
-            issue_url="https://gitlab.example.com/issue/789",
-            project="namespace/test-project",
-            status=AutoFixStatus.ANALYZING,
-        )
-        await existing_state.save(tmp_gitlab_dir)
-
-        result = await processor.process_issue(
-            issue_iid=789,
-            issue=issue,
-            trigger_label="auto-fix",
-        )
-
-        # Should return the existing state
-        assert result.status == AutoFixStatus.ANALYZING
-
-
-class TestCheckLabeledIssues:
-    """Tests for checking labeled issues."""
-
-    @pytest.mark.asyncio
-    async def test_check_labeled_issues_finds_new(
-        self, processor, mock_permission_checker
-    ):
-        """Test finding new labeled issues."""
-        all_issues = [
-            {
-                "iid": 1,
-                "title": "Has auto-fix label",
-                "labels": ["auto-fix"],
-            },
-            {
-                "iid": 2,
-                "title": "Has autofix label",
-                "labels": ["autofix"],
-            },
-            {
-                "iid": 3,
-                "title": "No label",
-                "labels": [],
-            },
-        ]
-
-        # Permission checks pass
-        mock_permission_checker.verify_automation_trigger.return_value = MagicMock(
-            allowed=True
-        )
-
-        result = await processor.check_labeled_issues(
-            all_issues, verify_permissions=True
-        )
-
-        assert len(result) == 2
-        assert result[0]["issue_iid"] == 1
-        assert result[1]["issue_iid"] == 2
-
-    @pytest.mark.asyncio
-    async def test_check_labeled_issues_filters_in_queue(
-        self, processor, mock_permission_checker, tmp_gitlab_dir
-    ):
-        """Test that issues already in queue are filtered out."""
-        # Create existing state for issue 1
-        existing_state = AutoFixState(
-            issue_iid=1,
-            issue_url="https://gitlab.example.com/issue/1",
-            project="namespace/test-project",
-            status=AutoFixStatus.ANALYZING,
-        )
-        await existing_state.save(tmp_gitlab_dir)
-
-        all_issues = [
-            {
-                "iid": 1,
-                "title": "Already in queue",
-                "labels": ["auto-fix"],
-            },
-            {
-                "iid": 2,
-                "title": "New issue",
-                "labels": ["auto-fix"],
-            },
-        ]
-
-        mock_permission_checker.verify_automation_trigger.return_value = MagicMock(
-            allowed=True
-        )
-
-        result = await processor.check_labeled_issues(
-            all_issues, verify_permissions=True
-        )
-
-        # Should only return issue 2 (issue 1 is already in queue)
-        assert len(result) == 1
-        assert result[0]["issue_iid"] == 2
-
-    @pytest.mark.asyncio
-    async def test_check_labeled_issues_permission_filtering(
-        self, processor, mock_permission_checker
-    ):
-        """Test that unauthorized issues are filtered out."""
-        all_issues = [
-            {
-                "iid": 1,
-                "title": "Authorized issue",
-                "labels": ["auto-fix"],
-            },
-            {
-                "iid": 2,
-                "title": "Unauthorized issue",
-                "labels": ["auto-fix"],
-            },
-        ]
-
-        def make_permission_result(issue_iid, trigger_label):
-            if issue_iid == 1:
-                return MagicMock(allowed=True)
-            else:
-                return MagicMock(allowed=False, reason="Not authorized")
-
-        mock_permission_checker.verify_automation_trigger.side_effect = (
-            make_permission_result
-        )
-
-        result = await processor.check_labeled_issues(
-            all_issues, verify_permissions=True
-        )
-
-        # Should only return issue 1
-        assert len(result) == 1
-        assert result[0]["issue_iid"] == 1
-
-
-class TestGetQueue:
-    """Tests for getting auto-fix queue."""
-
-    @pytest.mark.asyncio
-    async def test_get_queue_empty(self, processor, tmp_gitlab_dir):
-        """Test getting queue when empty."""
-        queue = await processor.get_queue()
-
-        assert queue == []
-
-    @pytest.mark.asyncio
-    async def test_get_queue_with_items(self, processor, tmp_gitlab_dir):
-        """Test getting queue with items."""
-        # Create some states
-        for i in [1, 2, 3]:
-            state = AutoFixState(
-                issue_iid=i,
-                issue_url=f"https://gitlab.example.com/issue/{i}",
-                project="namespace/test-project",
-                status=AutoFixStatus.ANALYZING,
-            )
-            await state.save(tmp_gitlab_dir)
-
-        queue = await processor.get_queue()
-
-        assert len(queue) == 3
-
-
-class TestAutoFixState:
-    """Tests for AutoFixState model."""
-
-    def test_state_creation(self, tmp_gitlab_dir):
-        """Test creating and saving state."""
-        state = AutoFixState(
-            issue_iid=123,
-            issue_url="https://gitlab.example.com/issue/123",
-            project="namespace/test-project",
-            status=AutoFixStatus.PENDING,
-        )
-
-        assert state.issue_iid == 123
-        assert state.status == AutoFixStatus.PENDING
-
-    def test_state_save_and_load(self, tmp_gitlab_dir):
-        """Test saving and loading state."""
-        state = AutoFixState(
-            issue_iid=456,
-            issue_url="https://gitlab.example.com/issue/456",
-            project="namespace/test-project",
-            status=AutoFixStatus.BUILDING,
-        )
-
-        # Save state
-        import asyncio
-
-        asyncio.run(state.save(tmp_gitlab_dir))
-
-        # Load state
-        loaded = AutoFixState.load(tmp_gitlab_dir, 456)
-
-        assert loaded is not None
-        assert loaded.issue_iid == 456
-        assert loaded.status == AutoFixStatus.BUILDING
-
-    def test_state_transition_validation(self, tmp_gitlab_dir):
-        """Test that invalid state transitions are rejected."""
-        state = AutoFixState(
-            issue_iid=789,
-            issue_url="https://gitlab.example.com/issue/789",
-            project="namespace/test-project",
-            status=AutoFixStatus.PENDING,
-        )
-
-        # Valid transition
-        state.update_status(AutoFixStatus.ANALYZING)  # Should work
-
-        # Invalid transition
-        with pytest.raises(ValueError):
-            state.update_status(AutoFixStatus.COMPLETED)  # Can't skip to completed
-
-
-class TestProgressReporting:
-    """Tests for progress callback handling."""
-
-    @pytest.mark.asyncio
-    async def test_progress_reported_during_processing(
-        self, mock_config, tmp_path, tmp_gitlab_dir
-    ):
-        """Test that progress callback is stored on the processor."""
-        progress_calls = []
-
-        def progress_callback(progress):
-            progress_calls.append(progress)
-
-        processor = AutoFixProcessor(
-            gitlab_dir=tmp_gitlab_dir,
-            config=mock_config,
-            permission_checker=MagicMock(),
-            progress_callback=progress_callback,
-        )
-
-        # Verify the callback is stored
-        assert processor.progress_callback is not None
-        assert processor.progress_callback == progress_callback
-
-        # Test that calling the callback works
-        processor.progress_callback({"status": "test"})
-
-        assert len(progress_calls) == 1
-        assert progress_calls[0] == {"status": "test"}
-
-
-class TestURLConstruction:
-    """Tests for URL construction."""
-
-    @pytest.mark.asyncio
-    async def test_issue_url_construction(self, processor, mock_config):
-        """Test that issue URLs are constructed correctly."""
-        issue = {"iid": 123}
-
-        state = await processor.process_issue(
-            issue_iid=123,
-            issue=issue,
-            trigger_label=None,
-        )
-
-        assert (
-            state.issue_url
-            == "https://gitlab.example.com/namespace/test-project/-/issues/123"
-        )

apps/backend/__tests__/test_gitlab_batch_issues.py

@@ -1,451 +0,0 @@
-"""
-Tests for GitLab Batch Issues
-================================
-
-Tests for issue batching, similarity detection, and batch processing.
-"""
-
-from pathlib import Path
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-try:
-    from runners.gitlab.batch_issues import (
-        ClaudeGitlabBatchAnalyzer,
-        GitlabBatchStatus,
-        GitlabIssueBatch,
-        GitlabIssueBatcher,
-        GitlabIssueBatchItem,
-        format_batch_summary,
-    )
-    from runners.gitlab.glab_client import GitLabConfig
-except ImportError:
-    from glab_client import GitLabConfig
-    from runners.gitlab.batch_issues import (
-        ClaudeGitlabBatchAnalyzer,
-        GitlabBatchStatus,
-        GitlabIssueBatch,
-        GitlabIssueBatcher,
-        GitlabIssueBatchItem,
-        format_batch_summary,
-    )
-
-
-@pytest.fixture
-def mock_config():
-    """Create a mock GitLab config."""
-    config = MagicMock(spec=GitLabConfig)
-    config.project = "namespace/test-project"
-    config.instance_url = "https://gitlab.example.com"
-    return config
-
-
-@pytest.fixture
-def sample_issues():
-    """Sample issues for batching."""
-    return [
-        {
-            "iid": 1,
-            "title": "Login bug",
-            "description": "Cannot login with special characters",
-            "labels": ["bug", "auth"],
-        },
-        {
-            "iid": 2,
-            "title": "Signup bug",
-            "description": "Cannot signup with special characters",
-            "labels": ["bug", "auth"],
-        },
-        {
-            "iid": 3,
-            "title": "UI bug",
-            "description": "Button alignment issue",
-            "labels": ["bug", "ui"],
-        },
-    ]
-
-
-class TestBatchAnalyzer:
-    """Tests for Claude-based batch analyzer."""
-
-    @pytest.mark.asyncio
-    async def test_analyze_single_issue(self, mock_config, tmp_path):
-        """Test analyzing a single issue."""
-        analyzer = ClaudeGitlabBatchAnalyzer(project_dir=tmp_path)
-
-        issues = [{"iid": 1, "title": "Single issue"}]
-
-        with patch.object(analyzer, "_fallback_batches") as mock_fallback:
-            mock_fallback.return_value = [
-                {
-                    "issue_iids": [1],
-                    "theme": "Single issue",
-                    "reasoning": "Single issue in group",
-                    "confidence": 1.0,
-                }
-            ]
-
-            result = await analyzer.analyze_and_batch_issues(issues)
-
-            assert len(result) == 1
-            assert result[0]["issue_iids"] == [1]
-
-    @pytest.mark.asyncio
-    async def test_analyze_empty_list(self, mock_config, tmp_path):
-        """Test analyzing empty issue list."""
-        analyzer = ClaudeGitlabBatchAnalyzer(project_dir=tmp_path)
-
-        result = await analyzer.analyze_and_batch_issues([])
-
-        assert result == []
-
-    @pytest.mark.asyncio
-    async def test_parse_json_response(self, mock_config, tmp_path):
-        """Test JSON parsing from Claude response."""
-        analyzer = ClaudeGitlabBatchAnalyzer(project_dir=tmp_path)
-
-        # Valid JSON
-        json_str = '{"batches": [{"issue_iids": [1, 2]}]}'
-        result = analyzer._parse_json_response(json_str)
-
-        assert "batches" in result
-
-    @pytest.mark.asyncio
-    async def test_parse_json_from_markdown(self, mock_config, tmp_path):
-        """Test extracting JSON from markdown code blocks."""
-        analyzer = ClaudeGitlabBatchAnalyzer(project_dir=tmp_path)
-
-        # JSON in markdown code block
-        response = '```json\n{"batches": [{"issue_iids": [1, 2]}]}\n```'
-        result = analyzer._parse_json_response(response)
-
-        assert "batches" in result
-
-    @pytest.mark.asyncio
-    async def test_fallback_batches(self, mock_config, tmp_path):
-        """Test fallback batching when Claude is unavailable."""
-        analyzer = ClaudeGitlabBatchAnalyzer(project_dir=tmp_path)
-
-        issues = [
-            {"iid": 1, "title": "Issue 1"},
-            {"iid": 2, "title": "Issue 2"},
-        ]
-
-        result = analyzer._fallback_batches(issues)
-
-        assert len(result) == 2
-        assert all("confidence" in r for r in result)
-
-
-class TestIssueBatchItem:
-    """Tests for IssueBatchItem model."""
-
-    def test_batch_item_to_dict(self):
-        """Test converting batch item to dict."""
-        item = GitlabIssueBatchItem(
-            issue_iid=123,
-            title="Test Issue",
-            body="Description",
-            labels=["bug"],
-            similarity_to_primary=0.8,
-        )
-
-        result = item.to_dict()
-
-        assert result["issue_iid"] == 123
-        assert result["similarity_to_primary"] == 0.8
-
-    def test_batch_item_from_dict(self):
-        """Test creating batch item from dict."""
-        data = {
-            "issue_iid": 456,
-            "title": "Test",
-            "body": "Desc",
-            "labels": ["feature"],
-            "similarity_to_primary": 1.0,
-        }
-
-        result = GitlabIssueBatchItem.from_dict(data)
-
-        assert result.issue_iid == 456
-
-
-class TestIssueBatch:
-    """Tests for IssueBatch model."""
-
-    def test_batch_creation(self):
-        """Test creating a batch."""
-        issues = [
-            GitlabIssueBatchItem(
-                issue_iid=1,
-                title="Issue 1",
-                body="",
-            ),
-            GitlabIssueBatchItem(
-                issue_iid=2,
-                title="Issue 2",
-                body="",
-            ),
-        ]
-
-        batch = GitlabIssueBatch(
-            batch_id="batch-1-2",
-            project="namespace/test-project",
-            primary_issue=1,
-            issues=issues,
-            theme="Authentication issues",
-        )
-
-        assert batch.batch_id == "batch-1-2"
-        assert batch.primary_issue == 1
-        assert len(batch.issues) == 2
-
-    def test_batch_to_dict(self):
-        """Test converting batch to dict."""
-        batch = GitlabIssueBatch(
-            batch_id="batch-1",
-            project="namespace/project",
-            primary_issue=1,
-            issues=[],
-            status=GitlabBatchStatus.PENDING,
-        )
-
-        result = batch.to_dict()
-
-        assert result["batch_id"] == "batch-1"
-        assert result["status"] == "pending"
-
-    def test_batch_from_dict(self):
-        """Test creating batch from dict."""
-        data = {
-            "batch_id": "batch-1",
-            "project": "namespace/project",
-            "primary_issue": 1,
-            "issues": [],
-            "status": "pending",
-            "created_at": "2024-01-01T00:00:00Z",
-        }
-
-        result = GitlabIssueBatch.from_dict(data)
-
-        assert result.batch_id == "batch-1"
-        assert result.status == GitlabBatchStatus.PENDING
-
-
-class TestIssueBatcher:
-    """Tests for IssueBatcher class."""
-
-    def test_batcher_initialization(self, mock_config, tmp_path):
-        """Test batcher initialization."""
-        batcher = GitlabIssueBatcher(
-            gitlab_dir=tmp_path / ".auto-claude" / "gitlab",
-            project="namespace/project",
-            project_dir=tmp_path,
-        )
-
-        assert batcher.project == "namespace/project"
-
-    @pytest.mark.asyncio
-    async def test_create_batches(self, mock_config, tmp_path, sample_issues):
-        """Test creating batches from issues."""
-        batcher = GitlabIssueBatcher(
-            gitlab_dir=tmp_path / ".auto-claude" / "gitlab",
-            project="namespace/project",
-            project_dir=tmp_path,
-        )
-
-        # Patch the analyzer's analyze_and_batch_issues method
-        with patch.object(batcher.analyzer, "analyze_and_batch_issues") as mock_analyze:
-            mock_analyze.return_value = [
-                {
-                    "issue_iids": [1, 2],
-                    "theme": "Auth issues",
-                    "confidence": 0.85,
-                },
-                {
-                    "issue_iids": [3],
-                    "theme": "UI bug",
-                    "confidence": 0.9,
-                },
-            ]
-
-            batches = await batcher.create_batches(sample_issues)
-
-            assert len(batches) == 2
-            assert batches[0].theme == "Auth issues"
-            assert batches[1].theme == "UI bug"
-
-    def test_generate_batch_id(self, mock_config, tmp_path):
-        """Test batch ID generation."""
-        batcher = GitlabIssueBatcher(
-            gitlab_dir=tmp_path / ".auto-claude" / "gitlab",
-            project="namespace/project",
-            project_dir=tmp_path,
-        )
-
-        batch_id = batcher._generate_batch_id([1, 2, 3])
-
-        assert batch_id == "batch-1-2-3"
-
-    def test_save_and_load_batch(self, mock_config, tmp_path):
-        """Test saving and loading batches."""
-        batcher = GitlabIssueBatcher(
-            gitlab_dir=tmp_path / ".auto-claude" / "gitlab",
-            project="namespace/project",
-            project_dir=tmp_path,
-        )
-
-        batch = GitlabIssueBatch(
-            batch_id="batch-123",
-            project="namespace/project",
-            primary_issue=123,
-            issues=[],
-        )
-
-        # Save
-        batcher.save_batch(batch)
-
-        # Load
-        loaded = batcher.load_batch(tmp_path / ".auto-claude" / "gitlab", "batch-123")
-
-        assert loaded is not None
-        assert loaded.batch_id == "batch-123"
-
-    def test_list_batches(self, mock_config, tmp_path):
-        """Test listing all batches."""
-        batcher = GitlabIssueBatcher(
-            gitlab_dir=tmp_path / ".auto-claude" / "gitlab",
-            project="namespace/project",
-            project_dir=tmp_path,
-        )
-
-        # Create a couple of batches
-        batch1 = GitlabIssueBatch(
-            batch_id="batch-1",
-            project="namespace/project",
-            primary_issue=1,
-            issues=[],
-            status=GitlabBatchStatus.PENDING,
-        )
-        batch2 = GitlabIssueBatch(
-            batch_id="batch-2",
-            project="namespace/project",
-            primary_issue=2,
-            issues=[],
-            status=GitlabBatchStatus.COMPLETED,
-        )
-
-        batcher.save_batch(batch1)
-        batcher.save_batch(batch2)
-
-        # List
-        batches = batcher.list_batches()
-
-        assert len(batches) == 2
-        # Should be sorted by created_at descending
-        assert batches[0].batch_id == "batch-2"
-        assert batches[1].batch_id == "batch-1"
-
-
-class TestBatchStatus:
-    """Tests for BatchStatus enum."""
-
-    def test_status_values(self):
-        """Test all status values exist."""
-        expected_statuses = [
-            GitlabBatchStatus.PENDING,
-            GitlabBatchStatus.ANALYZING,
-            GitlabBatchStatus.CREATING_SPEC,
-            GitlabBatchStatus.BUILDING,
-            GitlabBatchStatus.QA_REVIEW,
-            GitlabBatchStatus.MR_CREATED,
-            GitlabBatchStatus.COMPLETED,
-            GitlabBatchStatus.FAILED,
-        ]
-
-        for status in expected_statuses:
-            assert status.value in [
-                "pending",
-                "analyzing",
-                "creating_spec",
-                "building",
-                "qa_review",
-                "mr_created",
-                "completed",
-                "failed",
-            ]
-
-
-class TestBatchSummaryFormatting:
-    """Tests for batch summary formatting."""
-
-    def test_format_batch_summary(self):
-        """Test formatting a batch summary."""
-        batch = GitlabIssueBatch(
-            batch_id="batch-auth-issues",
-            project="namespace/project",
-            primary_issue=1,
-            issues=[
-                GitlabIssueBatchItem(
-                    issue_iid=1,
-                    title="Login bug",
-                    body="",
-                ),
-                GitlabIssueBatchItem(
-                    issue_iid=2,
-                    title="Signup bug",
-                    body="",
-                ),
-            ],
-            common_themes=["Authentication issues"],
-            status=GitlabBatchStatus.PENDING,
-        )
-
-        summary = format_batch_summary(batch)
-
-        assert "batch-auth-issues" in summary
-        assert "!1" in summary
-        assert "!2" in summary
-        assert "Authentication issues" in summary
-
-
-class TestSimilarityThreshold:
-    """Tests for similarity threshold handling."""
-
-    def test_threshold_filtering(self, mock_config, tmp_path):
-        """Test that similarity threshold is respected."""
-        batcher = GitlabIssueBatcher(
-            gitlab_dir=tmp_path / ".auto-claude" / "gitlab",
-            project="namespace/project",
-            project_dir=tmp_path,
-            similarity_threshold=0.8,  # High threshold
-        )
-
-        assert batcher.similarity_threshold == 0.8
-
-
-class TestBatchSizeLimits:
-    """Tests for batch size limits."""
-
-    def test_max_batch_size(self, mock_config, tmp_path):
-        """Test that max batch size is enforced."""
-        batcher = GitlabIssueBatcher(
-            gitlab_dir=tmp_path / ".auto-claude" / "gitlab",
-            project="namespace/project",
-            project_dir=tmp_path,
-            max_batch_size=3,
-        )
-
-        assert batcher.max_batch_size == 3
-
-    def test_min_batch_size(self, mock_config, tmp_path):
-        """Test min batch size setting."""
-        batcher = GitlabIssueBatcher(
-            gitlab_dir=tmp_path / ".auto-claude" / "gitlab",
-            project="namespace/project",
-            project_dir=tmp_path,
-            min_batch_size=2,
-        )
-
-        assert batcher.min_batch_size == 2

apps/backend/__tests__/test_gitlab_bot_detection.py

@@ -1,253 +0,0 @@
-"""
-GitLab Bot Detection Tests
-==========================
-
-Tests for bot detection to prevent infinite review loops.
-"""
-
-import json
-from datetime import datetime, timedelta, timezone
-from pathlib import Path
-from unittest.mock import MagicMock, Mock, patch
-
-import pytest
-from __tests__.fixtures.gitlab import (
-    MOCK_GITLAB_CONFIG,
-    mock_mr_data,
-)
-
-
-class TestBotDetector:
-    """Test bot detection prevents infinite loops."""
-
-    @pytest.fixture
-    def detector(self, tmp_path):
-        """Create a BotDetector instance for testing."""
-        from runners.gitlab.bot_detection import BotDetector
-
-        return BotDetector(
-            state_dir=tmp_path,
-            bot_username="auto-claude-bot",
-            review_own_mrs=False,
-        )
-
-    def test_bot_detection_init(self, detector):
-        """Test detector initializes correctly."""
-        assert detector.bot_username == "auto-claude-bot"
-        assert detector.review_own_mrs is False
-        assert detector.state.reviewed_commits == {}
-
-    def test_is_bot_mr_self_authored(self, detector):
-        """Test MR authored by bot is detected."""
-        mr_data = mock_mr_data(author="auto-claude-bot")
-
-        assert detector.is_bot_mr(mr_data) is True
-
-    def test_is_bot_mr_pattern_match(self, detector):
-        """Test MR with bot pattern in username is detected."""
-        mr_data = mock_mr_data(author="coderabbit[bot]")
-
-        assert detector.is_bot_mr(mr_data) is True
-
-    def test_is_bot_mr_human_authored(self, detector):
-        """Test MR authored by human is not detected as bot."""
-        mr_data = mock_mr_data(author="john_doe")
-
-        assert detector.is_bot_mr(mr_data) is False
-
-    def test_is_bot_commit_self_authored(self, detector):
-        """Test commit by bot is detected."""
-        commit = {
-            "author": {"username": "auto-claude-bot"},
-            "message": "Fix issue",
-        }
-
-        assert detector.is_bot_commit(commit) is True
-
-    def test_is_bot_commit_ai_coauthored(self, detector):
-        """Test commit with AI co-authorship is detected."""
-        commit = {
-            "author": {"username": "human"},
-            "message": "Co-authored-by: claude <no-reply>",
-        }
-
-        assert detector.is_bot_commit(commit) is True
-
-    def test_is_bot_commit_human(self, detector):
-        """Test human commit is not detected as bot."""
-        commit = {
-            "author": {"username": "john_doe"},
-            "message": "Fix bug",
-        }
-
-        assert detector.is_bot_commit(commit) is False
-
-    def test_should_skip_mr_bot_authored(self, detector):
-        """Test should skip MR when bot authored."""
-        mr_data = mock_mr_data(author="auto-claude-bot")
-        commits = []
-
-        should_skip, reason = detector.should_skip_mr_review(123, mr_data, commits)
-
-        assert should_skip is True
-        assert "auto-claude-bot" in reason.lower()
-
-    def test_should_skip_mr_in_cooling_off(self, detector):
-        """Test should skip MR when in cooling off period."""
-        # First, mark as reviewed
-        detector.mark_reviewed(123, "abc123")
-
-        # Immediately try to review again
-        mr_data = mock_mr_data()
-        commits = [{"id": "abc123", "sha": "abc123"}]
-
-        should_skip, reason = detector.should_skip_mr_review(123, mr_data, commits)
-
-        assert should_skip is True
-        assert "cooling" in reason.lower()
-
-    def test_should_skip_mr_already_reviewed(self, detector):
-        """Test should skip MR when commit already reviewed."""
-        # Mark as reviewed
-        detector.mark_reviewed(123, "abc123")
-
-        # Try to review same commit
-        mr_data = mock_mr_data()
-        commits = [{"id": "abc123", "sha": "abc123"}]
-
-        # Wait past cooling off (manually update time)
-        detector.state.last_review_times["123"] = (
-            datetime.now(timezone.utc) - timedelta(minutes=10)
-        ).isoformat()
-
-        should_skip, reason = detector.should_skip_mr_review(123, mr_data, commits)
-
-        assert should_skip is True
-        assert "already reviewed" in reason.lower()
-
-    def test_should_not_skip_safe_mr(self, detector):
-        """Test should not skip when MR is safe to review."""
-        mr_data = mock_mr_data()
-        commits = [{"id": "new123", "sha": "new123"}]
-
-        should_skip, reason = detector.should_skip_mr_review(456, mr_data, commits)
-
-        assert should_skip is False
-        assert reason == ""
-
-    def test_mark_reviewed(self, detector):
-        """Test marking MR as reviewed."""
-        detector.mark_reviewed(123, "abc123")
-
-        assert "123" in detector.state.reviewed_commits
-        assert "abc123" in detector.state.reviewed_commits["123"]
-        assert "123" in detector.state.last_review_times
-
-    def test_mark_reviewed_multiple_commits(self, detector):
-        """Test marking multiple commits for same MR."""
-        detector.mark_reviewed(123, "commit1")
-        detector.mark_reviewed(123, "commit2")
-        detector.mark_reviewed(123, "commit3")
-
-        assert len(detector.state.reviewed_commits["123"]) == 3
-
-    def test_clear_mr_state(self, detector):
-        """Test clearing MR state."""
-        detector.mark_reviewed(123, "abc123")
-        detector.clear_mr_state(123)
-
-        assert "123" not in detector.state.reviewed_commits
-        assert "123" not in detector.state.last_review_times
-
-    def test_get_stats(self, detector):
-        """Test getting detector statistics."""
-        detector.mark_reviewed(123, "abc123")
-        detector.mark_reviewed(124, "def456")
-
-        stats = detector.get_stats()
-
-        assert stats["bot_username"] == "auto-claude-bot"
-        assert stats["total_mrs_tracked"] == 2
-        assert stats["total_reviews_performed"] == 2
-
-    def test_cleanup_stale_mrs(self, detector):
-        """Test cleanup of old MR state."""
-        # Add an old MR (manually set old timestamp)
-        old_time = (datetime.now(timezone.utc) - timedelta(days=40)).isoformat()
-        detector.state.last_review_times["999"] = old_time
-        detector.state.reviewed_commits["999"] = ["old123"]
-
-        # Add a recent MR
-        detector.mark_reviewed(123, "abc123")
-
-        cleaned = detector.cleanup_stale_mrs(max_age_days=30)
-
-        assert cleaned == 1
-        assert "999" not in detector.state.reviewed_commits
-        assert "123" in detector.state.reviewed_commits
-
-    def test_state_persistence(self, tmp_path):
-        """Test state is saved and loaded correctly."""
-        from runners.gitlab.bot_detection import BotDetector
-
-        # Create detector and mark as reviewed
-        detector1 = BotDetector(
-            state_dir=tmp_path,
-            bot_username="test-bot",
-        )
-        detector1.mark_reviewed(123, "abc123")
-
-        # Create new detector instance (should load state)
-        detector2 = BotDetector(
-            state_dir=tmp_path,
-            bot_username="test-bot",
-        )
-
-        assert "123" in detector2.state.reviewed_commits
-        assert "abc123" in detector2.state.reviewed_commits["123"]
-
-
-class TestBotDetectionState:
-    """Test BotDetectionState model."""
-
-    def test_to_dict(self):
-        """Test converting state to dictionary."""
-        from runners.gitlab.bot_detection import BotDetectionState
-
-        state = BotDetectionState(
-            reviewed_commits={"123": ["abc123", "def456"]},
-            last_review_times={"123": "2025-01-14T10:00:00"},
-        )
-
-        data = state.to_dict()
-
-        assert data["reviewed_commits"]["123"] == ["abc123", "def456"]
-
-    def test_from_dict(self):
-        """Test loading state from dictionary."""
-        from runners.gitlab.bot_detection import BotDetectionState
-
-        data = {
-            "reviewed_commits": {"123": ["abc123"]},
-            "last_review_times": {"123": "2025-01-14T10:00:00"},
-        }
-
-        state = BotDetectionState.from_dict(data)
-
-        assert state.reviewed_commits["123"] == ["abc123"]
-        assert state.last_review_times["123"] == "2025-01-14T10:00:00"
-
-    def test_save_and_load(self, tmp_path):
-        """Test saving and loading state from disk."""
-        from runners.gitlab.bot_detection import BotDetectionState
-
-        state = BotDetectionState(
-            reviewed_commits={"123": ["abc123"]},
-            last_review_times={"123": "2025-01-14T10:00:00"},
-        )
-
-        state.save(tmp_path)
-
-        loaded = BotDetectionState.load(tmp_path)
-
-        assert loaded.reviewed_commits["123"] == ["abc123"]

apps/backend/__tests__/test_gitlab_branch_operations.py

@@ -1,263 +0,0 @@
-"""
-Tests for GitLab Branch Operations
-====================================
-
-Tests for branch listing, creation, deletion, and comparison.
-"""
-
-from pathlib import Path
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-try:
-    from runners.gitlab.glab_client import GitLabClient, GitLabConfig
-except ImportError:
-    from glab_client import GitLabClient, GitLabConfig
-
-
-@pytest.fixture
-def mock_config():
-    """Create a mock GitLab config."""
-    return GitLabConfig(
-        token="test-token",
-        project="namespace/test-project",
-        instance_url="https://gitlab.example.com",
-    )
-
-
-@pytest.fixture
-def client(mock_config, tmp_path):
-    """Create a GitLab client instance."""
-    return GitLabClient(
-        project_dir=tmp_path,
-        config=mock_config,
-    )
-
-
-@pytest.fixture
-def sample_branches():
-    """Sample branch data."""
-    return [
-        {
-            "name": "main",
-            "merged": False,
-            "protected": True,
-            "default": True,
-            "developers_can_push": False,
-            "developers_can_merge": False,
-            "commit": {
-                "id": "abc123def456",
-                "short_id": "abc123d",
-                "title": "Stable branch",
-            },
-            "web_url": "https://gitlab.example.com/namespace/test-project/-/tree/main",
-        },
-        {
-            "name": "develop",
-            "merged": False,
-            "protected": False,
-            "default": False,
-            "developers_can_push": True,
-            "developers_can_merge": True,
-            "commit": {
-                "id": "def456abc123",
-                "short_id": "def456a",
-                "title": "Development branch",
-            },
-            "web_url": "https://gitlab.example.com/namespace/test-project/-/tree/develop",
-        },
-    ]
-
-
-class TestListBranches:
-    """Tests for list_branches method."""
-
-    @pytest.mark.asyncio
-    async def test_list_all_branches(self, client, sample_branches):
-        """Test listing all branches."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = sample_branches
-
-            result = client.list_branches()
-
-            assert len(result) == 2
-            assert result[0]["name"] == "main"
-            assert result[1]["name"] == "develop"
-
-    @pytest.mark.asyncio
-    async def test_list_branches_with_search(self, client, sample_branches):
-        """Test listing branches with search filter."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = [sample_branches[0]]  # Only main
-
-            result = client.list_branches(search="main")
-
-            assert len(result) == 1
-            assert result[0]["name"] == "main"
-
-    @pytest.mark.asyncio
-    async def test_list_branches_async(self, client, sample_branches):
-        """Test async variant of list_branches."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = sample_branches
-
-            result = await client.list_branches_async()
-
-            assert len(result) == 2
-
-
-class TestGetBranch:
-    """Tests for get_branch method."""
-
-    @pytest.mark.asyncio
-    async def test_get_existing_branch(self, client, sample_branches):
-        """Test getting an existing branch."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = sample_branches[0]
-
-            result = client.get_branch("main")
-
-            assert result["name"] == "main"
-            assert result["protected"] is True
-            assert result["commit"]["id"] == "abc123def456"
-
-    @pytest.mark.asyncio
-    async def test_get_branch_async(self, client, sample_branches):
-        """Test async variant of get_branch."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = sample_branches[0]
-
-            result = await client.get_branch_async("main")
-
-            assert result["name"] == "main"
-
-    @pytest.mark.asyncio
-    async def test_get_nonexistent_branch(self, client):
-        """Test getting a branch that doesn't exist."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.side_effect = Exception("404 Not Found")
-
-            with pytest.raises(Exception):  # noqa: B017
-                client.get_branch("nonexistent")
-
-
-class TestCreateBranch:
-    """Tests for create_branch method."""
-
-    @pytest.mark.asyncio
-    async def test_create_branch_from_ref(self, client):
-        """Test creating a branch from another branch."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "name": "feature-branch",
-                "commit": {"id": "new123"},
-                "protected": False,
-            }
-
-            result = client.create_branch(
-                branch_name="feature-branch",
-                ref="main",
-            )
-
-            assert result["name"] == "feature-branch"
-
-    @pytest.mark.asyncio
-    async def test_create_branch_from_commit(self, client):
-        """Test creating a branch from a commit SHA."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "name": "fix-branch",
-                "commit": {"id": "fix123"},
-            }
-
-            result = client.create_branch(
-                branch_name="fix-branch",
-                ref="abc123def",
-            )
-
-            assert result["name"] == "fix-branch"
-
-    @pytest.mark.asyncio
-    async def test_create_branch_async(self, client):
-        """Test async variant of create_branch."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {"name": "feature", "commit": {}}
-
-            result = await client.create_branch_async("feature", "main")
-
-            assert result["name"] == "feature"
-
-
-class TestDeleteBranch:
-    """Tests for delete_branch method."""
-
-    @pytest.mark.asyncio
-    async def test_delete_existing_branch(self, client):
-        """Test deleting an existing branch."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = None  # 204 No Content
-
-            result = client.delete_branch("feature-branch")
-
-            # Should not raise on success
-            assert result is None
-
-    @pytest.mark.asyncio
-    async def test_delete_branch_async(self, client):
-        """Test async variant of delete_branch."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = None
-
-            result = await client.delete_branch_async("old-branch")
-
-            assert result is None
-
-
-class TestCompareBranches:
-    """Tests for compare_branches method."""
-
-    @pytest.mark.asyncio
-    async def test_compare_branches_basic(self, client):
-        """Test comparing two branches."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "diff": "@@ -1,1 +1,1 @@",
-                "commits": [{"id": "abc123"}],
-                "compare_same_ref": False,
-            }
-
-            result = client.compare_branches("main", "feature")
-
-            assert "diff" in result
-            assert result["compare_same_ref"] is False
-
-    @pytest.mark.asyncio
-    async def test_compare_branches_async(self, client):
-        """Test async variant of compare_branches."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "diff": "@@ -1,1 +1,1 @@",
-            }
-
-            result = await client.compare_branches_async("main", "feature")
-
-            assert "diff" in result
-
-    @pytest.mark.asyncio
-    async def test_compare_same_branch(self, client):
-        """Test comparing a branch to itself."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "diff": "",
-                "compare_same_ref": True,
-            }
-
-            result = client.compare_branches("main", "main")
-
-            assert result["compare_same_ref"] is True

apps/backend/__tests__/test_gitlab_ci_checker.py

@@ -1,376 +0,0 @@
-"""
-GitLab CI Checker Tests
-========================
-
-Tests for CI/CD pipeline status checking.
-"""
-
-from datetime import datetime, timezone
-from pathlib import Path
-from unittest.mock import MagicMock, Mock, patch
-
-import pytest
-from __tests__.fixtures.gitlab import (
-    MOCK_GITLAB_CONFIG,
-    mock_mr_data,
-    mock_pipeline_data,
-    mock_pipeline_jobs,
-)
-
-
-class TestCIChecker:
-    """Test CI/CD pipeline checking functionality."""
-
-    @pytest.fixture
-    def checker(self, tmp_path):
-        """Create a CIChecker instance for testing."""
-        from runners.gitlab.glab_client import GitLabConfig
-        from runners.gitlab.services.ci_checker import CIChecker
-
-        config = GitLabConfig(
-            token="test-token",
-            project="group/project",
-            instance_url="https://gitlab.example.com",
-        )
-
-        with patch("runners.gitlab.services.ci_checker.GitLabClient"):
-            return CIChecker(
-                project_dir=tmp_path,
-                config=config,
-            )
-
-    def test_init(self, checker):
-        """Test checker initializes correctly."""
-        assert checker.client is not None
-
-    def test_check_mr_pipeline_success(self, checker):
-        """Test checking MR with successful pipeline."""
-        pipeline_data = mock_pipeline_data(status="success")
-
-        async def mock_get_pipelines(mr_iid):
-            return [pipeline_data]
-
-        async def mock_get_pipeline_status(pipeline_id):
-            return pipeline_data
-
-        async def mock_get_pipeline_jobs(pipeline_id):
-            return mock_pipeline_jobs()
-
-        # Setup async mocks
-        import asyncio
-
-        async def test():
-            with patch.object(
-                checker.client, "get_mr_pipelines_async", mock_get_pipelines
-            ):
-                with patch.object(
-                    checker.client,
-                    "get_pipeline_status_async",
-                    mock_get_pipeline_status,
-                ):
-                    with patch.object(
-                        checker.client,
-                        "get_pipeline_jobs_async",
-                        mock_get_pipeline_jobs,
-                    ):
-                        pipeline = await checker.check_mr_pipeline(123)
-
-            assert pipeline is not None
-            assert pipeline.pipeline_id == 1001
-            assert pipeline.status.value == "success"
-            assert pipeline.has_failures is False
-
-        asyncio.run(test())
-
-    def test_check_mr_pipeline_failed(self, checker):
-        """Test checking MR with failed pipeline."""
-        pipeline_data = mock_pipeline_data(status="failed")
-        jobs_data = mock_pipeline_jobs()
-        jobs_data[0]["status"] = "failed"
-
-        import asyncio
-
-        async def test():
-            async def mock_get_pipelines(mr_iid):
-                return [pipeline_data]
-
-            async def mock_get_pipeline_status(pipeline_id):
-                return pipeline_data
-
-            async def mock_get_pipeline_jobs(pipeline_id):
-                return jobs_data
-
-            with patch.object(
-                checker.client, "get_mr_pipelines_async", mock_get_pipelines
-            ):
-                with patch.object(
-                    checker.client,
-                    "get_pipeline_status_async",
-                    mock_get_pipeline_status,
-                ):
-                    with patch.object(
-                        checker.client,
-                        "get_pipeline_jobs_async",
-                        mock_get_pipeline_jobs,
-                    ):
-                        pipeline = await checker.check_mr_pipeline(123)
-
-            assert pipeline.has_failures is True
-            assert pipeline.is_blocking is True
-
-        asyncio.run(test())
-
-    def test_check_mr_pipeline_no_pipeline(self, checker):
-        """Test checking MR with no pipeline."""
-        import asyncio
-
-        async def test():
-            async def mock_get_pipelines(mr_iid):
-                return []
-
-            with patch.object(
-                checker.client, "get_mr_pipelines_async", mock_get_pipelines
-            ):
-                pipeline = await checker.check_mr_pipeline(123)
-
-            assert pipeline is None
-
-        asyncio.run(test())
-
-    def test_get_blocking_reason_success(self, checker):
-        """Test getting blocking reason for successful pipeline."""
-        from runners.gitlab.services.ci_checker import PipelineInfo, PipelineStatus
-
-        pipeline = PipelineInfo(
-            pipeline_id=1001,
-            status=PipelineStatus.SUCCESS,
-            ref="main",
-            sha="abc123",
-            created_at="2025-01-14T10:00:00",
-            updated_at="2025-01-14T10:05:00",
-            failed_jobs=[],
-        )
-
-        reason = checker.get_blocking_reason(pipeline)
-
-        assert reason == ""
-
-    def test_get_blocking_reason_failed(self, checker):
-        """Test getting blocking reason for failed pipeline."""
-        from runners.gitlab.services.ci_checker import (
-            JobStatus,
-            PipelineInfo,
-            PipelineStatus,
-        )
-
-        pipeline = PipelineInfo(
-            pipeline_id=1001,
-            status=PipelineStatus.FAILED,
-            ref="main",
-            sha="abc123",
-            created_at="2025-01-14T10:00:00",
-            updated_at="2025-01-14T10:05:00",
-            failed_jobs=[
-                JobStatus(
-                    name="test",
-                    status="failed",
-                    stage="test",
-                    failure_reason="AssertionError",
-                )
-            ],
-        )
-
-        reason = checker.get_blocking_reason(pipeline)
-
-        assert "failed" in reason.lower()
-
-    def test_format_pipeline_summary(self, checker):
-        """Test formatting pipeline summary."""
-        from runners.gitlab.services.ci_checker import (
-            JobStatus,
-            PipelineInfo,
-            PipelineStatus,
-        )
-
-        pipeline = PipelineInfo(
-            pipeline_id=1001,
-            status=PipelineStatus.SUCCESS,
-            ref="main",
-            sha="abc123",
-            created_at="2025-01-14T10:00:00",
-            updated_at="2025-01-14T10:05:00",
-            duration=300,
-            jobs=[
-                JobStatus(
-                    name="test",
-                    status="success",
-                    stage="test",
-                ),
-                JobStatus(
-                    name="lint",
-                    status="success",
-                    stage="lint",
-                ),
-            ],
-        )
-
-        summary = checker.format_pipeline_summary(pipeline)
-
-        assert "Pipeline #1001" in summary
-        assert "SUCCESS" in summary
-        assert "2 total" in summary
-
-    def test_security_scan_detection(self, checker):
-        """Test detection of security scan failures."""
-        from runners.gitlab.services.ci_checker import JobStatus
-
-        jobs = [
-            JobStatus(
-                name="sast",
-                status="failed",
-                stage="test",
-                failure_reason="Vulnerability found",
-            ),
-            JobStatus(
-                name="secret_detection",
-                status="failed",
-                stage="test",
-                failure_reason="Secret leaked",
-            ),
-            JobStatus(
-                name="test",
-                status="success",
-                stage="test",
-            ),
-        ]
-
-        issues = checker._check_security_scans(jobs)
-
-        assert len(issues) == 2
-        assert any(i["type"] == "Static Application Security Testing" for i in issues)
-        assert any(i["type"] == "Secret Detection" for i in issues)
-
-
-class TestPipelineStatus:
-    """Test PipelineStatus enum."""
-
-    def test_status_values(self):
-        """Test all status values exist."""
-        from runners.gitlab.services.ci_checker import PipelineStatus
-
-        assert PipelineStatus.PENDING.value == "pending"
-        assert PipelineStatus.RUNNING.value == "running"
-        assert PipelineStatus.SUCCESS.value == "success"
-        assert PipelineStatus.FAILED.value == "failed"
-        assert PipelineStatus.CANCELED.value == "canceled"
-
-
-class TestJobStatus:
-    """Test JobStatus model."""
-
-    def test_job_status_creation(self):
-        """Test creating JobStatus."""
-        from runners.gitlab.services.ci_checker import JobStatus
-
-        job = JobStatus(
-            name="test",
-            status="success",
-            stage="test",
-            started_at="2025-01-14T10:00:00",
-            finished_at="2025-01-14T10:01:00",
-            duration=60,
-        )
-
-        assert job.name == "test"
-        assert job.status == "success"
-        assert job.duration == 60
-
-
-class TestPipelineInfo:
-    """Test PipelineInfo model."""
-
-    def test_pipeline_info_creation(self):
-        """Test creating PipelineInfo."""
-        from runners.gitlab.services.ci_checker import PipelineInfo, PipelineStatus
-
-        pipeline = PipelineInfo(
-            pipeline_id=1001,
-            status=PipelineStatus.SUCCESS,
-            ref="main",
-            sha="abc123",
-            created_at="2025-01-14T10:00:00",
-            updated_at="2025-01-14T10:05:00",
-        )
-
-        assert pipeline.pipeline_id == 1001
-        assert pipeline.has_failures is False
-        assert pipeline.is_blocking is False
-
-    def test_has_failures_property(self):
-        """Test has_failures property."""
-        from runners.gitlab.services.ci_checker import (
-            JobStatus,
-            PipelineInfo,
-            PipelineStatus,
-        )
-
-        pipeline = PipelineInfo(
-            pipeline_id=1001,
-            status=PipelineStatus.FAILED,
-            ref="main",
-            sha="abc123",
-            created_at="2025-01-14T10:00:00",
-            updated_at="2025-01-14T10:05:00",
-            failed_jobs=[
-                JobStatus(name="test", status="failed", stage="test"),
-            ],
-        )
-
-        assert pipeline.has_failures is True
-        assert len(pipeline.failed_jobs) == 1
-
-    def test_is_blocking_success(self):
-        """Test is_blocking for successful pipeline."""
-        from runners.gitlab.services.ci_checker import PipelineInfo, PipelineStatus
-
-        pipeline = PipelineInfo(
-            pipeline_id=1001,
-            status=PipelineStatus.SUCCESS,
-            ref="main",
-            sha="abc123",
-            created_at="2025-01-14T10:00:00",
-            updated_at="2025-01-14T10:05:00",
-        )
-
-        assert pipeline.is_blocking is False
-
-    def test_is_blocking_failed(self):
-        """Test is_blocking for failed pipeline."""
-        from runners.gitlab.services.ci_checker import PipelineInfo, PipelineStatus
-
-        pipeline = PipelineInfo(
-            pipeline_id=1001,
-            status=PipelineStatus.FAILED,
-            ref="main",
-            sha="abc123",
-            created_at="2025-01-14T10:00:00",
-            updated_at="2025-01-14T10:05:00",
-        )
-
-        assert pipeline.is_blocking is True
-
-    def test_is_blocking_running(self):
-        """Test is_blocking for running pipeline."""
-        from runners.gitlab.services.ci_checker import PipelineInfo, PipelineStatus
-
-        pipeline = PipelineInfo(
-            pipeline_id=1001,
-            status=PipelineStatus.RUNNING,
-            ref="main",
-            sha="abc123",
-            created_at="2025-01-14T10:00:00",
-            updated_at="2025-01-14T10:05:00",
-        )
-
-        # Running with no failed jobs is not blocking
-        assert pipeline.is_blocking is False

apps/backend/__tests__/test_gitlab_client_errors.py

@@ -1,322 +0,0 @@
-"""
-Tests for GitLab Client Error Handling
-=======================================
-
-Tests for enhanced retry logic, rate limiting, and error handling.
-"""
-
-import socket
-import urllib.error
-from pathlib import Path
-from unittest.mock import MagicMock, Mock, patch
-
-import pytest
-
-try:
-    from runners.gitlab.glab_client import GitLabClient, GitLabConfig
-except ImportError:
-    from glab_client import GitLabClient, GitLabConfig
-
-
-@pytest.fixture
-def mock_config():
-    """Create a mock GitLab config."""
-    return GitLabConfig(
-        token="test-token",
-        project="namespace/test-project",
-        instance_url="https://gitlab.example.com",
-    )
-
-
-@pytest.fixture
-def client(mock_config, tmp_path):
-    """Create a GitLab client instance."""
-    return GitLabClient(
-        project_dir=tmp_path,
-        config=mock_config,
-        default_timeout=5.0,
-    )
-
-
-def _create_mock_response(
-    status=200, content=b'{"id": 123}', content_type="application/json", headers=None
-):
-    """Helper to create a mock HTTP response."""
-    mock_resp = Mock()
-    mock_resp.status = status
-    mock_resp.read = lambda: content
-    # Use a real dict for headers to properly support .get() method
-    headers_dict = {"Content-Type": content_type}
-    if headers:
-        headers_dict.update(headers)
-    mock_resp.headers = headers_dict
-    # Support context manager protocol
-    mock_resp.__enter__ = Mock(return_value=mock_resp)
-    mock_resp.__exit__ = Mock(return_value=False)
-    return mock_resp
-
-
-class TestRetryLogic:
-    """Tests for retry logic on transient failures."""
-
-    @pytest.mark.asyncio
-    async def test_retry_on_429_rate_limit(self, client):
-        """Test retry on HTTP 429 rate limit."""
-        call_count = 0
-
-        def mock_urlopen(request, timeout=None):
-            nonlocal call_count
-            call_count += 1
-            if call_count == 1:
-                # First call: rate limited
-                error = urllib.error.HTTPError(
-                    url="https://example.com",
-                    code=429,
-                    msg="Rate limited",
-                    hdrs={"Retry-After": "1"},
-                    fp=None,
-                )
-                error.read = lambda: b""
-                raise error
-            # Second call: success
-            return _create_mock_response()
-
-        with patch("urllib.request.urlopen", mock_urlopen):
-            result = client._fetch("/projects/namespace%2Fproject")
-
-            assert call_count == 2  # Retried once
-
-    @pytest.mark.asyncio
-    async def test_retry_on_500_server_error(self, client):
-        """Test retry on HTTP 500 server error."""
-        call_count = 0
-
-        def mock_urlopen(request, timeout=None):
-            nonlocal call_count
-            call_count += 1
-            if call_count < 2:
-                error = urllib.error.HTTPError(
-                    url="https://example.com",
-                    code=500,
-                    msg="Internal server error",
-                    hdrs={},
-                    fp=None,
-                )
-                error.read = lambda: b""
-                raise error
-            return _create_mock_response()
-
-        with patch("urllib.request.urlopen", mock_urlopen):
-            result = client._fetch("/projects/namespace%2Fproject")
-
-            assert call_count == 2
-
-    @pytest.mark.asyncio
-    async def test_retry_on_502_bad_gateway(self, client):
-        """Test retry on HTTP 502 bad gateway."""
-        call_count = 0
-
-        def mock_urlopen(request, timeout=None):
-            nonlocal call_count
-            call_count += 1
-            if call_count == 1:
-                error = urllib.error.HTTPError(
-                    url="https://example.com",
-                    code=502,
-                    msg="Bad gateway",
-                    hdrs={},
-                    fp=None,
-                )
-                error.read = lambda: b""
-                raise error
-            return _create_mock_response()
-
-        with patch("urllib.request.urlopen", mock_urlopen):
-            result = client._fetch("/projects/namespace%2Fproject")
-
-            assert call_count == 2
-
-    @pytest.mark.asyncio
-    async def test_retry_on_socket_timeout(self, client):
-        """Test retry on socket timeout."""
-        call_count = 0
-
-        def mock_urlopen(request, timeout=None):
-            nonlocal call_count
-            call_count += 1
-            if call_count == 1:
-                raise TimeoutError("Connection timed out")
-            return _create_mock_response()
-
-        with patch("urllib.request.urlopen", mock_urlopen):
-            result = client._fetch("/projects/namespace%2Fproject")
-
-            assert call_count == 2
-
-    @pytest.mark.asyncio
-    async def test_retry_on_connection_reset(self, client):
-        """Test retry on connection reset."""
-        call_count = 0
-
-        def mock_urlopen(request, timeout=None):
-            nonlocal call_count
-            call_count += 1
-            if call_count == 1:
-                raise ConnectionResetError("Connection reset")
-            return _create_mock_response()
-
-        with patch("urllib.request.urlopen", mock_urlopen):
-            result = client._fetch("/projects/namespace%2Fproject")
-
-            assert call_count == 2
-
-    @pytest.mark.asyncio
-    async def test_no_retry_on_404_not_found(self, client):
-        """Test that 404 errors are not retried."""
-        call_count = 0
-
-        def mock_urlopen(request, timeout=None):
-            nonlocal call_count
-            call_count += 1
-            error = urllib.error.HTTPError(
-                url="https://example.com",
-                code=404,
-                msg="Not found",
-                hdrs={},
-                fp=None,
-            )
-            error.read = lambda: b""
-            raise error
-
-        with patch("urllib.request.urlopen", mock_urlopen):
-            with pytest.raises(Exception):  # noqa: B017
-                client._fetch("/projects/namespace%2Fproject")
-
-            assert call_count == 1  # No retry
-
-    @pytest.mark.asyncio
-    async def test_max_retries_exceeded(self, client):
-        """Test that max retries limit is respected."""
-        call_count = 0
-
-        def mock_urlopen(request, timeout=None):
-            nonlocal call_count
-            call_count += 1
-            # Always fail
-            raise urllib.error.HTTPError(
-                url="https://example.com",
-                code=500,
-                msg="Server error",
-                hdrs={},
-                fp=None,
-            )
-
-        with patch("urllib.request.urlopen", mock_urlopen):
-            with pytest.raises(Exception, match="GitLab API error"):
-                client._fetch("/projects/namespace%2Fproject", max_retries=2)
-
-            # With max_retries=2, the loop runs range(2) = [0, 1], so 2 attempts total
-            assert call_count == 2
-
-
-class TestRateLimiting:
-    """Tests for rate limit handling."""
-
-    @pytest.mark.asyncio
-    async def test_retry_after_header_parsing(self, client):
-        """Test parsing Retry-After header."""
-        import time
-
-        def mock_urlopen(request, timeout=None):
-            error = urllib.error.HTTPError(
-                url="https://example.com",
-                code=429,
-                msg="Rate limited",
-                hdrs={"Retry-After": "2"},
-                fp=None,
-            )
-            error.read = lambda: b""
-            raise error
-
-        with patch("urllib.request.urlopen", mock_urlopen):
-            with patch("time.sleep") as mock_sleep:
-                # Should fail after retries
-                with pytest.raises(Exception):  # noqa: B017
-                    client._fetch("/projects/namespace%2Fproject")
-
-                # Check that sleep was called with Retry-After value
-                mock_sleep.assert_called_with(2)
-
-
-class TestErrorMessages:
-    """Tests for helpful error messages."""
-
-    @pytest.mark.asyncio
-    async def test_gitlab_error_message_included(self, client):
-        """Test that GitLab error messages are included in exceptions."""
-
-        def mock_urlopen(request, timeout=None):
-            error = urllib.error.HTTPError(
-                url="https://example.com",
-                code=400,
-                msg="Bad request",
-                hdrs={},
-                fp=None,
-            )
-            error.read = lambda: b'{"message": "Invalid branch name"}'
-            raise error
-
-        with patch("urllib.request.urlopen", mock_urlopen):
-            with pytest.raises(Exception) as exc_info:
-                client._fetch("/projects/namespace%2Fproject")
-
-            # Error message should include GitLab's message
-            assert "Invalid branch name" in str(exc_info.value)
-
-    @pytest.mark.asyncio
-    async def test_invalid_endpoint_raises(self, client):
-        """Test that invalid endpoints are rejected."""
-        with pytest.raises(
-            ValueError, match="does not match known GitLab API patterns"
-        ):
-            client._fetch("/invalid/endpoint")
-
-
-class TestResponseSizeLimits:
-    """Tests for response size limits."""
-
-    @pytest.mark.asyncio
-    async def test_large_response_rejected(self, client):
-        """Test that overly large responses are rejected."""
-
-        def mock_urlopen(request, timeout=None):
-            # Use application/json to trigger size check (status < 400)
-            return _create_mock_response(
-                content=b"Large response",
-                content_type="application/json",
-                headers={"Content-Length": str(20 * 1024 * 1024)},  # 20MB
-            )
-
-        with patch("urllib.request.urlopen", mock_urlopen):
-            with pytest.raises(ValueError, match="Response too large"):
-                client._fetch("/projects/namespace%2Fproject")
-
-
-class TestContentTypeHandling:
-    """Tests for Content-Type validation."""
-
-    @pytest.mark.asyncio
-    async def test_non_json_response_handling(self, client):
-        """Test handling of non-JSON responses on success."""
-
-        def mock_urlopen(request, timeout=None):
-            mock_resp = _create_mock_response(
-                content=b"Plain text response", content_type="text/plain"
-            )
-            return mock_resp
-
-        with patch("urllib.request.urlopen", mock_urlopen):
-            result = client._fetch("/projects/namespace%2Fproject")
-
-            # Should return raw response for non-JSON on success
-            assert result == "Plain text response"

apps/backend/__tests__/test_gitlab_client_extensions.py

@@ -1,361 +0,0 @@
-"""
-Tests for GitLab Client API Extensions
-=========================================
-
-Tests for new CRUD endpoints, branch operations, file operations, and webhooks.
-"""
-
-from pathlib import Path
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-# Try imports with fallback for different environments
-try:
-    from runners.gitlab.glab_client import (
-        GitLabClient,
-        GitLabConfig,
-        encode_project_path,
-    )
-except ImportError:
-    from glab_client import GitLabClient, GitLabConfig, encode_project_path
-
-
-@pytest.fixture
-def mock_config():
-    """Create a mock GitLab config."""
-    return GitLabConfig(
-        token="test-token",
-        project="namespace/test-project",
-        instance_url="https://gitlab.example.com",
-    )
-
-
-@pytest.fixture
-def client(mock_config, tmp_path):
-    """Create a GitLab client instance."""
-    return GitLabClient(
-        project_dir=tmp_path,
-        config=mock_config,
-    )
-
-
-class TestMRExtensions:
-    """Tests for MR CRUD operations."""
-
-    @pytest.mark.asyncio
-    async def test_create_mr(self, client):
-        """Test creating a merge request."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "iid": 123,
-                "title": "Test MR",
-                "source_branch": "feature",
-                "target_branch": "main",
-            }
-
-            result = client.create_mr(
-                source_branch="feature",
-                target_branch="main",
-                title="Test MR",
-                description="Test description",
-            )
-
-            assert mock_fetch.called
-            assert result["iid"] == 123
-
-    @pytest.mark.asyncio
-    async def test_list_mrs_filters(self, client):
-        """Test listing MRs with filters."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = [
-                {"iid": 1, "title": "MR 1"},
-                {"iid": 2, "title": "MR 2"},
-            ]
-
-            result = client.list_mrs(state="opened", labels=["bug"])
-
-            assert mock_fetch.called
-            assert len(result) == 2
-
-    @pytest.mark.asyncio
-    async def test_update_mr(self, client):
-        """Test updating a merge request."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {"iid": 123, "title": "Updated"}
-
-            result = client.update_mr(
-                mr_iid=123,
-                title="Updated",
-                labels={"bug": True, "feature": False},
-            )
-
-            assert mock_fetch.called
-
-
-class TestBranchOperations:
-    """Tests for branch management operations."""
-
-    @pytest.mark.asyncio
-    async def test_list_branches(self, client):
-        """Test listing branches."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = [
-                {"name": "main", "commit": {"id": "abc123"}},
-                {"name": "develop", "commit": {"id": "def456"}},
-            ]
-
-            result = client.list_branches()
-
-            assert len(result) == 2
-            assert result[0]["name"] == "main"
-
-    @pytest.mark.asyncio
-    async def test_get_branch(self, client):
-        """Test getting a specific branch."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "name": "main",
-                "commit": {"id": "abc123"},
-                "protected": True,
-            }
-
-            result = client.get_branch("main")
-
-            assert result["name"] == "main"
-
-    @pytest.mark.asyncio
-    async def test_create_branch(self, client):
-        """Test creating a new branch."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "name": "feature-branch",
-                "commit": {"id": "abc123"},
-            }
-
-            result = client.create_branch(
-                branch_name="feature-branch",
-                ref="main",
-            )
-
-            assert result["name"] == "feature-branch"
-
-    @pytest.mark.asyncio
-    async def test_delete_branch(self, client):
-        """Test deleting a branch."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = None  # 204 No Content
-
-            result = client.delete_branch("feature-branch")
-
-            # Should not raise on success
-            assert result is None
-
-    @pytest.mark.asyncio
-    async def test_compare_branches(self, client):
-        """Test comparing two branches."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "diff": "@@ -1,1 +1,1 @@",
-                "commits": [{"id": "abc123"}],
-            }
-
-            result = client.compare_branches("main", "feature")
-
-            assert "diff" in result
-
-
-class TestFileOperations:
-    """Tests for file operations."""
-
-    @pytest.mark.asyncio
-    async def test_get_file_contents(self, client):
-        """Test getting file contents."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "file_name": "test.py",
-                "content": "ZGVmIHRlc3Q=",  # base64
-                "encoding": "base64",
-            }
-
-            result = client.get_file_contents("test.py", ref="main")
-
-            assert result["file_name"] == "test.py"
-
-    @pytest.mark.asyncio
-    async def test_create_file(self, client):
-        """Test creating a new file."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "file_path": "new_file.py",
-                "branch": "main",
-            }
-
-            result = client.create_file(
-                file_path="new_file.py",
-                content="print('hello')",
-                commit_message="Add new file",
-                branch="main",
-            )
-
-            assert result["file_path"] == "new_file.py"
-
-    @pytest.mark.asyncio
-    async def test_update_file(self, client):
-        """Test updating an existing file."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "file_path": "existing.py",
-                "branch": "main",
-            }
-
-            result = client.update_file(
-                file_path="existing.py",
-                content="updated content",
-                commit_message="Update file",
-                branch="main",
-            )
-
-            assert result["file_path"] == "existing.py"
-
-    @pytest.mark.asyncio
-    async def test_delete_file(self, client):
-        """Test deleting a file."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = None  # 204 No Content
-
-            result = client.delete_file(
-                file_path="old.py",
-                commit_message="Remove old file",
-                branch="main",
-            )
-
-            assert result is None
-
-
-class TestWebhookOperations:
-    """Tests for webhook management."""
-
-    @pytest.mark.asyncio
-    async def test_list_webhooks(self, client):
-        """Test listing webhooks."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = [
-                {"id": 1, "url": "https://example.com/hook"},
-                {"id": 2, "url": "https://example.com/another"},
-            ]
-
-            result = client.list_webhooks()
-
-            assert len(result) == 2
-
-    @pytest.mark.asyncio
-    async def test_get_webhook(self, client):
-        """Test getting a specific webhook."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "id": 1,
-                "url": "https://example.com/hook",
-                "push_events": True,
-            }
-
-            result = client.get_webhook(1)
-
-            assert result["id"] == 1
-
-    @pytest.mark.asyncio
-    async def test_create_webhook(self, client):
-        """Test creating a webhook."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "id": 1,
-                "url": "https://example.com/hook",
-            }
-
-            result = client.create_webhook(
-                url="https://example.com/hook",
-                push_events=True,
-                merge_request_events=True,
-            )
-
-            assert result["id"] == 1
-
-    @pytest.mark.asyncio
-    async def test_update_webhook(self, client):
-        """Test updating a webhook."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "id": 1,
-                "url": "https://example.com/hook-updated",
-            }
-
-            result = client.update_webhook(
-                hook_id=1,
-                url="https://example.com/hook-updated",
-            )
-
-            assert result["url"] == "https://example.com/hook-updated"
-
-    @pytest.mark.asyncio
-    async def test_delete_webhook(self, client):
-        """Test deleting a webhook."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = None  # 204 No Content
-
-            result = client.delete_webhook(1)
-
-            assert result is None
-
-
-class TestAsyncMethods:
-    """Tests for async method variants."""
-
-    @pytest.mark.asyncio
-    async def test_create_mr_async(self, client):
-        """Test async variant of create_mr."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "iid": 123,
-                "title": "Test MR",
-            }
-
-            result = await client.create_mr_async(
-                source_branch="feature",
-                target_branch="main",
-                title="Test MR",
-            )
-
-            assert result["iid"] == 123
-
-    @pytest.mark.asyncio
-    async def test_list_branches_async(self, client):
-        """Test async variant of list_branches."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = [
-                {"name": "main"},
-            ]
-
-            result = await client.list_branches_async()
-
-            assert len(result) == 1
-
-
-class TestEncoding:
-    """Tests for URL encoding."""
-
-    def test_encode_project_path_simple(self):
-        """Test encoding simple project path."""
-        result = encode_project_path("namespace/project")
-        assert result == "namespace%2Fproject"
-
-    def test_encode_project_path_with_dots(self):
-        """Test encoding project path with dots."""
-        result = encode_project_path("group.name/project")
-        assert "group.name%2Fproject" in result or "group%2Ename%2Fproject" in result
-
-    def test_encode_project_path_with_slashes(self):
-        """Test encoding project path with nested groups."""
-        result = encode_project_path("group/subgroup/project")
-        assert result == "group%2Fsubgroup%2Fproject"

apps/backend/__tests__/test_gitlab_context_gatherer.py

@@ -1,444 +0,0 @@
-"""
-Unit Tests for GitLab MR Context Gatherer Enhancements
-======================================================
-
-Tests for enhanced context gathering including monorepo detection,
-related files finding, and AI bot comment detection.
-"""
-
-from pathlib import Path
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-# Try imports with fallback for different environments
-try:
-    from runners.gitlab.services.context_gatherer import (
-        CONFIG_FILE_NAMES,
-        GITLAB_AI_BOT_PATTERNS,
-        MRContextGatherer,
-    )
-except ImportError:
-    from runners.gitlab.context_gatherer import (
-        CONFIG_FILE_NAMES,
-        GITLAB_AI_BOT_PATTERNS,
-        MRContextGatherer,
-    )
-
-
-@pytest.fixture
-def mock_client():
-    """Create a mock GitLab client."""
-    client = MagicMock()
-    client.get_mr_async = AsyncMock()
-    client.get_mr_changes_async = AsyncMock()
-    client.get_mr_commits_async = AsyncMock()
-    client.get_mr_notes_async = AsyncMock()
-    client.get_mr_pipeline_async = AsyncMock()
-    return client
-
-
-@pytest.fixture
-def sample_mr_data():
-    """Sample MR data from GitLab API."""
-    return {
-        "iid": 123,
-        "title": "Add new feature",
-        "description": "This adds a cool feature",
-        "author": {"username": "developer"},
-        "source_branch": "feature-branch",
-        "target_branch": "main",
-        "state": "opened",
-    }
-
-
-@pytest.fixture
-def sample_changes_data():
-    """Sample MR changes data."""
-    return {
-        "changes": [
-            {
-                "new_path": "src/utils/helpers.py",
-                "old_path": "src/utils/helpers.py",
-                "diff": "@@ -1,1 +1,2 @@\n def helper():\n+    return True",
-                "new_file": False,
-                "deleted_file": False,
-                "renamed_file": False,
-            },
-        ],
-        "additions": 10,
-        "deletions": 5,
-    }
-
-
-@pytest.fixture
-def sample_commits():
-    """Sample commit data."""
-    return [
-        {
-            "id": "abc123",
-            "short_id": "abc123",
-            "title": "Add feature",
-            "message": "Add feature",
-        }
-    ]
-
-
-@pytest.fixture
-def tmp_project_dir(tmp_path):
-    """Create a temporary project directory with structure."""
-    # Create monorepo structure
-    (tmp_path / "apps").mkdir()
-    (tmp_path / "apps" / "backend").mkdir()
-    (tmp_path / "apps" / "frontend").mkdir()
-    (tmp_path / "packages").mkdir()
-    (tmp_path / "packages" / "shared").mkdir()
-
-    # Create config files
-    (tmp_path / "package.json").write_text(
-        '{"workspaces": ["apps/*", "packages/*"]}', encoding="utf-8"
-    )
-    (tmp_path / "tsconfig.json").write_text(
-        '{"compilerOptions": {"paths": {"@/*": ["src/*"]}}}', encoding="utf-8"
-    )
-    (tmp_path / ".gitlab-ci.yml").write_text("stages:\n  - test", encoding="utf-8")
-
-    # Create source files
-    (tmp_path / "src").mkdir()
-    (tmp_path / "src" / "utils").mkdir()
-    (tmp_path / "src" / "utils" / "helpers.py").write_text(
-        "def helper():\n    return True", encoding="utf-8"
-    )
-
-    # Create test files
-    (tmp_path / "tests").mkdir()
-    (tmp_path / "tests" / "test_helpers.py").write_text(
-        "def test_helper():\n    assert True", encoding="utf-8"
-    )
-
-    return tmp_path
-
-
-@pytest.fixture
-def gatherer(tmp_project_dir):
-    """Create a context gatherer instance."""
-    return MRContextGatherer(
-        project_dir=tmp_project_dir,
-        mr_iid=123,
-        config=MagicMock(project="namespace/project", token="test-token"),
-    )
-
-
-class TestAIBotPatterns:
-    """Test AI bot pattern detection."""
-
-    def test_gitlab_ai_bot_patterns_comprehensive(self):
-        """Test that AI bot patterns include major tools."""
-        # Check for known AI tools
-        assert "coderabbit" in GITLAB_AI_BOT_PATTERNS
-        assert "greptile" in GITLAB_AI_BOT_PATTERNS
-        assert "cursor" in GITLAB_AI_BOT_PATTERNS
-        assert "sourcery-ai" in GITLAB_AI_BOT_PATTERNS
-        assert "codium" in GITLAB_AI_BOT_PATTERNS
-
-    def test_config_file_names_include_gitlab_ci(self):
-        """Test that GitLab CI config is included."""
-        assert ".gitlab-ci.yml" in CONFIG_FILE_NAMES
-
-
-class TestRepoStructureDetection:
-    """Test monorepo and project structure detection."""
-
-    def test_detect_monorepo_apps(self, gatherer, tmp_project_dir):
-        """Test detection of apps/ directory."""
-        structure = gatherer._detect_repo_structure()
-
-        assert "Monorepo Apps" in structure
-        assert "backend" in structure
-        assert "frontend" in structure
-
-    def test_detect_monorepo_packages(self, gatherer, tmp_project_dir):
-        """Test detection of packages/ directory."""
-        structure = gatherer._detect_repo_structure()
-
-        assert "Packages" in structure
-        assert "shared" in structure
-
-    def test_detect_workspaces(self, gatherer, tmp_project_dir):
-        """Test detection of npm workspaces."""
-        structure = gatherer._detect_repo_structure()
-
-        assert "Workspaces" in structure
-
-    def test_detect_gitlab_ci(self, gatherer, tmp_project_dir):
-        """Test detection of GitLab CI config."""
-        structure = gatherer._detect_repo_structure()
-
-        assert "GitLab CI" in structure
-
-    def test_detect_standard_repo(self, tmp_path):
-        """Test detection of standard repo without monorepo structure."""
-        gatherer = MRContextGatherer(
-            project_dir=tmp_path,
-            mr_iid=123,
-            config=MagicMock(project="namespace/project"),
-        )
-
-        structure = gatherer._detect_repo_structure()
-
-        assert "Standard single-package repository" in structure
-
-
-class TestRelatedFilesFinding:
-    """Test finding related files for context."""
-
-    def test_find_test_files(self, gatherer, tmp_project_dir):
-        """Test finding test files for a source file."""
-        source_path = Path("src/utils/helpers.py")
-        tests = gatherer._find_test_files(source_path)
-
-        # Should find the test file we created
-        assert "tests/test_helpers.py" in tests
-
-    def test_find_config_files(self, gatherer, tmp_project_dir):
-        """Test finding config files in directory."""
-        directory = Path(tmp_project_dir)
-        configs = gatherer._find_config_files(directory)
-
-        # Should find config files in root
-        assert "package.json" in configs
-        assert "tsconfig.json" in configs
-        assert ".gitlab-ci.yml" in configs
-
-    def test_find_type_definitions(self, gatherer, tmp_project_dir):
-        """Test finding TypeScript type definition files."""
-        # Create a TypeScript file
-        (tmp_project_dir / "src" / "types.ts").write_text(
-            "export type Foo = string;", encoding="utf-8"
-        )
-        (tmp_project_dir / "src" / "types.d.ts").write_text(
-            "export type Bar = number;", encoding="utf-8"
-        )
-
-        source_path = Path("src/types.ts")
-        type_defs = gatherer._find_type_definitions(source_path)
-
-        assert "src/types.d.ts" in type_defs
-
-    def test_find_dependents_limits_generic_names(self, gatherer, tmp_project_dir):
-        """Test that generic names are skipped in dependent finding."""
-        # Generic names should be skipped to avoid too many matches
-        for stem in ["index", "main", "app", "utils", "helpers", "types", "constants"]:
-            result = gatherer._find_dependents(f"src/{stem}.py")
-            assert result == set()  # Should skip generic names
-
-    def test_prioritize_related_files(self, gatherer):
-        """Test prioritization of related files."""
-        files = {
-            "tests/test_utils.py",  # Test file - highest priority
-            "src/utils.d.ts",  # Type definition - high priority
-            "tsconfig.json",  # Config - medium priority
-            "src/random.py",  # Other - low priority
-        }
-
-        prioritized = gatherer._prioritize_related_files(files, limit=10)
-
-        # Test files should come first
-        assert prioritized[0] == "tests/test_utils.py"
-        assert "src/utils.d.ts" in prioritized[1:3]  # Type files next
-        assert "tsconfig.json" in prioritized  # Configs included
-
-
-class TestJSONLoading:
-    """Test JSON loading with comment handling."""
-
-    def test_load_json_safe_standard(self, gatherer, tmp_project_dir):
-        """Test loading standard JSON without comments."""
-        (tmp_project_dir / "standard.json").write_text(
-            '{"key": "value"}', encoding="utf-8"
-        )
-
-        result = gatherer._load_json_safe("standard.json")
-
-        assert result == {"key": "value"}
-
-    def test_load_json_safe_with_comments(self, gatherer, tmp_project_dir):
-        """Test loading JSON with tsconfig-style comments."""
-        (tmp_project_dir / "with-comments.json").write_text(
-            "{\n"
-            "  // Single-line comment\n"
-            '  "key": "value",\n'
-            "  /* Multi-line\n"
-            "     comment */\n"
-            '  "key2": "value2"\n'
-            "}",
-            encoding="utf-8",
-        )
-
-        result = gatherer._load_json_safe("with-comments.json")
-
-        assert result == {"key": "value", "key2": "value2"}
-
-    def test_load_json_safe_nonexistent(self, gatherer, tmp_project_dir):
-        """Test loading non-existent JSON file."""
-        result = gatherer._load_json_safe("nonexistent.json")
-
-        assert result is None
-
-    def test_load_tsconfig_paths(self, gatherer, tmp_project_dir):
-        """Test loading tsconfig paths."""
-        result = gatherer._load_tsconfig_paths()
-
-        assert result is not None
-        assert "@/*" in result
-        assert "src/*" in result["@/*"]
-
-
-class TestStaticMethods:
-    """Test static utility methods."""
-
-    def test_find_related_files_for_root(self, tmp_project_dir):
-        """Test static method for finding related files."""
-        changed_files = [
-            {"new_path": "src/utils/helpers.py", "old_path": "src/utils/helpers.py"},
-        ]
-
-        related = MRContextGatherer.find_related_files_for_root(
-            changed_files=changed_files,
-            project_root=tmp_project_dir,
-        )
-
-        # Should find test file
-        assert "tests/test_helpers.py" in related
-        # Should not include the changed file itself
-        assert "src/utils/helpers.py" not in related
-
-
-@pytest.mark.asyncio
-class TestGatherIntegration:
-    """Test the full gather method integration."""
-
-    async def test_gather_with_enhancements(
-        self, gatherer, mock_client, sample_mr_data, sample_changes_data, sample_commits
-    ):
-        """Test that gather includes repo structure and related files."""
-        # Setup mock responses
-        mock_client.get_mr_async.return_value = sample_mr_data
-        mock_client.get_mr_changes_async.return_value = sample_changes_data
-        mock_client.get_mr_commits_async.return_value = sample_commits
-        mock_client.get_mr_notes_async.return_value = []
-        mock_client.get_mr_pipeline_async.return_value = {
-            "id": 456,
-            "status": "success",
-        }
-
-        result = await gatherer.gather()
-
-        # Verify enhanced fields are populated
-        assert result.mr_iid == 123
-        assert result.repo_structure != ""
-        assert (
-            "Monorepo" in result.repo_structure or "Standard" in result.repo_structure
-        )
-        assert isinstance(result.related_files, list)
-        assert result.ci_status == "success"
-        assert result.ci_pipeline_id == 456
-
-    @pytest.mark.asyncio
-    async def test_gather_handles_missing_ci(
-        self, gatherer, mock_client, sample_mr_data, sample_changes_data, sample_commits
-    ):
-        """Test that gather handles missing CI pipeline gracefully."""
-        mock_client.get_mr_async.return_value = sample_mr_data
-        mock_client.get_mr_changes_async.return_value = sample_changes_data
-        mock_client.get_mr_commits_async.return_value = sample_commits
-        mock_client.get_mr_notes_async.return_value = []
-        mock_client.get_mr_pipeline_async.return_value = None
-
-        result = await gatherer.gather()
-
-        # Should not fail, CI fields should be None
-        assert result.ci_status is None
-        assert result.ci_pipeline_id is None
-
-
-class TestAIBotCommentDetection:
-    """Test AI bot comment detection and parsing."""
-
-    def test_parse_ai_comment_known_tool(self, gatherer):
-        """Test parsing comment from known AI tool."""
-        note = {
-            "id": 1,
-            "author": {"username": "coderabbit[bot]"},
-            "body": "Consider using async/await here",
-            "created_at": "2024-01-01T00:00:00Z",
-        }
-
-        result = gatherer._parse_ai_comment(note)
-
-        assert result is not None
-        assert result.tool_name == "CodeRabbit"
-        assert result.author == "coderabbit[bot]"
-
-    def test_parse_ai_comment_unknown_user(self, gatherer):
-        """Test parsing comment from unknown user."""
-        note = {
-            "id": 1,
-            "author": {"username": "developer"},
-            "body": "Just a regular comment",
-            "created_at": "2024-01-01T00:00:00Z",
-        }
-
-        result = gatherer._parse_ai_comment(note)
-
-        assert result is None
-
-    def test_parse_ai_comment_no_author(self, gatherer):
-        """Test parsing comment with no author."""
-        note = {
-            "id": 1,
-            "body": "Anonymous comment",
-            "created_at": "2024-01-01T00:00:00Z",
-        }
-
-        result = gatherer._parse_ai_comment(note)
-
-        assert result is None
-
-
-class TestValidation:
-    """Test input validation functions."""
-
-    def test_validate_git_ref_valid(self):
-        """Test validation of valid git refs."""
-        from runners.gitlab.services.context_gatherer import _validate_git_ref
-
-        assert _validate_git_ref("main") is True
-        assert _validate_git_ref("feature-branch") is True
-        assert _validate_git_ref("feature/branch-123") is True
-        assert _validate_git_ref("abc123def456") is True
-
-    def test_validate_git_ref_invalid(self):
-        """Test validation rejects invalid git refs."""
-        from runners.gitlab.services.context_gatherer import _validate_git_ref
-
-        assert _validate_git_ref("") is False  # Empty
-        assert _validate_git_ref("a" * 300) is False  # Too long
-        assert _validate_git_ref("branch;rm -rf") is False  # Invalid chars
-
-    def test_validate_file_path_valid(self):
-        """Test validation of valid file paths."""
-        from runners.gitlab.services.context_gatherer import _validate_file_path
-
-        assert _validate_file_path("src/file.py") is True
-        assert _validate_file_path("src/utils/helpers.ts") is True
-        assert _validate_file_path("src/config.json") is True
-
-    def test_validate_file_path_invalid(self):
-        """Test validation rejects invalid file paths."""
-        from runners.gitlab.services.context_gatherer import _validate_file_path
-
-        assert _validate_file_path("") is False  # Empty
-        assert _validate_file_path("../etc/passwd") is False  # Path traversal
-        assert _validate_file_path("/etc/passwd") is False  # Absolute path
-        assert _validate_file_path("a" * 1100) is False  # Too long

apps/backend/__tests__/test_gitlab_file_lock.py

@@ -1,422 +0,0 @@
-"""
-GitLab File Lock Tests
-=======================
-
-Tests for file locking utilities for concurrent safety.
-"""
-
-import json
-import tempfile
-import threading
-import time
-from pathlib import Path
-from unittest.mock import patch
-
-import pytest
-
-
-class TestFileLock:
-    """Test FileLock for concurrent-safe operations."""
-
-    @pytest.fixture
-    def lock_file(self, tmp_path):
-        """Create a temporary lock file path."""
-        return tmp_path / "test.lock"
-
-    def test_acquire_lock(self, lock_file):
-        """Test acquiring a lock."""
-        from runners.gitlab.utils.file_lock import FileLock
-
-        with FileLock(lock_file, timeout=5.0):
-            # Lock is held here
-            assert lock_file.exists()
-
-    def test_lock_release(self, lock_file):
-        """Test lock is released after context."""
-        from runners.gitlab.utils.file_lock import FileLock
-
-        with FileLock(lock_file, timeout=5.0):
-            pass
-
-        # Lock file should be cleaned up
-        assert not lock_file.exists()
-
-    def test_lock_timeout(self, lock_file):
-        """Test lock timeout when held by another process."""
-        from runners.gitlab.utils.file_lock import FileLock, FileLockTimeout
-
-        # Hold lock in separate thread
-        def hold_lock():
-            with FileLock(lock_file, timeout=5.0):
-                time.sleep(0.5)
-
-        thread = threading.Thread(target=hold_lock)
-        thread.start()
-
-        # Wait a bit for lock to be acquired
-        time.sleep(0.1)
-
-        # Try to acquire with short timeout
-        with pytest.raises(FileLockTimeout):
-            FileLock(lock_file, timeout=0.1).acquire()
-
-        thread.join()
-
-    def test_exclusive_lock(self, lock_file):
-        """Test exclusive lock prevents concurrent writes."""
-        from runners.gitlab.utils.file_lock import FileLock
-
-        results = []
-
-        def try_write(value):
-            try:
-                with FileLock(lock_file, timeout=1.0, exclusive=True):
-                    with open(
-                        lock_file.with_suffix(".txt"), "w", encoding="utf-8"
-                    ) as f:
-                        f.write(str(value))
-                    results.append(value)
-            except Exception:
-                results.append(None)
-
-        threads = [
-            threading.Thread(target=try_write, args=(1,)),
-            threading.Thread(target=try_write, args=(2,)),
-        ]
-
-        for t in threads:
-            t.start()
-
-        for t in threads:
-            t.join()
-
-        # Only one should have succeeded
-        successful = [r for r in results if r is not None]
-        assert len(successful) == 1
-
-    def test_lock_cleanup_on_error(self, lock_file):
-        """Test lock is cleaned up even on error."""
-        from runners.gitlab.utils.file_lock import FileLock
-
-        try:
-            with FileLock(lock_file, timeout=5.0):
-                raise ValueError("Simulated error")
-        except ValueError:
-            pass
-
-        # Lock should be cleaned up despite error
-        assert not lock_file.exists()
-
-
-class TestAtomicWrite:
-    """Test atomic_write for safe file writes."""
-
-    @pytest.fixture
-    def target_file(self, tmp_path):
-        """Create a temporary target file."""
-        return tmp_path / "target.txt"
-
-    def test_atomic_write_creates_file(self, target_file):
-        """Test atomic write creates target file."""
-        from runners.gitlab.utils.file_lock import atomic_write
-
-        with atomic_write(target_file) as f:
-            f.write("test content")
-
-        assert target_file.exists()
-        assert target_file.read_text(encoding="utf-8") == "test content"
-
-    def test_atomic_write_preserves_on_error(self, target_file):
-        """Test atomic write doesn't corrupt on error."""
-        from runners.gitlab.utils.file_lock import atomic_write
-
-        # Create initial content
-        target_file.write_text("original content", encoding="utf-8")
-
-        try:
-            with atomic_write(target_file) as f:
-                f.write("new content")
-                raise ValueError("Simulated error")
-        except ValueError:
-            pass
-
-        # Original content should be preserved
-        assert target_file.read_text(encoding="utf-8") == "original content"
-
-    def test_atomic_write_context_manager(self, target_file):
-        """Test atomic write context manager."""
-        from runners.gitlab.utils.file_lock import atomic_write
-
-        with atomic_write(target_file) as f:
-            f.write("line 1\n")
-            f.write("line 2\n")
-
-        content = target_file.read_text(encoding="utf-8")
-        assert "line 1" in content
-        assert "line 2" in content
-
-
-class TestLockedJsonOperations:
-    """Test locked JSON operations."""
-
-    @pytest.fixture
-    def data_file(self, tmp_path):
-        """Create a temporary data file."""
-        return tmp_path / "data.json"
-
-    def test_locked_json_write(self, data_file):
-        """Test writing JSON with file locking."""
-        from runners.gitlab.utils.file_lock import locked_json_write
-
-        data = {"key": "value", "number": 42}
-
-        locked_json_write(data_file, data)
-
-        assert data_file.exists()
-        with open(data_file, encoding="utf-8") as f:
-            loaded = json.load(f)
-        assert loaded == data
-
-    def test_locked_json_read(self, data_file):
-        """Test reading JSON with file locking."""
-        from runners.gitlab.utils.file_lock import locked_json_read, locked_json_write
-
-        data = {"key": "value", "nested": {"item": 1}}
-        locked_json_write(data_file, data)
-
-        loaded = locked_json_read(data_file)
-
-        assert loaded == data
-
-    def test_locked_json_update(self, data_file):
-        """Test updating JSON with file locking."""
-        from runners.gitlab.utils.file_lock import (
-            locked_json_read,
-            locked_json_update,
-            locked_json_write,
-        )
-
-        initial = {"key": "value"}
-        locked_json_write(data_file, initial)
-
-        def update_fn(data):
-            data["new_key"] = "new_value"
-            return data
-
-        locked_json_update(data_file, update_fn)
-
-        loaded = locked_json_read(data_file)
-        assert loaded["key"] == "value"
-        assert loaded["new_key"] == "new_value"
-
-    def test_locked_json_read_missing_file(self, tmp_path):
-        """Test reading missing JSON file returns None."""
-        from runners.gitlab.utils.file_lock import locked_json_read
-
-        result = locked_json_read(tmp_path / "nonexistent.json")
-
-        assert result is None
-
-    def test_concurrent_json_writes(self, tmp_path):
-        """Test concurrent JSON writes are safe."""
-        from runners.gitlab.utils.file_lock import (
-            locked_json_read,
-            locked_json_update,
-            locked_json_write,
-        )
-
-        data_file = tmp_path / "concurrent.json"
-
-        # Initialize
-        locked_json_write(data_file, {"counter": 0})
-
-        results = []
-
-        def increment():
-            def updater(data):
-                data["counter"] += 1
-                return data
-
-            locked_json_update(data_file, updater)
-            result = locked_json_read(data_file)
-            results.append(result["counter"])
-
-        threads = [
-            threading.Thread(target=increment),
-            threading.Thread(target=increment),
-            threading.Thread(target=increment),
-        ]
-
-        for t in threads:
-            t.start()
-
-        for t in threads:
-            t.join()
-
-        # Final value should be 3
-        final = locked_json_read(data_file)
-        assert final["counter"] == 3
-
-
-class TestLockedReadWrite:
-    """Test general locked read/write operations."""
-
-    @pytest.fixture
-    def data_file(self, tmp_path):
-        """Create a temporary data file."""
-        return tmp_path / "data.txt"
-
-    def test_locked_write(self, data_file):
-        """Test writing with lock."""
-        from runners.gitlab.utils.file_lock import locked_write
-
-        with locked_write(data_file) as f:
-            f.write("test content")
-
-        assert data_file.read_text(encoding="utf-8") == "test content"
-
-    def test_locked_read(self, data_file):
-        """Test reading with lock."""
-        from runners.gitlab.utils.file_lock import locked_read, locked_write
-
-        with locked_write(data_file) as f:
-            f.write("read test")
-
-        with locked_read(data_file) as f:
-            content = f.read()
-
-        assert content == "read test"
-
-    def test_locked_write_file_lock(self, data_file):
-        """Test locked_write with custom FileLock."""
-        from runners.gitlab.utils.file_lock import FileLock, locked_write
-
-        with FileLock(data_file, timeout=5.0):
-            with locked_write(data_file, lock=None) as f:
-                f.write("custom lock")
-
-        assert data_file.read_text(encoding="utf-8") == "custom lock"
-
-
-class TestFileLockError:
-    """Test FileLockError exceptions."""
-
-    def test_file_lock_error(self):
-        """Test FileLockError is raised correctly."""
-        from runners.gitlab.utils.file_lock import FileLockError
-
-        error = FileLockError("Custom error message")
-        assert str(error) == "Custom error message"
-
-    def test_file_lock_timeout(self):
-        """Test FileLockTimeout is raised correctly."""
-        from runners.gitlab.utils.file_lock import FileLockTimeout
-
-        error = FileLockTimeout("Timeout message")
-        assert "Timeout" in str(error)
-
-
-class TestConcurrentSafety:
-    """Test concurrent safety scenarios."""
-
-    def test_multiple_readers(self, tmp_path):
-        """Test multiple readers can access file concurrently."""
-        from runners.gitlab.utils.file_lock import locked_json_read, locked_json_write
-
-        data_file = tmp_path / "readers.json"
-        locked_json_write(data_file, {"value": 42})
-
-        results = []
-
-        def read_value():
-            data = locked_json_read(data_file)
-            results.append(data["value"])
-
-        threads = [threading.Thread(target=read_value) for _ in range(5)]
-
-        for t in threads:
-            t.start()
-
-        for t in threads:
-            t.join()
-
-        assert len(results) == 5
-        assert all(r == 42 for r in results)
-
-    def test_writers_exclusive(self, tmp_path):
-        """Test writers have exclusive access."""
-        from runners.gitlab.utils.file_lock import (
-            locked_json_read,
-            locked_json_update,
-            locked_json_write,
-        )
-
-        data_file = tmp_path / "writers.json"
-        locked_json_write(data_file, {"counter": 0})
-
-        results = []
-
-        def increment():
-            def updater(data):
-                data["counter"] += 1
-                return data
-
-            locked_json_update(data_file, updater)
-            result = locked_json_read(data_file)
-            results.append(result["counter"])
-
-        threads = [threading.Thread(target=increment) for _ in range(10)]
-
-        for t in threads:
-            t.start()
-
-        for t in threads:
-            t.join()
-
-        # All increments should be applied
-        final = locked_json_read(data_file)
-        assert final["counter"] == 10
-        assert len(results) == 10
-
-    def test_reader_writer_conflict(self, tmp_path):
-        """Test readers and writers don't conflict."""
-        from runners.gitlab.utils.file_lock import (
-            locked_json_read,
-            locked_json_update,
-            locked_json_write,
-        )
-
-        data_file = tmp_path / "rw.json"
-        locked_json_write(data_file, {"reads": 0, "writes": 0})
-
-        read_results = []
-
-        def reader():
-            for _ in range(10):
-                data = locked_json_read(data_file)
-                read_results.append(data["reads"])
-
-        def writer():
-            for _ in range(5):
-
-                def updater(data):
-                    data["writes"] += 1
-                    return data
-
-                locked_json_update(data_file, updater)
-
-        threads = [
-            threading.Thread(target=reader),
-            threading.Thread(target=writer),
-        ]
-
-        for t in threads:
-            t.start()
-
-        for t in threads:
-            t.join()
-
-        # All operations should complete
-        final = locked_json_read(data_file)
-        assert final["writes"] == 5
-        assert len(read_results) == 10

apps/backend/__tests__/test_gitlab_file_operations.py

@@ -1,281 +0,0 @@
-"""
-Tests for GitLab File Operations
-===================================
-
-Tests for file content retrieval, creation, updating, and deletion.
-"""
-
-from pathlib import Path
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-try:
-    from runners.gitlab.glab_client import GitLabClient, GitLabConfig
-except ImportError:
-    from glab_client import GitLabClient, GitLabConfig
-
-
-@pytest.fixture
-def mock_config():
-    """Create a mock GitLab config."""
-    return GitLabConfig(
-        token="test-token",
-        project="namespace/test-project",
-        instance_url="https://gitlab.example.com",
-    )
-
-
-@pytest.fixture
-def client(mock_config, tmp_path):
-    """Create a GitLab client instance."""
-    return GitLabClient(
-        project_dir=tmp_path,
-        config=mock_config,
-    )
-
-
-class TestGetFileContents:
-    """Tests for get_file_contents method."""
-
-    @pytest.mark.asyncio
-    async def test_get_file_contents_current_version(self, client):
-        """Test getting file contents from current HEAD."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "file_name": "test.py",
-                "file_path": "src/test.py",
-                "size": 100,
-                "encoding": "base64",
-                "content": "cHJpbnQoJ2hlbGxvJyk=",  # base64 for "print('hello')"
-                "content_sha256": "abc123",
-                "ref": "main",
-            }
-
-            result = client.get_file_contents("src/test.py")
-
-            assert result["file_name"] == "test.py"
-            assert result["encoding"] == "base64"
-
-    @pytest.mark.asyncio
-    async def test_get_file_contents_with_ref(self, client):
-        """Test getting file contents from specific ref."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "file_name": "config.json",
-                "ref": "develop",
-                "content": "eyJjb25maWciOiB0cnVlfQ==",
-            }
-
-            result = client.get_file_contents("config.json", ref="develop")
-
-            assert result["ref"] == "develop"
-
-    @pytest.mark.asyncio
-    async def test_get_file_contents_async(self, client):
-        """Test async variant of get_file_contents."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "file_name": "test.py",
-                "content": "dGVzdA==",
-            }
-
-            result = await client.get_file_contents_async("test.py")
-
-            assert result["file_name"] == "test.py"
-
-
-class TestCreateFile:
-    """Tests for create_file method."""
-
-    @pytest.mark.asyncio
-    async def test_create_new_file(self, client):
-        """Test creating a new file."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "file_path": "new_file.py",
-                "branch": "main",
-                "commit_id": "abc123",
-            }
-
-            result = client.create_file(
-                file_path="new_file.py",
-                content="print('hello world')",
-                commit_message="Add new file",
-                branch="main",
-            )
-
-            assert result["file_path"] == "new_file.py"
-
-    @pytest.mark.asyncio
-    async def test_create_file_with_author(self, client):
-        """Test creating a file with author information."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "file_path": "authored.py",
-                "commit_id": "def456",
-            }
-
-            result = client.create_file(
-                file_path="authored.py",
-                content="# Author: John Doe",
-                commit_message="Add file",
-                branch="main",
-                author_name="John Doe",
-                author_email="john@example.com",
-            )
-
-            assert result["commit_id"] == "def456"
-
-    @pytest.mark.asyncio
-    async def test_create_file_async(self, client):
-        """Test async variant of create_file."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {"file_path": "async.py"}
-
-            result = await client.create_file_async(
-                file_path="async.py",
-                content="content",
-                commit_message="Add",
-                branch="main",
-            )
-
-            assert result["file_path"] == "async.py"
-
-
-class TestUpdateFile:
-    """Tests for update_file method."""
-
-    @pytest.mark.asyncio
-    async def test_update_existing_file(self, client):
-        """Test updating an existing file."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "file_path": "existing.py",
-                "branch": "main",
-                "commit_id": "ghi789",
-            }
-
-            result = client.update_file(
-                file_path="existing.py",
-                content="updated content",
-                commit_message="Update file",
-                branch="main",
-            )
-
-            assert result["commit_id"] == "ghi789"
-
-    @pytest.mark.asyncio
-    async def test_update_file_with_author(self, client):
-        """Test updating file with author info."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "file_path": "update.py",
-                "commit_id": "jkl012",
-            }
-
-            result = client.update_file(
-                file_path="update.py",
-                content="new content",
-                commit_message="Modify file",
-                branch="develop",
-                author_name="Jane Doe",
-                author_email="jane@example.com",
-            )
-
-            assert result["commit_id"] == "jkl012"
-
-    @pytest.mark.asyncio
-    async def test_update_file_async(self, client):
-        """Test async variant of update_file."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {"file_path": "update.py"}
-
-            result = await client.update_file_async(
-                file_path="update.py",
-                content="new content",
-                commit_message="Update",
-                branch="main",
-            )
-
-            assert result["file_path"] == "update.py"
-
-
-class TestDeleteFile:
-    """Tests for delete_file method."""
-
-    @pytest.mark.asyncio
-    async def test_delete_file(self, client):
-        """Test deleting a file."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "file_path": "old.py",
-                "branch": "main",
-                "commit_id": "mno345",
-            }
-
-            result = client.delete_file(
-                file_path="old.py",
-                commit_message="Remove old file",
-                branch="main",
-            )
-
-            assert result["commit_id"] == "mno345"
-
-    @pytest.mark.asyncio
-    async def test_delete_file_async(self, client):
-        """Test async variant of delete_file."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {"file_path": "delete.py"}
-
-            result = await client.delete_file_async(
-                file_path="delete.py",
-                commit_message="Delete",
-                branch="main",
-            )
-
-            assert result["file_path"] == "delete.py"
-
-
-class TestFileOperationErrors:
-    """Tests for file operation error handling."""
-
-    @pytest.mark.asyncio
-    async def test_get_nonexistent_file(self, client):
-        """Test getting a file that doesn't exist."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.side_effect = Exception("404 File Not Found")
-
-            with pytest.raises(Exception):  # noqa: B017
-                client.get_file_contents("nonexistent.py")
-
-    @pytest.mark.asyncio
-    async def test_create_file_already_exists(self, client):
-        """Test creating a file that already exists."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.side_effect = Exception("400 File already exists")
-
-            with pytest.raises(Exception):  # noqa: B017
-                client.create_file(
-                    file_path="existing.py",
-                    content="content",
-                    commit_message="Add",
-                    branch="main",
-                )
-
-    @pytest.mark.asyncio
-    async def test_delete_nonexistent_file(self, client):
-        """Test deleting a file that doesn't exist."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.side_effect = Exception("404 File Not Found")
-
-            with pytest.raises(Exception):  # noqa: B017
-                client.delete_file(
-                    file_path="nonexistent.py",
-                    commit_message="Delete",
-                    branch="main",
-                )

apps/backend/__tests__/test_gitlab_followup_reviewer.py

@@ -1,455 +0,0 @@
-"""
-Unit Tests for GitLab Follow-up MR Reviewer
-============================================
-
-Tests for FollowupReviewer class.
-"""
-
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-from runners.gitlab.models import (
-    AutoFixState,
-    AutoFixStatus,
-    MergeVerdict,
-    MRReviewFinding,
-    MRReviewResult,
-    ReviewCategory,
-    ReviewSeverity,
-)
-from runners.gitlab.services.followup_reviewer import FollowupReviewer
-
-
-@pytest.fixture
-def mock_client():
-    """Create a mock GitLab client."""
-    client = MagicMock()
-    client.get_mr_async = AsyncMock()
-    client.get_mr_notes_async = AsyncMock()
-    return client
-
-
-@pytest.fixture
-def sample_previous_review():
-    """Create a sample previous review result."""
-    return MRReviewResult(
-        mr_iid=123,
-        project="namespace/project",
-        success=True,
-        findings=[
-            MRReviewFinding(
-                id="finding-1",
-                severity=ReviewSeverity.HIGH,
-                category=ReviewCategory.SECURITY,
-                title="SQL Injection vulnerability",
-                description="User input not sanitized",
-                file="src/api/users.py",
-                line=42,
-                suggested_fix="Use parameterized queries",
-                fixable=True,
-            ),
-            MRReviewFinding(
-                id="finding-2",
-                severity=ReviewSeverity.MEDIUM,
-                category=ReviewCategory.QUALITY,
-                title="Missing error handling",
-                description="No try-except around file I/O",
-                file="src/utils/file.py",
-                line=15,
-                suggested_fix="Add error handling",
-                fixable=True,
-            ),
-        ],
-        summary="Found 2 issues",
-        overall_status="request_changes",
-        verdict=MergeVerdict.NEEDS_REVISION,
-        verdict_reasoning="High severity issues must be resolved",
-        reviewed_commit_sha="abc123def456",
-        reviewed_file_blobs={"src/api/users.py": "blob1", "src/utils/file.py": "blob2"},
-    )
-
-
-@pytest.fixture
-def reviewer(sample_previous_review):
-    """Create a FollowupReviewer instance."""
-    return FollowupReviewer(
-        project_dir="/tmp/project",
-        gitlab_dir="/tmp/project/.auto-claude/gitlab",
-        config=MagicMock(project="namespace/project"),
-        progress_callback=None,
-        use_ai=False,
-    )
-
-
-@pytest.mark.asyncio
-async def test_review_followup_finding_resolved(
-    reviewer, mock_client, sample_previous_review
-):
-    """Test that resolved findings are detected."""
-    from runners.gitlab.models import FollowupMRContext
-
-    # Create context where one finding was resolved
-    context = FollowupMRContext(
-        mr_iid=123,
-        previous_review=sample_previous_review,
-        previous_commit_sha="abc123def456",
-        current_commit_sha="def456abc123",
-        commits_since_review=[
-            {"id": "commit1", "message": "Fix SQL injection"},
-        ],
-        files_changed_since_review=["src/api/users.py"],
-        diff_since_review="diff --git a/src/api/users.py b/src/api/users.py\n"
-        "@@ -40,7 +40,7 @@\n"
-        "-        query = f\"SELECT * FROM users WHERE name='{name}'\"\n"
-        '+        query = "SELECT * FROM users WHERE name=%s"\n'
-        "         cursor.execute(query, (name,))",
-    )
-
-    mock_client.get_mr_notes_async.return_value = []
-
-    result = await reviewer.review_followup(context, mock_client)
-
-    assert result.mr_iid == 123
-    assert len(result.resolved_findings) > 0
-    assert len(result.unresolved_findings) < 2  # At least one resolved
-
-
-@pytest.mark.asyncio
-async def test_review_followup_finding_unresolved(
-    reviewer, mock_client, sample_previous_review
-):
-    """Test that unresolved findings are tracked."""
-    from runners.gitlab.models import FollowupMRContext
-
-    # Create context where findings were not addressed
-    context = FollowupMRContext(
-        mr_iid=123,
-        previous_review=sample_previous_review,
-        previous_commit_sha="abc123def456",
-        current_commit_sha="def456abc123",
-        commits_since_review=[
-            {"id": "commit1", "message": "Update docs"},
-        ],
-        files_changed_since_review=["README.md"],
-        diff_since_review="diff --git a/README.md b/README.md\n+ # Updated docs",
-    )
-
-    mock_client.get_mr_notes_async.return_value = []
-
-    result = await reviewer.review_followup(context, mock_client)
-
-    assert result.mr_iid == 123
-    assert len(result.unresolved_findings) == 2  # Both still unresolved
-
-
-@pytest.mark.asyncio
-async def test_review_followup_new_findings(
-    reviewer, mock_client, sample_previous_review
-):
-    """Test that new issues are detected."""
-    from runners.gitlab.models import FollowupMRContext
-
-    # Create context with TODO comment in diff
-    context = FollowupMRContext(
-        mr_iid=123,
-        previous_review=sample_previous_review,
-        previous_commit_sha="abc123def456",
-        current_commit_sha="def456abc123",
-        commits_since_review=[
-            {"id": "commit1", "message": "Add feature"},
-        ],
-        files_changed_since_review=["src/feature.py"],
-        diff_since_review="diff --git a/src/feature.py b/src/feature.py\n"
-        "--- a/src/feature.py\n"
-        "+++ b/src/feature.py\n"
-        "@@ -0,0 +1,3 @@\n"
-        "+ # TODO: implement error handling\n"
-        "+ def feature():\n"
-        "+     pass",
-    )
-
-    mock_client.get_mr_notes_async.return_value = []
-
-    result = await reviewer.review_followup(context, mock_client)
-
-    # Should detect TODO as new finding
-    assert any(
-        f.id.startswith("followup-todo-") and "todo" in f.title.lower()
-        for f in result.findings
-    )
-
-
-@pytest.mark.asyncio
-async def test_determine_verdict_critical_blocks(reviewer, sample_previous_review):
-    """Test that critical issues block merge."""
-    new_findings = [
-        MRReviewFinding(
-            id="new-1",
-            severity=ReviewSeverity.CRITICAL,
-            category=ReviewCategory.SECURITY,
-            title="Critical security issue",
-            description="Must fix",
-            file="src/file.py",
-            line=1,
-        )
-    ]
-
-    verdict = reviewer._determine_verdict(
-        unresolved=[],
-        new_findings=new_findings,
-        mr_iid=123,
-    )
-
-    assert verdict == MergeVerdict.BLOCKED
-
-
-@pytest.mark.asyncio
-async def test_determine_verdict_high_needs_revision(reviewer, sample_previous_review):
-    """Test that high issues require revision."""
-    new_findings = [
-        MRReviewFinding(
-            id="new-1",
-            severity=ReviewSeverity.HIGH,
-            category=ReviewCategory.SECURITY,
-            title="High severity issue",
-            description="Should fix",
-            file="src/file.py",
-            line=1,
-        )
-    ]
-
-    verdict = reviewer._determine_verdict(
-        unresolved=[],
-        new_findings=new_findings,
-        mr_iid=123,
-    )
-
-    assert verdict == MergeVerdict.NEEDS_REVISION
-
-
-@pytest.mark.asyncio
-async def test_determine_verdict_medium_merge_with_changes(
-    reviewer, sample_previous_review
-):
-    """Test that medium issues suggest merge with changes."""
-    new_findings = [
-        MRReviewFinding(
-            id="new-1",
-            severity=ReviewSeverity.MEDIUM,
-            category=ReviewCategory.QUALITY,
-            title="Medium issue",
-            description="Nice to fix",
-            file="src/file.py",
-            line=1,
-        )
-    ]
-
-    verdict = reviewer._determine_verdict(
-        unresolved=[],
-        new_findings=new_findings,
-        mr_iid=123,
-    )
-
-    assert verdict == MergeVerdict.MERGE_WITH_CHANGES
-
-
-@pytest.mark.asyncio
-async def test_determine_verdict_ready_to_merge(reviewer, sample_previous_review):
-    """Test that low or no issues allow merge."""
-    new_findings = [
-        MRReviewFinding(
-            id="new-1",
-            severity=ReviewSeverity.LOW,
-            category=ReviewCategory.STYLE,
-            title="Style issue",
-            description="Optional fix",
-            file="src/file.py",
-            line=1,
-        )
-    ]
-
-    verdict = reviewer._determine_verdict(
-        unresolved=[],
-        new_findings=new_findings,
-        mr_iid=123,
-    )
-
-    assert verdict == MergeVerdict.READY_TO_MERGE
-
-
-@pytest.mark.asyncio
-async def test_determine_verdict_all_clear(reviewer, sample_previous_review):
-    """Test that no issues allows merge."""
-    verdict = reviewer._determine_verdict(
-        unresolved=[],
-        new_findings=[],
-        mr_iid=123,
-    )
-
-    assert verdict == MergeVerdict.READY_TO_MERGE
-
-
-def test_is_finding_addressed_file_changed(reviewer, sample_previous_review):
-    """Test finding detection when file is changed in the diff region."""
-    diff = (
-        "diff --git a/src/api/users.py b/src/api/users.py\n"
-        "@@ -40,7 +40,7 @@\n"
-        "-        query = f\"SELECT * FROM users WHERE name='{name}'\"\n"
-        '+        query = "SELECT * FROM users WHERE name=%s"\n'
-        "         cursor.execute(query, (name,))"
-    )
-
-    finding = sample_previous_review.findings[0]  # Line 42 in users.py
-
-    result = reviewer._is_finding_addressed(diff, finding)
-
-    assert result is True  # Line 42 is in the changed range (40-47)
-
-
-def test_is_finding_addressed_file_not_changed(reviewer, sample_previous_review):
-    """Test finding detection when file is not in diff."""
-    diff = "diff --git a/README.md b/README.md\n+ # Updated docs"
-
-    finding = sample_previous_review.findings[0]  # users.py
-
-    result = reviewer._is_finding_addressed(diff, finding)
-
-    assert result is False
-
-
-def test_is_finding_addressed_line_not_in_range(reviewer, sample_previous_review):
-    """Test finding detection when line is outside changed range."""
-    diff = (
-        "diff --git a/src/api/users.py b/src/api/users.py\n"
-        "@@ -1,7 +1,7 @@\n"
-        " def hello():\n"
-        "-    print('hello')\n"
-        "+    print('HELLO')\n"
-    )
-
-    finding = sample_previous_review.findings[0]  # Line 42, not in range 1-8
-
-    result = reviewer._is_finding_addressed(diff, finding)
-
-    assert result is False
-
-
-def test_is_finding_addressed_test_pattern_added(reviewer, sample_previous_review):
-    """Test finding detection for test category when tests are added."""
-    diff = (
-        "diff --git a/tests/test_users.py b/tests/test_users.py\n"
-        "+ def test_sql_injection():\n"
-        "+     assert True"
-    )
-
-    test_finding = MRReviewFinding(
-        id="test-1",
-        severity=ReviewSeverity.MEDIUM,
-        category=ReviewCategory.TEST,
-        title="Missing tests",
-        description="Add tests for users module",
-        file="tests/test_users.py",
-        line=1,
-    )
-
-    result = reviewer._is_finding_addressed(diff, test_finding)
-
-    assert result is True  # Pattern matches "+ def test_"
-
-
-def test_is_finding_addressed_doc_pattern_added(reviewer, sample_previous_review):
-    """Test finding detection for documentation category when docs are added."""
-    diff = (
-        "diff --git a/src/api/users.py b/src/api/users.py\n"
-        '+ """\n'
-        "+ User API module.\n"
-        '+ """'
-    )
-
-    doc_finding = MRReviewFinding(
-        id="doc-1",
-        severity=ReviewSeverity.LOW,
-        category=ReviewCategory.DOCS,
-        title="Missing docstring",
-        description="Add module docstring",
-        file="src/api/users.py",
-        line=1,
-    )
-
-    result = reviewer._is_finding_addressed(diff, doc_finding)
-
-    assert result is True  # Pattern matches '+"""'
-
-
-@pytest.mark.asyncio
-async def test_review_comment_question_detection(
-    reviewer, mock_client, sample_previous_review
-):
-    """Test that questions in comments are detected."""
-    from runners.gitlab.models import FollowupMRContext
-
-    context = FollowupMRContext(
-        mr_iid=123,
-        previous_review=sample_previous_review,
-        previous_commit_sha="abc123def456",
-        current_commit_sha="def456abc123",
-        commits_since_review=[{"id": "commit1"}],
-        files_changed_since_review=[],
-        diff_since_review="",
-    )
-
-    mock_client.get_mr_notes_async.return_value = [
-        {
-            "id": 1,
-            "commit_id": "commit1",
-            "author": {"username": "contributor"},
-            "body": "Should we add error handling here?",
-            "created_at": "2024-01-01T00:00:00Z",
-        },
-    ]
-
-    result = await reviewer.review_followup(context, mock_client)
-
-    # Should detect the question
-    assert any("question" in f.title.lower() for f in result.findings)
-
-
-@pytest.mark.asyncio
-async def test_review_comment_filters_by_commit(
-    reviewer, mock_client, sample_previous_review
-):
-    """Test that only comments from new commits are reviewed."""
-    from runners.gitlab.models import FollowupMRContext
-
-    context = FollowupMRContext(
-        mr_iid=123,
-        previous_review=sample_previous_review,
-        previous_commit_sha="abc123def456",
-        current_commit_sha="def456abc123",
-        commits_since_review=[{"id": "commit1"}],
-        files_changed_since_review=[],
-        diff_since_review="",
-    )
-
-    mock_client.get_mr_notes_async.return_value = [
-        {
-            "id": 1,
-            "commit_id": "commit1",  # New commit
-            "author": {"username": "contributor"},
-            "body": "Should we add error handling?",
-            "created_at": "2024-01-01T00:00:00Z",
-        },
-        {
-            "id": 2,
-            "commit_id": "old-commit",  # Old commit, should be ignored
-            "author": {"username": "contributor"},
-            "body": "Another question?",
-            "created_at": "2024-01-01T00:00:00Z",
-        },
-    ]
-
-    result = await reviewer.review_followup(context, mock_client)
-
-    # Should only have one finding from the new commit
-    question_findings = [f for f in result.findings if "question" in f.title.lower()]
-    assert len(question_findings) == 1

apps/backend/__tests__/test_gitlab_mr_e2e.py

@@ -1,566 +0,0 @@
-"""
-GitLab MR E2E Tests
-===================
-
-End-to-end tests for MR review lifecycle.
-"""
-
-import json
-from datetime import datetime, timezone
-from pathlib import Path
-from unittest.mock import AsyncMock, MagicMock, Mock, patch
-
-import pytest
-from __tests__.fixtures.gitlab import (
-    MOCK_GITLAB_CONFIG,
-    mock_mr_changes,
-    mock_mr_commits,
-    mock_mr_data,
-    mock_pipeline_data,
-    mock_pipeline_jobs,
-)
-
-
-class TestMREndToEnd:
-    """End-to-end MR review lifecycle tests."""
-
-    @pytest.fixture
-    def mock_orchestrator(self, tmp_path):
-        """Create a mock orchestrator for testing."""
-        from runners.gitlab.models import GitLabRunnerConfig
-        from runners.gitlab.orchestrator import GitLabOrchestrator
-
-        config = GitLabRunnerConfig(
-            token="test-token",
-            project="group/project",
-            instance_url="https://gitlab.example.com",
-            model="claude-sonnet-4-20250514",
-        )
-
-        with patch("runners.gitlab.orchestrator.GitLabClient"):
-            orchestrator = GitLabOrchestrator(
-                project_dir=tmp_path,
-                config=config,
-                enable_bot_detection=False,
-                enable_ci_checking=False,
-            )
-            return orchestrator
-
-    @pytest.mark.asyncio
-    async def test_full_mr_review_lifecycle(self, mock_orchestrator):
-        """Test complete MR review from start to finish."""
-        # Mock MR data
-        mock_orchestrator.client.get_mr_async.return_value = mock_mr_data()
-        mock_orchestrator.client.get_mr_commits_async.return_value = mock_mr_commits()
-        mock_orchestrator.client.get_mr_changes_async.return_value = mock_mr_changes()
-
-        # Mock review engine
-        with patch(
-            "runners.gitlab.services.context_gatherer.MRContextGatherer"
-        ) as mock_gatherer:
-            from runners.gitlab.models import (
-                MergeVerdict,
-                MRContext,
-                MRReviewFinding,
-                ReviewCategory,
-                ReviewSeverity,
-            )
-
-            mock_gatherer.return_value.gather.return_value = MRContext(
-                mr_iid=123,
-                title="Add feature",
-                description="Implementation",
-                author="john_doe",
-                source_branch="feature",
-                target_branch="main",
-                state="opened",
-                changed_files=[],
-                diff="",
-                commits=[],
-            )
-
-            # Mock review engine to return findings
-            with patch("runners.gitlab.services.MRReviewEngine") as mock_engine:
-                findings = [
-                    MRReviewFinding(
-                        id="find-1",
-                        severity=ReviewSeverity.MEDIUM,
-                        category=ReviewCategory.QUALITY,
-                        title="Code style",
-                        description="Fix formatting",
-                        file="file.py",
-                        line=10,
-                    )
-                ]
-
-                mock_engine.return_value.run_review.return_value = (
-                    findings,
-                    MergeVerdict.MERGE_WITH_CHANGES,
-                    "Consider the suggestions",
-                    [],
-                )
-
-                result = await mock_orchestrator.review_mr(123)
-
-        assert result.success is True
-        assert result.mr_iid == 123
-        assert len(result.findings) == 1
-        assert result.verdict == MergeVerdict.MERGE_WITH_CHANGES
-
-    @pytest.mark.asyncio
-    async def test_mr_review_with_ci_failure(self, mock_orchestrator):
-        """Test MR review blocked by CI failure."""
-        from runners.gitlab.services.ci_checker import PipelineInfo, PipelineStatus
-
-        # Setup CI failure
-        with patch("runners.gitlab.orchestrator.MRContextGatherer"):
-            with patch("runners.gitlab.services.ci_checker.CIChecker") as mock_checker:
-                pipeline_info = PipelineInfo(
-                    pipeline_id=1001,
-                    status=PipelineStatus.FAILED,
-                    ref="feature",
-                    sha="abc123",
-                    created_at="2025-01-14T10:00:00",
-                    updated_at="2025-01-14T10:05:00",
-                    failed_jobs=[
-                        Mock(
-                            status="failed",
-                            name="test",
-                            stage="test",
-                            failure_reason="Assert failed",
-                        )
-                    ],
-                )
-
-                mock_checker.return_value.check_mr_pipeline.return_value = pipeline_info
-                mock_checker.return_value.get_blocking_reason.return_value = (
-                    "Test job failed"
-                )
-                mock_checker.return_value.format_pipeline_summary.return_value = (
-                    "CI Failed"
-                )
-
-                mock_orchestrator.client.get_mr_async.return_value = mock_mr_data()
-                mock_orchestrator.client.get_mr_commits_async.return_value = []
-
-                with patch("runners.gitlab.services.MRReviewEngine") as mock_engine:
-                    from runners.gitlab.models import MergeVerdict
-
-                    mock_engine.return_value.run_review.return_value = (
-                        [],
-                        MergeVerdict.READY_TO_MERGE,
-                        "Looks good",
-                        [],
-                    )
-
-                    result = await mock_orchestrator.review_mr(123)
-
-        assert result.ci_status == "failed"
-        assert result.ci_pipeline_id == 1001
-        assert "CI" in result.summary
-
-    @pytest.mark.asyncio
-    async def test_followup_review_lifecycle(self, mock_orchestrator):
-        """Test follow-up review after initial review."""
-        from runners.gitlab.models import MergeVerdict, MRReviewResult
-
-        # Create initial review
-        initial_review = MRReviewResult(
-            mr_iid=123,
-            project="group/project",
-            success=True,
-            findings=[
-                Mock(id="find-1", title="Fix bug"),
-                Mock(id="find-2", title="Add tests"),
-            ],
-            reviewed_commit_sha="abc123",
-            verdict=MergeVerdict.NEEDS_REVISION,
-            verdict_reasoning="Issues found",
-            blockers=["find-1"],
-        )
-
-        # Save initial review
-        initial_review.save(mock_orchestrator.gitlab_dir)
-
-        # Mock new commits
-        new_commits = mock_mr_commits() + [
-            {
-                "id": "new456",
-                "sha": "new456",
-                "message": "Fix the issues",
-            }
-        ]
-
-        mock_orchestrator.client.get_mr_async.return_value = mock_mr_data()
-        mock_orchestrator.client.get_mr_commits_async.return_value = new_commits
-
-        # Mock follow-up review
-        with patch("runners.gitlab.orchestrator.MRContextGatherer"):
-            with patch("runners.gitlab.services.MRReviewEngine") as mock_engine:
-                mock_engine.return_value.run_review.return_value = (
-                    [],  # No new findings
-                    MergeVerdict.READY_TO_MERGE,
-                    "All fixed",
-                    [],
-                )
-
-                result = await mock_orchestrator.followup_review_mr(123)
-
-        assert result.is_followup_review is True
-        assert result.reviewed_commit_sha == "new456"
-
-    @pytest.mark.asyncio
-    async def test_bot_detection_skips_review(self, tmp_path):
-        """Test bot detection skips bot-authored MRs."""
-        from runners.gitlab.models import GitLabRunnerConfig
-        from runners.gitlab.orchestrator import GitLabOrchestrator
-
-        config = GitLabRunnerConfig(
-            token="test-token",
-            project="group/project",
-        )
-
-        with patch("runners.gitlab.orchestrator.GitLabClient"):
-            orchestrator = GitLabOrchestrator(
-                project_dir=tmp_path,
-                config=config,
-                bot_username="auto-claude-bot",
-            )
-
-            # Bot-authored MR
-            bot_mr = mock_mr_data(author="auto-claude-bot")
-            orchestrator.client.get_mr_async.return_value = bot_mr
-            orchestrator.client.get_mr_commits_async.return_value = []
-
-            result = await orchestrator.review_mr(123)
-
-        assert result.success is False
-        assert "bot" in result.error.lower()
-
-    @pytest.mark.asyncio
-    async def test_cooling_off_prevents_re_review(self, tmp_path):
-        """Test cooling off period prevents immediate re-review."""
-        from runners.gitlab.models import GitLabRunnerConfig
-        from runners.gitlab.orchestrator import GitLabOrchestrator
-
-        config = GitLabRunnerConfig(
-            token="test-token",
-            project="group/project",
-        )
-
-        with patch("runners.gitlab.orchestrator.GitLabClient"):
-            orchestrator = GitLabOrchestrator(
-                project_dir=tmp_path,
-                config=config,
-            )
-
-            # First review
-            orchestrator.client.get_mr_async.return_value = mock_mr_data()
-            orchestrator.client.get_mr_commits_async.return_value = mock_mr_commits()
-
-            with patch("runners.gitlab.orchestrator.MRContextGatherer"):
-                with patch("runners.gitlab.services.MRReviewEngine") as mock_engine:
-                    from runners.gitlab.models import MergeVerdict
-
-                    mock_engine.return_value.run_review.return_value = (
-                        [],
-                        MergeVerdict.READY_TO_MERGE,
-                        "Good",
-                        [],
-                    )
-
-                    result1 = await orchestrator.review_mr(123)
-
-            assert result1.success is True
-
-            # Immediate second review should be skipped
-            result2 = await orchestrator.review_mr(123)
-
-        assert result2.success is False
-        assert "cooling" in result2.error.lower()
-
-
-class TestMRReviewEngineIntegration:
-    """Test MR review engine integration."""
-
-    @pytest.fixture
-    def engine(self, tmp_path):
-        """Create review engine for testing."""
-        from runners.gitlab.models import GitLabRunnerConfig
-        from runners.gitlab.services.mr_review_engine import MRReviewEngine
-
-        config = GitLabRunnerConfig(
-            token="test-token",
-            project="group/project",
-        )
-
-        gitlab_dir = tmp_path / ".auto-claude" / "gitlab"
-        gitlab_dir.mkdir(parents=True, exist_ok=True)
-
-        return MRReviewEngine(
-            project_dir=tmp_path,
-            gitlab_dir=gitlab_dir,
-            config=config,
-        )
-
-    def test_engine_initialization(self, engine):
-        """Test engine initializes correctly."""
-        assert engine.project_dir
-        assert engine.gitlab_dir
-        assert engine.config
-
-    def test_generate_summary(self, engine):
-        """Test summary generation."""
-        from runners.gitlab.models import (
-            MergeVerdict,
-            MRReviewFinding,
-            ReviewCategory,
-            ReviewSeverity,
-        )
-
-        findings = [
-            MRReviewFinding(
-                id="find-1",
-                severity=ReviewSeverity.CRITICAL,
-                category=ReviewCategory.SECURITY,
-                title="SQL injection",
-                description="Vulnerability",
-                file="file.py",
-                line=10,
-            ),
-            MRReviewFinding(
-                id="find-2",
-                severity=ReviewSeverity.LOW,
-                category=ReviewCategory.STYLE,
-                title="Formatting",
-                description="Style issue",
-                file="file.py",
-                line=20,
-            ),
-        ]
-
-        summary = engine.generate_summary(
-            findings=findings,
-            verdict=MergeVerdict.BLOCKED,
-            verdict_reasoning="Critical security issue",
-            blockers=["SQL injection"],
-        )
-
-        assert "BLOCKED" in summary
-        assert "SQL injection" in summary
-        assert "Critical" in summary
-
-
-class TestMRContextGatherer:
-    """Test MR context gatherer."""
-
-    @pytest.fixture
-    def gatherer(self, tmp_path):
-        """Create context gatherer for testing."""
-        from runners.gitlab.glab_client import GitLabConfig
-        from runners.gitlab.services.context_gatherer import MRContextGatherer
-
-        config = GitLabConfig(
-            token="test-token",
-            project="group/project",
-            instance_url="https://gitlab.example.com",
-        )
-
-        with patch("runners.gitlab.services.context_gatherer.GitLabClient"):
-            return MRContextGatherer(
-                project_dir=tmp_path,
-                mr_iid=123,
-                config=config,
-            )
-
-    @pytest.mark.asyncio
-    async def test_gather_context(self, gatherer):
-        """Test gathering MR context."""
-        from runners.gitlab.models import MRContext
-
-        # Mock client responses
-        gatherer.client.get_mr_async.return_value = mock_mr_data()
-        gatherer.client.get_mr_changes_async.return_value = mock_mr_changes()
-        gatherer.client.get_mr_commits_async.return_value = mock_mr_commits()
-        gatherer.client.get_mr_notes_async.return_value = []
-
-        context = await gatherer.gather()
-
-        assert isinstance(context, MRContext)
-        assert context.mr_iid == 123
-        assert context.title == "Add user authentication feature"
-        assert context.author == "john_doe"
-
-    @pytest.mark.asyncio
-    async def test_gather_ai_bot_comments(self, gatherer):
-        """Test gathering AI bot comments."""
-        # Mock AI bot comments
-        ai_notes = [
-            {
-                "id": 1001,
-                "author": {"username": "coderabbit[bot]"},
-                "body": "Consider adding error handling",
-                "created_at": "2025-01-14T10:00:00",
-            },
-            {
-                "id": 1002,
-                "author": {"username": "human_user"},
-                "body": "Regular comment",
-                "created_at": "2025-01-14T11:00:00",
-            },
-        ]
-
-        gatherer.client.get_mr_notes_async.return_value = ai_notes
-
-        # First call should parse comments
-        from runners.gitlab.services.context_gatherer import AIBotComment
-
-        # Note: _fetch_ai_bot_comments is called internally during gather()
-        gatherer.client.get_mr_async.return_value = mock_mr_data()
-        gatherer.client.get_mr_changes_async.return_value = mock_mr_changes()
-        gatherer.client.get_mr_commits_async.return_value = mock_mr_commits()
-
-        context = await gatherer.gather()
-
-        # Verify AI bot comments were detected (context would have them if implemented)
-        assert context.mr_iid == 123
-
-
-class TestFollowupContextGatherer:
-    """Test follow-up context gatherer."""
-
-    @pytest.fixture
-    def previous_review(self):
-        """Create a previous review for testing."""
-        from runners.gitlab.models import MergeVerdict, MRReviewResult
-
-        return MRReviewResult(
-            mr_iid=123,
-            project="group/project",
-            success=True,
-            findings=[
-                Mock(id="find-1", title="Bug"),
-            ],
-            reviewed_commit_sha="abc123",
-            verdict=MergeVerdict.NEEDS_REVISION,
-            verdict_reasoning="Issues found",
-            blockers=[],
-        )
-
-    @pytest.fixture
-    def gatherer(self, tmp_path, previous_review):
-        """Create follow-up context gatherer."""
-        from runners.gitlab.glab_client import GitLabConfig
-        from runners.gitlab.services.context_gatherer import FollowupMRContextGatherer
-
-        config = GitLabConfig(
-            token="test-token",
-            project="group/project",
-            instance_url="https://gitlab.example.com",
-        )
-
-        with patch("runners.gitlab.services.context_gatherer.GitLabClient"):
-            return FollowupMRContextGatherer(
-                project_dir=tmp_path,
-                mr_iid=123,
-                previous_review=previous_review,
-                config=config,
-            )
-
-    @pytest.mark.asyncio
-    async def test_gather_followup_context(self, gatherer):
-        """Test gathering follow-up context."""
-        from runners.gitlab.models import FollowupMRContext
-
-        # Mock new commits since previous review
-        new_commits = [
-            {
-                "id": "new456",
-                "sha": "new456",
-                "message": "Fix bug",
-            }
-        ]
-
-        gatherer.client.get_mr_async.return_value = mock_mr_data()
-        gatherer.client.get_mr_commits_async.return_value = new_commits
-        gatherer.client.get_mr_changes_async.return_value = mock_mr_changes()
-
-        context = await gatherer.gather()
-
-        assert isinstance(context, FollowupMRContext)
-        assert context.mr_iid == 123
-        assert context.previous_commit_sha == "abc123"
-        assert context.current_commit_sha == "new456"
-        assert len(context.commits_since_review) == 1
-
-    @pytest.mark.asyncio
-    async def test_no_new_commits(self, gatherer):
-        """Test follow-up when no new commits."""
-        from runners.gitlab.models import FollowupMRContext
-
-        # Same commits as previous review
-        gatherer.client.get_mr_async.return_value = mock_mr_data()
-        gatherer.client.get_mr_commits_async.return_value = mock_mr_commits()
-        gatherer.client.get_mr_changes_async.return_value = mock_mr_changes()
-
-        context = await gatherer.gather()
-
-        assert context.current_commit_sha == "abc123"  # Same as previous
-
-
-class TestAIBotComment:
-    """Test AI bot comment detection."""
-
-    def test_parse_coderabbit_comment(self):
-        """Test parsing CodeRabbit comment."""
-        from runners.gitlab.services.context_gatherer import AIBotComment
-
-        note = {
-            "id": 1001,
-            "author": {"username": "coderabbit[bot]"},
-            "body": "Add error handling",
-            "created_at": "2025-01-14T10:00:00",
-        }
-
-        from runners.gitlab.services.context_gatherer import MRContextGatherer
-
-        gatherer_class = MRContextGatherer.__class__
-
-        comment = gatherer_class._parse_ai_comment(None, note)
-
-        assert comment is not None
-        assert comment.tool_name == "CodeRabbit"
-        assert comment.comment_id == 1001
-
-    def test_parse_human_comment(self):
-        """Test human comment is not detected as AI."""
-        from runners.gitlab.services.context_gatherer import MRContextGatherer
-
-        note = {
-            "id": 1002,
-            "author": {"username": "john_doe"},
-            "body": "Regular comment",
-            "created_at": "2025-01-14T10:00:00",
-        }
-
-        comment = MRContextGatherer._parse_ai_comment(None, note)
-
-        assert comment is None
-
-    def test_parse_greptile_comment(self):
-        """Test parsing Greptile comment."""
-        from runners.gitlab.services.context_gatherer import AIBotComment
-
-        note = {
-            "id": 1003,
-            "author": {"username": "greptile[bot]"},
-            "body": "Consider this",
-            "created_at": "2025-01-14T10:00:00",
-        }
-
-        from runners.gitlab.services.context_gatherer import MRContextGatherer
-
-        comment = MRContextGatherer._parse_ai_comment(None, note)
-
-        assert comment is not None
-        assert comment.tool_name == "Greptile"

apps/backend/__tests__/test_gitlab_mr_review.py

@@ -1,514 +0,0 @@
-"""
-GitLab MR Review Tests
-======================
-
-Tests for MR review models, findings, verdicts.
-"""
-
-import json
-from datetime import datetime, timezone
-from pathlib import Path
-from unittest.mock import MagicMock, Mock, patch
-
-import pytest
-from __tests__.fixtures.gitlab import (
-    MOCK_GITLAB_CONFIG,
-    mock_issue_data,
-    mock_mr_data,
-)
-
-
-class TestMRReviewFinding:
-    """Test MRReviewFinding model."""
-
-    def test_finding_creation(self):
-        """Test creating a review finding."""
-        from runners.gitlab.models import (
-            MRReviewFinding,
-            ReviewCategory,
-            ReviewSeverity,
-        )
-
-        finding = MRReviewFinding(
-            id="find-1",
-            severity=ReviewSeverity.HIGH,
-            category=ReviewCategory.SECURITY,
-            title="SQL injection vulnerability",
-            description="User input not sanitized in query",
-            file="src/auth.py",
-            line=42,
-            end_line=45,
-            suggested_fix="Use parameterized query",
-            fixable=True,
-        )
-
-        assert finding.id == "find-1"
-        assert finding.severity == ReviewSeverity.HIGH
-        assert finding.category == ReviewCategory.SECURITY
-        assert finding.file == "src/auth.py"
-        assert finding.line == 42
-        assert finding.fixable is True
-
-    def test_finding_to_dict(self):
-        """Test converting finding to dictionary."""
-        from runners.gitlab.models import (
-            MRReviewFinding,
-            ReviewCategory,
-            ReviewSeverity,
-        )
-
-        finding = MRReviewFinding(
-            id="find-1",
-            severity=ReviewSeverity.HIGH,
-            category=ReviewCategory.SECURITY,
-            title="SQL injection",
-            description="Vulnerability",
-            file="src/auth.py",
-            line=42,
-        )
-
-        data = finding.to_dict()
-
-        assert data["id"] == "find-1"
-        assert data["severity"] == "high"
-        assert data["category"] == "security"
-
-    def test_finding_from_dict(self):
-        """Test loading finding from dictionary."""
-        from runners.gitlab.models import MRReviewFinding
-
-        data = {
-            "id": "find-1",
-            "severity": "high",
-            "category": "security",
-            "title": "SQL injection",
-            "description": "Vulnerability",
-            "file": "src/auth.py",
-            "line": 42,
-            "end_line": 45,
-            "suggested_fix": "Fix it",
-            "fixable": True,
-        }
-
-        finding = MRReviewFinding.from_dict(data)
-
-        assert finding.id == "find-1"
-        assert finding.severity.value == "high"
-        assert finding.line == 42
-
-    def test_finding_with_evidence_code(self):
-        """Test finding with evidence code."""
-        from runners.gitlab.models import (
-            MRReviewFinding,
-            ReviewCategory,
-            ReviewPass,
-            ReviewSeverity,
-        )
-
-        finding = MRReviewFinding(
-            id="find-1",
-            severity=ReviewSeverity.CRITICAL,
-            category=ReviewCategory.SECURITY,
-            title="Command injection",
-            description="User input in subprocess",
-            file="src/exec.py",
-            line=10,
-            evidence_code="subprocess.call(user_input, shell=True)",
-            found_by_pass=ReviewPass.SECURITY,
-        )
-
-        assert finding.evidence_code == "subprocess.call(user_input, shell=True)"
-        assert finding.found_by_pass == ReviewPass.SECURITY
-
-
-class TestStructuralIssue:
-    """Test StructuralIssue model."""
-
-    def test_structural_issue_creation(self):
-        """Test creating a structural issue."""
-        from runners.gitlab.models import ReviewSeverity, StructuralIssue
-
-        issue = StructuralIssue(
-            id="struct-1",
-            type="feature_creep",
-            title="Additional features added",
-            description="MR includes features beyond original scope",
-            severity=ReviewSeverity.MEDIUM,
-            files_affected=["src/auth.py", "src/users.py"],
-        )
-
-        assert issue.id == "struct-1"
-        assert issue.type == "feature_creep"
-        assert issue.files_affected == ["src/auth.py", "src/users.py"]
-
-    def test_structural_issue_to_dict(self):
-        """Test converting structural issue to dictionary."""
-        from runners.gitlab.models import StructuralIssue
-
-        issue = StructuralIssue(
-            id="struct-1",
-            type="scope_change",
-            title="Scope increased",
-            description="MR scope changed significantly",
-            files_affected=["file1.py"],
-        )
-
-        data = issue.to_dict()
-
-        assert data["id"] == "struct-1"
-        assert data["type"] == "scope_change"
-
-    def test_structural_issue_from_dict(self):
-        """Test loading structural issue from dictionary."""
-        from runners.gitlab.models import StructuralIssue
-
-        data = {
-            "id": "struct-1",
-            "type": "feature_creep",
-            "title": "Extra features",
-            "description": "Beyond scope",
-            "severity": "medium",
-            "files_affected": ["file.py"],
-        }
-
-        issue = StructuralIssue.from_dict(data)
-
-        assert issue.type == "feature_creep"
-
-
-class TestAICommentTriage:
-    """Test AICommentTriage model."""
-
-    def test_triage_creation(self):
-        """Test creating AI comment triage."""
-        from runners.gitlab.models import AICommentTriage
-
-        triage = AICommentTriage(
-            comment_id=1001,
-            tool_name="CodeRabbit",
-            original_comment="Consider adding error handling",
-            triage_result="valid",
-            reasoning="Good point about error handling",
-            file="src/auth.py",
-            line=50,
-            created_at="2025-01-14T10:00:00",
-        )
-
-        assert triage.comment_id == 1001
-        assert triage.tool_name == "CodeRabbit"
-        assert triage.triage_result == "valid"
-
-    def test_triage_to_dict(self):
-        """Test converting triage to dictionary."""
-        from runners.gitlab.models import AICommentTriage
-
-        triage = AICommentTriage(
-            comment_id=1001,
-            tool_name="CodeRabbit",
-            original_comment="Add tests",
-            triage_result="false_positive",
-            reasoning="Tests already exist",
-        )
-
-        data = triage.to_dict()
-
-        assert data["comment_id"] == 1001
-        assert data["triage_result"] == "false_positive"
-
-    def test_triage_from_dict(self):
-        """Test loading triage from dictionary."""
-        from runners.gitlab.models import AICommentTriage
-
-        data = {
-            "comment_id": 1001,
-            "tool_name": "Cursor",
-            "original_comment": "Fix bug",
-            "triage_result": "questionable",
-            "reasoning": "Unclear if bug exists",
-            "file": "file.py",
-            "line": 10,
-        }
-
-        triage = AICommentTriage.from_dict(data)
-
-        assert triage.tool_name == "Cursor"
-        assert triage.triage_result == "questionable"
-
-
-class TestMRReviewResult:
-    """Test MRReviewResult model."""
-
-    def test_result_creation(self):
-        """Test creating review result."""
-        from runners.gitlab.models import (
-            MergeVerdict,
-            MRReviewFinding,
-            MRReviewResult,
-            ReviewCategory,
-            ReviewSeverity,
-        )
-
-        findings = [
-            MRReviewFinding(
-                id="find-1",
-                severity=ReviewSeverity.HIGH,
-                category=ReviewCategory.SECURITY,
-                title="Bug",
-                description="Issue",
-                file="file.py",
-                line=1,
-            )
-        ]
-
-        result = MRReviewResult(
-            mr_iid=123,
-            project="group/project",
-            success=True,
-            findings=findings,
-            summary="Review complete",
-            overall_status="approve",
-            verdict=MergeVerdict.READY_TO_MERGE,
-            verdict_reasoning="No issues found",
-            blockers=[],
-        )
-
-        assert result.mr_iid == 123
-        assert result.findings == findings
-        assert result.verdict == MergeVerdict.READY_TO_MERGE
-
-    def test_result_with_structural_issues(self):
-        """Test result with structural issues."""
-        from runners.gitlab.models import (
-            MergeVerdict,
-            MRReviewResult,
-            StructuralIssue,
-        )
-
-        structural_issues = [
-            StructuralIssue(
-                id="struct-1",
-                type="feature_creep",
-                title="Extra features",
-                description="Beyond scope",
-            )
-        ]
-
-        result = MRReviewResult(
-            mr_iid=123,
-            project="group/project",
-            success=True,
-            structural_issues=structural_issues,
-            verdict=MergeVerdict.MERGE_WITH_CHANGES,
-            verdict_reasoning="Feature creep detected",
-            blockers=[],
-        )
-
-        assert len(result.structural_issues) == 1
-        assert result.verdict == MergeVerdict.MERGE_WITH_CHANGES
-
-    def test_result_with_ai_triages(self):
-        """Test result with AI comment triages."""
-        from runners.gitlab.models import (
-            AICommentTriage,
-            MergeVerdict,
-            MRReviewResult,
-        )
-
-        ai_triages = [
-            AICommentTriage(
-                comment_id=1001,
-                tool_name="CodeRabbit",
-                original_comment="Fix bug",
-                triage_result="valid",
-                reasoning="Correct",
-            )
-        ]
-
-        result = MRReviewResult(
-            mr_iid=123,
-            project="group/project",
-            success=True,
-            ai_triages=ai_triages,
-            verdict=MergeVerdict.READY_TO_MERGE,
-            verdict_reasoning="All good",
-            blockers=[],
-        )
-
-        assert len(result.ai_triages) == 1
-
-    def test_result_with_ci_status(self):
-        """Test result with CI/CD status."""
-        from runners.gitlab.models import MergeVerdict, MRReviewResult
-
-        result = MRReviewResult(
-            mr_iid=123,
-            project="group/project",
-            success=True,
-            ci_status="failed",
-            ci_pipeline_id=1001,
-            verdict=MergeVerdict.BLOCKED,
-            verdict_reasoning="CI failed",
-            blockers=["CI Pipeline Failed"],
-        )
-
-        assert result.ci_status == "failed"
-        assert result.ci_pipeline_id == 1001
-        assert result.verdict == MergeVerdict.BLOCKED
-
-    def test_result_to_dict(self):
-        """Test converting result to dictionary."""
-        from runners.gitlab.models import MergeVerdict, MRReviewResult
-
-        result = MRReviewResult(
-            mr_iid=123,
-            project="group/project",
-            success=True,
-            verdict=MergeVerdict.READY_TO_MERGE,
-            verdict_reasoning="Good",
-            blockers=[],
-        )
-
-        data = result.to_dict()
-
-        assert data["mr_iid"] == 123
-        assert data["verdict"] == "ready_to_merge"
-
-    def test_result_from_dict(self):
-        """Test loading result from dictionary."""
-        from runners.gitlab.models import MergeVerdict, MRReviewResult
-
-        data = {
-            "mr_iid": 123,
-            "project": "group/project",
-            "success": True,
-            "findings": [],
-            "summary": "Review",
-            "overall_status": "approve",
-            "verdict": "ready_to_merge",
-            "verdict_reasoning": "Good",
-            "blockers": [],
-        }
-
-        result = MRReviewResult.from_dict(data)
-
-        assert result.mr_iid == 123
-        assert result.verdict == MergeVerdict.READY_TO_MERGE
-
-    def test_result_save_and_load(self, tmp_path):
-        """Test saving and loading result from disk."""
-        from runners.gitlab.models import MergeVerdict, MRReviewResult
-
-        result = MRReviewResult(
-            mr_iid=123,
-            project="group/project",
-            success=True,
-            verdict=MergeVerdict.READY_TO_MERGE,
-            verdict_reasoning="Good",
-            blockers=[],
-        )
-
-        result.save(tmp_path)
-
-        loaded = MRReviewResult.load(tmp_path, 123)
-
-        assert loaded is not None
-        assert loaded.mr_iid == 123
-
-    def test_followup_review_fields(self):
-        """Test follow-up review fields."""
-        from runners.gitlab.models import MergeVerdict, MRReviewResult
-
-        result = MRReviewResult(
-            mr_iid=123,
-            project="group/project",
-            success=True,
-            is_followup_review=True,
-            reviewed_commit_sha="abc123",
-            resolved_findings=["find-1"],
-            unresolved_findings=["find-2"],
-            new_findings_since_last_review=["find-3"],
-            verdict=MergeVerdict.READY_TO_MERGE,
-            verdict_reasoning="Good",
-            blockers=[],
-        )
-
-        assert result.is_followup_review is True
-        assert result.reviewed_commit_sha == "abc123"
-        assert len(result.resolved_findings) == 1
-
-
-class TestReviewPass:
-    """Test ReviewPass enum."""
-
-    def test_all_passes_defined(self):
-        """Test all review passes are defined."""
-        from runners.gitlab.models import ReviewPass
-
-        assert ReviewPass.QUICK_SCAN
-        assert ReviewPass.SECURITY
-        assert ReviewPass.QUALITY
-        assert ReviewPass.DEEP_ANALYSIS
-        assert ReviewPass.STRUCTURAL
-        assert ReviewPass.AI_COMMENT_TRIAGE
-
-    def test_pass_values(self):
-        """Test pass enum values."""
-        from runners.gitlab.models import ReviewPass
-
-        assert ReviewPass.QUICK_SCAN.value == "quick_scan"
-        assert ReviewPass.SECURITY.value == "security"
-        assert ReviewPass.QUALITY.value == "quality"
-        assert ReviewPass.DEEP_ANALYSIS.value == "deep_analysis"
-        assert ReviewPass.STRUCTURAL.value == "structural"
-        assert ReviewPass.AI_COMMENT_TRIAGE.value == "ai_comment_triage"
-
-
-class TestMergeVerdict:
-    """Test MergeVerdict enum."""
-
-    def test_all_verdicts_defined(self):
-        """Test all verdicts are defined."""
-        from runners.gitlab.models import MergeVerdict
-
-        assert MergeVerdict.READY_TO_MERGE
-        assert MergeVerdict.MERGE_WITH_CHANGES
-        assert MergeVerdict.NEEDS_REVISION
-        assert MergeVerdict.BLOCKED
-
-    def test_verdict_values(self):
-        """Test verdict enum values."""
-        from runners.gitlab.models import MergeVerdict
-
-        assert MergeVerdict.READY_TO_MERGE.value == "ready_to_merge"
-        assert MergeVerdict.MERGE_WITH_CHANGES.value == "merge_with_changes"
-        assert MergeVerdict.NEEDS_REVISION.value == "needs_revision"
-        assert MergeVerdict.BLOCKED.value == "blocked"
-
-
-class TestReviewSeverity:
-    """Test ReviewSeverity enum."""
-
-    def test_all_severities(self):
-        """Test all severity levels."""
-        from runners.gitlab.models import ReviewSeverity
-
-        assert ReviewSeverity.CRITICAL
-        assert ReviewSeverity.HIGH
-        assert ReviewSeverity.MEDIUM
-        assert ReviewSeverity.LOW
-
-
-class TestReviewCategory:
-    """Test ReviewCategory enum."""
-
-    def test_all_categories(self):
-        """Test all categories."""
-        from runners.gitlab.models import ReviewCategory
-
-        assert ReviewCategory.SECURITY
-        assert ReviewCategory.QUALITY
-        assert ReviewCategory.STYLE
-        assert ReviewCategory.TEST
-        assert ReviewCategory.DOCS
-        assert ReviewCategory.PATTERN
-        assert ReviewCategory.PERFORMANCE

apps/backend/__tests__/test_gitlab_permissions.py

@@ -1,381 +0,0 @@
-"""
-Unit Tests for GitLab Permission System
-========================================
-
-Tests for GitLabPermissionChecker and permission verification.
-"""
-
-import logging
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-from runners.gitlab.permissions import (
-    GitLabPermissionChecker,
-    GitLabRole,
-    PermissionCheckResult,
-)
-from runners.gitlab.permissions import PermissionError as GitLabPermissionError
-
-
-class MockGitLabClient:
-    """Mock GitLab API client for testing."""
-
-    def __init__(self):
-        self._fetch_async = AsyncMock()
-        self.get_project_members_async = AsyncMock(return_value=[])
-
-    def config(self):
-        """Return mock config."""
-        mock_config = MagicMock()
-        mock_config.project = "namespace/project"
-        return mock_config
-
-
-@pytest.fixture
-def mock_glab_client():
-    """Create a mock GitLab client."""
-    client = MockGitLabClient()
-    client.config = MagicMock()
-    client.config.project = "namespace/test-project"
-    return client
-
-
-@pytest.fixture
-def permission_checker(mock_glab_client):
-    """Create a permission checker instance."""
-    return GitLabPermissionChecker(
-        glab_client=mock_glab_client,
-        project="namespace/test-project",
-        allowed_roles=["OWNER", "MAINTAINER"],
-        allow_external_contributors=False,
-    )
-
-
-@pytest.mark.asyncio
-async def test_verify_token_scopes_success(permission_checker, mock_glab_client):
-    """Test successful token scope verification."""
-    mock_glab_client._fetch_async.return_value = {
-        "id": 123,
-        "name": "test-project",
-        "path_with_namespace": "namespace/test-project",
-    }
-
-    # Should not raise
-    await permission_checker.verify_token_scopes()
-
-
-@pytest.mark.asyncio
-async def test_verify_token_scopes_project_not_found(
-    permission_checker, mock_glab_client
-):
-    """Test project not found raises GitLabPermissionError."""
-    mock_glab_client._fetch_async.return_value = None
-
-    with pytest.raises(GitLabPermissionError, match="Cannot access project"):
-        await permission_checker.verify_token_scopes()
-
-
-@pytest.mark.asyncio
-async def test_check_label_adder_success(permission_checker, mock_glab_client):
-    """Test successfully finding who added a label."""
-    mock_glab_client.get_project_members_async.return_value = [
-        {
-            "id": 1,
-            "user": {"username": "alice"},
-            "action": "add",
-            "label": {"name": "auto-fix"},
-        },
-        {
-            "id": 2,
-            "user": {"username": "bob"},
-            "action": "remove",
-            "label": {"name": "auto-fix"},
-        },
-    ]
-
-    username, role = await permission_checker.check_label_adder(123, "auto-fix")
-
-    assert username == "alice"
-    assert role in [
-        "OWNER",
-        "MAINTAINER",
-        "DEVELOPER",
-        "REPORTER",
-        "GUEST",
-        "NONE",
-    ]
-
-
-@pytest.mark.asyncio
-async def test_check_label_adder_label_not_found(permission_checker, mock_glab_client):
-    """Test label not found raises GitLabPermissionError."""
-    mock_glab_client.get_project_members_async.return_value = [
-        {
-            "id": 1,
-            "user": {"username": "alice"},
-            "action": "add",
-            "label": {"name": "bug"},
-        },
-    ]
-
-    with pytest.raises(GitLabPermissionError, match="not found in issue"):
-        await permission_checker.check_label_adder(123, "auto-fix")
-
-
-@pytest.mark.asyncio
-async def test_check_label_adder_no_username(permission_checker, mock_glab_client):
-    """Test label event without username raises GitLabPermissionError."""
-    mock_glab_client.get_project_members_async.return_value = [
-        {
-            "id": 1,
-            "action": "add",
-            "label": {"name": "auto-fix"},
-        },
-    ]
-
-    with pytest.raises(GitLabPermissionError, match="Could not determine who added"):
-        await permission_checker.check_label_adder(123, "auto-fix")
-
-
-@pytest.mark.asyncio
-async def test_get_user_role_project_member(permission_checker, mock_glab_client):
-    """Test getting role for project member."""
-    mock_glab_client.get_project_members_async.return_value = [
-        {
-            "id": 1,
-            "username": "alice",
-            "access_level": 40,  # MAINTAINER
-        },
-    ]
-
-    role = await permission_checker.get_user_role("alice")
-
-    assert role == "MAINTAINER"
-
-
-@pytest.mark.asyncio
-async def test_get_user_role_owner_via_namespace(permission_checker, mock_glab_client):
-    """Test getting OWNER role via namespace ownership."""
-    # Not a direct member
-    mock_glab_client._fetch_async.side_effect = [
-        [],  # No project members
-        {  # Project info
-            "id": 123,
-            "namespace": {
-                "full_path": "namespace",
-                "owner_id": 999,
-            },
-        },
-        [  # User info matches owner
-            {
-                "id": 999,
-                "username": "alice",
-            },
-        ],
-    ]
-
-    role = await permission_checker.get_user_role("alice")
-
-    assert role == "OWNER"
-
-
-@pytest.mark.asyncio
-async def test_get_user_role_no_relationship(permission_checker, mock_glab_client):
-    """Test getting role for user with no relationship."""
-    mock_glab_client._fetch_async.side_effect = [
-        [],  # No project members
-        {  # Project info
-            "id": 123,
-            "namespace": {
-                "full_path": "namespace",
-                "owner_id": 999,
-            },
-        },
-        [  # User doesn't match owner
-            {
-                "id": 111,
-                "username": "alice",
-            },
-        ],
-    ]
-
-    role = await permission_checker.get_user_role("alice")
-
-    assert role == "NONE"
-
-
-@pytest.mark.asyncio
-async def test_get_user_role_uses_cache(permission_checker, mock_glab_client):
-    """Test that role results are cached."""
-    mock_glab_client.get_project_members_async.return_value = [
-        {
-            "id": 1,
-            "username": "alice",
-            "access_level": 40,
-        },
-    ]
-
-    # First call
-    role1 = await permission_checker.get_user_role("alice")
-    # Second call should use cache
-    role2 = await permission_checker.get_user_role("alice")
-
-    assert role1 == role2 == "MAINTAINER"
-    # Should only call API once
-    assert mock_glab_client.get_project_members_async.call_count == 1
-
-
-@pytest.mark.asyncio
-async def test_is_allowed_for_autofix_allowed(permission_checker, mock_glab_client):
-    """Test user is allowed for auto-fix."""
-    mock_glab_client.get_project_members_async.return_value = [
-        {
-            "id": 1,
-            "username": "alice",
-            "access_level": 40,  # MAINTAINER
-        },
-    ]
-
-    result = await permission_checker.is_allowed_for_autofix("alice")
-
-    assert result.allowed is True
-    assert result.username == "alice"
-    assert result.role == "MAINTAINER"
-    assert result.reason is None
-
-
-@pytest.mark.asyncio
-async def test_is_allowed_for_autofix_denied(permission_checker, mock_glab_client):
-    """Test user is denied for auto-fix."""
-    mock_glab_client.get_project_members_async.return_value = [
-        {
-            "id": 1,
-            "username": "bob",
-            "access_level": 20,  # REPORTER (not in allowed roles)
-        },
-    ]
-
-    result = await permission_checker.is_allowed_for_autofix("bob")
-
-    assert result.allowed is False
-    assert result.username == "bob"
-    assert result.role == "REPORTER"
-    assert "not in allowed roles" in result.reason
-
-
-@pytest.mark.asyncio
-async def test_verify_automation_trigger_allowed(permission_checker, mock_glab_client):
-    """Test complete verification succeeds for allowed user."""
-    mock_glab_client._fetch_async.side_effect = [
-        # Label events
-        [
-            {
-                "id": 1,
-                "user": {"username": "alice"},
-                "action": "add",
-                "label": {"name": "auto-fix"},
-            },
-        ],
-        # User role check
-        [
-            {
-                "id": 1,
-                "username": "alice",
-                "access_level": 40,
-            },
-        ],
-    ]
-
-    result = await permission_checker.verify_automation_trigger(123, "auto-fix")
-
-    assert result.allowed is True
-
-
-@pytest.mark.asyncio
-async def test_verify_automation_trigger_denied_logs_warning(
-    permission_checker, mock_glab_client, caplog
-):
-    """Test denial is logged with full context."""
-    mock_glab_client._fetch_async.side_effect = [
-        # Label events
-        [
-            {
-                "id": 1,
-                "user": {"username": "bob"},
-                "action": "add",
-                "label": {"name": "auto-fix"},
-            },
-        ],
-        # User role check
-        [
-            {
-                "id": 1,
-                "username": "bob",
-                "access_level": 20,  # REPORTER
-            },
-        ],
-    ]
-
-    result = await permission_checker.verify_automation_trigger(123, "auto-fix")
-
-    assert result.allowed is False
-
-
-def test_log_permission_denial(permission_checker, caplog):
-    """Test permission denial logging includes full context."""
-    with caplog.at_level(logging.INFO):
-        permission_checker.log_permission_denial(
-            action="auto-fix",
-            username="bob",
-            role="REPORTER",
-            issue_iid=123,
-        )
-
-    # Check that the log contains all relevant info
-    assert len(caplog.records) > 0
-    log_message = caplog.records[0].message
-    assert "auto-fix" in log_message
-    assert "bob" in log_message
-    assert "REPORTER" in log_message
-    assert "123" in log_message
-
-
-def test_access_levels():
-    """Test access level constants are correct."""
-    assert GitLabPermissionChecker.ACCESS_LEVELS["GUEST"] == 10
-    assert GitLabPermissionChecker.ACCESS_LEVELS["REPORTER"] == 20
-    assert GitLabPermissionChecker.ACCESS_LEVELS["DEVELOPER"] == 30
-    assert GitLabPermissionChecker.ACCESS_LEVELS["MAINTAINER"] == 40
-    assert GitLabPermissionChecker.ACCESS_LEVELS["OWNER"] == 50
-
-
-@pytest.mark.asyncio
-async def test_get_user_role_developer(permission_checker, mock_glab_client):
-    """Test getting DEVELOPER role."""
-    mock_glab_client.get_project_members_async.return_value = [
-        {
-            "id": 1,
-            "username": "dev",
-            "access_level": 30,
-        },
-    ]
-
-    role = await permission_checker.get_user_role("dev")
-
-    assert role == "DEVELOPER"
-
-
-@pytest.mark.asyncio
-async def test_get_user_role_guest(permission_checker, mock_glab_client):
-    """Test getting GUEST role."""
-    mock_glab_client.get_project_members_async.return_value = [
-        {
-            "id": 1,
-            "username": "guest",
-            "access_level": 10,
-        },
-    ]
-
-    role = await permission_checker.get_user_role("guest")
-
-    assert role == "GUEST"

apps/backend/__tests__/test_gitlab_provider.py

@@ -1,249 +0,0 @@
-"""
-GitLab Provider Tests
-=====================
-
-Tests for GitLabProvider implementation of the GitProvider protocol.
-"""
-
-import json
-from datetime import datetime, timezone
-from enum import Enum
-from pathlib import Path
-from typing import Any
-from unittest.mock import MagicMock, Mock, patch
-
-import pytest
-from __tests__.fixtures.gitlab import (
-    MOCK_GITLAB_CONFIG,
-    mock_issue_data,
-    mock_mr_data,
-    mock_pipeline_data,
-)
-
-# Mock ProviderType enum since GitHub runners aren't available in this branch
-# Note: GitLabProvider defines its own ProviderType when GitHub runners aren't available,
-# so we just use the string value for comparison
-GITLAB_PROVIDER_VALUE = "gitlab"  # GitHub protocol uses lowercase
-
-# Tests for GitLabProvider
-
-
-class TestGitLabProvider:
-    """Test GitLabProvider implements GitProvider protocol correctly."""
-
-    @pytest.fixture
-    def provider(self, tmp_path):
-        """Create a GitLabProvider instance for testing."""
-        from runners.gitlab.providers.gitlab_provider import GitLabProvider
-
-        with patch(
-            "runners.gitlab.providers.gitlab_provider.GitLabClient"
-        ) as mock_client:
-            provider = GitLabProvider(
-                _repo="group/project",
-                _token="test-token",
-                _instance_url="https://gitlab.example.com",
-                _project_dir=tmp_path,
-                _glab_client=mock_client.return_value,
-            )
-            return provider
-
-    def test_provider_type_property(self, provider):
-        """Test provider type is GitLab."""
-        # Compare the value since ProviderType may be defined in different modules
-        assert provider.provider_type.value == GITLAB_PROVIDER_VALUE
-
-    def test_repo_property(self, provider):
-        """Test repo property returns the repository."""
-        assert provider.repo == "group/project"
-
-    def test_fetch_pr(self, provider):
-        """Test fetching a single MR."""
-        # Mock client responses
-        provider._glab_client.get_mr.return_value = mock_mr_data()
-        provider._glab_client.get_mr_changes.return_value = {
-            "changes": [
-                {
-                    "diff": "@@ -0,0 +1,10 @@\n+new line",
-                    "new_path": "test.py",
-                    "old_path": "test.py",
-                }
-            ]
-        }
-
-        # Fetch MR
-        pr = await_if_needed(provider.fetch_pr(123))
-
-        assert pr.number == 123
-        assert pr.title == "Add user authentication feature"
-        assert pr.author == "john_doe"
-        assert pr.state == "opened"
-        assert pr.source_branch == "feature/oauth-auth"
-        assert pr.target_branch == "main"
-        assert pr.provider.name == "GITLAB"
-
-    def test_fetch_prs_with_filters(self, provider):
-        """Test fetching multiple MRs with filters."""
-        provider._glab_client._fetch.return_value = [
-            mock_mr_data(iid=100),
-            mock_mr_data(iid=101, state="closed"),
-        ]
-
-        prs = await_if_needed(provider.fetch_prs())
-
-        assert len(prs) == 2
-
-    def test_fetch_pr_diff(self, provider):
-        """Test fetching MR diff."""
-        expected_diff = "diff content here"
-        provider._glab_client.get_mr_diff.return_value = expected_diff
-
-        diff = await_if_needed(provider.fetch_pr_diff(123))
-
-        assert diff == expected_diff
-
-    def test_fetch_issue(self, provider):
-        """Test fetching a single issue."""
-        from __tests__.fixtures.gitlab import SAMPLE_ISSUE_DATA
-
-        provider._glab_client._fetch.return_value = SAMPLE_ISSUE_DATA
-
-        issue = await_if_needed(provider.fetch_issue(42))
-
-        assert issue.number == 42
-        assert issue.title == "Bug: Login button not working"
-        assert issue.author == "jane_smith"
-        assert issue.state == "opened"
-
-    def test_fetch_issues_with_filters(self, provider):
-        """Test fetching issues with filters."""
-        provider._glab_client._fetch.return_value = [
-            mock_issue_data(iid=10),
-            mock_issue_data(iid=11),
-        ]
-
-        issues = await_if_needed(provider.fetch_issues())
-
-        assert len(issues) == 2
-
-    def test_post_review(self, provider):
-        """Test posting a review to an MR."""
-        # Import ReviewData from GitHub protocol (which GitLabProvider uses)
-        from runners.github.providers.protocol import ReviewData
-
-        provider._glab_client.post_mr_note.return_value = {"id": 999}
-        provider._glab_client._fetch.return_value = {}  # approve MR response
-
-        review = ReviewData(
-            pr_number=123,
-            body="LGTM with minor suggestions",
-            event="approve",
-        )
-
-        note_id = await_if_needed(provider.post_review(123, review))
-
-        assert note_id == 999
-        provider._glab_client.post_mr_note.assert_called_once()
-
-    def test_merge_pr(self, provider):
-        """Test merging an MR."""
-        provider._glab_client.merge_mr.return_value = {"status": "success"}
-
-        result = await_if_needed(provider.merge_pr(123, merge_method="merge"))
-
-        assert result is True
-
-    def test_close_pr(self, provider):
-        """Test closing an MR."""
-        provider._glab_client._fetch.return_value = {}
-
-        result = await_if_needed(
-            provider.close_pr(123, comment="Closing as not needed")
-        )
-
-        assert result is True
-
-    def test_create_label(self, provider):
-        """Test creating a label."""
-        # Use LabelData from the provider's fallback protocol
-        from runners.gitlab.providers.gitlab_provider import (
-            LabelData as GitLabLabelData,
-        )
-
-        # Create an alias for readability
-        LabelData = GitLabLabelData
-
-        provider._glab_client._fetch.return_value = {}
-
-        label = LabelData(
-            name="bug",
-            color="#ff0000",
-            description="Bug report",
-        )
-
-        await_if_needed(provider.create_label(label))
-
-        # Verify call was made (checking that it didn't raise)
-        provider._glab_client._fetch.assert_called()
-
-    def test_list_labels(self, provider):
-        """Test listing labels."""
-        provider._glab_client._fetch.return_value = [
-            {"name": "bug", "color": "ff0000", "description": "Bug"},
-            {"name": "feature", "color": "00ff00", "description": "Feature"},
-        ]
-
-        labels = await_if_needed(provider.list_labels())
-
-        assert len(labels) == 2
-        assert labels[0].name == "bug"
-        assert labels[0].color == "#ff0000"
-
-    def test_get_repository_info(self, provider):
-        """Test getting repository info."""
-        provider._glab_client._fetch.return_value = {
-            "name": "project",
-            "path_with_namespace": "group/project",
-            "default_branch": "main",
-        }
-
-        info = await_if_needed(provider.get_repository_info())
-
-        assert info["default_branch"] == "main"
-
-    def test_get_default_branch(self, provider):
-        """Test getting default branch."""
-        provider._glab_client._fetch.return_value = {
-            "default_branch": "main",
-        }
-
-        branch = await_if_needed(provider.get_default_branch())
-
-        assert branch == "main"
-
-    def test_api_get(self, provider):
-        """Test low-level API GET."""
-        provider._glab_client._fetch.return_value = {"data": "value"}
-
-        result = await_if_needed(provider.api_get("/projects/1"))
-
-        assert result["data"] == "value"
-
-    def test_api_post(self, provider):
-        """Test low-level API POST."""
-        provider._glab_client._fetch.return_value = {"id": 123}
-
-        result = await_if_needed(
-            provider.api_post("/projects/1/notes", {"body": "test"})
-        )
-
-        assert result["id"] == 123
-
-
-def await_if_needed(coro_or_result):
-    """Helper to await async functions if needed."""
-    import asyncio
-
-    if hasattr(coro_or_result, "__await__"):
-        return asyncio.run(coro_or_result)
-    return coro_or_result

apps/backend/__tests__/test_gitlab_rate_limiter.py

@@ -1,519 +0,0 @@
-"""
-GitLab Rate Limiter Tests
-=========================
-
-Tests for token bucket rate limiting.
-"""
-
-import asyncio
-import time
-from unittest.mock import patch
-
-import pytest
-
-
-class TestTokenBucket:
-    """Test TokenBucket for rate limiting."""
-
-    def test_token_bucket_initialization(self):
-        """Test token bucket initializes correctly."""
-        from runners.gitlab.utils.rate_limiter import TokenBucket
-
-        bucket = TokenBucket(capacity=10, refill_rate=5.0)
-
-        assert bucket.capacity == 10
-        assert bucket.refill_rate == 5.0
-        assert bucket.tokens == 10
-
-    def test_token_bucket_consume_success(self):
-        """Test consuming tokens when available."""
-        from runners.gitlab.utils.rate_limiter import TokenBucket
-
-        bucket = TokenBucket(capacity=10, refill_rate=5.0)
-
-        success = bucket.consume(1)
-
-        assert success is True
-        assert bucket.tokens == 9
-
-    def test_token_bucket_consume_multiple(self):
-        """Test consuming multiple tokens."""
-        from runners.gitlab.utils.rate_limiter import TokenBucket
-
-        bucket = TokenBucket(capacity=10, refill_rate=5.0)
-
-        success = bucket.consume(5)
-
-        assert success is True
-        assert bucket.tokens == 5
-
-    def test_token_bucket_consume_insufficient(self):
-        """Test consuming when insufficient tokens."""
-        from runners.gitlab.utils.rate_limiter import TokenBucket
-
-        bucket = TokenBucket(capacity=10, refill_rate=5.0)
-
-        # Consume more than available
-        success = bucket.consume(15)
-
-        assert success is False
-        assert bucket.tokens == 10  # Should not change
-
-    def test_token_bucket_refill(self):
-        """Test token refill over time."""
-        from runners.gitlab.utils.rate_limiter import TokenBucket
-
-        bucket = TokenBucket(capacity=10, refill_rate=10.0)
-
-        # Consume all tokens
-        bucket.consume(10)
-        assert bucket.tokens == 0
-
-        # Wait for refill (0.1 seconds at 10 tokens/sec = 1 token)
-        time.sleep(0.11)
-
-        # Check refill
-        available = bucket.tokens
-        assert available >= 1
-
-    def test_token_bucket_refill_cap(self):
-        """Test tokens don't exceed capacity."""
-        from runners.gitlab.utils.rate_limiter import TokenBucket
-
-        bucket = TokenBucket(capacity=10, refill_rate=100.0)
-
-        # Wait long time for refill
-        time.sleep(0.2)
-
-        # Should not exceed capacity
-        assert bucket.tokens <= 10
-
-    def test_token_bucket_wait_for_token(self):
-        """Test waiting for token availability."""
-        from runners.gitlab.utils.rate_limiter import TokenBucket
-
-        bucket = TokenBucket(capacity=5, refill_rate=10.0)
-
-        # Consume all
-        bucket.consume(5)
-
-        # Should wait for refill
-        start = time.time()
-        bucket.consume(1, wait=True)
-        elapsed = time.time() - start
-
-        # Should have waited at least 0.1 seconds
-        assert elapsed >= 0.1
-
-    def test_token_bucket_wait_with_tokens(self):
-        """Test wait returns immediately when tokens available."""
-        from runners.gitlab.utils.rate_limiter import TokenBucket
-
-        bucket = TokenBucket(capacity=10, refill_rate=5.0)
-
-        start = time.time()
-        bucket.consume(1, wait=True)
-        elapsed = time.time() - start
-
-        # Should be immediate
-        assert elapsed < 0.01
-
-    def test_token_bucket_get_available(self):
-        """Test getting available token count."""
-        from runners.gitlab.utils.rate_limiter import TokenBucket
-
-        bucket = TokenBucket(capacity=10, refill_rate=5.0)
-
-        assert bucket.get_available() == 10
-
-        bucket.consume(3)
-        assert bucket.get_available() == 7
-
-    def test_token_bucket_reset(self):
-        """Test resetting token bucket."""
-        from runners.gitlab.utils.rate_limiter import TokenBucket
-
-        bucket = TokenBucket(capacity=10, refill_rate=5.0)
-
-        bucket.consume(5)
-        assert bucket.tokens == 5
-
-        bucket.reset()
-        assert bucket.tokens == 10
-
-
-class TestRateLimiter:
-    """Test RateLimiter for API rate limiting."""
-
-    @pytest.fixture
-    def limiter(self):
-        """Create a rate limiter for testing."""
-        from runners.gitlab.utils.rate_limiter import RateLimiter
-
-        return RateLimiter(
-            requests_per_minute=60,
-            burst_size=10,
-        )
-
-    def test_rate_limiter_initialization(self):
-        """Test rate limiter initializes correctly."""
-        from runners.gitlab.utils.rate_limiter import RateLimiter
-
-        limiter = RateLimiter(
-            requests_per_minute=60,
-            burst_size=10,
-        )
-
-        assert limiter.requests_per_minute == 60
-        assert limiter.burst_size == 10
-
-    def test_acquire_request(self, limiter):
-        """Test acquiring a request slot."""
-        success = limiter.acquire()
-
-        assert success is True
-
-    def test_acquire_burst(self, limiter):
-        """Test burst requests."""
-        # Should be able to make burst_size requests immediately
-        for _ in range(10):
-            success = limiter.acquire()
-            assert success is True
-
-    def test_acquire_exceeds_burst(self, limiter):
-        """Test exceeding burst limit."""
-        # Consume burst capacity
-        for _ in range(10):
-            limiter.acquire()
-
-        # Next request should fail
-        success = limiter.acquire()
-        assert success is False
-
-    def test_acquire_with_wait(self, limiter):
-        """Test acquire with wait option."""
-        # Consume burst
-        for _ in range(10):
-            limiter.acquire()
-
-        # Should wait for refill
-        start = time.time()
-        success = limiter.acquire(wait=True)
-        elapsed = time.time() - start
-
-        assert success is True
-        # At 60 req/min, 1 request = 1 second
-        assert elapsed >= 0.9
-
-    def test_get_wait_time(self, limiter):
-        """Test getting wait time."""
-        # No wait needed initially
-        wait_time = limiter.get_wait_time()
-        assert wait_time == 0
-
-        # Consume burst
-        for _ in range(10):
-            limiter.acquire()
-
-        # Should need to wait
-        wait_time = limiter.get_wait_time()
-        assert wait_time > 0
-
-    def test_reset(self, limiter):
-        """Test resetting rate limiter."""
-        # Consume some capacity
-        for _ in range(5):
-            limiter.acquire()
-
-        limiter.reset()
-
-        # Should have full capacity
-        success = limiter.acquire()
-        assert success is True
-
-    def test_rate_limiter_state_tracking(self, limiter):
-        """Test rate limiter tracks request state."""
-        from runners.gitlab.utils.rate_limiter import RateLimiterState
-
-        state = limiter.get_state()
-
-        assert isinstance(state, RateLimiterState)
-        assert state.available_tokens >= 0
-        assert state.available_tokens <= limiter.burst_size
-
-    def test_concurrent_requests(self, limiter):
-        """Test concurrent request handling."""
-        import threading
-
-        results = []
-
-        def make_request():
-            success = limiter.acquire(wait=True)
-            results.append(success)
-
-        threads = [threading.Thread(target=make_request) for _ in range(15)]
-
-        for t in threads:
-            t.start()
-
-        for t in threads:
-            t.join()
-
-        # All requests should succeed (some wait for refill)
-        assert all(results)
-
-    def test_rate_limiter_persistence(self, limiter, tmp_path):
-        """Test saving and loading rate limiter state."""
-        state_file = tmp_path / "rate_limiter_state.json"
-
-        # Consume some tokens
-        for _ in range(5):
-            limiter.acquire()
-
-        # Save state
-        limiter.save_state(state_file)
-
-        # Create new limiter and load state
-        from runners.gitlab.utils.rate_limiter import RateLimiter
-
-        new_limiter = RateLimiter(
-            requests_per_minute=60,
-            burst_size=10,
-        )
-        new_limiter.load_state(state_file)
-
-        # Should have same state
-        original_state = limiter.get_state()
-        loaded_state = new_limiter.get_state()
-
-        assert abs(original_state.available_tokens - loaded_state.available_tokens) < 1
-
-
-class TestRateLimiterIntegration:
-    """Integration tests for rate limiting with API calls."""
-
-    def test_rate_limiter_with_api_client(self):
-        """Test rate limiter integrates with API client."""
-        from runners.gitlab.utils.rate_limiter import RateLimiter
-
-        limiter = RateLimiter(
-            requests_per_minute=60,
-            burst_size=5,
-        )
-
-        call_count = 0
-
-        def mock_api_call():
-            nonlocal call_count
-            if limiter.acquire(wait=True):
-                call_count += 1
-                return {"data": "success"}
-            return {"error": "rate limited"}
-
-        # Make several calls
-        results = [mock_api_call() for _ in range(8)]
-
-        # Should have made all calls successfully (some waited)
-        assert call_count == 8
-        assert all(r.get("data") for r in results)
-
-    def test_rate_limiter_respects_backoff(self):
-        """Test rate limiter handles backoff correctly."""
-        from runners.gitlab.utils.rate_limiter import RateLimiter
-
-        limiter = RateLimiter(
-            requests_per_minute=30,  # 0.5 req/sec
-            burst_size=3,
-        )
-
-        times = []
-
-        def track_time():
-            times.append(time.time())
-            return limiter.acquire(wait=True)
-
-        # Make burst + 1 requests
-        for _ in range(4):
-            track_time()
-
-        # First 3 should be immediate (burst)
-        # 4th should have waited
-        burst_duration = times[2] - times[0]
-        wait_duration = times[3] - times[2]
-
-        # 4th request should have taken longer
-        assert wait_duration > burst_duration
-
-    @pytest.mark.asyncio
-    async def test_async_rate_limiting(self):
-        """Test rate limiting with async operations."""
-        from runners.gitlab.utils.rate_limiter import RateLimiter
-
-        limiter = RateLimiter(
-            requests_per_minute=60,
-            burst_size=5,
-        )
-
-        async def make_request(i):
-            if limiter.acquire(wait=True):
-                await asyncio.sleep(0.01)  # Simulate API call
-                return f"request-{i}"
-            return "rate-limited"
-
-        results = await asyncio.gather(*[make_request(i) for i in range(8)])
-
-        # All should succeed
-        assert len(results) == 8
-        assert all("rate-limited" not in r for r in results)
-
-
-class TestRateLimiterState:
-    """Test RateLimiterState model."""
-
-    def test_state_creation(self):
-        """Test creating state object."""
-        from runners.gitlab.utils.rate_limiter import RateLimiterState
-
-        state = RateLimiterState(
-            available_tokens=5.0,
-            last_refill_time=1234567890.0,
-        )
-
-        assert state.available_tokens == 5.0
-        assert state.last_refill_time == 1234567890.0
-
-    def test_state_to_dict(self):
-        """Test converting state to dict."""
-        from runners.gitlab.utils.rate_limiter import RateLimiterState
-
-        state = RateLimiterState(
-            available_tokens=7.5,
-            last_refill_time=1234567890.0,
-        )
-
-        data = state.to_dict()
-
-        assert data["available_tokens"] == 7.5
-        assert data["last_refill_time"] == 1234567890.0
-
-    def test_state_from_dict(self):
-        """Test loading state from dict."""
-        from runners.gitlab.utils.rate_limiter import RateLimiterState
-
-        data = {
-            "available_tokens": 8.0,
-            "last_refill_time": 1234567890.0,
-        }
-
-        state = RateLimiterState.from_dict(data)
-
-        assert state.available_tokens == 8.0
-        assert state.last_refill_time == 1234567890.0
-
-
-class TestRateLimiterDecorators:
-    """Test rate limiter decorators."""
-
-    def test_rate_limit_decorator(self):
-        """Test rate limit decorator for functions."""
-        from runners.gitlab.utils.rate_limiter import rate_limit
-
-        limiter = type(
-            "MockLimiter",
-            (),
-            {
-                "acquire": lambda wait=True: True,
-            },
-        )()
-
-        @rate_limit(limiter)
-        def api_function():
-            return "success"
-
-        result = api_function()
-        assert result == "success"
-
-    def test_rate_limit_decorator_with_wait(self):
-        """Test rate limit decorator respects wait parameter."""
-        from runners.gitlab.utils.rate_limiter import rate_limit
-
-        call_count = 0
-
-        class MockLimiter:
-            def acquire(self, wait=True):
-                nonlocal call_count
-                call_count += 1
-                return call_count <= 3  # Fail after 3 calls
-
-        limiter = MockLimiter()
-
-        @rate_limit(limiter, wait=True)
-        def api_function():
-            return "success"
-
-        # First 3 succeed
-        for _ in range(3):
-            result = api_function()
-            assert result == "success"
-
-        # 4th should fail (would wait but our mock returns False)
-        result = api_function()
-        assert result is None
-
-
-class TestAdaptiveRateLimiting:
-    """Test adaptive rate limiting based on responses."""
-
-    def test_adaptive_backoff_on_429(self):
-        """Test adaptive backoff on rate limit errors."""
-        from runners.gitlab.utils.rate_limiter import AdaptiveRateLimiter
-
-        limiter = AdaptiveRateLimiter(
-            requests_per_minute=60,
-            burst_size=10,
-        )
-
-        # Simulate rate limit response
-        limiter.handle_response(status_code=429)
-
-        # Should reduce rate
-        state = limiter.get_state()
-        assert state.adaptive_factor < 1.0
-
-    def test_adaptive_recovery_on_success(self):
-        """Test adaptive recovery on successful requests."""
-        from runners.gitlab.utils.rate_limiter import AdaptiveRateLimiter
-
-        limiter = AdaptiveRateLimiter(
-            requests_per_minute=60,
-            burst_size=10,
-        )
-
-        # Trigger backoff
-        limiter.handle_response(status_code=429)
-
-        # Recover with successful requests
-        for _ in range(10):
-            limiter.handle_response(status_code=200)
-
-        # Should recover rate
-        state = limiter.get_state()
-        assert state.adaptive_factor >= 0.9
-
-    def test_adaptive_minimum_rate(self):
-        """Test adaptive rate has minimum floor."""
-        from runners.gitlab.utils.rate_limiter import AdaptiveRateLimiter
-
-        limiter = AdaptiveRateLimiter(
-            requests_per_minute=60,
-            burst_size=10,
-            min_adaptive_factor=0.1,
-        )
-
-        # Trigger many backoffs
-        for _ in range(100):
-            limiter.handle_response(status_code=429)
-
-        # Should not go below minimum
-        state = limiter.get_state()
-        assert state.adaptive_factor >= 0.1

apps/backend/__tests__/test_gitlab_triage_engine.py

@@ -1,292 +0,0 @@
-"""
-Tests for GitLab Triage Engine
-=================================
-
-Tests for AI-driven issue triage and categorization.
-"""
-
-from unittest.mock import patch
-
-import pytest
-
-try:
-    from runners.gitlab.glab_client import GitLabConfig
-    from runners.gitlab.models import TriageCategory, TriageResult
-    from runners.gitlab.services.triage_engine import TriageEngine
-except ImportError:
-    from glab_client import GitLabConfig
-    from models import TriageCategory, TriageResult
-    from runners.gitlab.triage_engine import TriageEngine
-
-
-# Mock response parser for testing
-def parse_findings_from_response(response: str) -> dict:
-    """Mock parser for testing triage engine."""
-    import json
-    import re
-
-    # Try to extract JSON from markdown code blocks
-    json_match = re.search(r"```(?:json)?\s*\n(.*?)\n```", response, re.DOTALL)
-    if json_match:
-        response = json_match.group(1)
-
-    try:
-        return json.loads(response)
-    except json.JSONDecodeError:
-        return {"category": "bug", "confidence": 0.5}
-
-
-@pytest.fixture
-def mock_config():
-    """Create a mock GitLab config."""
-    try:
-        from runners.gitlab.models import GitLabRunnerConfig
-
-        return GitLabRunnerConfig(
-            token="test-token",
-            project="namespace/test-project",
-            instance_url="https://gitlab.example.com",
-            model="claude-sonnet-4-5-20250929",
-        )
-    except ImportError:
-        # Fallback to simple config with model attribute
-        config = GitLabConfig(
-            token="test-token",
-            project="namespace/test-project",
-            instance_url="https://gitlab.example.com",
-        )
-        config.model = "claude-sonnet-4-5-20250929"
-        return config
-
-
-@pytest.fixture
-def sample_issue():
-    """Sample issue data."""
-    return {
-        "iid": 123,
-        "title": "Fix authentication bug",
-        "description": "Users cannot log in when using special characters in password",
-        "labels": ["bug", "critical"],
-        "author": {"username": "reporter"},
-        "state": "opened",
-    }
-
-
-@pytest.fixture
-def engine(mock_config, tmp_path):
-    """Create a triage engine instance."""
-    return TriageEngine(
-        project_dir=tmp_path,
-        gitlab_dir=tmp_path / ".auto-claude" / "gitlab",
-        config=mock_config,
-    )
-
-
-class TestTriageEngineBasic:
-    """Tests for triage engine initialization and basic operations."""
-
-    def test_engine_initialization(self, engine):
-        """Test that engine initializes correctly."""
-        assert engine is not None
-        assert engine.project_dir is not None
-
-    def test_supported_categories(self, engine):
-        """Test that engine supports all required categories."""
-        expected_categories = {
-            TriageCategory.BUG,
-            TriageCategory.FEATURE,
-            TriageCategory.DUPLICATE,
-            TriageCategory.QUESTION,
-            TriageCategory.SPAM,
-            TriageCategory.INVALID,
-            TriageCategory.WONTFIX,
-        }
-
-        # Engine should handle all categories
-        for category in expected_categories:
-            assert category in TriageCategory
-
-
-class ResponseParserTests:
-    """Tests for response parsing utilities."""
-
-    def test_parse_findings_valid_json(self, engine):
-        """Test parsing valid JSON response with findings."""
-        response = """```json
-{
-  "category": "bug",
-  "confidence": 0.9,
-  "duplicate_of": null,
-  "reasoning": "Clear bug report with reproduction steps",
-  "suggested_labels": ["bug", "critical"]
-}
-```"""
-
-        result = parse_findings_from_response(response)
-
-        assert result["category"] == "bug"
-        assert result["confidence"] == 0.9
-
-    def test_parse_findings_with_duplicate(self, engine):
-        """Test parsing response with duplicate reference."""
-        response = """```json
-{
-  "category": "duplicate",
-  "confidence": 0.95,
-  "duplicate_of": 42,
-  "reasoning": "Same as issue #42",
-  "suggested_labels": ["duplicate"]
-}
-```"""
-
-        result = parse_findings_from_response(response)
-
-        assert result["category"] == "duplicate"
-        assert result["duplicate_of"] == 42
-
-    def test_parse_findings_with_question(self, engine):
-        """Test parsing response for question-type issue."""
-        response = """```json
-{
-  "category": "question",
-  "confidence": 0.8,
-  "reasoning": "User is asking for help, not reporting a bug",
-  "suggested_response": "Please provide more details"
-}
-```"""
-
-        result = parse_findings_from_response(response)
-
-        assert result["category"] == "question"
-        assert "suggested_response" in result
-
-    def test_parse_findings_markdown_only(self, engine):
-        """Test parsing response without JSON code blocks."""
-        response = """{"category": "feature", "confidence": 0.7}"""
-
-        result = parse_findings_from_response(response)
-
-        assert result["category"] == "feature"
-
-    def test_parse_findings_invalid_json(self, engine):
-        """Test parsing invalid JSON response."""
-        response = "This is not valid JSON at all"
-
-        result = parse_findings_from_response(response)
-
-        # Should return defaults for invalid response
-        assert "category" in result
-
-
-class TestTriageCategorization:
-    """Tests for issue categorization."""
-
-    def test_triage_categories_exist(self):
-        """Test that all triage categories are defined."""
-        expected_categories = {
-            TriageCategory.BUG,
-            TriageCategory.FEATURE,
-            TriageCategory.DUPLICATE,
-            TriageCategory.QUESTION,
-            TriageCategory.SPAM,
-            TriageCategory.INVALID,
-            TriageCategory.WONTFIX,
-        }
-        # Verify categories exist
-        assert TriageCategory.BUG in expected_categories
-        assert TriageCategory.FEATURE in expected_categories
-
-
-class TestTriageContextBuilding:
-    """Tests for context building."""
-
-    def test_build_triage_context_basic(self, engine, sample_issue):
-        """Test building basic triage context."""
-        context = engine.build_triage_context(sample_issue, [])
-
-        assert "Issue #123" in context
-        assert "Fix authentication bug" in context
-        # The description contains "Users cannot log in" not "Cannot login"
-        assert "Users cannot log in" in context
-
-    def test_build_triage_context_with_duplicates(self, engine):
-        """Test building context with potential duplicates."""
-        issue = {
-            "iid": 1,
-            "title": "Login bug",
-            "description": "Cannot login",
-            "author": {"username": "user1"},
-            "created_at": "2024-01-01T00:00:00Z",
-            "labels": ["bug"],
-        }
-
-        all_issues = [
-            issue,
-            {
-                "iid": 2,
-                "title": "Login issue",
-                "description": "Login not working",
-                "author": {"username": "user2"},
-                "created_at": "2024-01-02T00:00:00Z",
-                "labels": [],
-            },
-        ]
-
-        context = engine.build_triage_context(issue, all_issues)
-
-        # Should include potential duplicates section
-        assert "Potential Duplicates" in context
-        assert "#2" in context
-
-    def test_build_triage_context_no_duplicates(self, engine, sample_issue):
-        """Test building context without duplicates."""
-        context = engine.build_triage_context(sample_issue, [])
-
-        # Should NOT include duplicates section
-        assert "Potential Duplicates" not in context
-
-
-class TestTriageErrors:
-    """Tests for error handling in triage."""
-
-    def test_triage_result_default_values(self):
-        """Test TriageResult can be created with default values."""
-        result = TriageResult(
-            issue_iid=1,
-            project="test/project",
-            category=TriageCategory.FEATURE,
-            confidence=0.0,
-        )
-        assert result.issue_iid == 1
-        assert result.category == TriageCategory.FEATURE
-        assert result.confidence == 0.0
-
-
-class TestTriageResult:
-    """Tests for TriageResult model."""
-
-    def test_triage_result_creation(self):
-        """Test creating a triage result."""
-        result = TriageResult(
-            issue_iid=123,
-            project="namespace/project",
-            category=TriageCategory.BUG,
-            confidence=0.9,
-        )
-
-        assert result.issue_iid == 123
-        assert result.category == TriageCategory.BUG
-        assert result.confidence == 0.9
-
-    def test_triage_result_with_duplicate(self):
-        """Test creating a triage result with duplicate reference."""
-        result = TriageResult(
-            issue_iid=456,
-            project="namespace/project",
-            category=TriageCategory.DUPLICATE,
-            confidence=0.95,
-            duplicate_of=123,
-        )
-
-        assert result.duplicate_of == 123
-        assert result.category == TriageCategory.DUPLICATE

apps/backend/__tests__/test_gitlab_types.py

@@ -1,400 +0,0 @@
-"""
-Tests for GitLab TypedDict Definitions
-========================================
-
-Tests for type definitions and TypedDict usage.
-"""
-
-import pytest
-
-try:
-    from runners.gitlab.types import (
-        GitLabCommit,
-        GitLabIssue,
-        GitLabLabel,
-        GitLabMR,
-        GitLabPipeline,
-        GitLabUser,
-    )
-except ImportError:
-    from runners.gitlab.types import (
-        GitLabCommit,
-        GitLabIssue,
-        GitLabLabel,
-        GitLabMR,
-        GitLabPipeline,
-        GitLabUser,
-    )
-
-
-class TestGitLabUserTypedDict:
-    """Tests for GitLabUser TypedDict."""
-
-    def test_user_dict_structure(self):
-        """Test that user dict conforms to expected structure."""
-        user: GitLabUser = {
-            "id": 123,
-            "username": "testuser",
-            "name": "Test User",
-            "email": "test@example.com",
-            "avatar_url": "https://example.com/avatar.png",
-            "web_url": "https://gitlab.example.com/testuser",
-        }
-
-        assert user["id"] == 123
-        assert user["username"] == "testuser"
-
-    def test_user_dict_optional_fields(self):
-        """Test user dict with optional fields omitted."""
-        user: GitLabUser = {
-            "id": 456,
-            "username": "minimal",
-            "name": "Minimal User",
-        }
-
-        assert user["id"] == 456
-        # Should work without email, avatar_url, web_url
-
-
-class TestGitLabLabelTypedDict:
-    """Tests for GitLabLabel TypedDict."""
-
-    def test_label_dict_structure(self):
-        """Test that label dict conforms to expected structure."""
-        label: GitLabLabel = {
-            "id": 1,
-            "name": "bug",
-            "color": "#FF0000",
-            "description": "Bug report",
-        }
-
-        assert label["name"] == "bug"
-        assert label["color"] == "#FF0000"
-
-    def test_label_dict_optional_description(self):
-        """Test label dict without description."""
-        label: GitLabLabel = {
-            "id": 2,
-            "name": "enhancement",
-            "color": "#00FF00",
-        }
-
-        assert label["name"] == "enhancement"
-
-
-class TestGitLabMRTypedDict:
-    """Tests for GitLabMR TypedDict."""
-
-    def test_mr_dict_structure(self):
-        """Test that MR dict conforms to expected structure."""
-        mr: GitLabMR = {
-            "iid": 123,
-            "id": 456,
-            "title": "Test MR",
-            "description": "Test description",
-            "state": "opened",
-            "created_at": "2024-01-01T00:00:00Z",
-            "updated_at": "2024-01-01T01:00:00Z",
-            "merged_at": None,
-            "author": {
-                "id": 1,
-                "username": "author",
-                "name": "Author",
-            },
-            "assignees": [],
-            "reviewers": [],
-            "source_branch": "feature",
-            "target_branch": "main",
-            "web_url": "https://gitlab.example.com/merge_requests/123",
-        }
-
-        assert mr["iid"] == 123
-        assert mr["state"] == "opened"
-
-    def test_mr_dict_with_merge_status(self):
-        """Test MR dict with merge status."""
-        mr: GitLabMR = {
-            "iid": 456,
-            "id": 789,
-            "title": "Merged MR",
-            "state": "merged",
-            "merged_at": "2024-01-02T00:00:00Z",
-            "author": {"id": 1, "username": "dev"},
-            "assignees": [],
-            "reviewers": [],
-            "diff_refs": {
-                "base_sha": "abc123",
-                "head_sha": "def456",
-                "start_sha": "abc123",
-                "head_commit": {"id": "def456"},
-            },
-            "labels": [],
-        }
-
-        assert mr["state"] == "merged"
-        assert mr["merged_at"] is not None
-
-
-class TestGitLabIssueTypedDict:
-    """Tests for GitLabIssue TypedDict."""
-
-    def test_issue_dict_structure(self):
-        """Test that issue dict conforms to expected structure."""
-        issue: GitLabIssue = {
-            "iid": 123,
-            "id": 456,
-            "title": "Test Issue",
-            "description": "Test description",
-            "state": "opened",
-            "created_at": "2024-01-01T00:00:00Z",
-            "updated_at": "2024-01-01T01:00:00Z",
-            "closed_at": None,
-            "author": {
-                "id": 1,
-                "username": "reporter",
-                "name": "Reporter",
-            },
-            "assignees": [],
-            "labels": [],
-            "web_url": "https://gitlab.example.com/issues/123",
-        }
-
-        assert issue["iid"] == 123
-        assert issue["state"] == "opened"
-
-    def test_issue_dict_with_labels(self):
-        """Test issue dict with labels."""
-        issue: GitLabIssue = {
-            "iid": 789,
-            "id": 101,
-            "title": "Labeled Issue",
-            "labels": [
-                {
-                    "id": 1,
-                    "name": "bug",
-                    "color": "#FF0000",
-                },
-                {
-                    "id": 2,
-                    "name": "critical",
-                    "color": "#00FF00",
-                },
-            ],
-        }
-
-        assert len(issue["labels"]) == 2
-        assert issue["labels"][0]["name"] == "bug"
-
-
-class TestGitLabCommitTypedDict:
-    """Tests for GitLabCommit TypedDict."""
-
-    def test_commit_dict_structure(self):
-        """Test that commit dict conforms to expected structure."""
-        commit: GitLabCommit = {
-            "id": "abc123def456",
-            "short_id": "abc123",
-            "title": "Test commit",
-            "message": "Test commit message",
-            "author_name": "Developer",
-            "author_email": "dev@example.com",
-            "authored_date": "2024-01-01T00:00:00Z",
-            "committed_date": "2024-01-01T00:00:01Z",
-            "web_url": "https://gitlab.example.com/commit/abc123",
-        }
-
-        assert commit["id"] == "abc123def456"
-        assert commit["short_id"] == "abc123"
-        assert commit["author_name"] == "Developer"
-
-
-class TestGitLabPipelineTypedDict:
-    """Tests for GitLabPipeline TypedDict."""
-
-    def test_pipeline_dict_structure(self):
-        """Test that pipeline dict conforms to expected structure."""
-        pipeline: GitLabPipeline = {
-            "id": 123,
-            "iid": 456,
-            "project_id": 789,
-            "sha": "abc123",
-            "ref": "main",
-            "status": "success",
-            "created_at": "2024-01-01T00:00:00Z",
-            "updated_at": "2024-01-01T01:00:00Z",
-            "finished_at": "2024-01-01T02:00:00Z",
-            "duration": 120,
-            "web_url": "https://gitlab.example.com/pipelines/123",
-        }
-
-        assert pipeline["id"] == 123
-        assert pipeline["status"] == "success"
-        assert pipeline["duration"] == 120
-
-    def test_pipeline_dict_optional_fields(self):
-        """Test pipeline dict with optional fields omitted."""
-        pipeline: GitLabPipeline = {
-            "id": 456,
-            "iid": 789,
-            "project_id": 101,
-            "sha": "def456",
-            "ref": "develop",
-            "status": "running",
-            "created_at": "2024-01-01T00:00:00Z",
-            "updated_at": "2024-01-01T01:00:00Z",
-            "finished_at": None,
-            "duration": None,
-        }
-
-        assert pipeline["status"] == "running"
-        assert pipeline["finished_at"] is None
-
-
-class TestTotalFalseBehavior:
-    """Tests for total=False behavior in TypedDict (all fields optional)."""
-
-    def test_mr_minimal_dict(self):
-        """Test creating MR with minimal required fields."""
-        # In practice, GitLab API always returns certain fields
-        # But TypedDict with total=False allows flexibility
-        mr: GitLabMR = {
-            "iid": 123,
-            "id": 456,
-            "title": "Minimal MR",
-            "state": "opened",
-        }
-
-        assert mr["iid"] == 123
-
-    def test_issue_minimal_dict(self):
-        """Test creating issue with minimal required fields."""
-        issue: GitLabIssue = {
-            "iid": 456,
-            "id": 789,
-            "title": "Minimal Issue",
-            "state": "opened",
-        }
-
-        assert issue["iid"] == 456
-
-
-class TestNestedTypedDicts:
-    """Tests for nested TypedDict structures."""
-
-    def test_mr_with_nested_user(self):
-        """Test MR with nested user objects."""
-        mr: GitLabMR = {
-            "iid": 123,
-            "id": 456,
-            "title": "MR with author",
-            "state": "opened",
-            "author": {
-                "id": 1,
-                "username": "dev",
-                "name": "Developer",
-            },
-            "assignees": [
-                {
-                    "id": 2,
-                    "username": "assignee1",
-                    "name": "Assignee One",
-                }
-            ],
-        }
-
-        assert mr["author"]["username"] == "dev"
-        assert len(mr["assignees"]) == 1
-
-    def test_issue_with_nested_labels(self):
-        """Test issue with nested label objects."""
-        issue: GitLabIssue = {
-            "iid": 123,
-            "id": 456,
-            "title": "Issue with labels",
-            "state": "opened",
-            "labels": [
-                {"id": 1, "name": "bug", "color": "#FF0000"},
-                {"id": 2, "name": "critical", "color": "#00FF00"},
-            ],
-        }
-
-        assert issue["labels"][0]["name"] == "bug"
-        assert len(issue["labels"]) == 2
-
-
-class TestTypeCompatibility:
-    """Tests for type compatibility and validation."""
-
-    def test_mr_type_accepts_all_states(self):
-        """Test that MR type accepts all valid GitLab MR states."""
-        valid_states = ["opened", "closed", "locked", "merged"]
-
-        for state in valid_states:
-            mr: GitLabMR = {
-                "iid": 1,
-                "id": 1,
-                "title": f"MR in {state} state",
-                "state": state,
-            }
-            assert mr["state"] == state
-
-    def test_pipeline_type_accepts_all_statuses(self):
-        """Test that pipeline type accepts all valid GitLab pipeline statuses."""
-        valid_statuses = [
-            "pending",
-            "running",
-            "success",
-            "failed",
-            "canceled",
-            "skipped",
-            "manual",
-            "scheduled",
-        ]
-
-        for status in valid_statuses:
-            pipeline: GitLabPipeline = {
-                "id": 1,
-                "iid": 1,
-                "project_id": 1,
-                "sha": "abc",
-                "ref": "main",
-                "status": status,
-            }
-            assert pipeline["status"] == status
-
-
-class TestDocumentation:
-    """Tests that types are self-documenting."""
-
-    def test_user_fields_are_documented(self):
-        """Test that user fields match documentation."""
-        # GitLabUser should have: id, username, name, email, avatar_url, web_url
-        user: GitLabUser = {
-            "id": 1,
-            "username": "test",
-            "name": "Test",
-            "email": "test@example.com",
-            "avatar_url": "https://example.com/avatar.png",
-            "web_url": "https://gitlab.example.com/test",
-        }
-
-        # Verify expected fields exist
-        expected_fields = ["id", "username", "name", "email", "avatar_url", "web_url"]
-        for field in expected_fields:
-            assert field in user
-
-    def test_mr_fields_are_documented(self):
-        """Test that MR fields match documentation."""
-        # Key MR fields
-        mr: GitLabMR = {
-            "iid": 123,
-            "id": 456,
-            "title": "Test",
-            "state": "opened",
-            "created_at": "2024-01-01T00:00:00Z",
-            "updated_at": "2024-01-01T01:00:00Z",
-        }
-
-        expected_fields = ["iid", "id", "title", "state", "created_at", "updated_at"]
-        for field in expected_fields:
-            assert field in mr

apps/backend/__tests__/test_gitlab_webhook_operations.py

@@ -1,318 +0,0 @@
-"""
-Tests for GitLab Webhook Operations
-======================================
-
-Tests for webhook listing, creation, updating, and deletion.
-"""
-
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-try:
-    from runners.gitlab.glab_client import GitLabClient, GitLabConfig
-except ImportError:
-    from glab_client import GitLabClient, GitLabConfig
-
-
-@pytest.fixture
-def mock_config():
-    """Create a mock GitLab config."""
-    return GitLabConfig(
-        token="test-token",
-        project="namespace/test-project",
-        instance_url="https://gitlab.example.com",
-    )
-
-
-@pytest.fixture
-def client(mock_config, tmp_path):
-    """Create a GitLab client instance."""
-    return GitLabClient(
-        project_dir=tmp_path,
-        config=mock_config,
-    )
-
-
-@pytest.fixture
-def sample_webhooks():
-    """Sample webhook data."""
-    return [
-        {
-            "id": 1,
-            "url": "https://example.com/webhook",
-            "project_id": 123,
-            "push_events": True,
-            "issues_events": False,
-            "merge_requests_events": True,
-            "wiki_page_events": False,
-            "repository_update_events": False,
-            "tag_push_events": False,
-            "note_events": False,
-            "confidential_note_events": False,
-            "job_events": False,
-            "pipeline_events": False,
-            "deployment_events": False,
-            "release_events": False,
-        },
-        {
-            "id": 2,
-            "url": "https://hooks.example.com/another",
-            "project_id": 123,
-            "push_events": False,
-            "issues_events": True,
-            "merge_requests_events": True,
-        },
-    ]
-
-
-class TestListWebhooks:
-    """Tests for list_webhooks method."""
-
-    @pytest.mark.asyncio
-    async def test_list_all_webhooks(self, client, sample_webhooks):
-        """Test listing all webhooks."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = sample_webhooks
-
-            result = client.list_webhooks()
-
-            assert len(result) == 2
-            assert result[0]["id"] == 1
-            assert result[0]["url"] == "https://example.com/webhook"
-
-    @pytest.mark.asyncio
-    async def test_list_webhooks_empty(self, client):
-        """Test listing webhooks when none exist."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = []
-
-            result = client.list_webhooks()
-
-            assert result == []
-
-    @pytest.mark.asyncio
-    async def test_list_webhooks_async(self, client, sample_webhooks):
-        """Test async variant of list_webhooks."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = sample_webhooks
-
-            result = await client.list_webhooks_async()
-
-            assert len(result) == 2
-
-
-class TestGetWebhook:
-    """Tests for get_webhook method."""
-
-    @pytest.mark.asyncio
-    async def test_get_existing_webhook(self, client, sample_webhooks):
-        """Test getting an existing webhook."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = sample_webhooks[0]
-
-            result = client.get_webhook(1)
-
-            assert result["id"] == 1
-            assert result["url"] == "https://example.com/webhook"
-
-    @pytest.mark.asyncio
-    async def test_get_webhook_async(self, client, sample_webhooks):
-        """Test async variant of get_webhook."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = sample_webhooks[0]
-
-            result = await client.get_webhook_async(1)
-
-            assert result["id"] == 1
-
-    @pytest.mark.asyncio
-    async def test_get_nonexistent_webhook(self, client):
-        """Test getting a webhook that doesn't exist."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.side_effect = Exception("404 Not Found")
-
-            with pytest.raises(Exception):  # noqa: B017
-                client.get_webhook(999)
-
-
-class TestCreateWebhook:
-    """Tests for create_webhook method."""
-
-    @pytest.mark.asyncio
-    async def test_create_webhook_basic(self, client):
-        """Test creating a webhook with basic settings."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "id": 3,
-                "url": "https://example.com/new-hook",
-            }
-
-            result = client.create_webhook(
-                url="https://example.com/new-hook",
-            )
-
-            assert result["id"] == 3
-            assert result["url"] == "https://example.com/new-hook"
-
-    @pytest.mark.asyncio
-    async def test_create_webhook_with_events(self, client):
-        """Test creating a webhook with specific events."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "id": 4,
-                "url": "https://example.com/push-hook",
-                "push_events": True,
-                "issues_events": True,
-            }
-
-            result = client.create_webhook(
-                url="https://example.com/push-hook",
-                push_events=True,
-                issues_events=True,
-            )
-
-            assert result["push_events"] is True
-
-    @pytest.mark.asyncio
-    async def test_create_webhook_with_all_events(self, client):
-        """Test creating a webhook that listens to all events."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {"id": 5}
-
-            result = client.create_webhook(
-                url="https://example.com/all-events",
-                push_events=True,
-                merge_request_events=True,
-                issues_events=True,
-                note_events=True,
-                job_events=True,
-                pipeline_events=True,
-                wiki_page_events=True,
-            )
-
-            assert result["id"] == 5
-
-    @pytest.mark.asyncio
-    async def test_create_webhook_async(self, client):
-        """Test async variant of create_webhook."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {"id": 6}
-
-            result = await client.create_webhook_async(
-                url="https://example.com/async-hook",
-            )
-
-            assert result["id"] == 6
-
-
-class TestUpdateWebhook:
-    """Tests for update_webhook method."""
-
-    @pytest.mark.asyncio
-    async def test_update_webhook_url(self, client):
-        """Test updating webhook URL."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "id": 1,
-                "url": "https://example.com/updated-url",
-            }
-
-            result = client.update_webhook(
-                hook_id=1,
-                url="https://example.com/updated-url",
-            )
-
-            assert result["url"] == "https://example.com/updated-url"
-
-    @pytest.mark.asyncio
-    async def test_update_webhook_events(self, client):
-        """Test updating webhook events."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {
-                "id": 1,
-                "push_events": False,  # Disabled
-                "issues_events": True,  # Enabled
-            }
-
-            result = client.update_webhook(
-                hook_id=1,
-                push_events=False,
-                issues_events=True,
-            )
-
-            assert result["push_events"] is False
-
-    @pytest.mark.asyncio
-    async def test_update_webhook_async(self, client):
-        """Test async variant of update_webhook."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = {"id": 1, "url": "new"}
-
-            result = await client.update_webhook_async(
-                hook_id=1,
-                url="new",
-            )
-
-            assert result["url"] == "new"
-
-
-class TestDeleteWebhook:
-    """Tests for delete_webhook method."""
-
-    @pytest.mark.asyncio
-    async def test_delete_webhook(self, client):
-        """Test deleting a webhook."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = None  # 204 No Content
-
-            result = client.delete_webhook(1)
-
-            # Should not raise on success
-            assert result is None
-
-    @pytest.mark.asyncio
-    async def test_delete_webhook_async(self, client):
-        """Test async variant of delete_webhook."""
-        # Patch _fetch instead of _fetch_async since _fetch_async calls _fetch
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.return_value = None
-
-            result = await client.delete_webhook_async(2)
-
-            assert result is None
-
-
-class TestWebhookErrors:
-    """Tests for webhook error handling."""
-
-    @pytest.mark.asyncio
-    async def test_get_invalid_webhook_id(self, client):
-        """Test getting webhook with invalid ID."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.side_effect = Exception("404 Not Found")
-
-            with pytest.raises(Exception):  # noqa: B017
-                client.get_webhook(0)
-
-    @pytest.mark.asyncio
-    async def test_create_webhook_invalid_url(self, client):
-        """Test creating webhook with invalid URL."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.side_effect = Exception("400 Invalid URL")
-
-            with pytest.raises(Exception):  # noqa: B017
-                client.create_webhook(url="not-a-url")
-
-    @pytest.mark.asyncio
-    async def test_delete_nonexistent_webhook(self, client):
-        """Test deleting webhook that doesn't exist."""
-        with patch.object(client, "_fetch") as mock_fetch:
-            mock_fetch.side_effect = Exception("404 Not Found")
-
-            with pytest.raises(Exception):  # noqa: B017
-                client.delete_webhook(999)

apps/backend/__tests__/test_glab_client.py

@@ -1,733 +0,0 @@
-"""
-GitLab Client Tests
-===================
-
-Tests for GitLab client timeout, retry, and async operations.
-"""
-
-import asyncio
-import json
-from unittest.mock import AsyncMock, MagicMock, Mock, patch
-
-import pytest
-from requests.exceptions import ConnectionError, Timeout
-
-
-class TestGitLabClient:
-    """Test GitLab client basic operations."""
-
-    @pytest.fixture
-    def client(self):
-        """Create a GitLab client for testing."""
-        from __tests__.fixtures.gitlab import create_mock_client
-
-        return create_mock_client()
-
-    def test_client_initialization(self, client):
-        """Test client initializes correctly."""
-        assert client.config.token == "glpat-test-token-12345"
-        assert client.config.project == "group/project"
-        assert client.config.instance_url == "https://gitlab.example.com"
-        assert client.default_timeout == 30.0
-
-    def test_client_custom_timeout(self):
-        """Test client with custom timeout."""
-        from __tests__.fixtures.gitlab import create_mock_client
-
-        client = create_mock_client()
-        assert client.default_timeout == 30.0  # Uses default
-
-    def test_client_custom_retries(self):
-        """Test client with custom retry count."""
-        from __tests__.fixtures.gitlab import create_mock_client
-
-        client = create_mock_client()
-        # Uses default max_retries of 3
-        assert client.default_timeout == 30.0
-
-    def test_build_url(self, client):
-        """Test URL building."""
-        url = client._api_url("/projects/group%2Fproject/merge_requests")
-
-        assert "group%2Fproject" in url
-        assert "merge_requests" in url
-        assert "/api/v4/" in url
-
-    def test_build_url_with_params(self, client):
-        """Test URL building with query parameters."""
-        from urllib.parse import parse_qs, urlencode, urlparse
-
-        base_url = client._api_url("/projects/group%2Fproject/merge_requests")
-        query_string = urlencode({"state": "opened", "per_page": 50}, doseq=True)
-        full_url = f"{base_url}?{query_string}"
-
-        parsed = urlparse(full_url)
-        params = parse_qs(parsed.query)
-
-        assert "state=opened" in full_url or params.get("state") == ["opened"]
-        assert "per_page=50" in full_url or params.get("per_page") == ["50"]
-
-
-class TestGitLabClientRetry:
-    """Test GitLab client retry logic."""
-
-    @pytest.fixture
-    def client(self):
-        """Create a GitLab client for testing."""
-        import dataclasses
-
-        from __tests__.fixtures.gitlab import create_mock_client
-
-        client = create_mock_client()
-        return client
-
-    def test_retry_on_timeout(self, client):
-        """Test retry on timeout exception."""
-        from socket import timeout
-
-        call_count = 0
-
-        def mock_urlopen_side_effect(*args, **kwargs):
-            nonlocal call_count
-            call_count += 1
-            if call_count < 3:
-                raise TimeoutError("Request timed out")
-            # Return successful response
-            mock_resp = Mock()
-            mock_resp.read.return_value = b'{"iid": 123}'
-            mock_resp.headers = {"Content-Type": "application/json"}
-            mock_resp.status = 200
-            mock_resp.__enter__ = Mock(return_value=mock_resp)
-            mock_resp.__exit__ = Mock(return_value=False)
-            return mock_resp
-
-        with patch("urllib.request.urlopen", side_effect=mock_urlopen_side_effect):
-            result = client.get_mr(123)
-
-        assert call_count == 3  # Initial + 2 retries
-        assert result["iid"] == 123
-
-    def test_retry_on_connection_error(self, client):
-        """Test retry on connection error."""
-        from urllib.error import URLError
-
-        call_count = 0
-
-        def mock_urlopen_side_effect(*args, **kwargs):
-            nonlocal call_count
-            call_count += 1
-            if call_count < 2:
-                raise URLError("Connection failed")
-            # Return successful response
-            mock_resp = Mock()
-            mock_resp.read.return_value = b'{"iid": 123}'
-            mock_resp.headers = {"Content-Type": "application/json"}
-            mock_resp.status = 200
-            mock_resp.__enter__ = Mock(return_value=mock_resp)
-            mock_resp.__exit__ = Mock(return_value=False)
-            return mock_resp
-
-        with patch("urllib.request.urlopen", side_effect=mock_urlopen_side_effect):
-            result = client.get_mr(123)
-
-        assert call_count == 2  # Initial + 1 retry
-        assert result["iid"] == 123
-
-    def test_retry_exhausted(self, client):
-        """Test failure after retry exhaustion."""
-        from urllib.error import URLError
-
-        def mock_urlopen_side_effect(*args, **kwargs):
-            raise URLError("Request timed out")
-
-        with patch("urllib.request.urlopen", side_effect=mock_urlopen_side_effect):
-            with pytest.raises(Exception, match="GitLab API network error"):
-                client.get_mr(123)
-
-    def test_retry_with_backoff(self, client):
-        """Test retry uses exponential backoff."""
-        import time
-        from socket import timeout
-
-        call_times = []
-
-        def mock_urlopen_side_effect(*args, **kwargs):
-            call_times.append(time.time())
-            if len(call_times) < 3:
-                raise TimeoutError("Request timed out")
-            # Return successful response
-            mock_resp = Mock()
-            mock_resp.read.return_value = b'{"iid": 123}'
-            mock_resp.headers = {"Content-Type": "application/json"}
-            mock_resp.status = 200
-            mock_resp.__enter__ = Mock(return_value=mock_resp)
-            mock_resp.__exit__ = Mock(return_value=False)
-            return mock_resp
-
-        with patch("urllib.request.urlopen", side_effect=mock_urlopen_side_effect):
-            client.get_mr(123)
-
-        # Check delays between retries increase (exponential backoff)
-        if len(call_times) > 2:
-            delay1 = call_times[1] - call_times[0]
-            delay2 = call_times[2] - call_times[1]
-            # Second delay should be longer (exponential backoff)
-            assert delay2 > delay1
-
-    def test_no_retry_on_client_error(self, client):
-        """Test no retry on 4xx client errors."""
-        from urllib.error import HTTPError
-
-        call_count = 0
-
-        def mock_urlopen_side_effect(*args, **kwargs):
-            nonlocal call_count
-            call_count += 1
-            # 404 should not be retried (not in RETRYABLE_STATUS_CODES)
-            raise HTTPError("url", 404, "Not Found", {}, None)
-
-        with patch("urllib.request.urlopen", side_effect=mock_urlopen_side_effect):
-            with pytest.raises(Exception, match="GitLab API error"):
-                client.get_mr(123)
-
-        # Should only be called once (no retry for 4xx)
-        assert call_count == 1
-
-    def test_retry_on_server_error(self, client):
-        """Test retry on 5xx server errors."""
-        from urllib.error import HTTPError
-
-        call_count = 0
-
-        def mock_urlopen_side_effect(*args, **kwargs):
-            nonlocal call_count
-            call_count += 1
-            if call_count < 2:
-                raise HTTPError(None, 503, "Service Unavailable", {}, None)
-            # Return successful response
-            mock_resp = Mock()
-            mock_resp.read.return_value = b'{"iid": 123}'
-            mock_resp.headers = {"Content-Type": "application/json"}
-            mock_resp.status = 200
-            mock_resp.__enter__ = Mock(return_value=mock_resp)
-            mock_resp.__exit__ = Mock(return_value=False)
-            return mock_resp
-
-        with patch("urllib.request.urlopen", side_effect=mock_urlopen_side_effect):
-            result = client.get_mr(123)
-
-        assert call_count == 2
-        assert result["iid"] == 123
-
-
-class TestGitLabClientAsync:
-    """Test GitLab client async operations."""
-
-    @pytest.fixture
-    def client(self):
-        """Create a GitLab client for testing."""
-        from __tests__.fixtures.gitlab import create_mock_client
-
-        return create_mock_client()
-
-    @pytest.mark.asyncio
-    async def test_get_mr_async(self, client):
-        """Test async get MR."""
-        mock_data = {
-            "iid": 123,
-            "title": "Test MR",
-            "state": "opened",
-        }
-
-        with patch.object(client, "_fetch_async", return_value=mock_data):
-            result = await client.get_mr_async(123)
-
-        assert result["iid"] == 123
-        assert result["title"] == "Test MR"
-
-    @pytest.mark.asyncio
-    async def test_get_mr_changes_async(self, client):
-        """Test async get MR changes."""
-        mock_data = {
-            "changes": [
-                {
-                    "old_path": "file.py",
-                    "new_path": "file.py",
-                    "diff": "@@ -1,1 +1,2 @@",
-                }
-            ]
-        }
-
-        with patch.object(client, "_fetch_async", return_value=mock_data):
-            result = await client.get_mr_changes_async(123)
-
-        assert len(result["changes"]) == 1
-
-    @pytest.mark.asyncio
-    async def test_get_mr_commits_async(self, client):
-        """Test async get MR commits."""
-        mock_data = [
-            {"id": "abc123", "message": "Commit 1"},
-            {"id": "def456", "message": "Commit 2"},
-        ]
-
-        with patch.object(client, "_fetch_async", return_value=mock_data):
-            result = await client.get_mr_commits_async(123)
-
-        assert len(result) == 2
-        assert result[0]["id"] == "abc123"
-
-    @pytest.mark.asyncio
-    async def test_get_mr_notes_async(self, client):
-        """Test async get MR notes."""
-        mock_data = [
-            {"id": 1001, "body": "Comment 1"},
-            {"id": 1002, "body": "Comment 2"},
-        ]
-
-        with patch.object(client, "_fetch_async", return_value=mock_data):
-            result = await client.get_mr_notes_async(123)
-
-        assert len(result) == 2
-
-    @pytest.mark.asyncio
-    async def test_get_mr_pipelines_async(self, client):
-        """Test async get MR pipelines."""
-        mock_data = [
-            {"id": 1001, "status": "success"},
-            {"id": 1002, "status": "failed"},
-        ]
-
-        with patch.object(client, "_fetch_async", return_value=mock_data):
-            result = await client.get_mr_pipelines_async(123)
-
-        assert len(result) == 2
-
-    @pytest.mark.asyncio
-    async def test_get_issue_async(self, client):
-        """Test async get issue."""
-        mock_data = {
-            "iid": 456,
-            "title": "Test Issue",
-            "state": "opened",
-        }
-
-        with patch.object(client, "_fetch_async", return_value=mock_data):
-            result = await client.get_issue_async(456)
-
-        assert result["iid"] == 456
-
-    @pytest.mark.asyncio
-    async def test_get_pipeline_async(self, client):
-        """Test async get pipeline."""
-        mock_data = {
-            "id": 1001,
-            "status": "running",
-            "ref": "main",
-        }
-
-        with patch.object(client, "_fetch_async", return_value=mock_data):
-            result = await client.get_pipeline_status_async(1001)
-
-        assert result["id"] == 1001
-
-    @pytest.mark.asyncio
-    async def test_get_pipeline_jobs_async(self, client):
-        """Test async get pipeline jobs."""
-        mock_data = [
-            {"id": 2001, "name": "test", "status": "success"},
-            {"id": 2002, "name": "build", "status": "failed"},
-        ]
-
-        with patch.object(client, "_fetch_async", return_value=mock_data):
-            result = await client.get_pipeline_jobs_async(1001)
-
-        assert len(result) == 2
-
-    @pytest.mark.asyncio
-    async def test_concurrent_async_requests(self, client):
-        """Test concurrent async requests."""
-
-        async def fetch_mr(iid):
-            return await client.get_mr_async(iid)
-
-        mock_data = {
-            "iid": 123,
-            "title": "Test MR",
-        }
-
-        with patch.object(client, "_fetch_async", return_value=mock_data):
-            results = await asyncio.gather(
-                fetch_mr(123),
-                fetch_mr(456),
-                fetch_mr(789),
-            )
-
-        assert len(results) == 3
-
-    @pytest.mark.asyncio
-    async def test_async_error_handling(self, client):
-        """Test async error handling."""
-        with patch.object(client, "_fetch_async", side_effect=Exception("API Error")):
-            with pytest.raises(Exception, match="API Error"):
-                await client.get_mr_async(123)
-
-
-class TestGitLabClientAPI:
-    """Test GitLab client API methods."""
-
-    @pytest.fixture
-    def client(self):
-        """Create a GitLab client for testing."""
-        from __tests__.fixtures.gitlab import create_mock_client
-
-        return create_mock_client()
-
-    def test_get_mr(self, client):
-        """Test getting MR details."""
-        mock_response = {
-            "iid": 123,
-            "title": "Test MR",
-            "description": "Test description",
-            "state": "opened",
-            "author": {"username": "john_doe"},
-        }
-
-        with patch.object(client, "_fetch", return_value=mock_response):
-            result = client.get_mr(123)
-
-        assert result["iid"] == 123
-        assert result["title"] == "Test MR"
-
-    def test_get_mr_changes(self, client):
-        """Test getting MR changes."""
-        mock_response = {
-            "changes": [
-                {
-                    "old_path": "src/file.py",
-                    "new_path": "src/file.py",
-                    "diff": "@@ -1,1 +1,2 @@",
-                }
-            ]
-        }
-
-        with patch.object(client, "_fetch", return_value=mock_response):
-            result = client.get_mr_changes(123)
-
-        assert len(result["changes"]) == 1
-
-    def test_get_mr_commits(self, client):
-        """Test getting MR commits."""
-        mock_response = [
-            {"id": "abc123", "message": "First commit"},
-            {"id": "def456", "message": "Second commit"},
-        ]
-
-        with patch.object(client, "_fetch", return_value=mock_response):
-            result = client.get_mr_commits(123)
-
-        assert len(result) == 2
-
-    def test_get_mr_notes(self, client):
-        """Test getting MR discussion notes."""
-        mock_response = [
-            {"id": 1001, "body": "Review comment", "author": {"username": "reviewer"}},
-        ]
-
-        with patch.object(client, "_fetch", return_value=mock_response):
-            result = client.get_mr_notes(123)
-
-        assert len(result) == 1
-
-    def test_post_mr_note(self, client):
-        """Test posting note to MR."""
-        mock_response = {"id": 1002, "body": "New comment"}
-
-        with patch.object(client, "_fetch", return_value=mock_response):
-            result = client.post_mr_note(123, "New comment")
-
-        assert result["id"] == 1002
-
-    def test_get_mr_pipelines(self, client):
-        """Test getting MR pipelines."""
-        mock_response = [
-            {"id": 1001, "status": "success", "ref": "feature"},
-        ]
-
-        with patch.object(client, "_fetch", return_value=mock_response):
-            result = client.get_mr_pipelines(123)
-
-        assert len(result) == 1
-
-    def test_get_pipeline(self, client):
-        """Test getting pipeline details."""
-        mock_response = {
-            "id": 1001,
-            "status": "success",
-            "ref": "main",
-            "sha": "abc123",
-        }
-
-        with patch.object(client, "_fetch", return_value=mock_response):
-            result = client.get_pipeline_status(1001)
-
-        assert result["id"] == 1001
-
-    def test_get_pipeline_jobs(self, client):
-        """Test getting pipeline jobs."""
-        mock_response = [
-            {"id": 2001, "name": "test", "stage": "test", "status": "passed"},
-            {"id": 2002, "name": "build", "stage": "build", "status": "failed"},
-        ]
-
-        with patch.object(client, "_fetch", return_value=mock_response):
-            result = client.get_pipeline_jobs(1001)
-
-        assert len(result) == 2
-        assert result[1]["status"] == "failed"
-
-    def test_get_issue(self, client):
-        """Test getting issue details."""
-        mock_response = {
-            "iid": 456,
-            "title": "Test Issue",
-            "description": "Issue description",
-            "state": "opened",
-        }
-
-        with patch.object(client, "_fetch", return_value=mock_response):
-            result = client.get_issue(456)
-
-        assert result["iid"] == 456
-
-    def test_list_issues(self, client):
-        """Test listing issues."""
-        mock_response = [
-            {"iid": 456, "title": "Issue 1"},
-            {"iid": 457, "title": "Issue 2"},
-        ]
-
-        with patch.object(client, "_fetch", return_value=mock_response):
-            result = client.list_issues(state="opened")
-
-        assert len(result) == 2
-
-    def test_post_issue_note(self, client):
-        """Test posting note to issue."""
-        mock_response = {"id": 2001, "body": "Issue comment"}
-
-        with patch.object(client, "_fetch", return_value=mock_response):
-            result = client.post_issue_note(456, "Issue comment")
-
-        assert result["id"] == 2001
-
-    def test_get_file(self, client):
-        """Test getting file from repository."""
-        mock_response = {
-            "file_name": "README.md",
-            "content": "SGVsbG8gV29ybGQ=",  # Base64 encoded
-            "encoding": "base64",
-        }
-
-        with patch.object(client, "_fetch", return_value=mock_response):
-            result = client.get_file_contents("README.md", ref="main")
-
-        assert result["file_name"] == "README.md"
-
-    def test_list_projects(self, client):
-        """Test listing projects - removed in new API."""
-        # This method was removed from the new GitLabClient API
-        # Projects are now specified via the config
-        assert client.config.project is not None
-
-
-class TestGitLabClientAuth:
-    """Test GitLab client authentication."""
-
-    def test_token_in_headers(self):
-        """Test token is included in request headers."""
-        import dataclasses
-
-        from __tests__.fixtures.gitlab import create_mock_client
-
-        client = create_mock_client()
-        client.config = dataclasses.replace(client.config, token="test-token-12345")
-
-        with patch("urllib.request.urlopen") as mock_urlopen:
-            # Mock response object with proper attributes
-            mock_response = Mock()
-            mock_response.read.return_value = b'{"iid": 123}'
-            mock_response.headers = {"Content-Type": "application/json"}
-            mock_response.status = 200
-            mock_response.__enter__ = Mock(return_value=mock_response)
-            mock_response.__exit__ = Mock(return_value=False)
-            mock_urlopen.return_value = mock_response
-
-            client.get_mr(123)
-
-            # Check that urlopen was called
-            assert mock_urlopen.called
-
-            # Get the request object that was passed to urlopen
-            call_args = mock_urlopen.call_args[0]
-            request = call_args[0]
-
-            # Check the PRIVATE-TOKEN header (case-insensitive check)
-            assert (
-                "PRIVATE-TOKEN" in request.headers or "Private-token" in request.headers
-            )
-            # Use get() with case-insensitive fallback
-            token_value = request.headers.get(
-                "PRIVATE-TOKEN", request.headers.get("Private-token")
-            )
-            assert token_value == "test-token-12345"
-
-    def test_custom_instance_url(self):
-        """Test custom instance URL."""
-        import dataclasses
-
-        from __tests__.fixtures.gitlab import create_mock_client
-
-        client = create_mock_client()
-        client.config = dataclasses.replace(
-            client.config, instance_url="https://gitlab.custom.com"
-        )
-
-        with patch("urllib.request.urlopen") as mock_urlopen:
-            # Mock response object with proper attributes
-            mock_response = Mock()
-            mock_response.read.return_value = b'{"iid": 123}'
-            mock_response.headers = {"Content-Type": "application/json"}
-            mock_response.status = 200
-            mock_response.__enter__ = Mock(return_value=mock_response)
-            mock_response.__exit__ = Mock(return_value=False)
-            mock_urlopen.return_value = mock_response
-
-            client.get_mr(123)
-
-            # Check that urlopen was called with correct URL
-            call_args = mock_urlopen.call_args[0]
-            request = call_args[0]
-
-            assert "gitlab.custom.com" in request.full_url
-
-
-class TestGitLabClientConfig:
-    """Test GitLab configuration model."""
-
-    def test_config_creation(self):
-        """Test creating GitLab config."""
-        from runners.gitlab.glab_client import GitLabConfig
-
-        config = GitLabConfig(
-            token="test-token",
-            project="group/project",
-            instance_url="https://gitlab.example.com",
-        )
-
-        assert config.token == "test-token"
-        assert config.project == "group/project"
-
-    def test_config_defaults(self):
-        """Test config has sensible defaults."""
-        import tempfile
-        from pathlib import Path
-
-        from runners.gitlab.glab_client import GitLabClient, GitLabConfig
-
-        project_dir = Path(tempfile.mkdtemp())
-        config = GitLabConfig(
-            token="test-token",
-            project="group/project",
-            instance_url="https://gitlab.com",
-        )
-
-        client = GitLabClient(project_dir=project_dir, config=config)
-
-        assert client.config.instance_url == "https://gitlab.com"
-        assert client.default_timeout == 30.0
-
-    def test_config_to_dict(self):
-        """Test converting config to dict using dataclasses."""
-        import dataclasses
-
-        from runners.gitlab.glab_client import GitLabConfig
-
-        config = GitLabConfig(
-            token="test-token",
-            project="group/project",
-            instance_url="https://gitlab.com",
-        )
-
-        data = dataclasses.asdict(config)
-
-        assert data["token"] == "test-token"
-        assert data["project"] == "group/project"
-
-    def test_config_from_dict(self):
-        """Test loading config from dict using dataclasses."""
-        import dataclasses
-
-        from runners.gitlab.glab_client import GitLabConfig
-
-        data = {
-            "token": "test-token",
-            "project": "group/project",
-            "instance_url": "https://gitlab.example.com",
-        }
-
-        config = GitLabConfig(**data)
-
-        assert config.token == "test-token"
-        assert config.instance_url == "https://gitlab.example.com"
-
-
-class TestGitLabClientErrorHandling:
-    """Test GitLab client error handling."""
-
-    @pytest.fixture
-    def client(self):
-        """Create a GitLab client for testing."""
-        from __tests__.fixtures.gitlab import create_mock_client
-
-        return create_mock_client()
-
-    def test_http_404_handling(self, client):
-        """Test 404 error handling."""
-        from urllib.error import HTTPError
-
-        def mock_request(*args, **kwargs):
-            raise HTTPError(None, 404, "404 Not Found", {}, None)
-
-        with patch.object(client, "_fetch", mock_request):
-            with pytest.raises(HTTPError):
-                client.get_mr(99999)
-
-    def test_http_403_handling(self, client):
-        """Test 403 forbidden error handling."""
-        from urllib.error import HTTPError
-
-        def mock_request(*args, **kwargs):
-            raise HTTPError(None, 403, "403 Forbidden", {}, None)
-
-        with patch.object(client, "_fetch", mock_request):
-            with pytest.raises(HTTPError):
-                client.get_mr(123)
-
-    def test_network_error_handling(self, client):
-        """Test network error handling."""
-        with patch.object(
-            client, "_fetch", side_effect=ConnectionError("Network error")
-        ):
-            with pytest.raises(ConnectionError):
-                client.get_mr(123)
-
-    def test_timeout_handling(self, client):
-        """Test timeout handling."""
-        from socket import timeout
-
-        with patch.object(
-            client, "_fetch", side_effect=TimeoutError("Request timed out")
-        ):
-            with pytest.raises(timeout):
-                client.get_mr(123)

apps/backend/agents/base.py

@@ -6,6 +6,7 @@ Shared imports, types, and constants used across agent modules.
 """
 
 import logging
+import re
 
 # Configure logging
 logger = logging.getLogger(__name__)
@@ -13,3 +14,86 @@ logger = logging.getLogger(__name__)
 # Configuration constants
 AUTO_CONTINUE_DELAY_SECONDS = 3
 HUMAN_INTERVENTION_FILE = "PAUSE"
+
+# Retry configuration for subtask execution
+MAX_SUBTASK_RETRIES = 5  # Maximum attempts before marking subtask as stuck
+
+# Retry configuration for 400 tool concurrency errors
+MAX_CONCURRENCY_RETRIES = 5  # Maximum number of retries for tool concurrency errors
+INITIAL_RETRY_DELAY_SECONDS = (
+    2  # Initial retry delay (doubles each retry: 2s, 4s, 8s, 16s, 32s)
+)
+MAX_RETRY_DELAY_SECONDS = 32  # Cap retry delay at 32 seconds
+
+# Pause file constants for intelligent error recovery
+# These files signal pause/resume between frontend and backend
+RATE_LIMIT_PAUSE_FILE = "RATE_LIMIT_PAUSE"  # Created when rate limited
+AUTH_FAILURE_PAUSE_FILE = "AUTH_PAUSE"  # Created when auth fails
+RESUME_FILE = "RESUME"  # Created by frontend to signal resume
+
+# Maximum time to wait for rate limit reset (2 hours)
+# If reset time is beyond this, task should fail rather than wait indefinitely
+MAX_RATE_LIMIT_WAIT_SECONDS = 7200
+
+# Wait intervals for pause/resume checking
+RATE_LIMIT_CHECK_INTERVAL_SECONDS = (
+    30  # Check for RESUME file every 30 seconds during rate limit wait
+)
+AUTH_RESUME_CHECK_INTERVAL_SECONDS = 10  # Check for re-authentication every 10 seconds
+AUTH_RESUME_MAX_WAIT_SECONDS = 86400  # Maximum wait for re-authentication (24 hours)
+
+
+def sanitize_error_message(error_message: str, max_length: int = 500) -> str:
+    """
+    Sanitize error messages to remove potentially sensitive information.
+
+    Redacts:
+    - API keys (sk-..., key-...)
+    - Bearer tokens
+    - Token/secret values
+
+    Args:
+        error_message: The raw error message to sanitize
+        max_length: Maximum length to truncate to (default 500)
+
+    Returns:
+        Sanitized and truncated error message
+    """
+    if not error_message:
+        return ""
+
+    # Redact patterns that look like API keys or tokens
+    # Pattern: sk-... (OpenAI/Anthropic keys like sk-ant-api03-...)
+    sanitized = re.sub(
+        r"\bsk-[a-zA-Z0-9._\-]{20,}\b", "[REDACTED_API_KEY]", error_message
+    )
+
+    # Pattern: key-... (generic API keys)
+    sanitized = re.sub(r"\bkey-[a-zA-Z0-9._\-]{20,}\b", "[REDACTED_API_KEY]", sanitized)
+
+    # Pattern: Bearer ... (bearer tokens)
+    sanitized = re.sub(
+        r"\bBearer\s+[a-zA-Z0-9._\-]{20,}\b", "Bearer [REDACTED_TOKEN]", sanitized
+    )
+
+    # Pattern: token= or token: followed by long strings
+    sanitized = re.sub(
+        r"(token[=:]\s*)[a-zA-Z0-9._\-]{20,}\b",
+        r"\1[REDACTED_TOKEN]",
+        sanitized,
+        flags=re.IGNORECASE,
+    )
+
+    # Pattern: secret= or secret: followed by strings
+    sanitized = re.sub(
+        r"(secret[=:]\s*)[a-zA-Z0-9._\-]{20,}\b",
+        r"\1[REDACTED_SECRET]",
+        sanitized,
+        flags=re.IGNORECASE,
+    )
+
+    # Truncate to max length
+    if len(sanitized) > max_length:
+        sanitized = sanitized[:max_length] + "..."
+
+    return sanitized

apps/backend/agents/planner.py

@@ -1,183 +1,198 @@
-"""
-Planner Agent Module
-====================
-
-Handles follow-up planner sessions for adding new subtasks to completed specs.
-"""
-
-import logging
-from pathlib import Path
-
-from core.client import create_client
-from phase_config import get_phase_model, get_phase_thinking_budget
-from phase_event import ExecutionPhase, emit_phase
-from task_logger import (
-    LogPhase,
-    get_task_logger,
-)
-from ui import (
-    BuildState,
-    Icons,
-    StatusManager,
-    bold,
-    box,
-    highlight,
-    icon,
-    muted,
-    print_status,
-)
-
-from .session import run_agent_session
-
-logger = logging.getLogger(__name__)
-
-
-async def run_followup_planner(
-    project_dir: Path,
-    spec_dir: Path,
-    model: str,
-    verbose: bool = False,
-) -> bool:
-    """
-    Run the follow-up planner to add new subtasks to a completed spec.
-
-    This is a simplified version of run_autonomous_agent that:
-    1. Creates a client
-    2. Loads the followup planner prompt
-    3. Runs a single planning session
-    4. Returns after the plan is updated (doesn't enter coding loop)
-
-    The planner agent will:
-    - Read FOLLOWUP_REQUEST.md for the new task
-    - Read the existing implementation_plan.json
-    - Add new phase(s) with pending subtasks
-    - Update the plan status back to in_progress
-
-    Args:
-        project_dir: Root directory for the project
-        spec_dir: Directory containing the completed spec
-        model: Claude model to use
-        verbose: Whether to show detailed output
-
-    Returns:
-        bool: True if planning completed successfully
-    """
-    from implementation_plan import ImplementationPlan
-    from prompts import get_followup_planner_prompt
-
-    # Initialize status manager for ccstatusline
-    status_manager = StatusManager(project_dir)
-    status_manager.set_active(spec_dir.name, BuildState.PLANNING)
-    emit_phase(ExecutionPhase.PLANNING, "Follow-up planning")
-
-    # Initialize task logger for persistent logging
-    task_logger = get_task_logger(spec_dir)
-
-    # Show header
-    content = [
-        bold(f"{icon(Icons.GEAR)} FOLLOW-UP PLANNER SESSION"),
-        "",
-        f"Spec: {highlight(spec_dir.name)}",
-        muted("Adding follow-up work to completed spec."),
-        "",
-        muted("The agent will read your FOLLOWUP_REQUEST.md and add new subtasks."),
-    ]
-    print()
-    print(box(content, width=70, style="heavy"))
-    print()
-
-    # Start planning phase in task logger
-    if task_logger:
-        task_logger.start_phase(LogPhase.PLANNING, "Starting follow-up planning...")
-        task_logger.set_session(1)
-
-    # Create client with phase-specific model and thinking budget
-    # Respects task_metadata.json configuration when no CLI override
-    planning_model = get_phase_model(spec_dir, "planning", model)
-    planning_thinking_budget = get_phase_thinking_budget(spec_dir, "planning")
-    client = create_client(
-        project_dir,
-        spec_dir,
-        planning_model,
-        max_thinking_tokens=planning_thinking_budget,
-    )
-
-    # Generate follow-up planner prompt
-    prompt = get_followup_planner_prompt(spec_dir)
-
-    print_status("Running follow-up planner...", "progress")
-    print()
-
-    try:
-        # Run single planning session
-        async with client:
-            status, response = await run_agent_session(
-                client, prompt, spec_dir, verbose, phase=LogPhase.PLANNING
-            )
-
-        # End planning phase in task logger
-        if task_logger:
-            task_logger.end_phase(
-                LogPhase.PLANNING,
-                success=(status != "error"),
-                message="Follow-up planning session completed",
-            )
-
-        if status == "error":
-            print()
-            print_status("Follow-up planning failed", "error")
-            status_manager.update(state=BuildState.ERROR)
-            return False
-
-        # Verify the plan was updated (should have pending subtasks now)
-        plan_file = spec_dir / "implementation_plan.json"
-        if plan_file.exists():
-            plan = ImplementationPlan.load(plan_file)
-
-            # Check if there are any pending subtasks
-            all_subtasks = [c for p in plan.phases for c in p.subtasks]
-            pending_subtasks = [c for c in all_subtasks if c.status.value == "pending"]
-
-            if pending_subtasks:
-                # Reset the plan status to in_progress (in case planner didn't)
-                plan.reset_for_followup()
-                await plan.async_save(plan_file)
-
-                print()
-                content = [
-                    bold(f"{icon(Icons.SUCCESS)} FOLLOW-UP PLANNING COMPLETE"),
-                    "",
-                    f"New pending subtasks: {highlight(str(len(pending_subtasks)))}",
-                    f"Total subtasks: {len(all_subtasks)}",
-                    "",
-                    muted("Next steps:"),
-                    f"  Run: {highlight(f'python auto-claude/run.py --spec {spec_dir.name}')}",
-                ]
-                print(box(content, width=70, style="heavy"))
-                print()
-                status_manager.update(state=BuildState.PAUSED)
-                return True
-            else:
-                print()
-                print_status(
-                    "Warning: No pending subtasks found after planning", "warning"
-                )
-                print(muted("The planner may not have added new subtasks."))
-                print(muted("Check implementation_plan.json manually."))
-                status_manager.update(state=BuildState.PAUSED)
-                return False
-        else:
-            print()
-            print_status(
-                "Error: implementation_plan.json not found after planning", "error"
-            )
-            status_manager.update(state=BuildState.ERROR)
-            return False
-
-    except Exception as e:
-        print()
-        print_status(f"Follow-up planning error: {e}", "error")
-        if task_logger:
-            task_logger.log_error(f"Follow-up planning error: {e}", LogPhase.PLANNING)
-        status_manager.update(state=BuildState.ERROR)
-        return False
+"""
+Planner Agent Module
+====================
+
+Handles follow-up planner sessions for adding new subtasks to completed specs.
+"""
+
+import logging
+from pathlib import Path
+
+from core.client import create_client
+from phase_config import (
+    get_fast_mode,
+    get_phase_client_thinking_kwargs,
+    get_phase_model,
+    get_phase_model_betas,
+)
+from phase_event import ExecutionPhase, emit_phase
+from task_logger import (
+    LogPhase,
+    get_task_logger,
+)
+from ui import (
+    BuildState,
+    Icons,
+    StatusManager,
+    bold,
+    box,
+    highlight,
+    icon,
+    muted,
+    print_status,
+)
+
+from .session import run_agent_session
+
+logger = logging.getLogger(__name__)
+
+
+async def run_followup_planner(
+    project_dir: Path,
+    spec_dir: Path,
+    model: str,
+    verbose: bool = False,
+) -> bool:
+    """
+    Run the follow-up planner to add new subtasks to a completed spec.
+
+    This is a simplified version of run_autonomous_agent that:
+    1. Creates a client
+    2. Loads the followup planner prompt
+    3. Runs a single planning session
+    4. Returns after the plan is updated (doesn't enter coding loop)
+
+    The planner agent will:
+    - Read FOLLOWUP_REQUEST.md for the new task
+    - Read the existing implementation_plan.json
+    - Add new phase(s) with pending subtasks
+    - Update the plan status back to in_progress
+
+    Args:
+        project_dir: Root directory for the project
+        spec_dir: Directory containing the completed spec
+        model: Claude model to use
+        verbose: Whether to show detailed output
+
+    Returns:
+        bool: True if planning completed successfully
+    """
+    from implementation_plan import ImplementationPlan
+    from prompts import get_followup_planner_prompt
+
+    # Initialize status manager for ccstatusline
+    status_manager = StatusManager(project_dir)
+    status_manager.set_active(spec_dir.name, BuildState.PLANNING)
+    emit_phase(ExecutionPhase.PLANNING, "Follow-up planning")
+
+    # Initialize task logger for persistent logging
+    task_logger = get_task_logger(spec_dir)
+
+    # Show header
+    content = [
+        bold(f"{icon(Icons.GEAR)} FOLLOW-UP PLANNER SESSION"),
+        "",
+        f"Spec: {highlight(spec_dir.name)}",
+        muted("Adding follow-up work to completed spec."),
+        "",
+        muted("The agent will read your FOLLOWUP_REQUEST.md and add new subtasks."),
+    ]
+    print()
+    print(box(content, width=70, style="heavy"))
+    print()
+
+    # Start planning phase in task logger
+    if task_logger:
+        task_logger.start_phase(LogPhase.PLANNING, "Starting follow-up planning...")
+        task_logger.set_session(1)
+
+    # Create client with phase-specific model and thinking budget
+    # Respects task_metadata.json configuration when no CLI override
+    planning_model = get_phase_model(spec_dir, "planning", model)
+    planning_betas = get_phase_model_betas(spec_dir, "planning", model)
+    thinking_kwargs = get_phase_client_thinking_kwargs(
+        spec_dir, "planning", planning_model
+    )
+    fast_mode = get_fast_mode(spec_dir)
+    logger.info(
+        f"[Planner] [Fast Mode] {'ENABLED' if fast_mode else 'disabled'} for follow-up planning"
+    )
+    client = create_client(
+        project_dir,
+        spec_dir,
+        planning_model,
+        agent_type="planner",
+        betas=planning_betas,
+        fast_mode=fast_mode,
+        **thinking_kwargs,
+    )
+
+    # Generate follow-up planner prompt
+    prompt = get_followup_planner_prompt(spec_dir)
+
+    print_status("Running follow-up planner...", "progress")
+    print()
+
+    try:
+        # Run single planning session
+        async with client:
+            status, response, error_info = await run_agent_session(
+                client, prompt, spec_dir, verbose, phase=LogPhase.PLANNING
+            )
+
+        # End planning phase in task logger
+        if task_logger:
+            task_logger.end_phase(
+                LogPhase.PLANNING,
+                success=(status != "error"),
+                message="Follow-up planning session completed",
+            )
+
+        if status == "error":
+            print()
+            print_status("Follow-up planning failed", "error")
+            status_manager.update(state=BuildState.ERROR)
+            return False
+
+        # Verify the plan was updated (should have pending subtasks now)
+        plan_file = spec_dir / "implementation_plan.json"
+        if plan_file.exists():
+            plan = ImplementationPlan.load(plan_file)
+
+            # Check if there are any pending subtasks
+            all_subtasks = [c for p in plan.phases for c in p.subtasks]
+            pending_subtasks = [c for c in all_subtasks if c.status.value == "pending"]
+
+            if pending_subtasks:
+                # Reset the plan status to in_progress (in case planner didn't)
+                plan.reset_for_followup()
+                await plan.async_save(plan_file)
+
+                print()
+                content = [
+                    bold(f"{icon(Icons.SUCCESS)} FOLLOW-UP PLANNING COMPLETE"),
+                    "",
+                    f"New pending subtasks: {highlight(str(len(pending_subtasks)))}",
+                    f"Total subtasks: {len(all_subtasks)}",
+                    "",
+                    muted("Next steps:"),
+                    f"  Run: {highlight(f'python auto-claude/run.py --spec {spec_dir.name}')}",
+                ]
+                print(box(content, width=70, style="heavy"))
+                print()
+                status_manager.update(state=BuildState.PAUSED)
+                return True
+            else:
+                print()
+                print_status(
+                    "Warning: No pending subtasks found after planning", "warning"
+                )
+                print(muted("The planner may not have added new subtasks."))
+                print(muted("Check implementation_plan.json manually."))
+                status_manager.update(state=BuildState.PAUSED)
+                return False
+        else:
+            print()
+            print_status(
+                "Error: implementation_plan.json not found after planning", "error"
+            )
+            status_manager.update(state=BuildState.ERROR)
+            return False
+
+    except Exception as e:
+        print()
+        print_status(f"Follow-up planning error: {e}", "error")
+        if task_logger:
+            task_logger.log_error(f"Follow-up planning error: {e}", LogPhase.PLANNING)
+        status_manager.update(state=BuildState.ERROR)
+        return False

apps/backend/agents/pr_template_filler.py

@@ -0,0 +1,347 @@
+"""
+PR Template Filler Agent Module
+================================
+
+Detects GitHub PR templates in a project and uses Claude to intelligently
+fill them based on code changes, spec context, commit history, and branch info.
+"""
+
+import logging
+from pathlib import Path
+
+from core.client import create_client
+from task_logger import LogPhase, get_task_logger
+
+from .session import run_agent_session
+
+logger = logging.getLogger(__name__)
+
+# Maximum diff size (in characters) before truncating to file-level summaries
+MAX_DIFF_CHARS = 30_000
+
+
+def detect_pr_template(project_dir: Path | str) -> str | None:
+    """
+    Detect a GitHub PR template in the project.
+
+    Searches for:
+    1. .github/PULL_REQUEST_TEMPLATE.md (single template)
+    2. .github/PULL_REQUEST_TEMPLATE/ directory (picks the first .md file)
+
+    Args:
+        project_dir: Root directory of the project
+
+    Returns:
+        The template content as a string, or None if no template is found.
+    """
+    project_dir = Path(project_dir)
+    # Check for single template file
+    single_template = project_dir / ".github" / "PULL_REQUEST_TEMPLATE.md"
+    if single_template.is_file():
+        try:
+            content = single_template.read_text(encoding="utf-8")
+            if content.strip():
+                logger.info(f"Found PR template: {single_template}")
+                return content
+        except Exception as e:
+            logger.warning(f"Failed to read PR template {single_template}: {e}")
+
+    # Check for template directory (pick first .md file alphabetically)
+    template_dir = project_dir / ".github" / "PULL_REQUEST_TEMPLATE"
+    if template_dir.is_dir():
+        try:
+            md_files = sorted(template_dir.glob("*.md"))
+            if md_files:
+                content = md_files[0].read_text(encoding="utf-8")
+                if content.strip():
+                    logger.info(f"Found PR template: {md_files[0]}")
+                    return content
+        except Exception as e:
+            logger.warning(f"Failed to read PR template from {template_dir}: {e}")
+
+    logger.info("No GitHub PR template found in project")
+    return None
+
+
+def _truncate_diff(diff_summary: str) -> str:
+    """
+    Truncate a large diff to file-level summaries to stay within token limits.
+
+    If the diff is within MAX_DIFF_CHARS, return it unchanged.
+    Otherwise, extract only file-level change summaries (e.g. file names
+    with insertions/deletions counts) and discard line-level detail.
+
+    Args:
+        diff_summary: The full diff summary text
+
+    Returns:
+        The original or truncated diff summary.
+    """
+    if len(diff_summary) <= MAX_DIFF_CHARS:
+        return diff_summary
+
+    lines = diff_summary.splitlines()
+    summary_lines: list[str] = []
+    summary_lines.append("(Diff truncated to file-level summaries due to size)")
+    summary_lines.append("")
+
+    for line in lines:
+        # Keep file-level summary lines (stat lines, file headers, etc.)
+        stripped = line.strip()
+        if (
+            stripped.startswith("diff --git")
+            or stripped.startswith("---")
+            or stripped.startswith("+++")
+            or "file changed" in stripped.lower()
+            or "files changed" in stripped.lower()
+            or "insertion" in stripped.lower()
+            or "deletion" in stripped.lower()
+            or stripped.startswith("rename")
+            or stripped.startswith("new file")
+            or stripped.startswith("deleted file")
+            or stripped.startswith("Binary files")
+        ):
+            summary_lines.append(line)
+
+    # If we couldn't extract meaningful summaries, take the first chunk
+    if len(summary_lines) <= 2:
+        truncated = diff_summary[:MAX_DIFF_CHARS]
+        return truncated + "\n\n(... diff truncated due to size)"
+
+    return "\n".join(summary_lines)
+
+
+def _strip_markdown_fences(content: str) -> str:
+    """
+    Strip markdown code fences from the response if present.
+
+    The AI sometimes wraps the output in ```markdown ... ``` even when instructed
+    not to. This ensures the PR body renders correctly on GitHub.
+
+    Args:
+        content: The response content to clean
+
+    Returns:
+        The content with markdown fences stripped.
+    """
+    result = content
+
+    # Strip opening fence (```markdown or just ```)
+    if result.startswith("```markdown"):
+        result = result[len("```markdown") :].lstrip("\n")
+    elif result.startswith("```md"):
+        result = result[len("```md") :].lstrip("\n")
+    elif result.startswith("```"):
+        result = result[3:].lstrip("\n")
+
+    # Strip closing fence
+    if result.endswith("```"):
+        result = result[:-3].rstrip("\n")
+
+    return result.strip()
+
+
+def _build_prompt(
+    template_content: str,
+    diff_summary: str,
+    spec_overview: str,
+    commit_log: str,
+    branch_name: str,
+    target_branch: str,
+) -> str:
+    """
+    Build the prompt for the PR template filler agent.
+
+    Combines the system prompt context variables into a single message
+    that includes the template and all change context.
+
+    Args:
+        template_content: The PR template markdown
+        diff_summary: Git diff summary (possibly truncated)
+        spec_overview: Spec.md content or summary
+        commit_log: Git log of commits in the PR
+        branch_name: Source branch name
+        target_branch: Target branch name
+
+    Returns:
+        The assembled prompt string.
+    """
+    return f"""Fill out the following GitHub PR template using the provided context.
+Return ONLY the filled template markdown — no preamble, no explanation, no code fences.
+
+## Checkbox Guidelines
+
+IMPORTANT: Be accurate and honest about what has and hasn't been verified.
+
+**Check these based on context (you can infer from the diff/spec):**
+- Base Branch targeting — check based on target_branch value
+- Type of Change (bug fix, feature, docs, refactor, test) — infer from diff and spec
+- Area (Frontend, Backend, Fullstack) — infer from changed file paths
+- Feature Toggle "N/A" — if the feature appears complete and not behind a flag
+- Breaking Changes "No" — if changes appear backward compatible
+
+**Leave UNCHECKED (these require human verification you cannot perform):**
+- "I've tested my changes locally" — you have not tested anything
+- "All CI checks pass" — CI has not run yet
+- "Windows/macOS/Linux tested" — requires manual testing on each platform
+- "All existing tests pass" — CI has not run yet
+- "New features include test coverage" — unless test files are clearly visible in the diff
+- "Bug fixes include regression tests" — unless test files are clearly visible in the diff
+
+**For platform/code quality checkboxes:**
+- "Used centralized platform/ module" — leave unchecked unless you can verify from the diff
+- "No hardcoded paths" — leave unchecked unless you can verify from the diff
+- "PR is small and focused (< 400 lines)" — check only if diff stats show < 400 lines changed
+
+**For the "I've synced with develop branch" checkbox:**
+- Leave unchecked — you cannot verify the sync status
+
+## PR Template
+
+{template_content}
+
+## Change Context
+
+### Branch Information
+- **Source branch:** {branch_name}
+- **Target branch:** {target_branch}
+
+### Git Diff Summary
+```
+{diff_summary}
+```
+
+### Spec Overview
+{spec_overview}
+
+### Commit History
+```
+{commit_log}
+```
+
+Fill every section of the PR template. Follow the checkbox guidelines above carefully.
+Output ONLY the completed template — no code fences, no preamble."""
+
+
+def _load_spec_overview(spec_dir: Path) -> str:
+    """
+    Load the spec.md content for context. Falls back to a brief note if unavailable.
+
+    Args:
+        spec_dir: Directory containing the spec files
+
+    Returns:
+        The spec content or a fallback message.
+    """
+    spec_file = spec_dir / "spec.md"
+    if spec_file.is_file():
+        try:
+            content = spec_file.read_text(encoding="utf-8")
+            # Truncate very long specs to keep prompt manageable
+            if len(content) > 8000:
+                return content[:8000] + "\n\n(... spec truncated for brevity)"
+            return content
+        except Exception as e:
+            logger.warning(f"Failed to read spec.md: {e}")
+    return "(No spec overview available)"
+
+
+async def run_pr_template_filler(
+    project_dir: Path,
+    spec_dir: Path,
+    model: str,
+    thinking_budget: int | None = None,
+    branch_name: str = "",
+    target_branch: str = "develop",
+    diff_summary: str = "",
+    commit_log: str = "",
+    verbose: bool = False,
+) -> str | None:
+    """
+    Run the PR template filler agent to generate a filled PR body.
+
+    Detects the project's PR template, gathers change context, and invokes
+    Claude to intelligently fill out the template sections.
+
+    Args:
+        project_dir: Root directory of the project
+        spec_dir: Directory containing the spec files
+        model: Claude model to use
+        thinking_budget: Max thinking tokens (None to disable extended thinking)
+        branch_name: Source branch name for the PR
+        target_branch: Target branch name for the PR
+        diff_summary: Git diff summary of changes
+        commit_log: Git log of commits included in the PR
+        verbose: Whether to show detailed output
+
+    Returns:
+        The filled template markdown string, or None if template detection fails
+        or the agent encounters an error.
+    """
+    # Detect PR template
+    template_content = detect_pr_template(project_dir)
+    if template_content is None:
+        logger.info("No PR template detected — skipping template filler")
+        return None
+
+    # Load spec overview
+    spec_overview = _load_spec_overview(spec_dir)
+
+    # Truncate diff if too large
+    truncated_diff = _truncate_diff(diff_summary)
+
+    # Build the prompt
+    prompt = _build_prompt(
+        template_content=template_content,
+        diff_summary=truncated_diff,
+        spec_overview=spec_overview,
+        commit_log=commit_log,
+        branch_name=branch_name,
+        target_branch=target_branch,
+    )
+
+    # Initialize task logger
+    task_logger = get_task_logger(spec_dir)
+    if task_logger:
+        task_logger.start_phase(LogPhase.CODING, "PR template filling")
+
+    # Create client following the pattern from planner.py
+    client = create_client(
+        project_dir,
+        spec_dir,
+        model,
+        agent_type="pr_template_filler",
+        max_thinking_tokens=thinking_budget,
+    )
+
+    try:
+        async with client:
+            status, response, _ = await run_agent_session(
+                client, prompt, spec_dir, verbose, phase=LogPhase.CODING
+            )
+
+        if task_logger:
+            task_logger.end_phase(
+                LogPhase.CODING,
+                success=(status != "error"),
+                message="PR template filling completed",
+            )
+
+        if status == "error":
+            logger.error("PR template filler agent returned an error")
+            return None
+
+        # The agent should return only the filled template markdown
+        if response and response.strip():
+            result = _strip_markdown_fences(response.strip())
+            logger.info("PR template filled successfully")
+            return result
+
+        logger.warning("PR template filler returned empty response")
+        return None
+
+    except Exception as e:
+        logger.error(f"PR template filler error: {e}")
+        if task_logger:
+            task_logger.log_error(f"PR template filler error: {e}", LogPhase.CODING)
+        return None

apps/backend/agents/test_refactoring.py

@@ -1,159 +0,0 @@
-#!/usr/bin/env python3
-"""
-Verification script for agent module refactoring.
-
-This script verifies that:
-1. All modules can be imported
-2. All public API functions are accessible
-3. Backwards compatibility is maintained
-"""
-
-import sys
-from pathlib import Path
-
-# Add parent directory to path
-sys.path.insert(0, str(Path(__file__).parent.parent))
-
-
-def test_imports():
-    """Test that all modules can be imported."""
-    print("Testing module imports...")
-
-    # Test base module
-    from agents import base
-
-    assert hasattr(base, "AUTO_CONTINUE_DELAY_SECONDS")
-    assert hasattr(base, "HUMAN_INTERVENTION_FILE")
-    print("  ✓ agents.base")
-
-    # Test utils module
-    from agents import utils
-
-    assert hasattr(utils, "get_latest_commit")
-    assert hasattr(utils, "load_implementation_plan")
-    print("  ✓ agents.utils")
-
-    # Test memory module
-    from agents import memory
-
-    assert hasattr(memory, "save_session_memory")
-    assert hasattr(memory, "get_graphiti_context")
-    print("  ✓ agents.memory")
-
-    # Test session module
-    from agents import session
-
-    assert hasattr(session, "run_agent_session")
-    assert hasattr(session, "post_session_processing")
-    print("  ✓ agents.session")
-
-    # Test planner module
-    from agents import planner
-
-    assert hasattr(planner, "run_followup_planner")
-    print("  ✓ agents.planner")
-
-    # Test coder module
-    from agents import coder
-
-    assert hasattr(coder, "run_autonomous_agent")
-    print("  ✓ agents.coder")
-
-    print("\n✓ All module imports successful!\n")
-
-
-def test_public_api():
-    """Test that the public API is accessible."""
-    print("Testing public API...")
-
-    # Test main agent module exports
-    import agents
-
-    required_functions = [
-        "run_autonomous_agent",
-        "run_followup_planner",
-        "save_session_memory",
-        "get_graphiti_context",
-        "run_agent_session",
-        "post_session_processing",
-        "get_latest_commit",
-        "load_implementation_plan",
-    ]
-
-    for func_name in required_functions:
-        assert hasattr(agents, func_name), f"Missing function: {func_name}"
-        print(f"  ✓ agents.{func_name}")
-
-    print("\n✓ All public API functions accessible!\n")
-
-
-def test_backwards_compatibility():
-    """Test that the old agent.py facade maintains backwards compatibility."""
-    print("Testing backwards compatibility...")
-
-    # Test that agent.py can be imported
-    import agent
-
-    required_functions = [
-        "run_autonomous_agent",
-        "run_followup_planner",
-        "save_session_memory",
-        "save_session_to_graphiti",
-        "run_agent_session",
-        "post_session_processing",
-    ]
-
-    for func_name in required_functions:
-        assert hasattr(agent, func_name), (
-            f"Missing function in agent module: {func_name}"
-        )
-        print(f"  ✓ agent.{func_name}")
-
-    print("\n✓ Backwards compatibility maintained!\n")
-
-
-def test_module_structure():
-    """Test that the module structure is correct."""
-    print("Testing module structure...")
-
-    from pathlib import Path
-
-    agents_dir = Path(__file__).parent
-
-    required_files = [
-        "__init__.py",
-        "base.py",
-        "utils.py",
-        "memory.py",
-        "session.py",
-        "planner.py",
-        "coder.py",
-    ]
-
-    for filename in required_files:
-        filepath = agents_dir / filename
-        assert filepath.exists(), f"Missing file: {filename}"
-        print(f"  ✓ agents/{filename}")
-
-    print("\n✓ Module structure correct!\n")
-
-
-if __name__ == "__main__":
-    try:
-        test_module_structure()
-        test_imports()
-        test_public_api()
-        test_backwards_compatibility()
-
-        print("=" * 60)
-        print("✓ ALL TESTS PASSED - Refactoring verified!")
-        print("=" * 60)
-
-    except AssertionError as e:
-        print(f"\n✗ TEST FAILED: {e}")
-        sys.exit(1)
-    except ImportError as e:
-        print(f"\n✗ IMPORT ERROR: {e}")
-        print("Note: Some imports may fail due to missing dependencies.")
-        print("This is expected in test environments.")
-        sys.exit(0)  # Don't fail on import errors (expected in test env)

apps/backend/agents/tools_pkg/models.py

@@ -46,7 +46,7 @@ TOOL_UPDATE_QA_STATUS = "mcp__auto-claude__update_qa_status"
 # Context7 MCP tools for documentation lookup (always enabled)
 CONTEXT7_TOOLS = [
     "mcp__context7__resolve-library-id",
-    "mcp__context7__get-library-docs",
+    "mcp__context7__query-docs",
 ]
 
 # Linear MCP tools for project management (when LINEAR_API_KEY is set)
@@ -158,7 +158,7 @@ AGENT_CONFIGS = {
         "tools": BASE_READ_TOOLS,
         "mcp_servers": [],  # Self-critique, no external tools
         "auto_claude_tools": [],
-        "thinking_default": "ultrathink",
+        "thinking_default": "high",
     },
     "spec_discovery": {
         "tools": BASE_READ_TOOLS + WEB_TOOLS,
@@ -210,7 +210,7 @@ AGENT_CONFIGS = {
             TOOL_RECORD_GOTCHA,
             TOOL_GET_SESSION_CONTEXT,
         ],
-        "thinking_default": "none",  # Coding doesn't use extended thinking
+        "thinking_default": "low",  # Coding uses minimal thinking (effort: low for Opus, 1024 tokens for Sonnet/Haiku)
     },
     # ═══════════════════════════════════════════════════════════════════════
     # QA PHASES (Read + test + browser + Graphiti memory)
@@ -247,9 +247,9 @@ AGENT_CONFIGS = {
         "tools": BASE_READ_TOOLS + WEB_TOOLS,
         "mcp_servers": [],
         "auto_claude_tools": [],
-        # Note: Default to "none" because insight_extractor uses Haiku which doesn't support thinking
-        # If using Sonnet/Opus models, override max_thinking_tokens in create_simple_client()
-        "thinking_default": "none",
+        # Note: Default to "low" for minimal thinking overhead
+        # Haiku doesn't support thinking; create_simple_client() handles this
+        "thinking_default": "low",
     },
     "merge_resolver": {
         "tools": [],  # Text-only analysis
@@ -263,6 +263,12 @@ AGENT_CONFIGS = {
         "auto_claude_tools": [],
         "thinking_default": "low",
     },
+    "pr_template_filler": {
+        "tools": BASE_READ_TOOLS,  # Read-only — reads diff, template, spec
+        "mcp_servers": [],  # No MCP needed, context passed via prompt
+        "auto_claude_tools": [],
+        "thinking_default": "low",  # Fast utility task for structured fill-in
+    },
     "pr_reviewer": {
         "tools": BASE_READ_TOOLS + WEB_TOOLS,  # Read-only
         "mcp_servers": ["context7"],
@@ -270,18 +276,38 @@ AGENT_CONFIGS = {
         "thinking_default": "high",
     },
     "pr_orchestrator_parallel": {
-        "tools": BASE_READ_TOOLS + WEB_TOOLS,  # Read-only for parallel PR orchestrator
+        # Read-only for parallel PR orchestrator
+        # NOTE: Do NOT add "Task" here - the SDK auto-allows Task when agents are defined
+        # via the --agents flag. Explicitly adding it interferes with agent registration.
+        "tools": BASE_READ_TOOLS + WEB_TOOLS,
         "mcp_servers": ["context7"],
         "auto_claude_tools": [],
         "thinking_default": "high",
     },
     "pr_followup_parallel": {
-        "tools": BASE_READ_TOOLS
-        + WEB_TOOLS,  # Read-only for parallel followup reviewer
+        # Read-only for parallel followup reviewer
+        # NOTE: Do NOT add "Task" here - same reason as pr_orchestrator_parallel
+        "tools": BASE_READ_TOOLS + WEB_TOOLS,
         "mcp_servers": ["context7"],
         "auto_claude_tools": [],
         "thinking_default": "high",
     },
+    "pr_followup_extraction": {
+        # Lightweight extraction call for recovering data when structured output fails
+        # Pure structured output extraction, no tools needed
+        "tools": [],
+        "mcp_servers": [],
+        "auto_claude_tools": [],
+        "thinking_default": "low",
+    },
+    "pr_finding_validator": {
+        # Standalone validator for re-checking findings against actual code
+        # Called separately from orchestrator to validate findings with fresh context
+        "tools": BASE_READ_TOOLS,
+        "mcp_servers": [],
+        "auto_claude_tools": [],
+        "thinking_default": "medium",
+    },
     # ═══════════════════════════════════════════════════════════════════════
     # ANALYSIS PHASES
     # ═══════════════════════════════════════════════════════════════════════
@@ -506,7 +532,7 @@ def get_default_thinking_level(agent_type: str) -> str:
         agent_type: The agent type identifier
 
     Returns:
-        Thinking level string (none, low, medium, high, ultrathink)
+        Thinking level string (low, medium, high)
     """
     config = get_agent_config(agent_type)
     return config.get("thinking_default", "medium")

apps/backend/agents/tools_pkg/tools/qa.py

@@ -56,14 +56,10 @@ def _apply_qa_update(
         "ready_for_qa_revalidation": status == "fixes_applied",
     }
 
-    # Update plan status to match QA result
-    # This ensures the UI shows the correct column after QA
-    if status == "approved":
-        plan["status"] = "human_review"
-        plan["planStatus"] = "review"
-    elif status == "rejected":
-        plan["status"] = "human_review"
-        plan["planStatus"] = "review"
+    # NOTE: Do NOT write plan["status"] or plan["planStatus"] here.
+    # The frontend XState task state machine owns status transitions.
+    # Writing status here races with XState's persistPlanStatusAndReasonSync()
+    # and can clobber the reviewReason field, causing tasks to appear "incomplete".
 
     plan["last_updated"] = datetime.now(timezone.utc).isoformat()
 

apps/backend/analysis/__init__.py

@@ -23,7 +23,8 @@ from .ci_discovery import CIDiscovery
 from .project_analyzer import ProjectAnalyzer
 from .risk_classifier import RiskClassifier
 from .security_scanner import SecurityScanner
-from .test_discovery import TestDiscovery
+
+# TestDiscovery was removed - tests are now co-located in their respective modules
 
 # insight_extractor is a module with functions, not a class, so don't import it here
 # Import it directly when needed: from analysis import insight_extractor
@@ -37,5 +38,5 @@ __all__ = [
     "RiskClassifier",
     "SecurityScanner",
     "CIDiscovery",
-    "TestDiscovery",
+    # "TestDiscovery",  # Removed - tests now co-located in their modules
 ]

apps/backend/analysis/analyzers/framework_analyzer.py

@@ -235,10 +235,15 @@ class FrameworkAnalyzer(BaseAnalyzer):
 
         # Scripts
         scripts = pkg.get("scripts", {})
+        pkg_mgr = self.analysis.get("package_manager", "npm")
         if "dev" in scripts:
-            self.analysis["dev_command"] = "npm run dev"
+            self.analysis["dev_command"] = f"{pkg_mgr} run dev"
         elif "start" in scripts:
-            self.analysis["dev_command"] = "npm run start"
+            self.analysis["dev_command"] = f"{pkg_mgr} run start"
+
+        # Capture available scripts for downstream consumers (QA agents, init.sh)
+        if scripts:
+            self.analysis["scripts"] = dict(scripts)
 
     def _detect_go_framework(self, content: str) -> None:
         """Detect Go framework."""

apps/backend/analysis/analyzers/project_analyzer_module.py

@@ -31,6 +31,7 @@ class ProjectAnalyzer:
         """Run full project analysis."""
         self._detect_project_type()
         self._find_and_analyze_services()
+        self._aggregate_dependency_locations()
         self._analyze_infrastructure()
         self._detect_conventions()
         self._map_dependencies()
@@ -124,6 +125,63 @@ class ProjectAnalyzer:
 
         self.index["services"] = services
 
+    def _aggregate_dependency_locations(self) -> None:
+        """Aggregate dependency location metadata from all services.
+
+        Collects dependency_locations from each service and stores them as
+        paths relative to the project root (e.g., 'apps/backend/.venv'
+        instead of just '.venv').
+        """
+        aggregated: list[dict[str, Any]] = []
+
+        for service_name, service_info in self.index.get("services", {}).items():
+            service_deps = service_info.get("dependency_locations", [])
+            service_path = service_info.get("path", "")
+
+            # Compute service-relative prefix once per service
+            service_rel: Path | None = None
+            if service_path:
+                try:
+                    service_rel = Path(service_path).relative_to(self.project_dir)
+                except ValueError:
+                    # Service path is outside the project root — skip its deps
+                    # to avoid producing absolute paths that bypass containment
+                    continue
+
+            for dep in service_deps:
+                dep_path = dep.get("path")
+                if not dep_path:
+                    continue
+
+                # Build project-relative path from service path + dep path
+                if service_rel is not None:
+                    project_relative = str(service_rel / dep_path)
+                else:
+                    project_relative = dep_path
+
+                entry: dict[str, Any] = {
+                    "type": dep.get("type", "unknown"),
+                    "path": project_relative,
+                    "exists": dep.get("exists", False),
+                    "service": service_name,
+                }
+                if dep.get("requirements_file"):
+                    # Convert to project-relative path like we do for "path"
+                    if service_rel is not None:
+                        entry["requirements_file"] = str(
+                            service_rel / dep["requirements_file"]
+                        )
+                    else:
+                        entry["requirements_file"] = dep["requirements_file"]
+                pkg_mgr = dep.get("package_manager") or service_info.get(
+                    "package_manager"
+                )
+                if pkg_mgr:
+                    entry["package_manager"] = pkg_mgr
+                aggregated.append(entry)
+
+        self.index["dependency_locations"] = aggregated
+
     def _analyze_infrastructure(self) -> None:
         """Analyze infrastructure configuration."""
         infra = {}

apps/backend/analysis/analyzers/service_analyzer.py

@@ -40,6 +40,8 @@ class ServiceAnalyzer(BaseAnalyzer):
         self._find_key_directories()
         self._find_entry_points()
         self._detect_dependencies()
+        self._detect_dependency_locations()
+        self._detect_package_manager()
         self._detect_testing()
         self._find_dockerfile()
 
@@ -209,6 +211,121 @@ class ServiceAnalyzer(BaseAnalyzer):
                         deps.append(match.group(1))
             self.analysis["dependencies"] = deps[:20]
 
+    def _detect_dependency_locations(self) -> None:
+        """Detect where dependencies live on disk for this service."""
+        locations: list[dict[str, Any]] = []
+
+        # Node.js: node_modules (only if package.json exists)
+        if self._exists("package.json"):
+            node_modules = self.path / "node_modules"
+            locations.append(
+                {
+                    "type": "node_modules",
+                    "path": "node_modules",
+                    "exists": node_modules.exists() and node_modules.is_dir(),
+                }
+            )
+
+        # Python: .venv or venv
+        for venv_dir in [".venv", "venv"]:
+            venv_path = self.path / venv_dir
+            if venv_path.exists() and venv_path.is_dir():
+                entry: dict[str, Any] = {
+                    "type": "venv",
+                    "path": venv_dir,
+                    "exists": True,
+                }
+                # Find requirements file
+                for req_file in ["requirements.txt", "pyproject.toml", "Pipfile"]:
+                    if self._exists(req_file):
+                        entry["requirements_file"] = req_file
+                        break
+                locations.append(entry)
+                break
+        else:
+            # No venv found, still record requirements file if present
+            for req_file in ["requirements.txt", "pyproject.toml", "Pipfile"]:
+                if self._exists(req_file):
+                    locations.append(
+                        {
+                            "type": "venv",
+                            "path": ".venv",
+                            "exists": False,
+                            "requirements_file": req_file,
+                        }
+                    )
+                    break
+
+        # PHP: vendor
+        vendor_path = self.path / "vendor"
+        if vendor_path.exists() and vendor_path.is_dir():
+            locations.append(
+                {
+                    "type": "vendor_php",
+                    "path": "vendor",
+                    "exists": True,
+                }
+            )
+
+        # Rust: target
+        target_path = self.path / "target"
+        if target_path.exists() and target_path.is_dir():
+            locations.append(
+                {
+                    "type": "cargo_target",
+                    "path": "target",
+                    "exists": True,
+                }
+            )
+
+        # Ruby: vendor/bundle
+        bundle_path = self.path / "vendor" / "bundle"
+        if bundle_path.exists() and bundle_path.is_dir():
+            locations.append(
+                {
+                    "type": "vendor_bundle",
+                    "path": "vendor/bundle",
+                    "exists": True,
+                }
+            )
+
+        self.analysis["dependency_locations"] = locations
+
+    def _detect_package_manager(self) -> None:
+        """Detect the package manager used by this service."""
+        # Node.js package managers
+        if self._exists("package-lock.json"):
+            self.analysis["package_manager"] = "npm"
+        elif self._exists("yarn.lock"):
+            self.analysis["package_manager"] = "yarn"
+        elif self._exists("pnpm-lock.yaml"):
+            self.analysis["package_manager"] = "pnpm"
+        elif self._exists("bun.lockb") or self._exists("bun.lock"):
+            self.analysis["package_manager"] = "bun"
+        # Python package managers
+        elif self._exists("Pipfile"):
+            self.analysis["package_manager"] = "pipenv"
+        elif self._exists("pyproject.toml"):
+            if self._exists("uv.lock"):
+                self.analysis["package_manager"] = "uv"
+            elif self._exists("poetry.lock"):
+                self.analysis["package_manager"] = "poetry"
+            else:
+                self.analysis["package_manager"] = "pip"
+        elif self._exists("requirements.txt"):
+            self.analysis["package_manager"] = "pip"
+        # Other
+        elif self._exists("Cargo.toml"):
+            self.analysis["package_manager"] = "cargo"
+        elif self._exists("go.mod"):
+            self.analysis["package_manager"] = "go_mod"
+        elif self._exists("Gemfile"):
+            self.analysis["package_manager"] = "gem"
+        elif self._exists("composer.json"):
+            self.analysis["package_manager"] = "composer"
+        else:
+            self.analysis["package_manager"] = None
+
     def _detect_testing(self) -> None:
         """Detect testing framework and configuration."""
         if self._exists("package.json"):

apps/backend/analysis/test_discovery.py

@@ -1,690 +0,0 @@
-#!/usr/bin/env python3
-"""
-Test Discovery Module
-=====================
-
-Detects test frameworks, test commands, and test directories in a project.
-This module analyzes project configuration files to discover how tests
-should be run.
-
-The test discovery results are used by:
-- QA Agent: To determine what test commands to run
-- Test Creator: To know what framework to use when creating tests
-- Planner: To include correct test commands in verification strategy
-
-Usage:
-    from test_discovery import TestDiscovery
-
-    discovery = TestDiscovery()
-    result = discovery.discover(project_dir)
-
-    print(f"Test frameworks: {result['frameworks']}")
-    print(f"Test command: {result['test_command']}")
-"""
-
-from __future__ import annotations
-
-import json
-from dataclasses import dataclass, field
-from pathlib import Path
-from typing import Any
-
-# =============================================================================
-# DATA CLASSES
-# =============================================================================
-
-
-@dataclass
-class TestFramework:
-    """
-    Represents a detected test framework.
-
-    Attributes:
-        name: Name of the framework (e.g., "pytest", "jest", "vitest")
-        type: Type of testing (unit, integration, e2e, all)
-        command: Command to run tests
-        config_file: Configuration file if found
-        version: Version if detected
-        coverage_command: Command for coverage if available
-    """
-
-    __test__ = False  # Prevent pytest from collecting this as a test class
-
-    name: str
-    type: str  # unit, integration, e2e, all
-    command: str
-    config_file: str | None = None
-    version: str | None = None
-    coverage_command: str | None = None
-
-
-@dataclass
-class TestDiscoveryResult:
-    """
-    Result of test framework discovery.
-
-    Attributes:
-        frameworks: List of detected test frameworks
-        test_command: Primary test command to run
-        test_directories: Discovered test directories
-        package_manager: Detected package manager
-        has_tests: Whether any test files were found
-        coverage_command: Command for coverage if available
-    """
-
-    __test__ = False  # Prevent pytest from collecting this as a test class
-
-    frameworks: list[TestFramework] = field(default_factory=list)
-    test_command: str = ""
-    test_directories: list[str] = field(default_factory=list)
-    package_manager: str = ""
-    has_tests: bool = False
-    coverage_command: str | None = None
-
-
-# =============================================================================
-# FRAMEWORK DETECTORS
-# =============================================================================
-
-
-# Pattern-based framework detection
-FRAMEWORK_PATTERNS = {
-    # JavaScript/TypeScript
-    "jest": {
-        "config_files": [
-            "jest.config.js",
-            "jest.config.ts",
-            "jest.config.mjs",
-            "jest.config.cjs",
-        ],
-        "package_key": "jest",
-        "type": "unit",
-        "command": "npx jest",
-        "coverage_command": "npx jest --coverage",
-    },
-    "vitest": {
-        "config_files": ["vitest.config.js", "vitest.config.ts", "vitest.config.mjs"],
-        "package_key": "vitest",
-        "type": "unit",
-        "command": "npx vitest run",
-        "coverage_command": "npx vitest run --coverage",
-    },
-    "mocha": {
-        "config_files": [
-            ".mocharc.js",
-            ".mocharc.json",
-            ".mocharc.yaml",
-            ".mocharc.yml",
-        ],
-        "package_key": "mocha",
-        "type": "unit",
-        "command": "npx mocha",
-        "coverage_command": "npx nyc mocha",
-    },
-    "playwright": {
-        "config_files": ["playwright.config.js", "playwright.config.ts"],
-        "package_key": "@playwright/test",
-        "type": "e2e",
-        "command": "npx playwright test",
-        "coverage_command": None,
-    },
-    "cypress": {
-        "config_files": ["cypress.config.js", "cypress.config.ts", "cypress.json"],
-        "package_key": "cypress",
-        "type": "e2e",
-        "command": "npx cypress run",
-        "coverage_command": None,
-    },
-    # Python
-    "pytest": {
-        "config_files": ["pytest.ini", "pyproject.toml", "setup.cfg", "conftest.py"],
-        "pyproject_key": "pytest",
-        "requirements_key": "pytest",
-        "type": "all",
-        "command": "pytest",
-        "coverage_command": "pytest --cov",
-    },
-    "unittest": {
-        "config_files": [],
-        "type": "unit",
-        "command": "python -m unittest discover",
-        "coverage_command": "coverage run -m unittest discover",
-    },
-    # Rust
-    "cargo_test": {
-        "config_files": ["Cargo.toml"],
-        "type": "all",
-        "command": "cargo test",
-        "coverage_command": "cargo tarpaulin",
-    },
-    # Go
-    "go_test": {
-        "config_files": ["go.mod"],
-        "type": "all",
-        "command": "go test ./...",
-        "coverage_command": "go test -cover ./...",
-    },
-    # Ruby
-    "rspec": {
-        "config_files": [".rspec", "spec/spec_helper.rb"],
-        "gemfile_key": "rspec",
-        "type": "all",
-        "command": "bundle exec rspec",
-        "coverage_command": "bundle exec rspec --format documentation",
-    },
-    "minitest": {
-        "config_files": [],
-        "gemfile_key": "minitest",
-        "type": "unit",
-        "command": "bundle exec rake test",
-        "coverage_command": None,
-    },
-}
-
-
-# =============================================================================
-# TEST DISCOVERY
-# =============================================================================
-
-
-class TestDiscovery:
-    """
-    Discovers test frameworks and configurations in a project.
-
-    Analyzes:
-    - Package files (package.json, pyproject.toml, Cargo.toml, etc.)
-    - Configuration files (jest.config.js, pytest.ini, etc.)
-    - Directory structure (tests/, spec/, __tests__/)
-    """
-
-    __test__ = False  # Prevent pytest from collecting this as a test class
-
-    def __init__(self) -> None:
-        """Initialize the test discovery."""
-        self._cache: dict[str, TestDiscoveryResult] = {}
-
-    def discover(self, project_dir: Path) -> TestDiscoveryResult:
-        """
-        Discover test frameworks and configuration in the project.
-
-        Args:
-            project_dir: Path to the project root
-
-        Returns:
-            TestDiscoveryResult with detected frameworks and commands
-        """
-        project_dir = Path(project_dir)
-        cache_key = str(project_dir.resolve())
-
-        if cache_key in self._cache:
-            return self._cache[cache_key]
-
-        result = TestDiscoveryResult()
-
-        # Detect package manager
-        result.package_manager = self._detect_package_manager(project_dir)
-
-        # Discover frameworks based on project type
-        if (project_dir / "package.json").exists():
-            self._discover_js_frameworks(project_dir, result)
-
-        # Check for Python project indicators
-        python_indicators = [
-            project_dir / "pyproject.toml",
-            project_dir / "requirements.txt",
-            project_dir / "setup.py",
-            project_dir / "pytest.ini",
-            project_dir / "conftest.py",
-            project_dir / "tests" / "conftest.py",
-        ]
-        if any(p.exists() for p in python_indicators):
-            self._discover_python_frameworks(project_dir, result)
-
-        if (project_dir / "Cargo.toml").exists():
-            self._discover_rust_frameworks(project_dir, result)
-        if (project_dir / "go.mod").exists():
-            self._discover_go_frameworks(project_dir, result)
-        if (project_dir / "Gemfile").exists():
-            self._discover_ruby_frameworks(project_dir, result)
-
-        # Find test directories
-        result.test_directories = self._find_test_directories(project_dir)
-
-        # Check if tests exist
-        result.has_tests = self._has_test_files(project_dir, result.test_directories)
-
-        # Set primary test command
-        if result.frameworks:
-            result.test_command = result.frameworks[0].command
-
-        # Set coverage command from first framework that has one
-        if not result.coverage_command:
-            for framework in result.frameworks:
-                if framework.coverage_command:
-                    result.coverage_command = framework.coverage_command
-                    break
-
-        self._cache[cache_key] = result
-        return result
-
-    def _detect_package_manager(self, project_dir: Path) -> str:
-        """Detect the package manager used by the project."""
-        if (project_dir / "pnpm-lock.yaml").exists():
-            return "pnpm"
-        if (project_dir / "yarn.lock").exists():
-            return "yarn"
-        if (project_dir / "package-lock.json").exists():
-            return "npm"
-        if (project_dir / "bun.lockb").exists() or (project_dir / "bun.lock").exists():
-            return "bun"
-        if (project_dir / "uv.lock").exists():
-            return "uv"
-        if (project_dir / "poetry.lock").exists():
-            return "poetry"
-        if (project_dir / "Pipfile.lock").exists():
-            return "pipenv"
-        if (project_dir / "Cargo.lock").exists():
-            return "cargo"
-        if (project_dir / "go.sum").exists():
-            return "go"
-        if (project_dir / "Gemfile.lock").exists():
-            return "bundler"
-        return ""
-
-    def _discover_js_frameworks(
-        self, project_dir: Path, result: TestDiscoveryResult
-    ) -> None:
-        """Discover JavaScript/TypeScript test frameworks."""
-        package_json = project_dir / "package.json"
-        if not package_json.exists():
-            return
-
-        try:
-            with open(package_json, encoding="utf-8") as f:
-                pkg = json.load(f)
-        except (OSError, json.JSONDecodeError, UnicodeDecodeError):
-            return
-
-        deps = pkg.get("dependencies", {})
-        dev_deps = pkg.get("devDependencies", {})
-        all_deps = {**deps, **dev_deps}
-        scripts = pkg.get("scripts", {})
-
-        # Check for test frameworks in dependencies
-        for name, pattern in FRAMEWORK_PATTERNS.items():
-            if "package_key" not in pattern:
-                continue
-
-            if pattern["package_key"] in all_deps:
-                # Check for config file
-                config_file = None
-                for cf in pattern.get("config_files", []):
-                    if (project_dir / cf).exists():
-                        config_file = cf
-                        break
-
-                # Get version
-                version = all_deps.get(pattern["package_key"], "")
-                if version.startswith("^") or version.startswith("~"):
-                    version = version[1:]
-
-                # Determine command - prefer npm scripts if available
-                command = pattern["command"]
-                if "test" in scripts and pattern["package_key"] in scripts.get(
-                    "test", ""
-                ):
-                    command = f"{result.package_manager or 'npm'} test"
-
-                result.frameworks.append(
-                    TestFramework(
-                        name=name,
-                        type=pattern["type"],
-                        command=command,
-                        config_file=config_file,
-                        version=version,
-                        coverage_command=pattern.get("coverage_command"),
-                    )
-                )
-
-        # Check npm scripts for test commands
-        if not result.frameworks and "test" in scripts:
-            test_script = scripts["test"]
-            if (
-                test_script
-                and test_script != 'echo "Error: no test specified" && exit 1'
-            ):
-                # Try to infer framework from script
-                framework_name = "npm_test"
-                framework_type = "unit"
-
-                if "jest" in test_script:
-                    framework_name = "jest"
-                elif "vitest" in test_script:
-                    framework_name = "vitest"
-                elif "mocha" in test_script:
-                    framework_name = "mocha"
-                elif "playwright" in test_script:
-                    framework_name = "playwright"
-                    framework_type = "e2e"
-                elif "cypress" in test_script:
-                    framework_name = "cypress"
-                    framework_type = "e2e"
-
-                result.frameworks.append(
-                    TestFramework(
-                        name=framework_name,
-                        type=framework_type,
-                        command=f"{result.package_manager or 'npm'} test",
-                        config_file=None,
-                    )
-                )
-
-    def _discover_python_frameworks(
-        self, project_dir: Path, result: TestDiscoveryResult
-    ) -> None:
-        """Discover Python test frameworks."""
-        # Check for pytest.ini first (explicit pytest config)
-        if (project_dir / "pytest.ini").exists():
-            if not any(f.name == "pytest" for f in result.frameworks):
-                result.frameworks.append(
-                    TestFramework(
-                        name="pytest",
-                        type="all",
-                        command="pytest",
-                        config_file="pytest.ini",
-                    )
-                )
-
-        # Check pyproject.toml
-        pyproject = project_dir / "pyproject.toml"
-        if pyproject.exists():
-            content = pyproject.read_text(encoding="utf-8")
-
-            # Check for pytest
-            if "pytest" in content:
-                if not any(f.name == "pytest" for f in result.frameworks):
-                    config_file = (
-                        "pyproject.toml" if "[tool.pytest" in content else None
-                    )
-                    result.frameworks.append(
-                        TestFramework(
-                            name="pytest",
-                            type="all",
-                            command="pytest",
-                            config_file=config_file,
-                        )
-                    )
-
-        # Check requirements.txt
-        requirements = project_dir / "requirements.txt"
-        if requirements.exists():
-            content = requirements.read_text(encoding="utf-8").lower()
-            if "pytest" in content and not any(
-                f.name == "pytest" for f in result.frameworks
-            ):
-                result.frameworks.append(
-                    TestFramework(
-                        name="pytest",
-                        type="all",
-                        command="pytest",
-                        config_file=None,
-                    )
-                )
-
-        # Check for conftest.py (pytest marker)
-        conftest_root = project_dir / "conftest.py"
-        conftest_tests = project_dir / "tests" / "conftest.py"
-        if conftest_root.exists() or conftest_tests.exists():
-            if not any(f.name == "pytest" for f in result.frameworks):
-                result.frameworks.append(
-                    TestFramework(
-                        name="pytest",
-                        type="all",
-                        command="pytest",
-                        config_file="conftest.py",
-                    )
-                )
-
-        # Fall back to unittest if test files exist but no framework detected
-        if not result.frameworks:
-            test_dirs = self._find_test_directories(project_dir)
-            if test_dirs:
-                result.frameworks.append(
-                    TestFramework(
-                        name="unittest",
-                        type="unit",
-                        command="python -m unittest discover",
-                        config_file=None,
-                    )
-                )
-
-    def _discover_rust_frameworks(
-        self, project_dir: Path, result: TestDiscoveryResult
-    ) -> None:
-        """Discover Rust test frameworks."""
-        cargo_toml = project_dir / "Cargo.toml"
-        if cargo_toml.exists():
-            result.frameworks.append(
-                TestFramework(
-                    name="cargo_test",
-                    type="all",
-                    command="cargo test",
-                    config_file="Cargo.toml",
-                )
-            )
-
-    def _discover_go_frameworks(
-        self, project_dir: Path, result: TestDiscoveryResult
-    ) -> None:
-        """Discover Go test frameworks."""
-        go_mod = project_dir / "go.mod"
-        if go_mod.exists():
-            result.frameworks.append(
-                TestFramework(
-                    name="go_test",
-                    type="all",
-                    command="go test ./...",
-                    config_file="go.mod",
-                )
-            )
-
-    def _discover_ruby_frameworks(
-        self, project_dir: Path, result: TestDiscoveryResult
-    ) -> None:
-        """Discover Ruby test frameworks."""
-        gemfile = project_dir / "Gemfile"
-        if not gemfile.exists():
-            return
-
-        content = gemfile.read_text(encoding="utf-8").lower()
-
-        if "rspec" in content or (project_dir / ".rspec").exists():
-            result.frameworks.append(
-                TestFramework(
-                    name="rspec",
-                    type="all",
-                    command="bundle exec rspec",
-                    config_file=".rspec" if (project_dir / ".rspec").exists() else None,
-                )
-            )
-        elif "minitest" in content:
-            result.frameworks.append(
-                TestFramework(
-                    name="minitest",
-                    type="unit",
-                    command="bundle exec rake test",
-                    config_file=None,
-                )
-            )
-
-    def _find_test_directories(self, project_dir: Path) -> list[str]:
-        """Find test directories in the project."""
-        test_dir_patterns = [
-            "tests",
-            "test",
-            "spec",
-            "__tests__",
-            "specs",
-            "test_*",
-        ]
-
-        found_dirs = []
-        for pattern in test_dir_patterns:
-            if pattern.endswith("*"):
-                # Glob pattern
-                for d in project_dir.glob(pattern):
-                    if d.is_dir():
-                        found_dirs.append(str(d.relative_to(project_dir)))
-            else:
-                # Exact name
-                test_dir = project_dir / pattern
-                if test_dir.is_dir():
-                    found_dirs.append(pattern)
-
-        return found_dirs
-
-    def _has_test_files(self, project_dir: Path, test_directories: list[str]) -> bool:
-        """Check if any test files exist."""
-        test_file_patterns = [
-            "**/test_*.py",
-            "**/*_test.py",
-            "**/*.test.js",
-            "**/*.test.ts",
-            "**/*.test.tsx",
-            "**/*.spec.js",
-            "**/*.spec.ts",
-            "**/*.spec.tsx",
-            "**/test_*.go",
-            "**/*_test.go",
-            "**/*_test.rs",
-            "**/spec/**/*_spec.rb",
-        ]
-
-        # Check in test directories
-        for test_dir in test_directories:
-            test_path = project_dir / test_dir
-            if test_path.exists():
-                for pattern in test_file_patterns:
-                    if list(test_path.glob(pattern.replace("**/", ""))):
-                        return True
-
-        # Check project-wide
-        for pattern in test_file_patterns:
-            if list(project_dir.glob(pattern)):
-                return True
-
-        return False
-
-    def to_dict(self, result: TestDiscoveryResult) -> dict[str, Any]:
-        """Convert result to dictionary for JSON serialization."""
-        return {
-            "frameworks": [
-                {
-                    "name": f.name,
-                    "type": f.type,
-                    "command": f.command,
-                    "config_file": f.config_file,
-                    "version": f.version,
-                    "coverage_command": f.coverage_command,
-                }
-                for f in result.frameworks
-            ],
-            "test_command": result.test_command,
-            "test_directories": result.test_directories,
-            "package_manager": result.package_manager,
-            "has_tests": result.has_tests,
-            "coverage_command": result.coverage_command,
-        }
-
-    def clear_cache(self) -> None:
-        """Clear the internal cache."""
-        self._cache.clear()
-
-
-# =============================================================================
-# CONVENIENCE FUNCTIONS
-# =============================================================================
-
-
-def discover_tests(project_dir: Path) -> TestDiscoveryResult:
-    """
-    Convenience function to discover tests in a project.
-
-    Args:
-        project_dir: Path to project root
-
-    Returns:
-        TestDiscoveryResult with detected frameworks
-    """
-    discovery = TestDiscovery()
-    return discovery.discover(project_dir)
-
-
-def get_test_command(project_dir: Path) -> str:
-    """
-    Get the primary test command for a project.
-
-    Args:
-        project_dir: Path to project root
-
-    Returns:
-        Test command string, or empty string if not found
-    """
-    discovery = TestDiscovery()
-    result = discovery.discover(project_dir)
-    return result.test_command
-
-
-def get_test_frameworks(project_dir: Path) -> list[str]:
-    """
-    Get list of test framework names in a project.
-
-    Args:
-        project_dir: Path to project root
-
-    Returns:
-        List of framework names
-    """
-    discovery = TestDiscovery()
-    result = discovery.discover(project_dir)
-    return [f.name for f in result.frameworks]
-
-
-# =============================================================================
-# CLI
-# =============================================================================
-
-
-def main() -> None:
-    """CLI entry point for testing."""
-    import argparse
-
-    parser = argparse.ArgumentParser(description="Discover test frameworks")
-    parser.add_argument("project_dir", type=Path, help="Path to project root")
-    parser.add_argument("--json", action="store_true", help="Output as JSON")
-
-    args = parser.parse_args()
-
-    discovery = TestDiscovery()
-    result = discovery.discover(args.project_dir)
-
-    if args.json:
-        print(json.dumps(discovery.to_dict(result), indent=2))
-    else:
-        print(f"Package Manager: {result.package_manager or 'unknown'}")
-        print(f"Has Tests: {result.has_tests}")
-        print(f"Test Command: {result.test_command or 'none'}")
-        print(f"Test Directories: {', '.join(result.test_directories) or 'none'}")
-        print(f"Coverage Command: {result.coverage_command or 'none'}")
-        print(f"\nFrameworks ({len(result.frameworks)}):")
-        for f in result.frameworks:
-            print(f"  - {f.name} ({f.type})")
-            print(f"    Command: {f.command}")
-            if f.config_file:
-                print(f"    Config: {f.config_file}")
-            if f.version:
-                print(f"    Version: {f.version}")
-
-
-if __name__ == "__main__":
-    main()

apps/backend/cli/batch_commands.py

@@ -10,6 +10,7 @@ import shutil
 import subprocess
 from pathlib import Path
 
+from qa.criteria import is_fixes_applied, is_qa_approved, is_qa_rejected
 from ui import highlight, print_status
 
 
@@ -151,13 +152,22 @@ def handle_batch_status_command(project_dir: str) -> bool:
             except json.JSONDecodeError:
                 pass
 
-        # Determine status
-        if (spec_dir / "spec.md").exists():
-            status = "spec_created"
-        elif (spec_dir / "implementation_plan.json").exists():
-            status = "building"
-        elif (spec_dir / "qa_report.md").exists():
+        # Determine status (highest priority first)
+        # Use authoritative QA status check, not just file existence
+        if is_qa_approved(spec_dir):
             status = "qa_approved"
+        elif is_qa_rejected(spec_dir):
+            status = "qa_rejected"
+        elif is_fixes_applied(spec_dir):
+            status = "fixes_applied"
+        elif (spec_dir / "implementation_plan.json").exists():
+            # Check if there's a qa_report.md but no approval yet (QA in progress)
+            if (spec_dir / "qa_report.md").exists():
+                status = "qa_in_progress"
+            else:
+                status = "building"
+        elif (spec_dir / "spec.md").exists():
+            status = "spec_created"
         else:
             status = "pending_spec"
 
@@ -165,7 +175,10 @@ def handle_batch_status_command(project_dir: str) -> bool:
             "pending_spec": "⏳",
             "spec_created": "📋",
             "building": "⚙️",
+            "qa_in_progress": "🔍",
             "qa_approved": "✅",
+            "qa_rejected": "❌",
+            "fixes_applied": "🔧",
             "unknown": "❓",
         }.get(status, "❓")
 
@@ -192,10 +205,10 @@ def handle_batch_cleanup_command(project_dir: str, dry_run: bool = True) -> bool
         print_status("No specs directory found", "info")
         return True
 
-    # Find completed specs
+    # Find completed specs (only QA-approved, matching status display logic)
     completed = []
     for spec_dir in specs_dir.iterdir():
-        if spec_dir.is_dir() and (spec_dir / "qa_report.md").exists():
+        if spec_dir.is_dir() and is_qa_approved(spec_dir):
             completed.append(spec_dir.name)
 
     if not completed:

apps/backend/cli/build_commands.py

@@ -87,7 +87,10 @@ def handle_build_command(
         debug_success,
     )
     from phase_config import get_phase_model
-    from prompts_pkg.prompts import get_base_branch_from_metadata
+    from prompts_pkg.prompts import (
+        get_base_branch_from_metadata,
+        get_use_local_branch_from_metadata,
+    )
     from qa_loop import run_qa_validation_loop, should_run_qa
 
     from .utils import print_banner, validate_environment
@@ -203,6 +206,9 @@ def handle_build_command(
             base_branch = metadata_branch
             debug("run.py", f"Using base branch from task metadata: {base_branch}")
 
+    # Check if user requested local branch (preserves gitignored files like .env)
+    use_local_branch = get_use_local_branch_from_metadata(spec_dir)
+
     if workspace_mode == WorkspaceMode.ISOLATED:
         # Keep reference to original spec directory for syncing progress back
         source_spec_dir = spec_dir
@@ -213,6 +219,7 @@ def handle_build_command(
             workspace_mode,
             source_spec_dir=spec_dir,
             base_branch=base_branch,
+            use_local_branch=use_local_branch,
         )
         # Use the localized spec directory (inside worktree) for AI access
         if localized_spec_dir:
@@ -442,7 +449,7 @@ def _handle_build_interrupt(
         if choice == "skip":
             print()
             print_status("Resuming build...", "info")
-            status_manager.update(state=BuildState.RUNNING)
+            status_manager.update(state=BuildState.BUILDING)
             asyncio.run(
                 run_autonomous_agent(
                     project_dir=working_dir,

apps/backend/cli/workspace_commands.py

@@ -536,6 +536,175 @@ def handle_cleanup_worktrees_command(project_dir: Path) -> None:
     cleanup_all_worktrees(project_dir, confirm=True)
 
 
+def _detect_conflict_scenario(
+    project_dir: Path,
+    conflicting_files: list[str],
+    spec_branch: str,
+    base_branch: str,
+) -> dict:
+    """
+    Analyze conflicting files to determine the conflict scenario.
+
+    This helps distinguish between:
+    - 'already_merged': Task changes already identical in target branch
+    - 'superseded': Target has newer version of same feature
+    - 'diverged': Standard diverged branches (AI can resolve)
+    - 'normal_conflict': Actual conflicting changes
+
+    Returns dict with:
+    - scenario: 'already_merged' | 'superseded' | 'diverged' | 'normal_conflict'
+    - already_merged_files: files identical in task and target
+    - details: additional context
+    """
+    if not conflicting_files:
+        return {
+            "scenario": "normal_conflict",
+            "already_merged_files": [],
+            "details": "No conflicting files to analyze",
+        }
+
+    already_merged_files = []
+    superseded_files = []
+    diverged_files = []
+
+    try:
+        # Get the merge-base commit
+        merge_base_result = subprocess.run(
+            ["git", "merge-base", base_branch, spec_branch],
+            cwd=project_dir,
+            capture_output=True,
+            text=True,
+        )
+        if merge_base_result.returncode != 0:
+            debug_warning(
+                MODULE, "Could not find merge base for conflict scenario detection"
+            )
+            return {
+                "scenario": "normal_conflict",
+                "already_merged_files": [],
+                "details": "Could not determine merge base",
+            }
+
+        merge_base = merge_base_result.stdout.strip()
+
+        for file_path in conflicting_files:
+            try:
+                # Get content from spec branch (task's changes)
+                spec_content_result = subprocess.run(
+                    ["git", "show", f"{spec_branch}:{file_path}"],
+                    cwd=project_dir,
+                    capture_output=True,
+                    text=True,
+                )
+                # Get content from base branch (target)
+                base_content_result = subprocess.run(
+                    ["git", "show", f"{base_branch}:{file_path}"],
+                    cwd=project_dir,
+                    capture_output=True,
+                    text=True,
+                )
+                # Get content from merge-base (original state)
+                merge_base_content_result = subprocess.run(
+                    ["git", "show", f"{merge_base}:{file_path}"],
+                    cwd=project_dir,
+                    capture_output=True,
+                    text=True,
+                )
+
+                # Check file existence in each ref
+                spec_exists = spec_content_result.returncode == 0
+                base_exists = base_content_result.returncode == 0
+                merge_base_exists = merge_base_content_result.returncode == 0
+
+                if spec_exists and base_exists:
+                    spec_content = spec_content_result.stdout
+                    base_content = base_content_result.stdout
+
+                    # If contents are identical, the changes are already merged
+                    if spec_content == base_content:
+                        already_merged_files.append(file_path)
+                        debug(
+                            MODULE,
+                            f"File {file_path}: already merged (identical content)",
+                        )
+                    elif merge_base_exists:
+                        merge_base_content = merge_base_content_result.stdout
+                        # If base has changed from merge_base but spec matches merge_base,
+                        # the task's changes are superseded by newer changes
+                        if spec_content == merge_base_content:
+                            superseded_files.append(file_path)
+                            debug(
+                                MODULE,
+                                f"File {file_path}: superseded (base has newer changes)",
+                            )
+                        else:
+                            diverged_files.append(file_path)
+                            debug(
+                                MODULE,
+                                f"File {file_path}: diverged (both branches modified)",
+                            )
+                    else:
+                        diverged_files.append(file_path)
+                else:
+                    diverged_files.append(file_path)
+
+            except Exception as e:
+                debug_warning(
+                    MODULE, f"Error analyzing file {file_path} for scenario: {e}"
+                )
+                diverged_files.append(file_path)
+
+        # Determine overall scenario based on dominant pattern
+        total_files = len(conflicting_files)
+
+        if len(already_merged_files) == total_files:
+            scenario = "already_merged"
+            details = "All conflicting files have identical content in both branches"
+        elif len(already_merged_files) > total_files / 2:
+            scenario = "already_merged"
+            details = f"{len(already_merged_files)} of {total_files} files already have the same content"
+        elif len(superseded_files) == total_files:
+            scenario = "superseded"
+            details = "All task changes have been superseded by newer changes in the target branch"
+        elif len(superseded_files) > total_files / 2:
+            scenario = "superseded"
+            details = (
+                f"{len(superseded_files)} of {total_files} files have been superseded"
+            )
+        elif diverged_files:
+            scenario = "diverged"
+            details = f"{len(diverged_files)} files have diverged and need AI merge"
+        else:
+            scenario = "normal_conflict"
+            details = "Standard merge conflicts detected"
+
+        debug(
+            MODULE,
+            f"Conflict scenario: {scenario}",
+            already_merged=len(already_merged_files),
+            superseded=len(superseded_files),
+            diverged=len(diverged_files),
+        )
+
+        return {
+            "scenario": scenario,
+            "already_merged_files": already_merged_files,
+            "superseded_files": superseded_files,
+            "diverged_files": diverged_files,
+            "details": details,
+        }
+
+    except Exception as e:
+        debug_error(MODULE, f"Error detecting conflict scenario: {e}")
+        return {
+            "scenario": "normal_conflict",
+            "already_merged_files": [],
+            "superseded_files": [],
+            "diverged_files": [],
+            "details": f"Error during analysis: {e}",
+        }
+
+
 def _check_git_merge_conflicts(
     project_dir: Path, spec_name: str, base_branch: str | None = None
 ) -> dict:
@@ -879,6 +1048,24 @@ def handle_merge_preview_command(
             f for f in git_conflicts.get("conflicting_files", []) if not is_lock_file(f)
         ]
 
+        # Detect conflict scenario (already_merged, superseded, diverged, normal_conflict)
+        # This helps the UI show appropriate messaging and actions
+        conflict_scenario = None
+        if non_lock_conflicting_files:
+            conflict_scenario = _detect_conflict_scenario(
+                project_dir,
+                non_lock_conflicting_files,
+                git_conflicts["spec_branch"],
+                git_conflicts["base_branch"],
+            )
+            debug(
+                MODULE,
+                f"Conflict scenario detected: {conflict_scenario.get('scenario')}",
+                already_merged_files=len(
+                    conflict_scenario.get("already_merged_files", [])
+                ),
+            )
+
         # Use git diff file count as the authoritative totalFiles count
         # The semantic tracker may not track all files (e.g., test files, config files)
         # but we want to show the user all files that will be merged
@@ -952,6 +1139,16 @@ def handle_merge_preview_command(
                 # Path-mapped files that need AI merge due to renames
                 "pathMappedAIMerges": path_mapped_ai_merges,
                 "totalRenames": len(path_mappings),
+                # Conflict scenario detection for better UX messaging
+                "scenario": conflict_scenario.get("scenario")
+                if conflict_scenario
+                else None,
+                "alreadyMergedFiles": conflict_scenario.get("already_merged_files", [])
+                if conflict_scenario
+                else [],
+                "scenarioMessage": conflict_scenario.get("details")
+                if conflict_scenario
+                else None,
             },
             "summary": {
                 # Use git diff count, not semantic tracker count

apps/backend/core/auth.py

@@ -6,6 +6,7 @@ for multiple environment variables, and SDK environment variable passthrough
 for custom API endpoints.
 """
 
+import hashlib
 import json
 import logging
 import os
@@ -14,6 +15,7 @@ import subprocess
 from typing import TYPE_CHECKING
 
 from core.platform import (
+    get_where_exe_path,
     is_linux,
     is_macos,
     is_windows,
@@ -65,6 +67,48 @@ SDK_ENV_VARS = [
 ]
 
 
+def _calculate_config_dir_hash(config_dir: str) -> str:
+    """
+    Calculate hash of config directory path for Keychain service name.
+
+    This MUST match the frontend's calculateConfigDirHash() in credential-utils.ts.
+    The frontend uses SHA256 hash of the config dir path, taking first 8 hex chars.
+
+    Args:
+        config_dir: Path to the config directory (should be absolute/expanded)
+
+    Returns:
+        8-character hex hash string (e.g., "d74c9506")
+    """
+    return hashlib.sha256(config_dir.encode()).hexdigest()[:8]
+
+
+def _get_keychain_service_name(config_dir: str | None = None) -> str:
+    """
+    Get the Keychain service name for credential storage.
+
+    This MUST match the frontend's getKeychainServiceName() in credential-utils.ts.
+    All profiles use hash-based keychain entries for isolation:
+    - Profile with configDir: "Claude Code-credentials-{hash}"
+    - No configDir (legacy/default): "Claude Code-credentials"
+
+    Args:
+        config_dir: Optional CLAUDE_CONFIG_DIR path. If provided, uses hash-based name.
+
+    Returns:
+        Keychain service name (e.g., "Claude Code-credentials-d74c9506")
+    """
+    if not config_dir:
+        return "Claude Code-credentials"
+
+    # Expand ~ to home directory (matching frontend normalization)
+    expanded_dir = os.path.expanduser(config_dir)
+
+    # Calculate hash and return hash-based service name
+    hash_suffix = _calculate_config_dir_hash(expanded_dir)
+    return f"Claude Code-credentials-{hash_suffix}"
+
+
 def is_encrypted_token(token: str | None) -> bool:
     """
     Check if a token is encrypted (has "enc:" prefix).
@@ -346,36 +390,50 @@ def _try_decrypt_token(token: str | None) -> str | None:
     return token
 
 
-def get_token_from_keychain() -> str | None:
+def get_token_from_keychain(config_dir: str | None = None) -> str | None:
     """
     Get authentication token from system credential store.
 
     Reads Claude Code credentials from:
-    - macOS: Keychain
+    - macOS: Keychain (uses hash-based service name if config_dir provided)
     - Windows: Credential Manager
     - Linux: Secret Service API (via dbus/secretstorage)
 
+    Args:
+        config_dir: Optional CLAUDE_CONFIG_DIR path for profile-specific credentials.
+                   When provided, reads from hash-based keychain entry matching
+                   the frontend's storage location.
+
     Returns:
         Token string if found, None otherwise
     """
     if is_macos():
-        return _get_token_from_macos_keychain()
+        return _get_token_from_macos_keychain(config_dir)
     elif is_windows():
-        return _get_token_from_windows_credential_files()
+        return _get_token_from_windows_credential_files(config_dir)
     else:
         # Linux: use secret-service API via DBus
-        return _get_token_from_linux_secret_service()
+        return _get_token_from_linux_secret_service(config_dir)
 
 
-def _get_token_from_macos_keychain() -> str | None:
-    """Get token from macOS Keychain."""
+def _get_token_from_macos_keychain(config_dir: str | None = None) -> str | None:
+    """Get token from macOS Keychain.
+
+    Args:
+        config_dir: Optional CLAUDE_CONFIG_DIR path. When provided, uses hash-based
+                   service name (e.g., "Claude Code-credentials-d74c9506") matching
+                   the frontend's credential storage location.
+    """
+    # Get the correct service name (hash-based if config_dir provided)
+    service_name = _get_keychain_service_name(config_dir)
+
     try:
         result = subprocess.run(
             [
                 "/usr/bin/security",
                 "find-generic-password",
                 "-s",
-                "Claude Code-credentials",
+                service_name,
                 "-w",
             ],
             capture_output=True,
@@ -384,6 +442,14 @@ def _get_token_from_macos_keychain() -> str | None:
         )
 
         if result.returncode != 0:
+            # If hash-based lookup fails and we have a config_dir, DON'T fall back
+            # to default service name - that would return the wrong profile's token.
+            # The config_dir was provided explicitly, so we should only use that.
+            if config_dir:
+                logger.debug(
+                    f"No keychain entry found for service '{service_name}' "
+                    f"(config_dir: {config_dir})"
+                )
             return None
 
         credentials_json = result.stdout.strip()
@@ -397,22 +463,51 @@ def _get_token_from_macos_keychain() -> str | None:
             return None
 
         # Validate token format (Claude OAuth tokens start with sk-ant-oat01-)
-        if not token.startswith("sk-ant-oat01-"):
+        # Also accept encrypted tokens (enc:) which will be decrypted later
+        if not (token.startswith("sk-ant-oat01-") or token.startswith("enc:")):
             return None
 
+        logger.debug(f"Found token in keychain service '{service_name}'")
         return token
 
     except (subprocess.TimeoutExpired, json.JSONDecodeError, KeyError, Exception):
         return None
 
 
-def _get_token_from_windows_credential_files() -> str | None:
+def _get_token_from_windows_credential_files(
+    config_dir: str | None = None,
+) -> str | None:
     """Get token from Windows credential files.
 
     Claude Code on Windows stores credentials in ~/.claude/.credentials.json
+    For custom profiles, uses the config_dir's .credentials.json file.
+
+    Args:
+        config_dir: Optional CLAUDE_CONFIG_DIR path for profile-specific credentials.
     """
     try:
-        # Claude Code stores credentials in ~/.claude/.credentials.json
+        # If config_dir is provided, read from that directory first
+        if config_dir:
+            expanded_dir = os.path.expanduser(config_dir)
+            profile_cred_paths = [
+                os.path.join(expanded_dir, ".credentials.json"),
+                os.path.join(expanded_dir, "credentials.json"),
+            ]
+            for cred_path in profile_cred_paths:
+                if os.path.exists(cred_path):
+                    with open(cred_path, encoding="utf-8") as f:
+                        data = json.load(f)
+                        token = data.get("claudeAiOauth", {}).get("accessToken")
+                        if token and (
+                            token.startswith("sk-ant-oat01-")
+                            or token.startswith("enc:")
+                        ):
+                            logger.debug(f"Found token in {cred_path}")
+                            return token
+            # If config_dir provided but no token found, don't fall back to default
+            return None
+
+        # Default Claude Code credential paths (no profile specified)
         cred_paths = [
             os.path.expandvars(r"%USERPROFILE%\.claude\.credentials.json"),
             os.path.expandvars(r"%USERPROFILE%\.claude\credentials.json"),
@@ -425,7 +520,9 @@ def _get_token_from_windows_credential_files() -> str | None:
                 with open(cred_path, encoding="utf-8") as f:
                     data = json.load(f)
                     token = data.get("claudeAiOauth", {}).get("accessToken")
-                    if token and token.startswith("sk-ant-oat01-"):
+                    if token and (
+                        token.startswith("sk-ant-oat01-") or token.startswith("enc:")
+                    ):
                         return token
 
         return None
@@ -434,7 +531,7 @@ def _get_token_from_windows_credential_files() -> str | None:
         return None
 
 
-def _get_token_from_linux_secret_service() -> str | None:
+def _get_token_from_linux_secret_service(config_dir: str | None = None) -> str | None:
     """Get token from Linux Secret Service API via DBus.
 
     Claude Code on Linux stores credentials in the Secret Service API
@@ -442,9 +539,12 @@ def _get_token_from_linux_secret_service() -> str | None:
     uses the secretstorage library which communicates via DBus.
 
     The credential is stored with:
-    - Label: "Claude Code-credentials"
+    - Label: "Claude Code-credentials" or "Claude Code-credentials-{hash}" for profiles
     - Attributes: {application: "claude-code"}
 
+    Args:
+        config_dir: Optional CLAUDE_CONFIG_DIR path for profile-specific credentials.
+
     Returns:
         Token string if found, None otherwise
     """
@@ -452,6 +552,9 @@ def _get_token_from_linux_secret_service() -> str | None:
         # secretstorage not installed, fall back to env var
         return None
 
+    # Get the correct service name (hash-based if config_dir provided)
+    target_label = _get_keychain_service_name(config_dir)
+
     try:
         # Get the default collection (typically "login" keyring)
         # secretstorage handles DBus communication internally
@@ -476,10 +579,10 @@ def _get_token_from_linux_secret_service() -> str | None:
         items = collection.search_items({"application": "claude-code"})
 
         for item in items:
-            # Check if this is the Claude Code credentials item
+            # Check if this is the correct Claude Code credentials item
             label = item.get_label()
-            # Use exact match for "Claude Code-credentials" to avoid false positives
-            if label == "Claude Code-credentials":
+            # Use exact match for target label (profile-specific or default)
+            if label == target_label:
                 # Get the secret (stored as JSON string)
                 secret = item.get_secret()
                 if not secret:
@@ -492,11 +595,23 @@ def _get_token_from_linux_secret_service() -> str | None:
                     data = json.loads(secret)
                     token = data.get("claudeAiOauth", {}).get("accessToken")
 
-                    if token and token.startswith("sk-ant-oat01-"):
+                    if token and (
+                        token.startswith("sk-ant-oat01-") or token.startswith("enc:")
+                    ):
+                        logger.debug(
+                            f"Found token in secret service with label '{target_label}'"
+                        )
                         return token
                 except json.JSONDecodeError:
                     continue
 
+        # If config_dir was provided but no token found, don't fall back
+        if config_dir:
+            logger.debug(
+                f"No secret service entry found with label '{target_label}' "
+                f"(config_dir: {config_dir})"
+            )
+
         return None
 
     except (
@@ -579,24 +694,77 @@ def get_auth_token(config_dir: str | None = None) -> str | None:
     Returns:
         Token string if found, None otherwise
     """
+    _debug = os.environ.get("DEBUG", "").lower() in ("true", "1")
+
+    if _debug:
+        # Log which auth env vars are set (presence only, never values)
+        set_vars = [v for v in AUTH_TOKEN_ENV_VARS if os.environ.get(v)]
+        logger.info(
+            "[Auth] get_auth_token() called — config_dir param=%s, "
+            "env vars present: %s, CLAUDE_CONFIG_DIR env=%s",
+            repr(config_dir),
+            set_vars or "(none)",
+            "set" if os.environ.get("CLAUDE_CONFIG_DIR") else "unset",
+        )
+
     # First check environment variables (highest priority)
     for var in AUTH_TOKEN_ENV_VARS:
         token = os.environ.get(var)
         if token:
+            if _debug:
+                logger.info("[Auth] Token resolved from env var: %s", var)
             return _try_decrypt_token(token)
 
     # Check CLAUDE_CONFIG_DIR environment variable (profile's custom config directory)
     env_config_dir = os.environ.get("CLAUDE_CONFIG_DIR")
     effective_config_dir = config_dir or env_config_dir
 
-    # If a custom config directory is specified, read from there
+    # Debug: Log which config_dir is being used for credential resolution
+    if _debug and effective_config_dir:
+        service_name = _get_keychain_service_name(effective_config_dir)
+        logger.info(
+            "[Auth] Resolving credentials for profile config_dir: %s "
+            "(Keychain service: %s)",
+            effective_config_dir,
+            service_name,
+        )
+
+    # If a custom config directory is specified, read from there first
     if effective_config_dir:
+        # Try reading from .credentials.json file in the config directory
         token = _get_token_from_config_dir(effective_config_dir)
         if token:
+            if _debug:
+                logger.info(
+                    "[Auth] Token resolved from config dir file: %s",
+                    effective_config_dir,
+                )
             return _try_decrypt_token(token)
 
-    # Fallback to system credential store (default locations)
-    return _try_decrypt_token(get_token_from_keychain())
+        # Also try the system credential store with hash-based service name
+        # This is needed because macOS stores credentials in Keychain, not files
+        token = get_token_from_keychain(effective_config_dir)
+        if token:
+            if _debug:
+                logger.info("[Auth] Token resolved from Keychain (profile-specific)")
+            return _try_decrypt_token(token)
+
+        # If config_dir was explicitly provided, DON'T fall back to default keychain
+        # - that would return the wrong profile's token
+        logger.debug(
+            "No credentials found for config_dir '%s' in file or keychain",
+            effective_config_dir,
+        )
+        return None
+
+    # No config_dir specified - use default system credential store
+    keychain_token = get_token_from_keychain()
+    if _debug:
+        logger.info(
+            "[Auth] Token resolved from default Keychain: %s",
+            "found" if keychain_token else "not found",
+        )
+    return _try_decrypt_token(keychain_token)
 
 
 def get_auth_token_source(config_dir: str | None = None) -> str | None:
@@ -616,10 +784,20 @@ def get_auth_token_source(config_dir: str | None = None) -> str | None:
     # Check if token came from custom config directory (profile's configDir)
     env_config_dir = os.environ.get("CLAUDE_CONFIG_DIR")
     effective_config_dir = config_dir or env_config_dir
-    if effective_config_dir and _get_token_from_config_dir(effective_config_dir):
-        return "CLAUDE_CONFIG_DIR"
+    if effective_config_dir:
+        # Check file-based storage
+        if _get_token_from_config_dir(effective_config_dir):
+            return "CLAUDE_CONFIG_DIR"
+        # Check hash-based keychain entry for this profile
+        if get_token_from_keychain(effective_config_dir):
+            if is_macos():
+                return "macOS Keychain (profile)"
+            elif is_windows():
+                return "Windows Credential Files (profile)"
+            else:
+                return "Linux Secret Service (profile)"
 
-    # Check if token came from system credential store
+    # Check if token came from default system credential store
     if get_token_from_keychain():
         if is_macos():
             return "macOS Keychain"
@@ -706,9 +884,9 @@ def _find_git_bash_path() -> str | None:
 
     # Method 1: Use 'where' command to find git.exe
     try:
-        # Use where.exe explicitly for reliability
+        # Use full path to where.exe for reliability (works even when System32 isn't in PATH)
         result = subprocess.run(
-            ["where.exe", "git"],
+            [get_where_exe_path(), "git"],
             capture_output=True,
             text=True,
             timeout=5,
@@ -800,6 +978,75 @@ def get_sdk_env_vars() -> dict[str, str]:
     return env
 
 
+def configure_sdk_authentication(config_dir: str | None = None) -> None:
+    """
+    Configure SDK authentication based on environment variables.
+
+    Supports two authentication modes:
+    - API Profile mode (ANTHROPIC_BASE_URL set): uses ANTHROPIC_AUTH_TOKEN
+    - OAuth mode (default): uses CLAUDE_CODE_OAUTH_TOKEN
+
+    In API profile mode, explicitly removes CLAUDE_CODE_OAUTH_TOKEN from the
+    environment because the SDK gives OAuth priority over API keys when both
+    are present.
+
+    Args:
+        config_dir: Optional profile config directory for per-profile Keychain
+                    lookup. When set, enables multi-profile token storage.
+
+    Raises:
+        ValueError: If required tokens are missing for the active mode.
+                   - API profile mode: requires ANTHROPIC_AUTH_TOKEN
+                   - OAuth mode: requires CLAUDE_CODE_OAUTH_TOKEN (from Keychain or env)
+    """
+    _debug = os.environ.get("DEBUG", "").lower() in ("true", "1")
+    api_profile_mode = bool(os.environ.get("ANTHROPIC_BASE_URL", "").strip())
+
+    if _debug:
+        logger.info(
+            "[Auth] configure_sdk_authentication() — mode=%s, config_dir=%s, "
+            "CLAUDE_CONFIG_DIR env=%s",
+            "api_profile" if api_profile_mode else "oauth",
+            repr(config_dir),
+            "set" if os.environ.get("CLAUDE_CONFIG_DIR") else "unset",
+        )
+
+    if api_profile_mode:
+        # API profile mode: ensure ANTHROPIC_AUTH_TOKEN is present
+        if not os.environ.get("ANTHROPIC_AUTH_TOKEN"):
+            raise ValueError(
+                "API profile mode active (ANTHROPIC_BASE_URL is set) "
+                "but ANTHROPIC_AUTH_TOKEN is not set"
+            )
+        # Explicitly remove CLAUDE_CODE_OAUTH_TOKEN so SDK uses ANTHROPIC_AUTH_TOKEN
+        # SDK gives OAuth priority over API keys when both are present
+        os.environ.pop("CLAUDE_CODE_OAUTH_TOKEN", None)
+        logger.info("Using API profile authentication")
+    else:
+        # OAuth mode: require and validate OAuth token
+        # Get OAuth token - uses profile-specific Keychain lookup when config_dir is set
+        # This correctly reads from "Claude Code-credentials-{hash}" for non-default profiles
+        oauth_token = require_auth_token(config_dir)
+
+        # Validate token is not encrypted before passing to SDK
+        # Encrypted tokens (enc:...) should have been decrypted by require_auth_token()
+        # If we still have an encrypted token here, it means decryption failed or was skipped
+        validate_token_not_encrypted(oauth_token)
+
+        # Ensure SDK can access it via its expected env var
+        # This is required because the SDK doesn't know about per-profile Keychain naming
+        os.environ["CLAUDE_CODE_OAUTH_TOKEN"] = oauth_token
+        logger.info("Using OAuth authentication")
+
+        if _debug:
+            logger.info(
+                "[Auth] SDK env check — CLAUDE_CONFIG_DIR=%s, "
+                "CLAUDE_CODE_OAUTH_TOKEN=%s",
+                "set" if os.environ.get("CLAUDE_CONFIG_DIR") else "unset",
+                "set" if os.environ.get("CLAUDE_CODE_OAUTH_TOKEN") else "unset",
+            )
+
+
 def ensure_claude_code_oauth_token() -> None:
     """
     Ensure CLAUDE_CODE_OAUTH_TOKEN is set (for SDK compatibility).

apps/backend/core/client.py

@@ -21,6 +21,7 @@ import time
 from pathlib import Path
 from typing import Any
 
+from core.fast_mode import ensure_fast_mode_in_user_settings
 from core.platform import (
     is_windows,
     validate_cli_path,
@@ -28,6 +29,89 @@ from core.platform import (
 
 logger = logging.getLogger(__name__)
 
+# =============================================================================
+# SDK Message Parser Patch
+# =============================================================================
+# The Claude Agent SDK's message_parser raises MessageParseError for unknown
+# message types (e.g., "rate_limit_event"). Since parse_message runs inside an
+# async generator, the exception kills the entire agent session stream.
+# Patch to log a warning and return a SystemMessage instead of crashing.
+# This is needed until the SDK natively handles all CLI message types.
+
+
+def _patch_sdk_message_parser() -> None:
+    """Patch the SDK's parse_message to handle unknown message types gracefully.
+
+    The Claude CLI may emit message types that the installed SDK version doesn't
+    recognize (e.g., rate_limit_event, usage_event). Without this patch, any
+    unrecognized type raises MessageParseError inside the SDK's async generator,
+    which terminates the entire response stream and kills the agent session.
+
+    The patch converts unknown types into SystemMessage objects with a
+    'unknown_<type>' subtype, which all message consumers silently skip.
+    """
+    try:
+        import claude_agent_sdk._internal.message_parser as _parser
+        from claude_agent_sdk._errors import MessageParseError
+        from claude_agent_sdk.types import SystemMessage
+
+        _original_parse = _parser.parse_message
+
+        def _patched_parse(data):
+            try:
+                return _original_parse(data)
+            except MessageParseError as e:
+                msg = str(e)
+                if "Unknown message type" in msg:
+                    msg_type = (
+                        data.get("type", "unknown")
+                        if isinstance(data, dict)
+                        else "unknown"
+                    )
+                    # Rate limit events deserve a visible warning; others just debug-level
+                    if "rate_limit" in msg_type:
+                        retry_after = (
+                            data.get("retry_after")
+                            or data.get("data", {}).get("retry_after")
+                            if isinstance(data, dict)
+                            else None
+                        )
+                        retry_info = (
+                            f" (retry_after={retry_after}s)" if retry_after else ""
+                        )
+                        logger.warning(
+                            f"Rate limit event received from CLI{retry_info} — "
+                            f"the SDK will handle backoff automatically"
+                        )
+                    else:
+                        logger.debug(
+                            f"SDK received unhandled message type '{msg_type}', skipping"
+                        )
+                    return SystemMessage(
+                        subtype=f"unknown_{msg_type}",
+                        data=data if isinstance(data, dict) else {},
+                    )
+                raise
+
+        _parser.parse_message = _patched_parse
+    except Exception as e:
+        logger.warning(f"Failed to patch SDK message parser: {e}")
+
+
+_patch_sdk_message_parser()
+
+# =============================================================================
+# Windows System Prompt Limits
+# =============================================================================
+# Windows CreateProcessW has a 32,768 character limit for the entire command line.
+# When CLAUDE.md is very large and passed as --system-prompt, the command can exceed
+# this limit, causing ERROR_FILE_NOT_FOUND. We cap CLAUDE.md content to stay safe.
+# 20,000 chars leaves ~12KB headroom for CLI overhead (model, tools, MCP config, etc.)
+WINDOWS_MAX_SYSTEM_PROMPT_CHARS = 20000
+WINDOWS_TRUNCATION_MESSAGE = (
+    "\n\n[... CLAUDE.md truncated due to Windows command-line length limit ...]"
+)
+
 # =============================================================================
 # Project Index Cache
 # =============================================================================
@@ -139,9 +223,8 @@ from agents.tools_pkg import (
 from claude_agent_sdk import ClaudeAgentOptions, ClaudeSDKClient
 from claude_agent_sdk.types import HookMatcher
 from core.auth import (
+    configure_sdk_authentication,
     get_sdk_env_vars,
-    require_auth_token,
-    validate_token_not_encrypted,
 )
 from linear_updater import is_linear_enabled
 from prompts_pkg.project_context import detect_project_capabilities, load_project_index
@@ -450,6 +533,9 @@ def create_client(
     max_thinking_tokens: int | None = None,
     output_format: dict | None = None,
     agents: dict | None = None,
+    betas: list[str] | None = None,
+    effort_level: str | None = None,
+    fast_mode: bool = False,
 ) -> ClaudeSDKClient:
     """
     Create a Claude Agent SDK client with multi-layered security.
@@ -465,10 +551,9 @@ def create_client(
         agent_type: Agent type identifier from AGENT_CONFIGS
                    (e.g., 'coder', 'planner', 'qa_reviewer', 'spec_gatherer')
         max_thinking_tokens: Token budget for extended thinking (None = disabled)
-                            - ultrathink: 16000 (spec creation)
-                            - high: 10000 (QA review)
-                            - medium: 5000 (planning, validation)
-                            - None: disabled (coding)
+                            - high: 16384 (spec creation, QA review)
+                            - medium: 4096 (planning, validation)
+                            - low: 1024 (coding)
         output_format: Optional structured output format for validated JSON responses.
                       Use {"type": "json_schema", "schema": Model.model_json_schema()}
                       See: https://platform.claude.com/docs/en/agent-sdk/structured-outputs
@@ -476,6 +561,16 @@ def create_client(
                Format: {"agent-name": {"description": "...", "prompt": "...",
                         "tools": [...], "model": "inherit"}}
                See: https://platform.claude.com/docs/en/agent-sdk/subagents
+        betas: Optional list of SDK beta header strings (e.g., ["context-1m-2025-08-07"]
+               for 1M context window). Use get_phase_model_betas() to compute from config.
+        effort_level: Optional effort level for adaptive thinking models (e.g., "low",
+                     "medium", "high"). When set, injected as CLAUDE_CODE_EFFORT_LEVEL
+                     env var for the SDK subprocess. Only meaningful for models that
+                     support adaptive thinking (e.g., Opus 4.6).
+        fast_mode: Enable Fast Mode for faster Opus 4.6 output. When True, enables
+                  the "user" setting source so the CLI reads fastMode from
+                  ~/.claude/settings.json. Requires extra usage enabled on Claude
+                  subscription; falls back to standard speed automatically.
 
     Returns:
         Configured ClaudeSDKClient
@@ -490,20 +585,37 @@ def create_client(
        (see security.py for ALLOWED_COMMANDS)
     4. Tool filtering - Each agent type only sees relevant tools (prevents misuse)
     """
-    # Get OAuth token - Claude CLI handles token lifecycle internally
-    oauth_token = require_auth_token()
-
-    # Validate token is not encrypted before passing to SDK
-    # Encrypted tokens (enc:...) should have been decrypted by require_auth_token()
-    # If we still have an encrypted token here, it means decryption failed or was skipped
-    validate_token_not_encrypted(oauth_token)
-
-    # Ensure SDK can access it via its expected env var
-    os.environ["CLAUDE_CODE_OAUTH_TOKEN"] = oauth_token
-
-    # Collect env vars to pass to SDK (ANTHROPIC_BASE_URL, etc.)
+    # Collect env vars to pass to SDK (ANTHROPIC_BASE_URL, CLAUDE_CONFIG_DIR, etc.)
     sdk_env = get_sdk_env_vars()
 
+    # Get the config dir for profile-specific credential lookup
+    # CLAUDE_CONFIG_DIR enables per-profile Keychain entries with SHA256-hashed service names
+    config_dir = sdk_env.get("CLAUDE_CONFIG_DIR")
+
+    # Configure SDK authentication (OAuth or API profile mode)
+    configure_sdk_authentication(config_dir)
+
+    if config_dir:
+        logger.info(f"Using CLAUDE_CONFIG_DIR for profile: {config_dir}")
+
+    # Inject effort level for adaptive thinking models (e.g., Opus 4.6)
+    if effort_level:
+        sdk_env["CLAUDE_CODE_EFFORT_LEVEL"] = effort_level
+
+    # Fast mode requires the CLI to read "fastMode" from user settings.
+    # The SDK default (setting_sources=None) passes --setting-sources "" which
+    # blocks ALL filesystem settings. We must explicitly enable "user" source
+    # so the CLI reads ~/.claude/settings.json where fastMode: true lives.
+    # See: https://code.claude.com/docs/en/fast-mode
+    if fast_mode:
+        ensure_fast_mode_in_user_settings()
+        logger.info("[Fast Mode] ACTIVE — will enable user setting source for fastMode")
+        print(
+            "[Fast Mode] ACTIVE — enabling user settings source for CLI to read fastMode"
+        )
+    else:
+        logger.info("[Fast Mode] inactive — not requested for this client")
+
     # Debug: Log git-bash path detection on Windows
     if "CLAUDE_CODE_GIT_BASH_PATH" in sdk_env:
         logger.info(f"Git Bash path found: {sdk_env['CLAUDE_CODE_GIT_BASH_PATH']}")
@@ -667,7 +779,12 @@ def create_client(
         print("   - Worktree permissions: granted for original project directories")
     print("   - Bash commands restricted to allowlist")
     if max_thinking_tokens:
-        print(f"   - Extended thinking: {max_thinking_tokens:,} tokens")
+        thinking_info = f"{max_thinking_tokens:,} tokens"
+        if effort_level:
+            thinking_info += f" + effort={effort_level}"
+        if fast_mode:
+            thinking_info += " + fast mode"
+        print(f"   - Extended thinking: {thinking_info}")
     else:
         print("   - Extended thinking: disabled")
 
@@ -787,8 +904,31 @@ def create_client(
     if should_use_claude_md():
         claude_md_content = load_claude_md(project_dir)
         if claude_md_content:
+            # On Windows, the SDK passes system_prompt as a --system-prompt CLI argument.
+            # Windows CreateProcessW has a 32,768 character limit for the entire command line.
+            # When CLAUDE.md is very large, the command can exceed this limit, causing Windows
+            # to return ERROR_FILE_NOT_FOUND which the SDK misreports as "Claude Code not found".
+            # Cap CLAUDE.md content to keep total command line under the limit. (#1661)
+            was_truncated = False
+            if is_windows():
+                max_claude_md_chars = (
+                    WINDOWS_MAX_SYSTEM_PROMPT_CHARS
+                    - len(base_prompt)
+                    - len(WINDOWS_TRUNCATION_MESSAGE)
+                    - len("\n\n# Project Instructions (from CLAUDE.md)\n\n")
+                )
+                if len(claude_md_content) > max_claude_md_chars > 0:
+                    claude_md_content = (
+                        claude_md_content[:max_claude_md_chars]
+                        + WINDOWS_TRUNCATION_MESSAGE
+                    )
+                    print(
+                        "   - CLAUDE.md: truncated (exceeded Windows command-line limit)"
+                    )
+                    was_truncated = True
             base_prompt = f"{base_prompt}\n\n# Project Instructions (from CLAUDE.md)\n\n{claude_md_content}"
-            print("   - CLAUDE.md: included in system prompt")
+            if not was_truncated:
+                print("   - CLAUDE.md: included in system prompt")
         else:
             print("   - CLAUDE.md: not found in project root")
     else:
@@ -819,6 +959,12 @@ def create_client(
         "enable_file_checkpointing": True,
     }
 
+    # Fast mode: enable user setting source so CLI reads fastMode from
+    # ~/.claude/settings.json. Without this, the SDK's default --setting-sources ""
+    # blocks all filesystem settings and the CLI never sees fastMode: true.
+    if fast_mode:
+        options_kwargs["setting_sources"] = ["user"]
+
     # Optional: Allow CLI path override via environment variable
     # The SDK bundles its own CLI, but users can override if needed
     env_cli_path = os.environ.get("CLAUDE_CLI_PATH")
@@ -836,4 +982,8 @@ def create_client(
     if agents:
         options_kwargs["agents"] = agents
 
+    # Add beta headers if specified (e.g., for 1M context window)
+    if betas:
+        options_kwargs["betas"] = betas
+
     return ClaudeSDKClient(options=ClaudeAgentOptions(**options_kwargs))

apps/backend/core/error_utils.py

@@ -0,0 +1,188 @@
+"""
+Shared Error Utilities
+======================
+
+Common error detection and classification functions used across
+agent sessions, QA, and other modules.
+"""
+
+from __future__ import annotations
+
+import logging
+import re
+from collections.abc import AsyncIterator
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from claude_agent_sdk.types import Message
+
+logger = logging.getLogger(__name__)
+
+
+def is_tool_concurrency_error(error: Exception) -> bool:
+    """
+    Check if an error is a 400 tool concurrency error from Claude API.
+
+    Tool concurrency errors occur when too many tools are used simultaneously
+    in a single API request, hitting Claude's concurrent tool use limit.
+
+    Args:
+        error: The exception to check
+
+    Returns:
+        True if this is a tool concurrency error, False otherwise
+    """
+    error_str = str(error).lower()
+    # Check for 400 status AND tool concurrency keywords
+    return "400" in error_str and (
+        ("tool" in error_str and "concurrency" in error_str)
+        or "too many tools" in error_str
+        or "concurrent tool" in error_str
+    )
+
+
+def is_rate_limit_error(error: Exception) -> bool:
+    """
+    Check if an error is a rate limit error (429 or similar).
+
+    Rate limit errors occur when the API usage quota is exceeded,
+    either for session limits or weekly limits.
+
+    Args:
+        error: The exception to check
+
+    Returns:
+        True if this is a rate limit error, False otherwise
+    """
+    error_str = str(error).lower()
+
+    # Check for HTTP 429 with word boundaries to avoid false positives
+    if re.search(r"\b429\b", error_str):
+        return True
+
+    # Check for other rate limit indicators
+    return any(
+        p in error_str
+        for p in [
+            "limit reached",
+            "rate limit",
+            "too many requests",
+            "usage limit",
+            "quota exceeded",
+        ]
+    )
+
+
+def is_authentication_error(error: Exception) -> bool:
+    """
+    Check if an error is an authentication error (401, token expired, etc.).
+
+    Authentication errors occur when OAuth tokens are invalid, expired,
+    or have been revoked (e.g., after token refresh on another process).
+
+    Validation approach:
+    - HTTP 401 status code is checked with word boundaries to minimize false positives
+    - Additional string patterns are validated against lowercase error messages
+    - Patterns are designed to match known Claude API and OAuth error formats
+
+    Known false positive risks:
+    - Generic error messages containing "unauthorized" or "access denied" may match
+      even if not related to authentication (e.g., file permission errors)
+    - Error messages containing these keywords in user-provided content could match
+    - Mitigation: HTTP 401 check provides strong signal; string patterns are secondary
+
+    Real-world validation:
+    - Pattern matching has been tested against actual Claude API error responses
+    - False positive rate is acceptable given the recovery mechanism (prompt user to re-auth)
+    - If false positive occurs, user can simply resume without re-authenticating
+
+    Args:
+        error: The exception to check
+
+    Returns:
+        True if this is an authentication error, False otherwise
+    """
+    error_str = str(error).lower()
+
+    # Check for HTTP 401 with word boundaries to avoid false positives
+    if re.search(r"\b401\b", error_str):
+        return True
+
+    # Check for other authentication indicators
+    # NOTE: "authentication failed" and "authentication error" are more specific patterns
+    # to reduce false positives from generic "authentication" mentions
+    return any(
+        p in error_str
+        for p in [
+            "authentication failed",
+            "authentication error",
+            "unauthorized",
+            "invalid token",
+            "token expired",
+            "authentication_error",
+            "invalid_token",
+            "token_expired",
+            "not authenticated",
+            "http 401",
+            "does not have access to claude",
+            "please login again",
+        ]
+    )
+
+
+async def safe_receive_messages(
+    client,
+    *,
+    caller: str = "agent",
+) -> AsyncIterator[Message]:
+    """Iterate over SDK messages with resilience against unexpected errors.
+
+    The SDK's ``receive_response()`` async generator can terminate early if:
+    1. An unhandled message type slips past the monkey-patch (e.g., SDK upgrade
+       removes the patch surface).
+    2. A transient parse error corrupts a single message in the stream.
+    3. An unexpected ``StopAsyncIteration`` or runtime error occurs mid-stream.
+
+    This wrapper catches per-message errors, logs them, and continues yielding
+    subsequent messages so the agent session can complete its work.
+
+    It also detects rate-limit events (surfaced as ``SystemMessage`` with
+    subtype ``unknown_rate_limit_event``) and logs a user-visible warning.
+
+    Args:
+        client: A ``ClaudeSDKClient`` instance (must be inside ``async with``).
+        caller: Label for log messages (e.g., "session", "agent_runner").
+
+    Yields:
+        Parsed ``Message`` objects from the SDK response stream.
+    """
+    try:
+        async for msg in client.receive_response():
+            # Detect rate-limit events surfaced by the monkey-patch
+            msg_type = type(msg).__name__
+            if msg_type == "SystemMessage":
+                subtype = getattr(msg, "subtype", "")
+                if subtype.startswith("unknown_"):
+                    original_type = subtype[len("unknown_") :]
+                    if "rate_limit" in original_type:
+                        data = getattr(msg, "data", {})
+                        retry_after = data.get("retry_after") or data.get(
+                            "data", {}
+                        ).get("retry_after")
+                        retry_info = (
+                            f" (retry in {retry_after}s)" if retry_after else ""
+                        )
+                        logger.warning(f"[{caller}] Rate limit event{retry_info}")
+                    else:
+                        logger.debug(
+                            f"[{caller}] Skipping unknown SDK message type: {original_type}"
+                        )
+                    continue
+            yield msg
+    except GeneratorExit:
+        return
+    except Exception as e:
+        # If the generator itself raises (e.g., transport error), log and stop
+        # gracefully so callers can process whatever was collected so far.
+        logger.error(f"[{caller}] SDK response stream terminated unexpectedly: {e}")
+        return

apps/backend/core/fast_mode.py

@@ -0,0 +1,76 @@
+"""
+Fast Mode Settings Helper
+=========================
+
+Manages the fastMode flag in ~/.claude/settings.json for temporary
+per-task fast mode overrides. Shared by both client.py and simple_client.py.
+"""
+
+import json
+import logging
+from pathlib import Path
+
+from core.file_utils import write_json_atomic
+
+logger = logging.getLogger(__name__)
+
+_fast_mode_atexit_registered = False
+
+
+def _write_fast_mode_setting(enabled: bool) -> None:
+    """Write fastMode value to ~/.claude/settings.json (atomic read-modify-write).
+
+    Uses write_json_atomic from core.file_utils to prevent corruption when
+    multiple concurrent task processes modify the file simultaneously.
+    """
+    settings_file = Path.home() / ".claude" / "settings.json"
+    try:
+        settings: dict = {}
+        if settings_file.exists():
+            settings = json.loads(settings_file.read_text(encoding="utf-8"))
+
+        if settings.get("fastMode") != enabled:
+            settings["fastMode"] = enabled
+            settings_file.parent.mkdir(parents=True, exist_ok=True)
+            # Atomic write using shared utility
+            write_json_atomic(settings_file, settings)
+            state = "true" if enabled else "false"
+            logger.info(
+                f"[Fast Mode] Wrote fastMode={state} to ~/.claude/settings.json"
+            )
+    except Exception as e:
+        logger.warning(f"[Fast Mode] Could not update ~/.claude/settings.json: {e}")
+
+
+def _disable_fast_mode_on_exit() -> None:
+    """atexit handler: restore fastMode=false so interactive CLI sessions stay standard."""
+    _write_fast_mode_setting(False)
+
+
+def ensure_fast_mode_in_user_settings() -> None:
+    """
+    Enable fastMode in ~/.claude/settings.json and register cleanup.
+
+    The CLI reads fastMode from user settings (loaded via --setting-sources user).
+    This function:
+    1. Writes fastMode=true before spawning the CLI subprocess
+    2. Registers an atexit handler to restore fastMode=false when the process exits
+
+    This ensures fast mode is a temporary override per task process, not a permanent
+    setting change. The CLI subprocess reads settings at startup, so restoring false
+    after exit doesn't affect running tasks — only prevents fast mode from leaking
+    into subsequent interactive CLI sessions or non-fast-mode tasks.
+    """
+    global _fast_mode_atexit_registered
+
+    _write_fast_mode_setting(True)
+
+    # Register cleanup once per process — idempotent on repeated calls
+    if not _fast_mode_atexit_registered:
+        import atexit
+
+        atexit.register(_disable_fast_mode_on_exit)
+        _fast_mode_atexit_registered = True
+        logger.info(
+            "[Fast Mode] Registered atexit cleanup (will restore fastMode=false)"
+        )

apps/backend/core/gh_executable.py

@@ -10,6 +10,8 @@ import os
 import shutil
 import subprocess
 
+from core.platform import get_where_exe_path
+
 _cached_gh_path: str | None = None
 
 
@@ -53,12 +55,11 @@ def _run_where_command() -> str | None:
     """
     try:
         result = subprocess.run(
-            "where gh",
+            [get_where_exe_path(), "gh"],
             capture_output=True,
             text=True,
             encoding="utf-8",
             timeout=5,
-            shell=True,  # Required: 'where' command must be executed through shell on Windows
         )
         if result.returncode == 0 and result.stdout.strip():
             found_path = result.stdout.strip().split("\n")[0].strip()
@@ -133,7 +134,7 @@ def _find_gh_executable() -> str | None:
             if os.path.isfile(path) and _verify_gh_executable(path):
                 return path
 
-        # 5. Try 'where' command with shell=True (more reliable on Windows)
+        # 5. Try 'where' command with full path (works even when System32 isn't in PATH)
         return _run_where_command()
 
     return None

apps/backend/core/git_executable.py

@@ -15,6 +15,8 @@ import shutil
 import subprocess
 from pathlib import Path
 
+from core.platform import get_where_exe_path
+
 # Git environment variables that can interfere with worktree operations
 # when set by pre-commit hooks or other git configurations.
 # These must be cleared to prevent cross-worktree contamination.
@@ -124,14 +126,13 @@ def _find_git_executable() -> str:
             except OSError:
                 continue
 
-        # 4. Try 'where' command with shell=True (more reliable on Windows)
+        # 4. Try 'where' command with full path (works even when System32 isn't in PATH)
         try:
             result = subprocess.run(
-                "where git",
+                [get_where_exe_path(), "git"],
                 capture_output=True,
                 text=True,
                 timeout=5,
-                shell=True,
             )
             if result.returncode == 0 and result.stdout.strip():
                 found_path = result.stdout.strip().split("\n")[0].strip()

apps/backend/core/git_provider.py

@@ -0,0 +1,115 @@
+#!/usr/bin/env python3
+"""
+Git Provider Detection
+======================
+
+Utility to detect git hosting provider (GitHub, GitLab, or unknown) from git remote URLs.
+Supports both SSH and HTTPS remote formats, and self-hosted GitLab instances.
+"""
+
+import re
+from pathlib import Path
+
+from .git_executable import run_git
+
+
+def detect_git_provider(project_dir: str | Path, remote_name: str | None = None) -> str:
+    """Detect the git hosting provider from the git remote URL.
+
+    Args:
+        project_dir: Path to the git repository
+        remote_name: Name of the remote to check (defaults to "origin")
+
+    Returns:
+        'github' if GitHub remote detected
+        'gitlab' if GitLab remote detected (cloud or self-hosted)
+        'unknown' if no remote or unsupported provider
+
+    Examples:
+        >>> detect_git_provider('/path/to/repo')
+        'github'  # for git@github.com:user/repo.git
+        'gitlab'  # for git@gitlab.com:user/repo.git
+        'gitlab'  # for https://gitlab.company.com/user/repo.git
+        'unknown' # for no remote or other providers
+    """
+    try:
+        # Get the remote URL (use specified remote or default to origin)
+        remote = remote_name if remote_name else "origin"
+        result = run_git(
+            ["remote", "get-url", remote],
+            cwd=project_dir,
+            timeout=5,
+        )
+
+        # If command failed or no output, return unknown
+        if result.returncode != 0 or not result.stdout.strip():
+            return "unknown"
+
+        remote_url = result.stdout.strip()
+
+        # Parse ssh:// URL format: ssh://[user@]host[:port]/path
+        ssh_url_match = re.match(r"^ssh://(?:[^@]+@)?([^:/]+)(?::\d+)?/", remote_url)
+        if ssh_url_match:
+            hostname = ssh_url_match.group(1)
+            return _classify_hostname(hostname)
+
+        # Parse HTTPS/HTTP format: https://host/path or http://host/path
+        # Must check before scp-like format to avoid matching "https" as hostname
+        https_match = re.match(r"^https?://([^/]+)/", remote_url)
+        if https_match:
+            hostname = https_match.group(1)
+            return _classify_hostname(hostname)
+
+        # Parse scp-like format: [user@]host:path (any username, not just 'git')
+        # This handles git@github.com:user/repo.git and similar formats
+        scp_match = re.match(r"^(?:[^@]+@)?([^:]+):", remote_url)
+        if scp_match:
+            hostname = scp_match.group(1)
+            # Exclude paths that look like Windows drives (e.g., C:)
+            if len(hostname) > 1:
+                return _classify_hostname(hostname)
+
+        # Unrecognized URL format
+        return "unknown"
+
+    except Exception:
+        # Any error (subprocess issues, etc.) -> unknown
+        return "unknown"
+
+
+def _classify_hostname(hostname: str) -> str:
+    """Classify a hostname as github, gitlab, or unknown.
+
+    Args:
+        hostname: The git remote hostname (e.g., 'github.com', 'gitlab.example.com')
+
+    Returns:
+        'github', 'gitlab', or 'unknown'
+    """
+    hostname_lower = hostname.lower()
+
+    # Check for GitHub (cloud and self-hosted/enterprise)
+    # Match github.com, *.github.com, or domains where a segment is or starts with 'github'
+    hostname_parts = hostname_lower.split(".")
+    if (
+        hostname_lower == "github.com"
+        or hostname_lower.endswith(".github.com")
+        or any(
+            part == "github" or part.startswith("github-") for part in hostname_parts
+        )
+    ):
+        return "github"
+
+    # Check for GitLab (cloud and self-hosted)
+    # Match gitlab.com, *.gitlab.com, or domains where a segment is or starts with 'gitlab'
+    if (
+        hostname_lower == "gitlab.com"
+        or hostname_lower.endswith(".gitlab.com")
+        or any(
+            part == "gitlab" or part.startswith("gitlab-") for part in hostname_parts
+        )
+    ):
+        return "gitlab"
+
+    # Unknown provider
+    return "unknown"

apps/backend/core/glab_executable.py

@@ -0,0 +1,193 @@
+#!/usr/bin/env python3
+"""
+GitLab CLI Executable Finder
+============================
+
+Utility to find the glab (GitLab CLI) executable, with platform-specific fallbacks.
+"""
+
+import os
+import shutil
+import subprocess
+
+from core.platform import get_where_exe_path
+
+_cached_glab_path: str | None = None
+
+
+def invalidate_glab_cache() -> None:
+    """Invalidate the cached glab executable path.
+
+    Useful when glab may have been uninstalled, updated, or when
+    GITLAB_CLI_PATH environment variable has changed.
+    """
+    global _cached_glab_path
+    _cached_glab_path = None
+
+
+def _verify_glab_executable(path: str) -> bool:
+    """Verify that a path is a valid glab executable by checking version.
+
+    Args:
+        path: Path to the potential glab executable
+
+    Returns:
+        True if the path points to a valid glab executable, False otherwise
+    """
+    try:
+        result = subprocess.run(
+            [path, "--version"],
+            capture_output=True,
+            text=True,
+            encoding="utf-8",
+            timeout=5,
+        )
+        return result.returncode == 0
+    except (subprocess.TimeoutExpired, OSError):
+        return False
+
+
+def _run_where_command() -> str | None:
+    """Run Windows 'where glab' command to find glab executable.
+
+    Returns:
+        First path found, or None if command failed
+    """
+    try:
+        result = subprocess.run(
+            [get_where_exe_path(), "glab"],
+            capture_output=True,
+            text=True,
+            encoding="utf-8",
+            timeout=5,
+        )
+        if result.returncode == 0 and result.stdout.strip():
+            found_path = result.stdout.strip().split("\n")[0].strip()
+            if (
+                found_path
+                and os.path.isfile(found_path)
+                and _verify_glab_executable(found_path)
+            ):
+                return found_path
+    except (subprocess.TimeoutExpired, OSError):
+        # 'where' command failed or timed out - fall through to return None
+        pass
+    return None
+
+
+def get_glab_executable() -> str | None:
+    """Find the glab executable, with platform-specific fallbacks.
+
+    Returns the path to glab executable, or None if not found.
+
+    Priority order:
+    1. GITLAB_CLI_PATH env var (user-configured path from frontend)
+    2. shutil.which (if glab is in PATH)
+    3. Homebrew paths on macOS
+    4. Windows Program Files paths
+    5. Windows 'where' command
+
+    Caches the result after first successful find. Use invalidate_glab_cache()
+    to force re-detection (e.g., after glab installation/uninstallation).
+    """
+    global _cached_glab_path
+
+    # Return cached result if available AND still exists
+    if _cached_glab_path is not None and os.path.isfile(_cached_glab_path):
+        return _cached_glab_path
+
+    _cached_glab_path = _find_glab_executable()
+    return _cached_glab_path
+
+
+def _find_glab_executable() -> str | None:
+    """Internal function to find glab executable."""
+    # 1. Check GITLAB_CLI_PATH env var (set by Electron frontend)
+    env_path = os.environ.get("GITLAB_CLI_PATH")
+    if env_path and os.path.isfile(env_path) and _verify_glab_executable(env_path):
+        return env_path
+
+    # 2. Try shutil.which (works if glab is in PATH)
+    glab_path = shutil.which("glab")
+    if glab_path and _verify_glab_executable(glab_path):
+        return glab_path
+
+    # 3. macOS-specific: check Homebrew paths
+    if os.name != "nt":  # Unix-like systems (macOS, Linux)
+        homebrew_paths = [
+            "/opt/homebrew/bin/glab",  # Apple Silicon
+            "/usr/local/bin/glab",  # Intel Mac
+            "/home/linuxbrew/.linuxbrew/bin/glab",  # Linux Homebrew
+        ]
+        for path in homebrew_paths:
+            if os.path.isfile(path) and _verify_glab_executable(path):
+                return path
+
+    # 4. Windows-specific: check Program Files paths
+    # glab uses Inno Setup with DefaultDirName={autopf}\glab
+    if os.name == "nt":
+        windows_paths = [
+            os.path.expandvars(r"%PROGRAMFILES%\glab\glab.exe"),
+            os.path.expandvars(r"%PROGRAMFILES(X86)%\glab\glab.exe"),
+            os.path.expandvars(r"%LOCALAPPDATA%\Programs\glab\glab.exe"),
+        ]
+        for path in windows_paths:
+            if os.path.isfile(path) and _verify_glab_executable(path):
+                return path
+
+        # 5. Try 'where' command with full path (works even when System32 isn't in PATH)
+        return _run_where_command()
+
+    return None
+
+
+def run_glab(
+    args: list[str],
+    cwd: str | None = None,
+    timeout: int = 60,
+    input_data: str | None = None,
+) -> subprocess.CompletedProcess:
+    """Run a glab command with proper executable finding.
+
+    Args:
+        args: glab command arguments (without 'glab' prefix)
+        cwd: Working directory for the command
+        timeout: Command timeout in seconds (default: 60)
+        input_data: Optional string data to pass to stdin
+
+    Returns:
+        CompletedProcess with command results.
+    """
+    glab = get_glab_executable()
+    if not glab:
+        return subprocess.CompletedProcess(
+            args=["glab"] + args,
+            returncode=-1,
+            stdout="",
+            stderr="GitLab CLI (glab) not found. Install from https://gitlab.com/gitlab-org/cli",
+        )
+    try:
+        return subprocess.run(
+            [glab] + args,
+            cwd=cwd,
+            input=input_data,
+            capture_output=True,
+            text=True,
+            encoding="utf-8",
+            errors="replace",
+            timeout=timeout,
+        )
+    except subprocess.TimeoutExpired:
+        return subprocess.CompletedProcess(
+            args=[glab] + args,
+            returncode=-1,
+            stdout="",
+            stderr=f"Command timed out after {timeout} seconds",
+        )
+    except FileNotFoundError:
+        return subprocess.CompletedProcess(
+            args=[glab] + args,
+            returncode=-1,
+            stdout="",
+            stderr="GitLab CLI (glab) executable not found. Install from https://gitlab.com/gitlab-org/cli",
+        )

apps/backend/core/phase_event.py

@@ -23,6 +23,9 @@ class ExecutionPhase(str, Enum):
     QA_FIXING = "qa_fixing"
     COMPLETE = "complete"
     FAILED = "failed"
+    # Pause states for intelligent error recovery
+    RATE_LIMIT_PAUSED = "rate_limit_paused"
+    AUTH_FAILURE_PAUSED = "auth_failure_paused"
 
 
 def emit_phase(
@@ -31,8 +34,19 @@ def emit_phase(
     *,
     progress: int | None = None,
     subtask: str | None = None,
+    reset_timestamp: int | None = None,
+    profile_id: str | None = None,
 ) -> None:
-    """Emit structured phase event to stdout for frontend parsing."""
+    """Emit structured phase event to stdout for frontend parsing.
+
+    Args:
+        phase: The execution phase (e.g., PLANNING, CODING, RATE_LIMIT_PAUSED)
+        message: Optional message describing the phase state
+        progress: Optional progress percentage (0-100)
+        subtask: Optional subtask identifier
+        reset_timestamp: Optional Unix timestamp for rate limit reset time
+        profile_id: Optional profile ID that triggered the pause
+    """
     phase_value = phase.value if isinstance(phase, ExecutionPhase) else phase
 
     payload: dict[str, Any] = {
@@ -48,6 +62,12 @@ def emit_phase(
     if subtask is not None:
         payload["subtask"] = subtask
 
+    if reset_timestamp is not None:
+        payload["reset_timestamp"] = reset_timestamp
+
+    if profile_id is not None:
+        payload["profile_id"] = profile_id
+
     try:
         print(f"{PHASE_MARKER_PREFIX}{json.dumps(payload, default=str)}", flush=True)
     except (OSError, UnicodeEncodeError) as e:

apps/backend/core/platform/__init__.py

@@ -430,6 +430,22 @@ def requires_shell(command: str) -> bool:
     return ext.lower() in {".cmd", ".bat", ".ps1"}
 
 
+def get_where_exe_path() -> str:
+    """Get full path to where.exe on Windows.
+
+    Using the full path ensures where.exe works even when System32 isn't in PATH,
+    which can happen in restricted environments or when the app doesn't inherit
+    the full system PATH.
+
+    Returns:
+        Full path to where.exe (e.g., C:\\Windows\\System32\\where.exe)
+    """
+    system_root = os.environ.get(
+        "SystemRoot", os.environ.get("SYSTEMROOT", "C:\\Windows")
+    )
+    return os.path.join(system_root, "System32", "where.exe")
+
+
 def get_comspec_path() -> str:
     """
     Get the path to cmd.exe on Windows.

apps/backend/core/progress.py

@@ -9,8 +9,11 @@ Enhanced with colored output, icons, and better visual formatting.
 """
 
 import json
+import logging
 from pathlib import Path
 
+logger = logging.getLogger(__name__)
+
 from core.plan_normalization import normalize_subtask_aliases
 from ui import (
     Icons,
@@ -230,8 +233,8 @@ def print_progress_summary(spec_dir: Path, show_next: bool = True) -> None:
                         f"  {icon(Icons.ARROW_RIGHT)} Next: {highlight(next_id)} - {next_desc}"
                     )
 
-        except (OSError, json.JSONDecodeError, UnicodeDecodeError):
-            pass  # Ignore corrupted/unreadable progress files
+        except (OSError, json.JSONDecodeError, UnicodeDecodeError) as e:
+            logger.debug(f"Failed to load plan file for phase summary: {e}")
     else:
         print()
         print_status("No implementation subtasks yet - planner needs to run", "pending")
@@ -404,6 +407,8 @@ def get_next_subtask(spec_dir: Path) -> dict | None:
     """
     Find the next subtask to work on, respecting phase dependencies.
 
+    Skips subtasks that are marked as stuck in the recovery manager's attempt history.
+
     Args:
         spec_dir: Directory containing implementation_plan.json
 
@@ -415,6 +420,23 @@ def get_next_subtask(spec_dir: Path) -> dict | None:
     if not plan_file.exists():
         return None
 
+    # Load stuck subtasks from recovery manager's attempt history
+    stuck_subtask_ids = set()
+    attempt_history_file = spec_dir / "memory" / "attempt_history.json"
+    if attempt_history_file.exists():
+        try:
+            with open(attempt_history_file, encoding="utf-8") as f:
+                attempt_history = json.load(f)
+            # Collect IDs of subtasks marked as stuck
+            stuck_subtask_ids = {
+                entry["subtask_id"]
+                for entry in attempt_history.get("stuck_subtasks", [])
+                if "subtask_id" in entry
+            }
+        except (OSError, json.JSONDecodeError, UnicodeDecodeError):
+            # If we can't read the file, continue without stuck checking
+            pass
+
     try:
         with open(plan_file, encoding="utf-8") as f:
             plan = json.load(f)
@@ -455,9 +477,15 @@ def get_next_subtask(spec_dir: Path) -> dict | None:
             if not deps_satisfied:
                 continue
 
-            # Find first pending subtask in this phase
+            # Find first pending subtask in this phase (skip stuck subtasks)
             for subtask in phase.get("subtasks", phase.get("chunks", [])):
                 status = subtask.get("status", "pending")
+                subtask_id = subtask.get("id")
+
+                # Skip stuck subtasks
+                if subtask_id in stuck_subtask_ids:
+                    continue
+
                 if status in {"pending", "not_started", "not started"}:
                     subtask_out, _changed = normalize_subtask_aliases(subtask)
                     subtask_out["status"] = "pending"

apps/backend/core/sentry.py

@@ -186,14 +186,12 @@ def _before_send(event: dict, hint: dict) -> dict | None:
 
 def init_sentry(
     component: str = "backend",
-    force_enable: bool = False,
 ) -> bool:
     """
     Initialize Sentry for the Python backend.
 
     Args:
         component: Component name for tagging (e.g., "backend", "github-runner")
-        force_enable: Force enable even without packaged app detection
 
     Returns:
         True if Sentry was initialized, False otherwise
@@ -212,20 +210,11 @@ def init_sentry(
         logger.debug("[Sentry] No SENTRY_DSN configured - error reporting disabled")
         return False
 
-    # Check if we should enable Sentry
-    # Enable if:
-    # - Running from packaged app (detected by __compiled__ or frozen)
-    # - SENTRY_DEV=true is set
-    # - force_enable is True
+    # DSN is present (checked above), so Sentry should be enabled.
+    # The Electron main process only passes SENTRY_DSN to subprocesses in
+    # production builds, so its presence is sufficient to gate activation.
+    # In dev, set SENTRY_DSN in your environment to opt-in.
     is_packaged = getattr(sys, "frozen", False) or hasattr(sys, "__compiled__")
-    sentry_dev = os.environ.get("SENTRY_DEV", "").lower() in ("true", "1", "yes")
-    should_enable = is_packaged or sentry_dev or force_enable
-
-    if not should_enable:
-        logger.debug(
-            "[Sentry] Development mode - error reporting disabled (set SENTRY_DEV=true to enable)"
-        )
-        return False
 
     try:
         import sentry_sdk

apps/backend/core/simple_client.py

@@ -22,15 +22,16 @@ Example usage:
 """
 
 import logging
+import os
 from pathlib import Path
 
 from agents.tools_pkg import get_agent_config, get_default_thinking_level
 from claude_agent_sdk import ClaudeAgentOptions, ClaudeSDKClient
 from core.auth import (
+    configure_sdk_authentication,
     get_sdk_env_vars,
-    require_auth_token,
-    validate_token_not_encrypted,
 )
+from core.fast_mode import ensure_fast_mode_in_user_settings
 from core.platform import validate_cli_path
 from phase_config import get_thinking_budget
 
@@ -44,6 +45,9 @@ def create_simple_client(
     cwd: Path | None = None,
     max_turns: int = 1,
     max_thinking_tokens: int | None = None,
+    betas: list[str] | None = None,
+    effort_level: str | None = None,
+    fast_mode: bool = False,
 ) -> ClaudeSDKClient:
     """
     Create a minimal Claude SDK client for single-turn utility operations.
@@ -65,6 +69,11 @@ def create_simple_client(
         max_turns: Maximum conversation turns (default: 1 for single-turn)
         max_thinking_tokens: Override thinking budget (None = use agent default from
                             AGENT_CONFIGS, converted using phase_config.THINKING_BUDGET_MAP)
+        betas: Optional list of SDK beta header strings (e.g., ["context-1m-2025-08-07"])
+        effort_level: Optional effort level for adaptive thinking models (e.g., "low",
+                     "medium", "high"). Injected as CLAUDE_CODE_EFFORT_LEVEL env var.
+        fast_mode: Enable Fast Mode for faster Opus 4.6 output. Enables the "user"
+                  setting source so the CLI reads fastMode from ~/.claude/settings.json.
 
     Returns:
         Configured ClaudeSDKClient for single-turn operations
@@ -72,21 +81,27 @@ def create_simple_client(
     Raises:
         ValueError: If agent_type is not found in AGENT_CONFIGS
     """
-    # Get authentication
-    oauth_token = require_auth_token()
-
-    # Validate token is not encrypted before passing to SDK
-    # Encrypted tokens (enc:...) should have been decrypted by require_auth_token()
-    # If we still have an encrypted token here, it means decryption failed or was skipped
-    validate_token_not_encrypted(oauth_token)
-
-    import os
-
-    os.environ["CLAUDE_CODE_OAUTH_TOKEN"] = oauth_token
-
-    # Get environment variables for SDK
+    # Get environment variables for SDK (including CLAUDE_CONFIG_DIR if set)
     sdk_env = get_sdk_env_vars()
 
+    # Get the config dir for profile-specific credential lookup
+    # CLAUDE_CONFIG_DIR enables per-profile Keychain entries with SHA256-hashed service names
+    config_dir = sdk_env.get("CLAUDE_CONFIG_DIR")
+
+    # Configure SDK authentication (OAuth or API profile mode)
+    configure_sdk_authentication(config_dir)
+
+    # Inject effort level for adaptive thinking models (e.g., Opus 4.6)
+    if effort_level:
+        sdk_env["CLAUDE_CODE_EFFORT_LEVEL"] = effort_level
+
+    # Fast mode: the CLI reads "fastMode" from user settings (~/.claude/settings.json).
+    # By default the SDK passes --setting-sources "" which blocks all filesystem settings.
+    # We enable "user" source so the CLI can read fastMode from user settings.
+    if fast_mode:
+        ensure_fast_mode_in_user_settings()
+        logger.info("[Fast Mode] ACTIVE — will enable user setting source for fastMode")
+
     # Get agent configuration (raises ValueError if unknown type)
     config = get_agent_config(agent_type)
 
@@ -109,10 +124,19 @@ def create_simple_client(
         "env": sdk_env,
     }
 
+    # Fast mode: enable user setting source so CLI reads fastMode from
+    # ~/.claude/settings.json. Without this, --setting-sources "" blocks it.
+    if fast_mode:
+        options_kwargs["setting_sources"] = ["user"]
+
     # Only add max_thinking_tokens if not None (Haiku doesn't support extended thinking)
     if max_thinking_tokens is not None:
         options_kwargs["max_thinking_tokens"] = max_thinking_tokens
 
+    # Add beta headers if specified (e.g., for 1M context window)
+    if betas:
+        options_kwargs["betas"] = betas
+
     # Optional: Allow CLI path override via environment variable
     env_cli_path = os.environ.get("CLAUDE_CLI_PATH")
     if env_cli_path and validate_cli_path(env_cli_path):

apps/backend/core/task_event.py

@@ -0,0 +1,101 @@
+"""
+Task event protocol for frontend XState synchronization.
+
+Protocol: __TASK_EVENT__:{...}
+"""
+
+from __future__ import annotations
+
+import json
+import os
+import sys
+from dataclasses import dataclass
+from datetime import datetime, timezone
+from pathlib import Path
+from uuid import uuid4
+
+TASK_EVENT_PREFIX = "__TASK_EVENT__:"
+_DEBUG = os.environ.get("DEBUG", "").lower() in ("1", "true", "yes")
+
+
+@dataclass
+class TaskEventContext:
+    task_id: str
+    spec_id: str
+    project_id: str
+    sequence_start: int = 0
+
+
+def _load_task_metadata(spec_dir: Path) -> dict:
+    metadata_path = spec_dir / "task_metadata.json"
+    if not metadata_path.exists():
+        return {}
+    try:
+        with open(metadata_path, encoding="utf-8") as f:
+            return json.load(f)
+    except (OSError, json.JSONDecodeError, UnicodeDecodeError):
+        return {}
+
+
+def _load_last_sequence(spec_dir: Path) -> int:
+    plan_path = spec_dir / "implementation_plan.json"
+    if not plan_path.exists():
+        return 0
+    try:
+        with open(plan_path, encoding="utf-8") as f:
+            plan = json.load(f)
+        last_event = plan.get("lastEvent") or {}
+        seq = last_event.get("sequence")
+        if isinstance(seq, int) and seq >= 0:
+            return seq + 1
+    except (OSError, json.JSONDecodeError, UnicodeDecodeError):
+        return 0
+    return 0
+
+
+def load_task_event_context(spec_dir: Path) -> TaskEventContext:
+    metadata = _load_task_metadata(spec_dir)
+    task_id = metadata.get("taskId") or metadata.get("task_id") or spec_dir.name
+    spec_id = metadata.get("specId") or metadata.get("spec_id") or spec_dir.name
+    project_id = metadata.get("projectId") or metadata.get("project_id") or ""
+    sequence_start = _load_last_sequence(spec_dir)
+    return TaskEventContext(
+        task_id=str(task_id),
+        spec_id=str(spec_id),
+        project_id=str(project_id),
+        sequence_start=sequence_start,
+    )
+
+
+class TaskEventEmitter:
+    def __init__(self, context: TaskEventContext) -> None:
+        self._context = context
+        self._sequence = context.sequence_start
+
+    @classmethod
+    def from_spec_dir(cls, spec_dir: Path) -> TaskEventEmitter:
+        return cls(load_task_event_context(spec_dir))
+
+    def emit(self, event_type: str, payload: dict | None = None) -> None:
+        event = {
+            "type": event_type,
+            "taskId": self._context.task_id,
+            "specId": self._context.spec_id,
+            "projectId": self._context.project_id,
+            "timestamp": datetime.now(timezone.utc).isoformat(),
+            "eventId": str(uuid4()),
+            "sequence": self._sequence,
+        }
+        if payload:
+            event.update(payload)
+
+        try:
+            print(f"{TASK_EVENT_PREFIX}{json.dumps(event, default=str)}", flush=True)
+            self._sequence += 1
+        except (OSError, UnicodeEncodeError) as e:
+            if _DEBUG:
+                try:
+                    sys.stderr.write(f"[task_event] emit failed: {e}\n")
+                    sys.stderr.flush()
+                except (OSError, UnicodeEncodeError):
+                    pass  # Silent on complete I/O failure

apps/backend/core/workspace.py

@@ -121,6 +121,7 @@ from merge import (
     FileTimelineTracker,
     MergeOrchestrator,
 )
+from merge.progress import MergeProgressCallback, MergeProgressStage, emit_progress
 
 MODULE = "workspace"
 
@@ -145,6 +146,26 @@ MODULE = "workspace"
 # - _heuristic_merge
 
 
+def _create_merge_progress_callback() -> MergeProgressCallback | None:
+    """
+    Create a progress callback for merge operations when running as a subprocess.
+
+    Returns emit_progress (writing JSON to stdout) only when stdout is piped
+    (i.e., running as a subprocess from the Electron frontend). Returns None
+    when running interactively in a terminal to avoid polluting CLI output.
+
+    This function must be called at runtime (not at import time) to ensure
+    sys.stdout state is accurate.
+    """
+    import sys
+
+    # Only emit progress JSON when stdout is piped (subprocess mode).
+    # In interactive CLI mode (TTY), progress JSON would clutter the output.
+    if not sys.stdout.isatty():
+        return emit_progress
+    return None
+
+
 def merge_existing_build(
     project_dir: Path,
     spec_name: str,
@@ -252,10 +273,11 @@ def merge_existing_build(
                 had_conflicts = stats.get("conflicts_resolved", 0) > 0
                 ai_assisted = stats.get("ai_assisted", 0) > 0
                 direct_copy = stats.get("direct_copy", False)
+                git_merge_used = stats.get("git_merge", False)
 
-                if had_conflicts or ai_assisted or direct_copy:
-                    # AI resolved conflicts, assisted with merges, or direct copy was used
-                    # Changes are already written and staged - no need for git merge
+                if had_conflicts or ai_assisted or direct_copy or git_merge_used:
+                    # AI resolved conflicts, assisted with merges, git merge was used, or direct copy was used
+                    # Changes are already written and staged - no need for additional git merge
                     _print_merge_success(
                         no_commit, stats, spec_name=spec_name, keep_worktree=True
                     )
@@ -402,9 +424,20 @@ def _try_smart_merge_inner(
         no_commit=no_commit,
     )
 
+    # Create progress callback for subprocess mode (Electron frontend).
+    # Only emits JSON to stdout when piped, not in interactive CLI.
+    progress_callback = _create_merge_progress_callback()
+
     try:
         print(muted("  Analyzing changes with intent-aware merge..."))
 
+        if progress_callback is not None:
+            progress_callback(
+                MergeProgressStage.ANALYZING,
+                0,
+                "Starting merge analysis",
+            )
+
         # Capture worktree state in FileTimelineTracker before merge
         try:
             timeline_tracker = FileTimelineTracker(project_dir)
@@ -440,6 +473,13 @@ def _try_smart_merge_inner(
         )
 
         # Check for git-level conflicts first (branch divergence)
+        if progress_callback is not None:
+            progress_callback(
+                MergeProgressStage.DETECTING_CONFLICTS,
+                25,
+                "Checking for git-level conflicts",
+            )
+
         debug(MODULE, "Checking for git-level conflicts")
         git_conflicts = _check_git_conflicts(project_dir, spec_name)
 
@@ -492,12 +532,11 @@ def _try_smart_merge_inner(
                 # If rebase succeeded and now there are no conflicts,
                 # the diverged_but_no_conflicts path will handle the merge
             else:
-                # Rebase failed - continue with conflict resolution as before
-                # The AI resolver will handle the conflicts
-                print(
-                    warning(
-                        "  Rebase encountered issues, using AI conflict resolution..."
-                    )
+                # Rebase failed (likely due to worktree lock) - continue with merge
+                # Git merge or AI resolver will handle it depending on conflict state
+                debug(
+                    MODULE,
+                    "Rebase skipped or failed, continuing with merge flow",
                 )
 
         if git_conflicts.get("has_conflicts"):
@@ -518,6 +557,18 @@ def _try_smart_merge_inner(
                 num_conflicts=len(git_conflicts.get("conflicting_files", [])),
             )
 
+            if progress_callback is not None:
+                progress_callback(
+                    MergeProgressStage.RESOLVING,
+                    50,
+                    f"Resolving {len(git_conflicts.get('conflicting_files', []))} conflicting files with AI",
+                    {
+                        "conflicts_found": len(
+                            git_conflicts.get("conflicting_files", [])
+                        )
+                    },
+                )
+
             # Try to resolve git conflicts with AI
             resolution_result = _resolve_git_conflicts_with_ai(
                 project_dir,
@@ -535,6 +586,22 @@ def _try_smart_merge_inner(
                     resolved_files=resolution_result.get("resolved_files", []),
                     stats=resolution_result.get("stats", {}),
                 )
+
+                if progress_callback is not None:
+                    stats = resolution_result.get("stats", {})
+                    original_conflict_count = len(
+                        git_conflicts.get("conflicting_files", [])
+                    )
+                    progress_callback(
+                        MergeProgressStage.COMPLETE,
+                        100,
+                        "Merge complete",
+                        {
+                            "conflicts_found": original_conflict_count,
+                            "conflicts_resolved": stats.get("conflicts_resolved", 0),
+                        },
+                    )
+
                 return resolution_result
             else:
                 # AI couldn't resolve all conflicts
@@ -547,6 +614,26 @@ def _try_smart_merge_inner(
                     resolved_files=resolution_result.get("resolved_files", []),
                     error=resolution_result.get("error"),
                 )
+
+                if progress_callback is not None:
+                    original_conflict_count = len(
+                        git_conflicts.get("conflicting_files", [])
+                    )
+                    remaining_count = len(
+                        resolution_result.get("remaining_conflicts", [])
+                    )
+                    progress_callback(
+                        MergeProgressStage.ERROR,
+                        0,
+                        "Some conflicts could not be resolved",
+                        {
+                            "conflicts_found": original_conflict_count,
+                            "conflicts_resolved": original_conflict_count
+                            - remaining_count,
+                            "conflicts_remaining": remaining_count,
+                        },
+                    )
+
                 return {
                     "success": False,
                     "conflicts": resolution_result.get("remaining_conflicts", []),
@@ -555,148 +642,81 @@ def _try_smart_merge_inner(
                     "error": resolution_result.get("error"),
                 }
 
-        # Check if branches diverged but no actual conflicts (can do direct copy)
+        # Check if branches diverged but no actual conflicts (use git merge)
         if git_conflicts.get("diverged_but_no_conflicts"):
-            debug(MODULE, "Branches diverged but no conflicts - doing direct file copy")
+            debug(MODULE, "Branches diverged but no conflicts - using git merge")
             print(muted("  Branches diverged but no conflicts detected"))
-            print(muted("  Copying changed files directly from worktree..."))
+            print(muted("  Using git merge to combine changes..."))
 
-            # Get changed files from spec branch
             spec_branch = f"auto-claude/{spec_name}"
-            base_branch = git_conflicts.get("base_branch", "main")
 
-            # Get merge-base for diff
-            merge_base_result = run_git(
-                ["merge-base", base_branch, spec_branch],
+            # Use git merge --no-commit to combine changes from both branches
+            # Since merge-tree confirmed no conflicts, this should succeed cleanly
+            merge_result = run_git(
+                ["merge", "--no-commit", "--no-ff", spec_branch],
                 cwd=project_dir,
             )
-            merge_base = (
-                merge_base_result.stdout.strip()
-                if merge_base_result.returncode == 0
-                else None
-            )
 
-            if merge_base:
-                # Get list of changed files in spec branch
-                changed_files = _get_changed_files_from_branch(
-                    project_dir, merge_base, spec_branch
+            if merge_result.returncode == 0:
+                # Merge succeeded - get list of files that were merged
+                # Use git diff --cached to see what's staged
+                diff_result = run_git(
+                    ["diff", "--cached", "--name-only"],
+                    cwd=project_dir,
+                )
+                merged_files = [
+                    f.strip()
+                    for f in diff_result.stdout.splitlines()
+                    if f.strip() and not _is_auto_claude_file(f.strip())
+                ]
+
+                debug_success(
+                    MODULE,
+                    "Git merge succeeded",
+                    merged_files_count=len(merged_files),
                 )
 
-                resolved_files = []
-                skipped_files = []  # Track files that failed to copy
-                files_to_stage = []
-                for file_path, status in changed_files:
-                    if _is_auto_claude_file(file_path):
-                        continue
+                for file_path in merged_files:
+                    print(success(f"    ✓ {file_path}"))
 
-                    try:
-                        target_path = project_dir / file_path
-
-                        if status == "D":
-                            # Deleted in worktree
-                            if target_path.exists():
-                                target_path.unlink()
-                            files_to_stage.append(file_path)
-                            resolved_files.append(file_path)
-                            print(success(f"    ✓ {file_path} (deleted)"))
-                        else:
-                            # New or modified - copy from spec branch
-                            target_path.parent.mkdir(parents=True, exist_ok=True)
-
-                            if _is_binary_file(file_path):
-                                binary_content = _get_binary_file_content_from_ref(
-                                    project_dir, spec_branch, file_path
-                                )
-                                if binary_content is not None:
-                                    target_path.write_bytes(binary_content)
-                                    files_to_stage.append(file_path)
-                                    resolved_files.append(file_path)
-                                    status_label = (
-                                        "new file" if status == "A" else "updated"
-                                    )
-                                    print(
-                                        success(f"    ✓ {file_path} ({status_label})")
-                                    )
-                                else:
-                                    skipped_files.append(file_path)
-                                    debug_warning(
-                                        MODULE,
-                                        f"Could not retrieve binary content for {file_path}",
-                                    )
-                            else:
-                                content = _get_file_content_from_ref(
-                                    project_dir, spec_branch, file_path
-                                )
-                                if content is not None:
-                                    target_path.write_text(content, encoding="utf-8")
-                                    files_to_stage.append(file_path)
-                                    resolved_files.append(file_path)
-                                    status_label = (
-                                        "new file" if status == "A" else "updated"
-                                    )
-                                    print(
-                                        success(f"    ✓ {file_path} ({status_label})")
-                                    )
-                                else:
-                                    skipped_files.append(file_path)
-                                    debug_warning(
-                                        MODULE,
-                                        f"Could not retrieve content for {file_path}",
-                                    )
-
-                    except Exception as e:
-                        skipped_files.append(file_path)
-                        debug_warning(MODULE, f"Could not copy {file_path}: {e}")
-
-                # Stage all files in a single git add call for efficiency
-                if files_to_stage:
-                    add_result = run_git(
-                        ["add"] + files_to_stage,
-                        cwd=project_dir,
+                if progress_callback is not None:
+                    progress_callback(
+                        MergeProgressStage.COMPLETE,
+                        100,
+                        f"Git merge complete ({len(merged_files)} files)",
                     )
-                    if add_result.returncode != 0:
-                        debug_warning(
-                            MODULE,
-                            f"Failed to stage files for direct copy: {add_result.stderr}",
-                        )
-                        # Return failure - files were written but not staged
-                        return {
-                            "success": False,
-                            "error": f"Failed to stage files: {add_result.stderr}",
-                            "resolved_files": [],
-                        }
 
-                # Build result - check for skipped files to detect partial merges
-                result = {
-                    "success": len(skipped_files) == 0,
-                    "resolved_files": resolved_files,
+                return {
+                    "success": True,
+                    "resolved_files": merged_files,
                     "stats": {
-                        "files_merged": len(resolved_files),
+                        "files_merged": len(merged_files),
                         "conflicts_resolved": 0,
                         "ai_assisted": 0,
-                        "auto_merged": len(resolved_files),
-                        "direct_copy": True,  # Flag indicating direct copy was used
-                        "skipped_count": len(skipped_files),
+                        "auto_merged": len(merged_files),
+                        "git_merge": True,  # Flag indicating git merge was used
                     },
                 }
-                if skipped_files:
-                    result["skipped_files"] = skipped_files
-                    result["partial_success"] = len(resolved_files) > 0
-                    print()
-                    print(
-                        warning(
-                            f"  ⚠ {len(skipped_files)} file(s) could not be retrieved:"
-                        )
-                    )
-                    for skipped_file in skipped_files:
-                        print(muted(f"    - {skipped_file}"))
-                    print(muted("  These files may need manual review."))
-                return result
             else:
-                # merge-base failed - branches may not share history
+                # Merge failed unexpectedly - abort and fall back to semantic analysis
                 debug_warning(
                     MODULE,
-                    "Could not find merge-base between branches - falling back to semantic analysis",
+                    "Git merge failed unexpectedly despite no conflicts detected",
+                    stderr=merge_result.stderr[:500] if merge_result.stderr else "",
+                )
+                # Abort the merge to restore clean state
+                abort_result = run_git(["merge", "--abort"], cwd=project_dir)
+                if abort_result.returncode != 0:
+                    debug_error(
+                        MODULE,
+                        "Failed to abort merge - repo may be in inconsistent state",
+                        stderr=abort_result.stderr,
+                    )
+                    return None  # Trigger fallback to avoid operating on inconsistent state
+                print(
+                    warning(
+                        "  Git merge failed unexpectedly, falling back to semantic analysis..."
+                    )
                 )
 
         # No git conflicts - proceed with semantic analysis
@@ -725,6 +745,14 @@ def _try_smart_merge_inner(
 
         # All conflicts can be auto-merged or no conflicts
         print(muted("  All changes compatible, proceeding with merge..."))
+
+        if progress_callback is not None:
+            progress_callback(
+                MergeProgressStage.COMPLETE,
+                100,
+                f"Analysis complete ({files_to_merge} files compatible)",
+            )
+
         return {
             "success": True,
             "stats": {
@@ -737,6 +765,13 @@ def _try_smart_merge_inner(
         # If smart merge fails, fall back to git
         import traceback
 
+        if progress_callback is not None:
+            progress_callback(
+                MergeProgressStage.ERROR,
+                0,
+                f"Smart merge error: {e}",
+            )
+
         print(muted(f"  Smart merge error: {e}"))
         traceback.print_exc()
         return None
@@ -748,14 +783,11 @@ def _rebase_spec_branch(
     base_branch: str,
 ) -> bool:
     """
-    Rebase the spec branch onto the latest base branch.
+    Attempt to rebase the spec branch onto the latest base branch.
 
-    This performs an automatic rebase of the spec branch onto the current
-    base branch (main/develop) to bring it up to date before merging.
-    If conflicts occur during rebase, the function aborts and returns False
-    so that the caller can fall back to AI conflict resolution.
-
-    The function preserves the current HEAD by restoring it after completion.
+    NOTE: This will fail if the spec branch is checked out in a worktree,
+    which is the normal case. The caller should handle failure gracefully
+    by falling back to git merge or AI conflict resolution.
 
     Args:
         project_dir: The project directory
@@ -764,22 +796,36 @@ def _rebase_spec_branch(
 
     Returns:
         True if rebase succeeded cleanly or branch was already up-to-date,
-        False if rebase failed due to conflicts or other errors (aborted, no ref movement)
+        False if rebase failed (worktree lock, conflicts, or other errors)
     """
     spec_branch = f"auto-claude/{spec_name}"
 
     debug(
         MODULE,
-        "Rebasing spec branch",
+        "Attempting to rebase spec branch",
         spec_branch=spec_branch,
         base_branch=base_branch,
     )
 
-    # Save original branch to restore after rebase (HIGH: prevents leaving repo on spec branch)
+    # Check if spec branch is used by a worktree (common case)
+    # In this case, we can't checkout/rebase from the main repo
+    worktree_list_result = run_git(["worktree", "list", "--porcelain"], cwd=project_dir)
+    if worktree_list_result.returncode == 0:
+        # Check if spec_branch is in use by a worktree
+        output = worktree_list_result.stdout
+        if f"branch refs/heads/{spec_branch}" in output:
+            debug(
+                MODULE,
+                "Spec branch is checked out in a worktree - skipping rebase",
+                spec_branch=spec_branch,
+            )
+            # This is expected - return False to let caller use git merge instead
+            return False
+
+    # Save original branch to restore after rebase
     original_branch_result = run_git(
         ["rev-parse", "--abbrev-ref", "HEAD"], cwd=project_dir
     )
-    # Check returncode and validate stdout before using original_branch
     if original_branch_result.returncode != 0:
         debug_error(
             MODULE,
@@ -795,7 +841,6 @@ def _rebase_spec_branch(
         )
         return False
 
-    # Save current state for recovery
     # Get the current commit of spec_branch before rebase
     before_commit_result = run_git(["rev-parse", spec_branch], cwd=project_dir)
     if before_commit_result.returncode != 0:
@@ -804,8 +849,6 @@ def _rebase_spec_branch(
             "Could not get spec branch commit before rebase",
             stderr=before_commit_result.stderr,
         )
-        # Restore original branch before returning
-        run_git(["checkout", original_branch], cwd=project_dir)
         return False
     before_commit = before_commit_result.stdout.strip()
 
@@ -813,22 +856,18 @@ def _rebase_spec_branch(
     print(muted(f"  Rebasing {spec_branch} onto {base_branch}..."))
 
     try:
-        # Perform the rebase using safe/standard invocation:
-        # 1. Checkout the spec branch first
-        # 2. Run standard rebase (no strategy options - let conflicts stop the rebase)
-        # If conflicts occur, we'll abort and let AI handle them during merge
+        # Try to checkout the spec branch
         checkout_result = run_git(["checkout", spec_branch], cwd=project_dir)
         if checkout_result.returncode != 0:
-            debug_error(
+            # Checkout failed - likely due to worktree lock
+            debug(
                 MODULE,
-                "Could not checkout spec branch for rebase",
-                stderr=checkout_result.stderr,
+                "Could not checkout spec branch for rebase (likely worktree lock)",
+                stderr=checkout_result.stderr[:200] if checkout_result.stderr else "",
             )
             return False
 
-        # Run standard rebase - will stop on conflicts so we can detect them
-        # Git syntax: git rebase [options] <upstream>
-        # where <upstream> is the branch to rebase onto
+        # Run standard rebase
         rebase_result = run_git(
             ["rebase", base_branch],
             cwd=project_dir,
@@ -838,9 +877,6 @@ def _rebase_spec_branch(
             # Rebase failed - check if it was due to conflicts
             status_result = run_git(["status", "--porcelain"], cwd=project_dir)
 
-            # MEDIUM: Properly parse git status output for conflict markers
-            # Git status --porcelain uses two-character status codes:
-            # UU = both modified, AA = both added, DD = both deleted, etc.
             has_unmerged = any(
                 line[:2] in ("UU", "AA", "DD", "AU", "UA", "DU", "UD")
                 for line in status_result.stdout.splitlines()
@@ -848,7 +884,6 @@ def _rebase_spec_branch(
             )
 
             # Abort the rebase to return to clean state
-            # NEW-002: If abort fails, immediately return False (repo in bad state)
             abort_result = run_git(["rebase", "--abort"], cwd=project_dir)
             if abort_result.returncode != 0:
                 debug_error(
@@ -856,19 +891,16 @@ def _rebase_spec_branch(
                     "Failed to abort rebase - repo may be in inconsistent state",
                     stderr=abort_result.stderr,
                 )
-                return False  # Abort failed - cannot safely continue
-
-            if has_unmerged:
-                # Rebase failed due to conflicts - we aborted, so no ref movement happened
-                debug_warning(
-                    MODULE,
-                    "Rebase encountered conflicts - aborted, will use AI conflict resolution",
-                    stderr=rebase_result.stderr[:200] if rebase_result.stderr else "",
-                )
-                # Return False since we aborted - no rebase occurred, caller should use AI
                 return False
 
-            # Other error (not conflict-related)
+            if has_unmerged:
+                debug_warning(
+                    MODULE,
+                    "Rebase encountered conflicts - aborted, will use alternative merge",
+                    stderr=rebase_result.stderr[:200] if rebase_result.stderr else "",
+                )
+                return False
+
             debug_error(
                 MODULE,
                 "Rebase failed with unexpected error",
@@ -882,9 +914,7 @@ def _rebase_spec_branch(
         if after_commit_result.returncode == 0:
             after_commit_hash = after_commit_result.stdout.strip()
 
-            # Verify the branch actually moved (commit changed)
             if before_commit == after_commit_hash:
-                # MEDIUM: Branch already up-to-date is a success condition, not failure
                 debug(
                     MODULE,
                     "Branch already up-to-date, no rebase needed",
@@ -904,8 +934,7 @@ def _rebase_spec_branch(
         debug_error(MODULE, "Could not verify spec branch commit after rebase")
         return False
     finally:
-        # HIGH: Always restore original branch, even on error/exception
-        # NEW-001: Log restoration failure (cannot modify return from finally block)
+        # Always restore original branch
         if original_branch:
             restore_result = run_git(["checkout", original_branch], cwd=project_dir)
             if restore_result.returncode != 0:
@@ -914,8 +943,6 @@ def _rebase_spec_branch(
                     f"Failed to restore original branch '{original_branch}'",
                     stderr=restore_result.stderr,
                 )
-                # Note: Cannot modify return value from finally block,
-                # but restoration failure is rare and non-critical (user can manually switch back)
 
 
 def _check_git_conflicts(project_dir: Path, spec_name: str) -> dict:

apps/backend/core/workspace/__init__.py

@@ -17,7 +17,6 @@ Public API exported from sub-modules.
 """
 
 import importlib.util
-import sys
 from pathlib import Path
 
 # Import merge functions from workspace.py (which coexists with this package)
@@ -28,10 +27,17 @@ _workspace_module = importlib.util.module_from_spec(_spec)
 _spec.loader.exec_module(_workspace_module)
 merge_existing_build = _workspace_module.merge_existing_build
 _run_parallel_merges = _workspace_module._run_parallel_merges
+_resolve_git_conflicts_with_ai = _workspace_module._resolve_git_conflicts_with_ai
 AI_MERGE_SYSTEM_PROMPT = _workspace_module.AI_MERGE_SYSTEM_PROMPT
 _build_merge_prompt = _workspace_module._build_merge_prompt
 _check_git_conflicts = _workspace_module._check_git_conflicts
 _rebase_spec_branch = _workspace_module._rebase_spec_branch
+_create_merge_progress_callback = _workspace_module._create_merge_progress_callback
+_infer_language_from_path = _workspace_module._infer_language_from_path
+_strip_code_fences = _workspace_module._strip_code_fences
+_try_simple_3way_merge = _workspace_module._try_simple_3way_merge
+_attempt_ai_merge = _workspace_module._attempt_ai_merge
+_merge_file_with_ai_async = _workspace_module._merge_file_with_ai_async
 
 # Models and Enums
 # Display Functions
@@ -74,7 +80,9 @@ from .git_utils import (
     # Export private names for backward compatibility
     _is_process_running,
     _validate_merged_syntax,
+    apply_path_mapping,
     create_conflict_file_with_git,
+    detect_file_renames,
     get_binary_file_content_from_ref,
     get_changed_files_from_branch,
     get_current_branch,
@@ -91,6 +99,8 @@ from .models import (
     MergeLockError,
     ParallelMergeResult,
     ParallelMergeTask,
+    SpecNumberLock,
+    SpecNumberLockError,
     WorkspaceChoice,
     WorkspaceMode,
 )
@@ -110,11 +120,9 @@ from .setup import (
 __all__ = [
     # Merge Operations (from workspace.py)
     "merge_existing_build",
-    "_run_parallel_merges",  # Private but used internally
-    "AI_MERGE_SYSTEM_PROMPT",  # System prompt for AI merge (ACS-194)
-    "_build_merge_prompt",  # Internal prompt builder (ACS-194)
-    "_check_git_conflicts",  # Internal git conflict detection (ACS-224)
-    "_rebase_spec_branch",  # Internal rebase function (ACS-224)
+    # Note: Private functions (_run_parallel_merges, _resolve_git_conflicts_with_ai, etc.)
+    # are kept as module-level assignments for internal use but not exported in __all__
+    # to maintain the underscore convention for private/internal APIs
     # Models
     "WorkspaceMode",
     "WorkspaceChoice",
@@ -122,6 +130,8 @@ __all__ = [
     "ParallelMergeResult",
     "MergeLock",
     "MergeLockError",
+    "SpecNumberLock",
+    "SpecNumberLockError",
     # Git Utils
     "has_uncommitted_changes",
     "get_current_branch",
@@ -131,8 +141,11 @@ __all__ = [
     "get_changed_files_from_branch",
     "is_process_running",
     "is_binary_file",
+    "is_lock_file",
     "validate_merged_syntax",
     "create_conflict_file_with_git",
+    "detect_file_renames",  # File rename detection
+    "apply_path_mapping",  # Path mapping for renamed files
     # Setup
     "choose_workspace",
     "copy_spec_to_worktree",

apps/backend/core/workspace/dependency_strategy.py

@@ -0,0 +1,176 @@
+"""
+Dependency Strategy Mapping
+============================
+
+Maps dependency types to sharing strategies for worktree creation.
+
+Each dependency ecosystem has different constraints:
+
+- **node_modules**: Safe to symlink. Node's resolution algorithm follows symlinks
+  correctly, and the directory is self-contained.
+
+- **venv / .venv**: Must be recreated. Python's ``pyvenv.cfg`` discovery walks the
+  real directory hierarchy without resolving symlinks (CPython bug #106045), so a
+  symlinked venv resolves paths relative to the *target*, not the worktree.
+
+- **vendor (PHP)**: Safe to symlink. Composer's autoloader uses ``__DIR__``-relative
+  paths that resolve correctly through symlinks.
+
+- **cargo target / go modules**: Skip entirely. Rust's ``target/`` dir contains
+  per-machine build artifacts that must be rebuilt. Go uses a global module cache
+  (``$GOPATH/pkg/mod``), so there is nothing in-tree to share.
+"""
+
+from __future__ import annotations
+
+import logging
+import os
+from pathlib import Path, PurePosixPath, PureWindowsPath
+
+logger = logging.getLogger(__name__)
+
+from .models import DependencyShareConfig, DependencyStrategy
+
+# ---------------------------------------------------------------------------
+# Default strategy map
+# ---------------------------------------------------------------------------
+# Maps dependency type identifiers to the strategy that should be used when
+# sharing that dependency across worktrees.  Data-driven — add new entries
+# here rather than writing if/else branches.
+# ---------------------------------------------------------------------------
+
+DEFAULT_STRATEGY_MAP: dict[str, DependencyStrategy] = {
+    # JavaScript / Node.js — symlink is safe and fast
+    "node_modules": DependencyStrategy.SYMLINK,
+    # Python — venvs MUST be recreated (pyvenv.cfg symlink bug)
+    "venv": DependencyStrategy.RECREATE,
+    ".venv": DependencyStrategy.RECREATE,
+    # PHP — Composer vendor dir is safe to symlink
+    "vendor_php": DependencyStrategy.SYMLINK,
+    # Ruby — Bundler vendor/bundle is safe to symlink
+    "vendor_bundle": DependencyStrategy.SYMLINK,
+    # Rust — build output dir, skip (rebuilt per-worktree)
+    "cargo_target": DependencyStrategy.SKIP,
+    # Go — global module cache, nothing in-tree to share
+    "go_modules": DependencyStrategy.SKIP,
+}
+
+
+def get_dependency_configs(
+    project_index: dict | None,
+    project_dir: Path | None = None,
+) -> list[DependencyShareConfig]:
+    """Derive dependency share configs from a project index.
+
+    If *project_index* is ``None`` or lacks ``dependency_locations``,
+    falls back to a hardcoded node_modules config for backward compatibility
+    with existing worktree setups.
+
+    Args:
+        project_index: Parsed ``project_index.json`` dict, or ``None``.
+        project_dir: Project root directory for resolved-path containment
+            checks (defense-in-depth).  Should always be provided when
+            *project_index* is not ``None`` — omitting it disables the
+            resolved-path security check.
+
+    Returns:
+        List of :class:`DependencyShareConfig` objects — one per discovered
+        dependency location.
+    """
+
+    configs: list[DependencyShareConfig] = []
+    seen: set[str] = set()
+
+    if project_index is not None:
+        if project_dir is None:
+            logger.warning(
+                "get_dependency_configs called with project_index but no "
+                "project_dir — resolved-path containment check is disabled"
+            )
+
+        # Use the aggregated top-level dependency_locations which already
+        # contain project-relative paths (e.g. "apps/backend/.venv" instead
+        # of just ".venv").  This avoids a monorepo path resolution bug
+        # where service-relative paths were incorrectly treated as project-
+        # relative.
+        dep_locations = project_index.get("dependency_locations") or []
+        for dep in dep_locations:
+            if not isinstance(dep, dict):
+                continue
+
+            dep_type = dep.get("type", "")
+            rel_path = dep.get("path", "")
+
+            if not dep_type or not rel_path:
+                continue
+
+            # Path containment: reject absolute paths and traversals.
+            # Check both POSIX and Windows path styles for cross-platform safety.
+            p = PurePosixPath(rel_path)
+            if p.is_absolute() or PureWindowsPath(rel_path).is_absolute():
+                continue
+            if ".." in p.parts or ".." in PureWindowsPath(rel_path).parts:
+                continue
+
+            # Defense-in-depth: verify the resolved path stays within project_dir
+            if project_dir is not None:
+                resolved = (project_dir / rel_path).resolve()
+                if not str(resolved).startswith(str(project_dir.resolve()) + os.sep):
+                    continue
+
+            # Deduplicate by relative path
+            if rel_path in seen:
+                continue
+            seen.add(rel_path)
+
+            strategy = DEFAULT_STRATEGY_MAP.get(dep_type, DependencyStrategy.SKIP)
+
+            # Validate requirements_file path containment too
+            req_file = dep.get("requirements_file")
+            if req_file:
+                rp = PurePosixPath(req_file)
+                if (
+                    rp.is_absolute()
+                    or PureWindowsPath(req_file).is_absolute()
+                    or ".." in rp.parts
+                    or ".." in PureWindowsPath(req_file).parts
+                ):
+                    req_file = None
+
+                # Defense-in-depth: resolved-path containment (matches rel_path check)
+                if req_file and project_dir is not None:
+                    resolved_req = (project_dir / req_file).resolve()
+                    if not str(resolved_req).startswith(
+                        str(project_dir.resolve()) + os.sep
+                    ):
+                        req_file = None
+
+            configs.append(
+                DependencyShareConfig(
+                    dep_type=dep_type,
+                    strategy=strategy,
+                    source_rel_path=rel_path,
+                    requirements_file=req_file,
+                    package_manager=dep.get("package_manager"),
+                )
+            )
+
+    # Fallback: if no configs were discovered, default to node_modules-only
+    # so existing worktree behaviour is preserved.
+    if not configs:
+        configs.append(
+            DependencyShareConfig(
+                dep_type="node_modules",
+                strategy=DependencyStrategy.SYMLINK,
+                source_rel_path="node_modules",
+            )
+        )
+        configs.append(
+            DependencyShareConfig(
+                dep_type="node_modules",
+                strategy=DependencyStrategy.SYMLINK,
+                source_rel_path="apps/frontend/node_modules",
+            )
+        )
+
+    return configs

apps/backend/core/workspace/models.py

@@ -273,3 +273,31 @@ class SpecNumberLock:
                 pass
 
         return max_num
+
+
+class DependencyStrategy(Enum):
+    """Strategy for sharing dependency directories across worktrees.
+
+    SYMLINK is fast but unsafe for certain ecosystems. Notably, Python venv
+    breaks when symlinked because CPython's pyvenv.cfg discovery walks the
+    real directory hierarchy without resolving symlinks first
+    (CPython bug #106045). This means a symlinked venv resolves its home
+    path relative to the symlink target's parent, not the worktree, causing
+    import failures and broken interpreters.
+    """
+
+    SYMLINK = "symlink"  # Create a symlink to the source (fast, works for node_modules)
+    RECREATE = "recreate"  # Re-run the package manager to create a fresh copy
+    COPY = "copy"  # Deep-copy the directory (slow but always correct)
+    SKIP = "skip"  # Do nothing; let the agent handle it
+
+
+@dataclass
+class DependencyShareConfig:
+    """Configuration for how a specific dependency type should be shared."""
+
+    dep_type: str  # e.g. "node_modules", "venv", ".venv"
+    strategy: DependencyStrategy
+    source_rel_path: str  # Relative path from project root, e.g. "node_modules"
+    requirements_file: str | None = None  # e.g. "requirements.txt", "pyproject.toml"
+    package_manager: str | None = None  # e.g. "npm", "uv", "pip"

apps/backend/core/workspace/setup.py

@@ -14,6 +14,7 @@ import sys
 from pathlib import Path
 
 from core.git_executable import run_git
+from core.platform import is_windows
 from merge import FileTimelineTracker
 from security.constants import ALLOWLIST_FILENAME, PROFILE_FILENAME
 from ui import (
@@ -28,8 +29,9 @@ from ui import (
 )
 from worktree import WorktreeManager
 
+from .dependency_strategy import get_dependency_configs
 from .git_utils import has_uncommitted_changes
-from .models import WorkspaceMode
+from .models import DependencyShareConfig, DependencyStrategy, WorkspaceMode
 
 # Import debug utilities
 try:
@@ -189,11 +191,37 @@ def symlink_node_modules_to_worktree(
     """
     Symlink node_modules directories from project root to worktree.
 
-    This ensures the worktree has access to dependencies for TypeScript checks
-    and other tooling without requiring a separate npm install.
+    .. deprecated::
+        Use :func:`setup_worktree_dependencies` instead, which handles all
+        dependency types (node_modules, venvs, vendor dirs, etc.) via
+        strategy-based dispatch.
 
-    Works with npm workspace hoisting where dependencies are hoisted to root
-    and workspace-specific dependencies remain in nested node_modules.
+    This is a thin backward-compatibility wrapper that delegates to
+    ``setup_worktree_dependencies()`` with no project index (fallback mode).
+
+    Args:
+        project_dir: The main project directory
+        worktree_path: Path to the worktree
+
+    Returns:
+        List of symlinked paths (relative to worktree)
+    """
+    results = setup_worktree_dependencies(
+        project_dir, worktree_path, project_index=None
+    )
+    # Flatten all processed paths for backward-compatible return value
+    return [path for paths in results.values() for path in paths]
+
+
+def symlink_claude_config_to_worktree(
+    project_dir: Path, worktree_path: Path
+) -> list[str]:
+    """
+    Symlink .claude/ directory from project root to worktree.
+
+    This ensures the worktree has access to Claude Code configuration
+    (settings, CLAUDE.md, MCP servers, etc.) so that terminals opened
+    in the worktree behave identically to the project root.
 
     Args:
         project_dir: The main project directory
@@ -204,81 +232,52 @@ def symlink_node_modules_to_worktree(
     """
     symlinked = []
 
-    # Node modules locations to symlink for TypeScript and tooling support.
-    # These are the standard locations for this monorepo structure.
-    #
-    # Design rationale:
-    # - Hardcoded paths are intentional for simplicity and reliability
-    # - Dynamic discovery (reading workspaces from package.json) would add complexity
-    #   and potential failure points without significant benefit
-    # - This monorepo uses npm workspaces with hoisting, so dependencies are primarily
-    #   in root node_modules with workspace-specific deps in apps/frontend/node_modules
-    #
-    # To add new workspace locations:
-    # 1. Add (source_rel, target_rel) tuple below
-    # 2. Update the parallel TypeScript implementation in
-    #    apps/frontend/src/main/ipc-handlers/terminal/worktree-handlers.ts
-    # 3. Update the pre-commit hook check in .husky/pre-commit if needed
-    node_modules_locations = [
-        ("node_modules", "node_modules"),
-        ("apps/frontend/node_modules", "apps/frontend/node_modules"),
-    ]
+    source_path = project_dir / ".claude"
+    target_path = worktree_path / ".claude"
 
-    for source_rel, target_rel in node_modules_locations:
-        source_path = project_dir / source_rel
-        target_path = worktree_path / target_rel
+    # Skip if source doesn't exist
+    if not source_path.exists():
+        debug(MODULE, "Skipping .claude/ - source does not exist")
+        return symlinked
 
-        # Skip if source doesn't exist
-        if not source_path.exists():
-            debug(MODULE, f"Skipping {source_rel} - source does not exist")
-            continue
+    # Skip if target already exists
+    if target_path.exists():
+        debug(MODULE, "Skipping .claude/ - target already exists")
+        return symlinked
 
-        # Skip if target already exists (don't overwrite existing node_modules)
-        if target_path.exists():
-            debug(MODULE, f"Skipping {target_rel} - target already exists")
-            continue
+    # Also skip if target is a symlink (even if broken)
+    if target_path.is_symlink():
+        debug(MODULE, "Skipping .claude/ - symlink already exists (possibly broken)")
+        return symlinked
 
-        # Also skip if target is a symlink (even if broken - exists() returns False for broken symlinks)
-        if target_path.is_symlink():
-            debug(
-                MODULE,
-                f"Skipping {target_rel} - symlink already exists (possibly broken)",
-            )
-            continue
-
-        # Ensure parent directory exists
-        target_path.parent.mkdir(parents=True, exist_ok=True)
-
-        try:
-            if sys.platform == "win32":
-                # On Windows, use junctions instead of symlinks (no admin rights required)
-                # Junctions require absolute paths
-                result = subprocess.run(
-                    ["cmd", "/c", "mklink", "/J", str(target_path), str(source_path)],
-                    capture_output=True,
-                    text=True,
-                )
-                if result.returncode != 0:
-                    raise OSError(result.stderr or "mklink /J failed")
-            else:
-                # On macOS/Linux, use relative symlinks for portability
-                relative_source = os.path.relpath(source_path, target_path.parent)
-                os.symlink(relative_source, target_path)
-            symlinked.append(target_rel)
-            debug(MODULE, f"Symlinked {target_rel} -> {source_path}")
-        except OSError as e:
-            # Symlink/junction creation can fail on some systems (e.g., FAT32 filesystem)
-            # Log warning but don't fail - worktree is still usable, just without
-            # TypeScript checking
-            debug_warning(
-                MODULE,
-                f"Could not symlink {target_rel}: {e}. TypeScript checks may fail.",
-            )
-            # Warn user - pre-commit hooks may fail without dependencies
-            print_status(
-                f"Warning: Could not link {target_rel} - TypeScript checks may fail",
-                "warning",
+    # Ensure parent directory exists
+    target_path.parent.mkdir(parents=True, exist_ok=True)
+
+    try:
+        if sys.platform == "win32":
+            # On Windows, use junctions instead of symlinks (no admin rights required)
+            result = subprocess.run(
+                ["cmd", "/c", "mklink", "/J", str(target_path), str(source_path)],
+                capture_output=True,
+                text=True,
             )
+            if result.returncode != 0:
+                raise OSError(result.stderr or "mklink /J failed")
+        else:
+            # On macOS/Linux, use relative symlinks for portability
+            relative_source = os.path.relpath(source_path, target_path.parent)
+            os.symlink(relative_source, target_path)
+        symlinked.append(".claude")
+        debug(MODULE, f"Symlinked .claude/ -> {source_path}")
+    except OSError as e:
+        debug_warning(
+            MODULE,
+            f"Could not symlink .claude/: {e}. Claude Code features may not work in worktree terminals.",
+        )
+        print_status(
+            "Warning: Could not link .claude/ - Claude Code features may not work in terminals",
+            "warning",
+        )
 
     return symlinked
 
@@ -325,6 +324,7 @@ def setup_workspace(
     mode: WorkspaceMode,
     source_spec_dir: Path | None = None,
     base_branch: str | None = None,
+    use_local_branch: bool = False,
 ) -> tuple[Path, WorktreeManager | None, Path | None]:
     """
     Set up the workspace based on user's choice.
@@ -337,6 +337,7 @@ def setup_workspace(
         mode: The workspace mode to use
         source_spec_dir: Optional source spec directory to copy to worktree
         base_branch: Base branch for worktree creation (default: current branch)
+        use_local_branch: If True, use local branch directly instead of preferring origin/branch
 
     Returns:
         Tuple of (working_directory, worktree_manager or None, localized_spec_dir or None)
@@ -357,7 +358,9 @@ def setup_workspace(
     # Ensure timeline tracking hook is installed (once per session)
     ensure_timeline_hook_installed(project_dir)
 
-    manager = WorktreeManager(project_dir, base_branch=base_branch)
+    manager = WorktreeManager(
+        project_dir, base_branch=base_branch, use_local_branch=use_local_branch
+    )
     manager.setup()
 
     # Get or create worktree for THIS SPECIFIC SPEC
@@ -370,13 +373,33 @@ def setup_workspace(
             f"Environment files copied: {', '.join(copied_env_files)}", "success"
         )
 
-    # Symlink node_modules to worktree for TypeScript and tooling support
-    # This allows pre-commit hooks to run typecheck without npm install in worktree
-    symlinked_modules = symlink_node_modules_to_worktree(
+    # Set up dependencies in worktree using strategy-based dispatch
+    # Load project index if available for ecosystem-aware dependency handling
+    project_index = None
+    project_index_path = project_dir / ".auto-claude" / "project_index.json"
+    if project_index_path.is_file():
+        try:
+            with open(project_index_path, encoding="utf-8") as f:
+                project_index = json.load(f)
+            debug(MODULE, "Loaded project_index.json for dependency setup")
+        except (OSError, json.JSONDecodeError) as e:
+            debug_warning(MODULE, f"Could not load project_index.json: {e}")
+
+    dep_results = setup_worktree_dependencies(
+        project_dir, worktree_info.path, project_index=project_index
+    )
+    for strategy_name, paths in dep_results.items():
+        if paths:
+            print_status(
+                f"Dependencies ({strategy_name}): {', '.join(paths)}", "success"
+            )
+
+    # Symlink .claude/ config to worktree for Claude Code features (settings, commands, etc.)
+    symlinked_claude = symlink_claude_config_to_worktree(
         project_dir, worktree_info.path
     )
-    if symlinked_modules:
-        print_status(f"Dependencies linked: {', '.join(symlinked_modules)}", "success")
+    if symlinked_claude:
+        print_status(f"Claude config linked: {', '.join(symlinked_claude)}", "success")
 
     # Copy security configuration files if they exist
     # Note: Unlike env files, security files always overwrite to ensure
@@ -570,6 +593,299 @@ def initialize_timeline_tracking(
         print(muted(f"  Note: Timeline tracking could not be initialized: {e}"))
 
 
+def setup_worktree_dependencies(
+    project_dir: Path,
+    worktree_path: Path,
+    project_index: dict | None = None,
+) -> dict[str, list[str]]:
+    """
+    Set up dependencies in a worktree using strategy-based dispatch.
+
+    Reads dependency configs from the project index and applies the correct
+    strategy for each: symlink, recreate, copy, or skip.
+
+    All operations are non-blocking — failures produce warnings but do not
+    prevent worktree creation.
+
+    Args:
+        project_dir: The main project directory
+        worktree_path: Path to the worktree
+        project_index: Parsed project_index.json dict, or None
+
+    Returns:
+        Dict mapping strategy names to lists of paths that were processed.
+    """
+    configs = get_dependency_configs(project_index, project_dir=project_dir)
+    results: dict[str, list[str]] = {}
+
+    for config in configs:
+        strategy_name = config.strategy.value
+        if strategy_name not in results:
+            results[strategy_name] = []
+
+        try:
+            performed = True
+            if config.strategy == DependencyStrategy.SYMLINK:
+                performed = _apply_symlink_strategy(project_dir, worktree_path, config)
+            elif config.strategy == DependencyStrategy.RECREATE:
+                performed = _apply_recreate_strategy(project_dir, worktree_path, config)
+            elif config.strategy == DependencyStrategy.COPY:
+                performed = _apply_copy_strategy(project_dir, worktree_path, config)
+            elif config.strategy == DependencyStrategy.SKIP:
+                _apply_skip_strategy(config)
+                # Don't record skipped entries — only report actual work
+                continue
+            if performed:
+                results[strategy_name].append(config.source_rel_path)
+        except Exception as e:
+            debug_warning(
+                MODULE,
+                f"Failed to apply {strategy_name} strategy for "
+                f"{config.source_rel_path}: {e}",
+            )
+
+    return results
+
+
+def _apply_symlink_strategy(
+    project_dir: Path,
+    worktree_path: Path,
+    config: DependencyShareConfig,
+) -> bool:
+    """Create a symlink (or Windows junction) from worktree to project source.
+
+    Returns True if a symlink was created, False if skipped.
+    """
+    source_path = project_dir / config.source_rel_path
+    target_path = worktree_path / config.source_rel_path
+
+    if not source_path.exists():
+        debug(MODULE, f"Skipping symlink {config.source_rel_path} - source missing")
+        return False
+
+    if target_path.exists() or target_path.is_symlink():
+        debug(MODULE, f"Skipping symlink {config.source_rel_path} - target exists")
+        return False
+
+    target_path.parent.mkdir(parents=True, exist_ok=True)
+
+    try:
+        if is_windows():
+            # Windows: use directory junctions (no admin rights required).
+            # os.symlink creates a directory symlink that needs admin/DevMode,
+            # so we use mklink /J which creates a junction without privileges.
+            result = subprocess.run(
+                ["cmd", "/c", "mklink", "/J", str(target_path), str(source_path)],
+                capture_output=True,
+                text=True,
+                timeout=30,
+            )
+            if result.returncode != 0:
+                raise OSError(result.stderr or "mklink /J failed")
+        else:
+            # macOS/Linux: relative symlinks for portability
+            relative_source = os.path.relpath(source_path, target_path.parent)
+            os.symlink(relative_source, target_path)
+        debug(MODULE, f"Symlinked {config.source_rel_path} -> {source_path}")
+        return True
+    except subprocess.TimeoutExpired:
+        debug_warning(
+            MODULE,
+            f"Symlink creation timed out for {config.source_rel_path}",
+        )
+        print_status(
+            f"Warning: Symlink creation timed out for {config.source_rel_path}",
+            "warning",
+        )
+        return False
+    except OSError as e:
+        debug_warning(
+            MODULE,
+            f"Could not symlink {config.source_rel_path}: {e}",
+        )
+        print_status(f"Warning: Could not link {config.source_rel_path}", "warning")
+        return False
+
+
+def _apply_recreate_strategy(
+    project_dir: Path,
+    worktree_path: Path,
+    config: DependencyShareConfig,
+) -> bool:
+    """Create a fresh virtual environment in the worktree and install deps.
+
+    Returns True if the venv was successfully created, False if skipped or failed.
+    """
+    venv_path = worktree_path / config.source_rel_path
+
+    if venv_path.exists():
+        debug(MODULE, f"Skipping recreate {config.source_rel_path} - already exists")
+        return False
+
+    # Detect Python executable from the source venv or fall back to sys.executable
+    source_venv = project_dir / config.source_rel_path
+    python_exec = sys.executable
+
+    if source_venv.exists():
+        # Try to use the same Python version as the source venv
+        for candidate in ("bin/python", "Scripts/python.exe"):
+            candidate_path = source_venv / candidate
+            if candidate_path.exists():
+                python_exec = str(candidate_path.resolve())
+                break
+
+    # Create the venv
+    try:
+        debug(MODULE, f"Creating venv at {venv_path}")
+        result = subprocess.run(
+            [python_exec, "-m", "venv", str(venv_path)],
+            capture_output=True,
+            text=True,
+            timeout=120,
+        )
+        if result.returncode != 0:
+            debug_warning(MODULE, f"venv creation failed: {result.stderr}")
+            print_status(
+                f"Warning: Could not create venv at {config.source_rel_path}",
+                "warning",
+            )
+            # Clean up partial venv so retries aren't blocked
+            if venv_path.exists():
+                shutil.rmtree(venv_path, ignore_errors=True)
+            return False
+    except subprocess.TimeoutExpired:
+        debug_warning(MODULE, f"venv creation timed out for {config.source_rel_path}")
+        print_status(
+            f"Warning: venv creation timed out for {config.source_rel_path}",
+            "warning",
+        )
+        # Clean up partial venv so retries aren't blocked
+        if venv_path.exists():
+            shutil.rmtree(venv_path, ignore_errors=True)
+        return False
+
+    # Install from requirements file if specified
+    req_file = config.requirements_file
+    if req_file:
+        req_path = project_dir / req_file
+        if req_path.is_file():
+            # Determine pip executable inside the new venv
+            if is_windows():
+                pip_exec = str(venv_path / "Scripts" / "pip.exe")
+            else:
+                pip_exec = str(venv_path / "bin" / "pip")
+
+            # Build install command based on file type
+            req_basename = Path(req_file).name
+            if req_basename == "pyproject.toml":
+                # pyproject.toml: snapshot-install from the worktree copy.
+                # Non-editable so the venv doesn't symlink back to the source.
+                worktree_req = worktree_path / req_file
+                install_dir = str(
+                    worktree_req.parent if worktree_req.is_file() else req_path.parent
+                )
+                install_cmd = [pip_exec, "install", install_dir]
+            elif req_basename == "Pipfile":
+                # Pipfile: not directly installable via pip, skip
+                debug(
+                    MODULE,
+                    f"Skipping Pipfile-based install for {req_file} "
+                    "(use pipenv in the worktree)",
+                )
+                install_cmd = None
+            else:
+                # requirements.txt or similar: pip install -r
+                install_cmd = [pip_exec, "install", "-r", str(req_path)]
+
+            if install_cmd:
+                try:
+                    debug(MODULE, f"Installing deps from {req_file}")
+                    pip_result = subprocess.run(
+                        install_cmd,
+                        capture_output=True,
+                        text=True,
+                        timeout=120,
+                    )
+                    if pip_result.returncode != 0:
+                        debug_warning(
+                            MODULE,
+                            f"pip install failed (exit {pip_result.returncode}): "
+                            f"{pip_result.stderr}",
+                        )
+                        print_status(
+                            f"Warning: Dependency install failed for {req_file}",
+                            "warning",
+                        )
+                        # Clean up broken venv so retries aren't blocked
+                        if venv_path.exists():
+                            shutil.rmtree(venv_path, ignore_errors=True)
+                        return False
+                except subprocess.TimeoutExpired:
+                    debug_warning(
+                        MODULE,
+                        f"pip install timed out for {req_file}",
+                    )
+                    print_status(
+                        f"Warning: Dependency install timed out for {req_file}",
+                        "warning",
+                    )
+                    # Clean up broken venv so retries aren't blocked
+                    if venv_path.exists():
+                        shutil.rmtree(venv_path, ignore_errors=True)
+                    return False
+                except OSError as e:
+                    debug_warning(MODULE, f"pip install failed: {e}")
+                    # Clean up broken venv so retries aren't blocked
+                    if venv_path.exists():
+                        shutil.rmtree(venv_path, ignore_errors=True)
+                    return False
+
+    debug(MODULE, f"Recreated venv at {config.source_rel_path}")
+    return True
+
+
+def _apply_copy_strategy(
+    project_dir: Path,
+    worktree_path: Path,
+    config: DependencyShareConfig,
+) -> bool:
+    """Deep-copy a dependency directory from project to worktree.
+
+    Returns True if the copy was performed, False if skipped.
+    """
+    source_path = project_dir / config.source_rel_path
+    target_path = worktree_path / config.source_rel_path
+
+    if not source_path.exists():
+        debug(MODULE, f"Skipping copy {config.source_rel_path} - source missing")
+        return False
+
+    if target_path.exists():
+        debug(MODULE, f"Skipping copy {config.source_rel_path} - target exists")
+        return False
+
+    target_path.parent.mkdir(parents=True, exist_ok=True)
+
+    try:
+        if source_path.is_file():
+            shutil.copy2(source_path, target_path)
+        else:
+            shutil.copytree(source_path, target_path)
+        debug(MODULE, f"Copied {config.source_rel_path} to worktree")
+        return True
+    except (OSError, shutil.Error) as e:
+        debug_warning(MODULE, f"Could not copy {config.source_rel_path}: {e}")
+        print_status(f"Warning: Could not copy {config.source_rel_path}", "warning")
+        return False
+
+
+def _apply_skip_strategy(config: DependencyShareConfig) -> None:
+    """Skip — nothing to do for this dependency type."""
+    debug(
+        MODULE, f"Skipping {config.dep_type} ({config.source_rel_path}) - skip strategy"
+    )
+
+
 # Export private functions for backward compatibility
 _ensure_timeline_hook_installed = ensure_timeline_hook_installed
 _initialize_timeline_tracking = initialize_timeline_tracking

apps/backend/core/workspace/tests/conftest.py

@@ -0,0 +1,250 @@
+#!/usr/bin/env python3
+"""
+Pytest Configuration and Shared Fixtures for Workspace Tests
+==============================================================
+
+Provides test fixtures for the workspace module tests.
+"""
+
+import os
+import shutil
+import subprocess
+import sys
+import tempfile
+from collections.abc import Generator
+from pathlib import Path
+from unittest.mock import MagicMock
+
+import pytest
+
+# =============================================================================
+# MODULE MOCK CLEANUP - Prevents test isolation issues
+# =============================================================================
+
+# List of modules that might be mocked by test files
+_POTENTIALLY_MOCKED_MODULES = [
+    "claude_code_sdk",
+    "claude_code_sdk.types",
+    "claude_agent_sdk",
+    "claude_agent_sdk.types",
+]
+
+# Store original module references at import time (BEFORE pre-mocking)
+_original_module_state = {}
+for _name in _POTENTIALLY_MOCKED_MODULES:
+    if _name in sys.modules:
+        _original_module_state[_name] = sys.modules[_name]
+
+
+# =============================================================================
+# PRE-MOCK EXTERNAL SDK MODULES - Must happen BEFORE adding auto-claude to path
+# =============================================================================
+# These SDK modules may not be installed, so we mock them before any imports
+# that might trigger loading code that depends on them.
+
+
+def _create_sdk_mock():
+    """Create a comprehensive mock for SDK modules."""
+    mock = MagicMock()
+    mock.ClaudeAgentOptions = MagicMock
+    mock.ClaudeSDKClient = MagicMock
+    mock.HookMatcher = MagicMock
+    return mock
+
+
+# Pre-mock claude_agent_sdk if not installed
+if "claude_agent_sdk" not in sys.modules:
+    sys.modules["claude_agent_sdk"] = _create_sdk_mock()
+    sys.modules["claude_agent_sdk.types"] = MagicMock()
+
+# Pre-mock claude_code_sdk if not installed
+if "claude_code_sdk" not in sys.modules:
+    sys.modules["claude_code_sdk"] = _create_sdk_mock()
+    sys.modules["claude_code_sdk.types"] = MagicMock()
+
+# Add backend directory to path for imports
+# When co-located at workspace/tests/, go up to backend directory
+# workspace/tests -> workspace -> core -> backend (4 levels up)
+_backend = Path(__file__).resolve().parent.parent.parent.parent
+sys.path.insert(0, str(_backend))
+
+# Add repo root to sys.path for test_fixtures import fallback
+_repo_root = _backend.parent.parent
+sys.path.insert(0, str(_repo_root))
+
+
+def _cleanup_mocked_modules():
+    """Remove any MagicMock modules from sys.modules."""
+    for name in _POTENTIALLY_MOCKED_MODULES:
+        if name in sys.modules:
+            module = sys.modules[name]
+            if isinstance(module, MagicMock):
+                if name in _original_module_state:
+                    sys.modules[name] = _original_module_state[name]
+                else:
+                    del sys.modules[name]
+
+
+def pytest_sessionstart(session):
+    """Clean up any mocked modules before the test session starts."""
+    _cleanup_mocked_modules()
+
+
+# =============================================================================
+# DIRECTORY FIXTURES
+# =============================================================================
+
+
+@pytest.fixture
+def temp_dir() -> Generator[Path, None, None]:
+    """Create a temporary directory that's cleaned up after the test."""
+    temp_path = Path(tempfile.mkdtemp())
+    yield temp_path
+    shutil.rmtree(temp_path, ignore_errors=True)
+
+
+@pytest.fixture
+def temp_git_repo(temp_dir: Path) -> Generator[Path, None, None]:
+    """Create a temporary git repository with initial commit.
+
+    IMPORTANT: This fixture properly isolates git operations by clearing
+    git environment variables that may be set by pre-commit hooks. Without
+    this isolation, git operations could affect the parent repository when
+    tests run inside a git worktree (e.g., during pre-commit validation).
+
+    See: https://git-scm.com/docs/git#_environment_variables
+    """
+    # Save original environment values to restore later
+    orig_env = {}
+
+    # These git env vars may be set by pre-commit hooks and MUST be cleared
+    # to avoid git operations affecting the parent repository instead of
+    # our isolated test repo. This is critical when running inside worktrees.
+    git_vars_to_clear = [
+        "GIT_DIR",
+        "GIT_WORK_TREE",
+        "GIT_INDEX_FILE",
+        "GIT_OBJECT_DIRECTORY",
+        "GIT_ALTERNATE_OBJECT_DIRECTORIES",
+    ]
+
+    # Clear interfering git environment variables
+    for key in git_vars_to_clear:
+        orig_env[key] = os.environ.get(key)
+        if key in os.environ:
+            del os.environ[key]
+
+    # Set GIT_CEILING_DIRECTORIES to prevent git from discovering parent .git
+    # directories. This is critical for test isolation when running inside
+    # another git repo (like during pre-commit hooks in worktrees).
+    orig_env["GIT_CEILING_DIRECTORIES"] = os.environ.get("GIT_CEILING_DIRECTORIES")
+    os.environ["GIT_CEILING_DIRECTORIES"] = str(temp_dir.parent)
+
+    try:
+        # Initialize git repo
+        subprocess.run(["git", "init"], cwd=temp_dir, capture_output=True, check=True)
+        subprocess.run(
+            ["git", "config", "user.email", "test@example.com"],
+            cwd=temp_dir,
+            capture_output=True,
+        )
+        subprocess.run(
+            ["git", "config", "user.name", "Test User"],
+            cwd=temp_dir,
+            capture_output=True,
+        )
+
+        # Create initial commit
+        test_file = temp_dir / "README.md"
+        test_file.write_text("# Test Project\n", encoding="utf-8")
+        subprocess.run(["git", "add", "."], cwd=temp_dir, capture_output=True)
+        subprocess.run(
+            ["git", "commit", "-m", "Initial commit"], cwd=temp_dir, capture_output=True
+        )
+
+        # Ensure branch is named 'main' (some git configs default to 'master')
+        subprocess.run(
+            ["git", "branch", "-M", "main"], cwd=temp_dir, capture_output=True
+        )
+
+        yield temp_dir
+    finally:
+        # Restore original environment variables
+        for key, value in orig_env.items():
+            if value is None:
+                os.environ.pop(key, None)
+            else:
+                os.environ[key] = value
+
+
+@pytest.fixture
+def spec_dir(temp_dir: Path) -> Path:
+    """Create a spec directory inside temp_dir."""
+    spec_path = temp_dir / "spec"
+    spec_path.mkdir(parents=True)
+    return spec_path
+
+
+@pytest.fixture
+def project_dir(temp_dir: Path) -> Path:
+    """Create a project directory inside temp_dir."""
+    project_path = temp_dir / "project"
+    project_path.mkdir(parents=True)
+    return project_path
+
+
+@pytest.fixture
+def make_commit(temp_git_repo: Path):
+    """Fixture to make commits in the test git repo.
+
+    Usage:
+        def test_something(make_commit):
+            make_commit("message", files={"file.txt": "content"})
+    """
+
+    def _make_commit(message: str, files: dict[str, str] | None = None):
+        """Create a commit with the given message and files.
+
+        Args:
+            message: Commit message
+            files: Optional dict of {filepath: content} to create before committing
+        """
+        if files:
+            for file_path, content in files.items():
+                full_path = temp_git_repo / file_path
+                full_path.parent.mkdir(parents=True, exist_ok=True)
+                full_path.write_text(content, encoding="utf-8")
+
+        subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
+        subprocess.run(
+            ["git", "commit", "-m", message],
+            cwd=temp_git_repo,
+            capture_output=True,
+        )
+
+    return _make_commit
+
+
+@pytest.fixture
+def stage_files(temp_git_repo: Path):
+    """Fixture to stage files in the test git repo.
+
+    Usage:
+        def test_something(stage_files):
+            stage_files({"file.txt": "content"})
+    """
+
+    def _stage_files(files: dict[str, str]):
+        """Stage files for commit.
+
+        Args:
+            files: Dict of {filepath: content} to create and stage
+        """
+        for file_path, content in files.items():
+            full_path = temp_git_repo / file_path
+            full_path.parent.mkdir(parents=True, exist_ok=True)
+            full_path.write_text(content, encoding="utf-8")
+
+        subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
+
+    return _stage_files

apps/backend/core/workspace/tests/pytest.ini

@@ -0,0 +1,10 @@
+[pytest]
+# Pytest configuration for workspace module tests
+
+# Async test mode
+asyncio_mode = auto
+
+# Register custom markers
+markers =
+    slow: marks tests as slow (deselect with '-m "not slow"')
+    integration: marks tests as integration tests (deselect with '-m "not integration"')

apps/backend/core/workspace/tests/test_display.py

@@ -0,0 +1,856 @@
+#!/usr/bin/env python3
+"""
+Tests for Workspace Display Functions
+======================================
+
+Tests the display.py module functionality including:
+- Build summary display
+- Changed files display
+- Merge success printing
+- Conflict info display
+- Environment file operations
+- Node modules symlink operations
+"""
+
+import json
+import os
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+
+import pytest
+
+# Test constant - in the new per-spec architecture, each spec has its own worktree
+# named after the spec itself. This constant is used for test assertions.
+TEST_SPEC_NAME = "test-spec"
+
+
+class TestShowBuildSummary:
+    """Tests for show_build_summary display function."""
+
+    def test_show_build_summary_no_changes(self, capsys):
+        """show_build_summary prints info message when no changes."""
+        from unittest.mock import MagicMock
+
+        from core.workspace.display import show_build_summary
+
+        mock_manager = MagicMock()
+        mock_manager.get_change_summary.return_value = {
+            "new_files": 0,
+            "modified_files": 0,
+            "deleted_files": 0,
+        }
+        mock_manager.get_changed_files.return_value = []
+
+        show_build_summary(mock_manager, "test-spec")
+
+        captured = capsys.readouterr()
+        assert "No changes were made" in captured.out
+
+    def test_show_build_summary_with_new_files(self, capsys):
+        """show_build_summary displays new files count correctly."""
+        from unittest.mock import MagicMock
+
+        from core.workspace.display import show_build_summary
+
+        mock_manager = MagicMock()
+        mock_manager.get_change_summary.return_value = {
+            "new_files": 3,
+            "modified_files": 0,
+            "deleted_files": 0,
+        }
+        mock_manager.get_changed_files.return_value = [
+            ("A", "file1.py"),
+            ("A", "file2.py"),
+            ("A", "file3.py"),
+        ]
+
+        show_build_summary(mock_manager, "test-spec")
+
+        captured = capsys.readouterr()
+        assert "What was built" in captured.out
+        assert "+ 3 new files" in captured.out
+
+    def test_show_build_summary_singular_new_file(self, capsys):
+        """show_build_summary uses singular form for one new file."""
+        from unittest.mock import MagicMock
+
+        from core.workspace.display import show_build_summary
+
+        mock_manager = MagicMock()
+        mock_manager.get_change_summary.return_value = {
+            "new_files": 1,
+            "modified_files": 0,
+            "deleted_files": 0,
+        }
+        mock_manager.get_changed_files.return_value = [("A", "file1.py")]
+
+        show_build_summary(mock_manager, "test-spec")
+
+        captured = capsys.readouterr()
+        assert "+ 1 new file" in captured.out
+        assert "files" not in captured.out.split("new file")[1].split("\n")[0]
+
+    def test_show_build_summary_with_modified_files(self, capsys):
+        """show_build_summary displays modified files count correctly."""
+        from unittest.mock import MagicMock
+
+        from core.workspace.display import show_build_summary
+
+        mock_manager = MagicMock()
+        mock_manager.get_change_summary.return_value = {
+            "new_files": 0,
+            "modified_files": 2,
+            "deleted_files": 0,
+        }
+        mock_manager.get_changed_files.return_value = [
+            ("M", "file1.py"),
+            ("M", "file2.py"),
+        ]
+
+        show_build_summary(mock_manager, "test-spec")
+
+        captured = capsys.readouterr()
+        assert "~ 2 modified files" in captured.out
+
+    def test_show_build_summary_with_deleted_files(self, capsys):
+        """show_build_summary displays deleted files count correctly."""
+        from unittest.mock import MagicMock
+
+        from core.workspace.display import show_build_summary
+
+        mock_manager = MagicMock()
+        mock_manager.get_change_summary.return_value = {
+            "new_files": 0,
+            "modified_files": 0,
+            "deleted_files": 1,
+        }
+        mock_manager.get_changed_files.return_value = [("D", "old.py")]
+
+        show_build_summary(mock_manager, "test-spec")
+
+        captured = capsys.readouterr()
+        assert "- 1 deleted file" in captured.out
+
+    def test_show_build_summary_mixed_changes(self, capsys):
+        """show_build_summary displays all change types together."""
+        from unittest.mock import MagicMock
+
+        from core.workspace.display import show_build_summary
+
+        mock_manager = MagicMock()
+        mock_manager.get_change_summary.return_value = {
+            "new_files": 2,
+            "modified_files": 3,
+            "deleted_files": 1,
+        }
+        mock_manager.get_changed_files.return_value = [
+            ("A", "new1.py"),
+            ("A", "new2.py"),
+            ("M", "mod1.py"),
+            ("M", "mod2.py"),
+            ("M", "mod3.py"),
+            ("D", "old.py"),
+        ]
+
+        show_build_summary(mock_manager, "test-spec")
+
+        captured = capsys.readouterr()
+        assert "+ 2 new files" in captured.out
+        assert "~ 3 modified files" in captured.out
+        assert "- 1 deleted file" in captured.out
+
+
+class TestShowChangedFiles:
+    """Tests for show_changed_files display function."""
+
+    def test_show_changed_files_empty_list(self, capsys):
+        """show_changed_files prints info message when no files changed."""
+        from unittest.mock import MagicMock
+
+        from core.workspace.display import show_changed_files
+
+        mock_manager = MagicMock()
+        mock_manager.get_changed_files.return_value = []
+
+        show_changed_files(mock_manager, "test-spec")
+
+        captured = capsys.readouterr()
+        assert "No changes" in captured.out
+
+    def test_show_changed_files_with_added_file(self, capsys):
+        """show_changed_files displays added file with + prefix."""
+        from unittest.mock import MagicMock
+
+        from core.workspace.display import show_changed_files
+
+        mock_manager = MagicMock()
+        mock_manager.get_changed_files.return_value = [("A", "new_file.py")]
+
+        show_changed_files(mock_manager, "test-spec")
+
+        captured = capsys.readouterr()
+        assert "Changed files" in captured.out
+        assert "+ new_file.py" in captured.out
+
+    def test_show_changed_files_with_modified_file(self, capsys):
+        """show_changed_files displays modified file with ~ prefix."""
+        from unittest.mock import MagicMock
+
+        from core.workspace.display import show_changed_files
+
+        mock_manager = MagicMock()
+        mock_manager.get_changed_files.return_value = [("M", "changed.py")]
+
+        show_changed_files(mock_manager, "test-spec")
+
+        captured = capsys.readouterr()
+        assert "~ changed.py" in captured.out
+
+    def test_show_changed_files_with_deleted_file(self, capsys):
+        """show_changed_files displays deleted file with - prefix."""
+        from unittest.mock import MagicMock
+
+        from core.workspace.display import show_changed_files
+
+        mock_manager = MagicMock()
+        mock_manager.get_changed_files.return_value = [("D", "removed.py")]
+
+        show_changed_files(mock_manager, "test-spec")
+
+        captured = capsys.readouterr()
+        assert "- removed.py" in captured.out
+
+    def test_show_changed_files_with_unknown_status(self, capsys):
+        """show_changed_files displays unknown status code without decoration."""
+        from unittest.mock import MagicMock
+
+        from core.workspace.display import show_changed_files
+
+        mock_manager = MagicMock()
+        mock_manager.get_changed_files.return_value = [("R", "renamed.py")]
+
+        show_changed_files(mock_manager, "test-spec")
+
+        captured = capsys.readouterr()
+        assert "R renamed.py" in captured.out
+
+    def test_show_changed_files_multiple_files(self, capsys):
+        """show_changed_files displays all changed files."""
+        from unittest.mock import MagicMock
+
+        from core.workspace.display import show_changed_files
+
+        mock_manager = MagicMock()
+        mock_manager.get_changed_files.return_value = [
+            ("A", "new.py"),
+            ("M", "modified.py"),
+            ("D", "deleted.py"),
+            ("R", "renamed.py"),
+        ]
+
+        show_changed_files(mock_manager, "test-spec")
+
+        captured = capsys.readouterr()
+        assert "+ new.py" in captured.out
+        assert "~ modified.py" in captured.out
+        assert "- deleted.py" in captured.out
+        assert "R renamed.py" in captured.out
+
+
+class TestPrintMergeSuccess:
+    """Tests for print_merge_success display function."""
+
+    def test_print_merge_success_no_commit_basic(self, capsys):
+        """print_merge_success with no_commit=True shows basic message."""
+        from core.workspace.display import print_merge_success
+
+        print_merge_success(no_commit=True)
+
+        captured = capsys.readouterr()
+        assert "CHANGES ADDED TO YOUR PROJECT" in captured.out
+        assert "working directory" in captured.out
+        assert "Review the changes" in captured.out
+        assert "commit when ready" in captured.out
+
+    def test_print_merge_success_no_commit_with_lock_files(self, capsys):
+        """print_merge_success with lock_files_excluded shows lock file note."""
+        from core.workspace.display import print_merge_success
+
+        stats = {"lock_files_excluded": 2}
+        print_merge_success(no_commit=True, stats=stats)
+
+        captured = capsys.readouterr()
+        assert "CHANGES ADDED TO YOUR PROJECT" in captured.out
+        assert "Lock files kept from main" in captured.out
+        assert "npm install" in captured.out
+
+    def test_print_merge_success_no_commit_with_keep_worktree(self, capsys):
+        """print_merge_success with keep_worktree shows discard command."""
+        from core.workspace.display import print_merge_success
+
+        print_merge_success(no_commit=True, spec_name="spec-001", keep_worktree=True)
+
+        captured = capsys.readouterr()
+        assert "CHANGES ADDED TO YOUR PROJECT" in captured.out
+        assert "Worktree kept for testing" in captured.out
+        assert "python auto-claude/run.py --spec spec-001 --discard" in captured.out
+
+    def test_print_merge_success_no_commit_full_scenario(self, capsys):
+        """print_merge_success with all optional parameters."""
+        from core.workspace.display import print_merge_success
+
+        stats = {"lock_files_excluded": 1}
+        print_merge_success(
+            no_commit=True,
+            stats=stats,
+            spec_name="test-spec",
+            keep_worktree=True,
+        )
+
+        captured = capsys.readouterr()
+        assert "CHANGES ADDED TO YOUR PROJECT" in captured.out
+        assert "Lock files kept from main" in captured.out
+        assert "Worktree kept for testing" in captured.out
+        assert "--spec test-spec --discard" in captured.out
+
+    def test_print_merge_success_with_commit_basic(self, capsys):
+        """print_merge_success with no_commit=False shows commit message."""
+        from core.workspace.display import print_merge_success
+
+        print_merge_success(no_commit=False)
+
+        captured = capsys.readouterr()
+        assert "FEATURE ADDED TO YOUR PROJECT" in captured.out
+        assert "separate workspace has been cleaned up" in captured.out
+
+    def test_print_merge_success_with_commit_and_stats(self, capsys):
+        """print_merge_success with stats shows file counts."""
+        from core.workspace.display import print_merge_success
+
+        stats = {
+            "files_added": 5,
+            "files_modified": 3,
+            "files_deleted": 1,
+        }
+        print_merge_success(no_commit=False, stats=stats)
+
+        captured = capsys.readouterr()
+        assert "FEATURE ADDED TO YOUR PROJECT" in captured.out
+        assert "What changed" in captured.out
+        assert "+ 5 files added" in captured.out
+        assert "~ 3 files modified" in captured.out
+        assert "- 1 file deleted" in captured.out
+
+    def test_print_merge_success_singular_file_counts(self, capsys):
+        """print_merge_success uses singular form for single file counts."""
+        from core.workspace.display import print_merge_success
+
+        stats = {
+            "files_added": 1,
+            "files_modified": 1,
+            "files_deleted": 1,
+        }
+        print_merge_success(no_commit=False, stats=stats)
+
+        captured = capsys.readouterr()
+        assert "+ 1 file added" in captured.out
+        assert "~ 1 file modified" in captured.out
+        assert "- 1 file deleted" in captured.out
+
+    def test_print_merge_success_with_keep_worktree(self, capsys):
+        """print_merge_success with keep_worktree shows discard command."""
+        from core.workspace.display import print_merge_success
+
+        print_merge_success(no_commit=False, keep_worktree=True, spec_name="my-spec")
+
+        captured = capsys.readouterr()
+        assert "FEATURE ADDED TO YOUR PROJECT" in captured.out
+        assert "Worktree kept for testing" in captured.out
+        assert "--spec my-spec --discard" in captured.out
+        assert "separate workspace has been cleaned up" not in captured.out
+
+    def test_print_merge_success_zero_file_counts_not_shown(self, capsys):
+        """print_merge_success doesn't show file types with zero count."""
+        from core.workspace.display import print_merge_success
+
+        stats = {
+            "files_added": 2,
+            "files_modified": 0,
+            "files_deleted": 0,
+        }
+        print_merge_success(no_commit=False, stats=stats)
+
+        captured = capsys.readouterr()
+        assert "+ 2 files added" in captured.out
+        assert "files modified" not in captured.out
+        assert "files deleted" not in captured.out
+
+
+class TestPrintConflictInfoExtended:
+    """Extended tests for print_conflict_info display function."""
+
+    def test_print_conflict_info_empty_conflicts(self, capsys):
+        """print_conflict_info returns early with empty conflicts list."""
+        from core.workspace.display import print_conflict_info
+
+        result = {"conflicts": []}
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        assert captured.out == ""
+
+    def test_print_conflict_info_no_conflicts_key(self, capsys):
+        """print_conflict_info returns early when conflicts key missing."""
+        from core.workspace.display import print_conflict_info
+
+        result = {}
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        assert captured.out == ""
+
+    def test_print_conflict_info_critical_severity(self, capsys):
+        """print_conflict_info shows critical severity icon."""
+        from core.workspace.display import print_conflict_info
+
+        result = {
+            "conflicts": [
+                {
+                    "file": "critical.py",
+                    "reason": "Breaking change",
+                    "severity": "critical",
+                }
+            ]
+        }
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        assert "critical.py" in captured.out
+        assert "⛔" in captured.out
+        assert "Breaking change" in captured.out
+
+    def test_print_conflict_info_high_severity(self, capsys):
+        """print_conflict_info shows high severity icon."""
+        from core.workspace.display import print_conflict_info
+
+        result = {
+            "conflicts": [
+                {"file": "high.py", "reason": "Major conflict", "severity": "high"}
+            ]
+        }
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        assert "high.py" in captured.out
+        assert "🔴" in captured.out
+        assert "Major conflict" in captured.out
+
+    def test_print_conflict_info_medium_severity(self, capsys):
+        """print_conflict_info shows medium severity icon."""
+        from core.workspace.display import print_conflict_info
+
+        result = {
+            "conflicts": [
+                {"file": "medium.py", "reason": "Minor conflict", "severity": "medium"}
+            ]
+        }
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        assert "medium.py" in captured.out
+        assert "🟡" in captured.out
+        assert "Minor conflict" in captured.out
+
+    def test_print_conflict_info_low_severity_no_icon(self, capsys):
+        """print_conflict_info shows no icon for low severity."""
+        from core.workspace.display import print_conflict_info
+
+        result = {
+            "conflicts": [
+                {"file": "low.py", "reason": "Trivial issue", "severity": "low"}
+            ]
+        }
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        assert "low.py" in captured.out
+        assert "Trivial issue" in captured.out
+        assert "⛔" not in captured.out
+        assert "🔴" not in captured.out
+        assert "🟡" not in captured.out
+
+    def test_print_conflict_info_unknown_severity(self, capsys):
+        """print_conflict_info handles unknown severity gracefully."""
+        from core.workspace.display import print_conflict_info
+
+        result = {
+            "conflicts": [
+                {"file": "unknown.py", "reason": "Unknown", "severity": "unknown"}
+            ]
+        }
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        assert "unknown.py" in captured.out
+        assert "Unknown" in captured.out
+
+    def test_print_conflict_info_missing_file_key(self, capsys):
+        """print_conflict_info handles missing file key."""
+        from core.workspace.display import print_conflict_info
+
+        result = {"conflicts": [{"reason": "No file specified", "severity": "high"}]}
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        assert "unknown" in captured.out
+        assert "No file specified" in captured.out
+
+    def test_print_conflict_info_missing_reason_key(self, capsys):
+        """print_conflict_info handles missing reason key."""
+        from core.workspace.display import print_conflict_info
+
+        result = {"conflicts": [{"file": "noreason.py", "severity": "medium"}]}
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        assert "noreason.py" in captured.out
+
+    def test_print_conflict_info_dict_no_reason(self, capsys):
+        """print_conflict_info with dict missing reason."""
+        from core.workspace.display import print_conflict_info
+
+        result = {"conflicts": [{"file": "test.py", "severity": "high"}]}
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        assert "test.py" in captured.out
+        assert "🔴" in captured.out
+
+    def test_print_conflict_info_multiple_conflicts(self, capsys):
+        """print_conflict_info handles multiple conflicts."""
+        from core.workspace.display import print_conflict_info
+
+        result = {
+            "conflicts": [
+                {"file": "critical.py", "reason": "Critical", "severity": "critical"},
+                {"file": "high.py", "reason": "High", "severity": "high"},
+                {"file": "medium.py", "reason": "Medium", "severity": "medium"},
+            ]
+        }
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        assert "3 file" in captured.out
+        assert "⛔" in captured.out
+        assert "🔴" in captured.out
+        assert "🟡" in captured.out
+
+    def test_print_conflict_info_shows_marker_conflict_message(self, capsys):
+        """print_conflict_info shows marker conflict message for string conflicts."""
+        from core.workspace.display import print_conflict_info
+
+        result = {"conflicts": ["conflict.py"]}
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        assert "conflict markers" in captured.out
+        # Check that the conflict markers are mentioned in the message
+
+    def test_print_conflict_info_shows_ai_conflict_message(self, capsys):
+        """print_conflict_info shows AI conflict message for dict conflicts."""
+        from core.workspace.display import print_conflict_info
+
+        result = {
+            "conflicts": [
+                {
+                    "file": "ai-conflict.py",
+                    "reason": "AI merge failed",
+                    "severity": "high",
+                }
+            ]
+        }
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        assert "could not be auto-merged" in captured.out
+
+    def test_print_conflict_info_shows_both_messages_mixed(self, capsys):
+        """print_conflict_info shows both messages for mixed conflicts."""
+        from core.workspace.display import print_conflict_info
+
+        result = {
+            "conflicts": [
+                "marker.py",
+                {"file": "ai.py", "reason": "AI failed", "severity": "high"},
+            ]
+        }
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        assert "conflict markers" in captured.out
+        assert "could not be auto-merged" in captured.out
+
+    def test_print_conflict_info_shows_git_commands(self, capsys):
+        """print_conflict_info shows git add and commit commands."""
+        from core.workspace.display import print_conflict_info
+
+        result = {"conflicts": ["file1.py", "file2.py"]}
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        assert "git add" in captured.out
+        assert "git commit" in captured.out
+
+    def test_print_conflict_info_quotes_special_paths(self, capsys):
+        """print_conflict_info properly quotes file paths with special characters."""
+        from core.workspace.display import print_conflict_info
+
+        result = {"conflicts": ["file with spaces.py", "file'with'quotes.py"]}
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        # shlex.quote should quote paths with spaces
+        assert "git add" in captured.out
+        assert "file with spaces.py" in captured.out
+
+    def test_print_conflict_info_deduplicates_files(self, capsys):
+        """print_conflict_info deduplicates file paths in git command."""
+        from core.workspace.display import print_conflict_info
+
+        result = {
+            "conflicts": [
+                "file1.py",
+                {"file": "file1.py", "reason": "Also here", "severity": "medium"},
+                "file2.py",
+            ]
+        }
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        # Count occurrences of file1.py
+        count = captured.out.count("file1.py")
+        assert count == 3  # Display shows it twice (string + dict), once in git add
+
+    def test_print_conflict_info_preserves_order(self, capsys):
+        """print_conflict_info preserves file order while deduplicating."""
+        from core.workspace.display import print_conflict_info
+
+        result = {
+            "conflicts": [
+                "first.py",
+                {"file": "second.py", "severity": "high"},
+                "first.py",  # Duplicate
+                {"file": "third.py", "severity": "medium"},
+            ]
+        }
+
+        print_conflict_info(result)
+
+        captured = capsys.readouterr()
+        # First occurrence should be preserved
+        lines = captured.out.split("\n")
+        first_idx = None
+        second_idx = None
+        for i, line in enumerate(lines):
+            if "first.py" in line:
+                if first_idx is None:
+                    first_idx = i
+            if "second.py" in line:
+                if second_idx is None:
+                    second_idx = i
+        assert first_idx is not None
+        assert second_idx is not None
+
+
+class TestCopyEnvFilesToWorktree:
+    """Tests for copy_env_files_to_worktree function."""
+
+    def test_copies_all_env_files(self, temp_git_repo: Path):
+        """Copies all .env files when they exist in project dir."""
+        from core.workspace.setup import copy_env_files_to_worktree
+
+        # Create .env files in project
+        (temp_git_repo / ".env").write_text("FOO=bar", encoding="utf-8")
+        (temp_git_repo / ".env.local").write_text("LOCAL=1", encoding="utf-8")
+        (temp_git_repo / ".env.development").write_text("DEV=1", encoding="utf-8")
+
+        # Create worktree directory
+        worktree_path = (
+            temp_git_repo / ".auto-claude" / "worktrees" / "tasks" / "test-spec"
+        )
+        worktree_path.mkdir(parents=True)
+
+        # Copy env files
+        copied = copy_env_files_to_worktree(temp_git_repo, worktree_path)
+
+        # Check all files were copied
+        assert ".env" in copied
+        assert ".env.local" in copied
+        assert ".env.development" in copied
+        assert len(copied) == 3
+
+        # Verify files exist in worktree
+        assert (worktree_path / ".env").exists()
+        assert (worktree_path / ".env.local").exists()
+        assert (worktree_path / ".env.development").exists()
+
+    def test_skips_nonexistent_env_files(self, temp_git_repo: Path):
+        """Only copies env files that exist."""
+        from core.workspace.setup import copy_env_files_to_worktree
+
+        worktree_path = (
+            temp_git_repo / ".auto-claude" / "worktrees" / "tasks" / "test-spec"
+        )
+        worktree_path.mkdir(parents=True)
+
+        copied = copy_env_files_to_worktree(temp_git_repo, worktree_path)
+
+        assert len(copied) == 0
+
+    def test_does_not_overwrite_existing_env_files(self, temp_git_repo: Path):
+        """Does not overwrite .env files that already exist in worktree."""
+        from core.workspace.setup import copy_env_files_to_worktree
+
+        # Create .env in project
+        (temp_git_repo / ".env").write_text("PROJECT=1", encoding="utf-8")
+
+        worktree_path = (
+            temp_git_repo / ".auto-claude" / "worktrees" / "tasks" / "test-spec"
+        )
+        worktree_path.mkdir(parents=True)
+
+        # Create existing .env in worktree with different content
+        (worktree_path / ".env").write_text("WORKTREE=1", encoding="utf-8")
+
+        copied = copy_env_files_to_worktree(temp_git_repo, worktree_path)
+
+        # .env should not be in copied list since it already existed
+        assert ".env" not in copied
+
+        # Worktree .env should keep its original content
+        assert (worktree_path / ".env").read_text(encoding="utf-8") == "WORKTREE=1"
+
+
+class TestSymlinkNodeModulesToWorktree:
+    """Tests for symlink_node_modules_to_worktree function."""
+
+    @pytest.mark.skipif(sys.platform != "linux", reason="Unix-specific test")
+    def test_symlinks_node_modules_on_unix(self, temp_git_repo: Path):
+        """Creates relative symlinks on Unix systems."""
+        from core.workspace.setup import symlink_node_modules_to_worktree
+
+        # Create node_modules in project
+        node_modules = temp_git_repo / "node_modules"
+        node_modules.mkdir()
+        (node_modules / "test.txt").write_text("test", encoding="utf-8")
+
+        # Create apps/frontend/node_modules
+        frontend_node_modules = temp_git_repo / "apps" / "frontend" / "node_modules"
+        frontend_node_modules.mkdir(parents=True)
+        (frontend_node_modules / "test2.txt").write_text("test2", encoding="utf-8")
+
+        # Create worktree
+        worktree_path = (
+            temp_git_repo / ".auto-claude" / "worktrees" / "tasks" / "test-spec"
+        )
+        worktree_path.mkdir(parents=True)
+        (worktree_path / "apps" / "frontend").mkdir(parents=True)
+
+        # Create symlinks
+        symlinked = symlink_node_modules_to_worktree(temp_git_repo, worktree_path)
+
+        assert len(symlinked) == 2
+        assert "node_modules" in symlinked
+        assert "apps/frontend/node_modules" in symlinked
+
+        # Verify symlinks exist and point to correct location
+        assert (worktree_path / "node_modules").is_symlink()
+        assert (worktree_path / "apps" / "frontend" / "node_modules").is_symlink()
+
+    @pytest.mark.skipif(sys.platform != "win32", reason="Windows-specific test")
+    def test_creates_junctions_on_windows(self, temp_git_repo: Path, monkeypatch):
+        """Creates junctions on Windows systems."""
+        from unittest.mock import patch
+
+        from core.workspace.setup import symlink_node_modules_to_worktree
+
+        # Create node_modules in project
+        node_modules = temp_git_repo / "node_modules"
+        node_modules.mkdir()
+        (node_modules / "test.txt").write_text("test", encoding="utf-8")
+
+        # Create worktree
+        worktree_path = (
+            temp_git_repo / ".auto-claude" / "worktrees" / "tasks" / "test-spec"
+        )
+        worktree_path.mkdir(parents=True)
+
+        # Mock subprocess.run to simulate mklink /J success
+        def mock_subprocess_run(cmd, capture_output=False, text=False):
+            result = type("obj", (object,), {"returncode": 0, "stderr": ""})()
+            return result
+
+        with patch("subprocess.run", side_effect=mock_subprocess_run):
+            with monkeypatch.context() as m:
+                m.setattr("sys.platform", "win32")
+                symlinked = symlink_node_modules_to_worktree(
+                    temp_git_repo, worktree_path
+                )
+
+        assert "node_modules" in symlinked
+
+    def test_skips_nonexistent_node_modules(self, temp_git_repo: Path):
+        """Skips node_modules that don't exist in project."""
+        from core.workspace.setup import symlink_node_modules_to_worktree
+
+        worktree_path = (
+            temp_git_repo / ".auto-claude" / "worktrees" / "tasks" / "test-spec"
+        )
+        worktree_path.mkdir(parents=True)
+
+        symlinked = symlink_node_modules_to_worktree(temp_git_repo, worktree_path)
+
+        assert len(symlinked) == 0
+
+    def test_skips_existing_symlinks(self, temp_git_repo: Path):
+        """Does not recreate symlinks that already exist."""
+        from core.workspace.setup import symlink_node_modules_to_worktree
+
+        # Create node_modules in project
+        node_modules = temp_git_repo / "node_modules"
+        node_modules.mkdir()
+        (node_modules / "test.txt").write_text("test", encoding="utf-8")
+
+        # Create worktree
+        worktree_path = (
+            temp_git_repo / ".auto-claude" / "worktrees" / "tasks" / "test-spec"
+        )
+        worktree_path.mkdir(parents=True)
+
+        # Create existing symlink
+        if sys.platform != "win32":
+            os.symlink(temp_git_repo / "node_modules", worktree_path / "node_modules")
+
+        symlinked = symlink_node_modules_to_worktree(temp_git_repo, worktree_path)
+
+        # Should skip existing symlink
+        assert "node_modules" not in symlinked

apps/backend/core/workspace/tests/test_finalization.py

@@ -0,0 +1,805 @@
+#!/usr/bin/env python3
+"""
+Tests for Workspace Selection and Management
+=============================================
+
+Tests the workspace.py module functionality including:
+- Workspace mode selection (isolated vs direct)
+- Uncommitted changes detection
+- Workspace setup
+- Build finalization workflows
+"""
+
+import json
+import os
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+
+import pytest
+
+# Add parent directory to path so we can import the workspace module
+# When co-located at workspace/tests/, we need to add backend to path
+# workspace/tests -> workspace -> core -> backend (4 levels up)
+_backend = Path(__file__).resolve().parent.parent.parent.parent
+sys.path.insert(0, str(_backend))
+
+from core.workspace import (
+    WorkspaceChoice,
+    WorkspaceMode,
+    get_current_branch,
+    get_existing_build_worktree,
+    has_uncommitted_changes,
+    setup_workspace,
+)
+from worktree import WorktreeError, WorktreeManager
+
+# Test constant - in the new per-spec architecture, each spec has its own worktree
+# named after the spec itself. This constant is used for test assertions.
+TEST_SPEC_NAME = "test-spec"
+
+# =============================================================================
+# TESTS FOR finalization.py
+# =============================================================================
+
+
+class TestFinalizeWorkspace:
+    """Tests for finalize_workspace function."""
+
+    def test_direct_mode_returns_merge(self, temp_git_repo: Path, monkeypatch, capsys):
+        """Direct mode returns MERGE choice and shows completion message."""
+        from core.workspace.finalization import finalize_workspace
+
+        # Mock the UI functions
+        def mock_box(content, width=60, style="heavy"):
+            return content
+
+        monkeypatch.setattr("core.workspace.finalization.box", mock_box)
+
+        result = finalize_workspace(
+            temp_git_repo,
+            "test-spec",
+            manager=None,
+            auto_continue=False,
+        )
+
+        assert result == WorkspaceChoice.MERGE
+
+        captured = capsys.readouterr()
+        assert "BUILD COMPLETE" in captured.out
+        assert "directly to your project" in captured.out
+
+    def test_auto_continue_mode_returns_later(self, temp_git_repo: Path):
+        """Auto-continue mode returns LATER choice."""
+        from core.workspace.finalization import finalize_workspace
+
+        manager = WorktreeManager(temp_git_repo)
+        spec_name = "test-spec"
+
+        # Create worktree info
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        result = finalize_workspace(
+            temp_git_repo,
+            spec_name,
+            manager=manager,
+            auto_continue=True,
+        )
+
+        assert result == WorkspaceChoice.LATER
+
+    def test_isolated_mode_shows_menu(self, temp_git_repo: Path, monkeypatch):
+        """Isolated mode shows menu with test/review/merge/later options."""
+        from core.workspace.finalization import finalize_workspace
+
+        manager = WorktreeManager(temp_git_repo)
+        spec_name = "test-spec"
+
+        # Create worktree
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        # Mock select_menu to return "test"
+        def mock_select_menu(title, options, allow_quit):
+            return "test"
+
+        monkeypatch.setattr("core.workspace.finalization.select_menu", mock_select_menu)
+
+        result = finalize_workspace(
+            temp_git_repo,
+            spec_name,
+            manager=manager,
+            auto_continue=False,
+        )
+
+        assert result == WorkspaceChoice.TEST
+
+
+class TestHandleWorkspaceChoice:
+    """Tests for handle_workspace_choice function."""
+
+    def test_choice_test_shows_instructions(
+        self, temp_git_repo: Path, monkeypatch, capsys
+    ):
+        """TEST choice shows testing instructions."""
+        from core.workspace.finalization import handle_workspace_choice
+
+        manager = WorktreeManager(temp_git_repo)
+        spec_name = "test-spec"
+
+        # Create worktree
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        handle_workspace_choice(WorkspaceChoice.TEST, temp_git_repo, spec_name, manager)
+
+        captured = capsys.readouterr()
+        assert "TEST YOUR FEATURE" in captured.out
+        assert str(worktree_path) in captured.out
+
+    def test_choice_merge_calls_merge_worktree(
+        self, temp_git_repo: Path, monkeypatch, capsys
+    ):
+        """MERGE choice calls manager.merge_worktree."""
+        from core.workspace.finalization import handle_workspace_choice
+
+        manager = WorktreeManager(temp_git_repo)
+        spec_name = "test-spec"
+
+        # Create worktree and commit something
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+        (worktree_path / "test.py").write_text("test", encoding="utf-8")
+
+        # Initialize git in worktree and commit
+        subprocess.run(["git", "init"], cwd=worktree_path, capture_output=True)
+        subprocess.run(
+            ["git", "config", "user.email", "test@example.com"],
+            cwd=worktree_path,
+            capture_output=True,
+        )
+        subprocess.run(
+            ["git", "config", "user.name", "Test"],
+            cwd=worktree_path,
+            capture_output=True,
+        )
+        subprocess.run(["git", "add", "."], cwd=worktree_path, capture_output=True)
+        subprocess.run(
+            ["git", "commit", "-m", "Test"], cwd=worktree_path, capture_output=True
+        )
+
+        handle_workspace_choice(
+            WorkspaceChoice.MERGE, temp_git_repo, spec_name, manager
+        )
+
+        captured = capsys.readouterr()
+        assert "Adding changes" in captured.out
+
+    def test_choice_review_shows_changed_files(
+        self, temp_git_repo: Path, monkeypatch, capsys
+    ):
+        """REVIEW choice shows changed files."""
+        from core.workspace.finalization import handle_workspace_choice
+
+        manager = WorktreeManager(temp_git_repo)
+        spec_name = "test-spec"
+
+        # Create worktree
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        # Mock show_changed_files
+        mock_shown = []
+
+        def mock_show_changed_files(manager, spec_name):
+            mock_shown.append(spec_name)
+
+        monkeypatch.setattr(
+            "core.workspace.finalization.show_changed_files", mock_show_changed_files
+        )
+
+        handle_workspace_choice(
+            WorkspaceChoice.REVIEW, temp_git_repo, spec_name, manager
+        )
+
+        assert len(mock_shown) == 1
+        assert mock_shown[0] == spec_name
+
+        captured = capsys.readouterr()
+        assert "To see full details" in captured.out
+
+    def test_choice_later_shows_deferred_message(
+        self, temp_git_repo: Path, monkeypatch, capsys
+    ):
+        """LATER choice shows deferral message."""
+        from core.workspace.finalization import handle_workspace_choice
+
+        manager = WorktreeManager(temp_git_repo)
+        spec_name = "test-spec"
+
+        # Create worktree
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        handle_workspace_choice(
+            WorkspaceChoice.LATER, temp_git_repo, spec_name, manager
+        )
+
+        captured = capsys.readouterr()
+        assert "No problem!" in captured.out
+        assert "saved" in captured.out
+
+
+class TestReviewExistingBuild:
+    """Tests for review_existing_build function."""
+
+    def test_no_existing_build_shows_warning(self, temp_git_repo: Path, capsys):
+        """Shows warning when no existing build found."""
+        from core.workspace.finalization import review_existing_build
+
+        result = review_existing_build(temp_git_repo, "nonexistent-spec")
+
+        assert result is False
+
+        captured = capsys.readouterr()
+        assert "No existing build found" in captured.out
+
+    def test_shows_build_contents(self, temp_git_repo: Path, capsys):
+        """Shows build summary and changed files when build exists."""
+        from core.workspace.finalization import review_existing_build
+
+        spec_name = "test-spec"
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        result = review_existing_build(temp_git_repo, spec_name)
+
+        assert result is True
+
+        captured = capsys.readouterr()
+        assert "BUILD CONTENTS" in captured.out
+
+
+class TestDiscardExistingBuild:
+    """Tests for discard_existing_build function."""
+
+    def test_no_existing_build_returns_false(self, temp_git_repo: Path, capsys):
+        """Returns False when no existing build found."""
+        from core.workspace.finalization import discard_existing_build
+
+        result = discard_existing_build(temp_git_repo, "nonexistent-spec")
+
+        assert result is False
+
+        captured = capsys.readouterr()
+        assert "No existing build found" in captured.out
+
+    def test_confirmation_deletes_build(self, temp_git_repo: Path, monkeypatch, capsys):
+        """Deletes build when user types 'delete' to confirm."""
+        from core.workspace.finalization import discard_existing_build
+
+        spec_name = "test-spec"
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        # Mock input to return "delete"
+        monkeypatch.setattr("builtins.input", lambda: "delete")
+
+        result = discard_existing_build(temp_git_repo, spec_name)
+
+        assert result is True
+        captured = capsys.readouterr()
+        assert "Build deleted" in captured.out
+
+    def test_cancelled_confirmation_returns_false(
+        self, temp_git_repo: Path, monkeypatch, capsys
+    ):
+        """Returns False when user doesn't confirm."""
+        from core.workspace.finalization import discard_existing_build
+
+        spec_name = "test-spec"
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        # Mock input to return "no"
+        monkeypatch.setattr("builtins.input", lambda: "no")
+
+        result = discard_existing_build(temp_git_repo, spec_name)
+
+        assert result is False
+        captured = capsys.readouterr()
+        assert "Cancelled" in captured.out
+
+
+class TestCheckExistingBuild:
+    """Tests for check_existing_build function."""
+
+    def test_no_existing_build_returns_false(self, temp_git_repo: Path):
+        """Returns False when no existing build."""
+        from core.workspace.finalization import check_existing_build
+
+        result = check_existing_build(temp_git_repo, "nonexistent-spec")
+
+        assert result is False
+
+    def test_shows_menu_for_existing_build(self, temp_git_repo: Path, monkeypatch):
+        """Shows menu when existing build found."""
+        from core.workspace.finalization import check_existing_build
+
+        spec_name = "test-spec"
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        # Mock select_menu to return "continue"
+        def mock_select_menu(title, options, allow_quit):
+            return "continue"
+
+        monkeypatch.setattr("core.workspace.finalization.select_menu", mock_select_menu)
+
+        result = check_existing_build(temp_git_repo, spec_name)
+
+        assert result is True
+
+    def test_review_choice_reviews_and_continues(
+        self, temp_git_repo: Path, monkeypatch
+    ):
+        """Review choice reviews build then continues."""
+        from core.workspace.finalization import check_existing_build
+
+        spec_name = "test-spec"
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        review_called = []
+
+        def mock_review(project_dir, spec_name):
+            review_called.append(spec_name)
+            return True
+
+        def mock_select_menu(title, options, allow_quit):
+            return "review"
+
+        def mock_input(prompt):
+            return ""
+
+        monkeypatch.setattr(
+            "core.workspace.finalization.review_existing_build", mock_review
+        )
+        monkeypatch.setattr("core.workspace.finalization.select_menu", mock_select_menu)
+        monkeypatch.setattr("builtins.input", mock_input)
+
+        result = check_existing_build(temp_git_repo, spec_name)
+
+        assert result is True
+        assert spec_name in review_called
+
+
+class TestListAllWorktrees:
+    """Tests for list_all_worktrees function."""
+
+    def test_returns_empty_list_when_no_worktrees(self, temp_git_repo: Path):
+        """Returns empty list when no worktrees exist."""
+        from core.workspace.finalization import list_all_worktrees
+
+        result = list_all_worktrees(temp_git_repo)
+
+        assert result == []
+
+    def test_lists_existing_worktrees(self, temp_git_repo: Path):
+        """Returns list of existing worktrees."""
+        from core.workspace.finalization import list_all_worktrees
+
+        # Create worktrees
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        (worktrees_dir / "spec-001").mkdir()
+        (worktrees_dir / "spec-002").mkdir()
+
+        result = list_all_worktrees(temp_git_repo)
+
+        assert len(result) == 2
+        spec_names = {wt.spec_name for wt in result}
+        assert "spec-001" in spec_names
+        assert "spec-002" in spec_names
+
+
+class TestCleanupAllWorktrees:
+    """Tests for cleanup_all_worktrees function."""
+
+    def test_no_worktrees_returns_false(self, temp_git_repo: Path, capsys):
+        """Returns False when no worktrees found."""
+        from core.workspace.finalization import cleanup_all_worktrees
+
+        result = cleanup_all_worktrees(temp_git_repo, confirm=False)
+
+        assert result is False
+
+        captured = capsys.readouterr()
+        assert "No worktrees found" in captured.out
+
+    def test_cleanup_without_confirmation(self, temp_git_repo: Path):
+        """Cleans up worktrees when confirm=False."""
+        from core.workspace.finalization import cleanup_all_worktrees
+
+        # Create worktrees
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        spec1_path = worktrees_dir / "spec-001"
+        spec1_path.mkdir()
+        spec2_path = worktrees_dir / "spec-002"
+        spec2_path.mkdir()
+
+        result = cleanup_all_worktrees(temp_git_repo, confirm=False)
+
+        assert result is True
+        assert not spec1_path.exists()
+        assert not spec2_path.exists()
+
+    def test_cleanup_with_confirmation_yes(self, temp_git_repo: Path, monkeypatch):
+        """Cleans up worktrees when user confirms with 'yes'."""
+        from core.workspace.finalization import cleanup_all_worktrees
+
+        # Create worktrees
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        spec1_path = worktrees_dir / "spec-001"
+        spec1_path.mkdir()
+
+        # Mock input to return "yes"
+        monkeypatch.setattr("builtins.input", lambda: "yes")
+
+        result = cleanup_all_worktrees(temp_git_repo, confirm=True)
+
+        assert result is True
+        assert not spec1_path.exists()
+
+    def test_cleanup_with_confirmation_no(self, temp_git_repo: Path, monkeypatch):
+        """Cancels cleanup when user doesn't confirm."""
+        from core.workspace.finalization import cleanup_all_worktrees
+
+        # Create worktrees
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        spec1_path = worktrees_dir / "spec-001"
+        spec1_path.mkdir()
+
+        # Mock input to return "no"
+        monkeypatch.setattr("builtins.input", lambda: "no")
+
+        result = cleanup_all_worktrees(temp_git_repo, confirm=True)
+
+        assert result is False
+        assert spec1_path.exists()  # Should still exist
+
+    def test_cleanup_with_confirmation_keyboard_interrupt(
+        self, temp_git_repo: Path, monkeypatch, capsys
+    ):
+        """Cancels cleanup when user presses Ctrl+C (KeyboardInterrupt)."""
+        from core.workspace.finalization import cleanup_all_worktrees
+
+        # Create worktrees
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        spec1_path = worktrees_dir / "spec-001"
+        spec1_path.mkdir()
+
+        # Mock input to raise KeyboardInterrupt
+        def mock_input(prompt=""):
+            raise KeyboardInterrupt()
+
+        monkeypatch.setattr("builtins.input", mock_input)
+
+        result = cleanup_all_worktrees(temp_git_repo, confirm=True)
+
+        assert result is False
+        assert spec1_path.exists()  # Should still exist
+
+        captured = capsys.readouterr()
+        assert "Cancelled" in captured.out
+
+
+class TestFinalizeWorkspaceBranchCoverage:
+    """Additional tests for finalize_workspace to cover missing branches."""
+
+    def test_isolated_mode_merge_choice(self, temp_git_repo: Path, monkeypatch):
+        """Isolated mode returns MERGE when user selects merge."""
+        from core.workspace.finalization import finalize_workspace
+
+        manager = WorktreeManager(temp_git_repo)
+        spec_name = "test-spec"
+
+        # Create worktree
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        # Mock select_menu to return "merge"
+        def mock_select_menu(title, options, allow_quit):
+            return "merge"
+
+        monkeypatch.setattr("core.workspace.finalization.select_menu", mock_select_menu)
+
+        result = finalize_workspace(
+            temp_git_repo,
+            spec_name,
+            manager=manager,
+            auto_continue=False,
+        )
+
+        assert result == WorkspaceChoice.MERGE
+
+    def test_isolated_mode_review_choice(self, temp_git_repo: Path, monkeypatch):
+        """Isolated mode returns REVIEW when user selects review."""
+        from core.workspace.finalization import finalize_workspace
+
+        manager = WorktreeManager(temp_git_repo)
+        spec_name = "test-spec"
+
+        # Create worktree
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        # Mock select_menu to return "review"
+        def mock_select_menu(title, options, allow_quit):
+            return "review"
+
+        monkeypatch.setattr("core.workspace.finalization.select_menu", mock_select_menu)
+
+        result = finalize_workspace(
+            temp_git_repo,
+            spec_name,
+            manager=manager,
+            auto_continue=False,
+        )
+
+        assert result == WorkspaceChoice.REVIEW
+
+    def test_isolated_mode_later_choice(self, temp_git_repo: Path, monkeypatch):
+        """Isolated mode returns LATER when user selects later."""
+        from core.workspace.finalization import finalize_workspace
+
+        manager = WorktreeManager(temp_git_repo)
+        spec_name = "test-spec"
+
+        # Create worktree
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        # Mock select_menu to return "later"
+        def mock_select_menu(title, options, allow_quit):
+            return "later"
+
+        monkeypatch.setattr("core.workspace.finalization.select_menu", mock_select_menu)
+
+        result = finalize_workspace(
+            temp_git_repo,
+            spec_name,
+            manager=manager,
+            auto_continue=False,
+        )
+
+        assert result == WorkspaceChoice.LATER
+
+
+class TestHandleWorkspaceChoiceBranchCoverage:
+    """Additional tests for handle_workspace_choice to cover missing branches."""
+
+    def test_choice_test_without_staging_path(self, temp_git_repo: Path, capsys):
+        """TEST choice shows fallback instructions when staging_path is None."""
+        from core.workspace.finalization import handle_workspace_choice
+
+        manager = WorktreeManager(temp_git_repo)
+        spec_name = "test-spec"
+
+        # Create worktree directory (but not through manager, so no staging_path)
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        handle_workspace_choice(WorkspaceChoice.TEST, temp_git_repo, spec_name, manager)
+
+        captured = capsys.readouterr()
+        assert "TEST YOUR FEATURE" in captured.out
+        # Should show the fallback path
+        assert (
+            str(worktree_path) in captured.out
+            or f".auto-claude/worktrees/tasks/{spec_name}" in captured.out
+        )
+
+    def test_choice_merge_success(self, temp_git_repo: Path, capsys):
+        """MERGE choice shows success message when merge succeeds."""
+        from core.workspace.finalization import handle_workspace_choice
+        from worktree import WorktreeManager
+
+        # Setup a proper isolated workspace with git worktree
+        working_dir, manager, _ = setup_workspace(
+            temp_git_repo,
+            "test-spec",
+            WorkspaceMode.ISOLATED,
+        )
+
+        # Make changes and commit
+        (working_dir / "test.py").write_text("test content", encoding="utf-8")
+        subprocess.run(["git", "add", "."], cwd=working_dir, capture_output=True)
+        subprocess.run(
+            ["git", "commit", "-m", "Add test"], cwd=working_dir, capture_output=True
+        )
+
+        handle_workspace_choice(
+            WorkspaceChoice.MERGE, temp_git_repo, "test-spec", manager
+        )
+
+        captured = capsys.readouterr()
+        assert "Your feature has been added" in captured.out
+
+    def test_choice_later_without_staging_path(self, temp_git_repo: Path, capsys):
+        """LATER choice shows fallback path when staging_path is None."""
+        from core.workspace.finalization import handle_workspace_choice
+
+        manager = WorktreeManager(temp_git_repo)
+        spec_name = "test-spec"
+
+        # Create worktree directory (but not through manager, so no staging_path)
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        handle_workspace_choice(
+            WorkspaceChoice.LATER, temp_git_repo, spec_name, manager
+        )
+
+        captured = capsys.readouterr()
+        assert "No problem!" in captured.out
+        # Should show the fallback path
+        assert (
+            str(worktree_path) in captured.out
+            or f".auto-claude/worktrees/tasks/{spec_name}" in captured.out
+        )
+
+
+class TestDiscardExistingBuildBranchCoverage:
+    """Additional tests for discard_existing_build to cover missing branches."""
+
+    def test_keyboard_interrupt_cancels_discard(
+        self, temp_git_repo: Path, monkeypatch, capsys
+    ):
+        """KeyboardInterrupt during confirmation returns False."""
+        from core.workspace.finalization import discard_existing_build
+
+        spec_name = "test-spec"
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        # Mock input to raise KeyboardInterrupt
+        def mock_input(prompt=""):
+            raise KeyboardInterrupt()
+
+        monkeypatch.setattr("builtins.input", mock_input)
+
+        result = discard_existing_build(temp_git_repo, spec_name)
+
+        assert result is False
+
+        captured = capsys.readouterr()
+        assert "Cancelled" in captured.out
+
+
+class TestCheckExistingBuildBranchCoverage:
+    """Additional tests for check_existing_build to cover missing branches."""
+
+    def test_none_choice_exits(self, temp_git_repo: Path, monkeypatch):
+        """None choice (quit) calls sys.exit(0)."""
+        import sys
+
+        from core.workspace.finalization import check_existing_build
+
+        spec_name = "test-spec"
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        # Mock select_menu to return None (quit)
+        def mock_select_menu(title, options, allow_quit):
+            return None
+
+        monkeypatch.setattr("core.workspace.finalization.select_menu", mock_select_menu)
+
+        # Should raise SystemExit
+        with pytest.raises(SystemExit) as exc_info:
+            check_existing_build(temp_git_repo, spec_name)
+
+        assert exc_info.value.code == 0
+
+    def test_merge_choice_merges_and_returns_false(
+        self, temp_git_repo: Path, monkeypatch
+    ):
+        """Merge choice calls merge_existing_build and returns False."""
+        from unittest.mock import MagicMock
+
+        from core.workspace.finalization import check_existing_build
+
+        spec_name = "test-spec"
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        merge_called = []
+
+        def mock_merge_existing_build(project_dir, spec_name):
+            merge_called.append(spec_name)
+
+        def mock_select_menu(title, options, allow_quit):
+            return "merge"
+
+        monkeypatch.setattr("core.workspace.finalization.select_menu", mock_select_menu)
+
+        # Mock the workspace module import
+        import workspace as ws
+
+        original_merge = getattr(ws, "merge_existing_build", None)
+        ws.merge_existing_build = mock_merge_existing_build
+
+        try:
+            result = check_existing_build(temp_git_repo, spec_name)
+            assert result is False
+            assert spec_name in merge_called
+        finally:
+            if original_merge:
+                ws.merge_existing_build = original_merge
+
+    def test_fresh_choice_discards_and_returns_false(
+        self, temp_git_repo: Path, monkeypatch
+    ):
+        """Fresh choice discards build and returns False (start fresh)."""
+        from core.workspace.finalization import check_existing_build
+
+        spec_name = "test-spec"
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_path = worktrees_dir / spec_name
+        worktree_path.mkdir(parents=True)
+
+        def mock_select_menu(title, options, allow_quit):
+            return "fresh"
+
+        monkeypatch.setattr("core.workspace.finalization.select_menu", mock_select_menu)
+        # Mock input to return "delete" for confirmation
+        monkeypatch.setattr("builtins.input", lambda: "delete")
+
+        result = check_existing_build(temp_git_repo, spec_name)
+        assert result is False, "Fresh choice should return False"

apps/backend/core/workspace/tests/test_models.py

@@ -0,0 +1,638 @@
+#!/usr/bin/env python3
+"""
+Tests for Workspace Models
+==========================
+
+Tests the workspace.py module models including:
+- WorkspaceMode enum
+- WorkspaceChoice enum
+- ParallelMergeTask
+- ParallelMergeResult
+- MergeLock and MergeLockError
+- SpecNumberLock and SpecNumberLockError
+"""
+
+import os
+import subprocess
+import sys
+from pathlib import Path
+
+import pytest
+
+# Add parent directory to path so we can import the workspace module
+# When co-located at workspace/tests/, we need to add backend to path
+# workspace/tests -> workspace -> core -> backend (4 levels up)
+_backend = Path(__file__).resolve().parent.parent.parent.parent
+sys.path.insert(0, str(_backend))
+
+from core.workspace.models import (
+    MergeLock,
+    MergeLockError,
+    ParallelMergeResult,
+    ParallelMergeTask,
+    SpecNumberLock,
+    SpecNumberLockError,
+)
+from worktree import WorktreeError, WorktreeManager
+
+# Test constant - in the new per-spec architecture, each spec has its own worktree
+# named after the spec itself. This constant is used for test assertions.
+TEST_SPEC_NAME = "test-spec"
+
+
+class TestWorkspaceMode:
+    """Tests for WorkspaceMode enum."""
+
+    def test_isolated_mode(self):
+        """ISOLATED mode value is correct."""
+        from core.workspace.models import WorkspaceMode
+
+        assert WorkspaceMode.ISOLATED.value == "isolated"
+
+    def test_direct_mode(self):
+        """DIRECT mode value is correct."""
+        from core.workspace.models import WorkspaceMode
+
+        assert WorkspaceMode.DIRECT.value == "direct"
+
+
+class TestWorkspaceChoice:
+    """Tests for WorkspaceChoice enum."""
+
+    def test_merge_choice(self):
+        """MERGE choice value is correct."""
+        from core.workspace.models import WorkspaceChoice
+
+        assert WorkspaceChoice.MERGE.value == "merge"
+
+    def test_review_choice(self):
+        """REVIEW choice value is correct."""
+        from core.workspace.models import WorkspaceChoice
+
+        assert WorkspaceChoice.REVIEW.value == "review"
+
+    def test_test_choice(self):
+        """TEST choice value is correct."""
+        from core.workspace.models import WorkspaceChoice
+
+        assert WorkspaceChoice.TEST.value == "test"
+
+    def test_later_choice(self):
+        """LATER choice value is correct."""
+        from core.workspace.models import WorkspaceChoice
+
+        assert WorkspaceChoice.LATER.value == "later"
+
+
+class TestParallelMergeTask:
+    """Tests for ParallelMergeTask dataclass."""
+
+    def test_create_merge_task(self):
+        """ParallelMergeTask can be instantiated with all fields."""
+        task = ParallelMergeTask(
+            file_path="src/example.py",
+            main_content="main content",
+            worktree_content="worktree content",
+            base_content="base content",
+            spec_name="test-spec",
+            project_dir=Path("/project"),
+        )
+
+        assert task.file_path == "src/example.py"
+        assert task.main_content == "main content"
+        assert task.worktree_content == "worktree content"
+        assert task.base_content == "base content"
+        assert task.spec_name == "test-spec"
+        assert task.project_dir == Path("/project")
+
+    def test_merge_task_with_none_base(self):
+        """ParallelMergeTask can have None for base_content."""
+        task = ParallelMergeTask(
+            file_path="src/example.py",
+            main_content="main content",
+            worktree_content="worktree content",
+            base_content=None,
+            spec_name="test-spec",
+            project_dir=Path("/project"),
+        )
+
+        assert task.base_content is None
+
+    def test_merge_task_field_assignment(self):
+        """ParallelMergeTask fields can be reassigned."""
+        task = ParallelMergeTask(
+            file_path="src/example.py",
+            main_content="main",
+            worktree_content="worktree",
+            base_content=None,
+            spec_name="spec-1",
+            project_dir=Path("/project"),
+        )
+
+        task.file_path = "src/updated.py"
+        task.main_content = "updated main"
+        task.worktree_content = "updated worktree"
+        task.base_content = "updated base"
+        task.spec_name = "spec-2"
+        task.project_dir = Path("/updated")
+
+        assert task.file_path == "src/updated.py"
+        assert task.main_content == "updated main"
+        assert task.worktree_content == "updated worktree"
+        assert task.base_content == "updated base"
+        assert task.spec_name == "spec-2"
+        assert task.project_dir == Path("/updated")
+
+
+class TestParallelMergeResult:
+    """Tests for ParallelMergeResult dataclass."""
+
+    def test_create_successful_result(self):
+        """ParallelMergeResult can represent a successful merge."""
+        result = ParallelMergeResult(
+            file_path="src/example.py",
+            merged_content="merged content",
+            success=True,
+            error=None,
+            was_auto_merged=True,
+        )
+
+        assert result.file_path == "src/example.py"
+        assert result.merged_content == "merged content"
+        assert result.success is True
+        assert result.error is None
+        assert result.was_auto_merged is True
+
+    def test_create_failed_result(self):
+        """ParallelMergeResult can represent a failed merge."""
+        result = ParallelMergeResult(
+            file_path="src/example.py",
+            merged_content=None,
+            success=False,
+            error="Merge conflict occurred",
+            was_auto_merged=False,
+        )
+
+        assert result.file_path == "src/example.py"
+        assert result.merged_content is None
+        assert result.success is False
+        assert result.error == "Merge conflict occurred"
+        assert result.was_auto_merged is False
+
+    def test_result_default_values(self):
+        """ParallelMergeResult has correct default values."""
+        result = ParallelMergeResult(
+            file_path="src/example.py",
+            merged_content="content",
+            success=True,
+        )
+
+        assert result.error is None
+        assert result.was_auto_merged is False
+
+    def test_result_field_assignment(self):
+        """ParallelMergeResult fields can be reassigned."""
+        result = ParallelMergeResult(
+            file_path="src/example.py",
+            merged_content="merged",
+            success=True,
+            error=None,
+            was_auto_merged=False,
+        )
+
+        result.file_path = "src/updated.py"
+        result.merged_content = "updated merged"
+        result.success = False
+        result.error = "New error"
+        result.was_auto_merged = True
+
+        assert result.file_path == "src/updated.py"
+        assert result.merged_content == "updated merged"
+        assert result.success is False
+        assert result.error == "New error"
+        assert result.was_auto_merged is True
+
+
+class TestMergeLockError:
+    """Tests for MergeLockError exception."""
+
+    def test_merge_lock_error_creation(self):
+        """MergeLockError can be instantiated with a message."""
+        error = MergeLockError("Could not acquire lock")
+        assert str(error) == "Could not acquire lock"
+
+    def test_merge_lock_error_is_exception(self):
+        """MergeLockError is an Exception subclass."""
+        error = MergeLockError("test")
+        assert isinstance(error, Exception)
+        assert isinstance(error, MergeLockError)
+
+    def test_raise_merge_lock_error(self):
+        """MergeLockError can be raised and caught."""
+        with pytest.raises(MergeLockError) as exc_info:
+            raise MergeLockError("Lock timeout")
+            assert str(exc_info.value) == "Lock timeout"
+
+
+class TestMergeLock:
+    """Tests for MergeLock context manager."""
+
+    def test_merge_lock_initialization(self, temp_git_repo: Path):
+        """MergeLock initializes with correct paths."""
+        lock = MergeLock(temp_git_repo, "test-spec")
+
+        assert lock.project_dir == temp_git_repo
+        assert lock.spec_name == "test-spec"
+        assert lock.lock_dir == temp_git_repo / ".auto-claude" / ".locks"
+        assert lock.lock_file == lock.lock_dir / "merge-test-spec.lock"
+        assert lock.acquired is False
+
+    def test_merge_lock_acquire_and_release(self, temp_git_repo: Path):
+        """MergeLock can be acquired and released."""
+        lock = MergeLock(temp_git_repo, "test-spec")
+
+        with lock:
+            assert lock.acquired is True
+            assert lock.lock_file.exists()
+
+        # After context, lock should be released
+        assert lock.lock_file.exists() is False
+
+    def test_merge_lock_creates_lock_dir(self, temp_git_repo: Path):
+        """MergeLock creates lock directory if it doesn't exist."""
+        lock = MergeLock(temp_git_repo, "test-spec")
+
+        # Remove lock dir if it exists
+        if lock.lock_dir.exists():
+            lock.lock_dir.rmdir()
+
+        with lock:
+            assert lock.lock_dir.exists()
+
+    def test_merge_lock_writes_pid(self, temp_git_repo: Path):
+        """MergeLock writes current PID to lock file."""
+        lock = MergeLock(temp_git_repo, "test-spec")
+
+        with lock:
+            pid_content = lock.lock_file.read_text(encoding="utf-8").strip()
+            assert pid_content == str(os.getpid())
+
+    @pytest.mark.slow
+    def test_merge_lock_timeout_on_contention(self, temp_git_repo: Path):
+        """MergeLock raises MergeLockError when lock is held by another process."""
+        lock1 = MergeLock(temp_git_repo, "test-spec")
+
+        # Acquire first lock
+        lock1.__enter__()
+
+        try:
+            # Create a second lock for the same spec
+            lock2 = MergeLock(temp_git_repo, "test-spec")
+
+            # This should timeout because lock1 holds the lock
+            with pytest.raises(MergeLockError) as exc_info:
+                lock2.__enter__()
+
+            assert "Could not acquire merge lock" in str(exc_info.value)
+            assert "test-spec" in str(exc_info.value)
+            assert "after 30s" in str(exc_info.value)
+        finally:
+            lock1.__exit__(None, None, None)
+
+    def test_merge_lock_removes_stale_lock(self, temp_git_repo: Path):
+        """MergeLock removes stale lock from dead process."""
+        lock1 = MergeLock(temp_git_repo, "test-spec")
+
+        with lock1:
+            # Write a fake PID that doesn't exist
+            fake_pid = 999999
+            lock1.lock_file.write_text(str(fake_pid), encoding="utf-8")
+
+            # Create a new lock - it should remove the stale lock
+            lock2 = MergeLock(temp_git_repo, "test-spec")
+            with lock2:
+                assert lock2.acquired is True
+
+    def test_merge_lock_handles_invalid_pid(self, temp_git_repo: Path):
+        """MergeLock handles invalid PID in lock file."""
+        lock1 = MergeLock(temp_git_repo, "test-spec")
+
+        with lock1:
+            # Write invalid content to lock file
+            lock1.lock_file.write_text("invalid-pid", encoding="utf-8")
+
+            # Create a new lock - it should remove the invalid lock
+            lock2 = MergeLock(temp_git_repo, "test-spec")
+            with lock2:
+                assert lock2.acquired is True
+
+    def test_merge_lock_cleanup_on_exception(self, temp_git_repo: Path):
+        """MergeLock releases lock even if exception occurs in context."""
+        lock = MergeLock(temp_git_repo, "test-spec")
+
+        try:
+            with lock:
+                assert lock.acquired is True
+                raise ValueError("Test exception")
+        except ValueError:
+            pass
+
+        # Lock should be released despite exception
+        assert lock.lock_file.exists() is False
+
+    def test_merge_lock_idempotent_release(self, temp_git_repo: Path):
+        """MergeLock __exit__ can be called multiple times safely."""
+        lock = MergeLock(temp_git_repo, "test-spec")
+
+        with lock:
+            pass
+
+        # Call __exit__ again - should not raise
+        lock.__exit__(None, None, None)
+        lock.__exit__(None, None, None)
+
+    def test_merge_lock_different_specs_dont_conflict(self, temp_git_repo: Path):
+        """MergeLock for different specs can be held simultaneously."""
+        lock1 = MergeLock(temp_git_repo, "spec-1")
+        lock2 = MergeLock(temp_git_repo, "spec-2")
+
+        with lock1:
+            with lock2:
+                assert lock1.acquired is True
+                assert lock2.acquired is True
+                assert lock1.lock_file != lock2.lock_file
+
+
+class TestSpecNumberLockError:
+    """Tests for SpecNumberLockError exception."""
+
+    def test_spec_number_lock_error_creation(self):
+        """SpecNumberLockError can be instantiated with a message."""
+        error = SpecNumberLockError("Could not acquire spec numbering lock")
+        assert str(error) == "Could not acquire spec numbering lock"
+
+    def test_spec_number_lock_error_is_exception(self):
+        """SpecNumberLockError is an Exception subclass."""
+        error = SpecNumberLockError("test")
+        assert isinstance(error, Exception)
+        assert isinstance(error, SpecNumberLockError)
+
+    def test_raise_spec_number_lock_error(self):
+        """SpecNumberLockError can be raised and caught."""
+        with pytest.raises(SpecNumberLockError) as exc_info:
+            raise SpecNumberLockError("Lock timeout")
+            assert str(exc_info.value) == "Lock timeout"
+
+
+class TestSpecNumberLock:
+    """Tests for SpecNumberLock context manager."""
+
+    def test_spec_number_lock_initialization(self, temp_git_repo: Path):
+        """SpecNumberLock initializes with correct paths."""
+        lock = SpecNumberLock(temp_git_repo)
+
+        assert lock.project_dir == temp_git_repo
+        assert lock.lock_dir == temp_git_repo / ".auto-claude" / ".locks"
+        assert lock.lock_file == lock.lock_dir / "spec-numbering.lock"
+        assert lock.acquired is False
+        assert lock._global_max is None
+
+    def test_spec_number_lock_acquire_and_release(self, temp_git_repo: Path):
+        """SpecNumberLock can be acquired and released."""
+        lock = SpecNumberLock(temp_git_repo)
+
+        with lock:
+            assert lock.acquired is True
+            assert lock.lock_file.exists()
+
+        # After context, lock should be released
+        assert lock.lock_file.exists() is False
+
+    def test_spec_number_lock_creates_lock_dir(self, temp_git_repo: Path):
+        """SpecNumberLock creates lock directory if it doesn't exist."""
+        lock = SpecNumberLock(temp_git_repo)
+
+        # Remove lock dir if it exists
+        if lock.lock_dir.exists():
+            lock.lock_dir.rmdir()
+
+        with lock:
+            assert lock.lock_dir.exists()
+
+    def test_spec_number_lock_writes_pid(self, temp_git_repo: Path):
+        """SpecNumberLock writes current PID to lock file."""
+        lock = SpecNumberLock(temp_git_repo)
+
+        with lock:
+            pid_content = lock.lock_file.read_text(encoding="utf-8").strip()
+            assert pid_content == str(os.getpid())
+
+    def test_get_next_spec_number_no_existing_specs(self, temp_git_repo: Path):
+        """get_next_spec_number returns 1 when no specs exist."""
+        lock = SpecNumberLock(temp_git_repo)
+
+        with lock:
+            next_num = lock.get_next_spec_number()
+            assert next_num == 1
+
+    def test_get_next_spec_number_with_existing_specs(self, temp_git_repo: Path):
+        """get_next_spec_number returns max existing spec number + 1."""
+        # Create spec directories
+        specs_dir = temp_git_repo / ".auto-claude" / "specs"
+        specs_dir.mkdir(parents=True)
+        (specs_dir / "001-first").mkdir()
+        (specs_dir / "003-third").mkdir()
+
+        lock = SpecNumberLock(temp_git_repo)
+
+        with lock:
+            next_num = lock.get_next_spec_number()
+            assert next_num == 4
+
+    def test_get_next_spec_number_caches_result(self, temp_git_repo: Path):
+        """get_next_spec_number caches the global max."""
+        specs_dir = temp_git_repo / ".auto-claude" / "specs"
+        specs_dir.mkdir(parents=True)
+        (specs_dir / "005-test").mkdir()
+
+        lock = SpecNumberLock(temp_git_repo)
+
+        with lock:
+            next_num1 = lock.get_next_spec_number()
+            next_num2 = lock.get_next_spec_number()
+
+            # Should return the same value (cached)
+            assert next_num1 == next_num2 == 6
+            assert lock._global_max == 5
+
+    def test_get_next_spec_number_requires_lock(self, temp_git_repo: Path):
+        """get_next_spec_number raises SpecNumberLockError if lock not acquired."""
+        lock = SpecNumberLock(temp_git_repo)
+
+        with pytest.raises(SpecNumberLockError) as exc_info:
+            lock.get_next_spec_number()
+
+        assert "Lock must be acquired" in str(exc_info.value)
+
+    def test_get_next_spec_number_scans_worktrees(self, temp_git_repo: Path):
+        """get_next_spec_number scans all worktree spec directories."""
+        # Create main project specs
+        main_specs = temp_git_repo / ".auto-claude" / "specs"
+        main_specs.mkdir(parents=True)
+        (main_specs / "002-main").mkdir()
+
+        # Create worktree with specs
+        worktrees_dir = temp_git_repo / ".auto-claude" / "worktrees" / "tasks"
+        worktrees_dir.mkdir(parents=True)
+        worktree_spec_dir = worktrees_dir / "test-worktree" / ".auto-claude" / "specs"
+        worktree_spec_dir.mkdir(parents=True)
+        (worktree_spec_dir / "005-worktree").mkdir()
+
+        lock = SpecNumberLock(temp_git_repo)
+
+        with lock:
+            next_num = lock.get_next_spec_number()
+            # Should find max of 2 and 5, return 6
+            assert next_num == 6
+
+    def test_scan_specs_dir_nonexistent(self, temp_git_repo: Path):
+        """_scan_specs_dir returns 0 for nonexistent directory."""
+        lock = SpecNumberLock(temp_git_repo)
+
+        with lock:
+            # Use a path inside temp_dir that doesn't exist
+            nonexistent = temp_git_repo / "this_does_not_exist_specs"
+            result = lock._scan_specs_dir(nonexistent)
+            assert result == 0
+
+    def test_scan_specs_dir_ignores_invalid_names(self, temp_git_repo: Path):
+        """_scan_specs_dir ignores directories with invalid spec names."""
+        specs_dir = temp_git_repo / ".auto-claude" / "specs"
+        specs_dir.mkdir(parents=True)
+        (specs_dir / "001-valid").mkdir()
+        (specs_dir / "invalid-name").mkdir()
+        (specs_dir / "abc").mkdir()
+        (specs_dir / "100-valid").mkdir()
+
+        lock = SpecNumberLock(temp_git_repo)
+
+        with lock:
+            result = lock._scan_specs_dir(specs_dir)
+            # Should only count 001 and 100
+            assert result == 100
+
+    @pytest.mark.slow
+    def test_spec_number_lock_timeout_on_contention(self, temp_git_repo: Path):
+        """SpecNumberLock raises SpecNumberLockError when lock is held."""
+        lock1 = SpecNumberLock(temp_git_repo)
+
+        # Acquire first lock
+        lock1.__enter__()
+
+        try:
+            # Create a second lock
+            lock2 = SpecNumberLock(temp_git_repo)
+
+            # This should timeout because lock1 holds the lock
+            with pytest.raises(SpecNumberLockError) as exc_info:
+                lock2.__enter__()
+
+            assert "Could not acquire spec numbering lock" in str(exc_info.value)
+            assert "after 30s" in str(exc_info.value)
+        finally:
+            lock1.__exit__(None, None, None)
+
+    def test_spec_number_lock_removes_stale_lock(self, temp_git_repo: Path):
+        """SpecNumberLock removes stale lock from dead process."""
+        lock1 = SpecNumberLock(temp_git_repo)
+
+        with lock1:
+            # Write a fake PID that doesn't exist
+            fake_pid = 999999
+            lock1.lock_file.write_text(str(fake_pid), encoding="utf-8")
+
+            # Create a new lock - it should remove the stale lock
+            lock2 = SpecNumberLock(temp_git_repo)
+            with lock2:
+                assert lock2.acquired is True
+
+    def test_spec_number_lock_handles_invalid_pid(self, temp_git_repo: Path):
+        """SpecNumberLock handles invalid PID in lock file."""
+        lock1 = SpecNumberLock(temp_git_repo)
+
+        with lock1:
+            # Write invalid content to lock file
+            lock1.lock_file.write_text("invalid-pid", encoding="utf-8")
+
+            # Create a new lock - it should remove the invalid lock
+            lock2 = SpecNumberLock(temp_git_repo)
+            with lock2:
+                assert lock2.acquired is True
+
+    def test_spec_number_lock_cleanup_on_exception(self, temp_git_repo: Path):
+        """SpecNumberLock releases lock even if exception occurs in context."""
+        lock = SpecNumberLock(temp_git_repo)
+
+        try:
+            with lock:
+                assert lock.acquired is True
+                raise ValueError("Test exception")
+        except ValueError:
+            pass
+
+        # Lock should be released despite exception
+        assert lock.lock_file.exists() is False
+
+    def test_spec_number_lock_idempotent_release(self, temp_git_repo: Path):
+        """SpecNumberLock __exit__ can be called multiple times safely."""
+        lock = SpecNumberLock(temp_git_repo)
+
+        with lock:
+            pass
+
+        # Call __exit__ again - should not raise
+        lock.__exit__(None, None, None)
+        lock.__exit__(None, None, None)
+
+    def test_spec_number_lock_returns_self(self, temp_git_repo: Path):
+        """SpecNumberLock __enter__ returns self."""
+        lock = SpecNumberLock(temp_git_repo)
+
+        with lock as entered_lock:
+            assert entered_lock is lock
+
+    def test_merge_success_returns_true(self, temp_git_repo: Path):
+        """Successful merge returns True (ACS-163 verification)."""
+        manager = WorktreeManager(temp_git_repo)
+        manager.setup()
+
+        # Create a worktree with non-conflicting changes
+        worker_info = manager.create_worktree("worker-spec")
+        (worker_info.path / "worker-file.txt").write_text(
+            "worker content", encoding="utf-8"
+        )
+        subprocess.run(["git", "add", "."], cwd=worker_info.path, capture_output=True)
+        subprocess.run(
+            ["git", "commit", "-m", "Worker commit"],
+            cwd=worker_info.path,
+            capture_output=True,
+        )
+
+        # Merge should succeed
+        result = manager.merge_worktree("worker-spec", delete_after=False)
+
+        assert result is True
+
+        # Verify the file was merged into base branch
+        subprocess.run(
+            ["git", "checkout", manager.base_branch],
+            cwd=temp_git_repo,
+            capture_output=True,
+        )
+        assert (temp_git_repo / "worker-file.txt").exists(), (
+            "Merged file should exist in base branch"
+        )
+        merged_content = (temp_git_repo / "worker-file.txt").read_text(encoding="utf-8")
+        assert merged_content == "worker content", (
+            "Merged file should have worktree content"
+        )

apps/backend/core/workspace/tests/test_rebase.py

@@ -1,539 +1,31 @@
 #!/usr/bin/env python3
 """
-Tests for Workspace Selection and Management
-=============================================
+Tests for Workspace Rebase Operations
+======================================
 
-Tests the workspace.py module functionality including:
-- Workspace mode selection (isolated vs direct)
-- Uncommitted changes detection
-- Workspace setup
-- Build finalization workflows
+Tests the rebase functionality including:
+- Rebase detection (_check_git_conflicts)
+- Spec branch rebase operations
+- Rebase integration tests
+- Rebase error handling
 """
 
+import json
+import os
+import shutil
 import subprocess
+import sys
 from pathlib import Path
 
 import pytest
-from workspace import (
-    WorkspaceChoice,
-    WorkspaceMode,
-    get_current_branch,
-    get_existing_build_worktree,
-    has_uncommitted_changes,
-    setup_workspace,
-)
-from worktree import WorktreeManager
+from worktree import WorktreeError, WorktreeManager
 
 # Test constant - in the new per-spec architecture, each spec has its own worktree
 # named after the spec itself. This constant is used for test assertions.
 TEST_SPEC_NAME = "test-spec"
 
 
-class TestWorkspaceMode:
-    """Tests for WorkspaceMode enum."""
-
-    def test_isolated_mode(self):
-        """ISOLATED mode value is correct."""
-        assert WorkspaceMode.ISOLATED.value == "isolated"
-
-    def test_direct_mode(self):
-        """DIRECT mode value is correct."""
-        assert WorkspaceMode.DIRECT.value == "direct"
-
-
-class TestWorkspaceChoice:
-    """Tests for WorkspaceChoice enum."""
-
-    def test_merge_choice(self):
-        """MERGE choice value is correct."""
-        assert WorkspaceChoice.MERGE.value == "merge"
-
-    def test_review_choice(self):
-        """REVIEW choice value is correct."""
-        assert WorkspaceChoice.REVIEW.value == "review"
-
-    def test_test_choice(self):
-        """TEST choice value is correct."""
-        assert WorkspaceChoice.TEST.value == "test"
-
-    def test_later_choice(self):
-        """LATER choice value is correct."""
-        assert WorkspaceChoice.LATER.value == "later"
-
-
-class TestHasUncommittedChanges:
-    """Tests for uncommitted changes detection."""
-
-    def test_clean_repo_no_changes(self, temp_git_repo: Path):
-        """Clean repo returns False."""
-        result = has_uncommitted_changes(temp_git_repo)
-        assert result is False
-
-    def test_untracked_file_has_changes(self, temp_git_repo: Path):
-        """Untracked file counts as changes."""
-        (temp_git_repo / "new_file.txt").write_text("content")
-
-        result = has_uncommitted_changes(temp_git_repo)
-        assert result is True
-
-    def test_modified_file_has_changes(self, temp_git_repo: Path):
-        """Modified tracked file counts as changes."""
-        (temp_git_repo / "README.md").write_text("modified content")
-
-        result = has_uncommitted_changes(temp_git_repo)
-        assert result is True
-
-    def test_staged_file_has_changes(self, temp_git_repo: Path):
-        """Staged file counts as changes."""
-        (temp_git_repo / "README.md").write_text("modified")
-        subprocess.run(["git", "add", "README.md"], cwd=temp_git_repo, capture_output=True)
-
-        result = has_uncommitted_changes(temp_git_repo)
-        assert result is True
-
-
-class TestGetCurrentBranch:
-    """Tests for current branch detection."""
-
-    def test_gets_main_branch(self, temp_git_repo: Path):
-        """Gets the main/master branch."""
-        branch = get_current_branch(temp_git_repo)
-
-        # Could be main or master depending on git config
-        assert branch in ["main", "master"]
-
-    def test_gets_feature_branch(self, temp_git_repo: Path):
-        """Gets feature branch name."""
-        subprocess.run(
-            ["git", "checkout", "-b", "feature/test-branch"],
-            cwd=temp_git_repo, capture_output=True
-        )
-
-        branch = get_current_branch(temp_git_repo)
-        assert branch == "feature/test-branch"
-
-
-class TestGetExistingBuildWorktree:
-    """Tests for existing build worktree detection."""
-
-    def test_no_existing_worktree(self, temp_git_repo: Path):
-        """Returns None when no worktree exists."""
-        result = get_existing_build_worktree(temp_git_repo, "test-spec")
-        assert result is None
-
-    def test_existing_worktree(self, temp_git_repo: Path):
-        """Returns path when worktree exists."""
-        # Create the worktree directory structure (per-spec architecture)
-        worktree_path = temp_git_repo / ".worktrees" / TEST_SPEC_NAME
-        worktree_path.mkdir(parents=True)
-
-        result = get_existing_build_worktree(temp_git_repo, TEST_SPEC_NAME)
-        assert result == worktree_path
-
-
-class TestSetupWorkspace:
-    """Tests for workspace setup."""
-
-    def test_setup_direct_mode(self, temp_git_repo: Path):
-        """Direct mode returns project dir and no manager."""
-        working_dir, manager, _ = setup_workspace(
-            temp_git_repo,
-            "test-spec",
-            WorkspaceMode.DIRECT,
-        )
-
-        assert working_dir == temp_git_repo
-        assert manager is None
-
-    def test_setup_isolated_mode(self, temp_git_repo: Path):
-        """Isolated mode creates worktree and returns manager."""
-        working_dir, manager, _ = setup_workspace(
-            temp_git_repo,
-            TEST_SPEC_NAME,
-            WorkspaceMode.ISOLATED,
-        )
-
-        assert working_dir != temp_git_repo
-        assert manager is not None
-        assert working_dir.exists()
-        # Per-spec architecture: worktree is named after the spec
-        assert working_dir.name == TEST_SPEC_NAME
-
-    def test_setup_isolated_creates_worktrees_dir(self, temp_git_repo: Path):
-        """Isolated mode creates worktrees directory."""
-        setup_workspace(
-            temp_git_repo,
-            "test-spec",
-            WorkspaceMode.ISOLATED,
-        )
-
-        assert (temp_git_repo / ".auto-claude" / "worktrees" / "tasks").exists()
-
-
-class TestWorkspaceUtilities:
-    """Tests for workspace utility functions."""
-
-    def test_per_spec_worktree_naming(self, temp_git_repo: Path):
-        """Per-spec architecture uses spec name for worktree directory."""
-        spec_name = "my-spec-001"
-        working_dir, manager, _ = setup_workspace(
-            temp_git_repo,
-            spec_name,
-            WorkspaceMode.ISOLATED,
-        )
-
-        # Worktree should be named after the spec
-        assert working_dir.name == spec_name
-        # New path: .auto-claude/worktrees/tasks/{spec_name}
-        assert working_dir.parent.name == "tasks"
-
-
-class TestWorkspaceIntegration:
-    """Integration tests for workspace management."""
-
-    def test_isolated_workflow(self, temp_git_repo: Path):
-        """Full isolated workflow: setup -> work -> finalize."""
-        # Setup isolated workspace
-        working_dir, manager, _ = setup_workspace(
-            temp_git_repo,
-            "test-spec",
-            WorkspaceMode.ISOLATED,
-        )
-
-        # Make changes in workspace
-        (working_dir / "feature.py").write_text("# New feature\n")
-
-        # Verify changes are in workspace
-        assert (working_dir / "feature.py").exists()
-
-        # Verify changes are NOT in main project
-        assert not (temp_git_repo / "feature.py").exists()
-
-    def test_direct_workflow(self, temp_git_repo: Path):
-        """Full direct workflow: setup -> work."""
-        # Setup direct workspace
-        working_dir, manager, _ = setup_workspace(
-            temp_git_repo,
-            "test-spec",
-            WorkspaceMode.DIRECT,
-        )
-
-        # Working dir is the project dir
-        assert working_dir == temp_git_repo
-
-        # Make changes directly
-        (working_dir / "feature.py").write_text("# New feature\n")
-
-        # Changes are in main project
-        assert (temp_git_repo / "feature.py").exists()
-
-    def test_isolated_merge(self, temp_git_repo: Path):
-        """Can merge isolated workspace back to main."""
-        # Setup
-        working_dir, manager, _ = setup_workspace(
-            temp_git_repo,
-            "test-spec",
-            WorkspaceMode.ISOLATED,
-        )
-
-        # Make changes and commit using git directly
-        (working_dir / "feature.py").write_text("# New feature\n")
-        subprocess.run(["git", "add", "."], cwd=working_dir, capture_output=True)
-        subprocess.run(
-            ["git", "commit", "-m", "Add feature"],
-            cwd=working_dir, capture_output=True
-        )
-
-        # Merge back using merge_worktree
-        result = manager.merge_worktree("test-spec", delete_after=False)
-
-        assert result is True
-
-        # Check changes are in main
-        subprocess.run(
-            ["git", "checkout", manager.base_branch],
-            cwd=temp_git_repo, capture_output=True
-        )
-        assert (temp_git_repo / "feature.py").exists()
-
-
-class TestWorkspaceCleanup:
-    """Tests for workspace cleanup."""
-
-    def test_cleanup_after_merge(self, temp_git_repo: Path):
-        """Workspace is cleaned up after merge with delete_after=True."""
-        working_dir, manager, _ = setup_workspace(
-            temp_git_repo,
-            "test-spec",
-            WorkspaceMode.ISOLATED,
-        )
-
-        # Commit changes using git directly
-        (working_dir / "test.py").write_text("test")
-        subprocess.run(["git", "add", "."], cwd=working_dir, capture_output=True)
-        subprocess.run(
-            ["git", "commit", "-m", "Test"],
-            cwd=working_dir, capture_output=True
-        )
-
-        # Merge with cleanup
-        manager.merge_worktree("test-spec", delete_after=True)
-
-        # Workspace should be removed
-        assert not working_dir.exists()
-
-    def test_workspace_preserved_after_merge_no_delete(self, temp_git_repo: Path):
-        """Workspace preserved after merge with delete_after=False."""
-        working_dir, manager, _ = setup_workspace(
-            temp_git_repo,
-            "test-spec",
-            WorkspaceMode.ISOLATED,
-        )
-
-        # Commit changes using git directly
-        (working_dir / "test.py").write_text("test")
-        subprocess.run(["git", "add", "."], cwd=working_dir, capture_output=True)
-        subprocess.run(
-            ["git", "commit", "-m", "Test"],
-            cwd=working_dir, capture_output=True
-        )
-
-        # Merge without cleanup
-        manager.merge_worktree("test-spec", delete_after=False)
-
-        # Workspace should still exist
-        assert working_dir.exists()
-
-
-class TestWorkspaceReuse:
-    """Tests for reusing existing workspaces."""
-
-    def test_reuse_existing_workspace(self, temp_git_repo: Path):
-        """Can reuse existing workspace on second setup."""
-        # First setup
-        working_dir1, manager1, _ = setup_workspace(
-            temp_git_repo,
-            "test-spec",
-            WorkspaceMode.ISOLATED,
-        )
-
-        # Add a marker file
-        (working_dir1 / "marker.txt").write_text("marker")
-
-        # Second setup (should reuse)
-        working_dir2, manager2, _ = setup_workspace(
-            temp_git_repo,
-            "test-spec",
-            WorkspaceMode.ISOLATED,
-        )
-
-        # Should be the same directory
-        assert working_dir1 == working_dir2
-
-        # Marker should still exist
-        assert (working_dir2 / "marker.txt").exists()
-
-
-class TestWorkspaceErrors:
-    """Tests for workspace error handling."""
-
-    def test_setup_non_git_directory(self, temp_dir: Path):
-        """Handles non-git directories gracefully."""
-        with pytest.raises(Exception):
-            # This should fail because temp_dir is not a git repo
-            setup_workspace(
-                temp_dir,
-                "test-spec",
-                WorkspaceMode.ISOLATED,
-            )
-
-
-class TestPerSpecWorktreeName:
-    """Tests for per-spec worktree naming (new architecture)."""
-
-    def test_worktree_named_after_spec(self, temp_git_repo: Path):
-        """Worktree is named after the spec."""
-        spec_name = "spec-1"
-        working_dir, _, _ = setup_workspace(
-            temp_git_repo,
-            spec_name,
-            WorkspaceMode.ISOLATED,
-        )
-
-        # Per-spec architecture: worktree directory matches spec name
-        assert working_dir.name == spec_name
-
-    def test_different_specs_get_different_worktrees(self, temp_git_repo: Path):
-        """Different specs create separate worktrees."""
-        working_dir1, _, _ = setup_workspace(
-            temp_git_repo,
-            "spec-1",
-            WorkspaceMode.ISOLATED,
-        )
-
-        working_dir2, _, _ = setup_workspace(
-            temp_git_repo,
-            "spec-2",
-            WorkspaceMode.ISOLATED,
-        )
-
-        # Each spec has its own worktree
-        assert working_dir1.name == "spec-1"
-        assert working_dir2.name == "spec-2"
-        assert working_dir1 != working_dir2
-
-    def test_worktree_path_in_worktrees_dir(self, temp_git_repo: Path):
-        """Worktree is created in worktrees directory."""
-        working_dir, _, _ = setup_workspace(
-            temp_git_repo,
-            "test-spec",
-            WorkspaceMode.ISOLATED,
-        )
-
-        # New path: .auto-claude/worktrees/tasks/{spec_name}
-        assert "worktrees" in str(working_dir)
-        assert working_dir.parent.name == "tasks"
-
-
-class TestConflictInfoDisplay:
-    """Tests for conflict info display function (ACS-179)."""
-
-    def test_print_conflict_info_with_string_list(self, capsys):
-        """print_conflict_info handles string list of file paths (ACS-179)."""
-        from core.workspace.display import print_conflict_info
-
-        result = {
-            "conflicts": ["file1.txt", "file2.py", "file3.js"]
-        }
-
-        print_conflict_info(result)
-
-        captured = capsys.readouterr()
-        assert "3 file" in captured.out
-        assert "file1.txt" in captured.out
-        assert "file2.py" in captured.out
-        assert "file3.js" in captured.out
-        assert "git add" in captured.out
-
-    def test_print_conflict_info_with_dict_list(self, capsys):
-        """print_conflict_info handles dict list with file/reason/severity (ACS-179)."""
-        from core.workspace.display import print_conflict_info
-
-        result = {
-            "conflicts": [
-                {"file": "file1.txt", "reason": "Syntax error", "severity": "high"},
-                {"file": "file2.py", "reason": "Merge conflict", "severity": "medium"},
-                {"file": "file3.js", "reason": "Unknown error", "severity": "low"},
-            ]
-        }
-
-        print_conflict_info(result)
-
-        captured = capsys.readouterr()
-        assert "3 file" in captured.out
-        assert "file1.txt" in captured.out
-        assert "file2.py" in captured.out
-        assert "file3.js" in captured.out
-        assert "Syntax error" in captured.out
-        assert "Merge conflict" in captured.out
-        # Verify severity emoji indicators
-        assert "🔴" in captured.out  # High severity
-        assert "🟡" in captured.out  # Medium severity
-
-    def test_print_conflict_info_mixed_formats(self, capsys):
-        """print_conflict_info handles mixed string and dict conflicts (ACS-179)."""
-        from core.workspace.display import print_conflict_info
-
-        result = {
-            "conflicts": [
-                "simple-file.txt",
-                {"file": "complex-file.py", "reason": "AI merge failed", "severity": "high"},
-            ]
-        }
-
-        print_conflict_info(result)
-
-        captured = capsys.readouterr()
-        assert "2 file" in captured.out
-        assert "simple-file.txt" in captured.out
-        assert "complex-file.py" in captured.out
-        assert "AI merge failed" in captured.out
-
-
-class TestMergeErrorHandling:
-    """Tests for merge error handling (ACS-163)."""
-
-    def test_merge_failure_returns_false_immediately(self, temp_git_repo: Path):
-        """Failed merge returns False without falling through (ACS-163)."""
-        manager = WorktreeManager(temp_git_repo)
-        manager.setup()
-
-        # Create a worktree with changes
-        worker_info = manager.create_worktree("worker-spec")
-        (worker_info.path / "worker-file.txt").write_text("worker content")
-        subprocess.run(["git", "add", "."], cwd=worker_info.path, capture_output=True)
-        subprocess.run(
-            ["git", "commit", "-m", "Worker commit"],
-            cwd=worker_info.path, capture_output=True
-        )
-
-        # Create a conflicting change on main
-        subprocess.run(["git", "checkout", manager.base_branch], cwd=temp_git_repo, capture_output=True)
-        (temp_git_repo / "worker-file.txt").write_text("main content")
-        subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
-        subprocess.run(
-            ["git", "commit", "-m", "Main commit"],
-            cwd=temp_git_repo, capture_output=True
-        )
-
-        # Merge should fail (conflict) and return False
-        # This tests the fix for ACS-163 where failed merge would fall through
-        result = manager.merge_worktree("worker-spec", delete_after=False)
-
-        # Should return False on merge conflict
-        assert result is False
-
-        # Verify side effects: base branch content is unchanged
-        subprocess.run(["git", "checkout", manager.base_branch], cwd=temp_git_repo, capture_output=True)
-        base_content = (temp_git_repo / "worker-file.txt").read_text()
-        assert base_content == "main content", "Base branch should be unchanged after failed merge"
-
-        # Verify worktree still exists (delete_after=False)
-        assert worker_info.path.exists(), "Worktree should still exist after failed merge"
-
-        # Verify worktree content is unchanged
-        worktree_content = (worker_info.path / "worker-file.txt").read_text()
-        assert worktree_content == "worker content", "Worktree content should be unchanged"
-
-    def test_merge_success_returns_true(self, temp_git_repo: Path):
-        """Successful merge returns True (ACS-163 verification)."""
-        manager = WorktreeManager(temp_git_repo)
-        manager.setup()
-
-        # Create a worktree with non-conflicting changes
-        worker_info = manager.create_worktree("worker-spec")
-        (worker_info.path / "worker-file.txt").write_text("worker content")
-        subprocess.run(["git", "add", "."], cwd=worker_info.path, capture_output=True)
-        subprocess.run(
-            ["git", "commit", "-m", "Worker commit"],
-            cwd=worker_info.path, capture_output=True
-        )
-
-        # Merge should succeed
-        result = manager.merge_worktree("worker-spec", delete_after=False)
-
-        assert result is True
-
-        # Verify the file was merged into base branch
-        subprocess.run(["git", "checkout", manager.base_branch], cwd=temp_git_repo, capture_output=True)
-        assert (temp_git_repo / "worker-file.txt").exists(), "Merged file should exist in base branch"
-        merged_content = (temp_git_repo / "worker-file.txt").read_text()
-        assert merged_content == "worker content", "Merged file should have worktree content"
-
-
 class TestRebaseDetection:
-    """Tests for automatic rebase detection (ACS-224)."""
-
     def test_check_git_conflicts_detects_branch_behind(self, temp_git_repo: Path):
         """_check_git_conflicts detects when spec branch is behind base branch (ACS-224)."""
         from core.workspace import _check_git_conflicts
@@ -547,7 +39,7 @@ class TestRebaseDetection:
         )
 
         # Add a commit to spec branch
-        (temp_git_repo / "spec-file.txt").write_text("spec content")
+        (temp_git_repo / "spec-file.txt").write_text("spec content", encoding="utf-8")
         subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
         subprocess.run(
             ["git", "commit", "-m", "Spec commit"],
@@ -561,7 +53,7 @@ class TestRebaseDetection:
             cwd=temp_git_repo,
             capture_output=True,
         )
-        (temp_git_repo / "main-file.txt").write_text("main content")
+        (temp_git_repo / "main-file.txt").write_text("main content", encoding="utf-8")
         subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
         subprocess.run(
             ["git", "commit", "-m", "Main commit after spec"],
@@ -574,7 +66,9 @@ class TestRebaseDetection:
 
         assert result is not None
         assert result.get("needs_rebase") is True, "Should detect branch is behind"
-        assert result.get("commits_behind") == 1, "Should count commits behind correctly"
+        assert result.get("commits_behind") == 1, (
+            "Should count commits behind correctly"
+        )
         assert result.get("spec_branch") == spec_branch
 
     def test_check_git_conflicts_no_commits_behind(self, temp_git_repo: Path):
@@ -588,7 +82,7 @@ class TestRebaseDetection:
             cwd=temp_git_repo,
             capture_output=True,
         )
-        (temp_git_repo / "spec-file.txt").write_text("spec content")
+        (temp_git_repo / "spec-file.txt").write_text("spec content", encoding="utf-8")
         subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
         subprocess.run(
             ["git", "commit", "-m", "Spec commit"],
@@ -624,7 +118,7 @@ class TestRebaseDetection:
         )
 
         # Add a commit to spec branch
-        (temp_git_repo / "spec-file.txt").write_text("spec content")
+        (temp_git_repo / "spec-file.txt").write_text("spec content", encoding="utf-8")
         subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
         subprocess.run(
             ["git", "commit", "-m", "Spec commit"],
@@ -639,7 +133,9 @@ class TestRebaseDetection:
             capture_output=True,
         )
         for i in range(3):
-            (temp_git_repo / f"main-file-{i}.txt").write_text(f"main content {i}")
+            (temp_git_repo / f"main-file-{i}.txt").write_text(
+                f"main content {i}", encoding="utf-8"
+            )
             subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
             subprocess.run(
                 ["git", "commit", "-m", f"Main commit {i}"],
@@ -671,7 +167,7 @@ class TestRebaseSpecBranch:
         )
 
         # Add a commit to spec branch
-        (temp_git_repo / "spec-file.txt").write_text("spec content")
+        (temp_git_repo / "spec-file.txt").write_text("spec content", encoding="utf-8")
         subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
         subprocess.run(
             ["git", "commit", "-m", "Spec commit"],
@@ -685,7 +181,7 @@ class TestRebaseSpecBranch:
             cwd=temp_git_repo,
             capture_output=True,
         )
-        (temp_git_repo / "main-file.txt").write_text("main content")
+        (temp_git_repo / "main-file.txt").write_text("main content", encoding="utf-8")
         subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
         subprocess.run(
             ["git", "commit", "-m", "Main commit"],
@@ -726,7 +222,9 @@ class TestRebaseSpecBranch:
         ).stdout
         assert "Main commit" in log, "Spec branch should have main commit after rebase"
 
-    def test_rebase_spec_branch_with_conflicts_aborts_cleanly(self, temp_git_repo: Path):
+    def test_rebase_spec_branch_with_conflicts_aborts_cleanly(
+        self, temp_git_repo: Path
+    ):
         """_rebase_spec_branch handles conflicts by aborting and returning False (ACS-224)."""
         from core.workspace import _rebase_spec_branch
 
@@ -739,7 +237,7 @@ class TestRebaseSpecBranch:
         )
 
         # Create a file that will conflict
-        (temp_git_repo / "conflict.txt").write_text("spec version")
+        (temp_git_repo / "conflict.txt").write_text("spec version", encoding="utf-8")
         subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
         subprocess.run(
             ["git", "commit", "-m", "Spec conflict"],
@@ -753,7 +251,7 @@ class TestRebaseSpecBranch:
             cwd=temp_git_repo,
             capture_output=True,
         )
-        (temp_git_repo / "conflict.txt").write_text("main version")
+        (temp_git_repo / "conflict.txt").write_text("main version", encoding="utf-8")
         subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
         subprocess.run(
             ["git", "commit", "-m", "Main conflict"],
@@ -823,7 +321,7 @@ class TestRebaseSpecBranch:
             cwd=temp_git_repo,
             capture_output=True,
         )
-        (temp_git_repo / "spec-file.txt").write_text("spec content")
+        (temp_git_repo / "spec-file.txt").write_text("spec content", encoding="utf-8")
         subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
         subprocess.run(
             ["git", "commit", "-m", "Spec commit"],
@@ -842,7 +340,9 @@ class TestRebaseSpecBranch:
         # (branch already up-to-date is a success condition)
         result = _rebase_spec_branch(temp_git_repo, "test-spec", "main")
 
-        assert result is True, "Rebase should return True when branch is already up-to-date"
+        assert result is True, (
+            "Rebase should return True when branch is already up-to-date"
+        )
 
 
 class TestRebaseIntegration:
@@ -859,7 +359,9 @@ class TestRebaseIntegration:
         worker_info = manager.create_worktree("test-spec")
 
         # Add a file in spec worktree and commit
-        (worker_info.path / "spec-file.txt").write_text("spec content")
+        (worker_info.path / "spec-file.txt").write_text(
+            "spec content", encoding="utf-8"
+        )
         subprocess.run(["git", "add", "."], cwd=worker_info.path, capture_output=True)
         subprocess.run(
             ["git", "commit", "-m", "Spec commit"],
@@ -874,7 +376,7 @@ class TestRebaseIntegration:
             capture_output=True,
         )
         for i in range(2):
-            (temp_git_repo / f"main-{i}.txt").write_text(f"main {i}")
+            (temp_git_repo / f"main-{i}.txt").write_text(f"main {i}", encoding="utf-8")
             subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
             subprocess.run(
                 ["git", "commit", "-m", f"Main {i}"],
@@ -906,7 +408,7 @@ class TestRebaseIntegration:
         )
 
         # Add a commit to spec
-        (temp_git_repo / "spec.txt").write_text("spec")
+        (temp_git_repo / "spec.txt").write_text("spec", encoding="utf-8")
         subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
         subprocess.run(
             ["git", "commit", "-m", "Spec"],
@@ -920,7 +422,7 @@ class TestRebaseIntegration:
             cwd=temp_git_repo,
             capture_output=True,
         )
-        (temp_git_repo / "main.txt").write_text("main")
+        (temp_git_repo / "main.txt").write_text("main", encoding="utf-8")
         subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
         subprocess.run(
             ["git", "commit", "-m", "Main"],
@@ -966,7 +468,7 @@ class TestRebaseErrorHandling:
             cwd=temp_git_repo,
             capture_output=True,
         )
-        (temp_git_repo / "spec-file.txt").write_text("spec content")
+        (temp_git_repo / "spec-file.txt").write_text("spec content", encoding="utf-8")
         subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
         subprocess.run(
             ["git", "commit", "-m", "Spec commit"],
@@ -1007,7 +509,6 @@ class TestRebaseErrorHandling:
 
     def test_check_git_conflicts_handles_corrupted_repo(self, temp_git_repo: Path):
         """_check_git_conflicts handles corrupted repo metadata gracefully (ACS-224)."""
-        import shutil
 
         from core.workspace import _check_git_conflicts
 
@@ -1018,7 +519,7 @@ class TestRebaseErrorHandling:
             cwd=temp_git_repo,
             capture_output=True,
         )
-        (temp_git_repo / "spec-file.txt").write_text("spec content")
+        (temp_git_repo / "spec-file.txt").write_text("spec content", encoding="utf-8")
         subprocess.run(["git", "add", "."], cwd=temp_git_repo, capture_output=True)
         subprocess.run(
             ["git", "commit", "-m", "Spec commit"],

apps/backend/core/workspace/tests/test_setup.py

@@ -0,0 +1,293 @@
+#!/usr/bin/env python3
+"""
+Tests for Workspace Setup Operations
+=====================================
+
+Tests the setup functionality including:
+- Spec copy to workspace operations
+- Timeline hook installation
+- Timeline tracking initialization
+"""
+
+import json
+import os
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+
+import pytest
+
+# Test constant - in the new per-spec architecture, each spec has its own worktree
+# named after the spec itself. This constant is used for test assertions.
+TEST_SPEC_NAME = "test-spec"
+
+
+class TestCopySpecToWorktree:
+    """Tests for copy_spec_to_worktree function."""
+
+    def test_copies_spec_files_to_worktree(self, temp_git_repo: Path):
+        """Copies spec directory to worktree .auto-claude/specs/ location."""
+        from core.workspace.setup import copy_spec_to_worktree
+
+        # Create source spec directory
+        source_spec = temp_git_repo / "specs" / "test-spec"
+        source_spec.mkdir(parents=True)
+        (source_spec / "spec.md").write_text("# Test Spec", encoding="utf-8")
+        (source_spec / "requirements.json").write_text("{}", encoding="utf-8")
+
+        # Create worktree
+        worktree_path = (
+            temp_git_repo / ".auto-claude" / "worktrees" / "tasks" / "test-spec"
+        )
+        worktree_path.mkdir(parents=True)
+
+        # Copy spec
+        result = copy_spec_to_worktree(source_spec, worktree_path, "test-spec")
+
+        # Verify path is correct
+        expected = worktree_path / ".auto-claude" / "specs" / "test-spec"
+        assert result == expected
+
+        # Verify files were copied
+        assert (expected / "spec.md").exists()
+        assert (expected / "requirements.json").exists()
+        assert (expected / "spec.md").read_text(encoding="utf-8") == "# Test Spec"
+
+    def test_overwrites_existing_spec_in_worktree(self, temp_git_repo: Path):
+        """Overwrites spec files if they already exist in worktree."""
+        from core.workspace.setup import copy_spec_to_worktree
+
+        # Create source spec
+        source_spec = temp_git_repo / "specs" / "test-spec"
+        source_spec.mkdir(parents=True)
+        (source_spec / "spec.md").write_text("# New Spec", encoding="utf-8")
+
+        # Create worktree with existing spec
+        worktree_path = (
+            temp_git_repo / ".auto-claude" / "worktrees" / "tasks" / "test-spec"
+        )
+        worktree_path.mkdir(parents=True)
+        existing_spec = worktree_path / ".auto-claude" / "specs" / "test-spec"
+        existing_spec.mkdir(parents=True)
+        (existing_spec / "spec.md").write_text("# Old Spec", encoding="utf-8")
+
+        # Copy spec
+        result = copy_spec_to_worktree(source_spec, worktree_path, "test-spec")
+
+        # Verify new content was copied
+        assert (result / "spec.md").read_text(encoding="utf-8") == "# New Spec"
+
+    def test_creates_parent_directories(self, temp_git_repo: Path):
+        """Creates .auto-claude/specs directory if it doesn't exist."""
+        from core.workspace.setup import copy_spec_to_worktree
+
+        source_spec = temp_git_repo / "specs" / "test-spec"
+        source_spec.mkdir(parents=True)
+        (source_spec / "spec.md").write_text("# Test", encoding="utf-8")
+
+        worktree_path = (
+            temp_git_repo / ".auto-claude" / "worktrees" / "tasks" / "test-spec"
+        )
+        worktree_path.mkdir(parents=True)
+
+        result = copy_spec_to_worktree(source_spec, worktree_path, "test-spec")
+
+        # Parent directories should be created
+        assert result.exists()
+        assert (result.parent).exists()
+
+
+class TestEnsureTimelineHookInstalled:
+    """Tests for ensure_timeline_hook_installed function."""
+
+    def test_skips_if_not_git_repo(self, temp_dir: Path):
+        """Skips hook installation if directory is not a git repo."""
+        from core.workspace.setup import ensure_timeline_hook_installed
+
+        # Should not raise exception
+        ensure_timeline_hook_installed(temp_dir)
+
+    def test_skips_if_hook_already_installed(self, temp_git_repo: Path, monkeypatch):
+        """Skips if FileTimelineTracker hook is already installed."""
+        from core.workspace.setup import ensure_timeline_hook_installed
+
+        # Create hooks directory
+        hooks_dir = temp_git_repo / ".git" / "hooks"
+        hooks_dir.mkdir(parents=True, exist_ok=True)
+
+        # Create hook with FileTimelineTracker marker
+        hook_file = hooks_dir / "post-commit"
+        hook_file.write_text(
+            "#!/bin/sh\n# FileTimelineTracker hook\necho 'tracked'", encoding="utf-8"
+        )
+
+        # Mock install_hook to track if it was called
+        install_called = []
+
+        def mock_install_hook(project_dir):
+            install_called.append(True)
+
+        monkeypatch.setattr("merge.install_hook.install_hook", mock_install_hook)
+
+        ensure_timeline_hook_installed(temp_git_repo)
+
+        # install_hook should not be called
+        assert len(install_called) == 0
+
+    def test_installs_hook_if_missing(self, temp_git_repo: Path):
+        """Installs hook if it doesn't exist."""
+        from core.workspace.setup import ensure_timeline_hook_installed
+
+        # Create hooks directory but no hook file
+        hooks_dir = temp_git_repo / ".git" / "hooks"
+        hooks_dir.mkdir(parents=True, exist_ok=True)
+
+        # This test verifies the function runs without error
+        # The actual install_hook call is hard to mock because it's imported locally
+        # In production, the real install_hook would be called
+        ensure_timeline_hook_installed(temp_git_repo)
+
+        # Verify hooks directory exists (function ran)
+        assert hooks_dir.exists()
+
+
+class TestInitializeTimelineTracking:
+    """Tests for initialize_timeline_tracking function."""
+
+    def test_with_implementation_plan(self, temp_git_repo: Path, monkeypatch):
+        """Initializes tracking with files from implementation plan."""
+        from core.workspace.setup import initialize_timeline_tracking
+
+        # Create source spec with implementation plan
+        spec_name = "test-spec"
+        source_spec = temp_git_repo / ".auto-claude" / "specs" / spec_name
+        source_spec.mkdir(parents=True)
+
+        plan = {
+            "title": "Test Feature",
+            "description": "Test description",
+            "phases": [
+                {
+                    "subtasks": [
+                        {"files": ["app/main.py", "app/utils.py"]},
+                        {"files": ["tests/test_main.py"]},
+                    ]
+                }
+            ],
+        }
+        (source_spec / "implementation_plan.json").write_text(
+            json.dumps(plan), encoding="utf-8"
+        )
+
+        # Create worktree
+        worktree_path = (
+            temp_git_repo / ".auto-claude" / "worktrees" / "tasks" / spec_name
+        )
+        worktree_path.mkdir(parents=True)
+
+        # Mock FileTimelineTracker
+        mock_tracker_calls = []
+
+        class MockTracker:
+            def __init__(self, project_dir):
+                pass
+
+            def on_task_start(
+                self,
+                task_id,
+                files_to_modify,
+                branch_point_commit,
+                task_intent,
+                task_title,
+            ):
+                mock_tracker_calls.append(
+                    {
+                        "task_id": task_id,
+                        "files": files_to_modify,
+                        "branch": branch_point_commit,
+                        "intent": task_intent,
+                        "title": task_title,
+                    }
+                )
+
+        monkeypatch.setattr("core.workspace.setup.FileTimelineTracker", MockTracker)
+
+        initialize_timeline_tracking(
+            temp_git_repo, spec_name, worktree_path, source_spec
+        )
+
+        # Verify tracker was called with correct parameters
+        assert len(mock_tracker_calls) == 1
+        call = mock_tracker_calls[0]
+        assert call["task_id"] == spec_name
+        assert set(call["files"]) == {
+            "app/main.py",
+            "app/utils.py",
+            "tests/test_main.py",
+        }
+        assert call["title"] == "Test Feature"
+        assert call["intent"] == "Test description"
+
+    def test_without_implementation_plan(self, temp_git_repo: Path, monkeypatch):
+        """Initializes tracking retroactively from worktree if no plan."""
+        from core.workspace.setup import initialize_timeline_tracking
+
+        spec_name = "test-spec"
+        worktree_path = (
+            temp_git_repo / ".auto-claude" / "worktrees" / "tasks" / spec_name
+        )
+        worktree_path.mkdir(parents=True)
+
+        # Mock FileTimelineTracker
+        mock_calls = []
+
+        class MockTracker:
+            def __init__(self, project_dir):
+                pass
+
+            def initialize_from_worktree(
+                self, task_id, worktree_path, task_intent, task_title
+            ):
+                mock_calls.append(
+                    {
+                        "task_id": task_id,
+                        "worktree": worktree_path,
+                        "intent": task_intent,
+                        "title": task_title,
+                    }
+                )
+
+        monkeypatch.setattr("core.workspace.setup.FileTimelineTracker", MockTracker)
+
+        initialize_timeline_tracking(temp_git_repo, spec_name, worktree_path, None)
+
+        # Should use retroactive initialization
+        assert len(mock_calls) == 1
+        assert mock_calls[0]["task_id"] == spec_name
+
+    def test_handles_exception_gracefully(
+        self, temp_git_repo: Path, monkeypatch, capsys
+    ):
+        """Logs warning but doesn't raise exception on error."""
+        from core.workspace.setup import initialize_timeline_tracking
+
+        spec_name = "test-spec"
+        worktree_path = (
+            temp_git_repo / ".auto-claude" / "worktrees" / "tasks" / spec_name
+        )
+        worktree_path.mkdir(parents=True)
+
+        # Mock FileTimelineTracker to raise exception
+        class FailingTracker:
+            def __init__(self, project_dir):
+                raise Exception("Tracker init failed")
+
+        monkeypatch.setattr("core.workspace.setup.FileTimelineTracker", FailingTracker)
+
+        # Should not raise
+        initialize_timeline_tracking(temp_git_repo, spec_name, worktree_path, None)
+
+        # Should print warning
+        captured = capsys.readouterr()
+        assert "Timeline tracking" in captured.out or "Note:" in captured.out

apps/backend/core/worktree.py

@@ -15,6 +15,8 @@ This allows:
 """
 
 import asyncio
+import json
+import logging
 import os
 import re
 import shutil
@@ -28,8 +30,13 @@ from typing import TypedDict, TypeVar
 
 from core.gh_executable import get_gh_executable, invalidate_gh_cache
 from core.git_executable import get_git_executable, get_isolated_git_env, run_git
+from core.git_provider import detect_git_provider
+from core.glab_executable import get_glab_executable, invalidate_glab_cache
+from core.model_config import get_utility_model_config
 from debug import debug_warning
 
+logger = logging.getLogger(__name__)
+
 T = TypeVar("T")
 
 
@@ -136,6 +143,7 @@ class PushAndCreatePRResult(TypedDict, total=False):
     pushed: bool
     remote: str
     branch: str
+    provider: str  # 'github', 'gitlab', or 'unknown'
     pr_url: str | None  # None when PR was created but URL couldn't be extracted
     already_exists: bool
     error: str
@@ -175,12 +183,18 @@ class WorktreeManager:
 
     # Timeout constants for subprocess operations
     GIT_PUSH_TIMEOUT = 120  # 2 minutes for git push (network operations)
-    GH_CLI_TIMEOUT = 60  # 1 minute for gh CLI commands
-    GH_QUERY_TIMEOUT = 30  # 30 seconds for gh CLI queries
+    CLI_TIMEOUT = 60  # 1 minute for CLI commands (gh/glab)
+    CLI_QUERY_TIMEOUT = 30  # 30 seconds for CLI queries (gh/glab)
 
-    def __init__(self, project_dir: Path, base_branch: str | None = None):
+    def __init__(
+        self,
+        project_dir: Path,
+        base_branch: str | None = None,
+        use_local_branch: bool = False,
+    ):
         self.project_dir = project_dir
         self.base_branch = base_branch or self._detect_base_branch()
+        self.use_local_branch = use_local_branch
         self.worktrees_dir = project_dir / ".auto-claude" / "worktrees" / "tasks"
         self._merge_lock = asyncio.Lock()
 
@@ -416,6 +430,7 @@ class WorktreeManager:
                         if os.path.samefile(resolved_path, current_path):
                             return line[len("branch refs/heads/") :]
                 except OSError:
+                    # File system comparison errors are handled by fallback below
                     pass
                 # Fallback to normalized case comparison
                 if os.path.normcase(str(resolved_path)) == os.path.normcase(
@@ -496,6 +511,7 @@ class WorktreeManager:
                     if os.path.samefile(resolved_path, registered_path):
                         return True
             except OSError:
+                # File system errors handled by fallback comparison below
                 pass
             # Fallback to normalized case comparison for non-existent paths
             if os.path.normcase(str(resolved_path)) == os.path.normcase(
@@ -687,18 +703,23 @@ class WorktreeManager:
         else:
             # Branch doesn't exist - create new branch from remote or local base
             # Determine the start point for the worktree
-            remote_ref = f"origin/{self.base_branch}"
             start_point = self.base_branch  # Default to local branch
 
-            # Check if remote ref exists and use it as the source of truth
-            check_remote = self._run_git(["rev-parse", "--verify", remote_ref])
-            if check_remote.returncode == 0:
-                start_point = remote_ref
-                print(f"Creating worktree from remote: {remote_ref}")
+            if self.use_local_branch:
+                # User explicitly requested local branch - skip auto-switch to remote
+                # This preserves gitignored files (.env, configs) that may not exist on remote
+                print(f"Creating worktree from local branch: {self.base_branch}")
             else:
-                print(
-                    f"Remote ref {remote_ref} not found, using local branch: {self.base_branch}"
-                )
+                # Check if remote ref exists and use it as the source of truth
+                remote_ref = f"origin/{self.base_branch}"
+                check_remote = self._run_git(["rev-parse", "--verify", remote_ref])
+                if check_remote.returncode == 0:
+                    start_point = remote_ref
+                    print(f"Creating worktree from remote: {remote_ref}")
+                else:
+                    print(
+                        f"Remote ref {remote_ref} not found, using local branch: {self.base_branch}"
+                    )
 
             # Create worktree with new branch from the start point
             result = self._run_git(
@@ -1190,10 +1211,27 @@ class WorktreeManager:
             )
 
         target = target_branch or self.base_branch
+        # Strip remote prefix (e.g., "origin/feat/x" → "feat/x") since gh expects branch names only
+        if target.startswith("origin/"):
+            target = target[len("origin/") :]
         pr_title = title or f"auto-claude: {spec_name}"
 
-        # Get PR body from spec.md if available
-        pr_body = self._extract_spec_summary(spec_name)
+        # Try AI-powered PR body from project's PR template, fall back to spec summary
+        pr_body: str | None = None
+        try:
+            diff_summary, commit_log = self._gather_pr_context(spec_name, target)
+            pr_body = self._try_ai_pr_body(
+                spec_name=spec_name,
+                target_branch=target,
+                branch_name=info.branch,
+                diff_summary=diff_summary,
+                commit_log=commit_log,
+            )
+        except Exception as e:
+            logger.warning(f"AI PR body generation encountered an error: {e}")
+
+        if not pr_body:
+            pr_body = self._extract_spec_summary(spec_name)
 
         # Find gh executable before attempting PR creation
         gh_executable = get_gh_executable()
@@ -1236,7 +1274,7 @@ class WorktreeManager:
                     text=True,
                     encoding="utf-8",
                     errors="replace",
-                    timeout=self.GH_CLI_TIMEOUT,
+                    timeout=self.CLI_TIMEOUT,
                     env=get_isolated_git_env(),
                 )
 
@@ -1312,9 +1350,331 @@ class WorktreeManager:
             invalidate_gh_cache()
             return PullRequestResult(
                 success=False,
-                error="gh CLI not found. Install from https://cli.github.com/",
+                error="GitHub CLI (gh) not found. Install from https://cli.github.com/",
             )
 
+    def create_merge_request(
+        self,
+        spec_name: str,
+        target_branch: str | None = None,
+        title: str | None = None,
+        draft: bool = False,
+    ) -> PullRequestResult:
+        """
+        Create a GitLab merge request for a spec's branch using glab CLI with retry logic.
+
+        Args:
+            spec_name: The spec folder name
+            target_branch: Target branch for MR (defaults to base_branch)
+            title: MR title (defaults to spec name)
+            draft: Whether to create as draft MR
+
+        Returns:
+            PullRequestResult with keys:
+                - success: bool
+                - pr_url: str (if created)
+                - already_exists: bool (if MR already exists)
+                - error: str (if failed)
+        """
+        info = self.get_worktree_info(spec_name)
+        if not info:
+            return PullRequestResult(
+                success=False,
+                error=f"No worktree found for spec: {spec_name}",
+            )
+
+        target = target_branch or self.base_branch
+        # Strip remote prefix (e.g., "origin/feat/x" → "feat/x") since glab expects branch names only
+        if target.startswith("origin/"):
+            target = target[len("origin/") :]
+        mr_title = title or f"auto-claude: {spec_name}"
+
+        # Get MR body from spec.md if available
+        mr_body = self._extract_spec_summary(spec_name)
+
+        # Find glab executable before attempting MR creation
+        glab_executable = get_glab_executable()
+        if not glab_executable:
+            return PullRequestResult(
+                success=False,
+                error="GitLab CLI (glab) not found. Install from https://gitlab.com/gitlab-org/cli",
+            )
+
+        # Build glab mr create command
+        glab_args = [
+            glab_executable,
+            "mr",
+            "create",
+            "--target-branch",
+            target,
+            "--source-branch",
+            info.branch,
+            "--title",
+            mr_title,
+            "--description",
+            mr_body,
+        ]
+        if draft:
+            glab_args.append("--draft")
+
+        def is_mr_retryable(stderr: str) -> bool:
+            """Check if MR creation error is retryable (network or HTTP 5xx)."""
+            return _is_retryable_network_error(stderr) or _is_retryable_http_error(
+                stderr
+            )
+
+        def do_create_mr() -> tuple[bool, PullRequestResult | None, str]:
+            """Execute MR creation for retry wrapper."""
+            try:
+                result = subprocess.run(
+                    glab_args,
+                    cwd=info.path,
+                    capture_output=True,
+                    text=True,
+                    encoding="utf-8",
+                    errors="replace",
+                    timeout=self.CLI_TIMEOUT,
+                    env=get_isolated_git_env(),
+                )
+
+                # Check for "already exists" case (success, no retry needed)
+                if result.returncode != 0 and "already exists" in result.stderr.lower():
+                    existing_url = self._get_existing_mr_url(spec_name, target)
+                    result_dict = PullRequestResult(
+                        success=True,
+                        pr_url=existing_url,
+                        already_exists=True,
+                    )
+                    if existing_url is None:
+                        result_dict["message"] = (
+                            "MR already exists but URL could not be retrieved"
+                        )
+                    return (True, result_dict, "")
+
+                if result.returncode == 0:
+                    # Extract MR URL from output
+                    mr_url: str | None = result.stdout.strip()
+                    if not mr_url.startswith("http"):
+                        # Try to find URL in output
+                        # GitLab URL pattern: matches any HTTPS URL with /merge_requests/<number> or /-/merge_requests/<number> path
+                        match = re.search(
+                            r"https://[^\s]+(?:/merge_requests/|/-/merge_requests/)\d+",
+                            result.stdout,
+                        )
+                        if match:
+                            mr_url = match.group(0)
+                        else:
+                            # Invalid output - no valid URL found
+                            mr_url = None
+
+                    return (
+                        True,
+                        PullRequestResult(
+                            success=True,
+                            pr_url=mr_url,
+                            already_exists=False,
+                        ),
+                        "",
+                    )
+
+                return (False, None, result.stderr)
+
+            except FileNotFoundError:
+                # glab CLI not installed - not retryable, raise to exit retry loop
+                raise
+
+        max_retries = 3
+        try:
+            result, last_error = _with_retry(
+                operation=do_create_mr,
+                max_retries=max_retries,
+                is_retryable=is_mr_retryable,
+            )
+
+            if result:
+                return result
+
+            # Handle timeout error message
+            if last_error == "Operation timed out":
+                return PullRequestResult(
+                    success=False,
+                    error=f"MR creation timed out after {max_retries} attempts.",
+                )
+
+            return PullRequestResult(
+                success=False,
+                error=f"Failed to create MR: {last_error}",
+            )
+
+        except FileNotFoundError:
+            # Cached glab path became invalid - clear cache so next call re-discovers
+            invalidate_glab_cache()
+            return PullRequestResult(
+                success=False,
+                error="GitLab CLI (glab) not found. Install from https://gitlab.com/gitlab-org/cli",
+            )
+
+    def _gather_pr_context(self, spec_name: str, target_branch: str) -> tuple[str, str]:
+        """
+        Gather diff summary and commit log for PR template filling.
+
+        Args:
+            spec_name: The spec folder name
+            target_branch: The target branch for the PR
+
+        Returns:
+            Tuple of (diff_summary, commit_log)
+        """
+        worktree_path = self.get_worktree_path(spec_name)
+        info = self.get_worktree_info(spec_name)
+        branch = info.branch if info else self.get_branch_name(spec_name)
+
+        # Get diff summary (stat for overview)
+        diff_result = self._run_git(
+            ["diff", "--stat", f"{target_branch}...{branch}"],
+            cwd=worktree_path,
+            timeout=30,
+        )
+        diff_summary = diff_result.stdout.strip() if diff_result.returncode == 0 else ""
+
+        # Get shortstat for quick summary
+        shortstat_result = self._run_git(
+            ["diff", "--shortstat", f"{target_branch}...{branch}"],
+            cwd=worktree_path,
+            timeout=30,
+        )
+        if shortstat_result.returncode == 0 and shortstat_result.stdout.strip():
+            diff_summary += "\n\n" + shortstat_result.stdout.strip()
+
+        # Get actual code changes (patch format) for better AI context
+        # Truncate to 30k chars to avoid token limits while still providing meaningful context
+        patch_result = self._run_git(
+            ["diff", "-p", "--stat-width=999", f"{target_branch}...{branch}"],
+            cwd=worktree_path,
+            timeout=30,
+        )
+        if patch_result.returncode == 0 and patch_result.stdout.strip():
+            patch_content = patch_result.stdout.strip()
+            MAX_DIFF_CHARS = 30_000
+
+            if len(patch_content) > MAX_DIFF_CHARS:
+                # Truncate patch and add notice
+                truncated_patch = patch_content[:MAX_DIFF_CHARS]
+                diff_summary += (
+                    "\n\n" + truncated_patch + "\n\n(... diff truncated due to size)"
+                )
+            else:
+                diff_summary += "\n\n" + patch_content
+
+        # Get commit log
+        log_result = self._run_git(
+            [
+                "log",
+                "--oneline",
+                "--no-merges",
+                f"{target_branch}..{branch}",
+            ],
+            cwd=worktree_path,
+            timeout=30,
+        )
+        commit_log = log_result.stdout.strip() if log_result.returncode == 0 else ""
+
+        return diff_summary, commit_log
+
+    def _try_ai_pr_body(
+        self,
+        spec_name: str,
+        target_branch: str,
+        branch_name: str,
+        diff_summary: str,
+        commit_log: str,
+    ) -> str | None:
+        """
+        Attempt to generate a PR body using the AI template filler agent.
+
+        Runs the async agent synchronously with a 30-second timeout.
+        Returns None on any failure so the caller can fall back gracefully.
+
+        Args:
+            spec_name: The spec folder name
+            target_branch: The target branch for the PR
+            branch_name: The source branch name
+            diff_summary: Git diff summary of changes
+            commit_log: Git log of commits
+
+        Returns:
+            The AI-generated PR body string, or None if unavailable.
+        """
+        try:
+            from agents.pr_template_filler import (
+                detect_pr_template,
+                run_pr_template_filler,
+            )
+        except ImportError:
+            logger.warning(
+                "PR template filler module not available, skipping AI PR body"
+            )
+            return None
+
+        # Check if a PR template exists before doing any heavy lifting
+        template = detect_pr_template(self.project_dir)
+        if template is None:
+            return None
+
+        # Resolve spec directory
+        spec_dir = self.project_dir / ".auto-claude" / "specs" / spec_name
+        if not spec_dir.is_dir():
+            # Try worktree-local spec path
+            worktree_path = self.get_worktree_path(spec_name)
+            spec_dir = worktree_path / ".auto-claude" / "specs" / spec_name
+            if not spec_dir.is_dir():
+                logger.warning("Spec directory not found for AI PR body generation")
+                return None
+
+        # Get model configuration from environment (respects user settings)
+        model, thinking_budget = get_utility_model_config()
+
+        async def _run_with_timeout() -> str | None:
+            try:
+                return await asyncio.wait_for(
+                    run_pr_template_filler(
+                        project_dir=self.project_dir,
+                        spec_dir=spec_dir,
+                        model=model,
+                        thinking_budget=thinking_budget,
+                        branch_name=branch_name,
+                        target_branch=target_branch,
+                        diff_summary=diff_summary,
+                        commit_log=commit_log,
+                        verbose=False,
+                    ),
+                    timeout=30.0,
+                )
+            except asyncio.TimeoutError:
+                logger.warning("PR template filler timed out after 30s")
+                return None
+
+        try:
+            # Check if there's already a running event loop
+            try:
+                loop = asyncio.get_running_loop()
+            except RuntimeError:
+                loop = None
+
+            if loop and loop.is_running():
+                # We're already inside an async context — run in a new thread
+                import concurrent.futures
+
+                with concurrent.futures.ThreadPoolExecutor(max_workers=1) as pool:
+                    future = pool.submit(asyncio.run, _run_with_timeout())
+                    return future.result(timeout=35)
+            else:
+                return asyncio.run(_run_with_timeout())
+
+        except Exception as e:
+            logger.warning(f"AI PR body generation failed: {e}")
+            return None
+
     def _extract_spec_summary(self, spec_name: str) -> str:
         """Extract a summary from spec.md for PR body."""
         worktree_path = self.get_worktree_path(spec_name)
@@ -1389,7 +1749,7 @@ class WorktreeManager:
                 text=True,
                 encoding="utf-8",
                 errors="replace",
-                timeout=self.GH_QUERY_TIMEOUT,
+                timeout=self.CLI_QUERY_TIMEOUT,
                 env=get_isolated_git_env(),
             )
             if result.returncode == 0:
@@ -1408,6 +1768,57 @@ class WorktreeManager:
 
         return None
 
+    def _get_existing_mr_url(self, spec_name: str, target_branch: str) -> str | None:
+        """Get the URL of an existing MR for this branch."""
+        info = self.get_worktree_info(spec_name)
+        if not info:
+            return None
+
+        glab_executable = get_glab_executable()
+        if not glab_executable:
+            # glab CLI not found - return None and let caller handle it
+            return None
+
+        try:
+            result = subprocess.run(
+                [
+                    glab_executable,
+                    "mr",
+                    "view",
+                    info.branch,
+                    "--output",
+                    "json",
+                ],
+                cwd=info.path,
+                capture_output=True,
+                text=True,
+                encoding="utf-8",
+                errors="replace",
+                timeout=self.CLI_QUERY_TIMEOUT,
+                env=get_isolated_git_env(),
+            )
+            if result.returncode == 0 and result.stdout.strip():
+                # Parse JSON output to extract web_url (glab uses snake_case)
+                try:
+                    data = json.loads(result.stdout)
+                    return data.get("web_url")
+                except json.JSONDecodeError:
+                    # If JSON parsing fails, return None
+                    pass
+        except (
+            subprocess.TimeoutExpired,
+            FileNotFoundError,
+            subprocess.SubprocessError,
+        ) as e:
+            # Silently ignore errors when fetching existing MR URL - this is a best-effort
+            # lookup that may fail due to network issues, missing glab CLI, or auth problems.
+            # Returning None allows the caller to handle missing URLs gracefully.
+            if isinstance(e, FileNotFoundError):
+                invalidate_glab_cache()
+            debug_warning("worktree", f"Could not get existing MR URL: {e}")
+
+        return None
+
     def push_and_create_pr(
         self,
         spec_name: str,
@@ -1417,13 +1828,14 @@ class WorktreeManager:
         force_push: bool = False,
     ) -> PushAndCreatePRResult:
         """
-        Push branch and create a pull request in one operation.
+        Push branch and create a pull request/merge request in one operation.
+        Automatically detects git provider (GitHub or GitLab) and routes to the appropriate CLI.
 
         Args:
             spec_name: The spec folder name
-            target_branch: Target branch for PR (defaults to base_branch)
-            title: PR title (defaults to spec name)
-            draft: Whether to create as draft PR
+            target_branch: Target branch for PR/MR (defaults to base_branch)
+            title: PR/MR title (defaults to spec name)
+            draft: Whether to create as draft PR/MR
             force_push: Whether to force push the branch
 
         Returns:
@@ -1431,7 +1843,8 @@ class WorktreeManager:
                 - success: bool
                 - pr_url: str (if created)
                 - pushed: bool (if push succeeded)
-                - already_exists: bool (if PR already exists)
+                - provider: str ('github', 'gitlab', or 'unknown')
+                - already_exists: bool (if PR/MR already exists)
                 - error: str (if failed)
         """
         # Step 1: Push the branch
@@ -1445,20 +1858,44 @@ class WorktreeManager:
                 error=push_result.get("error", "Push failed"),
             )
 
-        # Step 2: Create the PR
-        pr_result = self.create_pull_request(
-            spec_name=spec_name,
-            target_branch=target_branch,
-            title=title,
-            draft=draft,
+        # Step 2: Detect git provider (use the remote that was pushed to)
+        provider = detect_git_provider(
+            self.project_dir, remote_name=push_result.get("remote")
         )
 
+        # Step 3: Create the PR/MR based on provider
+        if provider == "github":
+            pr_result = self.create_pull_request(
+                spec_name=spec_name,
+                target_branch=target_branch,
+                title=title,
+                draft=draft,
+            )
+        elif provider == "gitlab":
+            pr_result = self.create_merge_request(
+                spec_name=spec_name,
+                target_branch=target_branch,
+                title=title,
+                draft=draft,
+            )
+        else:
+            # Unknown provider
+            return PushAndCreatePRResult(
+                success=False,
+                pushed=True,
+                remote=push_result.get("remote"),
+                branch=push_result.get("branch"),
+                provider=provider,
+                error="Unable to determine git hosting provider. Supported: GitHub, GitLab.",
+            )
+
         # Combine results
         return PushAndCreatePRResult(
             success=pr_result.get("success", False),
             pushed=True,
             remote=push_result.get("remote"),
             branch=push_result.get("branch"),
+            provider=provider,
             pr_url=pr_result.get("pr_url"),
             already_exists=pr_result.get("already_exists", False),
             error=pr_result.get("error"),

apps/backend/ideation/config.py

@@ -29,6 +29,7 @@ class IdeationConfigManager:
         thinking_level: str = "medium",
         refresh: bool = False,
         append: bool = False,
+        fast_mode: bool = False,
     ):
         """Initialize configuration manager.
 
@@ -64,6 +65,7 @@ class IdeationConfigManager:
             self.model,
             self.thinking_level,
             self.max_ideas_per_type,
+            fast_mode=fast_mode,
         )
         self.analyzer = ProjectAnalyzer(
             self.project_dir,

apps/backend/ideation/generator.py

@@ -17,7 +17,12 @@ from pathlib import Path
 sys.path.insert(0, str(Path(__file__).parent.parent))
 
 from client import create_client
-from phase_config import get_thinking_budget, resolve_model_id
+from phase_config import (
+    get_model_betas,
+    get_thinking_budget,
+    get_thinking_kwargs_for_model,
+    resolve_model_id,
+)
 from ui import print_status
 
 # Ideation types
@@ -59,6 +64,7 @@ class IdeationGenerator:
         model: str = "sonnet",  # Changed from "opus" (fix #433)
         thinking_level: str = "medium",
         max_ideas_per_type: int = 5,
+        fast_mode: bool = False,
     ):
         self.project_dir = Path(project_dir)
         self.output_dir = Path(output_dir)
@@ -66,6 +72,7 @@ class IdeationGenerator:
         self.thinking_level = thinking_level
         self.thinking_budget = get_thinking_budget(thinking_level)
         self.max_ideas_per_type = max_ideas_per_type
+        self.fast_mode = fast_mode
         self.prompts_dir = Path(__file__).parent.parent / "prompts"
 
     async def run_agent(
@@ -91,11 +98,21 @@ class IdeationGenerator:
             prompt += f"\n{additional_context}\n"
 
         # Create client with thinking budget
+        # Use agent_type="ideation" to avoid loading unnecessary MCP servers
+        # which can cause 60-second timeout delays
+        resolved_model = resolve_model_id(self.model)
+        betas = get_model_betas(self.model)
+        thinking_kwargs = get_thinking_kwargs_for_model(
+            resolved_model, self.thinking_level
+        )
         client = create_client(
             self.project_dir,
             self.output_dir,
-            resolve_model_id(self.model),
-            max_thinking_tokens=self.thinking_budget,
+            resolved_model,
+            agent_type="ideation",
+            betas=betas,
+            fast_mode=self.fast_mode,
+            **thinking_kwargs,
         )
 
         try:
@@ -184,11 +201,20 @@ Common fixes:
 Write the fixed JSON to the file now.
 """
 
+        # Use agent_type="ideation" for recovery agent as well
+        resolved_model = resolve_model_id(self.model)
+        betas = get_model_betas(self.model)
+        thinking_kwargs = get_thinking_kwargs_for_model(
+            resolved_model, self.thinking_level
+        )
         client = create_client(
             self.project_dir,
             self.output_dir,
-            resolve_model_id(self.model),
-            max_thinking_tokens=self.thinking_budget,
+            resolved_model,
+            agent_type="ideation",
+            betas=betas,
+            fast_mode=self.fast_mode,
+            **thinking_kwargs,
         )
 
         try:

apps/backend/ideation/runner.py

@@ -28,6 +28,7 @@ from .types import IdeationPhaseResult
 
 # Configuration
 MAX_RETRIES = 3
+IDEATION_TIMEOUT_SECONDS = 5 * 60  # 5 minutes max for all ideation types
 
 
 class IdeationOrchestrator:
@@ -45,6 +46,7 @@ class IdeationOrchestrator:
         thinking_level: str = "medium",
         refresh: bool = False,
         append: bool = False,
+        fast_mode: bool = False,
     ):
         """Initialize the ideation orchestrator.
 
@@ -59,6 +61,7 @@ class IdeationOrchestrator:
             thinking_level: Thinking level for extended reasoning
             refresh: Force regeneration of existing files
             append: Preserve existing ideas when merging
+            fast_mode: Enable Fast Mode for faster Opus 4.6 output
         """
         # Initialize configuration manager
         self.config_manager = IdeationConfigManager(
@@ -72,6 +75,7 @@ class IdeationOrchestrator:
             thinking_level=thinking_level,
             refresh=refresh,
             append=append,
+            fast_mode=fast_mode,
         )
 
         # Expose configuration for convenience
@@ -173,16 +177,45 @@ class IdeationOrchestrator:
             "progress",
         )
 
-        # Create tasks for all enabled types
-        ideation_tasks = [
-            self.output_streamer.stream_ideation_result(
-                ideation_type, self.phase_executor, MAX_RETRIES
+        # Create tasks explicitly so we can cancel them on timeout
+        ideation_task_objs = [
+            asyncio.create_task(
+                self.output_streamer.stream_ideation_result(
+                    ideation_type, self.phase_executor, MAX_RETRIES
+                )
             )
             for ideation_type in self.enabled_types
         ]
 
-        # Run all ideation types concurrently
-        ideation_results = await asyncio.gather(*ideation_tasks, return_exceptions=True)
+        # Run all ideation types concurrently with timeout protection
+        # 5 minute timeout prevents infinite hangs if one type stalls
+        try:
+            ideation_results = await asyncio.wait_for(
+                asyncio.gather(*ideation_task_objs, return_exceptions=True),
+                timeout=IDEATION_TIMEOUT_SECONDS,
+            )
+        except asyncio.TimeoutError:
+            print_status(
+                "Ideation generation timed out after 5 minutes",
+                "error",
+            )
+            # Cancel all pending tasks to prevent resource leaks
+            for task in ideation_task_objs:
+                if not task.done():
+                    task.cancel()
+            # Wait for cancellation to complete and preserve results from completed tasks
+            # Tasks that finished before timeout will return their results;
+            # cancelled tasks will return CancelledError
+            results_after_cancel = await asyncio.gather(
+                *ideation_task_objs, return_exceptions=True
+            )
+            # Convert CancelledError to timeout exception, preserve completed results
+            ideation_results = [
+                Exception("Ideation timed out")
+                if isinstance(res, asyncio.CancelledError)
+                else res
+                for res in results_after_cancel
+            ]
 
         # Process results
         for i, result in enumerate(ideation_results):

apps/backend/integrations/graphiti/config.py

@@ -145,7 +145,7 @@ class GraphitiConfig:
 
     # OpenRouter settings (multi-provider aggregator)
     openrouter_api_key: str = ""
-    openrouter_base_url: str = "https://openrouter.ai/api/v1"
+    openrouter_base_url: str = "https://openrouter.ai/api"
     openrouter_llm_model: str = "anthropic/claude-sonnet-4"
     openrouter_embedding_model: str = "openai/text-embedding-3-small"
 
@@ -207,7 +207,7 @@ class GraphitiConfig:
         # OpenRouter settings
         openrouter_api_key = os.environ.get("OPENROUTER_API_KEY", "")
         openrouter_base_url = os.environ.get(
-            "OPENROUTER_BASE_URL", "https://openrouter.ai/api/v1"
+            "OPENROUTER_BASE_URL", "https://openrouter.ai/api"
         )
         openrouter_llm_model = os.environ.get(
             "OPENROUTER_LLM_MODEL", "anthropic/claude-sonnet-4"
@@ -624,7 +624,10 @@ def get_graphiti_status() -> dict:
 
     # CRITICAL FIX: Actually verify packages are importable before reporting available
     # Don't just check config.is_valid() - actually try to import the module
-    if not config.is_valid():
+    # Note: This branch is currently unreachable because is_valid() returns True
+    # whenever enabled is True. Kept for defensive purposes in case is_valid()
+    # logic changes in the future.
+    if not config.is_valid():  # pragma: no cover
         status["reason"] = errors[0] if errors else "Configuration invalid"
         return status
 
@@ -635,7 +638,7 @@ def get_graphiti_status() -> dict:
         from graphiti_core.driver.falkordb_driver import FalkorDriver  # noqa: F401
 
         # If we got here, packages are importable
-        status["available"] = True
+        status["available"] = True  # pragma: no cover
     except ImportError as e:
         status["available"] = False
         status["reason"] = f"Graphiti packages not installed: {e}"

apps/backend/integrations/graphiti/memory.py

@@ -12,12 +12,8 @@ The refactored code is now organized as:
 - graphiti/search.py - Semantic search logic
 - graphiti/schema.py - Graph schema definitions
 
-This facade ensures existing imports continue to work:
-    from graphiti_memory import GraphitiMemory, is_graphiti_enabled
-
-New code should prefer importing from the graphiti package:
-    from graphiti import GraphitiMemory
-    from graphiti.schema import GroupIdMode
+Import from this module:
+    from integrations.graphiti.memory import GraphitiMemory, is_graphiti_enabled, GroupIdMode
 
 For detailed documentation on the memory system architecture and usage,
 see graphiti/graphiti.py.
@@ -76,6 +72,8 @@ async def test_graphiti_connection() -> tuple[bool, str]:
     """
     Test if LadybugDB is available and Graphiti can connect.
 
+    Uses the embedded LadybugDB via the patched KuzuDriver (no remote connection).
+
     Returns:
         Tuple of (success: bool, message: str)
     """
@@ -91,43 +89,48 @@ async def test_graphiti_connection() -> tuple[bool, str]:
 
     try:
         from graphiti_core import Graphiti
-        from graphiti_core.driver.falkordb_driver import FalkorDriver
         from graphiti_providers import ProviderError, create_embedder, create_llm_client
 
+        # Import the patched driver creator (handles LadybugDB monkeypatch internally)
+        from integrations.graphiti.queries_pkg.client import _apply_ladybug_monkeypatch
+        from integrations.graphiti.queries_pkg.kuzu_driver_patched import (
+            create_patched_kuzu_driver,
+        )
+
         # Create providers
         try:
-            llm_client = create_llm_client(config)
-            embedder = create_embedder(config)
+            llm_client = create_llm_client(config)  # pragma: no cover
+            embedder = create_embedder(config)  # pragma: no cover
         except ProviderError as e:
             return False, f"Provider error: {e}"
 
-        # Try to connect
-        driver = FalkorDriver(
-            host=config.falkordb_host,
-            port=config.falkordb_port,
-            password=config.falkordb_password or None,
-            database=config.database,
-        )
+        # Apply LadybugDB monkeypatch for embedded database
+        if not _apply_ladybug_monkeypatch():  # pragma: no cover
+            return False, "LadybugDB not installed (requires Python 3.12+)"
 
-        graphiti = Graphiti(
+        # Create embedded database driver
+        db_path = config.get_db_path()
+        driver = create_patched_kuzu_driver(db=str(db_path))  # pragma: no cover
+
+        graphiti = Graphiti(  # pragma: no cover
             graph_driver=driver,
             llm_client=llm_client,
             embedder=embedder,
         )
 
         # Try a simple operation
-        await graphiti.build_indices_and_constraints()
-        await graphiti.close()
+        await graphiti.build_indices_and_constraints()  # pragma: no cover
+        await graphiti.close()  # pragma: no cover
 
-        return True, (
-            f"Connected to LadybugDB at {config.falkordb_host}:{config.falkordb_port} "
+        return True, (  # pragma: no cover
+            f"Connected to LadybugDB at {db_path} "
             f"(providers: {config.get_provider_summary()})"
         )
 
     except ImportError as e:
         return False, f"Graphiti packages not installed: {e}"
 
-    except Exception as e:
+    except Exception as e:  # pragma: no cover
         return False, f"Connection failed: {e}"
 
 

apps/backend/integrations/graphiti/providers_pkg/utils.py

@@ -62,7 +62,7 @@ async def get_graph_hints(
     try:
         from pathlib import Path
 
-        from graphiti_memory import GraphitiMemory, GroupIdMode
+        from integrations.graphiti.memory import GraphitiMemory, GroupIdMode
 
         # Determine project directory from project_id or use current dir
         project_dir = Path.cwd()

apps/backend/integrations/graphiti/queries_pkg/client.py

@@ -5,7 +5,9 @@ Handles database connection, initialization, and lifecycle management.
 Uses LadybugDB as the embedded graph database (no Docker required, Python 3.12+).
 """
 
+import asyncio
 import logging
+import random
 import sys
 from datetime import datetime, timezone
 
@@ -14,6 +16,27 @@ from graphiti_config import GraphitiConfig, GraphitiState
 
 logger = logging.getLogger(__name__)
 
+# Retry configuration for LadybugDB lock contention
+MAX_LOCK_RETRIES = 5
+INITIAL_BACKOFF_SECONDS = 0.5
+MAX_BACKOFF_SECONDS = 8.0
+JITTER_PERCENT = 0.2
+
+
+def _is_lock_error(error: Exception) -> bool:
+    """Check if an error indicates database lock contention."""
+    error_msg = str(error).lower()
+    return "could not set lock" in error_msg or (
+        "lock" in error_msg and ("file" in error_msg or "database" in error_msg)
+    )
+
+
+def _backoff_with_jitter(attempt: int) -> float:
+    """Calculate exponential backoff with jitter for retry delays."""
+    backoff = min(INITIAL_BACKOFF_SECONDS * (2**attempt), MAX_BACKOFF_SECONDS)
+    jitter = backoff * JITTER_PERCENT * (2 * random.random() - 1)
+    return max(0.01, backoff + jitter)
+
 
 def _apply_ladybug_monkeypatch() -> bool:
     """
@@ -196,32 +219,36 @@ class GraphitiClient:
                 )
 
                 db_path = self.config.get_db_path()
-                try:
-                    self._driver = create_patched_kuzu_driver(db=str(db_path))
-                except (OSError, PermissionError) as e:
-                    logger.warning(
-                        f"Failed to initialize LadybugDB driver at {db_path}: {e}"
-                    )
-                    capture_exception(
-                        e,
-                        error_type=type(e).__name__,
-                        db_path=str(db_path),
-                        llm_provider=self.config.llm_provider,
-                        embedder_provider=self.config.embedder_provider,
-                    )
-                    return False
-                except Exception as e:
-                    logger.warning(
-                        f"Unexpected error initializing LadybugDB driver at {db_path}: {e}"
-                    )
-                    capture_exception(
-                        e,
-                        error_type=type(e).__name__,
-                        db_path=str(db_path),
-                        llm_provider=self.config.llm_provider,
-                        embedder_provider=self.config.embedder_provider,
-                    )
-                    return False
+
+                # Retry with exponential backoff for lock contention
+                for attempt in range(MAX_LOCK_RETRIES + 1):
+                    try:
+                        self._driver = create_patched_kuzu_driver(db=str(db_path))
+                        if attempt > 0:
+                            logger.info(
+                                f"LadybugDB lock acquired after {attempt} retries"
+                            )
+                        break  # Success
+                    except Exception as e:
+                        if _is_lock_error(e) and attempt < MAX_LOCK_RETRIES:
+                            wait_time = _backoff_with_jitter(attempt)
+                            logger.debug(
+                                f"LadybugDB lock contention (attempt {attempt + 1}/{MAX_LOCK_RETRIES}), retrying in {wait_time:.2f}s"
+                            )
+                            await asyncio.sleep(wait_time)
+                            continue
+                        logger.warning(
+                            f"Failed to initialize LadybugDB driver at {db_path}: {e}"
+                        )
+                        capture_exception(
+                            e,
+                            error_type=type(e).__name__,
+                            db_path=str(db_path),
+                            llm_provider=self.config.llm_provider,
+                            embedder_provider=self.config.embedder_provider,
+                        )
+                        return False
+
                 logger.info(f"Initialized LadybugDB driver (patched) at: {db_path}")
             except ImportError as e:
                 logger.warning(f"KuzuDriver not available: {e}")

apps/backend/integrations/graphiti/queries_pkg/kuzu_driver_patched.py

@@ -15,7 +15,10 @@ from typing import Any
 # Import kuzu (might be real_ladybug via monkeypatch)
 try:
     import kuzu
-except ImportError:
+except ImportError:  # pragma: no cover
+    # Fallback to real_ladybug if kuzu is not available.
+    # This import-time fallback is hard to test in normal unit tests
+    # since the module is imported once before tests can mock anything.
     import real_ladybug as kuzu  # type: ignore
 
 logger = logging.getLogger(__name__)

apps/backend/integrations/graphiti/queries_pkg/search.py

@@ -67,7 +67,8 @@ class GraphitiSearch:
         Args:
             query: Search query
             num_results: Maximum number of results to return
-            include_project_context: If True and in PROJECT mode, search project-wide
+            include_project_context: If True and in SPEC mode, also search project-wide
+            min_score: Minimum relevance score threshold (0.0 to 1.0)
 
         Returns:
             List of relevant context items with content, score, and type
@@ -101,10 +102,14 @@ class GraphitiSearch:
                     or str(result)
                 )
 
+                # Normalize score to float, treating None as 0.0
+                raw_score = getattr(result, "score", None)
+                score = raw_score if raw_score is not None else 0.0
+
                 context_items.append(
                     {
                         "content": content,
-                        "score": getattr(result, "score", 0.0),
+                        "score": score,
                         "type": getattr(result, "type", "unknown"),
                     }
                 )
@@ -112,7 +117,9 @@ class GraphitiSearch:
             # Filter by minimum score if specified
             if min_score > 0:
                 context_items = [
-                    item for item in context_items if item.get("score", 0) >= min_score
+                    item
+                    for item in context_items
+                    if (item.get("score", 0.0)) >= min_score
                 ]
 
             logger.info(
@@ -225,12 +232,14 @@ class GraphitiSearch:
                         if not isinstance(data, dict):
                             continue
                         if data.get("type") == EPISODE_TYPE_TASK_OUTCOME:
+                            raw_score = getattr(result, "score", None)
+                            score = raw_score if raw_score is not None else 0.0
                             outcomes.append(
                                 {
                                     "task_id": data.get("task_id"),
                                     "success": data.get("success"),
                                     "outcome": data.get("outcome"),
-                                    "score": getattr(result, "score", 0.0),
+                                    "score": score,
                                 }
                             )
                     except (json.JSONDecodeError, TypeError, AttributeError):
@@ -284,7 +293,8 @@ class GraphitiSearch:
                 content = getattr(result, "content", None) or getattr(
                     result, "fact", None
                 )
-                score = getattr(result, "score", 0.0)
+                raw_score = getattr(result, "score", None)
+                score = raw_score if raw_score is not None else 0.0
 
                 if score < min_score:
                     continue
@@ -320,7 +330,8 @@ class GraphitiSearch:
                 content = getattr(result, "content", None) or getattr(
                     result, "fact", None
                 )
-                score = getattr(result, "score", 0.0)
+                raw_score = getattr(result, "score", None)
+                score = raw_score if raw_score is not None else 0.0
 
                 if score < min_score:
                     continue

apps/backend/integrations/graphiti/run_graphiti_memory_test.py

@@ -22,13 +22,13 @@ Usage:
 
     # Run the test:
     cd auto-claude
-    python integrations/graphiti/test_graphiti_memory.py
+    python integrations/graphiti/run_graphiti_memory_test.py
 
     # Or run specific tests:
-    python integrations/graphiti/test_graphiti_memory.py --test connection
-    python integrations/graphiti/test_graphiti_memory.py --test save
-    python integrations/graphiti/test_graphiti_memory.py --test search
-    python integrations/graphiti/test_graphiti_memory.py --test ollama
+    python integrations/graphiti/run_graphiti_memory_test.py --test connection
+    python integrations/graphiti/run_graphiti_memory_test.py --test save
+    python integrations/graphiti/run_graphiti_memory_test.py --test search
+    python integrations/graphiti/run_graphiti_memory_test.py --test ollama
 """
 
 import argparse
@@ -36,18 +36,15 @@ import asyncio
 import json
 import os
 import sys
+import tempfile
 from datetime import datetime, timezone
 from pathlib import Path
 
-# Add auto-claude to path
-auto_claude_dir = Path(__file__).parent.parent.parent
-sys.path.insert(0, str(auto_claude_dir))
-
 # Load .env file
 try:
     from dotenv import load_dotenv
 
-    env_file = auto_claude_dir / ".env"
+    env_file = Path(__file__).parent.parent.parent.parent / ".env"
     if env_file.exists():
         load_dotenv(env_file)
         print(f"Loaded .env from {env_file}")
@@ -170,7 +167,9 @@ async def test_save_episode(db_path: str, database: str) -> tuple[str, str]:
             "embedder": config.embedder_provider,
         }
 
-        episode_name = f"test_episode_{datetime.now().strftime('%Y%m%d_%H%M%S')}"
+        episode_name = (
+            f"test_episode_{datetime.now(timezone.utc).strftime('%Y%m%d_%H%M%S')}"
+        )
         group_id = "ladybug_test_group"
 
         print(f"  Episode name: {episode_name}")
@@ -186,7 +185,7 @@ async def test_save_episode(db_path: str, database: str) -> tuple[str, str]:
             name=episode_name,
             episode_body=json.dumps(test_data),
             source=EpisodeType.text,
-            source_description="Test episode from test_graphiti_memory.py",
+            source_description="Test episode from run_graphiti_memory_test.py",
             reference_time=datetime.now(timezone.utc),
             group_id=group_id,
         )
@@ -432,11 +431,8 @@ async def test_graphiti_memory_class(db_path: str, database: str) -> bool:
         from integrations.graphiti.memory import GraphitiMemory
 
         # Create temporary directories for testing
-        test_spec_dir = Path("/tmp/graphiti_test_spec")
-        test_spec_dir.mkdir(parents=True, exist_ok=True)
-
-        test_project_dir = Path("/tmp/graphiti_test_project")
-        test_project_dir.mkdir(parents=True, exist_ok=True)
+        test_spec_dir = Path(tempfile.mkdtemp(prefix="graphiti_test_spec_"))
+        test_project_dir = Path(tempfile.mkdtemp(prefix="graphiti_test_project_"))
 
         print(f"  Spec dir: {test_spec_dir}")
         print(f"  Project dir: {test_project_dir}")
@@ -704,14 +700,14 @@ async def main():
     print()
     print("  Quick commands:")
     print("    # Run all tests:")
-    print("    python integrations/graphiti/test_graphiti_memory.py")
+    print("    python integrations/graphiti/run_graphiti_memory_test.py")
     print()
     print("    # Test just Ollama embeddings:")
-    print("    python integrations/graphiti/test_graphiti_memory.py --test ollama")
+    print("    python integrations/graphiti/run_graphiti_memory_test.py --test ollama")
     print()
     print("    # Test with production database:")
     print(
-        "    python integrations/graphiti/test_graphiti_memory.py --database auto_claude_memory"
+        "    python integrations/graphiti/run_graphiti_memory_test.py --database auto_claude_memory"
     )
     print()
 

apps/backend/integrations/graphiti/run_ollama_embedding_test.py

@@ -36,13 +36,13 @@ NOTE: graphiti-core internally uses an OpenAI reranker for search ranking.
 
 Usage:
     cd apps/backend
-    python integrations/graphiti/test_ollama_embedding_memory.py
+    python integrations/graphiti/run_ollama_embedding_test.py
 
     # Run specific tests:
-    python integrations/graphiti/test_ollama_embedding_memory.py --test embeddings
-    python integrations/graphiti/test_ollama_embedding_memory.py --test create
-    python integrations/graphiti/test_ollama_embedding_memory.py --test retrieve
-    python integrations/graphiti/test_ollama_embedding_memory.py --test full-cycle
+    python integrations/graphiti/run_ollama_embedding_test.py --test embeddings
+    python integrations/graphiti/run_ollama_embedding_test.py --test create
+    python integrations/graphiti/run_ollama_embedding_test.py --test retrieve
+    python integrations/graphiti/run_ollama_embedding_test.py --test full-cycle
 """
 
 import argparse
@@ -54,15 +54,15 @@ import tempfile
 from datetime import datetime
 from pathlib import Path
 
-# Add auto-claude to path
-auto_claude_dir = Path(__file__).parent.parent.parent
-sys.path.insert(0, str(auto_claude_dir))
+# Add backend to path
+backend_dir = Path(__file__).parent.parent.parent.parent
+sys.path.insert(0, str(backend_dir))
 
 # Load .env file
 try:
     from dotenv import load_dotenv
 
-    env_file = auto_claude_dir / ".env"
+    env_file = backend_dir / ".env"
     if env_file.exists():
         load_dotenv(env_file)
         print(f"Loaded .env from {env_file}")
@@ -843,18 +843,18 @@ async def main():
     print()
     print("  Commands:")
     print("    # Run all tests:")
-    print("    python integrations/graphiti/test_ollama_embedding_memory.py")
+    print("    python integrations/graphiti/run_ollama_embedding_test.py")
     print()
     print("    # Run specific test:")
     print(
-        "    python integrations/graphiti/test_ollama_embedding_memory.py --test embeddings"
+        "    python integrations/graphiti/run_ollama_embedding_test.py --test embeddings"
     )
     print(
-        "    python integrations/graphiti/test_ollama_embedding_memory.py --test full-cycle"
+        "    python integrations/graphiti/run_ollama_embedding_test.py --test full-cycle"
     )
     print()
     print("    # Keep database for inspection:")
-    print("    python integrations/graphiti/test_ollama_embedding_memory.py --keep-db")
+    print("    python integrations/graphiti/run_ollama_embedding_test.py --keep-db")
     print()
 
 

apps/backend/integrations/graphiti/test_provider_naming.py

@@ -1,68 +0,0 @@
-#!/usr/bin/env python3
-"""
-Quick test to demonstrate provider-specific database naming.
-
-Shows how Auto Claude automatically generates provider-specific database names
-to prevent embedding dimension mismatches.
-"""
-
-import os
-import sys
-from pathlib import Path
-
-# Add auto-claude to path
-sys.path.insert(0, str(Path(__file__).parent.parent.parent))
-
-from integrations.graphiti.config import GraphitiConfig
-
-
-def test_provider_naming():
-    """Demonstrate provider-specific database naming."""
-
-    print("\n" + "=" * 70)
-    print("  PROVIDER-SPECIFIC DATABASE NAMING")
-    print("=" * 70 + "\n")
-
-    providers = [
-        ("openai", None, None),
-        ("ollama", "embeddinggemma", 768),
-        ("ollama", "qwen3-embedding:0.6b", 1024),
-        ("voyage", None, None),
-        ("google", None, None),
-    ]
-
-    for provider, model, dim in providers:
-        # Create config
-        config = GraphitiConfig.from_env()
-        config.embedder_provider = provider
-
-        if provider == "ollama" and model:
-            config.ollama_embedding_model = model
-            if dim:
-                config.ollama_embedding_dim = dim
-
-        # Get naming info
-        dimension = config.get_embedding_dimension()
-        signature = config.get_provider_signature()
-        db_name = config.get_provider_specific_database_name("auto_claude_memory")
-
-        print(f"Provider: {provider}")
-        if model:
-            print(f"  Model: {model}")
-        print(f"  Embedding Dimension: {dimension}")
-        print(f"  Provider Signature: {signature}")
-        print(f"  Database Name: {db_name}")
-        print(f"  Full Path: ~/.auto-claude/memories/{db_name}/")
-        print()
-
-    print("=" * 70)
-    print("\nKey Benefits:")
-    print("  ✅ No dimension mismatch errors")
-    print("  ✅ Each provider uses its own database")
-    print("  ✅ Can switch providers without conflicts")
-    print("  ✅ Migration utility available for data transfer")
-    print()
-
-
-if __name__ == "__main__":
-    test_provider_naming()

apps/backend/integrations/graphiti/tests/__init__.py

@@ -0,0 +1 @@
+"""Tests for Graphiti memory integration."""

apps/backend/integrations/graphiti/tests/conftest.py

@@ -0,0 +1,610 @@
+"""
+Pytest configuration and fixtures for graphiti integration tests.
+
+This module provides shared fixtures for testing the memory system integration,
+including mocks for external dependencies, test configurations, and client fixtures.
+"""
+
+import os
+import sys
+from pathlib import Path
+from unittest.mock import AsyncMock, MagicMock, Mock, patch
+
+import pytest
+
+# Add the backend directory to sys.path to allow imports
+backend_dir = Path(__file__).parent.parent.parent.parent
+sys.path.insert(0, str(backend_dir))
+
+
+def pytest_collection_modifyitems(config, items):
+    """
+    Exclude validator functions from test collection.
+
+    The validators.py module contains functions named test_llm_connection and
+    test_embedder_connection which are not pytest tests but validator functions.
+    """
+    # Filter out items that are from validators.py and are not in test classes
+    filtered_items = []
+    for item in items:
+        # Get the full path of the test
+        item_path = str(item.fspath) if hasattr(item, "fspath") else str(item.path)
+
+        # Skip the standalone test_llm_connection and test_embedder_connection
+        # functions from validators.py (they're not pytest tests)
+        if item.name in [
+            "test_llm_connection",
+            "test_embedder_connection",
+            "test_ollama_connection",
+        ]:
+            # Check if it's from validators.py
+            if "validators.py" in item_path or "test_providers.py" in item_path:
+                # Only skip if it's a standalone function (not in a TestClass)
+                if not item.parent.name.startswith("Test"):
+                    continue
+
+        filtered_items.append(item)
+
+    items[:] = filtered_items
+
+
+# =============================================================================
+# External Dependency Mocks
+# =============================================================================
+
+
+@pytest.fixture
+def mock_graphiti_core():
+    """Mock graphiti_core.Graphiti and related classes.
+
+    Patches the graphiti_core library to prevent actual graph database connections
+    during tests.
+
+    Yields:
+        tuple: (mock_graphiti_class, mock_graphiti_instance)
+    """
+    with patch(
+        "integrations.graphiti.queries_pkg.graphiti.graphiti_core.Graphiti"
+    ) as mock_graphiti:
+        # Configure the mock to return a mock instance
+        mock_instance = MagicMock()
+        mock_graphiti.return_value = mock_instance
+
+        # Mock common methods that might be called
+        mock_instance.add_edges = AsyncMock()
+        mock_instance.add_nodes = AsyncMock()
+        mock_instance.search = AsyncMock(return_value=[])
+        mock_instance.delete_graph = AsyncMock()
+        mock_instance.close = AsyncMock()
+
+        yield mock_graphiti, mock_instance
+
+
+@pytest.fixture
+def mock_falkor_driver():
+    """Mock graphiti_core.driver.falkordb_driver.FalkorDriver.
+
+    Prevents actual FalkorDB connections during tests.
+
+    Yields:
+        tuple: (mock_driver_class, mock_driver_instance)
+    """
+    with patch(
+        "integrations.graphiti.queries_pkg.graphiti.graphiti_core.driver.falkordb_driver.FalkorDriver"
+    ) as mock_driver:
+        mock_instance = MagicMock()
+        mock_driver.return_value = mock_instance
+
+        # Mock driver methods
+        mock_instance.close = MagicMock()
+        mock_instance.execute_query = MagicMock(return_value=[])
+
+        yield mock_driver, mock_instance
+
+
+@pytest.fixture
+def mock_graphiti_providers():
+    """Mock graphiti_providers module.
+
+    Patches the graphiti_providers module to prevent actual LLM/embedder calls.
+
+    Yields:
+        tuple: (mock_get_client, mock_client_instance)
+    """
+    with patch(
+        "integrations.graphiti.providers_pkg.providers.get_client"
+    ) as mock_get_client:
+        mock_client = MagicMock()
+        mock_get_client.return_value = mock_client
+        yield mock_get_client, mock_client
+
+
+@pytest.fixture
+def mock_ladybug_db():
+    """Mock real_ladybug and kuzu database connections.
+
+    Prevents actual database connections during tests.
+
+    Yields:
+        dict: Dictionary with 'ladybug' and 'kuzu' keys, each containing
+              (mock_class, mock_instance) tuples.
+    """
+    with (
+        patch(
+            "integrations.graphiti.queries_pkg.client.real_ladybug.Ladybug"
+        ) as mock_ladybug,
+        patch("integrations.graphiti.queries_pkg.client.kuzu.Connection") as mock_kuzu,
+    ):
+        # Mock Ladybug instance
+        ladybug_instance = MagicMock()
+        mock_ladybug.return_value = ladybug_instance
+        ladybug_instance.close = MagicMock()
+
+        # Mock Kuzu connection
+        kuzu_instance = MagicMock()
+        mock_kuzu.return_value = kuzu_instance
+        kuzu_instance.close = MagicMock()
+
+        yield {
+            "ladybug": (mock_ladybug, ladybug_instance),
+            "kuzu": (mock_kuzu, kuzu_instance),
+        }
+
+
+# =============================================================================
+# Config Fixtures
+# =============================================================================
+
+
+@pytest.fixture
+def mock_config():
+    """Return a GraphitiConfig with test values.
+
+    Provides a test configuration that doesn't require real environment variables
+    or database connections.
+
+    Returns:
+        GraphitiConfig: Configuration with test values.
+    """
+    from integrations.graphiti.config import GraphitiConfig
+
+    config = GraphitiConfig(
+        enabled=True,
+        database="test_dataset",
+        db_path="/tmp/test_graphiti.db",
+        llm_provider="openai",
+        openai_model="gpt-5-mini",
+        embedder_provider="openai",
+        openai_embedding_model="text-embedding-3-small",
+        openai_api_key="sk-test-key-for-testing",
+    )
+
+    return config
+
+
+@pytest.fixture
+def mock_env_vars(tmp_path):
+    """Set test environment variables for Graphiti configuration.
+
+    Sets up a clean environment with test values for all Graphiti-related
+    environment variables.
+
+    Yields:
+        dict: Dictionary of environment variables that were set.
+    """
+    test_db_path = str(tmp_path / "test_graphiti.db")
+
+    env_vars = {
+        "GRAPHITI_ENABLED": "true",
+        "GRAPHITI_LLM_PROVIDER": "openai",
+        "GRAPHITI_EMBEDDER_PROVIDER": "openai",
+        "GRAPHITI_DATABASE": "test_dataset",
+        "GRAPHITI_DB_PATH": test_db_path,
+        "OPENAI_MODEL": "gpt-5-mini",
+        "OPENAI_EMBEDDING_MODEL": "text-embedding-3-small",
+        "OPENAI_API_KEY": "sk-test-key-for-testing",
+    }
+
+    # Save original values
+    original = {k: os.environ.get(k) for k in env_vars}
+
+    # Set test values
+    for key, value in env_vars.items():
+        os.environ[key] = value
+
+    yield env_vars
+
+    # Restore original values
+    for key, original_value in original.items():
+        if original_value is None:
+            os.environ.pop(key, None)
+        else:
+            os.environ[key] = original_value
+
+
+# =============================================================================
+# Client Fixtures
+# =============================================================================
+
+
+@pytest.fixture
+def mock_graphiti_client():
+    """Mock GraphitiClient with all necessary methods.
+
+    Provides a mock client that simulates the behavior of the GraphitiClient
+    without requiring actual graph database connections.
+
+    Returns:
+        Mock: Mocked GraphitiClient with typical methods mocked.
+    """
+    client = Mock()
+    client.graphiti = Mock()
+
+    # Core client methods
+    client.is_initialized = Mock(return_value=True)
+    client.initialize = AsyncMock()
+    client.get_session_id = Mock(return_value="test_session")
+    client.get_user_id = Mock(return_value="test_user")
+    client.get_project_id = Mock(return_value="test_project")
+
+    # Memory operations (async)
+    client.add_episode = AsyncMock(return_value="episode_id_123")
+    client.add_episodic_memories = AsyncMock(return_value=["mem_id_1", "mem_id_2"])
+    client.add_abstract_memories = AsyncMock(return_value=["abstract_id_1"])
+    client.search = AsyncMock(return_value=[])
+    client.delete_graph = AsyncMock()
+
+    # Graphiti instance methods
+    client.graphiti.search = AsyncMock(return_value=[])
+
+    # Configuration
+    client.get_config = Mock(
+        return_value=Mock(
+            enabled=True, database="test_dataset", db_path="/tmp/test_graphiti.db"
+        )
+    )
+
+    return client
+
+
+@pytest.fixture
+def mock_graphiti_instance():
+    """Mock the Graphiti instance from graphiti_core.
+
+    Provides a mock of the actual Graphiti core instance with all methods
+    that might be called during operations.
+
+    Returns:
+        Mock: Mocked Graphiti instance with typical methods mocked.
+    """
+    instance = MagicMock()
+
+    # Search methods (async)
+    instance.search = AsyncMock(return_value=[])
+    instance.search_by_abstract = AsyncMock(return_value=[])
+    instance.search_by_vector = AsyncMock(return_value=[])
+
+    # Add methods (async)
+    instance.add_episode = AsyncMock(return_value="episode_id")
+    instance.add_edges = AsyncMock()
+    instance.add_nodes = AsyncMock()
+
+    # Graph management
+    instance.delete_graph = AsyncMock()
+    instance.close = AsyncMock()
+    instance.get_graph_summary = Mock(return_value={"nodes": 0, "edges": 0})
+
+    # Configuration
+    instance.database = "test_dataset"
+
+    return instance
+
+
+# =============================================================================
+# Test Directory Fixtures
+# =============================================================================
+
+
+@pytest.fixture
+def temp_spec_dir(tmp_path):
+    """Create a temporary directory for spec testing.
+
+    Provides a temporary directory with spec-like structure for testing
+    spec-related functionality.
+
+    Args:
+        tmp_path: pytest's built-in tmp_path fixture.
+
+    Returns:
+        Path: Path to the temporary spec directory.
+    """
+    spec_dir = tmp_path / "spec_001_test"
+    spec_dir.mkdir()
+
+    # Create common spec subdirectories
+    (spec_dir / ".auto-claude").mkdir()
+    (spec_dir / "context").mkdir()
+
+    return spec_dir
+
+
+@pytest.fixture
+def temp_project_dir(tmp_path):
+    """Create a temporary directory for project testing.
+
+    Provides a temporary directory with project-like structure for testing
+    project-related functionality.
+
+    Args:
+        tmp_path: pytest's built-in tmp_path fixture.
+
+    Returns:
+        Path: Path to the temporary project directory.
+    """
+    project_dir = tmp_path / "test_project"
+    project_dir.mkdir()
+
+    # Create common project subdirectories
+    (project_dir / "src").mkdir()
+    (project_dir / "tests").mkdir()
+    (project_dir / ".auto-claude").mkdir()
+
+    return project_dir
+
+
+@pytest.fixture
+def temp_db_path(tmp_path):
+    """Create a temporary path for test database.
+
+    Provides a temporary file path that can be used for database testing
+    without affecting real databases.
+
+    Args:
+        tmp_path: pytest's built-in tmp_path fixture.
+
+    Returns:
+        str: Path to temporary database file.
+    """
+    db_path = str(tmp_path / "test_graphiti.db")
+    return db_path
+
+
+# =============================================================================
+# Provider Fixtures
+# =============================================================================
+
+
+@pytest.fixture
+def mock_llm_client():
+    """Mocked LLM client for testing.
+
+    Provides a mock client that simulates LLM responses without making
+    actual API calls.
+
+    Returns:
+        Mock: Mocked LLM client.
+    """
+    client = Mock()
+
+    # Message methods
+    client.messages = Mock()
+    mock_response = Mock()
+    mock_response.id = "msg_test_123"
+    mock_response.content = []
+    mock_response.model = "claude-3-5-sonnet-20241022"
+    mock_response.role = "assistant"
+    client.messages.create = Mock(return_value=mock_response)
+
+    # Streaming support
+    client.messages.stream = Mock(return_value=iter([]))
+
+    # Token counting
+    client.count_tokens = Mock(return_value=100)
+
+    return client
+
+
+@pytest.fixture
+def mock_embedder():
+    """Mocked embedder with get_embedding() method.
+
+    Provides a mock embedder that returns fake embeddings without making
+    actual API calls. Uses deterministic values for reproducibility.
+
+    Returns:
+        tuple: (mock_embedder, test_embedding_list)
+    """
+    embedder = Mock()
+
+    # Return a deterministic embedding vector (1536 dimensions is common for OpenAI)
+    # Using 0.1 for all values makes tests reproducible
+    test_embedding = [0.1] * 1536
+
+    embedder.get_embedding = Mock(return_value=test_embedding)
+    embedder.get_embeddings = Mock(return_value=[test_embedding])
+
+    return embedder, test_embedding
+
+
+# =============================================================================
+# State Fixtures
+# =============================================================================
+
+
+@pytest.fixture
+def mock_state():
+    """GraphitiState with test values.
+
+    Provides a mock state object with typical values for testing state-related
+    functionality.
+
+    Returns:
+        Mock: Mocked GraphitiState with test values.
+    """
+    from integrations.graphiti.config import GraphitiState
+
+    state = GraphitiState(
+        initialized=True,
+        database="test_dataset",
+        indices_built=True,
+        llm_provider="openai",
+        embedder_provider="openai",
+    )
+
+    return state
+
+
+@pytest.fixture
+def mock_empty_state():
+    """Empty GraphitiState.
+
+    Provides a mock state object with default/uninitialized values for testing
+    initialization logic.
+
+    Returns:
+        Mock: Mocked GraphitiState with empty/default values.
+    """
+    from integrations.graphiti.config import GraphitiState
+
+    state = GraphitiState()
+
+    return state
+
+
+# =============================================================================
+# Test Data Fixtures
+# =============================================================================
+
+
+@pytest.fixture
+def sample_episode_data():
+    """Sample episode data for testing.
+
+    Provides realistic episode data structure for testing memory operations.
+
+    Returns:
+        dict: Sample episode data.
+    """
+    return {
+        "episode_id": "episode_123",
+        "content": "Test episode content about a feature implementation",
+        "metadata": {
+            "task_id": "task_001",
+            "timestamp": "2024-01-01T00:00:00Z",
+            "type": "implementation",
+        },
+        "session_id": "test_session",
+        "user_id": "test_user",
+    }
+
+
+@pytest.fixture
+def sample_memory_nodes():
+    """Sample memory nodes for testing.
+
+    Provides realistic node data for testing graph operations.
+
+    Returns:
+        list: List of sample memory node dictionaries.
+    """
+    return [
+        {
+            "uuid": "node_1",
+            "name": "Feature Implementation",
+            "label": "CONCEPT",
+            "summary": "Implementation of new feature",
+            "created_at": "2024-01-01T00:00:00Z",
+        },
+        {
+            "uuid": "node_2",
+            "name": "Bug Fix",
+            "label": "CONCEPT",
+            "summary": "Fixed critical bug",
+            "created_at": "2024-01-02T00:00:00Z",
+        },
+    ]
+
+
+@pytest.fixture
+def sample_search_results():
+    """Sample search results for testing.
+
+    Provides realistic search result data for testing search operations.
+
+    Returns:
+        list: List of sample search result dictionaries.
+    """
+    return [
+        {
+            "uuid": "result_1",
+            "name": "Search Result 1",
+            "summary": "First search result",
+            "score": 0.95,
+        },
+        {
+            "uuid": "result_2",
+            "name": "Search Result 2",
+            "summary": "Second search result",
+            "score": 0.87,
+        },
+    ]
+
+
+# =============================================================================
+# Helper Fixtures
+# =============================================================================
+
+
+@pytest.fixture
+def clean_env():
+    """Fixture to ensure clean environment for each test.
+
+    Removes all Graphiti-related environment variables before the test
+    and restores them afterward.
+
+    Yields:
+        dict: Dictionary of original environment values.
+    """
+    # Store original env vars
+    env_keys = [
+        "GRAPHITI_ENABLED",
+        "GRAPHITI_LLM_PROVIDER",
+        "GRAPHITI_EMBEDDER_PROVIDER",
+        "GRAPHITI_DATABASE",
+        "GRAPHITI_DB_PATH",
+        "OPENAI_API_KEY",
+        "OPENAI_MODEL",
+        "OPENAI_EMBEDDING_MODEL",
+        "ANTHROPIC_API_KEY",
+        "GRAPHITI_ANTHROPIC_MODEL",
+        "AZURE_OPENAI_API_KEY",
+        "AZURE_OPENAI_BASE_URL",
+        "AZURE_OPENAI_LLM_DEPLOYMENT",
+        "AZURE_OPENAI_EMBEDDING_DEPLOYMENT",
+        "VOYAGE_API_KEY",
+        "VOYAGE_EMBEDDING_MODEL",
+        "GOOGLE_API_KEY",
+        "GOOGLE_LLM_MODEL",
+        "GOOGLE_EMBEDDING_MODEL",
+        "OPENROUTER_API_KEY",
+        "OPENROUTER_BASE_URL",
+        "OPENROUTER_LLM_MODEL",
+        "OPENROUTER_EMBEDDING_MODEL",
+        "OLLAMA_BASE_URL",
+        "OLLAMA_LLM_MODEL",
+        "OLLAMA_EMBEDDING_MODEL",
+        "OLLAMA_EMBEDDING_DIM",
+    ]
+
+    original = {}
+    for key in env_keys:
+        original[key] = os.environ.get(key)
+        if key in os.environ:
+            os.environ.pop(key)
+
+    yield original
+
+    # Restore original values
+    for key, value in original.items():
+        if value is not None:
+            os.environ[key] = value

apps/backend/integrations/graphiti/tests/test_cross_encoder.py

@@ -0,0 +1,216 @@
+"""
+Tests for integrations.graphiti.providers_pkg.cross_encoder module.
+
+Tests cover:
+1. create_cross_encoder():
+   - Returns None for non-Ollama providers
+   - Returns None when llm_client is None
+   - Returns None on ImportError (graphiti_core not available)
+   - Returns None on Exception during creation
+   - Creates correct base_url for Ollama
+   - Creates LLMConfig with correct parameters
+"""
+
+import builtins
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+# =============================================================================
+# Test Fixtures
+# =============================================================================
+
+
+@pytest.fixture
+def mock_config():
+    """Mock GraphitiConfig."""
+    config = MagicMock()
+    config.llm_provider = "ollama"
+    config.ollama_base_url = "http://localhost:11434"
+    config.ollama_llm_model = "llama3.2"
+    return config
+
+
+@pytest.fixture
+def mock_llm_client():
+    """Mock LLM client."""
+    return MagicMock()
+
+
+@pytest.fixture
+def graphiti_core_mocks():
+    """Mock graphiti_core modules and capture LLMConfig calls."""
+    captured_config = {}
+
+    def capture_llm_config(**kwargs):
+        captured_config.update(kwargs)
+        return MagicMock()
+
+    with patch.dict(
+        "sys.modules",
+        {
+            "graphiti_core": MagicMock(),
+            "graphiti_core.cross_encoder": MagicMock(),
+            "graphiti_core.cross_encoder.openai_reranker_client": MagicMock(),
+            "graphiti_core.llm_client": MagicMock(),
+            "graphiti_core.llm_client.config": MagicMock(),
+        },
+    ):
+        from graphiti_core.cross_encoder.openai_reranker_client import (
+            OpenAIRerankerClient,
+        )
+        from graphiti_core.llm_client.config import LLMConfig
+
+        LLMConfig.side_effect = capture_llm_config
+        OpenAIRerankerClient.return_value = MagicMock()
+
+        yield captured_config
+
+
+# =============================================================================
+# Test create_cross_encoder()
+# =============================================================================
+
+
+class TestCreateCrossEncoder:
+    """Tests for create_cross_encoder() function."""
+
+    def test_returns_none_for_non_ollama_provider(self, mock_config, mock_llm_client):
+        """Test create_cross_encoder returns None for non-Ollama providers."""
+        mock_config.llm_provider = "openai"
+
+        import integrations.graphiti.providers_pkg.cross_encoder as ce_module
+
+        # The function returns None for non-ollama providers
+        result = ce_module.create_cross_encoder(mock_config, mock_llm_client)
+
+        assert result is None
+
+    def test_returns_none_for_anthropic_provider(self, mock_config, mock_llm_client):
+        """Test create_cross_encoder returns None for Anthropic provider."""
+        mock_config.llm_provider = "anthropic"
+
+        from integrations.graphiti.providers_pkg.cross_encoder import (
+            create_cross_encoder,
+        )
+
+        result = create_cross_encoder(mock_config, mock_llm_client)
+
+        assert result is None
+
+    def test_returns_none_for_google_provider(self, mock_config, mock_llm_client):
+        """Test create_cross_encoder returns None for Google provider."""
+        mock_config.llm_provider = "google"
+
+        from integrations.graphiti.providers_pkg.cross_encoder import (
+            create_cross_encoder,
+        )
+
+        result = create_cross_encoder(mock_config, mock_llm_client)
+
+        assert result is None
+
+    def test_returns_none_when_llm_client_is_none(self, mock_config):
+        """Test create_cross_encoder returns None when llm_client is None."""
+        from integrations.graphiti.providers_pkg.cross_encoder import (
+            create_cross_encoder,
+        )
+
+        result = create_cross_encoder(mock_config, llm_client=None)
+
+        assert result is None
+
+    def test_base_url_without_v1_gets_suffix_added(
+        self, mock_config, mock_llm_client, graphiti_core_mocks
+    ):
+        """Test that base_url without /v1 gets /v1 suffix added."""
+        mock_config.ollama_base_url = "http://localhost:11434"
+
+        from integrations.graphiti.providers_pkg.cross_encoder import (
+            create_cross_encoder,
+        )
+
+        _ = create_cross_encoder(mock_config, mock_llm_client)
+
+        # Verify base_url was captured and has /v1 suffix added
+        assert "base_url" in graphiti_core_mocks
+        assert graphiti_core_mocks["base_url"] == "http://localhost:11434/v1"
+
+    def test_base_url_with_v1_is_preserved(
+        self, mock_config, mock_llm_client, graphiti_core_mocks
+    ):
+        """Test that base_url with /v1 suffix is preserved."""
+        mock_config.ollama_base_url = "http://localhost:11434/v1"
+
+        from integrations.graphiti.providers_pkg.cross_encoder import (
+            create_cross_encoder,
+        )
+
+        _ = create_cross_encoder(mock_config, mock_llm_client)
+
+        # Verify base_url was preserved with /v1 suffix
+        assert "base_url" in graphiti_core_mocks
+        assert graphiti_core_mocks["base_url"] == "http://localhost:11434/v1"
+
+    def test_import_error_returns_none(self, mock_config, mock_llm_client):
+        """Test create_cross_encoder returns None when graphiti_core modules not available."""
+        from integrations.graphiti.providers_pkg.cross_encoder import (
+            create_cross_encoder,
+        )
+
+        # Mock the import to raise ImportError
+        original_import = builtins.__import__
+
+        def mock_import(name, *args, **kwargs):
+            if name == "graphiti_core.cross_encoder.openai_reranker_client":
+                raise ImportError("graphiti_core not installed")
+            if name == "graphiti_core.llm_client.config":
+                raise ImportError("graphiti_core not installed")
+            return original_import(name, *args, **kwargs)
+
+        with patch("builtins.__import__", side_effect=mock_import):
+            result = create_cross_encoder(mock_config, mock_llm_client)
+
+        assert result is None
+
+    def test_exception_during_creation_returns_none(self, mock_config, mock_llm_client):
+        """Test create_cross_encoder returns None on exception during creation."""
+        from integrations.graphiti.providers_pkg.cross_encoder import (
+            create_cross_encoder,
+        )
+
+        # Mock the graphiti_core modules but make LLMConfig raise an exception
+        with patch.dict(
+            "sys.modules",
+            {
+                "graphiti_core": MagicMock(),
+                "graphiti_core.cross_encoder": MagicMock(),
+                "graphiti_core.cross_encoder.openai_reranker_client": MagicMock(),
+                "graphiti_core.llm_client": MagicMock(),
+                "graphiti_core.llm_client.config": MagicMock(),
+            },
+        ):
+            from graphiti_core.llm_client.config import LLMConfig
+
+            # Make LLMConfig raise an exception
+            LLMConfig.side_effect = Exception("Config creation failed")
+
+            result = create_cross_encoder(mock_config, mock_llm_client)
+
+        assert result is None
+
+
+# =============================================================================
+# Test module exports
+# =============================================================================
+
+
+class TestModuleExports:
+    """Tests for cross_encoder module exports."""
+
+    def test_create_cross_encoder_is_exported(self):
+        """Test that create_cross_encoder is exported from module."""
+        from integrations.graphiti.providers_pkg import cross_encoder
+
+        assert hasattr(cross_encoder, "create_cross_encoder")
+        assert callable(cross_encoder.create_cross_encoder)

apps/backend/integrations/graphiti/tests/test_init.py

@@ -0,0 +1,238 @@
+"""
+Tests for integrations.graphiti.__init__ module.
+
+Tests cover:
+- __getattr__ lazy import functionality
+- Direct imports (GraphitiConfig, validate_graphiti_config)
+- Invalid attribute access raises AttributeError
+"""
+
+import sys
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+
+
+class TestInitModuleDirectImports:
+    """Test direct imports that don't require lazy loading."""
+
+    def test_import_graphiti_config_directly(self):
+        """Test GraphitiConfig can be imported directly."""
+        from integrations.graphiti import GraphitiConfig
+
+        assert GraphitiConfig is not None
+
+    def test_import_validate_graphiti_config_directly(self):
+        """Test validate_graphiti_config can be imported directly."""
+        from integrations.graphiti import validate_graphiti_config
+
+        assert validate_graphiti_config is not None
+
+    def test___all___exports(self):
+        """Test __all__ contains expected exports."""
+        import integrations.graphiti as graphiti_module
+
+        expected_all = [
+            "GraphitiConfig",
+            "validate_graphiti_config",
+            "GraphitiMemory",
+            "create_llm_client",
+            "create_embedder",
+        ]
+        assert graphiti_module.__all__ == expected_all
+
+
+class TestInitModuleLazyImports:
+    """Test __getattr__ lazy import functionality."""
+
+    @pytest.fixture
+    def mock_memory_module(self):
+        """Mock the memory module."""
+        memory_mock = MagicMock()
+        memory_mock.GraphitiMemory = MagicMock
+        return memory_mock
+
+    @pytest.fixture
+    def mock_providers_module(self):
+        """Mock the providers module."""
+        providers_mock = MagicMock()
+        providers_mock.create_llm_client = MagicMock(return_value=AsyncMock())
+        providers_mock.create_embedder = MagicMock(return_value=AsyncMock())
+        return providers_mock
+
+    def test_getattr_graphiti_memory_lazy_import(self, mock_memory_module):
+        """Test accessing GraphitiMemory triggers lazy import."""
+        import integrations.graphiti as graphiti_module
+
+        with patch.dict(
+            "sys.modules",
+            {
+                "integrations.graphiti.memory": mock_memory_module,
+            },
+        ):
+            # Access the attribute via __getattr__
+            result = graphiti_module.__getattr__("GraphitiMemory")
+
+            assert result == mock_memory_module.GraphitiMemory
+
+    def test_getattr_create_llm_client_lazy_import(self, mock_providers_module):
+        """Test accessing create_llm_client triggers lazy import."""
+        import integrations.graphiti as graphiti_module
+
+        with patch.dict(
+            "sys.modules",
+            {
+                "integrations.graphiti.providers": mock_providers_module,
+            },
+        ):
+            result = graphiti_module.__getattr__("create_llm_client")
+
+            assert result == mock_providers_module.create_llm_client
+
+    def test_getattr_create_embedder_lazy_import(self, mock_providers_module):
+        """Test accessing create_embedder triggers lazy import."""
+        import integrations.graphiti as graphiti_module
+
+        with patch.dict(
+            "sys.modules",
+            {
+                "integrations.graphiti.providers": mock_providers_module,
+            },
+        ):
+            result = graphiti_module.__getattr__("create_embedder")
+
+            assert result == mock_providers_module.create_embedder
+
+    def test_getattr_invalid_attribute_raises_attribute_error(self):
+        """Test accessing invalid attribute raises AttributeError."""
+        import integrations.graphiti as graphiti_module
+
+        with pytest.raises(AttributeError) as exc_info:
+            graphiti_module.__getattr__("NonExistentAttribute")
+
+        assert "has no attribute" in str(exc_info.value)
+        assert "NonExistentAttribute" in str(exc_info.value)
+
+    def test_getattr_empty_string_attribute(self):
+        """Test accessing empty string attribute raises AttributeError."""
+        import integrations.graphiti as graphiti_module
+
+        with pytest.raises(AttributeError):
+            graphiti_module.__getattr__("")
+
+    def test_getattr_case_sensitive(self):
+        """Test that __getattr__ is case-sensitive."""
+        import integrations.graphiti as graphiti_module
+
+        # lowercase should fail
+        with pytest.raises(AttributeError):
+            graphiti_module.__getattr__("graphitimemory")
+
+        # mixed case should fail
+        with pytest.raises(AttributeError):
+            graphiti_module.__getattr__("Graphiti_Memory")
+
+
+class TestInitModuleAccessPatterns:
+    """Test various access patterns for the init module."""
+
+    def test_hasattr_on_graphiti_memory(self):
+        """Test hasattr works correctly with lazy imports."""
+        import integrations.graphiti as graphiti_module
+
+        # Mock the import
+        with patch.dict(
+            "sys.modules",
+            {
+                "integrations.graphiti.memory": MagicMock(GraphitiMemory=MagicMock),
+            },
+        ):
+            # hasattr should call __getattr__ and not raise
+            result = hasattr(graphiti_module, "GraphitiMemory")
+            assert result is True
+
+    def test_hasattr_on_invalid_attribute(self):
+        """Test hasattr returns False for invalid attributes."""
+        import integrations.graphiti as graphiti_module
+
+        result = hasattr(graphiti_module, "InvalidAttribute")
+        assert result is False
+
+    def test_getattr_on_existing_direct_import(self):
+        """Test __getattr__ is not called for direct imports."""
+        import integrations.graphiti as graphiti_module
+
+        # GraphitiConfig is imported directly, so __getattr__ shouldn't be called
+        # This tests that the normal import mechanism works
+        assert hasattr(graphiti_module, "GraphitiConfig")
+
+    def test_module_docstring(self):
+        """Test the module has a docstring."""
+        import integrations.graphiti as graphiti_module
+
+        assert graphiti_module.__doc__ is not None
+        assert "Graphiti" in graphiti_module.__doc__
+
+
+class TestInitModuleIntegration:
+    """Integration tests for the init module."""
+
+    def test_import_star(self):
+        """Test 'from integrations.graphiti import *' includes direct imports."""
+        # Create a new namespace for the import
+        namespace = {}
+        exec("from integrations.graphiti import *", namespace)
+
+        # Direct imports should be available
+        assert "GraphitiConfig" in namespace
+        assert "validate_graphiti_config" in namespace
+
+    def test_reimport_does_not_fail(self):
+        """Test that re-importing the module doesn't cause issues."""
+        import importlib
+
+        import integrations.graphiti
+
+        # Reload the module
+        importlib.reload(integrations.graphiti)
+
+        # Should still work
+        assert hasattr(integrations.graphiti, "GraphitiConfig")
+
+    @pytest.mark.slow
+    def test_concurrent_attribute_access(self):
+        """Test that concurrent attribute access doesn't cause issues."""
+        import concurrent.futures
+
+        import integrations.graphiti as graphiti_module
+
+        # Mock the imports
+        with patch.dict(
+            "sys.modules",
+            {
+                "integrations.graphiti.memory": MagicMock(GraphitiMemory=MagicMock),
+                "integrations.graphiti.providers": MagicMock(
+                    create_llm_client=MagicMock(return_value=AsyncMock()),
+                    create_embedder=MagicMock(return_value=AsyncMock()),
+                ),
+            },
+        ):
+
+            def access_attribute(attr_name):
+                try:
+                    return getattr(graphiti_module, attr_name)
+                except AttributeError:
+                    return None
+
+            # Access multiple attributes concurrently
+            with concurrent.futures.ThreadPoolExecutor(max_workers=3) as executor:
+                futures = [
+                    executor.submit(access_attribute, "GraphitiMemory"),
+                    executor.submit(access_attribute, "create_llm_client"),
+                    executor.submit(access_attribute, "create_embedder"),
+                ]
+                results = [f.result() for f in concurrent.futures.as_completed(futures)]
+
+            # All should succeed
+            assert len(results) == 3
+            assert all(r is not None for r in results)

apps/backend/integrations/graphiti/tests/test_memory.py

@@ -0,0 +1,425 @@
+"""
+Tests for integrations.graphiti.memory module.
+
+This module is a backward compatibility facade that re-exports from
+queries_pkg and provides convenience functions.
+"""
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+# =============================================================================
+# Test Fixtures
+# =============================================================================
+
+
+@pytest.fixture
+def mock_spec_dir(tmp_path):
+    """Create a temporary spec directory."""
+    spec_dir = tmp_path / "specs" / "001-test"
+    spec_dir.mkdir(parents=True)
+    return spec_dir
+
+
+@pytest.fixture
+def mock_project_dir(tmp_path):
+    """Create a temporary project directory."""
+    project_dir = tmp_path / "project"
+    project_dir.mkdir(parents=True)
+    return project_dir
+
+
+# =============================================================================
+# Tests for module imports
+# =============================================================================
+
+
+class TestModuleImports:
+    """Test that all expected exports are available."""
+
+    def test_import_GraphitiMemory(self):
+        """Test GraphitiMemory can be imported."""
+        from integrations.graphiti.memory import GraphitiMemory
+
+        assert GraphitiMemory is not None
+
+    def test_import_GroupIdMode(self):
+        """Test GroupIdMode can be imported."""
+        from integrations.graphiti.memory import GroupIdMode
+
+        assert GroupIdMode is not None
+        assert hasattr(GroupIdMode, "SPEC")
+        assert hasattr(GroupIdMode, "PROJECT")
+
+    def test_import_is_graphiti_enabled(self):
+        """Test is_graphiti_enabled can be imported."""
+        from integrations.graphiti.memory import is_graphiti_enabled
+
+        assert is_graphiti_enabled is not None
+
+    def test_import_get_graphiti_memory(self):
+        """Test get_graphiti_memory can be imported."""
+        from integrations.graphiti.memory import get_graphiti_memory
+
+        assert get_graphiti_memory is not None
+
+    def test_import_test_graphiti_connection(self):
+        """Test test_graphiti_connection can be imported."""
+        from integrations.graphiti.memory import test_graphiti_connection
+
+        assert test_graphiti_connection is not None
+
+    def test_import_test_provider_configuration(self):
+        """Test test_provider_configuration can be imported."""
+        from integrations.graphiti.memory import test_provider_configuration
+
+        assert test_provider_configuration is not None
+
+    def test_import_episode_types(self):
+        """Test all episode type constants can be imported."""
+        from integrations.graphiti.memory import (
+            EPISODE_TYPE_CODEBASE_DISCOVERY,
+            EPISODE_TYPE_GOTCHA,
+            EPISODE_TYPE_HISTORICAL_CONTEXT,
+            EPISODE_TYPE_PATTERN,
+            EPISODE_TYPE_QA_RESULT,
+            EPISODE_TYPE_SESSION_INSIGHT,
+            EPISODE_TYPE_TASK_OUTCOME,
+        )
+
+        assert EPISODE_TYPE_SESSION_INSIGHT == "session_insight"
+        assert EPISODE_TYPE_CODEBASE_DISCOVERY == "codebase_discovery"
+        assert EPISODE_TYPE_PATTERN == "pattern"
+        assert EPISODE_TYPE_GOTCHA == "gotcha"
+        assert EPISODE_TYPE_TASK_OUTCOME == "task_outcome"
+        assert EPISODE_TYPE_QA_RESULT == "qa_result"
+        assert EPISODE_TYPE_HISTORICAL_CONTEXT == "historical_context"
+
+    def test_import_MAX_CONTEXT_RESULTS(self):
+        """Test MAX_CONTEXT_RESULTS can be imported."""
+        from integrations.graphiti.memory import MAX_CONTEXT_RESULTS
+
+        assert MAX_CONTEXT_RESULTS is not None
+
+
+# =============================================================================
+# Tests for get_graphiti_memory()
+# =============================================================================
+
+
+class TestGetGraphitiMemory:
+    """Tests for get_graphiti_memory convenience function."""
+
+    def test_returns_graphiti_memory_instance(self, mock_spec_dir, mock_project_dir):
+        """Test get_graphiti_memory returns GraphitiMemory instance."""
+        from integrations.graphiti.memory import get_graphiti_memory
+
+        memory = get_graphiti_memory(mock_spec_dir, mock_project_dir)
+
+        assert memory is not None
+        assert hasattr(memory, "spec_dir")
+        assert hasattr(memory, "project_dir")
+
+    def test_default_group_id_mode_is_project(self, mock_spec_dir, mock_project_dir):
+        """Test default group_id_mode is PROJECT."""
+        from integrations.graphiti.memory import get_graphiti_memory
+        from integrations.graphiti.queries_pkg.schema import GroupIdMode
+
+        memory = get_graphiti_memory(mock_spec_dir, mock_project_dir)
+
+        # Check that group_id_mode defaults to PROJECT
+        assert memory.group_id_mode == GroupIdMode.PROJECT
+
+    def test_spec_group_id_mode(self, mock_spec_dir, mock_project_dir):
+        """Test SPEC group_id_mode can be set."""
+        from integrations.graphiti.memory import get_graphiti_memory
+        from integrations.graphiti.queries_pkg.schema import GroupIdMode
+
+        memory = get_graphiti_memory(mock_spec_dir, mock_project_dir, GroupIdMode.SPEC)
+
+        assert memory.group_id_mode == GroupIdMode.SPEC
+
+    def test_project_group_id_mode(self, mock_spec_dir, mock_project_dir):
+        """Test PROJECT group_id_mode can be set."""
+        from integrations.graphiti.memory import get_graphiti_memory
+        from integrations.graphiti.queries_pkg.schema import GroupIdMode
+
+        memory = get_graphiti_memory(
+            mock_spec_dir, mock_project_dir, GroupIdMode.PROJECT
+        )
+
+        assert memory.group_id_mode == GroupIdMode.PROJECT
+
+
+# =============================================================================
+# Tests for test_graphiti_connection()
+# =============================================================================
+
+
+class TestTestGraphitiConnection:
+    """Tests for test_graphiti_connection function."""
+
+    @pytest.mark.asyncio
+    async def test_returns_false_when_not_enabled(self):
+        """Test returns False when Graphiti not enabled."""
+        from integrations.graphiti.memory import test_graphiti_connection
+
+        with patch("integrations.graphiti.memory.GraphitiConfig") as mock_config_class:
+            mock_config = MagicMock()
+            mock_config.enabled = False
+            mock_config_class.from_env.return_value = mock_config
+
+            success, message = await test_graphiti_connection()
+
+            assert success is False
+            assert "not enabled" in message.lower()
+
+    @pytest.mark.asyncio
+    async def test_returns_false_with_validation_errors(self):
+        """Test returns False when config has validation errors."""
+        from integrations.graphiti.memory import test_graphiti_connection
+
+        with patch("integrations.graphiti.memory.GraphitiConfig") as mock_config_class:
+            mock_config = MagicMock()
+            mock_config.enabled = True
+            mock_config.get_validation_errors.return_value = ["API key missing"]
+            mock_config_class.from_env.return_value = mock_config
+
+            success, message = await test_graphiti_connection()
+
+            assert success is False
+            assert "Configuration errors" in message
+
+    @pytest.mark.asyncio
+    async def test_returns_false_on_import_error(self):
+        """Test returns False when graphiti_core not installed."""
+        from integrations.graphiti.memory import test_graphiti_connection
+
+        with patch("integrations.graphiti.memory.GraphitiConfig") as mock_config_class:
+            mock_config = MagicMock()
+            mock_config.enabled = True
+            mock_config.get_validation_errors.return_value = []
+            mock_config_class.from_env.return_value = mock_config
+
+            # Only raise ImportError for graphiti_core imports
+            import builtins
+
+            original_import = builtins.__import__
+
+            def selective_import_error(name, *args, **kwargs):
+                if "graphiti_core" in name:
+                    raise ImportError(f"No module named '{name}'")
+                return original_import(name, *args, **kwargs)
+
+            with patch("builtins.__import__", side_effect=selective_import_error):
+                success, message = await test_graphiti_connection()
+
+                assert success is False
+                assert "not installed" in message.lower()
+
+    @pytest.mark.slow
+    @pytest.mark.asyncio
+    async def test_returns_true_on_successful_connection(self):
+        """Test returns True when connection succeeds (requires graphiti_core)."""
+        from integrations.graphiti.memory import test_graphiti_connection
+
+        # This test requires graphiti_core to be installed
+        # Marked as slow since it connects to actual database
+        try:
+            success, message = await test_graphiti_connection()
+
+            # If graphiti_core is not installed, success will be False
+            if "not installed" in message.lower():
+                assert success is False
+            # If installed but DB not available, check for connection error
+            elif "connection failed" in message.lower():
+                assert success is False
+            # If everything is set up, should succeed
+            else:
+                # Concrete assertion for successful connection
+                assert success is True, (
+                    f"Expected success=True, got {success} with message: {message}"
+                )
+                assert message, "Message should not be empty for successful connection"
+
+        except AssertionError as e:
+            # Re-raise AssertionError to properly surface test failures
+            raise
+        except Exception as e:
+            # If there's an unexpected error, fail the test with useful info
+            pytest.skip(f"Graphiti connection test failed: {e}")
+
+    @pytest.mark.asyncio
+    async def test_handles_provider_error(self):
+        """Test handles ProviderError during provider creation."""
+        from integrations.graphiti.memory import test_graphiti_connection
+        from integrations.graphiti.providers_pkg.exceptions import ProviderError
+
+        with patch("integrations.graphiti.memory.GraphitiConfig") as mock_config_class:
+            mock_config = MagicMock()
+            mock_config.enabled = True
+            mock_config.get_validation_errors.return_value = []
+            mock_config_class.from_env.return_value = mock_config
+
+            # Mock graphiti_core imports to succeed
+            mock_graphiti = MagicMock()
+            mock_falkordb_driver = MagicMock()
+
+            # Mock provider creation to raise ProviderError
+            with patch("graphiti_providers.create_llm_client") as mock_create_llm:
+                mock_create_llm.side_effect = ProviderError("Test provider error")
+
+                with patch.dict(
+                    "sys.modules",
+                    {
+                        "graphiti_core": MagicMock(Graphiti=mock_graphiti),
+                        "graphiti_core.driver": MagicMock(),
+                        "graphiti_core.driver.falkordb_driver": mock_falkordb_driver,
+                        "graphiti_providers": MagicMock(
+                            ProviderError=ProviderError,
+                            create_embedder=MagicMock(),
+                            create_llm_client=mock_create_llm,
+                        ),
+                    },
+                ):
+                    success, message = await test_graphiti_connection()
+
+                    assert success is False
+                    assert "Provider error" in message
+
+
+# =============================================================================
+# Tests for test_provider_configuration()
+# =============================================================================
+
+
+class TestTestProviderConfiguration:
+    """Tests for test_provider_configuration function."""
+
+    @pytest.mark.asyncio
+    async def test_returns_configuration_status(self):
+        """Test returns dict with configuration status."""
+        pytest.importorskip("graphiti_providers")
+        from integrations.graphiti.memory import test_provider_configuration
+
+        with patch("integrations.graphiti.memory.GraphitiConfig") as mock_config_class:
+            mock_config = MagicMock()
+            mock_config.is_valid.return_value = True
+            mock_config.get_validation_errors.return_value = []
+            mock_config.llm_provider = "openai"
+            mock_config.embedder_provider = "openai"
+            mock_config_class.from_env.return_value = mock_config
+
+            # Mock the test functions
+            with patch(
+                "graphiti_providers.test_llm_connection",
+                return_value=(True, "LLM OK"),
+            ):
+                with patch(
+                    "graphiti_providers.test_embedder_connection",
+                    return_value=(True, "Embedder OK"),
+                ):
+                    results = await test_provider_configuration()
+
+                    assert isinstance(results, dict)
+                    assert results["config_valid"] is True
+                    assert results["validation_errors"] == []
+                    assert results["llm_provider"] == "openai"
+                    assert results["embedder_provider"] == "openai"
+                    assert results["llm_test"]["success"] is True
+                    assert results["embedder_test"]["success"] is True
+
+    @pytest.mark.asyncio
+    async def test_includes_ollama_test_when_ollama_provider(self):
+        """Test includes ollama_test when using ollama provider."""
+        pytest.importorskip("graphiti_providers")
+        from integrations.graphiti.memory import test_provider_configuration
+
+        with patch("integrations.graphiti.memory.GraphitiConfig") as mock_config_class:
+            mock_config = MagicMock()
+            mock_config.is_valid.return_value = True
+            mock_config.get_validation_errors.return_value = []
+            mock_config.llm_provider = "ollama"
+            mock_config.embedder_provider = "openai"
+            mock_config.ollama_base_url = "http://localhost:11434"
+            mock_config_class.from_env.return_value = mock_config
+
+            with patch(
+                "graphiti_providers.test_llm_connection",
+                return_value=(True, "LLM OK"),
+            ):
+                with patch(
+                    "graphiti_providers.test_embedder_connection",
+                    return_value=(True, "Embedder OK"),
+                ):
+                    with patch(
+                        "graphiti_providers.test_ollama_connection",
+                        return_value=(True, "Ollama OK"),
+                    ):
+                        results = await test_provider_configuration()
+
+                        assert "ollama_test" in results
+                        assert results["ollama_test"]["success"] is True
+
+    @pytest.mark.asyncio
+    async def test_omits_ollama_test_when_not_ollama_provider(self):
+        """Test omits ollama_test when not using ollama provider."""
+        pytest.importorskip("graphiti_providers")
+        from integrations.graphiti.memory import test_provider_configuration
+
+        with patch("integrations.graphiti.memory.GraphitiConfig") as mock_config_class:
+            mock_config = MagicMock()
+            mock_config.is_valid.return_value = True
+            mock_config.get_validation_errors.return_value = []
+            mock_config.llm_provider = "openai"
+            mock_config.embedder_provider = "openai"
+            mock_config_class.from_env.return_value = mock_config
+
+            with patch(
+                "graphiti_providers.test_llm_connection",
+                return_value=(True, "LLM OK"),
+            ):
+                with patch(
+                    "graphiti_providers.test_embedder_connection",
+                    return_value=(True, "Embedder OK"),
+                ):
+                    results = await test_provider_configuration()
+
+                    assert "ollama_test" not in results
+
+
+# =============================================================================
+# Tests for __all__ export list
+# =============================================================================
+
+
+class TestAllExports:
+    """Test __all__ contains expected exports."""
+
+    def test_all_exports_defined(self):
+        """Test __all__ is defined and contains expected items."""
+        from integrations.graphiti import memory
+
+        assert hasattr(memory, "__all__")
+        assert isinstance(memory.__all__, list)
+
+        expected_exports = [
+            "GraphitiMemory",
+            "GroupIdMode",
+            "get_graphiti_memory",
+            "is_graphiti_enabled",
+            "test_graphiti_connection",
+            "test_provider_configuration",
+            "MAX_CONTEXT_RESULTS",
+            "EPISODE_TYPE_SESSION_INSIGHT",
+            "EPISODE_TYPE_CODEBASE_DISCOVERY",
+            "EPISODE_TYPE_PATTERN",
+            "EPISODE_TYPE_GOTCHA",
+            "EPISODE_TYPE_TASK_OUTCOME",
+            "EPISODE_TYPE_QA_RESULT",
+            "EPISODE_TYPE_HISTORICAL_CONTEXT",
+        ]
+
+        for export in expected_exports:
+            assert export in memory.__all__, f"{export} not in __all__"