refactor: replace git command for branch retrieval

- Updated multiple route handlers to use 'git symbolic-ref --short HEAD' instead of 'git rev-parse --abbrev-ref HEAD' for retrieving the current branch name, improving consistency and clarity in branch management across the application.

.claude/.gitignore

@@ -1,2 +1 @@
-hans/
-skills/
+hans/

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,108 +0,0 @@
-name: Feature Request
-description: Suggest a new feature or enhancement for Automaker
-title: '[Feature]: '
-labels: ['enhancement']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to suggest a feature! Please fill out the form below to help us understand your request.
-
-  - type: dropdown
-    id: feature-area
-    attributes:
-      label: Feature Area
-      description: Which area of Automaker does this feature relate to?
-      options:
-        - UI/UX (User Interface)
-        - Agent/AI
-        - Kanban Board
-        - Git/Worktree Management
-        - Project Management
-        - Settings/Configuration
-        - Documentation
-        - Performance
-        - Other
-      default: 0
-    validations:
-      required: true
-
-  - type: dropdown
-    id: priority
-    attributes:
-      label: Priority
-      description: How important is this feature to your workflow?
-      options:
-        - Nice to have
-        - Would improve my workflow
-        - Critical for my use case
-      default: 0
-    validations:
-      required: true
-
-  - type: textarea
-    id: problem-statement
-    attributes:
-      label: Problem Statement
-      description: Is your feature request related to a problem? Please describe the problem you're trying to solve.
-      placeholder: A clear and concise description of what the problem is. Ex. I'm always frustrated when...
-    validations:
-      required: true
-
-  - type: textarea
-    id: proposed-solution
-    attributes:
-      label: Proposed Solution
-      description: Describe the solution you'd like to see implemented.
-      placeholder: A clear and concise description of what you want to happen.
-    validations:
-      required: true
-
-  - type: textarea
-    id: alternatives-considered
-    attributes:
-      label: Alternatives Considered
-      description: Describe any alternative solutions or workarounds you've considered.
-      placeholder: A clear and concise description of any alternative solutions or features you've considered.
-    validations:
-      required: false
-
-  - type: textarea
-    id: use-cases
-    attributes:
-      label: Use Cases
-      description: Describe specific scenarios where this feature would be useful.
-      placeholder: |
-        1. When working on...
-        2. As a user who needs to...
-        3. In situations where...
-    validations:
-      required: false
-
-  - type: textarea
-    id: mockups
-    attributes:
-      label: Mockups/Screenshots
-      description: If applicable, add mockups, wireframes, or screenshots to help illustrate your feature request.
-      placeholder: Drag and drop images here or paste image URLs
-    validations:
-      required: false
-
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional Context
-      description: Add any other context, references, or examples about the feature request here.
-      placeholder: Any additional information that might be helpful...
-    validations:
-      required: false
-
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Checklist
-      options:
-        - label: I have searched existing issues to ensure this feature hasn't been requested already
-          required: true
-        - label: I have provided a clear description of the problem and proposed solution
-          required: true

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

@@ -41,8 +41,7 @@ runs:
       # Use npm install instead of npm ci to correctly resolve platform-specific
       # optional dependencies (e.g., @tailwindcss/oxide, lightningcss binaries)
       # Skip scripts to avoid electron-builder install-app-deps which uses too much memory
-      # Use --force to allow platform-specific dev dependencies like dmg-license on non-darwin platforms
-      run: npm install --ignore-scripts --force
+      run: npm install --ignore-scripts
 
     - name: Install Linux native bindings
       shell: bash

.github/workflows/e2e-tests.yml

@@ -31,99 +31,24 @@ jobs:
       - name: Build server
         run: npm run build --workspace=apps/server
 
-      - name: Set up Git user
-        run: |
-          git config --global user.name "GitHub CI"
-          git config --global user.email "ci@example.com"
-
       - name: Start backend server
-        run: |
-          echo "Starting backend server..."
-          # Start server in background and save PID
-          npm run start --workspace=apps/server > backend.log 2>&1 &
-          SERVER_PID=$!
-          echo "Server started with PID: $SERVER_PID"
-          echo "SERVER_PID=$SERVER_PID" >> $GITHUB_ENV
-
+        run: npm run start --workspace=apps/server &
         env:
           PORT: 3008
           NODE_ENV: test
-          # Use a deterministic API key so Playwright can log in reliably
-          AUTOMAKER_API_KEY: test-api-key-for-e2e-tests
-          # Reduce log noise in CI
-          AUTOMAKER_HIDE_API_KEY: 'true'
-          # Avoid real API calls during CI
-          AUTOMAKER_MOCK_AGENT: 'true'
-          # Simulate containerized environment to skip sandbox confirmation dialogs
-          IS_CONTAINERIZED: 'true'
 
       - name: Wait for backend server
         run: |
           echo "Waiting for backend server to be ready..."
-
-          # Check if server process is running
-          if [ -z "$SERVER_PID" ]; then
-            echo "ERROR: Server PID not found in environment"
-            cat backend.log 2>/dev/null || echo "No backend log found"
-            exit 1
-          fi
-
-          # Check if process is actually running
-          if ! kill -0 $SERVER_PID 2>/dev/null; then
-            echo "ERROR: Server process $SERVER_PID is not running!"
-            echo "=== Backend logs ==="
-            cat backend.log
-            echo ""
-            echo "=== Recent system logs ==="
-            dmesg 2>/dev/null | tail -20 || echo "No dmesg available"
-            exit 1
-          fi
-
-          # Wait for health endpoint
-          for i in {1..60}; do
-            if curl -s -f http://localhost:3008/api/health > /dev/null 2>&1; then
+          for i in {1..30}; do
+            if curl -s http://localhost:3008/api/health > /dev/null 2>&1; then
               echo "Backend server is ready!"
-              echo "=== Backend logs ==="
-              cat backend.log
-              echo ""
-              echo "Health check response:"
-              curl -s http://localhost:3008/api/health | jq . 2>/dev/null || echo "Health check: $(curl -s http://localhost:3008/api/health 2>/dev/null || echo 'No response')"
               exit 0
             fi
-            
-            # Check if server process is still running
-            if ! kill -0 $SERVER_PID 2>/dev/null; then
-              echo "ERROR: Server process died during wait!"
-              echo "=== Backend logs ==="
-              cat backend.log
-              exit 1
-            fi
-            
-            echo "Waiting... ($i/60)"
+            echo "Waiting... ($i/30)"
             sleep 1
           done
-
-          echo "ERROR: Backend server failed to start within 60 seconds!"
-          echo "=== Backend logs ==="
-          cat backend.log
-          echo ""
-          echo "=== Process status ==="
-          ps aux | grep -E "(node|tsx)" | grep -v grep || echo "No node processes found"
-          echo ""
-          echo "=== Port status ==="
-          netstat -tlnp 2>/dev/null | grep :3008 || echo "Port 3008 not listening"
-          lsof -i :3008 2>/dev/null || echo "lsof not available or port not in use"
-          echo ""
-          echo "=== Health endpoint test ==="
-          curl -v http://localhost:3008/api/health 2>&1 || echo "Health endpoint failed"
-
-          # Kill the server process if it's still hanging
-          if kill -0 $SERVER_PID 2>/dev/null; then
-            echo ""
-            echo "Killing stuck server process..."
-            kill -9 $SERVER_PID 2>/dev/null || true
-          fi
-
+          echo "Backend server failed to start!"
           exit 1
 
       - name: Run E2E tests
@@ -134,20 +59,6 @@ jobs:
           CI: true
           VITE_SERVER_URL: http://localhost:3008
           VITE_SKIP_SETUP: 'true'
-          # Keep UI-side login/defaults consistent
-          AUTOMAKER_API_KEY: test-api-key-for-e2e-tests
-
-      - name: Print backend logs on failure
-        if: failure()
-        run: |
-          echo "=== E2E Tests Failed - Backend Logs ==="
-          cat backend.log 2>/dev/null || echo "No backend log found"
-          echo ""
-          echo "=== Process status at failure ==="
-          ps aux | grep -E "(node|tsx)" | grep -v grep || echo "No node processes found"
-          echo ""
-          echo "=== Port status ==="
-          netstat -tlnp 2>/dev/null | grep :3008 || echo "Port 3008 not listening"
 
       - name: Upload Playwright report
         uses: actions/upload-artifact@v4
@@ -157,22 +68,10 @@ jobs:
           path: apps/ui/playwright-report/
           retention-days: 7
 
-      - name: Upload test results (screenshots, traces, videos)
+      - name: Upload test results
         uses: actions/upload-artifact@v4
-        if: always()
+        if: failure()
         with:
           name: test-results
-          path: |
-            apps/ui/test-results/
+          path: apps/ui/test-results/
           retention-days: 7
-          if-no-files-found: ignore
-
-      - name: Cleanup - Kill backend server
-        if: always()
-        run: |
-          if [ -n "$SERVER_PID" ]; then
-            echo "Cleaning up backend server (PID: $SERVER_PID)..."
-            kill $SERVER_PID 2>/dev/null || true
-            kill -9 $SERVER_PID 2>/dev/null || true
-            echo "Backend server cleanup complete"
-          fi

.github/workflows/format-check.yml

@@ -25,7 +25,7 @@ jobs:
           cache-dependency-path: package-lock.json
 
       - name: Install dependencies
-        run: npm install --ignore-scripts --force
+        run: npm install --ignore-scripts
 
       - name: Check formatting
         run: npm run format:check

.github/workflows/release.yml

@@ -35,11 +35,6 @@ jobs:
         with:
           check-lockfile: 'true'
 
-      - name: Install RPM build tools (Linux)
-        if: matrix.os == 'ubuntu-latest'
-        shell: bash
-        run: sudo apt-get update && sudo apt-get install -y rpm
-
       - name: Build Electron app (macOS)
         if: matrix.os == 'macos-latest'
         shell: bash
@@ -78,7 +73,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: linux-builds
-          path: apps/ui/release/*.{AppImage,deb,rpm}
+          path: apps/ui/release/*.{AppImage,deb}
           retention-days: 30
 
   upload:
@@ -109,8 +104,8 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           files: |
-            artifacts/macos-builds/*.{dmg,zip,blockmap}
-            artifacts/windows-builds/*.{exe,blockmap}
-            artifacts/linux-builds/*.{AppImage,deb,rpm,blockmap}
+            artifacts/macos-builds/*
+            artifacts/windows-builds/*
+            artifacts/linux-builds/*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/security-audit.yml

@@ -26,5 +26,5 @@ jobs:
           check-lockfile: 'true'
 
       - name: Run npm audit
-        run: npm audit --audit-level=critical
+        run: npm audit --audit-level=moderate
         continue-on-error: false

.gitignore

@@ -73,9 +73,6 @@ blob-report/
 !.env.example
 !.env.local.example
 
-# Codex config (contains API keys)
-.codex/config.toml
-
 # TypeScript
 *.tsbuildinfo
 
@@ -87,11 +84,4 @@ docker-compose.override.yml
 .claude/hans/
 
 pnpm-lock.yaml
-yarn.lock
-
-# Fork-specific workflow files (should never be committed)
-# API key files
-data/.api-key
-data/credentials.json
-data/
-.codex/
+yarn.lock

.husky/pre-commit

@@ -31,12 +31,7 @@ fi
 
 # Ensure common system paths are in PATH (for systems without nvm)
 # This helps find node/npm installed via Homebrew, system packages, etc.
-if [ -n "$WINDIR" ]; then
-  export PATH="$PATH:/c/Program Files/nodejs:/c/Program Files (x86)/nodejs"
-  export PATH="$PATH:$APPDATA/npm:$LOCALAPPDATA/Programs/nodejs"
-else 
-  export PATH="$PATH:/usr/local/bin:/opt/homebrew/bin:/usr/bin"
-fi
+export PATH="$PATH:/usr/local/bin:/opt/homebrew/bin:/usr/bin"
 
 # Run lint-staged - works with or without nvm
 # Prefer npx, fallback to npm exec, both work with system-installed Node.js

CLAUDE.md

@@ -166,11 +166,7 @@ Use `resolveModelString()` from `@automaker/model-resolver` to convert model ali
 ## Environment Variables
 
 - `ANTHROPIC_API_KEY` - Anthropic API key (or use Claude Code CLI auth)
-- `HOST` - Host to bind server to (default: 0.0.0.0)
-- `HOSTNAME` - Hostname for user-facing URLs (default: localhost)
 - `PORT` - Server port (default: 3008)
 - `DATA_DIR` - Data storage directory (default: ./data)
 - `ALLOWED_ROOT_DIRECTORY` - Restrict file operations to specific directory
 - `AUTOMAKER_MOCK_AGENT=true` - Enable mock agent mode for CI testing
-- `AUTOMAKER_AUTO_LOGIN=true` - Skip login prompt in development (disabled when NODE_ENV=production)
-- `VITE_HOSTNAME` - Hostname for frontend API URLs (default: localhost)

CONTRIBUTING.md

@@ -24,7 +24,6 @@ For complete details on contribution terms and rights assignment, please review
     - [Development Setup](#development-setup)
     - [Project Structure](#project-structure)
   - [Pull Request Process](#pull-request-process)
-    - [Branching Strategy (RC Branches)](#branching-strategy-rc-branches)
     - [Branch Naming Convention](#branch-naming-convention)
     - [Commit Message Format](#commit-message-format)
     - [Submitting a Pull Request](#submitting-a-pull-request)
@@ -187,59 +186,6 @@ automaker/
 
 This section covers everything you need to know about contributing changes through pull requests, from creating your branch to getting your code merged.
 
-### Branching Strategy (RC Branches)
-
-Automaker uses **Release Candidate (RC) branches** for all development work. Understanding this workflow is essential before contributing.
-
-**How it works:**
-
-1. **All development happens on RC branches** - We maintain version-specific RC branches (e.g., `v0.10.0rc`, `v0.11.0rc`) where all active development occurs
-2. **RC branches are eventually merged to main** - Once an RC branch is stable and ready for release, it gets merged into `main`
-3. **Main branch is for releases only** - The `main` branch contains only released, stable code
-
-**Before creating a PR:**
-
-1. **Check for the latest RC branch** - Before starting work, check the repository for the current RC branch:
-
-   ```bash
-   git fetch upstream
-   git branch -r | grep rc
-   ```
-
-2. **Base your work on the RC branch** - Create your feature branch from the latest RC branch, not from `main`:
-
-   ```bash
-   # Find the latest RC branch (e.g., v0.11.0rc)
-   git checkout upstream/v0.11.0rc
-   git checkout -b feature/your-feature-name
-   ```
-
-3. **Target the RC branch in your PR** - When opening your pull request, set the base branch to the current RC branch, not `main`
-
-**Example workflow:**
-
-```bash
-# 1. Fetch latest changes
-git fetch upstream
-
-# 2. Check for RC branches
-git branch -r | grep rc
-# Output: upstream/v0.11.0rc
-
-# 3. Create your branch from the RC
-git checkout -b feature/add-dark-mode upstream/v0.11.0rc
-
-# 4. Make your changes and commit
-git commit -m "feat: Add dark mode support"
-
-# 5. Push to your fork
-git push origin feature/add-dark-mode
-
-# 6. Open PR targeting the RC branch (v0.11.0rc), NOT main
-```
-
-**Important:** PRs opened directly against `main` will be asked to retarget to the current RC branch.
-
 ### Branch Naming Convention
 
 We use a consistent branch naming pattern to keep our repository organized:
@@ -329,14 +275,14 @@ Follow these steps to submit your contribution:
 
 #### 1. Prepare Your Changes
 
-Ensure you've synced with the latest upstream changes from the RC branch:
+Ensure you've synced with the latest upstream changes:
 
 ```bash
 # Fetch latest changes from upstream
 git fetch upstream
 
-# Rebase your branch on the current RC branch (if needed)
-git rebase upstream/v0.11.0rc  # Use the current RC branch name
+# Rebase your branch on main (if needed)
+git rebase upstream/main
 ```
 
 #### 2. Run Pre-submission Checks
@@ -368,19 +314,18 @@ git push origin feature/your-feature-name
 
 1. Go to your fork on GitHub
 2. Click "Compare & pull request" for your branch
-3. **Important:** Set the base repository to `AutoMaker-Org/automaker` and the base branch to the **current RC branch** (e.g., `v0.11.0rc`), not `main`
+3. Ensure the base repository is `AutoMaker-Org/automaker` and base branch is `main`
 4. Fill out the PR template completely
 
 #### PR Requirements Checklist
 
 Your PR should include:
 
-- [ ] **Targets the current RC branch** (not `main`) - see [Branching Strategy](#branching-strategy-rc-branches)
 - [ ] **Clear title** describing the change (use conventional commit format)
 - [ ] **Description** explaining what changed and why
 - [ ] **Link to related issue** (if applicable): `Closes #123` or `Fixes #456`
 - [ ] **All CI checks passing** (format, lint, build, tests)
-- [ ] **No merge conflicts** with the RC branch
+- [ ] **No merge conflicts** with main branch
 - [ ] **Tests included** for new functionality
 - [ ] **Documentation updated** if adding/changing public APIs
 

DEVELOPMENT_WORKFLOW.md

@@ -1,253 +0,0 @@
-# Development Workflow
-
-This document defines the standard workflow for keeping a branch in sync with the upstream
-release candidate (RC) and for shipping feature work. It is paired with `check-sync.sh`.
-
-## Quick Decision Rule
-
-1. Ask the user to select a workflow:
-   - **Sync Workflow** → you are maintaining the current RC branch with fixes/improvements
-     and will push the same fixes to both origin and upstream RC when you have local
-     commits to publish.
-   - **PR Workflow** → you are starting new feature work on a new branch; upstream updates
-     happen via PR only.
-2. After the user selects, run:
-   ```bash
-   ./check-sync.sh
-   ```
-3. Use the status output to confirm alignment. If it reports **diverged**, default to
-   merging `upstream/<TARGET_RC>` into the current branch and preserving local commits.
-   For Sync Workflow, when the working tree is clean and you are behind upstream RC,
-   proceed with the fetch + merge without asking for additional confirmation.
-
-## Target RC Resolution
-
-The target RC is resolved dynamically so the workflow stays current as the RC changes.
-
-Resolution order:
-
-1. Latest `upstream/v*rc` branch (auto-detected)
-2. `upstream/HEAD` (fallback)
-3. If neither is available, you must pass `--rc <branch>`
-
-Override for a single run:
-
-```bash
-./check-sync.sh --rc <rc-branch>
-```
-
-## Pre-Flight Checklist
-
-1. Confirm a clean working tree:
-   ```bash
-   git status
-   ```
-2. Confirm the current branch:
-   ```bash
-   git branch --show-current
-   ```
-3. Ensure remotes exist (origin + upstream):
-   ```bash
-   git remote -v
-   ```
-
-## Sync Workflow (Upstream Sync)
-
-Use this flow when you are updating the current branch with fixes or improvements and
-intend to keep origin and upstream RC in lockstep.
-
-1. **Check sync status**
-   ```bash
-   ./check-sync.sh
-   ```
-2. **Update from upstream RC before editing (no pulls)**
-   - **Behind upstream RC** → fetch and merge RC into your branch:
-     ```bash
-     git fetch upstream
-     git merge upstream/<TARGET_RC> --no-edit
-     ```
-     When the working tree is clean and the user selected Sync Workflow, proceed without
-     an extra confirmation prompt.
-   - **Diverged** → stop and resolve manually.
-3. **Resolve conflicts if needed**
-   - Handle conflicts intelligently: preserve upstream behavior and your local intent.
-4. **Make changes and commit (if you are delivering fixes)**
-   ```bash
-   git add -A
-   git commit -m "type: description"
-   ```
-5. **Build to verify**
-   ```bash
-   npm run build:packages
-   npm run build
-   ```
-6. **Push after a successful merge to keep remotes aligned**
-   - If you only merged upstream RC changes, push **origin only** to sync your fork:
-     ```bash
-     git push origin <branch>
-     ```
-   - If you have local fixes to publish, push **origin + upstream**:
-     ```bash
-     git push origin <branch>
-     git push upstream <branch>:<TARGET_RC>
-     ```
-   - Always ask the user which push to perform.
-   - Origin (origin-only sync):
-     ```bash
-     git push origin <branch>
-     ```
-   - Upstream RC (publish the same fixes when you have local commits):
-     ```bash
-     git push upstream <branch>:<TARGET_RC>
-     ```
-7. **Re-check sync**
-   ```bash
-   ./check-sync.sh
-   ```
-
-## PR Workflow (Feature Work)
-
-Use this flow only for new feature work on a new branch. Do not push to upstream RC.
-
-1. **Create or switch to a feature branch**
-   ```bash
-   git checkout -b <branch>
-   ```
-2. **Make changes and commit**
-   ```bash
-   git add -A
-   git commit -m "type: description"
-   ```
-3. **Merge upstream RC before shipping**
-   ```bash
-   git merge upstream/<TARGET_RC> --no-edit
-   ```
-4. **Build and/or test**
-   ```bash
-   npm run build:packages
-   npm run build
-   ```
-5. **Push to origin**
-   ```bash
-   git push -u origin <branch>
-   ```
-6. **Create or update the PR**
-   - Use `gh pr create` or the GitHub UI.
-7. **Review and follow-up**
-
-- Apply feedback, commit changes, and push again.
-- Re-run `./check-sync.sh` if additional upstream sync is needed.
-
-## Conflict Resolution Checklist
-
-1. Identify which changes are from upstream vs. local.
-2. Preserve both behaviors where possible; avoid dropping either side.
-3. Prefer minimal, safe integrations over refactors.
-4. Re-run build commands after resolving conflicts.
-5. Re-run `./check-sync.sh` to confirm status.
-
-## Build/Test Matrix
-
-- **Sync Workflow**: `npm run build:packages` and `npm run build`.
-- **PR Workflow**: `npm run build:packages` and `npm run build` (plus relevant tests).
-
-## Post-Sync Verification
-
-1. `git status` should be clean.
-2. `./check-sync.sh` should show expected alignment.
-3. Verify recent commits with:
-   ```bash
-   git log --oneline -5
-   ```
-
-## check-sync.sh Usage
-
-- Uses dynamic Target RC resolution (see above).
-- Override target RC:
-  ```bash
-  ./check-sync.sh --rc <rc-branch>
-  ```
-- Optional preview limit:
-  ```bash
-  ./check-sync.sh --preview 10
-  ```
-- The script prints sync status for both origin and upstream and previews recent commits
-  when you are behind.
-
-## Stop Conditions
-
-Stop and ask for guidance if any of the following are true:
-
-- The working tree is dirty and you are about to merge or push.
-- `./check-sync.sh` reports **diverged** during PR Workflow, or a merge cannot be completed.
-- The script cannot resolve a target RC and requests `--rc`.
-- A build fails after sync or conflict resolution.
-
-## AI Agent Guardrails
-
-- Always run `./check-sync.sh` before merges or pushes.
-- Always ask for explicit user approval before any push command.
-- Do not ask for additional confirmation before a Sync Workflow fetch + merge when the
-  working tree is clean and the user has already selected the Sync Workflow.
-- Choose Sync vs PR workflow based on intent (RC maintenance vs new feature work), not
-  on the script's workflow hint.
-- Only use force push when the user explicitly requests a history rewrite.
-- Ask for explicit approval before dependency installs, branch deletion, or destructive operations.
-- When resolving merge conflicts, preserve both upstream changes and local intent where possible.
-- Do not create or switch to new branches unless the user explicitly requests it.
-
-## AI Agent Decision Guidance
-
-Agents should provide concrete, task-specific suggestions instead of repeatedly asking
-open-ended questions. Use the user's stated goal and the `./check-sync.sh` status to
-propose a default path plus one or two alternatives, and only ask for confirmation when
-an action requires explicit approval.
-
-Default behavior:
-
-- If the intent is RC maintenance, recommend the Sync Workflow and proceed with
-  safe preparation steps (status checks, previews). If the branch is behind upstream RC,
-  fetch and merge without additional confirmation when the working tree is clean, then
-  push to origin to keep the fork aligned. Push upstream only when there are local fixes
-  to publish.
-- If the intent is new feature work, recommend the PR Workflow and proceed with safe
-  preparation steps (status checks, identifying scope). Ask for approval before merges,
-  pushes, or dependency installs.
-- If `./check-sync.sh` reports **diverged** during Sync Workflow, merge
-  `upstream/<TARGET_RC>` into the current branch and preserve local commits.
-- If `./check-sync.sh` reports **diverged** during PR Workflow, stop and ask for guidance
-  with a short explanation of the divergence and the minimal options to resolve it.
-  If the user's intent is RC maintenance, prefer the Sync Workflow regardless of the
-  script hint. When the intent is new feature work, use the PR Workflow and avoid upstream
-  RC pushes.
-
-Suggestion format (keep it short):
-
-- **Recommended**: one sentence with the default path and why it fits the task.
-- **Alternatives**: one or two options with the tradeoff or prerequisite.
-- **Approval points**: mention any upcoming actions that need explicit approval (exclude sync
-  workflow pushes and merges).
-
-## Failure Modes and How to Avoid Them
-
-Sync Workflow:
-
-- Wrong RC target: verify the auto-detected RC in `./check-sync.sh` output before merging.
-- Diverged from upstream RC: stop and resolve manually before any merge or push.
-- Dirty working tree: commit or stash before syncing to avoid accidental merges.
-- Missing remotes: ensure both `origin` and `upstream` are configured before syncing.
-- Build breaks after sync: run `npm run build:packages` and `npm run build` before pushing.
-
-PR Workflow:
-
-- Branch not synced to current RC: re-run `./check-sync.sh` and merge RC before shipping.
-- Pushing the wrong branch: confirm `git branch --show-current` before pushing.
-- Unreviewed changes: always commit and push to origin before opening or updating a PR.
-- Skipped tests/builds: run the build commands before declaring the PR ready.
-
-## Notes
-
-- Avoid merging with uncommitted changes; commit or stash first.
-- Prefer merge over rebase for PR branches; rebases rewrite history and often require a force push,
-  which should only be done with an explicit user request.
-- Use clear, conventional commit messages and split unrelated changes into separate commits.

Dockerfile

@@ -55,26 +55,9 @@ RUN npm run build:packages && npm run build --workspace=apps/server
 # =============================================================================
 FROM node:22-slim AS server
 
-# Build argument for tracking which commit this image was built from
-ARG GIT_COMMIT_SHA=unknown
-LABEL automaker.git.commit.sha="${GIT_COMMIT_SHA}"
-
-# Build arguments for user ID matching (allows matching host user for mounted volumes)
-# Override at build time: docker build --build-arg UID=$(id -u) --build-arg GID=$(id -g) ...
-ARG UID=1001
-ARG GID=1001
-
 # Install git, curl, bash (for terminal), gosu (for user switching), and GitHub CLI (pinned version, multi-arch)
-# Also install Playwright/Chromium system dependencies (aligns with playwright install-deps on Debian/Ubuntu)
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    git curl bash gosu ca-certificates openssh-client \
-    # Playwright/Chromium dependencies
-    libglib2.0-0 libnss3 libnspr4 libdbus-1-3 libatk1.0-0 libatk-bridge2.0-0 \
-    libcups2 libdrm2 libxkbcommon0 libatspi2.0-0 libxcomposite1 libxdamage1 \
-    libxfixes3 libxrandr2 libgbm1 libasound2 libpango-1.0-0 libcairo2 \
-    libx11-6 libx11-xcb1 libxcb1 libxext6 libxrender1 libxss1 libxtst6 \
-    libxshmfence1 libgtk-3-0 libexpat1 libfontconfig1 fonts-liberation \
-    xdg-utils libpangocairo-1.0-0 libpangoft2-1.0-0 libu2f-udev libvulkan1 \
+    git curl bash gosu ca-certificates \
     && GH_VERSION="2.63.2" \
     && ARCH=$(uname -m) \
     && case "$ARCH" in \
@@ -92,10 +75,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN npm install -g @anthropic-ai/claude-code
 
 # Create non-root user with home directory BEFORE installing Cursor CLI
-# Uses UID/GID build args to match host user for mounted volume permissions
-# Use -o flag to allow non-unique IDs (GID 1000 may already exist as 'node' group)
-RUN groupadd -o -g ${GID} automaker && \
-    useradd -o -u ${UID} -g automaker -m -d /home/automaker -s /bin/bash automaker && \
+RUN groupadd -g 1001 automaker && \
+    useradd -u 1001 -g automaker -m -d /home/automaker -s /bin/bash automaker && \
     mkdir -p /home/automaker/.local/bin && \
     mkdir -p /home/automaker/.cursor && \
     chown -R automaker:automaker /home/automaker && \
@@ -110,12 +91,6 @@ RUN curl https://cursor.com/install -fsS | bash && \
     ls -la /home/automaker/.local/bin/ && \
     echo "=== PATH is: $PATH ===" && \
     (which cursor-agent && cursor-agent --version) || echo "cursor-agent installed (may need auth setup)"
-
-# Install OpenCode CLI (for multi-provider AI model access)
-RUN curl -fsSL https://opencode.ai/install | bash && \
-    echo "=== Checking OpenCode CLI installation ===" && \
-    ls -la /home/automaker/.local/bin/ && \
-    (which opencode && opencode --version) || echo "opencode installed (may need auth setup)"
 USER root
 
 # Add PATH to profile so it's available in all interactive shells (for login shells)
@@ -209,10 +184,6 @@ RUN npm run build:packages && npm run build --workspace=apps/ui
 # =============================================================================
 FROM nginx:alpine AS ui
 
-# Build argument for tracking which commit this image was built from
-ARG GIT_COMMIT_SHA=unknown
-LABEL automaker.git.commit.sha="${GIT_COMMIT_SHA}"
-
 # Copy built files
 COPY --from=ui-builder /app/apps/ui/dist /usr/share/nginx/html
 

Dockerfile.dev

@@ -1,94 +0,0 @@
-# Automaker Development Dockerfile
-# For development with live reload via volume mounting
-# Source code is NOT copied - it's mounted as a volume
-#
-# Usage:
-#   docker compose -f docker-compose.dev.yml up
-
-FROM node:22-slim
-
-# Install build dependencies for native modules (node-pty) and runtime tools
-# Also install Playwright/Chromium system dependencies (aligns with playwright install-deps on Debian/Ubuntu)
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    python3 make g++ \
-    git curl bash gosu ca-certificates openssh-client \
-    # Playwright/Chromium dependencies
-    libglib2.0-0 libnss3 libnspr4 libdbus-1-3 libatk1.0-0 libatk-bridge2.0-0 \
-    libcups2 libdrm2 libxkbcommon0 libatspi2.0-0 libxcomposite1 libxdamage1 \
-    libxfixes3 libxrandr2 libgbm1 libasound2 libpango-1.0-0 libcairo2 \
-    libx11-6 libx11-xcb1 libxcb1 libxext6 libxrender1 libxss1 libxtst6 \
-    libxshmfence1 libgtk-3-0 libexpat1 libfontconfig1 fonts-liberation \
-    xdg-utils libpangocairo-1.0-0 libpangoft2-1.0-0 libu2f-udev libvulkan1 \
-    && GH_VERSION="2.63.2" \
-    && ARCH=$(uname -m) \
-    && case "$ARCH" in \
-        x86_64) GH_ARCH="amd64" ;; \
-        aarch64|arm64) GH_ARCH="arm64" ;; \
-        *) echo "Unsupported architecture: $ARCH" && exit 1 ;; \
-    esac \
-    && curl -L "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_${GH_ARCH}.tar.gz" -o gh.tar.gz \
-    && tar -xzf gh.tar.gz \
-    && mv gh_${GH_VERSION}_linux_${GH_ARCH}/bin/gh /usr/local/bin/gh \
-    && rm -rf gh.tar.gz gh_${GH_VERSION}_linux_${GH_ARCH} \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install Claude CLI globally
-RUN npm install -g @anthropic-ai/claude-code
-
-# Build arguments for user ID matching (allows matching host user for mounted volumes)
-# Override at build time: docker-compose build --build-arg UID=$(id -u) --build-arg GID=$(id -g)
-ARG UID=1001
-ARG GID=1001
-
-# Create non-root user with configurable UID/GID
-# Use -o flag to allow non-unique IDs (GID 1000 may already exist as 'node' group)
-RUN groupadd -o -g ${GID} automaker && \
-    useradd -o -u ${UID} -g automaker -m -d /home/automaker -s /bin/bash automaker && \
-    mkdir -p /home/automaker/.local/bin && \
-    mkdir -p /home/automaker/.cursor && \
-    chown -R automaker:automaker /home/automaker && \
-    chmod 700 /home/automaker/.cursor
-
-# Install Cursor CLI as automaker user
-USER automaker
-ENV HOME=/home/automaker
-RUN curl https://cursor.com/install -fsS | bash || true
-USER root
-
-# Add PATH to profile for Cursor CLI
-RUN mkdir -p /etc/profile.d && \
-    echo 'export PATH="/home/automaker/.local/bin:$PATH"' > /etc/profile.d/cursor-cli.sh && \
-    chmod +x /etc/profile.d/cursor-cli.sh
-
-# Add to user bashrc files
-RUN echo 'export PATH="/home/automaker/.local/bin:$PATH"' >> /home/automaker/.bashrc && \
-    chown automaker:automaker /home/automaker/.bashrc
-RUN echo 'export PATH="/home/automaker/.local/bin:$PATH"' >> /root/.bashrc
-
-WORKDIR /app
-
-# Create directories with proper permissions
-RUN mkdir -p /data /projects && chown automaker:automaker /data /projects
-
-# Configure git for mounted volumes
-RUN git config --system --add safe.directory '*' && \
-    git config --system credential.helper '!gh auth git-credential'
-
-# Copy entrypoint script
-COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
-RUN chmod +x /usr/local/bin/docker-entrypoint.sh
-
-# Environment variables
-ENV PORT=3008
-ENV DATA_DIR=/data
-ENV HOME=/home/automaker
-ENV PATH="/home/automaker/.local/bin:${PATH}"
-
-# Expose both dev ports
-EXPOSE 3007 3008
-
-# Use entrypoint for permission handling
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-
-# Default command - will be overridden by docker-compose
-CMD ["npm", "run", "dev:web"]

README.md

@@ -28,7 +28,6 @@
   - [Quick Start](#quick-start)
 - [How to Run](#how-to-run)
   - [Development Mode](#development-mode)
-  - [Interactive TUI Launcher](#interactive-tui-launcher-recommended-for-new-users)
   - [Building for Production](#building-for-production)
   - [Testing](#testing)
   - [Linting](#linting)
@@ -102,9 +101,11 @@ In the Discord, you can:
 
 ### Prerequisites
 
-- **Node.js 22+** (required: >=22.0.0 <23.0.0)
+- **Node.js 18+** (tested with Node.js 22)
 - **npm** (comes with Node.js)
-- **[Claude Code CLI](https://code.claude.com/docs/en/overview)** - Install and authenticate with your Anthropic subscription. Automaker integrates with your authenticated Claude Code CLI to access Claude models.
+- **Authentication** (choose one):
+  - **[Claude Code CLI](https://code.claude.com/docs/en/overview)** (recommended) - Install and authenticate, credentials used automatically
+  - **Anthropic API Key** - Direct API key for Claude Agent SDK ([get one here](https://console.anthropic.com/))
 
 ### Quick Start
 
@@ -116,16 +117,40 @@ cd automaker
 # 2. Install dependencies
 npm install
 
-# 3. Start Automaker
-npm run dev
+# 3. Build shared packages (Now can be skipped npm install / run dev does it automaticly)
+npm run build:packages
+
+# 4. Start Automaker (production mode)
+npm run start
 # Choose between:
 #   1. Web Application (browser at localhost:3007)
 #   2. Desktop Application (Electron - recommended)
 ```
 
-**Authentication:** Automaker integrates with your authenticated Claude Code CLI. Make sure you have [installed and authenticated](https://code.claude.com/docs/en/quickstart) the Claude Code CLI before running Automaker. Your CLI credentials will be detected automatically.
+**Note:** The `npm run start` command will:
 
-**For Development:** `npm run dev` starts the development server with Vite live reload and hot module replacement for fast refresh and instant updates as you make changes.
+- Check for dependencies and install if needed
+- Build the application if needed
+- Kill any processes on ports 3007/3008
+- Present an interactive menu to choose your run mode
+- Run in production mode (no hot reload)
+
+**Authentication Setup:** On first run, Automaker will automatically show a setup wizard where you can configure authentication. You can choose to:
+
+- Use **Claude Code CLI** (recommended) - Automaker will detect your CLI credentials automatically
+- Enter an **API key** directly in the wizard
+
+If you prefer to set up authentication before running (e.g., for headless deployments or CI/CD), you can set it manually:
+
+```bash
+# Option A: Environment variable
+export ANTHROPIC_API_KEY="sk-ant-..."
+
+# Option B: Create .env file in project root
+echo "ANTHROPIC_API_KEY=sk-ant-..." > .env
+```
+
+**For Development:** If you want to develop on Automaker with Vite live reload and hot module replacement, use `npm run dev` instead. This will start the development server with fast refresh and instant updates as you make changes.
 
 ## How to Run
 
@@ -162,40 +187,6 @@ npm run dev:electron:wsl:gpu
 npm run dev:web
 ```
 
-### Interactive TUI Launcher (Recommended for New Users)
-
-For a user-friendly interactive menu, use the built-in TUI launcher script:
-
-```bash
-# Show interactive menu with all launch options
-./start-automaker.sh
-
-# Or launch directly without menu
-./start-automaker.sh web          # Web browser
-./start-automaker.sh electron     # Desktop app
-./start-automaker.sh electron-debug  # Desktop + DevTools
-
-# Additional options
-./start-automaker.sh --help       # Show all available options
-./start-automaker.sh --version    # Show version information
-./start-automaker.sh --check-deps # Verify project dependencies
-./start-automaker.sh --no-colors  # Disable colored output
-./start-automaker.sh --no-history # Don't remember last choice
-```
-
-**Features:**
-
-- 🎨 Beautiful terminal UI with gradient colors and ASCII art
-- ⌨️ Interactive menu (press 1-3 to select, Q to exit)
-- 💾 Remembers your last choice
-- ✅ Pre-flight checks (validates Node.js, npm, dependencies)
-- 📏 Responsive layout (adapts to terminal size)
-- ⏱️ 30-second timeout for hands-free selection
-- 🌐 Cross-shell compatible (bash/zsh)
-
-**History File:**
-Your last selected mode is saved in `~/.automaker_launcher_history` for quick re-runs.
-
 ### Building for Production
 
 #### Web Application
@@ -203,6 +194,9 @@ Your last selected mode is saved in `~/.automaker_launcher_history` for quick re
 ```bash
 # Build for web deployment (uses Vite)
 npm run build
+
+# Run production build
+npm run start
 ```
 
 #### Desktop Application
@@ -214,30 +208,11 @@ npm run build:electron
 # Platform-specific builds
 npm run build:electron:mac     # macOS (DMG + ZIP, x64 + arm64)
 npm run build:electron:win     # Windows (NSIS installer, x64)
-npm run build:electron:linux   # Linux (AppImage + DEB + RPM, x64)
+npm run build:electron:linux   # Linux (AppImage + DEB, x64)
 
 # Output directory: apps/ui/release/
 ```
 
-**Linux Distribution Packages:**
-
-- **AppImage**: Universal format, works on any Linux distribution
-- **DEB**: Ubuntu, Debian, Linux Mint, Pop!\_OS
-- **RPM**: Fedora, RHEL, Rocky Linux, AlmaLinux, openSUSE
-
-**Installing on Fedora/RHEL:**
-
-```bash
-# Download the RPM package
-wget https://github.com/AutoMaker-Org/automaker/releases/latest/download/Automaker-<version>-x86_64.rpm
-
-# Install with dnf (Fedora)
-sudo dnf install ./Automaker-<version>-x86_64.rpm
-
-# Or with yum (RHEL/CentOS)
-sudo yum localinstall ./Automaker-<version>-x86_64.rpm
-```
-
 #### Docker Deployment
 
 Docker provides the most secure way to run Automaker by isolating it from your host filesystem.
@@ -256,9 +231,16 @@ docker-compose logs -f
 docker-compose down
 ```
 
-##### Authentication
+##### Configuration
 
-Automaker integrates with your authenticated Claude Code CLI. To use CLI authentication in Docker, mount your Claude CLI config directory (see [Claude CLI Authentication](#claude-cli-authentication) below).
+Create a `.env` file in the project root if using API key authentication:
+
+```bash
+# Optional: Anthropic API key (not needed if using Claude CLI authentication)
+ANTHROPIC_API_KEY=sk-ant-...
+```
+
+**Note:** Most users authenticate via Claude CLI instead of API keys. See [Claude CLI Authentication](#claude-cli-authentication-optional) below.
 
 ##### Working with Projects (Host Directory Access)
 
@@ -272,9 +254,9 @@ services:
       - /path/to/your/project:/projects/your-project
 ```
 
-##### Claude CLI Authentication
+##### Claude CLI Authentication (Optional)
 
-Mount your Claude CLI config directory to use your authenticated CLI credentials:
+To use Claude Code CLI authentication instead of an API key, mount your Claude CLI config directory:
 
 ```yaml
 services:
@@ -372,6 +354,10 @@ npm run lint
 
 ### Environment Configuration
 
+#### Authentication (if not using Claude Code CLI)
+
+- `ANTHROPIC_API_KEY` - Your Anthropic API key for Claude Agent SDK (not needed if using Claude Code CLI)
+
 #### Optional - Server
 
 - `PORT` - Server port (default: 3008)
@@ -382,23 +368,49 @@ npm run lint
 
 - `AUTOMAKER_API_KEY` - Optional API authentication for the server
 - `ALLOWED_ROOT_DIRECTORY` - Restrict file operations to specific directory
-- `CORS_ORIGIN` - CORS allowed origins (comma-separated list; defaults to localhost only)
+- `CORS_ORIGIN` - CORS policy (default: \*)
 
 #### Optional - Development
 
 - `VITE_SKIP_ELECTRON` - Skip Electron in dev mode
 - `OPEN_DEVTOOLS` - Auto-open DevTools in Electron
-- `AUTOMAKER_SKIP_SANDBOX_WARNING` - Skip sandbox warning dialog (useful for dev/CI)
-- `AUTOMAKER_AUTO_LOGIN=true` - Skip login prompt in development (ignored when NODE_ENV=production)
 
 ### Authentication Setup
 
-Automaker integrates with your authenticated Claude Code CLI and uses your Anthropic subscription.
+#### Option 1: Claude Code CLI (Recommended)
 
 Install and authenticate the Claude Code CLI following the [official quickstart guide](https://code.claude.com/docs/en/quickstart).
 
 Once authenticated, Automaker will automatically detect and use your CLI credentials. No additional configuration needed!
 
+#### Option 2: Direct API Key
+
+If you prefer not to use the CLI, you can provide an Anthropic API key directly using one of these methods:
+
+##### 2a. Shell Configuration
+
+Add to your `~/.bashrc` or `~/.zshrc`:
+
+```bash
+export ANTHROPIC_API_KEY="sk-ant-..."
+```
+
+Then restart your terminal or run `source ~/.bashrc` (or `source ~/.zshrc`).
+
+##### 2b. .env File
+
+Create a `.env` file in the project root (gitignored):
+
+```bash
+ANTHROPIC_API_KEY=sk-ant-...
+PORT=3008
+DATA_DIR=./data
+```
+
+##### 2c. In-App Storage
+
+The application can store your API key securely in the settings UI. The key is persisted in the `DATA_DIR` directory.
+
 ## Features
 
 ### Core Workflow
@@ -507,24 +519,20 @@ Automaker provides several specialized views accessible via the sidebar or keybo
 | **Agent**          | `A`      | Interactive chat sessions with AI agents for exploratory work and questions                      |
 | **Spec**           | `D`      | Project specification editor with AI-powered generation and feature suggestions                  |
 | **Context**        | `C`      | Manage context files (markdown, images) that AI agents automatically reference                   |
+| **Profiles**       | `M`      | Create and manage AI agent profiles with custom prompts and configurations                       |
 | **Settings**       | `S`      | Configure themes, shortcuts, defaults, authentication, and more                                  |
 | **Terminal**       | `T`      | Integrated terminal with tabs, splits, and persistent sessions                                   |
-| **Graph**          | `H`      | Visualize feature dependencies with interactive graph visualization                              |
-| **Ideation**       | `I`      | Brainstorm and generate ideas with AI assistance                                                 |
-| **Memory**         | `Y`      | View and manage agent memory and conversation history                                            |
-| **GitHub Issues**  | `G`      | Import and validate GitHub issues, convert to tasks                                              |
-| **GitHub PRs**     | `R`      | View and manage GitHub pull requests                                                             |
+| **GitHub Issues**  | -        | Import and validate GitHub issues, convert to tasks                                              |
 | **Running Agents** | -        | View all active agents across projects with status and progress                                  |
 
 ### Keyboard Navigation
 
 All shortcuts are customizable in Settings. Default shortcuts:
 
-- **Navigation:** `K` (Board), `A` (Agent), `D` (Spec), `C` (Context), `S` (Settings), `T` (Terminal), `H` (Graph), `I` (Ideation), `Y` (Memory), `G` (GitHub Issues), `R` (GitHub PRs)
+- **Navigation:** `K` (Board), `A` (Agent), `D` (Spec), `C` (Context), `S` (Settings), `M` (Profiles), `T` (Terminal)
 - **UI:** `` ` `` (Toggle sidebar)
-- **Actions:** `N` (New item in current view), `O` (Open project), `P` (Project picker)
+- **Actions:** `N` (New item in current view), `G` (Start next features), `O` (Open project), `P` (Project picker)
 - **Projects:** `Q`/`E` (Cycle previous/next project)
-- **Terminal:** `Alt+D` (Split right), `Alt+S` (Split down), `Alt+W` (Close), `Alt+T` (New tab)
 
 ## Architecture
 
@@ -589,16 +597,10 @@ Stored in `{projectPath}/.automaker/`:
 │       ├── agent-output.md # AI agent output log
 │       └── images/        # Attached images
 ├── context/               # Context files for AI agents
-├── worktrees/             # Git worktree metadata
-├── validations/           # GitHub issue validation results
-├── ideation/              # Brainstorming and analysis data
-│   └── analysis.json      # Project structure analysis
-├── board/                 # Board-related data
-├── images/                # Project-level images
 ├── settings.json          # Project-specific settings
-├── app_spec.txt           # Project specification (XML format)
-├── active-branches.json   # Active git branches tracking
-└── execution-state.json   # Auto-mode execution state
+├── spec.md               # Project specification
+├── analysis.json         # Project structure analysis
+└── feature-suggestions.json # AI-generated suggestions
 ```
 
 #### Global Data
@@ -636,6 +638,7 @@ data/
 
 - [Contributing Guide](./CONTRIBUTING.md) - How to contribute to Automaker
 - [Project Documentation](./docs/) - Architecture guides, patterns, and developer docs
+- [Docker Isolation Guide](./docs/docker-isolation.md) - Security-focused Docker deployment
 - [Shared Packages Guide](./docs/llm-shared-packages.md) - Using monorepo packages
 
 ### Community

SECURITY_TODO.md

@@ -1,300 +0,0 @@
-# Security Audit Findings - v0.13.0rc Branch
-
-**Date:** $(date)  
-**Audit Type:** Git diff security review against v0.13.0rc branch  
-**Status:** ⚠️ Security vulnerabilities found - requires fixes before release
-
-## Executive Summary
-
-No intentionally malicious code was detected in the changes. However, several **critical security vulnerabilities** were identified that could allow command injection attacks. These must be fixed before release.
-
----
-
-## 🔴 Critical Security Issues
-
-### 1. Command Injection in Merge Handler
-
-**File:** `apps/server/src/routes/worktree/routes/merge.ts`  
-**Lines:** 43, 54, 65-66, 93  
-**Severity:** CRITICAL
-
-**Issue:**
-User-controlled inputs (`branchName`, `mergeTo`, `options?.message`) are directly interpolated into shell commands without validation, allowing command injection attacks.
-
-**Vulnerable Code:**
-
-```typescript
-// Line 43 - branchName not validated
-await execAsync(`git rev-parse --verify ${branchName}`, { cwd: projectPath });
-
-// Line 54 - mergeTo not validated
-await execAsync(`git rev-parse --verify ${mergeTo}`, { cwd: projectPath });
-
-// Lines 65-66 - branchName and message not validated
-const mergeCmd = options?.squash
-  ? `git merge --squash ${branchName}`
-  : `git merge ${branchName} -m "${options?.message || `Merge ${branchName} into ${mergeTo}`}"`;
-
-// Line 93 - message not sanitized
-await execAsync(`git commit -m "${options?.message || `Merge ${branchName} (squash)`}"`, {
-  cwd: projectPath,
-});
-```
-
-**Attack Vector:**
-An attacker could inject shell commands via branch names or commit messages:
-
-- Branch name: `main; rm -rf /`
-- Commit message: `"; malicious_command; "`
-
-**Fix Required:**
-
-1. Validate `branchName` and `mergeTo` using `isValidBranchName()` before use
-2. Sanitize commit messages or use `execGitCommand` with proper escaping
-3. Replace `execAsync` template literals with `execGitCommand` array-based calls
-
-**Note:** `isValidBranchName` is imported but only used AFTER deletion (line 119), not before execAsync calls.
-
----
-
-### 2. Command Injection in Push Handler
-
-**File:** `apps/server/src/routes/worktree/routes/push.ts`  
-**Lines:** 44, 49  
-**Severity:** CRITICAL
-
-**Issue:**
-User-controlled `remote` parameter and `branchName` are directly interpolated into shell commands without validation.
-
-**Vulnerable Code:**
-
-```typescript
-// Line 38 - remote defaults to 'origin' but not validated
-const targetRemote = remote || 'origin';
-
-// Lines 44, 49 - targetRemote and branchName not validated
-await execAsync(`git push -u ${targetRemote} ${branchName} ${forceFlag}`, {
-  cwd: worktreePath,
-});
-await execAsync(`git push --set-upstream ${targetRemote} ${branchName} ${forceFlag}`, {
-  cwd: worktreePath,
-});
-```
-
-**Attack Vector:**
-An attacker could inject commands via the remote name:
-
-- Remote: `origin; malicious_command; #`
-
-**Fix Required:**
-
-1. Validate `targetRemote` parameter (alphanumeric + `-`, `_` only)
-2. Validate `branchName` before use (even though it comes from git output)
-3. Use `execGitCommand` with array arguments instead of template literals
-
----
-
-### 3. Unsafe Environment Variable Export in Shell Script
-
-**File:** `start-automaker.sh`  
-**Lines:** 5068, 5085  
-**Severity:** CRITICAL
-
-**Issue:**
-Unsafe parsing and export of `.env` file contents using `xargs` without proper handling of special characters.
-
-**Vulnerable Code:**
-
-```bash
-export $(grep -v '^#' .env | xargs)
-```
-
-**Attack Vector:**
-If `.env` file contains malicious content with spaces, special characters, or code, it could be executed:
-
-- `.env` entry: `VAR="value; malicious_command"`
-- Could lead to code execution during startup
-
-**Fix Required:**
-Replace with safer parsing method:
-
-```bash
-# Safer approach
-set -a
-source <(grep -v '^#' .env | sed 's/^/export /')
-set +a
-
-# Or even safer - validate each line
-while IFS= read -r line; do
-  [[ "$line" =~ ^[[:space:]]*# ]] && continue
-  [[ -z "$line" ]] && continue
-  if [[ "$line" =~ ^([A-Za-z_][A-Za-z0-9_]*)=(.*)$ ]]; then
-    export "${BASH_REMATCH[1]}"="${BASH_REMATCH[2]}"
-  fi
-done < .env
-```
-
----
-
-## 🟡 Moderate Security Concerns
-
-### 4. Inconsistent Use of Secure Command Execution
-
-**Issue:**
-The codebase has `execGitCommand()` function available (which uses array arguments and is safer), but it's not consistently used. Some places still use `execAsync` with template literals.
-
-**Files Affected:**
-
-- `apps/server/src/routes/worktree/routes/merge.ts`
-- `apps/server/src/routes/worktree/routes/push.ts`
-
-**Recommendation:**
-
-- Audit all `execAsync` calls with template literals
-- Replace with `execGitCommand` where possible
-- Document when `execAsync` is acceptable (only with fully validated inputs)
-
----
-
-### 5. Missing Input Validation
-
-**Issues:**
-
-1. `targetRemote` in `push.ts` defaults to 'origin' but isn't validated
-2. Commit messages in `merge.ts` aren't sanitized before use in shell commands
-3. `worktreePath` validation relies on middleware but should be double-checked
-
-**Recommendation:**
-
-- Add validation functions for remote names
-- Sanitize commit messages (remove shell metacharacters)
-- Add defensive validation even when middleware exists
-
----
-
-## ✅ Positive Security Findings
-
-1. **No Hardcoded Credentials:** No API keys, passwords, or tokens found in the diff
-2. **No Data Exfiltration:** No suspicious network requests or data transmission patterns
-3. **No Backdoors:** No hidden functionality or unauthorized access patterns detected
-4. **Safe Command Execution:** `execGitCommand` function properly uses array arguments in some places
-5. **Environment Variable Handling:** `init-script-service.ts` properly sanitizes environment variables (lines 194-220)
-
----
-
-## 📋 Action Items
-
-### Immediate (Before Release)
-
-- [ ] **Fix command injection in `merge.ts`**
-  - [ ] Validate `branchName` with `isValidBranchName()` before line 43
-  - [ ] Validate `mergeTo` with `isValidBranchName()` before line 54
-  - [ ] Sanitize commit messages or use `execGitCommand` for merge commands
-  - [ ] Replace `execAsync` template literals with `execGitCommand` array calls
-
-- [ ] **Fix command injection in `push.ts`**
-  - [ ] Add validation function for remote names
-  - [ ] Validate `targetRemote` before use
-  - [ ] Validate `branchName` before use (defensive programming)
-  - [ ] Replace `execAsync` template literals with `execGitCommand`
-
-- [ ] **Fix shell script security issue**
-  - [ ] Replace unsafe `export $(grep ... | xargs)` with safer parsing
-  - [ ] Add validation for `.env` file contents
-  - [ ] Test with edge cases (spaces, special chars, quotes)
-
-### Short-term (Next Sprint)
-
-- [ ] **Audit all `execAsync` calls**
-  - [ ] Create inventory of all `execAsync` calls with template literals
-  - [ ] Replace with `execGitCommand` where possible
-  - [ ] Document exceptions and why they're safe
-
-- [ ] **Add input validation utilities**
-  - [ ] Create `isValidRemoteName()` function
-  - [ ] Create `sanitizeCommitMessage()` function
-  - [ ] Add validation for all user-controlled inputs
-
-- [ ] **Security testing**
-  - [ ] Add unit tests for command injection prevention
-  - [ ] Add integration tests with malicious inputs
-  - [ ] Test shell script with malicious `.env` files
-
-### Long-term (Security Hardening)
-
-- [ ] **Code review process**
-  - [ ] Add security checklist for PR reviews
-  - [ ] Require security review for shell command execution changes
-  - [ ] Add automated security scanning
-
-- [ ] **Documentation**
-  - [ ] Document secure coding practices for shell commands
-  - [ ] Create security guidelines for contributors
-  - [ ] Add security section to CONTRIBUTING.md
-
----
-
-## 🔍 Testing Recommendations
-
-### Command Injection Tests
-
-```typescript
-// Test cases for merge.ts
-describe('merge handler security', () => {
-  it('should reject branch names with shell metacharacters', () => {
-    // Test: branchName = "main; rm -rf /"
-    // Expected: Validation error, command not executed
-  });
-
-  it('should sanitize commit messages', () => {
-    // Test: message = '"; malicious_command; "'
-    // Expected: Sanitized or rejected
-  });
-});
-
-// Test cases for push.ts
-describe('push handler security', () => {
-  it('should reject remote names with shell metacharacters', () => {
-    // Test: remote = "origin; malicious_command; #"
-    // Expected: Validation error, command not executed
-  });
-});
-```
-
-### Shell Script Tests
-
-```bash
-# Test with malicious .env content
-echo 'VAR="value; echo PWNED"' > test.env
-# Expected: Should not execute the command
-
-# Test with spaces in values
-echo 'VAR="value with spaces"' > test.env
-# Expected: Should handle correctly
-
-# Test with special characters
-echo 'VAR="value\$with\$dollars"' > test.env
-# Expected: Should handle correctly
-```
-
----
-
-## 📚 References
-
-- [OWASP Command Injection](https://owasp.org/www-community/attacks/Command_Injection)
-- [Node.js Child Process Security](https://nodejs.org/api/child_process.html#child_process_security_concerns)
-- [Shell Script Security Best Practices](https://mywiki.wooledge.org/BashGuide/Practices)
-
----
-
-## Notes
-
-- All findings are based on code diff analysis
-- No runtime testing was performed
-- Assumes attacker has access to API endpoints (authenticated or unauthenticated)
-- Fixes should be tested thoroughly before deployment
-
----
-
-**Last Updated:** $(date)  
-**Next Review:** After fixes are implemented

TODO.md

@@ -2,14 +2,6 @@
 
 - Setting the default model does not seem like it works.
 
-# Performance (completed)
-
-- [x] Graph performance mode for large graphs (compact nodes/edges + visible-only rendering)
-- [x] Render containment on heavy scroll regions (kanban columns, chat history)
-- [x] Reduce blur/shadow effects when lists get large
-- [x] React Query tuning for heavy datasets (less refetch on focus/reconnect)
-- [x] DnD/list rendering optimizations (virtualized kanban + memoized card sections)
-
 # UX
 
 - Consolidate all models to a single place in the settings instead of having AI profiles and all this other stuff

apps/server/.env.example

@@ -8,20 +8,6 @@
 # Your Anthropic API key for Claude models
 ANTHROPIC_API_KEY=sk-ant-...
 
-# ============================================
-# OPTIONAL - Additional API Keys
-# ============================================
-
-# OpenAI API key for Codex/GPT models
-OPENAI_API_KEY=sk-...
-
-# Cursor API key for Cursor models
-CURSOR_API_KEY=...
-
-# OAuth credentials for CLI authentication (extracted automatically)
-CLAUDE_OAUTH_CREDENTIALS=
-CURSOR_AUTH_TOKEN=
-
 # ============================================
 # OPTIONAL - Security
 # ============================================
@@ -44,11 +30,6 @@ CORS_ORIGIN=http://localhost:3007
 # OPTIONAL - Server
 # ============================================
 
-# Host to bind the server to (default: 0.0.0.0)
-# Use 0.0.0.0 to listen on all interfaces (recommended for Docker/remote access)
-# Use 127.0.0.1 or localhost to restrict to local connections only
-HOST=0.0.0.0
-
 # Port to run the server on
 PORT=3008
 
@@ -68,14 +49,6 @@ TERMINAL_PASSWORD=
 
 ENABLE_REQUEST_LOGGING=false
 
-# ============================================
-# OPTIONAL - UI Behavior
-# ============================================
-
-# Skip the sandbox warning dialog on startup (default: false)
-# Set to "true" to disable the warning entirely (useful for dev/CI environments)
-AUTOMAKER_SKIP_SANDBOX_WARNING=false
-
 # ============================================
 # OPTIONAL - Debugging
 # ============================================

apps/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automaker/server",
-  "version": "0.12.0",
+  "version": "0.8.0",
   "description": "Backend server for Automaker - provides API for both web and Electron modes",
   "author": "AutoMaker Team",
   "license": "SEE LICENSE IN LICENSE",
@@ -32,8 +32,7 @@
     "@automaker/prompts": "1.0.0",
     "@automaker/types": "1.0.0",
     "@automaker/utils": "1.0.0",
-    "@modelcontextprotocol/sdk": "1.25.2",
-    "@openai/codex-sdk": "^0.77.0",
+    "@modelcontextprotocol/sdk": "1.25.1",
     "cookie-parser": "1.4.7",
     "cors": "2.8.5",
     "dotenv": "17.2.3",

apps/server/src/index.ts

@@ -17,19 +17,9 @@ import dotenv from 'dotenv';
 
 import { createEventEmitter, type EventEmitter } from './lib/events.js';
 import { initAllowedPaths } from '@automaker/platform';
-import { createLogger, setLogLevel, LogLevel } from '@automaker/utils';
+import { createLogger } from '@automaker/utils';
 
 const logger = createLogger('Server');
-
-/**
- * Map server log level string to LogLevel enum
- */
-const LOG_LEVEL_MAP: Record<string, LogLevel> = {
-  error: LogLevel.ERROR,
-  warn: LogLevel.WARN,
-  info: LogLevel.INFO,
-  debug: LogLevel.DEBUG,
-};
 import { authMiddleware, validateWsConnectionToken, checkRawAuthentication } from './lib/auth.js';
 import { requireJsonContentType } from './middleware/require-json-content-type.js';
 import { createAuthRoutes } from './routes/auth/index.js';
@@ -63,10 +53,6 @@ import { SettingsService } from './services/settings-service.js';
 import { createSpecRegenerationRoutes } from './routes/app-spec/index.js';
 import { createClaudeRoutes } from './routes/claude/index.js';
 import { ClaudeUsageService } from './services/claude-usage-service.js';
-import { createCodexRoutes } from './routes/codex/index.js';
-import { CodexUsageService } from './services/codex-usage-service.js';
-import { CodexAppServerService } from './services/codex-app-server-service.js';
-import { CodexModelCacheService } from './services/codex-model-cache-service.js';
 import { createGitHubRoutes } from './routes/github/index.js';
 import { createContextRoutes } from './routes/context/index.js';
 import { createBacklogPlanRoutes } from './routes/backlog-plan/index.js';
@@ -77,73 +63,32 @@ import { createPipelineRoutes } from './routes/pipeline/index.js';
 import { pipelineService } from './services/pipeline-service.js';
 import { createIdeationRoutes } from './routes/ideation/index.js';
 import { IdeationService } from './services/ideation-service.js';
-import { getDevServerService } from './services/dev-server-service.js';
-import { eventHookService } from './services/event-hook-service.js';
-import { createNotificationsRoutes } from './routes/notifications/index.js';
-import { getNotificationService } from './services/notification-service.js';
-import { createEventHistoryRoutes } from './routes/event-history/index.js';
-import { getEventHistoryService } from './services/event-history-service.js';
 
 // Load environment variables
 dotenv.config();
 
 const PORT = parseInt(process.env.PORT || '3008', 10);
-const HOST = process.env.HOST || '0.0.0.0';
-const HOSTNAME = process.env.HOSTNAME || 'localhost';
 const DATA_DIR = process.env.DATA_DIR || './data';
-logger.info('[SERVER_STARTUP] process.env.DATA_DIR:', process.env.DATA_DIR);
-logger.info('[SERVER_STARTUP] Resolved DATA_DIR:', DATA_DIR);
-logger.info('[SERVER_STARTUP] process.cwd():', process.cwd());
-const ENABLE_REQUEST_LOGGING_DEFAULT = process.env.ENABLE_REQUEST_LOGGING !== 'false'; // Default to true
-
-// Runtime-configurable request logging flag (can be changed via settings)
-let requestLoggingEnabled = ENABLE_REQUEST_LOGGING_DEFAULT;
-
-/**
- * Enable or disable HTTP request logging at runtime
- */
-export function setRequestLoggingEnabled(enabled: boolean): void {
-  requestLoggingEnabled = enabled;
-}
-
-/**
- * Get current request logging state
- */
-export function isRequestLoggingEnabled(): boolean {
-  return requestLoggingEnabled;
-}
-
-// Width for log box content (excluding borders)
-const BOX_CONTENT_WIDTH = 67;
+const ENABLE_REQUEST_LOGGING = process.env.ENABLE_REQUEST_LOGGING !== 'false'; // Default to true
 
 // Check for required environment variables
 const hasAnthropicKey = !!process.env.ANTHROPIC_API_KEY;
 
 if (!hasAnthropicKey) {
-  const wHeader = '⚠️  WARNING: No Claude authentication configured'.padEnd(BOX_CONTENT_WIDTH);
-  const w1 = 'The Claude Agent SDK requires authentication to function.'.padEnd(BOX_CONTENT_WIDTH);
-  const w2 = 'Set your Anthropic API key:'.padEnd(BOX_CONTENT_WIDTH);
-  const w3 = '  export ANTHROPIC_API_KEY="sk-ant-..."'.padEnd(BOX_CONTENT_WIDTH);
-  const w4 = 'Or use the setup wizard in Settings to configure authentication.'.padEnd(
-    BOX_CONTENT_WIDTH
-  );
-
   logger.warn(`
-╔═════════════════════════════════════════════════════════════════════╗
-║  ${wHeader}║
-╠═════════════════════════════════════════════════════════════════════╣
-║                                                                     ║
-║  ${w1}║
-║                                                                     ║
-║  ${w2}║
-║  ${w3}║
-║                                                                     ║
-║  ${w4}║
-║                                                                     ║
-╚═════════════════════════════════════════════════════════════════════╝
+╔═══════════════════════════════════════════════════════════════════════╗
+║  ⚠️  WARNING: No Claude authentication configured                      ║
+║                                                                       ║
+║  The Claude Agent SDK requires authentication to function.            ║
+║                                                                       ║
+║  Set your Anthropic API key:                                          ║
+║    export ANTHROPIC_API_KEY="sk-ant-..."                              ║
+║                                                                       ║
+║  Or use the setup wizard in Settings to configure authentication.     ║
+╚═══════════════════════════════════════════════════════════════════════╝
 `);
 } else {
-  logger.info('✓ ANTHROPIC_API_KEY detected');
+  logger.info('✓ ANTHROPIC_API_KEY detected (API key auth)');
 }
 
 // Initialize security
@@ -153,21 +98,22 @@ initAllowedPaths();
 const app = express();
 
 // Middleware
-// Custom colored logger showing only endpoint and status code (dynamically configurable)
-morgan.token('status-colored', (_req, res) => {
-  const status = res.statusCode;
-  if (status >= 500) return `\x1b[31m${status}\x1b[0m`; // Red for server errors
-  if (status >= 400) return `\x1b[33m${status}\x1b[0m`; // Yellow for client errors
-  if (status >= 300) return `\x1b[36m${status}\x1b[0m`; // Cyan for redirects
-  return `\x1b[32m${status}\x1b[0m`; // Green for success
-});
+// Custom colored logger showing only endpoint and status code (configurable via ENABLE_REQUEST_LOGGING env var)
+if (ENABLE_REQUEST_LOGGING) {
+  morgan.token('status-colored', (_req, res) => {
+    const status = res.statusCode;
+    if (status >= 500) return `\x1b[31m${status}\x1b[0m`; // Red for server errors
+    if (status >= 400) return `\x1b[33m${status}\x1b[0m`; // Yellow for client errors
+    if (status >= 300) return `\x1b[36m${status}\x1b[0m`; // Cyan for redirects
+    return `\x1b[32m${status}\x1b[0m`; // Green for success
+  });
 
-app.use(
-  morgan(':method :url :status-colored', {
-    // Skip when request logging is disabled or for health check endpoints
-    skip: (req) => !requestLoggingEnabled || req.url === '/api/health',
-  })
-);
+  app.use(
+    morgan(':method :url :status-colored', {
+      skip: (req) => req.url === '/api/health', // Skip health check logs
+    })
+  );
+}
 // CORS configuration
 // When using credentials (cookies), origin cannot be '*'
 // We dynamically allow the requesting origin for local development
@@ -191,25 +137,14 @@ app.use(
         return;
       }
 
-      // For local development, allow all localhost/loopback origins (any port)
-      try {
-        const url = new URL(origin);
-        const hostname = url.hostname;
-
-        if (
-          hostname === 'localhost' ||
-          hostname === '127.0.0.1' ||
-          hostname === '::1' ||
-          hostname === '0.0.0.0' ||
-          hostname.startsWith('192.168.') ||
-          hostname.startsWith('10.') ||
-          hostname.startsWith('172.')
-        ) {
-          callback(null, origin);
-          return;
-        }
-      } catch (err) {
-        // Ignore URL parsing errors
+      // For local development, allow localhost origins
+      if (
+        origin.startsWith('http://localhost:') ||
+        origin.startsWith('http://127.0.0.1:') ||
+        origin.startsWith('http://[::1]:')
+      ) {
+        callback(null, origin);
+        return;
       }
 
       // Reject other origins by default for security
@@ -231,67 +166,13 @@ const agentService = new AgentService(DATA_DIR, events, settingsService);
 const featureLoader = new FeatureLoader();
 const autoModeService = new AutoModeService(events, settingsService);
 const claudeUsageService = new ClaudeUsageService();
-const codexAppServerService = new CodexAppServerService();
-const codexModelCacheService = new CodexModelCacheService(DATA_DIR, codexAppServerService);
-const codexUsageService = new CodexUsageService(codexAppServerService);
 const mcpTestService = new MCPTestService(settingsService);
 const ideationService = new IdeationService(events, settingsService, featureLoader);
 
-// Initialize DevServerService with event emitter for real-time log streaming
-const devServerService = getDevServerService();
-devServerService.setEventEmitter(events);
-
-// Initialize Notification Service with event emitter for real-time updates
-const notificationService = getNotificationService();
-notificationService.setEventEmitter(events);
-
-// Initialize Event History Service
-const eventHistoryService = getEventHistoryService();
-
-// Initialize Event Hook Service for custom event triggers (with history storage)
-eventHookService.initialize(events, settingsService, eventHistoryService, featureLoader);
-
 // Initialize services
 (async () => {
-  // Migrate settings from legacy Electron userData location if needed
-  // This handles users upgrading from versions that stored settings in ~/.config/Automaker (Linux),
-  // ~/Library/Application Support/Automaker (macOS), or %APPDATA%\Automaker (Windows)
-  // to the new shared ./data directory
-  try {
-    const migrationResult = await settingsService.migrateFromLegacyElectronPath();
-    if (migrationResult.migrated) {
-      logger.info(`Settings migrated from legacy location: ${migrationResult.legacyPath}`);
-      logger.info(`Migrated files: ${migrationResult.migratedFiles.join(', ')}`);
-    }
-    if (migrationResult.errors.length > 0) {
-      logger.warn('Migration errors:', migrationResult.errors);
-    }
-  } catch (err) {
-    logger.warn('Failed to check for legacy settings migration:', err);
-  }
-
-  // Apply logging settings from saved settings
-  try {
-    const settings = await settingsService.getGlobalSettings();
-    if (settings.serverLogLevel && LOG_LEVEL_MAP[settings.serverLogLevel] !== undefined) {
-      setLogLevel(LOG_LEVEL_MAP[settings.serverLogLevel]);
-      logger.info(`Server log level set to: ${settings.serverLogLevel}`);
-    }
-    // Apply request logging setting (default true if not set)
-    const enableRequestLog = settings.enableRequestLogging ?? true;
-    setRequestLoggingEnabled(enableRequestLog);
-    logger.info(`HTTP request logging: ${enableRequestLog ? 'enabled' : 'disabled'}`);
-  } catch (err) {
-    logger.warn('Failed to load logging settings, using defaults');
-  }
-
   await agentService.initialize();
   logger.info('Agent service initialized');
-
-  // Bootstrap Codex model cache in background (don't block server startup)
-  void codexModelCacheService.getModels().catch((err) => {
-    logger.error('Failed to bootstrap Codex model cache:', err);
-  });
 })();
 
 // Run stale validation cleanup every hour to prevent memory leaks from crashed validations
@@ -307,10 +188,9 @@ setInterval(() => {
 // This helps prevent CSRF and content-type confusion attacks
 app.use('/api', requireJsonContentType);
 
-// Mount API routes - health, auth, and setup are unauthenticated
+// Mount API routes - health and auth are unauthenticated
 app.use('/api/health', createHealthRoutes());
 app.use('/api/auth', createAuthRoutes());
-app.use('/api/setup', createSetupRoutes());
 
 // Apply authentication to all other routes
 app.use('/api', authMiddleware);
@@ -321,11 +201,12 @@ app.get('/api/health/detailed', createDetailedHandler());
 app.use('/api/fs', createFsRoutes(events));
 app.use('/api/agent', createAgentRoutes(agentService, events));
 app.use('/api/sessions', createSessionsRoutes(agentService));
-app.use('/api/features', createFeaturesRoutes(featureLoader, settingsService, events));
+app.use('/api/features', createFeaturesRoutes(featureLoader));
 app.use('/api/auto-mode', createAutoModeRoutes(autoModeService));
 app.use('/api/enhance-prompt', createEnhancePromptRoutes(settingsService));
-app.use('/api/worktree', createWorktreeRoutes(events, settingsService));
+app.use('/api/worktree', createWorktreeRoutes());
 app.use('/api/git', createGitRoutes());
+app.use('/api/setup', createSetupRoutes());
 app.use('/api/suggestions', createSuggestionsRoutes(events, settingsService));
 app.use('/api/models', createModelsRoutes());
 app.use('/api/spec-regeneration', createSpecRegenerationRoutes(events, settingsService));
@@ -335,15 +216,12 @@ app.use('/api/templates', createTemplatesRoutes());
 app.use('/api/terminal', createTerminalRoutes());
 app.use('/api/settings', createSettingsRoutes(settingsService));
 app.use('/api/claude', createClaudeRoutes(claudeUsageService));
-app.use('/api/codex', createCodexRoutes(codexUsageService, codexModelCacheService));
 app.use('/api/github', createGitHubRoutes(events, settingsService));
 app.use('/api/context', createContextRoutes(settingsService));
 app.use('/api/backlog-plan', createBacklogPlanRoutes(events, settingsService));
 app.use('/api/mcp', createMCPRoutes(mcpTestService));
 app.use('/api/pipeline', createPipelineRoutes(pipelineService));
 app.use('/api/ideation', createIdeationRoutes(events, ideationService, featureLoader));
-app.use('/api/notifications', createNotificationsRoutes(notificationService));
-app.use('/api/event-history', createEventHistoryRoutes(eventHistoryService, settingsService));
 
 // Create HTTP server
 const server = createServer(app);
@@ -655,81 +533,46 @@ terminalWss.on('connection', (ws: WebSocket, req: import('http').IncomingMessage
 });
 
 // Start server with error handling for port conflicts
-const startServer = (port: number, host: string) => {
-  server.listen(port, host, () => {
+const startServer = (port: number) => {
+  server.listen(port, () => {
     const terminalStatus = isTerminalEnabled()
       ? isTerminalPasswordRequired()
         ? 'enabled (password protected)'
         : 'enabled'
       : 'disabled';
-
-    // Build URLs for display
-    const listenAddr = `${host}:${port}`;
-    const httpUrl = `http://${HOSTNAME}:${port}`;
-    const wsEventsUrl = `ws://${HOSTNAME}:${port}/api/events`;
-    const wsTerminalUrl = `ws://${HOSTNAME}:${port}/api/terminal/ws`;
-    const healthUrl = `http://${HOSTNAME}:${port}/api/health`;
-
-    const sHeader = '🚀 Automaker Backend Server'.padEnd(BOX_CONTENT_WIDTH);
-    const s1 = `Listening:    ${listenAddr}`.padEnd(BOX_CONTENT_WIDTH);
-    const s2 = `HTTP API:     ${httpUrl}`.padEnd(BOX_CONTENT_WIDTH);
-    const s3 = `WebSocket:    ${wsEventsUrl}`.padEnd(BOX_CONTENT_WIDTH);
-    const s4 = `Terminal WS:  ${wsTerminalUrl}`.padEnd(BOX_CONTENT_WIDTH);
-    const s5 = `Health:       ${healthUrl}`.padEnd(BOX_CONTENT_WIDTH);
-    const s6 = `Terminal:     ${terminalStatus}`.padEnd(BOX_CONTENT_WIDTH);
-
+    const portStr = port.toString().padEnd(4);
     logger.info(`
-╔═════════════════════════════════════════════════════════════════════╗
-║  ${sHeader}║
-╠═════════════════════════════════════════════════════════════════════╣
-║                                                                     ║
-║  ${s1}║
-║  ${s2}║
-║  ${s3}║
-║  ${s4}║
-║  ${s5}║
-║  ${s6}║
-║                                                                     ║
-╚═════════════════════════════════════════════════════════════════════╝
+╔═══════════════════════════════════════════════════════╗
+║           Automaker Backend Server                    ║
+╠═══════════════════════════════════════════════════════╣
+║  HTTP API:    http://localhost:${portStr}                 ║
+║  WebSocket:   ws://localhost:${portStr}/api/events        ║
+║  Terminal:    ws://localhost:${portStr}/api/terminal/ws   ║
+║  Health:      http://localhost:${portStr}/api/health      ║
+║  Terminal:    ${terminalStatus.padEnd(37)}║
+╚═══════════════════════════════════════════════════════╝
 `);
   });
 
   server.on('error', (error: NodeJS.ErrnoException) => {
     if (error.code === 'EADDRINUSE') {
-      const portStr = port.toString();
-      const nextPortStr = (port + 1).toString();
-      const killCmd = `lsof -ti:${portStr} | xargs kill -9`;
-      const altCmd = `PORT=${nextPortStr} npm run dev:server`;
-
-      const eHeader = `❌ ERROR: Port ${portStr} is already in use`.padEnd(BOX_CONTENT_WIDTH);
-      const e1 = 'Another process is using this port.'.padEnd(BOX_CONTENT_WIDTH);
-      const e2 = 'To fix this, try one of:'.padEnd(BOX_CONTENT_WIDTH);
-      const e3 = '1. Kill the process using the port:'.padEnd(BOX_CONTENT_WIDTH);
-      const e4 = `   ${killCmd}`.padEnd(BOX_CONTENT_WIDTH);
-      const e5 = '2. Use a different port:'.padEnd(BOX_CONTENT_WIDTH);
-      const e6 = `   ${altCmd}`.padEnd(BOX_CONTENT_WIDTH);
-      const e7 = '3. Use the init.sh script which handles this:'.padEnd(BOX_CONTENT_WIDTH);
-      const e8 = '   ./init.sh'.padEnd(BOX_CONTENT_WIDTH);
-
       logger.error(`
-╔═════════════════════════════════════════════════════════════════════╗
-║  ${eHeader}║
-╠═════════════════════════════════════════════════════════════════════╣
-║                                                                     ║
-║  ${e1}║
-║                                                                     ║
-║  ${e2}║
-║                                                                     ║
-║  ${e3}║
-║  ${e4}║
-║                                                                     ║
-║  ${e5}║
-║  ${e6}║
-║                                                                     ║
-║  ${e7}║
-║  ${e8}║
-║                                                                     ║
-╚═════════════════════════════════════════════════════════════════════╝
+╔═══════════════════════════════════════════════════════╗
+║  ❌ ERROR: Port ${port} is already in use              ║
+╠═══════════════════════════════════════════════════════╣
+║  Another process is using this port.                  ║
+║                                                       ║
+║  To fix this, try one of:                             ║
+║                                                       ║
+║  1. Kill the process using the port:                  ║
+║     lsof -ti:${port} | xargs kill -9                   ║
+║                                                       ║
+║  2. Use a different port:                             ║
+║     PORT=${port + 1} npm run dev:server                ║
+║                                                       ║
+║  3. Use the init.sh script which handles this:        ║
+║     ./init.sh                                         ║
+╚═══════════════════════════════════════════════════════╝
 `);
       process.exit(1);
     } else {
@@ -739,27 +582,7 @@ const startServer = (port: number, host: string) => {
   });
 };
 
-startServer(PORT, HOST);
-
-// Global error handlers to prevent crashes from uncaught errors
-process.on('unhandledRejection', (reason: unknown, _promise: Promise<unknown>) => {
-  logger.error('Unhandled Promise Rejection:', {
-    reason: reason instanceof Error ? reason.message : String(reason),
-    stack: reason instanceof Error ? reason.stack : undefined,
-  });
-  // Don't exit - log the error and continue running
-  // This prevents the server from crashing due to unhandled rejections
-});
-
-process.on('uncaughtException', (error: Error) => {
-  logger.error('Uncaught Exception:', {
-    message: error.message,
-    stack: error.stack,
-  });
-  // Exit on uncaught exceptions to prevent undefined behavior
-  // The process is in an unknown state after an uncaught exception
-  process.exit(1);
-});
+startServer(PORT);
 
 // Graceful shutdown
 process.on('SIGTERM', () => {

apps/server/src/lib/agent-discovery.ts

@@ -1,257 +0,0 @@
-/**
- * Agent Discovery - Scans filesystem for AGENT.md files
- *
- * Discovers agents from:
- * - ~/.claude/agents/ (user-level, global)
- * - .claude/agents/ (project-level)
- *
- * Similar to Skills, but for custom subagents defined in AGENT.md files.
- */
-
-import path from 'path';
-import os from 'os';
-import { createLogger } from '@automaker/utils';
-import { secureFs, systemPaths } from '@automaker/platform';
-import type { AgentDefinition } from '@automaker/types';
-
-const logger = createLogger('AgentDiscovery');
-
-export interface FilesystemAgent {
-  name: string; // Directory name (e.g., 'code-reviewer')
-  definition: AgentDefinition;
-  source: 'user' | 'project';
-  filePath: string; // Full path to AGENT.md
-}
-
-/**
- * Parse agent content string into AgentDefinition
- * Format:
- * ---
- * name: agent-name  # Optional
- * description: When to use this agent
- * tools: tool1, tool2, tool3  # Optional (comma or space separated list)
- * model: sonnet  # Optional: sonnet, opus, haiku
- * ---
- * System prompt content here...
- */
-function parseAgentContent(content: string, filePath: string): AgentDefinition | null {
-  // Extract frontmatter
-  const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---\n([\s\S]*)$/);
-  if (!frontmatterMatch) {
-    logger.warn(`Invalid agent file format (missing frontmatter): ${filePath}`);
-    return null;
-  }
-
-  const [, frontmatter, prompt] = frontmatterMatch;
-
-  // Parse description (required)
-  const description = frontmatter.match(/description:\s*(.+)/)?.[1]?.trim();
-  if (!description) {
-    logger.warn(`Missing description in agent file: ${filePath}`);
-    return null;
-  }
-
-  // Parse tools (optional) - supports both comma-separated and space-separated
-  const toolsMatch = frontmatter.match(/tools:\s*(.+)/);
-  const tools = toolsMatch
-    ? toolsMatch[1]
-        .split(/[,\s]+/) // Split by comma or whitespace
-        .map((t) => t.trim())
-        .filter((t) => t && t !== '')
-    : undefined;
-
-  // Parse model (optional) - validate against allowed values
-  const modelMatch = frontmatter.match(/model:\s*(\w+)/);
-  const modelValue = modelMatch?.[1]?.trim();
-  const validModels = ['sonnet', 'opus', 'haiku', 'inherit'] as const;
-  const model =
-    modelValue && validModels.includes(modelValue as (typeof validModels)[number])
-      ? (modelValue as 'sonnet' | 'opus' | 'haiku' | 'inherit')
-      : undefined;
-
-  if (modelValue && !model) {
-    logger.warn(
-      `Invalid model "${modelValue}" in agent file: ${filePath}. Expected one of: ${validModels.join(', ')}`
-    );
-  }
-
-  return {
-    description,
-    prompt: prompt.trim(),
-    tools,
-    model,
-  };
-}
-
-/**
- * Directory entry with type information
- */
-interface DirEntry {
-  name: string;
-  isFile: boolean;
-  isDirectory: boolean;
-}
-
-/**
- * Filesystem adapter interface for abstracting systemPaths vs secureFs
- */
-interface FsAdapter {
-  exists: (filePath: string) => Promise<boolean>;
-  readdir: (dirPath: string) => Promise<DirEntry[]>;
-  readFile: (filePath: string) => Promise<string>;
-}
-
-/**
- * Create a filesystem adapter for system paths (user directory)
- */
-function createSystemPathAdapter(): FsAdapter {
-  return {
-    exists: (filePath) => Promise.resolve(systemPaths.systemPathExists(filePath)),
-    readdir: async (dirPath) => {
-      const entryNames = await systemPaths.systemPathReaddir(dirPath);
-      const entries: DirEntry[] = [];
-      for (const name of entryNames) {
-        const stat = await systemPaths.systemPathStat(path.join(dirPath, name));
-        entries.push({
-          name,
-          isFile: stat.isFile(),
-          isDirectory: stat.isDirectory(),
-        });
-      }
-      return entries;
-    },
-    readFile: (filePath) => systemPaths.systemPathReadFile(filePath, 'utf-8') as Promise<string>,
-  };
-}
-
-/**
- * Create a filesystem adapter for project paths (secureFs)
- */
-function createSecureFsAdapter(): FsAdapter {
-  return {
-    exists: (filePath) =>
-      secureFs
-        .access(filePath)
-        .then(() => true)
-        .catch(() => false),
-    readdir: async (dirPath) => {
-      const entries = await secureFs.readdir(dirPath, { withFileTypes: true });
-      return entries.map((entry) => ({
-        name: entry.name,
-        isFile: entry.isFile(),
-        isDirectory: entry.isDirectory(),
-      }));
-    },
-    readFile: (filePath) => secureFs.readFile(filePath, 'utf-8') as Promise<string>,
-  };
-}
-
-/**
- * Parse agent file using the provided filesystem adapter
- */
-async function parseAgentFileWithAdapter(
-  filePath: string,
-  fsAdapter: FsAdapter
-): Promise<AgentDefinition | null> {
-  try {
-    const content = await fsAdapter.readFile(filePath);
-    return parseAgentContent(content, filePath);
-  } catch (error) {
-    logger.error(`Failed to parse agent file: ${filePath}`, error);
-    return null;
-  }
-}
-
-/**
- * Scan a directory for agent .md files
- * Agents can be in two formats:
- * 1. Flat: agent-name.md (file directly in agents/)
- * 2. Subdirectory: agent-name/AGENT.md (folder + file, similar to Skills)
- */
-async function scanAgentsDirectory(
-  baseDir: string,
-  source: 'user' | 'project'
-): Promise<FilesystemAgent[]> {
-  const agents: FilesystemAgent[] = [];
-  const fsAdapter = source === 'user' ? createSystemPathAdapter() : createSecureFsAdapter();
-
-  try {
-    // Check if directory exists
-    const exists = await fsAdapter.exists(baseDir);
-    if (!exists) {
-      logger.debug(`Directory does not exist: ${baseDir}`);
-      return agents;
-    }
-
-    // Read all entries in the directory
-    const entries = await fsAdapter.readdir(baseDir);
-
-    for (const entry of entries) {
-      // Check for flat .md file format (agent-name.md)
-      if (entry.isFile && entry.name.endsWith('.md')) {
-        const agentName = entry.name.slice(0, -3); // Remove .md extension
-        const agentFilePath = path.join(baseDir, entry.name);
-        const definition = await parseAgentFileWithAdapter(agentFilePath, fsAdapter);
-        if (definition) {
-          agents.push({
-            name: agentName,
-            definition,
-            source,
-            filePath: agentFilePath,
-          });
-          logger.debug(`Discovered ${source} agent (flat): ${agentName}`);
-        }
-      }
-      // Check for subdirectory format (agent-name/AGENT.md)
-      else if (entry.isDirectory) {
-        const agentFilePath = path.join(baseDir, entry.name, 'AGENT.md');
-        const agentFileExists = await fsAdapter.exists(agentFilePath);
-
-        if (agentFileExists) {
-          const definition = await parseAgentFileWithAdapter(agentFilePath, fsAdapter);
-          if (definition) {
-            agents.push({
-              name: entry.name,
-              definition,
-              source,
-              filePath: agentFilePath,
-            });
-            logger.debug(`Discovered ${source} agent (subdirectory): ${entry.name}`);
-          }
-        }
-      }
-    }
-  } catch (error) {
-    logger.error(`Failed to scan agents directory: ${baseDir}`, error);
-  }
-
-  return agents;
-}
-
-/**
- * Discover all filesystem-based agents from user and project sources
- */
-export async function discoverFilesystemAgents(
-  projectPath?: string,
-  sources: Array<'user' | 'project'> = ['user', 'project']
-): Promise<FilesystemAgent[]> {
-  const agents: FilesystemAgent[] = [];
-
-  // Discover user-level agents from ~/.claude/agents/
-  if (sources.includes('user')) {
-    const userAgentsDir = path.join(os.homedir(), '.claude', 'agents');
-    const userAgents = await scanAgentsDirectory(userAgentsDir, 'user');
-    agents.push(...userAgents);
-    logger.info(`Discovered ${userAgents.length} user-level agents from ${userAgentsDir}`);
-  }
-
-  // Discover project-level agents from .claude/agents/
-  if (sources.includes('project') && projectPath) {
-    const projectAgentsDir = path.join(projectPath, '.claude', 'agents');
-    const projectAgents = await scanAgentsDirectory(projectAgentsDir, 'project');
-    agents.push(...projectAgents);
-    logger.info(`Discovered ${projectAgents.length} project-level agents from ${projectAgentsDir}`);
-  }
-
-  return agents;
-}

apps/server/src/lib/app-spec-format.ts

@@ -11,12 +11,8 @@ export { specOutputSchema } from '@automaker/types';
 
 /**
  * Escape special XML characters
- * Handles undefined/null values by converting them to empty strings
  */
-export function escapeXml(str: string | undefined | null): string {
-  if (str == null) {
-    return '';
-  }
+function escapeXml(str: string): string {
   return str
     .replace(/&/g, '&')
     .replace(/</g, '&lt;')

apps/server/src/lib/auth-utils.ts

@@ -1,263 +0,0 @@
-/**
- * Secure authentication utilities that avoid environment variable race conditions
- */
-
-import { spawn } from 'child_process';
-import { createLogger } from '@automaker/utils';
-
-const logger = createLogger('AuthUtils');
-
-export interface SecureAuthEnv {
-  [key: string]: string | undefined;
-}
-
-export interface AuthValidationResult {
-  isValid: boolean;
-  error?: string;
-  normalizedKey?: string;
-}
-
-/**
- * Validates API key format without modifying process.env
- */
-export function validateApiKey(
-  key: string,
-  provider: 'anthropic' | 'openai' | 'cursor'
-): AuthValidationResult {
-  if (!key || typeof key !== 'string' || key.trim().length === 0) {
-    return { isValid: false, error: 'API key is required' };
-  }
-
-  const trimmedKey = key.trim();
-
-  switch (provider) {
-    case 'anthropic':
-      if (!trimmedKey.startsWith('sk-ant-')) {
-        return {
-          isValid: false,
-          error: 'Invalid Anthropic API key format. Should start with "sk-ant-"',
-        };
-      }
-      if (trimmedKey.length < 20) {
-        return { isValid: false, error: 'Anthropic API key too short' };
-      }
-      break;
-
-    case 'openai':
-      if (!trimmedKey.startsWith('sk-')) {
-        return { isValid: false, error: 'Invalid OpenAI API key format. Should start with "sk-"' };
-      }
-      if (trimmedKey.length < 20) {
-        return { isValid: false, error: 'OpenAI API key too short' };
-      }
-      break;
-
-    case 'cursor':
-      // Cursor API keys might have different format
-      if (trimmedKey.length < 10) {
-        return { isValid: false, error: 'Cursor API key too short' };
-      }
-      break;
-  }
-
-  return { isValid: true, normalizedKey: trimmedKey };
-}
-
-/**
- * Creates a secure environment object for authentication testing
- * without modifying the global process.env
- */
-export function createSecureAuthEnv(
-  authMethod: 'cli' | 'api_key',
-  apiKey?: string,
-  provider: 'anthropic' | 'openai' | 'cursor' = 'anthropic'
-): SecureAuthEnv {
-  const env: SecureAuthEnv = { ...process.env };
-
-  if (authMethod === 'cli') {
-    // For CLI auth, remove the API key to force CLI authentication
-    const envKey = provider === 'openai' ? 'OPENAI_API_KEY' : 'ANTHROPIC_API_KEY';
-    delete env[envKey];
-  } else if (authMethod === 'api_key' && apiKey) {
-    // For API key auth, validate and set the provided key
-    const validation = validateApiKey(apiKey, provider);
-    if (!validation.isValid) {
-      throw new Error(validation.error);
-    }
-    const envKey = provider === 'openai' ? 'OPENAI_API_KEY' : 'ANTHROPIC_API_KEY';
-    env[envKey] = validation.normalizedKey;
-  }
-
-  return env;
-}
-
-/**
- * Creates a temporary environment override for the current process
- * WARNING: This should only be used in isolated contexts and immediately cleaned up
- */
-export function createTempEnvOverride(authEnv: SecureAuthEnv): () => void {
-  const originalEnv = { ...process.env };
-
-  // Apply the auth environment
-  Object.assign(process.env, authEnv);
-
-  // Return cleanup function
-  return () => {
-    // Restore original environment
-    Object.keys(process.env).forEach((key) => {
-      if (!(key in originalEnv)) {
-        delete process.env[key];
-      }
-    });
-    Object.assign(process.env, originalEnv);
-  };
-}
-
-/**
- * Spawns a process with secure environment isolation
- */
-export function spawnSecureAuth(
-  command: string,
-  args: string[],
-  authEnv: SecureAuthEnv,
-  options: {
-    cwd?: string;
-    timeout?: number;
-  } = {}
-): Promise<{ stdout: string; stderr: string; exitCode: number | null }> {
-  return new Promise((resolve, reject) => {
-    const { cwd = process.cwd(), timeout = 30000 } = options;
-
-    logger.debug(`Spawning secure auth process: ${command} ${args.join(' ')}`);
-
-    const child = spawn(command, args, {
-      cwd,
-      env: authEnv,
-      stdio: 'pipe',
-      shell: false,
-    });
-
-    let stdout = '';
-    let stderr = '';
-    let isResolved = false;
-
-    const timeoutId = setTimeout(() => {
-      if (!isResolved) {
-        child.kill('SIGTERM');
-        isResolved = true;
-        reject(new Error('Authentication process timed out'));
-      }
-    }, timeout);
-
-    child.stdout?.on('data', (data) => {
-      stdout += data.toString();
-    });
-
-    child.stderr?.on('data', (data) => {
-      stderr += data.toString();
-    });
-
-    child.on('close', (code) => {
-      clearTimeout(timeoutId);
-      if (!isResolved) {
-        isResolved = true;
-        resolve({ stdout, stderr, exitCode: code });
-      }
-    });
-
-    child.on('error', (error) => {
-      clearTimeout(timeoutId);
-      if (!isResolved) {
-        isResolved = true;
-        reject(error);
-      }
-    });
-  });
-}
-
-/**
- * Safely extracts environment variable without race conditions
- */
-export function safeGetEnv(key: string): string | undefined {
-  return process.env[key];
-}
-
-/**
- * Checks if an environment variable would be modified without actually modifying it
- */
-export function wouldModifyEnv(key: string, newValue: string): boolean {
-  const currentValue = safeGetEnv(key);
-  return currentValue !== newValue;
-}
-
-/**
- * Secure auth session management
- */
-export class AuthSessionManager {
-  private static activeSessions = new Map<string, SecureAuthEnv>();
-
-  static createSession(
-    sessionId: string,
-    authMethod: 'cli' | 'api_key',
-    apiKey?: string,
-    provider: 'anthropic' | 'openai' | 'cursor' = 'anthropic'
-  ): SecureAuthEnv {
-    const env = createSecureAuthEnv(authMethod, apiKey, provider);
-    this.activeSessions.set(sessionId, env);
-    return env;
-  }
-
-  static getSession(sessionId: string): SecureAuthEnv | undefined {
-    return this.activeSessions.get(sessionId);
-  }
-
-  static destroySession(sessionId: string): void {
-    this.activeSessions.delete(sessionId);
-  }
-
-  static cleanup(): void {
-    this.activeSessions.clear();
-  }
-}
-
-/**
- * Rate limiting for auth attempts to prevent abuse
- */
-export class AuthRateLimiter {
-  private attempts = new Map<string, { count: number; lastAttempt: number }>();
-
-  constructor(
-    private maxAttempts = 5,
-    private windowMs = 60000
-  ) {}
-
-  canAttempt(identifier: string): boolean {
-    const now = Date.now();
-    const record = this.attempts.get(identifier);
-
-    if (!record || now - record.lastAttempt > this.windowMs) {
-      this.attempts.set(identifier, { count: 1, lastAttempt: now });
-      return true;
-    }
-
-    if (record.count >= this.maxAttempts) {
-      return false;
-    }
-
-    record.count++;
-    record.lastAttempt = now;
-    return true;
-  }
-
-  getRemainingAttempts(identifier: string): number {
-    const record = this.attempts.get(identifier);
-    if (!record) return this.maxAttempts;
-    return Math.max(0, this.maxAttempts - record.count);
-  }
-
-  getResetTime(identifier: string): Date | null {
-    const record = this.attempts.get(identifier);
-    if (!record) return null;
-    return new Date(record.lastAttempt + this.windowMs);
-  }
-}

apps/server/src/lib/auth.ts

@@ -23,13 +23,6 @@ const SESSION_COOKIE_NAME = 'automaker_session';
 const SESSION_MAX_AGE_MS = 30 * 24 * 60 * 60 * 1000; // 30 days
 const WS_TOKEN_MAX_AGE_MS = 5 * 60 * 1000; // 5 minutes for WebSocket connection tokens
 
-/**
- * Check if an environment variable is set to 'true'
- */
-function isEnvTrue(envVar: string | undefined): boolean {
-  return envVar === 'true';
-}
-
 // Session store - persisted to file for survival across server restarts
 const validSessions = new Map<string, { createdAt: number; expiresAt: number }>();
 
@@ -137,47 +130,19 @@ function ensureApiKey(): string {
 // API key - always generated/loaded on startup for CSRF protection
 const API_KEY = ensureApiKey();
 
-// Width for log box content (excluding borders)
-const BOX_CONTENT_WIDTH = 67;
-
 // Print API key to console for web mode users (unless suppressed for production logging)
-if (!isEnvTrue(process.env.AUTOMAKER_HIDE_API_KEY)) {
-  const autoLoginEnabled = isEnvTrue(process.env.AUTOMAKER_AUTO_LOGIN);
-  const autoLoginStatus = autoLoginEnabled ? 'enabled (auto-login active)' : 'disabled';
-
-  // Build box lines with exact padding
-  const header = '🔐 API Key for Web Mode Authentication'.padEnd(BOX_CONTENT_WIDTH);
-  const line1 = "When accessing via browser, you'll be prompted to enter this key:".padEnd(
-    BOX_CONTENT_WIDTH
-  );
-  const line2 = API_KEY.padEnd(BOX_CONTENT_WIDTH);
-  const line3 = 'In Electron mode, authentication is handled automatically.'.padEnd(
-    BOX_CONTENT_WIDTH
-  );
-  const line4 = `Auto-login (AUTOMAKER_AUTO_LOGIN): ${autoLoginStatus}`.padEnd(BOX_CONTENT_WIDTH);
-  const tipHeader = '💡 Tips'.padEnd(BOX_CONTENT_WIDTH);
-  const line5 = 'Set AUTOMAKER_API_KEY env var to use a fixed key'.padEnd(BOX_CONTENT_WIDTH);
-  const line6 = 'Set AUTOMAKER_AUTO_LOGIN=true to skip the login prompt'.padEnd(BOX_CONTENT_WIDTH);
-
+if (process.env.AUTOMAKER_HIDE_API_KEY !== 'true') {
   logger.info(`
-╔═════════════════════════════════════════════════════════════════════╗
-║  ${header}║
-╠═════════════════════════════════════════════════════════════════════╣
-║                                                                     ║
-║  ${line1}║
-║                                                                     ║
-║  ${line2}║
-║                                                                     ║
-║  ${line3}║
-║                                                                     ║
-║  ${line4}║
-║                                                                     ║
-╠═════════════════════════════════════════════════════════════════════╣
-║  ${tipHeader}║
-╠═════════════════════════════════════════════════════════════════════╣
-║  ${line5}║
-║  ${line6}║
-╚═════════════════════════════════════════════════════════════════════╝
+╔═══════════════════════════════════════════════════════════════════════╗
+║  🔐 API Key for Web Mode Authentication                               ║
+╠═══════════════════════════════════════════════════════════════════════╣
+║                                                                       ║
+║  When accessing via browser, you'll be prompted to enter this key:    ║
+║                                                                       ║
+║    ${API_KEY}
+║                                                                       ║
+║  In Electron mode, authentication is handled automatically.          ║
+╚═══════════════════════════════════════════════════════════════════════╝
 `);
 } else {
   logger.info('API key banner hidden (AUTOMAKER_HIDE_API_KEY=true)');
@@ -297,7 +262,7 @@ export function getSessionCookieOptions(): {
   return {
     httpOnly: true, // JavaScript cannot access this cookie
     secure: process.env.NODE_ENV === 'production', // HTTPS only in production
-    sameSite: 'lax', // Sent for same-site requests and top-level navigations, but not cross-origin fetch/XHR
+    sameSite: 'strict', // Only sent for same-site requests (CSRF protection)
     maxAge: SESSION_MAX_AGE_MS,
     path: '/',
   };
@@ -353,15 +318,6 @@ function checkAuthentication(
     return { authenticated: false, errorType: 'invalid_api_key' };
   }
 
-  // Check for session token in query parameter (web mode - needed for image loads)
-  const queryToken = query.token;
-  if (queryToken) {
-    if (validateSession(queryToken)) {
-      return { authenticated: true };
-    }
-    return { authenticated: false, errorType: 'invalid_session' };
-  }
-
   // Check for session cookie (web mode)
   const sessionToken = cookies[SESSION_COOKIE_NAME];
   if (sessionToken && validateSession(sessionToken)) {
@@ -377,17 +333,10 @@ function checkAuthentication(
  * Accepts either:
  * 1. X-API-Key header (for Electron mode)
  * 2. X-Session-Token header (for web mode with explicit token)
- * 3. apiKey query parameter (fallback for Electron, cases where headers can't be set)
- * 4. token query parameter (fallback for web mode, needed for image loads via CSS/img tags)
- * 5. Session cookie (for web mode)
+ * 3. apiKey query parameter (fallback for cases where headers can't be set)
+ * 4. Session cookie (for web mode)
  */
 export function authMiddleware(req: Request, res: Response, next: NextFunction): void {
-  // Allow disabling auth for local/trusted networks
-  if (isEnvTrue(process.env.AUTOMAKER_DISABLE_AUTH)) {
-    next();
-    return;
-  }
-
   const result = checkAuthentication(
     req.headers as Record<string, string | string[] | undefined>,
     req.query as Record<string, string | undefined>,
@@ -433,10 +382,9 @@ export function isAuthEnabled(): boolean {
  * Get authentication status for health endpoint
  */
 export function getAuthStatus(): { enabled: boolean; method: string } {
-  const disabled = isEnvTrue(process.env.AUTOMAKER_DISABLE_AUTH);
   return {
-    enabled: !disabled,
-    method: disabled ? 'disabled' : 'api_key_or_session',
+    enabled: true,
+    method: 'api_key_or_session',
   };
 }
 
@@ -444,7 +392,6 @@ export function getAuthStatus(): { enabled: boolean; method: string } {
  * Check if a request is authenticated (for status endpoint)
  */
 export function isRequestAuthenticated(req: Request): boolean {
-  if (isEnvTrue(process.env.AUTOMAKER_DISABLE_AUTH)) return true;
   const result = checkAuthentication(
     req.headers as Record<string, string | string[] | undefined>,
     req.query as Record<string, string | undefined>,
@@ -462,6 +409,5 @@ export function checkRawAuthentication(
   query: Record<string, string | undefined>,
   cookies: Record<string, string | undefined>
 ): boolean {
-  if (isEnvTrue(process.env.AUTOMAKER_DISABLE_AUTH)) return true;
   return checkAuthentication(headers, query, cookies).authenticated;
 }

apps/server/src/lib/cli-detection.ts

@@ -1,447 +0,0 @@
-/**
- * Unified CLI Detection Framework
- *
- * Provides consistent CLI detection and management across all providers
- */
-
-import { spawn, execSync } from 'child_process';
-import * as fs from 'fs';
-import * as path from 'path';
-import * as os from 'os';
-import { createLogger } from '@automaker/utils';
-
-const logger = createLogger('CliDetection');
-
-export interface CliInfo {
-  name: string;
-  command: string;
-  version?: string;
-  path?: string;
-  installed: boolean;
-  authenticated: boolean;
-  authMethod: 'cli' | 'api_key' | 'none';
-  platform?: string;
-  architectures?: string[];
-}
-
-export interface CliDetectionOptions {
-  timeout?: number;
-  includeWsl?: boolean;
-  wslDistribution?: string;
-}
-
-export interface CliDetectionResult {
-  cli: CliInfo;
-  detected: boolean;
-  issues: string[];
-}
-
-export interface UnifiedCliDetection {
-  claude?: CliDetectionResult;
-  codex?: CliDetectionResult;
-  cursor?: CliDetectionResult;
-}
-
-/**
- * CLI Configuration for different providers
- */
-const CLI_CONFIGS = {
-  claude: {
-    name: 'Claude CLI',
-    commands: ['claude'],
-    versionArgs: ['--version'],
-    installCommands: {
-      darwin: 'brew install anthropics/claude/claude',
-      linux: 'curl -fsSL https://claude.ai/install.sh | sh',
-      win32: 'iwr https://claude.ai/install.ps1 -UseBasicParsing | iex',
-    },
-  },
-  codex: {
-    name: 'Codex CLI',
-    commands: ['codex', 'openai'],
-    versionArgs: ['--version'],
-    installCommands: {
-      darwin: 'npm install -g @openai/codex-cli',
-      linux: 'npm install -g @openai/codex-cli',
-      win32: 'npm install -g @openai/codex-cli',
-    },
-  },
-  cursor: {
-    name: 'Cursor CLI',
-    commands: ['cursor-agent', 'cursor'],
-    versionArgs: ['--version'],
-    installCommands: {
-      darwin: 'brew install cursor/cursor/cursor-agent',
-      linux: 'curl -fsSL https://cursor.sh/install.sh | sh',
-      win32: 'iwr https://cursor.sh/install.ps1 -UseBasicParsing | iex',
-    },
-  },
-} as const;
-
-/**
- * Detect if a CLI is installed and available
- */
-export async function detectCli(
-  provider: keyof typeof CLI_CONFIGS,
-  options: CliDetectionOptions = {}
-): Promise<CliDetectionResult> {
-  const config = CLI_CONFIGS[provider];
-  const { timeout = 5000, includeWsl = false, wslDistribution } = options;
-  const issues: string[] = [];
-
-  const cliInfo: CliInfo = {
-    name: config.name,
-    command: '',
-    installed: false,
-    authenticated: false,
-    authMethod: 'none',
-  };
-
-  try {
-    // Find the command in PATH
-    const command = await findCommand([...config.commands]);
-    if (command) {
-      cliInfo.command = command;
-    }
-
-    if (!cliInfo.command) {
-      issues.push(`${config.name} not found in PATH`);
-      return { cli: cliInfo, detected: false, issues };
-    }
-
-    cliInfo.path = cliInfo.command;
-    cliInfo.installed = true;
-
-    // Get version
-    try {
-      cliInfo.version = await getCliVersion(cliInfo.command, [...config.versionArgs], timeout);
-    } catch (error) {
-      issues.push(`Failed to get ${config.name} version: ${error}`);
-    }
-
-    // Check authentication
-    cliInfo.authMethod = await checkCliAuth(provider, cliInfo.command);
-    cliInfo.authenticated = cliInfo.authMethod !== 'none';
-
-    return { cli: cliInfo, detected: true, issues };
-  } catch (error) {
-    issues.push(`Error detecting ${config.name}: ${error}`);
-    return { cli: cliInfo, detected: false, issues };
-  }
-}
-
-/**
- * Detect all CLIs in the system
- */
-export async function detectAllCLis(
-  options: CliDetectionOptions = {}
-): Promise<UnifiedCliDetection> {
-  const results: UnifiedCliDetection = {};
-
-  // Detect all providers in parallel
-  const providers = Object.keys(CLI_CONFIGS) as Array<keyof typeof CLI_CONFIGS>;
-  const detectionPromises = providers.map(async (provider) => {
-    const result = await detectCli(provider, options);
-    return { provider, result };
-  });
-
-  const detections = await Promise.all(detectionPromises);
-
-  for (const { provider, result } of detections) {
-    results[provider] = result;
-  }
-
-  return results;
-}
-
-/**
- * Find the first available command from a list of alternatives
- */
-export async function findCommand(commands: string[]): Promise<string | null> {
-  for (const command of commands) {
-    try {
-      const whichCommand = process.platform === 'win32' ? 'where' : 'which';
-      const result = execSync(`${whichCommand} ${command}`, {
-        encoding: 'utf8',
-        timeout: 2000,
-      }).trim();
-
-      if (result) {
-        return result.split('\n')[0]; // Take first result on Windows
-      }
-    } catch {
-      // Command not found, try next
-    }
-  }
-  return null;
-}
-
-/**
- * Get CLI version
- */
-export async function getCliVersion(
-  command: string,
-  args: string[],
-  timeout: number = 5000
-): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const child = spawn(command, args, {
-      stdio: 'pipe',
-      timeout,
-    });
-
-    let stdout = '';
-    let stderr = '';
-
-    child.stdout?.on('data', (data) => {
-      stdout += data.toString();
-    });
-
-    child.stderr?.on('data', (data) => {
-      stderr += data.toString();
-    });
-
-    child.on('close', (code) => {
-      if (code === 0 && stdout) {
-        resolve(stdout.trim());
-      } else if (stderr) {
-        reject(stderr.trim());
-      } else {
-        reject(`Command exited with code ${code}`);
-      }
-    });
-
-    child.on('error', reject);
-  });
-}
-
-/**
- * Check authentication status for a CLI
- */
-export async function checkCliAuth(
-  provider: keyof typeof CLI_CONFIGS,
-  command: string
-): Promise<'cli' | 'api_key' | 'none'> {
-  try {
-    switch (provider) {
-      case 'claude':
-        return await checkClaudeAuth(command);
-      case 'codex':
-        return await checkCodexAuth(command);
-      case 'cursor':
-        return await checkCursorAuth(command);
-      default:
-        return 'none';
-    }
-  } catch {
-    return 'none';
-  }
-}
-
-/**
- * Check Claude CLI authentication
- */
-async function checkClaudeAuth(command: string): Promise<'cli' | 'api_key' | 'none'> {
-  try {
-    // Check for environment variable
-    if (process.env.ANTHROPIC_API_KEY) {
-      return 'api_key';
-    }
-
-    // Try running a simple command to check CLI auth
-    const result = await getCliVersion(command, ['--version'], 3000);
-    if (result) {
-      return 'cli'; // If version works, assume CLI is authenticated
-    }
-  } catch {
-    // Version command might work even without auth, so we need a better check
-  }
-
-  // Try a more specific auth check
-  return new Promise((resolve) => {
-    const child = spawn(command, ['whoami'], {
-      stdio: 'pipe',
-      timeout: 3000,
-    });
-
-    let stdout = '';
-    let stderr = '';
-
-    child.stdout?.on('data', (data) => {
-      stdout += data.toString();
-    });
-
-    child.stderr?.on('data', (data) => {
-      stderr += data.toString();
-    });
-
-    child.on('close', (code) => {
-      if (code === 0 && stdout && !stderr.includes('not authenticated')) {
-        resolve('cli');
-      } else {
-        resolve('none');
-      }
-    });
-
-    child.on('error', () => {
-      resolve('none');
-    });
-  });
-}
-
-/**
- * Check Codex CLI authentication
- */
-async function checkCodexAuth(command: string): Promise<'cli' | 'api_key' | 'none'> {
-  // Check for environment variable
-  if (process.env.OPENAI_API_KEY) {
-    return 'api_key';
-  }
-
-  try {
-    // Try a simple auth check
-    const result = await getCliVersion(command, ['--version'], 3000);
-    if (result) {
-      return 'cli';
-    }
-  } catch {
-    // Version check failed
-  }
-
-  return 'none';
-}
-
-/**
- * Check Cursor CLI authentication
- */
-async function checkCursorAuth(command: string): Promise<'cli' | 'api_key' | 'none'> {
-  // Check for environment variable
-  if (process.env.CURSOR_API_KEY) {
-    return 'api_key';
-  }
-
-  // Check for credentials files
-  const credentialPaths = [
-    path.join(os.homedir(), '.cursor', 'credentials.json'),
-    path.join(os.homedir(), '.config', 'cursor', 'credentials.json'),
-    path.join(os.homedir(), '.cursor', 'auth.json'),
-    path.join(os.homedir(), '.config', 'cursor', 'auth.json'),
-  ];
-
-  for (const credPath of credentialPaths) {
-    try {
-      if (fs.existsSync(credPath)) {
-        const content = fs.readFileSync(credPath, 'utf8');
-        const creds = JSON.parse(content);
-        if (creds.accessToken || creds.token || creds.apiKey) {
-          return 'cli';
-        }
-      }
-    } catch {
-      // Invalid credentials file
-    }
-  }
-
-  // Try a simple command
-  try {
-    const result = await getCliVersion(command, ['--version'], 3000);
-    if (result) {
-      return 'cli';
-    }
-  } catch {
-    // Version check failed
-  }
-
-  return 'none';
-}
-
-/**
- * Get installation instructions for a provider
- */
-export function getInstallInstructions(
-  provider: keyof typeof CLI_CONFIGS,
-  platform: NodeJS.Platform = process.platform
-): string {
-  const config = CLI_CONFIGS[provider];
-  const command = config.installCommands[platform as keyof typeof config.installCommands];
-
-  if (!command) {
-    return `No installation instructions available for ${provider} on ${platform}`;
-  }
-
-  return command;
-}
-
-/**
- * Get platform-specific CLI paths and versions
- */
-export function getPlatformCliPaths(provider: keyof typeof CLI_CONFIGS): string[] {
-  const config = CLI_CONFIGS[provider];
-  const platform = process.platform;
-
-  switch (platform) {
-    case 'darwin':
-      return [
-        `/usr/local/bin/${config.commands[0]}`,
-        `/opt/homebrew/bin/${config.commands[0]}`,
-        path.join(os.homedir(), '.local', 'bin', config.commands[0]),
-      ];
-
-    case 'linux':
-      return [
-        `/usr/bin/${config.commands[0]}`,
-        `/usr/local/bin/${config.commands[0]}`,
-        path.join(os.homedir(), '.local', 'bin', config.commands[0]),
-        path.join(os.homedir(), '.npm', 'global', 'bin', config.commands[0]),
-      ];
-
-    case 'win32':
-      return [
-        path.join(
-          os.homedir(),
-          'AppData',
-          'Local',
-          'Programs',
-          config.commands[0],
-          `${config.commands[0]}.exe`
-        ),
-        path.join(process.env.ProgramFiles || '', config.commands[0], `${config.commands[0]}.exe`),
-        path.join(
-          process.env.ProgramFiles || '',
-          config.commands[0],
-          'bin',
-          `${config.commands[0]}.exe`
-        ),
-      ];
-
-    default:
-      return [];
-  }
-}
-
-/**
- * Validate CLI installation
- */
-export function validateCliInstallation(cliInfo: CliInfo): {
-  valid: boolean;
-  issues: string[];
-} {
-  const issues: string[] = [];
-
-  if (!cliInfo.installed) {
-    issues.push('CLI is not installed');
-  }
-
-  if (cliInfo.installed && !cliInfo.version) {
-    issues.push('Could not determine CLI version');
-  }
-
-  if (cliInfo.installed && cliInfo.authMethod === 'none') {
-    issues.push('CLI is not authenticated');
-  }
-
-  return {
-    valid: issues.length === 0,
-    issues,
-  };
-}

apps/server/src/lib/codex-auth.ts

@@ -1,68 +0,0 @@
-/**
- * Shared utility for checking Codex CLI authentication status
- *
- * Uses 'codex login status' command to verify authentication.
- * Never assumes authenticated - only returns true if CLI confirms.
- */
-
-import { spawnProcess } from '@automaker/platform';
-import { findCodexCliPath } from '@automaker/platform';
-import { createLogger } from '@automaker/utils';
-
-const logger = createLogger('CodexAuth');
-
-const CODEX_COMMAND = 'codex';
-const OPENAI_API_KEY_ENV = 'OPENAI_API_KEY';
-
-export interface CodexAuthCheckResult {
-  authenticated: boolean;
-  method: 'api_key_env' | 'cli_authenticated' | 'none';
-}
-
-/**
- * Check Codex authentication status using 'codex login status' command
- *
- * @param cliPath Optional CLI path. If not provided, will attempt to find it.
- * @returns Authentication status and method
- */
-export async function checkCodexAuthentication(
-  cliPath?: string | null
-): Promise<CodexAuthCheckResult> {
-  const resolvedCliPath = cliPath || (await findCodexCliPath());
-  const hasApiKey = !!process.env[OPENAI_API_KEY_ENV];
-
-  // If CLI is not installed, cannot be authenticated
-  if (!resolvedCliPath) {
-    logger.info('CLI not found');
-    return { authenticated: false, method: 'none' };
-  }
-
-  try {
-    const result = await spawnProcess({
-      command: resolvedCliPath || CODEX_COMMAND,
-      args: ['login', 'status'],
-      cwd: process.cwd(),
-      env: {
-        ...process.env,
-        TERM: 'dumb', // Avoid interactive output
-      },
-    });
-
-    // Check both stdout and stderr for "logged in" - Codex CLI outputs to stderr
-    const combinedOutput = (result.stdout + result.stderr).toLowerCase();
-    const isLoggedIn = combinedOutput.includes('logged in');
-
-    if (result.exitCode === 0 && isLoggedIn) {
-      // Determine auth method based on what we know
-      const method = hasApiKey ? 'api_key_env' : 'cli_authenticated';
-      logger.info(`✓ Authenticated (${method})`);
-      return { authenticated: true, method };
-    }
-
-    logger.info('Not authenticated');
-    return { authenticated: false, method: 'none' };
-  } catch (error) {
-    logger.error('Failed to check authentication:', error);
-    return { authenticated: false, method: 'none' };
-  }
-}

apps/server/src/lib/error-handler.ts

@@ -1,414 +0,0 @@
-/**
- * Unified Error Handling System for CLI Providers
- *
- * Provides consistent error classification, user-friendly messages, and debugging support
- * across all AI providers (Claude, Codex, Cursor)
- */
-
-import { createLogger } from '@automaker/utils';
-
-const logger = createLogger('ErrorHandler');
-
-export enum ErrorType {
-  AUTHENTICATION = 'authentication',
-  BILLING = 'billing',
-  RATE_LIMIT = 'rate_limit',
-  NETWORK = 'network',
-  TIMEOUT = 'timeout',
-  VALIDATION = 'validation',
-  PERMISSION = 'permission',
-  CLI_NOT_FOUND = 'cli_not_found',
-  CLI_NOT_INSTALLED = 'cli_not_installed',
-  MODEL_NOT_SUPPORTED = 'model_not_supported',
-  INVALID_REQUEST = 'invalid_request',
-  SERVER_ERROR = 'server_error',
-  UNKNOWN = 'unknown',
-}
-
-export enum ErrorSeverity {
-  LOW = 'low',
-  MEDIUM = 'medium',
-  HIGH = 'high',
-  CRITICAL = 'critical',
-}
-
-export interface ErrorClassification {
-  type: ErrorType;
-  severity: ErrorSeverity;
-  userMessage: string;
-  technicalMessage: string;
-  suggestedAction?: string;
-  retryable: boolean;
-  provider?: string;
-  context?: Record<string, any>;
-}
-
-export interface ErrorPattern {
-  type: ErrorType;
-  severity: ErrorSeverity;
-  patterns: RegExp[];
-  userMessage: string;
-  suggestedAction?: string;
-  retryable: boolean;
-}
-
-/**
- * Error patterns for different types of errors
- */
-const ERROR_PATTERNS: ErrorPattern[] = [
-  // Authentication errors
-  {
-    type: ErrorType.AUTHENTICATION,
-    severity: ErrorSeverity.HIGH,
-    patterns: [
-      /unauthorized/i,
-      /authentication.*fail/i,
-      /invalid_api_key/i,
-      /invalid api key/i,
-      /not authenticated/i,
-      /please.*log/i,
-      /token.*revoked/i,
-      /oauth.*error/i,
-      /credentials.*invalid/i,
-    ],
-    userMessage: 'Authentication failed. Please check your API key or login credentials.',
-    suggestedAction:
-      "Verify your API key is correct and hasn't expired, or run the CLI login command.",
-    retryable: false,
-  },
-
-  // Billing errors
-  {
-    type: ErrorType.BILLING,
-    severity: ErrorSeverity.HIGH,
-    patterns: [
-      /credit.*balance.*low/i,
-      /insufficient.*credit/i,
-      /billing.*issue/i,
-      /payment.*required/i,
-      /usage.*exceeded/i,
-      /quota.*exceeded/i,
-      /add.*credit/i,
-    ],
-    userMessage: 'Account has insufficient credits or billing issues.',
-    suggestedAction: 'Please add credits to your account or check your billing settings.',
-    retryable: false,
-  },
-
-  // Rate limit errors
-  {
-    type: ErrorType.RATE_LIMIT,
-    severity: ErrorSeverity.MEDIUM,
-    patterns: [
-      /rate.*limit/i,
-      /too.*many.*request/i,
-      /limit.*reached/i,
-      /try.*later/i,
-      /429/i,
-      /reset.*time/i,
-      /upgrade.*plan/i,
-    ],
-    userMessage: 'Rate limit reached. Please wait before trying again.',
-    suggestedAction: 'Wait a few minutes before retrying, or consider upgrading your plan.',
-    retryable: true,
-  },
-
-  // Network errors
-  {
-    type: ErrorType.NETWORK,
-    severity: ErrorSeverity.MEDIUM,
-    patterns: [/network/i, /connection/i, /dns/i, /timeout/i, /econnrefused/i, /enotfound/i],
-    userMessage: 'Network connection issue.',
-    suggestedAction: 'Check your internet connection and try again.',
-    retryable: true,
-  },
-
-  // Timeout errors
-  {
-    type: ErrorType.TIMEOUT,
-    severity: ErrorSeverity.MEDIUM,
-    patterns: [/timeout/i, /aborted/i, /time.*out/i],
-    userMessage: 'Operation timed out.',
-    suggestedAction: 'Try again with a simpler request or check your connection.',
-    retryable: true,
-  },
-
-  // Permission errors
-  {
-    type: ErrorType.PERMISSION,
-    severity: ErrorSeverity.HIGH,
-    patterns: [/permission.*denied/i, /access.*denied/i, /forbidden/i, /403/i, /not.*authorized/i],
-    userMessage: 'Permission denied.',
-    suggestedAction: 'Check if you have the required permissions for this operation.',
-    retryable: false,
-  },
-
-  // CLI not found
-  {
-    type: ErrorType.CLI_NOT_FOUND,
-    severity: ErrorSeverity.HIGH,
-    patterns: [/command not found/i, /not recognized/i, /not.*installed/i, /ENOENT/i],
-    userMessage: 'CLI tool not found.',
-    suggestedAction: "Please install the required CLI tool and ensure it's in your PATH.",
-    retryable: false,
-  },
-
-  // Model not supported
-  {
-    type: ErrorType.MODEL_NOT_SUPPORTED,
-    severity: ErrorSeverity.HIGH,
-    patterns: [/model.*not.*support/i, /unknown.*model/i, /invalid.*model/i],
-    userMessage: 'Model not supported.',
-    suggestedAction: 'Check available models and use a supported one.',
-    retryable: false,
-  },
-
-  // Server errors
-  {
-    type: ErrorType.SERVER_ERROR,
-    severity: ErrorSeverity.HIGH,
-    patterns: [/internal.*server/i, /server.*error/i, /500/i, /502/i, /503/i, /504/i],
-    userMessage: 'Server error occurred.',
-    suggestedAction: 'Try again in a few minutes or contact support if the issue persists.',
-    retryable: true,
-  },
-];
-
-/**
- * Classify an error into a specific type with user-friendly message
- */
-export function classifyError(
-  error: unknown,
-  provider?: string,
-  context?: Record<string, any>
-): ErrorClassification {
-  const errorText = getErrorText(error);
-
-  // Try to match against known patterns
-  for (const pattern of ERROR_PATTERNS) {
-    for (const regex of pattern.patterns) {
-      if (regex.test(errorText)) {
-        return {
-          type: pattern.type,
-          severity: pattern.severity,
-          userMessage: pattern.userMessage,
-          technicalMessage: errorText,
-          suggestedAction: pattern.suggestedAction,
-          retryable: pattern.retryable,
-          provider,
-          context,
-        };
-      }
-    }
-  }
-
-  // Unknown error
-  return {
-    type: ErrorType.UNKNOWN,
-    severity: ErrorSeverity.MEDIUM,
-    userMessage: 'An unexpected error occurred.',
-    technicalMessage: errorText,
-    suggestedAction: 'Please try again or contact support if the issue persists.',
-    retryable: true,
-    provider,
-    context,
-  };
-}
-
-/**
- * Get a user-friendly error message
- */
-export function getUserFriendlyErrorMessage(error: unknown, provider?: string): string {
-  const classification = classifyError(error, provider);
-
-  let message = classification.userMessage;
-
-  if (classification.suggestedAction) {
-    message += ` ${classification.suggestedAction}`;
-  }
-
-  // Add provider-specific context if available
-  if (provider) {
-    message = `[${provider.toUpperCase()}] ${message}`;
-  }
-
-  return message;
-}
-
-/**
- * Check if an error is retryable
- */
-export function isRetryableError(error: unknown): boolean {
-  const classification = classifyError(error);
-  return classification.retryable;
-}
-
-/**
- * Check if an error is authentication-related
- */
-export function isAuthenticationError(error: unknown): boolean {
-  const classification = classifyError(error);
-  return classification.type === ErrorType.AUTHENTICATION;
-}
-
-/**
- * Check if an error is billing-related
- */
-export function isBillingError(error: unknown): boolean {
-  const classification = classifyError(error);
-  return classification.type === ErrorType.BILLING;
-}
-
-/**
- * Check if an error is rate limit related
- */
-export function isRateLimitError(error: unknown): boolean {
-  const classification = classifyError(error);
-  return classification.type === ErrorType.RATE_LIMIT;
-}
-
-/**
- * Get error text from various error types
- */
-function getErrorText(error: unknown): string {
-  if (typeof error === 'string') {
-    return error;
-  }
-
-  if (error instanceof Error) {
-    return error.message;
-  }
-
-  if (typeof error === 'object' && error !== null) {
-    // Handle structured error objects
-    const errorObj = error as any;
-
-    if (errorObj.message) {
-      return errorObj.message;
-    }
-
-    if (errorObj.error?.message) {
-      return errorObj.error.message;
-    }
-
-    if (errorObj.error) {
-      return typeof errorObj.error === 'string' ? errorObj.error : JSON.stringify(errorObj.error);
-    }
-
-    return JSON.stringify(error);
-  }
-
-  return String(error);
-}
-
-/**
- * Create a standardized error response
- */
-export function createErrorResponse(
-  error: unknown,
-  provider?: string,
-  context?: Record<string, any>
-): {
-  success: false;
-  error: string;
-  errorType: ErrorType;
-  severity: ErrorSeverity;
-  retryable: boolean;
-  suggestedAction?: string;
-} {
-  const classification = classifyError(error, provider, context);
-
-  return {
-    success: false,
-    error: classification.userMessage,
-    errorType: classification.type,
-    severity: classification.severity,
-    retryable: classification.retryable,
-    suggestedAction: classification.suggestedAction,
-  };
-}
-
-/**
- * Log error with full context
- */
-export function logError(
-  error: unknown,
-  provider?: string,
-  operation?: string,
-  additionalContext?: Record<string, any>
-): void {
-  const classification = classifyError(error, provider, {
-    operation,
-    ...additionalContext,
-  });
-
-  logger.error(`Error in ${provider || 'unknown'}${operation ? ` during ${operation}` : ''}`, {
-    type: classification.type,
-    severity: classification.severity,
-    message: classification.userMessage,
-    technicalMessage: classification.technicalMessage,
-    retryable: classification.retryable,
-    suggestedAction: classification.suggestedAction,
-    context: classification.context,
-  });
-}
-
-/**
- * Provider-specific error handlers
- */
-export const ProviderErrorHandler = {
-  claude: {
-    classify: (error: unknown) => classifyError(error, 'claude'),
-    getUserMessage: (error: unknown) => getUserFriendlyErrorMessage(error, 'claude'),
-    isAuth: (error: unknown) => isAuthenticationError(error),
-    isBilling: (error: unknown) => isBillingError(error),
-    isRateLimit: (error: unknown) => isRateLimitError(error),
-  },
-
-  codex: {
-    classify: (error: unknown) => classifyError(error, 'codex'),
-    getUserMessage: (error: unknown) => getUserFriendlyErrorMessage(error, 'codex'),
-    isAuth: (error: unknown) => isAuthenticationError(error),
-    isBilling: (error: unknown) => isBillingError(error),
-    isRateLimit: (error: unknown) => isRateLimitError(error),
-  },
-
-  cursor: {
-    classify: (error: unknown) => classifyError(error, 'cursor'),
-    getUserMessage: (error: unknown) => getUserFriendlyErrorMessage(error, 'cursor'),
-    isAuth: (error: unknown) => isAuthenticationError(error),
-    isBilling: (error: unknown) => isBillingError(error),
-    isRateLimit: (error: unknown) => isRateLimitError(error),
-  },
-};
-
-/**
- * Create a retry handler for retryable errors
- */
-export function createRetryHandler(maxRetries: number = 3, baseDelay: number = 1000) {
-  return async function <T>(
-    operation: () => Promise<T>,
-    shouldRetry: (error: unknown) => boolean = isRetryableError
-  ): Promise<T> {
-    let lastError: unknown;
-
-    for (let attempt = 0; attempt <= maxRetries; attempt++) {
-      try {
-        return await operation();
-      } catch (error) {
-        lastError = error;
-
-        if (attempt === maxRetries || !shouldRetry(error)) {
-          throw error;
-        }
-
-        // Exponential backoff with jitter
-        const delay = baseDelay * Math.pow(2, attempt) + Math.random() * 1000;
-        logger.debug(`Retrying operation in ${delay}ms (attempt ${attempt + 1}/${maxRetries})`);
-        await new Promise((resolve) => setTimeout(resolve, delay));
-      }
-    }
-
-    throw lastError;
-  };
-}

apps/server/src/lib/permission-enforcer.ts

@@ -1,173 +0,0 @@
-/**
- * Permission enforcement utilities for Cursor provider
- */
-
-import type { CursorCliConfigFile } from '@automaker/types';
-import { createLogger } from '@automaker/utils';
-
-const logger = createLogger('PermissionEnforcer');
-
-export interface PermissionCheckResult {
-  allowed: boolean;
-  reason?: string;
-}
-
-/**
- * Check if a tool call is allowed based on permissions
- */
-export function checkToolCallPermission(
-  toolCall: any,
-  permissions: CursorCliConfigFile | null
-): PermissionCheckResult {
-  if (!permissions || !permissions.permissions) {
-    // If no permissions are configured, allow everything (backward compatibility)
-    return { allowed: true };
-  }
-
-  const { allow = [], deny = [] } = permissions.permissions;
-
-  // Check shell tool calls
-  if (toolCall.shellToolCall?.args?.command) {
-    const command = toolCall.shellToolCall.args.command;
-    const toolName = `Shell(${extractCommandName(command)})`;
-
-    // Check deny list first (deny takes precedence)
-    for (const denyRule of deny) {
-      if (matchesRule(toolName, denyRule)) {
-        return {
-          allowed: false,
-          reason: `Operation blocked by permission rule: ${denyRule}`,
-        };
-      }
-    }
-
-    // Then check allow list
-    for (const allowRule of allow) {
-      if (matchesRule(toolName, allowRule)) {
-        return { allowed: true };
-      }
-    }
-
-    return {
-      allowed: false,
-      reason: `Operation not in allow list: ${toolName}`,
-    };
-  }
-
-  // Check read tool calls
-  if (toolCall.readToolCall?.args?.path) {
-    const path = toolCall.readToolCall.args.path;
-    const toolName = `Read(${path})`;
-
-    // Check deny list first
-    for (const denyRule of deny) {
-      if (matchesRule(toolName, denyRule)) {
-        return {
-          allowed: false,
-          reason: `Read operation blocked by permission rule: ${denyRule}`,
-        };
-      }
-    }
-
-    // Then check allow list
-    for (const allowRule of allow) {
-      if (matchesRule(toolName, allowRule)) {
-        return { allowed: true };
-      }
-    }
-
-    return {
-      allowed: false,
-      reason: `Read operation not in allow list: ${toolName}`,
-    };
-  }
-
-  // Check write tool calls
-  if (toolCall.writeToolCall?.args?.path) {
-    const path = toolCall.writeToolCall.args.path;
-    const toolName = `Write(${path})`;
-
-    // Check deny list first
-    for (const denyRule of deny) {
-      if (matchesRule(toolName, denyRule)) {
-        return {
-          allowed: false,
-          reason: `Write operation blocked by permission rule: ${denyRule}`,
-        };
-      }
-    }
-
-    // Then check allow list
-    for (const allowRule of allow) {
-      if (matchesRule(toolName, allowRule)) {
-        return { allowed: true };
-      }
-    }
-
-    return {
-      allowed: false,
-      reason: `Write operation not in allow list: ${toolName}`,
-    };
-  }
-
-  // For other tool types, allow by default for now
-  return { allowed: true };
-}
-
-/**
- * Extract the base command name from a shell command
- */
-function extractCommandName(command: string): string {
-  // Remove leading spaces and get the first word
-  const trimmed = command.trim();
-  const firstWord = trimmed.split(/\s+/)[0];
-  return firstWord || 'unknown';
-}
-
-/**
- * Check if a tool name matches a permission rule
- */
-function matchesRule(toolName: string, rule: string): boolean {
-  // Exact match
-  if (toolName === rule) {
-    return true;
-  }
-
-  // Wildcard patterns
-  if (rule.includes('*')) {
-    const regex = new RegExp(rule.replace(/\*/g, '.*'));
-    return regex.test(toolName);
-  }
-
-  // Prefix match for shell commands (e.g., "Shell(git)" matches "Shell(git status)")
-  if (rule.startsWith('Shell(') && toolName.startsWith('Shell(')) {
-    const ruleCommand = rule.slice(6, -1); // Remove "Shell(" and ")"
-    const toolCommand = extractCommandName(toolName.slice(6, -1)); // Remove "Shell(" and ")"
-    return toolCommand.startsWith(ruleCommand);
-  }
-
-  return false;
-}
-
-/**
- * Log permission violations
- */
-export function logPermissionViolation(toolCall: any, reason: string, sessionId?: string): void {
-  const sessionIdStr = sessionId ? ` [${sessionId}]` : '';
-
-  if (toolCall.shellToolCall?.args?.command) {
-    logger.warn(
-      `Permission violation${sessionIdStr}: Shell command blocked - ${toolCall.shellToolCall.args.command} (${reason})`
-    );
-  } else if (toolCall.readToolCall?.args?.path) {
-    logger.warn(
-      `Permission violation${sessionIdStr}: Read operation blocked - ${toolCall.readToolCall.args.path} (${reason})`
-    );
-  } else if (toolCall.writeToolCall?.args?.path) {
-    logger.warn(
-      `Permission violation${sessionIdStr}: Write operation blocked - ${toolCall.writeToolCall.args.path} (${reason})`
-    );
-  } else {
-    logger.warn(`Permission violation${sessionIdStr}: Tool call blocked (${reason})`, { toolCall });
-  }
-}

apps/server/src/lib/sdk-options.ts

@@ -16,6 +16,7 @@
  */
 
 import type { Options } from '@anthropic-ai/claude-agent-sdk';
+import os from 'os';
 import path from 'path';
 import { resolveModelString } from '@automaker/model-resolver';
 import { createLogger } from '@automaker/utils';
@@ -30,68 +31,6 @@ import {
 } from '@automaker/types';
 import { isPathAllowed, PathNotAllowedError, getAllowedRootDirectory } from '@automaker/platform';
 
-/**
- * Result of sandbox compatibility check
- */
-export interface SandboxCompatibilityResult {
-  /** Whether sandbox mode can be enabled for this path */
-  enabled: boolean;
-  /** Optional message explaining why sandbox is disabled */
-  message?: string;
-}
-
-/**
- * Check if a working directory is compatible with sandbox mode.
- * Some paths (like cloud storage mounts) may not work with sandboxed execution.
- *
- * @param cwd - The working directory to check
- * @param sandboxRequested - Whether sandbox mode was requested by settings
- * @returns Object indicating if sandbox can be enabled and why not if disabled
- */
-export function checkSandboxCompatibility(
-  cwd: string,
-  sandboxRequested: boolean
-): SandboxCompatibilityResult {
-  if (!sandboxRequested) {
-    return { enabled: false };
-  }
-
-  const resolvedCwd = path.resolve(cwd);
-
-  // Check for cloud storage paths that may not be compatible with sandbox
-  const cloudStoragePatterns = [
-    // macOS mounted volumes
-    /^\/Volumes\/GoogleDrive/i,
-    /^\/Volumes\/Dropbox/i,
-    /^\/Volumes\/OneDrive/i,
-    /^\/Volumes\/iCloud/i,
-    // macOS home directory
-    /^\/Users\/[^/]+\/Google Drive/i,
-    /^\/Users\/[^/]+\/Dropbox/i,
-    /^\/Users\/[^/]+\/OneDrive/i,
-    /^\/Users\/[^/]+\/Library\/Mobile Documents/i, // iCloud
-    // Linux home directory
-    /^\/home\/[^/]+\/Google Drive/i,
-    /^\/home\/[^/]+\/Dropbox/i,
-    /^\/home\/[^/]+\/OneDrive/i,
-    // Windows
-    /^C:\\Users\\[^\\]+\\Google Drive/i,
-    /^C:\\Users\\[^\\]+\\Dropbox/i,
-    /^C:\\Users\\[^\\]+\\OneDrive/i,
-  ];
-
-  for (const pattern of cloudStoragePatterns) {
-    if (pattern.test(resolvedCwd)) {
-      return {
-        enabled: false,
-        message: `Sandbox disabled: Cloud storage path detected (${resolvedCwd}). Sandbox mode may not work correctly with cloud-synced directories.`,
-      };
-    }
-  }
-
-  return { enabled: true };
-}
-
 /**
  * Validate that a working directory is allowed by ALLOWED_ROOT_DIRECTORY.
  * This is the centralized security check for ALL AI model invocations.
@@ -118,6 +57,139 @@ export function validateWorkingDirectory(cwd: string): void {
   }
 }
 
+/**
+ * Known cloud storage path patterns where sandbox mode is incompatible.
+ *
+ * The Claude CLI sandbox feature uses filesystem isolation that conflicts with
+ * cloud storage providers' virtual filesystem implementations. This causes the
+ * Claude process to exit with code 1 when sandbox is enabled for these paths.
+ *
+ * Affected providers (macOS paths):
+ * - Dropbox: ~/Library/CloudStorage/Dropbox-*
+ * - Google Drive: ~/Library/CloudStorage/GoogleDrive-*
+ * - OneDrive: ~/Library/CloudStorage/OneDrive-*
+ * - iCloud Drive: ~/Library/Mobile Documents/
+ * - Box: ~/Library/CloudStorage/Box-*
+ *
+ * Note: This is a known limitation when using cloud storage paths.
+ */
+
+/**
+ * macOS-specific cloud storage patterns that appear under ~/Library/
+ * These are specific enough to use with includes() safely.
+ */
+const MACOS_CLOUD_STORAGE_PATTERNS = [
+  '/Library/CloudStorage/', // Dropbox, Google Drive, OneDrive, Box on macOS
+  '/Library/Mobile Documents/', // iCloud Drive on macOS
+] as const;
+
+/**
+ * Generic cloud storage folder names that need to be anchored to the home directory
+ * to avoid false positives (e.g., /home/user/my-project-about-dropbox/).
+ */
+const HOME_ANCHORED_CLOUD_FOLDERS = [
+  'Google Drive', // Google Drive on some systems
+  'Dropbox', // Dropbox on Linux/alternative installs
+  'OneDrive', // OneDrive on Linux/alternative installs
+] as const;
+
+/**
+ * Check if a path is within a cloud storage location.
+ *
+ * Cloud storage providers use virtual filesystem implementations that are
+ * incompatible with the Claude CLI sandbox feature, causing process crashes.
+ *
+ * Uses two detection strategies:
+ * 1. macOS-specific patterns (under ~/Library/) - checked via includes()
+ * 2. Generic folder names - anchored to home directory to avoid false positives
+ *
+ * @param cwd - The working directory path to check
+ * @returns true if the path is in a cloud storage location
+ */
+export function isCloudStoragePath(cwd: string): boolean {
+  const resolvedPath = path.resolve(cwd);
+  // Normalize to forward slashes for consistent pattern matching across platforms
+  let normalizedPath = resolvedPath.split(path.sep).join('/');
+  // Remove Windows drive letter if present (e.g., "C:/Users" -> "/Users")
+  // This ensures Unix paths in tests work the same on Windows
+  normalizedPath = normalizedPath.replace(/^[A-Za-z]:/, '');
+
+  // Check macOS-specific patterns (these are specific enough to use includes)
+  if (MACOS_CLOUD_STORAGE_PATTERNS.some((pattern) => normalizedPath.includes(pattern))) {
+    return true;
+  }
+
+  // Check home-anchored patterns to avoid false positives
+  // e.g., /home/user/my-project-about-dropbox/ should NOT match
+  const home = os.homedir();
+  for (const folder of HOME_ANCHORED_CLOUD_FOLDERS) {
+    const cloudPath = path.join(home, folder);
+    let normalizedCloudPath = cloudPath.split(path.sep).join('/');
+    // Remove Windows drive letter if present
+    normalizedCloudPath = normalizedCloudPath.replace(/^[A-Za-z]:/, '');
+    // Check if resolved path starts with the cloud storage path followed by a separator
+    // This ensures we match ~/Dropbox/project but not ~/Dropbox-archive or ~/my-dropbox-tool
+    if (
+      normalizedPath === normalizedCloudPath ||
+      normalizedPath.startsWith(normalizedCloudPath + '/')
+    ) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * Result of sandbox compatibility check
+ */
+export interface SandboxCheckResult {
+  /** Whether sandbox should be enabled */
+  enabled: boolean;
+  /** If disabled, the reason why */
+  disabledReason?: 'cloud_storage' | 'user_setting';
+  /** Human-readable message for logging/UI */
+  message?: string;
+}
+
+/**
+ * Determine if sandbox mode should be enabled for a given configuration.
+ *
+ * Sandbox mode is automatically disabled for cloud storage paths because the
+ * Claude CLI sandbox feature is incompatible with virtual filesystem
+ * implementations used by cloud storage providers (Dropbox, Google Drive, etc.).
+ *
+ * @param cwd - The working directory
+ * @param enableSandboxMode - User's sandbox mode setting
+ * @returns SandboxCheckResult with enabled status and reason if disabled
+ */
+export function checkSandboxCompatibility(
+  cwd: string,
+  enableSandboxMode?: boolean
+): SandboxCheckResult {
+  // User has explicitly disabled sandbox mode
+  if (enableSandboxMode === false) {
+    return {
+      enabled: false,
+      disabledReason: 'user_setting',
+    };
+  }
+
+  // Check for cloud storage incompatibility (applies when enabled or undefined)
+  if (isCloudStoragePath(cwd)) {
+    return {
+      enabled: false,
+      disabledReason: 'cloud_storage',
+      message: `Sandbox mode auto-disabled: Project is in a cloud storage location (${cwd}). The Claude CLI sandbox feature is incompatible with cloud storage filesystems. To use sandbox mode, move your project to a local directory.`,
+    };
+  }
+
+  // Sandbox is compatible and enabled (true or undefined defaults to enabled)
+  return {
+    enabled: true,
+  };
+}
+
 /**
  * Tool presets for different use cases
  */
@@ -129,30 +201,10 @@ export const TOOL_PRESETS = {
   specGeneration: ['Read', 'Glob', 'Grep'] as const,
 
   /** Full tool access for feature implementation */
-  fullAccess: [
-    'Read',
-    'Write',
-    'Edit',
-    'Glob',
-    'Grep',
-    'Bash',
-    'WebSearch',
-    'WebFetch',
-    'TodoWrite',
-  ] as const,
+  fullAccess: ['Read', 'Write', 'Edit', 'Glob', 'Grep', 'Bash', 'WebSearch', 'WebFetch'] as const,
 
   /** Tools for chat/interactive mode */
-  chat: [
-    'Read',
-    'Write',
-    'Edit',
-    'Glob',
-    'Grep',
-    'Bash',
-    'WebSearch',
-    'WebFetch',
-    'TodoWrite',
-  ] as const,
+  chat: ['Read', 'Write', 'Edit', 'Glob', 'Grep', 'Bash', 'WebSearch', 'WebFetch'] as const,
 } as const;
 
 /**
@@ -220,31 +272,55 @@ export function getModelForUseCase(
 
 /**
  * Base options that apply to all SDK calls
- * AUTONOMOUS MODE: Always bypass permissions for fully autonomous operation
  */
 function getBaseOptions(): Partial<Options> {
   return {
-    permissionMode: 'bypassPermissions',
-    allowDangerouslySkipPermissions: true,
+    permissionMode: 'acceptEdits',
   };
 }
 
 /**
- * MCP options result
+ * MCP permission options result
  */
-interface McpOptions {
+interface McpPermissionOptions {
+  /** Whether tools should be restricted to a preset */
+  shouldRestrictTools: boolean;
+  /** Options to spread when MCP bypass is enabled */
+  bypassOptions: Partial<Options>;
   /** Options to spread for MCP servers */
   mcpServerOptions: Partial<Options>;
 }
 
 /**
  * Build MCP-related options based on configuration.
+ * Centralizes the logic for determining permission modes and tool restrictions
+ * when MCP servers are configured.
  *
  * @param config - The SDK options config
- * @returns Object with MCP server settings to spread into final options
+ * @returns Object with MCP permission settings to spread into final options
  */
-function buildMcpOptions(config: CreateSdkOptionsConfig): McpOptions {
+function buildMcpOptions(config: CreateSdkOptionsConfig): McpPermissionOptions {
+  const hasMcpServers = config.mcpServers && Object.keys(config.mcpServers).length > 0;
+  // Default to true for autonomous workflow. Security is enforced when adding servers
+  // via the security warning dialog that explains the risks.
+  const mcpAutoApprove = config.mcpAutoApproveTools ?? true;
+  const mcpUnrestricted = config.mcpUnrestrictedTools ?? true;
+
+  // Determine if we should bypass permissions based on settings
+  const shouldBypassPermissions = hasMcpServers && mcpAutoApprove;
+  // Determine if we should restrict tools (only when no MCP or unrestricted is disabled)
+  const shouldRestrictTools = !hasMcpServers || !mcpUnrestricted;
+
   return {
+    shouldRestrictTools,
+    // Only include bypass options when MCP is configured and auto-approve is enabled
+    bypassOptions: shouldBypassPermissions
+      ? {
+          permissionMode: 'bypassPermissions' as const,
+          // Required flag when using bypassPermissions mode
+          allowDangerouslySkipPermissions: true,
+        }
+      : {},
     // Include MCP servers if configured
     mcpServerOptions: config.mcpServers ? { mcpServers: config.mcpServers } : {},
   };
@@ -346,9 +422,18 @@ export interface CreateSdkOptionsConfig {
   /** Enable auto-loading of CLAUDE.md files via SDK's settingSources */
   autoLoadClaudeMd?: boolean;
 
+  /** Enable sandbox mode for bash command isolation */
+  enableSandboxMode?: boolean;
+
   /** MCP servers to make available to the agent */
   mcpServers?: Record<string, McpServerConfig>;
 
+  /** Auto-approve MCP tool calls without permission prompts */
+  mcpAutoApproveTools?: boolean;
+
+  /** Allow unrestricted tools when MCP servers are enabled */
+  mcpUnrestrictedTools?: boolean;
+
   /** Extended thinking level for Claude models */
   thinkingLevel?: ThinkingLevel;
 }
@@ -469,6 +554,7 @@ export function createSuggestionsOptions(config: CreateSdkOptionsConfig): Option
  * - Full tool access for code modification
  * - Standard turns for interactive sessions
  * - Model priority: explicit model > session model > chat default
+ * - Sandbox mode controlled by enableSandboxMode setting (auto-disabled for cloud storage)
  * - When autoLoadClaudeMd is true, uses preset mode and settingSources for CLAUDE.md loading
  */
 export function createChatOptions(config: CreateSdkOptionsConfig): Options {
@@ -487,12 +573,24 @@ export function createChatOptions(config: CreateSdkOptionsConfig): Options {
   // Build thinking options
   const thinkingOptions = buildThinkingOptions(config.thinkingLevel);
 
+  // Check sandbox compatibility (auto-disables for cloud storage paths)
+  const sandboxCheck = checkSandboxCompatibility(config.cwd, config.enableSandboxMode);
+
   return {
     ...getBaseOptions(),
     model: getModelForUseCase('chat', effectiveModel),
     maxTurns: MAX_TURNS.standard,
     cwd: config.cwd,
-    allowedTools: [...TOOL_PRESETS.chat],
+    // Only restrict tools if no MCP servers configured or unrestricted is disabled
+    ...(mcpOptions.shouldRestrictTools && { allowedTools: [...TOOL_PRESETS.chat] }),
+    // Apply MCP bypass options if configured
+    ...mcpOptions.bypassOptions,
+    ...(sandboxCheck.enabled && {
+      sandbox: {
+        enabled: true,
+        autoAllowBashIfSandboxed: true,
+      },
+    }),
     ...claudeMdOptions,
     ...thinkingOptions,
     ...(config.abortController && { abortController: config.abortController }),
@@ -507,6 +605,7 @@ export function createChatOptions(config: CreateSdkOptionsConfig): Options {
  * - Full tool access for code modification and implementation
  * - Extended turns for thorough feature implementation
  * - Uses default model (can be overridden)
+ * - Sandbox mode controlled by enableSandboxMode setting (auto-disabled for cloud storage)
  * - When autoLoadClaudeMd is true, uses preset mode and settingSources for CLAUDE.md loading
  */
 export function createAutoModeOptions(config: CreateSdkOptionsConfig): Options {
@@ -522,12 +621,24 @@ export function createAutoModeOptions(config: CreateSdkOptionsConfig): Options {
   // Build thinking options
   const thinkingOptions = buildThinkingOptions(config.thinkingLevel);
 
+  // Check sandbox compatibility (auto-disables for cloud storage paths)
+  const sandboxCheck = checkSandboxCompatibility(config.cwd, config.enableSandboxMode);
+
   return {
     ...getBaseOptions(),
     model: getModelForUseCase('auto', config.model),
     maxTurns: MAX_TURNS.maximum,
     cwd: config.cwd,
-    allowedTools: [...TOOL_PRESETS.fullAccess],
+    // Only restrict tools if no MCP servers configured or unrestricted is disabled
+    ...(mcpOptions.shouldRestrictTools && { allowedTools: [...TOOL_PRESETS.fullAccess] }),
+    // Apply MCP bypass options if configured
+    ...mcpOptions.bypassOptions,
+    ...(sandboxCheck.enabled && {
+      sandbox: {
+        enabled: true,
+        autoAllowBashIfSandboxed: true,
+      },
+    }),
     ...claudeMdOptions,
     ...thinkingOptions,
     ...(config.abortController && { abortController: config.abortController }),
@@ -545,6 +656,7 @@ export function createCustomOptions(
   config: CreateSdkOptionsConfig & {
     maxTurns?: number;
     allowedTools?: readonly string[];
+    sandbox?: { enabled: boolean; autoAllowBashIfSandboxed?: boolean };
   }
 ): Options {
   // Validate working directory before creating options
@@ -559,17 +671,22 @@ export function createCustomOptions(
   // Build thinking options
   const thinkingOptions = buildThinkingOptions(config.thinkingLevel);
 
-  // For custom options: use explicit allowedTools if provided, otherwise default to readOnly
+  // For custom options: use explicit allowedTools if provided, otherwise use preset based on MCP settings
   const effectiveAllowedTools = config.allowedTools
     ? [...config.allowedTools]
-    : [...TOOL_PRESETS.readOnly];
+    : mcpOptions.shouldRestrictTools
+      ? [...TOOL_PRESETS.readOnly]
+      : undefined;
 
   return {
     ...getBaseOptions(),
     model: getModelForUseCase('default', config.model),
     maxTurns: config.maxTurns ?? MAX_TURNS.maximum,
     cwd: config.cwd,
-    allowedTools: effectiveAllowedTools,
+    ...(effectiveAllowedTools && { allowedTools: effectiveAllowedTools }),
+    ...(config.sandbox && { sandbox: config.sandbox }),
+    // Apply MCP bypass options if configured
+    ...mcpOptions.bypassOptions,
     ...claudeMdOptions,
     ...thinkingOptions,
     ...(config.abortController && { abortController: config.abortController }),

apps/server/src/lib/settings-helpers.ts

@@ -5,30 +5,12 @@
 import type { SettingsService } from '../services/settings-service.js';
 import type { ContextFilesResult, ContextFileInfo } from '@automaker/utils';
 import { createLogger } from '@automaker/utils';
-import type {
-  MCPServerConfig,
-  McpServerConfig,
-  PromptCustomization,
-  ClaudeApiProfile,
-  ClaudeCompatibleProvider,
-  PhaseModelKey,
-  PhaseModelEntry,
-  Credentials,
-} from '@automaker/types';
-import { DEFAULT_PHASE_MODELS } from '@automaker/types';
+import type { MCPServerConfig, McpServerConfig, PromptCustomization } from '@automaker/types';
 import {
   mergeAutoModePrompts,
   mergeAgentPrompts,
   mergeBacklogPlanPrompts,
   mergeEnhancementPrompts,
-  mergeCommitMessagePrompts,
-  mergeTitleGenerationPrompts,
-  mergeIssueValidationPrompts,
-  mergeIdeationPrompts,
-  mergeAppSpecPrompts,
-  mergeContextDescriptionPrompts,
-  mergeSuggestionsPrompts,
-  mergeTaskExecutionPrompts,
 } from '@automaker/prompts';
 
 const logger = createLogger('SettingsHelper');
@@ -73,6 +55,34 @@ export async function getAutoLoadClaudeMdSetting(
   }
 }
 
+/**
+ * Get the enableSandboxMode setting from global settings.
+ * Returns false if settings service is not available.
+ *
+ * @param settingsService - Optional settings service instance
+ * @param logPrefix - Prefix for log messages (e.g., '[AgentService]')
+ * @returns Promise resolving to the enableSandboxMode setting value
+ */
+export async function getEnableSandboxModeSetting(
+  settingsService?: SettingsService | null,
+  logPrefix = '[SettingsHelper]'
+): Promise<boolean> {
+  if (!settingsService) {
+    logger.info(`${logPrefix} SettingsService not available, sandbox mode disabled`);
+    return false;
+  }
+
+  try {
+    const globalSettings = await settingsService.getGlobalSettings();
+    const result = globalSettings.enableSandboxMode ?? false;
+    logger.info(`${logPrefix} enableSandboxMode from global settings: ${result}`);
+    return result;
+  } catch (error) {
+    logger.error(`${logPrefix} Failed to load enableSandboxMode setting:`, error);
+    throw error;
+  }
+}
+
 /**
  * Filters out CLAUDE.md from context files when autoLoadClaudeMd is enabled
  * and rebuilds the formatted prompt without it.
@@ -236,14 +246,6 @@ export async function getPromptCustomization(
   agent: ReturnType<typeof mergeAgentPrompts>;
   backlogPlan: ReturnType<typeof mergeBacklogPlanPrompts>;
   enhancement: ReturnType<typeof mergeEnhancementPrompts>;
-  commitMessage: ReturnType<typeof mergeCommitMessagePrompts>;
-  titleGeneration: ReturnType<typeof mergeTitleGenerationPrompts>;
-  issueValidation: ReturnType<typeof mergeIssueValidationPrompts>;
-  ideation: ReturnType<typeof mergeIdeationPrompts>;
-  appSpec: ReturnType<typeof mergeAppSpecPrompts>;
-  contextDescription: ReturnType<typeof mergeContextDescriptionPrompts>;
-  suggestions: ReturnType<typeof mergeSuggestionsPrompts>;
-  taskExecution: ReturnType<typeof mergeTaskExecutionPrompts>;
 }> {
   let customization: PromptCustomization = {};
 
@@ -265,466 +267,5 @@ export async function getPromptCustomization(
     agent: mergeAgentPrompts(customization.agent),
     backlogPlan: mergeBacklogPlanPrompts(customization.backlogPlan),
     enhancement: mergeEnhancementPrompts(customization.enhancement),
-    commitMessage: mergeCommitMessagePrompts(customization.commitMessage),
-    titleGeneration: mergeTitleGenerationPrompts(customization.titleGeneration),
-    issueValidation: mergeIssueValidationPrompts(customization.issueValidation),
-    ideation: mergeIdeationPrompts(customization.ideation),
-    appSpec: mergeAppSpecPrompts(customization.appSpec),
-    contextDescription: mergeContextDescriptionPrompts(customization.contextDescription),
-    suggestions: mergeSuggestionsPrompts(customization.suggestions),
-    taskExecution: mergeTaskExecutionPrompts(customization.taskExecution),
   };
 }
-
-/**
- * Get Skills configuration from settings.
- * Returns configuration for enabling skills and which sources to load from.
- *
- * @param settingsService - Settings service instance
- * @returns Skills configuration with enabled state, sources, and tool inclusion flag
- */
-export async function getSkillsConfiguration(settingsService: SettingsService): Promise<{
-  enabled: boolean;
-  sources: Array<'user' | 'project'>;
-  shouldIncludeInTools: boolean;
-}> {
-  const settings = await settingsService.getGlobalSettings();
-  const enabled = settings.enableSkills ?? true; // Default enabled
-  const sources = settings.skillsSources ?? ['user', 'project']; // Default both sources
-
-  return {
-    enabled,
-    sources,
-    shouldIncludeInTools: enabled && sources.length > 0,
-  };
-}
-
-/**
- * Get Subagents configuration from settings.
- * Returns configuration for enabling subagents and which sources to load from.
- *
- * @param settingsService - Settings service instance
- * @returns Subagents configuration with enabled state, sources, and tool inclusion flag
- */
-export async function getSubagentsConfiguration(settingsService: SettingsService): Promise<{
-  enabled: boolean;
-  sources: Array<'user' | 'project'>;
-  shouldIncludeInTools: boolean;
-}> {
-  const settings = await settingsService.getGlobalSettings();
-  const enabled = settings.enableSubagents ?? true; // Default enabled
-  const sources = settings.subagentsSources ?? ['user', 'project']; // Default both sources
-
-  return {
-    enabled,
-    sources,
-    shouldIncludeInTools: enabled && sources.length > 0,
-  };
-}
-
-/**
- * Get custom subagents from settings, merging global and project-level definitions.
- * Project-level subagents take precedence over global ones with the same name.
- *
- * @param settingsService - Settings service instance
- * @param projectPath - Path to the project for loading project-specific subagents
- * @returns Record of agent names to definitions, or undefined if none configured
- */
-export async function getCustomSubagents(
-  settingsService: SettingsService,
-  projectPath?: string
-): Promise<Record<string, import('@automaker/types').AgentDefinition> | undefined> {
-  // Get global subagents
-  const globalSettings = await settingsService.getGlobalSettings();
-  const globalSubagents = globalSettings.customSubagents || {};
-
-  // If no project path, return only global subagents
-  if (!projectPath) {
-    return Object.keys(globalSubagents).length > 0 ? globalSubagents : undefined;
-  }
-
-  // Get project-specific subagents
-  const projectSettings = await settingsService.getProjectSettings(projectPath);
-  const projectSubagents = projectSettings.customSubagents || {};
-
-  // Merge: project-level takes precedence
-  const merged = {
-    ...globalSubagents,
-    ...projectSubagents,
-  };
-
-  return Object.keys(merged).length > 0 ? merged : undefined;
-}
-
-/** Result from getActiveClaudeApiProfile */
-export interface ActiveClaudeApiProfileResult {
-  /** The active profile, or undefined if using direct Anthropic API */
-  profile: ClaudeApiProfile | undefined;
-  /** Credentials for resolving 'credentials' apiKeySource */
-  credentials: import('@automaker/types').Credentials | undefined;
-}
-
-/**
- * Get the active Claude API profile and credentials from settings.
- * Checks project settings first for per-project overrides, then falls back to global settings.
- * Returns both the profile and credentials for resolving 'credentials' apiKeySource.
- *
- * @deprecated Use getProviderById and getPhaseModelWithOverrides instead for the new provider system.
- * This function is kept for backward compatibility during migration.
- *
- * @param settingsService - Optional settings service instance
- * @param logPrefix - Prefix for log messages (e.g., '[AgentService]')
- * @param projectPath - Optional project path for per-project override
- * @returns Promise resolving to object with profile and credentials
- */
-export async function getActiveClaudeApiProfile(
-  settingsService?: SettingsService | null,
-  logPrefix = '[SettingsHelper]',
-  projectPath?: string
-): Promise<ActiveClaudeApiProfileResult> {
-  if (!settingsService) {
-    return { profile: undefined, credentials: undefined };
-  }
-
-  try {
-    const globalSettings = await settingsService.getGlobalSettings();
-    const credentials = await settingsService.getCredentials();
-    const profiles = globalSettings.claudeApiProfiles || [];
-
-    // Check for project-level override first
-    let activeProfileId: string | null | undefined;
-    let isProjectOverride = false;
-
-    if (projectPath) {
-      const projectSettings = await settingsService.getProjectSettings(projectPath);
-      // undefined = use global, null = explicit no profile, string = specific profile
-      if (projectSettings.activeClaudeApiProfileId !== undefined) {
-        activeProfileId = projectSettings.activeClaudeApiProfileId;
-        isProjectOverride = true;
-      }
-    }
-
-    // Fall back to global if project doesn't specify
-    if (activeProfileId === undefined && !isProjectOverride) {
-      activeProfileId = globalSettings.activeClaudeApiProfileId;
-    }
-
-    // No active profile selected - use direct Anthropic API
-    if (!activeProfileId) {
-      if (isProjectOverride && activeProfileId === null) {
-        logger.info(`${logPrefix} Project explicitly using Direct Anthropic API`);
-      }
-      return { profile: undefined, credentials };
-    }
-
-    // Find the active profile by ID
-    const activeProfile = profiles.find((p) => p.id === activeProfileId);
-
-    if (activeProfile) {
-      const overrideSuffix = isProjectOverride ? ' (project override)' : '';
-      logger.info(`${logPrefix} Using Claude API profile: ${activeProfile.name}${overrideSuffix}`);
-      return { profile: activeProfile, credentials };
-    } else {
-      logger.warn(
-        `${logPrefix} Active profile ID "${activeProfileId}" not found, falling back to direct Anthropic API`
-      );
-      return { profile: undefined, credentials };
-    }
-  } catch (error) {
-    logger.error(`${logPrefix} Failed to load Claude API profile:`, error);
-    return { profile: undefined, credentials: undefined };
-  }
-}
-
-// ============================================================================
-// New Provider System Helpers
-// ============================================================================
-
-/** Result from getProviderById */
-export interface ProviderByIdResult {
-  /** The provider, or undefined if not found */
-  provider: ClaudeCompatibleProvider | undefined;
-  /** Credentials for resolving 'credentials' apiKeySource */
-  credentials: Credentials | undefined;
-}
-
-/**
- * Get a ClaudeCompatibleProvider by its ID.
- * Returns the provider configuration and credentials for API key resolution.
- *
- * @param providerId - The provider ID to look up
- * @param settingsService - Settings service instance
- * @param logPrefix - Prefix for log messages
- * @returns Promise resolving to object with provider and credentials
- */
-export async function getProviderById(
-  providerId: string,
-  settingsService: SettingsService,
-  logPrefix = '[SettingsHelper]'
-): Promise<ProviderByIdResult> {
-  try {
-    const globalSettings = await settingsService.getGlobalSettings();
-    const credentials = await settingsService.getCredentials();
-    const providers = globalSettings.claudeCompatibleProviders || [];
-
-    const provider = providers.find((p) => p.id === providerId);
-
-    if (provider) {
-      if (provider.enabled === false) {
-        logger.warn(`${logPrefix} Provider "${provider.name}" (${providerId}) is disabled`);
-      } else {
-        logger.debug(`${logPrefix} Found provider: ${provider.name}`);
-      }
-      return { provider, credentials };
-    } else {
-      logger.warn(`${logPrefix} Provider not found: ${providerId}`);
-      return { provider: undefined, credentials };
-    }
-  } catch (error) {
-    logger.error(`${logPrefix} Failed to load provider by ID:`, error);
-    return { provider: undefined, credentials: undefined };
-  }
-}
-
-/** Result from getPhaseModelWithOverrides */
-export interface PhaseModelWithOverridesResult {
-  /** The resolved phase model entry */
-  phaseModel: PhaseModelEntry;
-  /** Whether a project override was applied */
-  isProjectOverride: boolean;
-  /** The provider if providerId is set and found */
-  provider: ClaudeCompatibleProvider | undefined;
-  /** Credentials for API key resolution */
-  credentials: Credentials | undefined;
-}
-
-/**
- * Get the phase model configuration for a specific phase, applying project overrides if available.
- * Also resolves the provider if the phase model has a providerId.
- *
- * @param phase - The phase key (e.g., 'enhancementModel', 'specGenerationModel')
- * @param settingsService - Optional settings service instance (returns defaults if undefined)
- * @param projectPath - Optional project path for checking overrides
- * @param logPrefix - Prefix for log messages
- * @returns Promise resolving to phase model with provider info
- */
-export async function getPhaseModelWithOverrides(
-  phase: PhaseModelKey,
-  settingsService?: SettingsService | null,
-  projectPath?: string,
-  logPrefix = '[SettingsHelper]'
-): Promise<PhaseModelWithOverridesResult> {
-  // Handle undefined settingsService gracefully
-  if (!settingsService) {
-    logger.info(`${logPrefix} SettingsService not available, using default for ${phase}`);
-    return {
-      phaseModel: DEFAULT_PHASE_MODELS[phase] || { model: 'sonnet' },
-      isProjectOverride: false,
-      provider: undefined,
-      credentials: undefined,
-    };
-  }
-
-  try {
-    const globalSettings = await settingsService.getGlobalSettings();
-    const credentials = await settingsService.getCredentials();
-    const globalPhaseModels = globalSettings.phaseModels || {};
-
-    // Start with global phase model
-    let phaseModel = globalPhaseModels[phase];
-    let isProjectOverride = false;
-
-    // Check for project override
-    if (projectPath) {
-      const projectSettings = await settingsService.getProjectSettings(projectPath);
-      const projectOverrides = projectSettings.phaseModelOverrides || {};
-
-      if (projectOverrides[phase]) {
-        phaseModel = projectOverrides[phase];
-        isProjectOverride = true;
-        logger.debug(`${logPrefix} Using project override for ${phase}`);
-      }
-    }
-
-    // If no phase model found, use a default
-    if (!phaseModel) {
-      phaseModel = { model: 'sonnet' };
-      logger.debug(`${logPrefix} No ${phase} configured, using default: sonnet`);
-    }
-
-    // Resolve provider if providerId is set
-    let provider: ClaudeCompatibleProvider | undefined;
-    if (phaseModel.providerId) {
-      const providers = globalSettings.claudeCompatibleProviders || [];
-      provider = providers.find((p) => p.id === phaseModel.providerId);
-
-      if (provider) {
-        if (provider.enabled === false) {
-          logger.warn(
-            `${logPrefix} Provider "${provider.name}" for ${phase} is disabled, falling back to direct API`
-          );
-          provider = undefined;
-        } else {
-          logger.debug(`${logPrefix} Using provider "${provider.name}" for ${phase}`);
-        }
-      } else {
-        logger.warn(
-          `${logPrefix} Provider ${phaseModel.providerId} not found for ${phase}, falling back to direct API`
-        );
-      }
-    }
-
-    return {
-      phaseModel,
-      isProjectOverride,
-      provider,
-      credentials,
-    };
-  } catch (error) {
-    logger.error(`${logPrefix} Failed to get phase model with overrides:`, error);
-    // Return a safe default
-    return {
-      phaseModel: { model: 'sonnet' },
-      isProjectOverride: false,
-      provider: undefined,
-      credentials: undefined,
-    };
-  }
-}
-
-/** Result from getProviderByModelId */
-export interface ProviderByModelIdResult {
-  /** The provider that contains this model, or undefined if not found */
-  provider: ClaudeCompatibleProvider | undefined;
-  /** The model configuration if found */
-  modelConfig: import('@automaker/types').ProviderModel | undefined;
-  /** Credentials for API key resolution */
-  credentials: Credentials | undefined;
-  /** The resolved Claude model ID to use for API calls (from mapsToClaudeModel) */
-  resolvedModel: string | undefined;
-}
-
-/**
- * Find a ClaudeCompatibleProvider by one of its model IDs.
- * Searches through all enabled providers to find one that contains the specified model.
- * This is useful when you have a model string from the UI but need the provider config.
- *
- * Also resolves the `mapsToClaudeModel` field to get the actual Claude model ID to use
- * when calling the API (e.g., "GLM-4.5-Air" -> "claude-haiku-4-5").
- *
- * @param modelId - The model ID to search for (e.g., "GLM-4.7", "MiniMax-M2.1")
- * @param settingsService - Settings service instance
- * @param logPrefix - Prefix for log messages
- * @returns Promise resolving to object with provider, model config, credentials, and resolved model
- */
-export async function getProviderByModelId(
-  modelId: string,
-  settingsService: SettingsService,
-  logPrefix = '[SettingsHelper]'
-): Promise<ProviderByModelIdResult> {
-  try {
-    const globalSettings = await settingsService.getGlobalSettings();
-    const credentials = await settingsService.getCredentials();
-    const providers = globalSettings.claudeCompatibleProviders || [];
-
-    // Search through all enabled providers for this model
-    for (const provider of providers) {
-      // Skip disabled providers
-      if (provider.enabled === false) {
-        continue;
-      }
-
-      // Check if this provider has the model
-      const modelConfig = provider.models?.find(
-        (m) => m.id === modelId || m.id.toLowerCase() === modelId.toLowerCase()
-      );
-
-      if (modelConfig) {
-        logger.info(`${logPrefix} Found model "${modelId}" in provider "${provider.name}"`);
-
-        // Resolve the mapped Claude model if specified
-        let resolvedModel: string | undefined;
-        if (modelConfig.mapsToClaudeModel) {
-          // Import resolveModelString to convert alias to full model ID
-          const { resolveModelString } = await import('@automaker/model-resolver');
-          resolvedModel = resolveModelString(modelConfig.mapsToClaudeModel);
-          logger.info(
-            `${logPrefix} Model "${modelId}" maps to Claude model "${modelConfig.mapsToClaudeModel}" -> "${resolvedModel}"`
-          );
-        }
-
-        return { provider, modelConfig, credentials, resolvedModel };
-      }
-    }
-
-    // Model not found in any provider
-    logger.debug(`${logPrefix} Model "${modelId}" not found in any provider`);
-    return {
-      provider: undefined,
-      modelConfig: undefined,
-      credentials: undefined,
-      resolvedModel: undefined,
-    };
-  } catch (error) {
-    logger.error(`${logPrefix} Failed to find provider by model ID:`, error);
-    return {
-      provider: undefined,
-      modelConfig: undefined,
-      credentials: undefined,
-      resolvedModel: undefined,
-    };
-  }
-}
-
-/**
- * Get all enabled provider models for use in model dropdowns.
- * Returns models from all enabled ClaudeCompatibleProviders.
- *
- * @param settingsService - Settings service instance
- * @param logPrefix - Prefix for log messages
- * @returns Promise resolving to array of provider models with their provider info
- */
-export async function getAllProviderModels(
-  settingsService: SettingsService,
-  logPrefix = '[SettingsHelper]'
-): Promise<
-  Array<{
-    providerId: string;
-    providerName: string;
-    model: import('@automaker/types').ProviderModel;
-  }>
-> {
-  try {
-    const globalSettings = await settingsService.getGlobalSettings();
-    const providers = globalSettings.claudeCompatibleProviders || [];
-
-    const allModels: Array<{
-      providerId: string;
-      providerName: string;
-      model: import('@automaker/types').ProviderModel;
-    }> = [];
-
-    for (const provider of providers) {
-      // Skip disabled providers
-      if (provider.enabled === false) {
-        continue;
-      }
-
-      for (const model of provider.models || []) {
-        allModels.push({
-          providerId: provider.id,
-          providerName: provider.name,
-          model,
-        });
-      }
-    }
-
-    logger.debug(
-      `${logPrefix} Found ${allModels.length} models from ${providers.length} providers`
-    );
-    return allModels;
-  } catch (error) {
-    logger.error(`${logPrefix} Failed to get all provider models:`, error);
-    return [];
-  }
-}

apps/server/src/lib/worktree-metadata.ts

@@ -5,24 +5,22 @@
 
 import * as secureFs from './secure-fs.js';
 import * as path from 'path';
-import type { PRState, WorktreePRInfo } from '@automaker/types';
-
-// Re-export types for backwards compatibility
-export type { PRState, WorktreePRInfo };
 
 /** Maximum length for sanitized branch names in filesystem paths */
 const MAX_SANITIZED_BRANCH_PATH_LENGTH = 200;
 
+export interface WorktreePRInfo {
+  number: number;
+  url: string;
+  title: string;
+  state: string;
+  createdAt: string;
+}
+
 export interface WorktreeMetadata {
   branch: string;
   createdAt: string;
   pr?: WorktreePRInfo;
-  /** Whether the init script has been executed for this worktree */
-  initScriptRan?: boolean;
-  /** Status of the init script execution */
-  initScriptStatus?: 'running' | 'success' | 'failed';
-  /** Error message if init script failed */
-  initScriptError?: string;
 }
 
 /**

apps/server/src/lib/xml-extractor.ts

@@ -1,611 +0,0 @@
-/**
- * XML Extraction Utilities
- *
- * Robust XML parsing utilities for extracting and updating sections
- * from app_spec.txt XML content. Uses regex-based parsing which is
- * sufficient for our controlled XML structure.
- *
- * Note: If more complex XML parsing is needed in the future, consider
- * using a library like 'fast-xml-parser' or 'xml2js'.
- */
-
-import { createLogger } from '@automaker/utils';
-import type { SpecOutput } from '@automaker/types';
-
-const logger = createLogger('XmlExtractor');
-
-/**
- * Represents an implemented feature extracted from XML
- */
-export interface ImplementedFeature {
-  name: string;
-  description: string;
-  file_locations?: string[];
-}
-
-/**
- * Logger interface for optional custom logging
- */
-export interface XmlExtractorLogger {
-  debug: (message: string, ...args: unknown[]) => void;
-  warn?: (message: string, ...args: unknown[]) => void;
-}
-
-/**
- * Options for XML extraction operations
- */
-export interface ExtractXmlOptions {
-  /** Custom logger (defaults to internal logger) */
-  logger?: XmlExtractorLogger;
-}
-
-/**
- * Escape special XML characters
- * Handles undefined/null values by converting them to empty strings
- */
-export function escapeXml(str: string | undefined | null): string {
-  if (str == null) {
-    return '';
-  }
-  return str
-    .replace(/&/g, '&')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&apos;');
-}
-
-/**
- * Unescape XML entities back to regular characters
- */
-export function unescapeXml(str: string): string {
-  return str
-    .replace(/&apos;/g, "'")
-    .replace(/&quot;/g, '"')
-    .replace(/&gt;/g, '>')
-    .replace(/&lt;/g, '<')
-    .replace(/&amp;/g, '&');
-}
-
-/**
- * Extract the content of a specific XML section
- *
- * @param xmlContent - The full XML content
- * @param tagName - The tag name to extract (e.g., 'implemented_features')
- * @param options - Optional extraction options
- * @returns The content between the tags, or null if not found
- */
-export function extractXmlSection(
-  xmlContent: string,
-  tagName: string,
-  options: ExtractXmlOptions = {}
-): string | null {
-  const log = options.logger || logger;
-
-  const regex = new RegExp(`<${tagName}>([\\s\\S]*?)<\\/${tagName}>`, 'i');
-  const match = xmlContent.match(regex);
-
-  if (match) {
-    log.debug(`Extracted <${tagName}> section`);
-    return match[1];
-  }
-
-  log.debug(`Section <${tagName}> not found`);
-  return null;
-}
-
-/**
- * Extract all values from repeated XML elements
- *
- * @param xmlContent - The XML content to search
- * @param tagName - The tag name to extract values from
- * @param options - Optional extraction options
- * @returns Array of extracted values (unescaped)
- */
-export function extractXmlElements(
-  xmlContent: string,
-  tagName: string,
-  options: ExtractXmlOptions = {}
-): string[] {
-  const log = options.logger || logger;
-  const values: string[] = [];
-
-  const regex = new RegExp(`<${tagName}>([\\s\\S]*?)<\\/${tagName}>`, 'g');
-  const matches = xmlContent.matchAll(regex);
-
-  for (const match of matches) {
-    values.push(unescapeXml(match[1].trim()));
-  }
-
-  log.debug(`Extracted ${values.length} <${tagName}> elements`);
-  return values;
-}
-
-/**
- * Extract implemented features from app_spec.txt XML content
- *
- * @param specContent - The full XML content of app_spec.txt
- * @param options - Optional extraction options
- * @returns Array of implemented features with name, description, and optional file_locations
- */
-export function extractImplementedFeatures(
-  specContent: string,
-  options: ExtractXmlOptions = {}
-): ImplementedFeature[] {
-  const log = options.logger || logger;
-  const features: ImplementedFeature[] = [];
-
-  // Match <implemented_features>...</implemented_features> section
-  const implementedSection = extractXmlSection(specContent, 'implemented_features', options);
-
-  if (!implementedSection) {
-    log.debug('No implemented_features section found');
-    return features;
-  }
-
-  // Extract individual feature blocks
-  const featureRegex = /<feature>([\s\S]*?)<\/feature>/g;
-  const featureMatches = implementedSection.matchAll(featureRegex);
-
-  for (const featureMatch of featureMatches) {
-    const featureContent = featureMatch[1];
-
-    // Extract name
-    const nameMatch = featureContent.match(/<name>([\s\S]*?)<\/name>/);
-    const name = nameMatch ? unescapeXml(nameMatch[1].trim()) : '';
-
-    // Extract description
-    const descMatch = featureContent.match(/<description>([\s\S]*?)<\/description>/);
-    const description = descMatch ? unescapeXml(descMatch[1].trim()) : '';
-
-    // Extract file_locations if present
-    const locationsSection = extractXmlSection(featureContent, 'file_locations', options);
-    const file_locations = locationsSection
-      ? extractXmlElements(locationsSection, 'location', options)
-      : undefined;
-
-    if (name) {
-      features.push({
-        name,
-        description,
-        ...(file_locations && file_locations.length > 0 ? { file_locations } : {}),
-      });
-    }
-  }
-
-  log.debug(`Extracted ${features.length} implemented features`);
-  return features;
-}
-
-/**
- * Extract only the feature names from implemented_features section
- *
- * @param specContent - The full XML content of app_spec.txt
- * @param options - Optional extraction options
- * @returns Array of feature names
- */
-export function extractImplementedFeatureNames(
-  specContent: string,
-  options: ExtractXmlOptions = {}
-): string[] {
-  const features = extractImplementedFeatures(specContent, options);
-  return features.map((f) => f.name);
-}
-
-/**
- * Generate XML for a single implemented feature
- *
- * @param feature - The feature to convert to XML
- * @param indent - The base indentation level (default: 2 spaces)
- * @returns XML string for the feature
- */
-export function featureToXml(feature: ImplementedFeature, indent: string = '  '): string {
-  const i2 = indent.repeat(2);
-  const i3 = indent.repeat(3);
-  const i4 = indent.repeat(4);
-
-  let xml = `${i2}<feature>
-${i3}<name>${escapeXml(feature.name)}</name>
-${i3}<description>${escapeXml(feature.description)}</description>`;
-
-  if (feature.file_locations && feature.file_locations.length > 0) {
-    xml += `
-${i3}<file_locations>
-${feature.file_locations.map((loc) => `${i4}<location>${escapeXml(loc)}</location>`).join('\n')}
-${i3}</file_locations>`;
-  }
-
-  xml += `
-${i2}</feature>`;
-
-  return xml;
-}
-
-/**
- * Generate XML for an array of implemented features
- *
- * @param features - Array of features to convert to XML
- * @param indent - The base indentation level (default: 2 spaces)
- * @returns XML string for the implemented_features section content
- */
-export function featuresToXml(features: ImplementedFeature[], indent: string = '  '): string {
-  return features.map((f) => featureToXml(f, indent)).join('\n');
-}
-
-/**
- * Update the implemented_features section in XML content
- *
- * @param specContent - The full XML content
- * @param newFeatures - The new features to set
- * @param options - Optional extraction options
- * @returns Updated XML content with the new implemented_features section
- */
-export function updateImplementedFeaturesSection(
-  specContent: string,
-  newFeatures: ImplementedFeature[],
-  options: ExtractXmlOptions = {}
-): string {
-  const log = options.logger || logger;
-  const indent = '  ';
-
-  // Generate new section content
-  const newSectionContent = featuresToXml(newFeatures, indent);
-
-  // Build the new section
-  const newSection = `<implemented_features>
-${newSectionContent}
-${indent}</implemented_features>`;
-
-  // Check if section exists
-  const sectionRegex = /<implemented_features>[\s\S]*?<\/implemented_features>/;
-
-  if (sectionRegex.test(specContent)) {
-    log.debug('Replacing existing implemented_features section');
-    return specContent.replace(sectionRegex, newSection);
-  }
-
-  // If section doesn't exist, try to insert after core_capabilities
-  const coreCapabilitiesEnd = '</core_capabilities>';
-  const insertIndex = specContent.indexOf(coreCapabilitiesEnd);
-
-  if (insertIndex !== -1) {
-    const insertPosition = insertIndex + coreCapabilitiesEnd.length;
-    log.debug('Inserting implemented_features after core_capabilities');
-    return (
-      specContent.slice(0, insertPosition) +
-      '\n\n' +
-      indent +
-      newSection +
-      specContent.slice(insertPosition)
-    );
-  }
-
-  // As a fallback, insert before </project_specification>
-  const projectSpecEnd = '</project_specification>';
-  const fallbackIndex = specContent.indexOf(projectSpecEnd);
-
-  if (fallbackIndex !== -1) {
-    log.debug('Inserting implemented_features before </project_specification>');
-    return (
-      specContent.slice(0, fallbackIndex) +
-      indent +
-      newSection +
-      '\n' +
-      specContent.slice(fallbackIndex)
-    );
-  }
-
-  log.warn?.('Could not find appropriate insertion point for implemented_features');
-  log.debug('Could not find appropriate insertion point for implemented_features');
-  return specContent;
-}
-
-/**
- * Add a new feature to the implemented_features section
- *
- * @param specContent - The full XML content
- * @param newFeature - The feature to add
- * @param options - Optional extraction options
- * @returns Updated XML content with the new feature added
- */
-export function addImplementedFeature(
-  specContent: string,
-  newFeature: ImplementedFeature,
-  options: ExtractXmlOptions = {}
-): string {
-  const log = options.logger || logger;
-
-  // Extract existing features
-  const existingFeatures = extractImplementedFeatures(specContent, options);
-
-  // Check for duplicates by name
-  const isDuplicate = existingFeatures.some(
-    (f) => f.name.toLowerCase() === newFeature.name.toLowerCase()
-  );
-
-  if (isDuplicate) {
-    log.debug(`Feature "${newFeature.name}" already exists, skipping`);
-    return specContent;
-  }
-
-  // Add the new feature
-  const updatedFeatures = [...existingFeatures, newFeature];
-
-  log.debug(`Adding feature "${newFeature.name}"`);
-  return updateImplementedFeaturesSection(specContent, updatedFeatures, options);
-}
-
-/**
- * Remove a feature from the implemented_features section by name
- *
- * @param specContent - The full XML content
- * @param featureName - The name of the feature to remove
- * @param options - Optional extraction options
- * @returns Updated XML content with the feature removed
- */
-export function removeImplementedFeature(
-  specContent: string,
-  featureName: string,
-  options: ExtractXmlOptions = {}
-): string {
-  const log = options.logger || logger;
-
-  // Extract existing features
-  const existingFeatures = extractImplementedFeatures(specContent, options);
-
-  // Filter out the feature to remove
-  const updatedFeatures = existingFeatures.filter(
-    (f) => f.name.toLowerCase() !== featureName.toLowerCase()
-  );
-
-  if (updatedFeatures.length === existingFeatures.length) {
-    log.debug(`Feature "${featureName}" not found, no changes made`);
-    return specContent;
-  }
-
-  log.debug(`Removing feature "${featureName}"`);
-  return updateImplementedFeaturesSection(specContent, updatedFeatures, options);
-}
-
-/**
- * Update an existing feature in the implemented_features section
- *
- * @param specContent - The full XML content
- * @param featureName - The name of the feature to update
- * @param updates - Partial updates to apply to the feature
- * @param options - Optional extraction options
- * @returns Updated XML content with the feature modified
- */
-export function updateImplementedFeature(
-  specContent: string,
-  featureName: string,
-  updates: Partial<ImplementedFeature>,
-  options: ExtractXmlOptions = {}
-): string {
-  const log = options.logger || logger;
-
-  // Extract existing features
-  const existingFeatures = extractImplementedFeatures(specContent, options);
-
-  // Find and update the feature
-  let found = false;
-  const updatedFeatures = existingFeatures.map((f) => {
-    if (f.name.toLowerCase() === featureName.toLowerCase()) {
-      found = true;
-      return {
-        ...f,
-        ...updates,
-        // Preserve the original name if not explicitly updated
-        name: updates.name ?? f.name,
-      };
-    }
-    return f;
-  });
-
-  if (!found) {
-    log.debug(`Feature "${featureName}" not found, no changes made`);
-    return specContent;
-  }
-
-  log.debug(`Updating feature "${featureName}"`);
-  return updateImplementedFeaturesSection(specContent, updatedFeatures, options);
-}
-
-/**
- * Check if a feature exists in the implemented_features section
- *
- * @param specContent - The full XML content
- * @param featureName - The name of the feature to check
- * @param options - Optional extraction options
- * @returns True if the feature exists
- */
-export function hasImplementedFeature(
-  specContent: string,
-  featureName: string,
-  options: ExtractXmlOptions = {}
-): boolean {
-  const features = extractImplementedFeatures(specContent, options);
-  return features.some((f) => f.name.toLowerCase() === featureName.toLowerCase());
-}
-
-/**
- * Convert extracted features to SpecOutput.implemented_features format
- *
- * @param features - Array of extracted features
- * @returns Features in SpecOutput format
- */
-export function toSpecOutputFeatures(
-  features: ImplementedFeature[]
-): SpecOutput['implemented_features'] {
-  return features.map((f) => ({
-    name: f.name,
-    description: f.description,
-    ...(f.file_locations && f.file_locations.length > 0
-      ? { file_locations: f.file_locations }
-      : {}),
-  }));
-}
-
-/**
- * Convert SpecOutput.implemented_features to ImplementedFeature format
- *
- * @param specFeatures - Features from SpecOutput
- * @returns Features in ImplementedFeature format
- */
-export function fromSpecOutputFeatures(
-  specFeatures: SpecOutput['implemented_features']
-): ImplementedFeature[] {
-  return specFeatures.map((f) => ({
-    name: f.name,
-    description: f.description,
-    ...(f.file_locations && f.file_locations.length > 0
-      ? { file_locations: f.file_locations }
-      : {}),
-  }));
-}
-
-/**
- * Represents a roadmap phase extracted from XML
- */
-export interface RoadmapPhase {
-  name: string;
-  status: string;
-  description?: string;
-}
-
-/**
- * Extract the technology stack from app_spec.txt XML content
- *
- * @param specContent - The full XML content
- * @param options - Optional extraction options
- * @returns Array of technology names
- */
-export function extractTechnologyStack(
-  specContent: string,
-  options: ExtractXmlOptions = {}
-): string[] {
-  const log = options.logger || logger;
-
-  const techSection = extractXmlSection(specContent, 'technology_stack', options);
-  if (!techSection) {
-    log.debug('No technology_stack section found');
-    return [];
-  }
-
-  const technologies = extractXmlElements(techSection, 'technology', options);
-  log.debug(`Extracted ${technologies.length} technologies`);
-  return technologies;
-}
-
-/**
- * Update the technology_stack section in XML content
- *
- * @param specContent - The full XML content
- * @param technologies - The new technology list
- * @param options - Optional extraction options
- * @returns Updated XML content
- */
-export function updateTechnologyStack(
-  specContent: string,
-  technologies: string[],
-  options: ExtractXmlOptions = {}
-): string {
-  const log = options.logger || logger;
-  const indent = '  ';
-  const i2 = indent.repeat(2);
-
-  // Generate new section content
-  const techXml = technologies
-    .map((t) => `${i2}<technology>${escapeXml(t)}</technology>`)
-    .join('\n');
-  const newSection = `<technology_stack>\n${techXml}\n${indent}</technology_stack>`;
-
-  // Check if section exists
-  const sectionRegex = /<technology_stack>[\s\S]*?<\/technology_stack>/;
-
-  if (sectionRegex.test(specContent)) {
-    log.debug('Replacing existing technology_stack section');
-    return specContent.replace(sectionRegex, newSection);
-  }
-
-  log.debug('No technology_stack section found to update');
-  return specContent;
-}
-
-/**
- * Extract roadmap phases from app_spec.txt XML content
- *
- * @param specContent - The full XML content
- * @param options - Optional extraction options
- * @returns Array of roadmap phases
- */
-export function extractRoadmapPhases(
-  specContent: string,
-  options: ExtractXmlOptions = {}
-): RoadmapPhase[] {
-  const log = options.logger || logger;
-  const phases: RoadmapPhase[] = [];
-
-  const roadmapSection = extractXmlSection(specContent, 'implementation_roadmap', options);
-  if (!roadmapSection) {
-    log.debug('No implementation_roadmap section found');
-    return phases;
-  }
-
-  // Extract individual phase blocks
-  const phaseRegex = /<phase>([\s\S]*?)<\/phase>/g;
-  const phaseMatches = roadmapSection.matchAll(phaseRegex);
-
-  for (const phaseMatch of phaseMatches) {
-    const phaseContent = phaseMatch[1];
-
-    const nameMatch = phaseContent.match(/<name>([\s\S]*?)<\/name>/);
-    const name = nameMatch ? unescapeXml(nameMatch[1].trim()) : '';
-
-    const statusMatch = phaseContent.match(/<status>([\s\S]*?)<\/status>/);
-    const status = statusMatch ? unescapeXml(statusMatch[1].trim()) : 'pending';
-
-    const descMatch = phaseContent.match(/<description>([\s\S]*?)<\/description>/);
-    const description = descMatch ? unescapeXml(descMatch[1].trim()) : undefined;
-
-    if (name) {
-      phases.push({ name, status, description });
-    }
-  }
-
-  log.debug(`Extracted ${phases.length} roadmap phases`);
-  return phases;
-}
-
-/**
- * Update a roadmap phase status in XML content
- *
- * @param specContent - The full XML content
- * @param phaseName - The name of the phase to update
- * @param newStatus - The new status value
- * @param options - Optional extraction options
- * @returns Updated XML content
- */
-export function updateRoadmapPhaseStatus(
-  specContent: string,
-  phaseName: string,
-  newStatus: string,
-  options: ExtractXmlOptions = {}
-): string {
-  const log = options.logger || logger;
-
-  // Find the phase and update its status
-  // Match the phase block containing the specific name
-  const phaseRegex = new RegExp(
-    `(<phase>\\s*<name>\\s*${escapeXml(phaseName)}\\s*<\\/name>\\s*<status>)[\\s\\S]*?(<\\/status>)`,
-    'i'
-  );
-
-  if (phaseRegex.test(specContent)) {
-    log.debug(`Updating phase "${phaseName}" status to "${newStatus}"`);
-    return specContent.replace(phaseRegex, `$1${escapeXml(newStatus)}$2`);
-  }
-
-  log.debug(`Phase "${phaseName}" not found`);
-  return specContent;
-}

apps/server/src/middleware/validate-paths.ts

@@ -8,28 +8,12 @@ import type { Request, Response, NextFunction } from 'express';
 import { validatePath, PathNotAllowedError } from '@automaker/platform';
 
 /**
- * Helper to get parameter value from request (checks body first, then query)
- */
-function getParamValue(req: Request, paramName: string): unknown {
-  // Check body first (for POST/PUT/PATCH requests)
-  if (req.body && req.body[paramName] !== undefined) {
-    return req.body[paramName];
-  }
-  // Fall back to query params (for GET requests)
-  if (req.query && req.query[paramName] !== undefined) {
-    return req.query[paramName];
-  }
-  return undefined;
-}
-
-/**
- * Creates a middleware that validates specified path parameters in req.body or req.query
+ * Creates a middleware that validates specified path parameters in req.body
  * @param paramNames - Names of parameters to validate (e.g., 'projectPath', 'worktreePath')
  * @example
  * router.post('/create', validatePathParams('projectPath'), handler);
  * router.post('/delete', validatePathParams('projectPath', 'worktreePath'), handler);
  * router.post('/send', validatePathParams('workingDirectory?', 'imagePaths[]'), handler);
- * router.get('/logs', validatePathParams('worktreePath'), handler); // Works with query params too
  *
  * Special syntax:
  * - 'paramName?' - Optional parameter (only validated if present)
@@ -42,8 +26,8 @@ export function validatePathParams(...paramNames: string[]) {
         // Handle optional parameters (paramName?)
         if (paramName.endsWith('?')) {
           const actualName = paramName.slice(0, -1);
-          const value = getParamValue(req, actualName);
-          if (value && typeof value === 'string') {
+          const value = req.body[actualName];
+          if (value) {
             validatePath(value);
           }
           continue;
@@ -52,20 +36,18 @@ export function validatePathParams(...paramNames: string[]) {
         // Handle array parameters (paramName[])
         if (paramName.endsWith('[]')) {
           const actualName = paramName.slice(0, -2);
-          const values = getParamValue(req, actualName);
+          const values = req.body[actualName];
           if (Array.isArray(values) && values.length > 0) {
             for (const value of values) {
-              if (typeof value === 'string') {
-                validatePath(value);
-              }
+              validatePath(value);
             }
           }
           continue;
         }
 
         // Handle regular parameters
-        const value = getParamValue(req, paramName);
-        if (value && typeof value === 'string') {
+        const value = req.body[paramName];
+        if (value) {
           validatePath(value);
         }
       }

apps/server/src/providers/claude-provider.ts

@@ -10,21 +10,7 @@ import { BaseProvider } from './base-provider.js';
 import { classifyError, getUserFriendlyErrorMessage, createLogger } from '@automaker/utils';
 
 const logger = createLogger('ClaudeProvider');
-import {
-  getThinkingTokenBudget,
-  validateBareModelId,
-  type ClaudeApiProfile,
-  type ClaudeCompatibleProvider,
-  type Credentials,
-} from '@automaker/types';
-
-/**
- * ProviderConfig - Union type for provider configuration
- *
- * Accepts either the legacy ClaudeApiProfile or new ClaudeCompatibleProvider.
- * Both share the same connection settings structure.
- */
-type ProviderConfig = ClaudeApiProfile | ClaudeCompatibleProvider;
+import { getThinkingTokenBudget } from '@automaker/types';
 import type {
   ExecuteOptions,
   ProviderMessage,
@@ -35,19 +21,7 @@ import type {
 // Explicit allowlist of environment variables to pass to the SDK.
 // Only these vars are passed - nothing else from process.env leaks through.
 const ALLOWED_ENV_VARS = [
-  // Authentication
   'ANTHROPIC_API_KEY',
-  'ANTHROPIC_AUTH_TOKEN',
-  // Endpoint configuration
-  'ANTHROPIC_BASE_URL',
-  'API_TIMEOUT_MS',
-  // Model mappings
-  'ANTHROPIC_DEFAULT_HAIKU_MODEL',
-  'ANTHROPIC_DEFAULT_SONNET_MODEL',
-  'ANTHROPIC_DEFAULT_OPUS_MODEL',
-  // Traffic control
-  'CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC',
-  // System vars (always from process.env)
   'PATH',
   'HOME',
   'SHELL',
@@ -57,132 +31,16 @@ const ALLOWED_ENV_VARS = [
   'LC_ALL',
 ];
 
-// System vars are always passed from process.env regardless of profile
-const SYSTEM_ENV_VARS = ['PATH', 'HOME', 'SHELL', 'TERM', 'USER', 'LANG', 'LC_ALL'];
-
 /**
- * Check if the config is a ClaudeCompatibleProvider (new system)
- * by checking for the 'models' array property
+ * Build environment for the SDK with only explicitly allowed variables
  */
-function isClaudeCompatibleProvider(config: ProviderConfig): config is ClaudeCompatibleProvider {
-  return 'models' in config && Array.isArray(config.models);
-}
-
-/**
- * Build environment for the SDK with only explicitly allowed variables.
- * When a provider/profile is provided, uses its configuration (clean switch - don't inherit from process.env).
- * When no provider is provided, uses direct Anthropic API settings from process.env.
- *
- * Supports both:
- * - ClaudeCompatibleProvider (new system with models[] array)
- * - ClaudeApiProfile (legacy system with modelMappings)
- *
- * @param providerConfig - Optional provider configuration for alternative endpoint
- * @param credentials - Optional credentials object for resolving 'credentials' apiKeySource
- */
-function buildEnv(
-  providerConfig?: ProviderConfig,
-  credentials?: Credentials
-): Record<string, string | undefined> {
+function buildEnv(): Record<string, string | undefined> {
   const env: Record<string, string | undefined> = {};
-
-  if (providerConfig) {
-    // Use provider configuration (clean switch - don't inherit non-system vars from process.env)
-    logger.debug('[buildEnv] Using provider configuration:', {
-      name: providerConfig.name,
-      baseUrl: providerConfig.baseUrl,
-      apiKeySource: providerConfig.apiKeySource ?? 'inline',
-      isNewProvider: isClaudeCompatibleProvider(providerConfig),
-    });
-
-    // Resolve API key based on source strategy
-    let apiKey: string | undefined;
-    const source = providerConfig.apiKeySource ?? 'inline'; // Default to inline for backwards compat
-
-    switch (source) {
-      case 'inline':
-        apiKey = providerConfig.apiKey;
-        break;
-      case 'env':
-        apiKey = process.env.ANTHROPIC_API_KEY;
-        break;
-      case 'credentials':
-        apiKey = credentials?.apiKeys?.anthropic;
-        break;
-    }
-
-    // Warn if no API key found
-    if (!apiKey) {
-      logger.warn(`No API key found for provider "${providerConfig.name}" with source "${source}"`);
-    }
-
-    // Authentication
-    if (providerConfig.useAuthToken) {
-      env['ANTHROPIC_AUTH_TOKEN'] = apiKey;
-    } else {
-      env['ANTHROPIC_API_KEY'] = apiKey;
-    }
-
-    // Endpoint configuration
-    env['ANTHROPIC_BASE_URL'] = providerConfig.baseUrl;
-    logger.debug(`[buildEnv] Set ANTHROPIC_BASE_URL to: ${providerConfig.baseUrl}`);
-
-    if (providerConfig.timeoutMs) {
-      env['API_TIMEOUT_MS'] = String(providerConfig.timeoutMs);
-    }
-
-    // Model mappings - only for legacy ClaudeApiProfile
-    // For ClaudeCompatibleProvider, the model is passed directly (no mapping needed)
-    if (!isClaudeCompatibleProvider(providerConfig) && providerConfig.modelMappings) {
-      if (providerConfig.modelMappings.haiku) {
-        env['ANTHROPIC_DEFAULT_HAIKU_MODEL'] = providerConfig.modelMappings.haiku;
-      }
-      if (providerConfig.modelMappings.sonnet) {
-        env['ANTHROPIC_DEFAULT_SONNET_MODEL'] = providerConfig.modelMappings.sonnet;
-      }
-      if (providerConfig.modelMappings.opus) {
-        env['ANTHROPIC_DEFAULT_OPUS_MODEL'] = providerConfig.modelMappings.opus;
-      }
-    }
-
-    // Traffic control
-    if (providerConfig.disableNonessentialTraffic) {
-      env['CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC'] = '1';
-    }
-  } else {
-    // Use direct Anthropic API - pass through credentials or environment variables
-    // This supports:
-    // 1. API Key mode: ANTHROPIC_API_KEY from credentials (UI settings) or env
-    // 2. Claude Max plan: Uses CLI OAuth auth (SDK handles this automatically)
-    // 3. Custom endpoints via ANTHROPIC_BASE_URL env var (backward compatibility)
-    //
-    // Priority: credentials file (UI settings) -> environment variable
-    // Note: Only auth and endpoint vars are passed. Model mappings and traffic
-    // control are NOT passed (those require a profile for explicit configuration).
-    if (credentials?.apiKeys?.anthropic) {
-      env['ANTHROPIC_API_KEY'] = credentials.apiKeys.anthropic;
-    } else if (process.env.ANTHROPIC_API_KEY) {
-      env['ANTHROPIC_API_KEY'] = process.env.ANTHROPIC_API_KEY;
-    }
-    // If using Claude Max plan via CLI auth, the SDK handles auth automatically
-    // when no API key is provided. We don't set ANTHROPIC_AUTH_TOKEN here
-    // unless it was explicitly set in process.env (rare edge case).
-    if (process.env.ANTHROPIC_AUTH_TOKEN) {
-      env['ANTHROPIC_AUTH_TOKEN'] = process.env.ANTHROPIC_AUTH_TOKEN;
-    }
-    // Pass through ANTHROPIC_BASE_URL if set in environment (backward compatibility)
-    if (process.env.ANTHROPIC_BASE_URL) {
-      env['ANTHROPIC_BASE_URL'] = process.env.ANTHROPIC_BASE_URL;
-    }
-  }
-
-  // Always add system vars from process.env
-  for (const key of SYSTEM_ENV_VARS) {
+  for (const key of ALLOWED_ENV_VARS) {
     if (process.env[key]) {
       env[key] = process.env[key];
     }
   }
-
   return env;
 }
 
@@ -195,10 +53,6 @@ export class ClaudeProvider extends BaseProvider {
    * Execute a query using Claude Agent SDK
    */
   async *executeQuery(options: ExecuteOptions): AsyncGenerator<ProviderMessage> {
-    // Validate that model doesn't have a provider prefix
-    // AgentService should strip prefixes before passing to providers
-    validateBareModelId(options.model, 'ClaudeProvider');
-
     const {
       prompt,
       model,
@@ -210,31 +64,31 @@ export class ClaudeProvider extends BaseProvider {
       conversationHistory,
       sdkSessionId,
       thinkingLevel,
-      claudeApiProfile,
-      claudeCompatibleProvider,
-      credentials,
     } = options;
 
-    // Determine which provider config to use
-    // claudeCompatibleProvider takes precedence over claudeApiProfile
-    const providerConfig = claudeCompatibleProvider || claudeApiProfile;
-
     // Convert thinking level to token budget
     const maxThinkingTokens = getThinkingTokenBudget(thinkingLevel);
 
     // Build Claude SDK options
+    // AUTONOMOUS MODE: Always bypass permissions for fully autonomous operation
+    const hasMcpServers = options.mcpServers && Object.keys(options.mcpServers).length > 0;
+    const defaultTools = ['Read', 'Write', 'Edit', 'Glob', 'Grep', 'Bash', 'WebSearch', 'WebFetch'];
+
+    // AUTONOMOUS MODE: Always bypass permissions and allow unrestricted tools
+    // Only restrict tools when no MCP servers are configured
+    const shouldRestrictTools = !hasMcpServers;
+
     const sdkOptions: Options = {
       model,
       systemPrompt,
       maxTurns,
       cwd,
       // Pass only explicitly allowed environment variables to SDK
-      // When a provider is active, uses provider settings (clean switch)
-      // When no provider, uses direct Anthropic API (from process.env or CLI OAuth)
-      env: buildEnv(providerConfig, credentials),
-      // Pass through allowedTools if provided by caller (decided by sdk-options.ts)
-      ...(allowedTools && { allowedTools }),
-      // AUTONOMOUS MODE: Always bypass permissions for fully autonomous operation
+      env: buildEnv(),
+      // Only restrict tools if explicitly set OR (no MCP / unrestricted disabled)
+      ...(allowedTools && shouldRestrictTools && { allowedTools }),
+      ...(!allowedTools && shouldRestrictTools && { allowedTools: defaultTools }),
+      // AUTONOMOUS MODE: Always bypass permissions and allow dangerous operations
       permissionMode: 'bypassPermissions',
       allowDangerouslySkipPermissions: true,
       abortController,
@@ -244,14 +98,12 @@ export class ClaudeProvider extends BaseProvider {
         : {}),
       // Forward settingSources for CLAUDE.md file loading
       ...(options.settingSources && { settingSources: options.settingSources }),
+      // Forward sandbox configuration
+      ...(options.sandbox && { sandbox: options.sandbox }),
       // Forward MCP servers configuration
       ...(options.mcpServers && { mcpServers: options.mcpServers }),
       // Extended thinking configuration
       ...(maxThinkingTokens && { maxThinkingTokens }),
-      // Subagents configuration for specialized task delegation
-      ...(options.agents && { agents: options.agents }),
-      // Pass through outputFormat for structured JSON outputs
-      ...(options.outputFormat && { outputFormat: options.outputFormat }),
     };
 
     // Build prompt payload
@@ -276,18 +128,6 @@ export class ClaudeProvider extends BaseProvider {
       promptPayload = prompt;
     }
 
-    // Log the environment being passed to the SDK for debugging
-    const envForSdk = sdkOptions.env as Record<string, string | undefined>;
-    logger.debug('[ClaudeProvider] SDK Configuration:', {
-      model: sdkOptions.model,
-      baseUrl: envForSdk?.['ANTHROPIC_BASE_URL'] || '(default Anthropic API)',
-      hasApiKey: !!envForSdk?.['ANTHROPIC_API_KEY'],
-      hasAuthToken: !!envForSdk?.['ANTHROPIC_AUTH_TOKEN'],
-      providerName: providerConfig?.name || '(direct Anthropic)',
-      maxTurns: sdkOptions.maxTurns,
-      maxThinkingTokens: sdkOptions.maxThinkingTokens,
-    });
-
     // Execute via Claude Agent SDK
     try {
       const stream = query({ prompt: promptPayload, options: sdkOptions });

apps/server/src/providers/cli-provider.ts

@@ -26,23 +26,22 @@
  * ```
  */
 
-import {
-  createWslCommand,
-  findCliInWsl,
-  isWslAvailable,
-  spawnJSONLProcess,
-  windowsToWslPath,
-  type SubprocessOptions,
-  type WslCliResult,
-} from '@automaker/platform';
-import { calculateReasoningTimeout } from '@automaker/types';
-import { createLogger, isAbortError } from '@automaker/utils';
 import { execSync } from 'child_process';
 import * as fs from 'fs';
-import * as os from 'os';
 import * as path from 'path';
+import * as os from 'os';
 import { BaseProvider } from './base-provider.js';
-import type { ExecuteOptions, ProviderConfig, ProviderMessage } from './types.js';
+import type { ProviderConfig, ExecuteOptions, ProviderMessage } from './types.js';
+import {
+  spawnJSONLProcess,
+  type SubprocessOptions,
+  isWslAvailable,
+  findCliInWsl,
+  createWslCommand,
+  windowsToWslPath,
+  type WslCliResult,
+} from '@automaker/platform';
+import { createLogger, isAbortError } from '@automaker/utils';
 
 /**
  * Spawn strategy for CLI tools on Windows
@@ -108,15 +107,6 @@ export interface CliDetectionResult {
 // Create logger for CLI operations
 const cliLogger = createLogger('CliProvider');
 
-/**
- * Base timeout for CLI operations in milliseconds.
- * CLI tools have longer startup and processing times compared to direct API calls,
- * so we use a higher base timeout (120s) than the default provider timeout (30s).
- * This is multiplied by reasoning effort multipliers when applicable.
- * @see calculateReasoningTimeout from @automaker/types
- */
-const CLI_BASE_TIMEOUT_MS = 120000;
-
 /**
  * Abstract base class for CLI-based providers
  *
@@ -460,10 +450,6 @@ export abstract class CliProvider extends BaseProvider {
       }
     }
 
-    // Calculate dynamic timeout based on reasoning effort.
-    // This addresses GitHub issue #530 where reasoning models with 'xhigh' effort would timeout.
-    const timeout = calculateReasoningTimeout(options.reasoningEffort, CLI_BASE_TIMEOUT_MS);
-
     // WSL strategy
     if (this.useWsl && this.wslCliPath) {
       const wslCwd = windowsToWslPath(cwd);
@@ -487,7 +473,7 @@ export abstract class CliProvider extends BaseProvider {
         cwd, // Windows cwd for spawn
         env: filteredEnv,
         abortController: options.abortController,
-        timeout,
+        timeout: 120000, // CLI operations may take longer
       };
     }
 
@@ -502,7 +488,7 @@ export abstract class CliProvider extends BaseProvider {
         cwd,
         env: filteredEnv,
         abortController: options.abortController,
-        timeout,
+        timeout: 120000,
       };
     }
 
@@ -515,7 +501,7 @@ export abstract class CliProvider extends BaseProvider {
       cwd,
       env: filteredEnv,
       abortController: options.abortController,
-      timeout,
+      timeout: 120000,
     };
   }
 
@@ -536,13 +522,8 @@ export abstract class CliProvider extends BaseProvider {
       throw new Error(`${this.getCliName()} CLI not found. ${this.getInstallInstructions()}`);
     }
 
-    // Many CLI-based providers do not support a separate "system" message.
-    // If a systemPrompt is provided, embed it into the prompt so downstream models
-    // still receive critical formatting/schema instructions (e.g., JSON-only outputs).
-    const effectiveOptions = this.embedSystemPromptIntoPrompt(options);
-
-    const cliArgs = this.buildCliArgs(effectiveOptions);
-    const subprocessOptions = this.buildSubprocessOptions(effectiveOptions, cliArgs);
+    const cliArgs = this.buildCliArgs(options);
+    const subprocessOptions = this.buildSubprocessOptions(options, cliArgs);
 
     try {
       for await (const rawEvent of spawnJSONLProcess(subprocessOptions)) {
@@ -574,52 +555,4 @@ export abstract class CliProvider extends BaseProvider {
       throw error;
     }
   }
-
-  /**
-   * Embed system prompt text into the user prompt for CLI providers.
-   *
-   * Most CLI providers we integrate with only accept a single prompt via stdin/args.
-   * When upstream code supplies `options.systemPrompt`, we prepend it to the prompt
-   * content and clear `systemPrompt` to avoid any accidental double-injection by
-   * subclasses.
-   */
-  protected embedSystemPromptIntoPrompt(options: ExecuteOptions): ExecuteOptions {
-    if (!options.systemPrompt) {
-      return options;
-    }
-
-    // Only string system prompts can be reliably embedded for CLI providers.
-    // Presets are provider-specific (e.g., Claude SDK) and cannot be represented
-    // universally. If a preset is provided, we only embed its optional `append`.
-    const systemText =
-      typeof options.systemPrompt === 'string'
-        ? options.systemPrompt
-        : options.systemPrompt.append
-          ? options.systemPrompt.append
-          : '';
-
-    if (!systemText) {
-      return { ...options, systemPrompt: undefined };
-    }
-
-    // Preserve original prompt structure.
-    if (typeof options.prompt === 'string') {
-      return {
-        ...options,
-        prompt: `${systemText}\n\n---\n\n${options.prompt}`,
-        systemPrompt: undefined,
-      };
-    }
-
-    if (Array.isArray(options.prompt)) {
-      return {
-        ...options,
-        prompt: [{ type: 'text', text: systemText }, ...options.prompt],
-        systemPrompt: undefined,
-      };
-    }
-
-    // Should be unreachable due to ExecuteOptions typing, but keep safe.
-    return { ...options, systemPrompt: undefined };
-  }
 }

apps/server/src/providers/codex-config-manager.ts

@@ -1,85 +0,0 @@
-/**
- * Codex Config Manager - Writes MCP server configuration for Codex CLI
- */
-
-import path from 'path';
-import type { McpServerConfig } from '@automaker/types';
-import * as secureFs from '../lib/secure-fs.js';
-
-const CODEX_CONFIG_DIR = '.codex';
-const CODEX_CONFIG_FILENAME = 'config.toml';
-const CODEX_MCP_SECTION = 'mcp_servers';
-
-function formatTomlString(value: string): string {
-  return JSON.stringify(value);
-}
-
-function formatTomlArray(values: string[]): string {
-  const formatted = values.map((value) => formatTomlString(value)).join(', ');
-  return `[${formatted}]`;
-}
-
-function formatTomlInlineTable(values: Record<string, string>): string {
-  const entries = Object.entries(values).map(
-    ([key, value]) => `${key} = ${formatTomlString(value)}`
-  );
-  return `{ ${entries.join(', ')} }`;
-}
-
-function formatTomlKey(key: string): string {
-  return `"${key.replace(/"/g, '\\"')}"`;
-}
-
-function buildServerBlock(name: string, server: McpServerConfig): string[] {
-  const lines: string[] = [];
-  const section = `${CODEX_MCP_SECTION}.${formatTomlKey(name)}`;
-  lines.push(`[${section}]`);
-
-  if (server.type) {
-    lines.push(`type = ${formatTomlString(server.type)}`);
-  }
-
-  if ('command' in server && server.command) {
-    lines.push(`command = ${formatTomlString(server.command)}`);
-  }
-
-  if ('args' in server && server.args && server.args.length > 0) {
-    lines.push(`args = ${formatTomlArray(server.args)}`);
-  }
-
-  if ('env' in server && server.env && Object.keys(server.env).length > 0) {
-    lines.push(`env = ${formatTomlInlineTable(server.env)}`);
-  }
-
-  if ('url' in server && server.url) {
-    lines.push(`url = ${formatTomlString(server.url)}`);
-  }
-
-  if ('headers' in server && server.headers && Object.keys(server.headers).length > 0) {
-    lines.push(`headers = ${formatTomlInlineTable(server.headers)}`);
-  }
-
-  return lines;
-}
-
-export class CodexConfigManager {
-  async configureMcpServers(
-    cwd: string,
-    mcpServers: Record<string, McpServerConfig>
-  ): Promise<void> {
-    const configDir = path.join(cwd, CODEX_CONFIG_DIR);
-    const configPath = path.join(configDir, CODEX_CONFIG_FILENAME);
-
-    await secureFs.mkdir(configDir, { recursive: true });
-
-    const blocks: string[] = [];
-    for (const [name, server] of Object.entries(mcpServers)) {
-      blocks.push(...buildServerBlock(name, server), '');
-    }
-
-    const content = blocks.join('\n').trim();
-    if (content) {
-      await secureFs.writeFile(configPath, content + '\n', 'utf-8');
-    }
-  }
-}

apps/server/src/providers/codex-models.ts

@@ -1,111 +0,0 @@
-/**
- * Codex Model Definitions
- *
- * Official Codex CLI models as documented at https://developers.openai.com/codex/models/
- */
-
-import { CODEX_MODEL_MAP } from '@automaker/types';
-import type { ModelDefinition } from './types.js';
-
-const CONTEXT_WINDOW_256K = 256000;
-const CONTEXT_WINDOW_128K = 128000;
-const MAX_OUTPUT_32K = 32000;
-const MAX_OUTPUT_16K = 16000;
-
-/**
- * All available Codex models with their specifications
- * Based on https://developers.openai.com/codex/models/
- */
-export const CODEX_MODELS: ModelDefinition[] = [
-  // ========== Recommended Codex Models ==========
-  {
-    id: CODEX_MODEL_MAP.gpt52Codex,
-    name: 'GPT-5.2-Codex',
-    modelString: CODEX_MODEL_MAP.gpt52Codex,
-    provider: 'openai',
-    description:
-      'Most advanced agentic coding model for complex software engineering (default for ChatGPT users).',
-    contextWindow: CONTEXT_WINDOW_256K,
-    maxOutputTokens: MAX_OUTPUT_32K,
-    supportsVision: true,
-    supportsTools: true,
-    tier: 'premium' as const,
-    default: true,
-    hasReasoning: true,
-  },
-  {
-    id: CODEX_MODEL_MAP.gpt51CodexMax,
-    name: 'GPT-5.1-Codex-Max',
-    modelString: CODEX_MODEL_MAP.gpt51CodexMax,
-    provider: 'openai',
-    description: 'Optimized for long-horizon, agentic coding tasks in Codex.',
-    contextWindow: CONTEXT_WINDOW_256K,
-    maxOutputTokens: MAX_OUTPUT_32K,
-    supportsVision: true,
-    supportsTools: true,
-    tier: 'premium' as const,
-    hasReasoning: true,
-  },
-  {
-    id: CODEX_MODEL_MAP.gpt51CodexMini,
-    name: 'GPT-5.1-Codex-Mini',
-    modelString: CODEX_MODEL_MAP.gpt51CodexMini,
-    provider: 'openai',
-    description: 'Smaller, more cost-effective version for faster workflows.',
-    contextWindow: CONTEXT_WINDOW_128K,
-    maxOutputTokens: MAX_OUTPUT_16K,
-    supportsVision: true,
-    supportsTools: true,
-    tier: 'basic' as const,
-    hasReasoning: false,
-  },
-
-  // ========== General-Purpose GPT Models ==========
-  {
-    id: CODEX_MODEL_MAP.gpt52,
-    name: 'GPT-5.2',
-    modelString: CODEX_MODEL_MAP.gpt52,
-    provider: 'openai',
-    description: 'Best general agentic model for tasks across industries and domains.',
-    contextWindow: CONTEXT_WINDOW_256K,
-    maxOutputTokens: MAX_OUTPUT_32K,
-    supportsVision: true,
-    supportsTools: true,
-    tier: 'standard' as const,
-    hasReasoning: true,
-  },
-  {
-    id: CODEX_MODEL_MAP.gpt51,
-    name: 'GPT-5.1',
-    modelString: CODEX_MODEL_MAP.gpt51,
-    provider: 'openai',
-    description: 'Great for coding and agentic tasks across domains.',
-    contextWindow: CONTEXT_WINDOW_256K,
-    maxOutputTokens: MAX_OUTPUT_32K,
-    supportsVision: true,
-    supportsTools: true,
-    tier: 'standard' as const,
-    hasReasoning: true,
-  },
-];
-
-/**
- * Get model definition by ID
- */
-export function getCodexModelById(modelId: string): ModelDefinition | undefined {
-  return CODEX_MODELS.find((m) => m.id === modelId || m.modelString === modelId);
-}
-
-/**
- * Get all models that support reasoning
- */
-export function getReasoningModels(): ModelDefinition[] {
-  return CODEX_MODELS.filter((m) => m.hasReasoning);
-}
-
-/**
- * Get models by tier
- */
-export function getModelsByTier(tier: 'premium' | 'standard' | 'basic'): ModelDefinition[] {
-  return CODEX_MODELS.filter((m) => m.tier === tier);
-}

apps/server/src/providers/codex-sdk-client.ts

@@ -1,173 +0,0 @@
-/**
- * Codex SDK client - Executes Codex queries via official @openai/codex-sdk
- *
- * Used for programmatic control of Codex from within the application.
- * Provides cleaner integration than spawning CLI processes.
- */
-
-import { Codex } from '@openai/codex-sdk';
-import { formatHistoryAsText, classifyError, getUserFriendlyErrorMessage } from '@automaker/utils';
-import { supportsReasoningEffort } from '@automaker/types';
-import type { ExecuteOptions, ProviderMessage } from './types.js';
-
-const OPENAI_API_KEY_ENV = 'OPENAI_API_KEY';
-const SDK_HISTORY_HEADER = 'Current request:\n';
-const DEFAULT_RESPONSE_TEXT = '';
-const SDK_ERROR_DETAILS_LABEL = 'Details:';
-
-type PromptBlock = {
-  type: string;
-  text?: string;
-  source?: {
-    type?: string;
-    media_type?: string;
-    data?: string;
-  };
-};
-
-function resolveApiKey(): string {
-  const apiKey = process.env[OPENAI_API_KEY_ENV];
-  if (!apiKey) {
-    throw new Error('OPENAI_API_KEY is not set.');
-  }
-  return apiKey;
-}
-
-function normalizePromptBlocks(prompt: ExecuteOptions['prompt']): PromptBlock[] {
-  if (Array.isArray(prompt)) {
-    return prompt as PromptBlock[];
-  }
-  return [{ type: 'text', text: prompt }];
-}
-
-function buildPromptText(options: ExecuteOptions, systemPrompt: string | null): string {
-  const historyText =
-    options.conversationHistory && options.conversationHistory.length > 0
-      ? formatHistoryAsText(options.conversationHistory)
-      : '';
-
-  const promptBlocks = normalizePromptBlocks(options.prompt);
-  const promptTexts: string[] = [];
-
-  for (const block of promptBlocks) {
-    if (block.type === 'text' && typeof block.text === 'string' && block.text.trim()) {
-      promptTexts.push(block.text);
-    }
-  }
-
-  const promptContent = promptTexts.join('\n\n');
-  if (!promptContent.trim()) {
-    throw new Error('Codex SDK prompt is empty.');
-  }
-
-  const parts: string[] = [];
-  if (systemPrompt) {
-    parts.push(`System: ${systemPrompt}`);
-  }
-  if (historyText) {
-    parts.push(historyText);
-  }
-  parts.push(`${SDK_HISTORY_HEADER}${promptContent}`);
-
-  return parts.join('\n\n');
-}
-
-function buildSdkErrorMessage(rawMessage: string, userMessage: string): string {
-  if (!rawMessage) {
-    return userMessage;
-  }
-  if (!userMessage || rawMessage === userMessage) {
-    return rawMessage;
-  }
-  return `${userMessage}\n\n${SDK_ERROR_DETAILS_LABEL} ${rawMessage}`;
-}
-
-/**
- * Execute a query using the official Codex SDK
- *
- * The SDK provides a cleaner interface than spawning CLI processes:
- * - Handles authentication automatically
- * - Provides TypeScript types
- * - Supports thread management and resumption
- * - Better error handling
- */
-export async function* executeCodexSdkQuery(
-  options: ExecuteOptions,
-  systemPrompt: string | null
-): AsyncGenerator<ProviderMessage> {
-  try {
-    const apiKey = resolveApiKey();
-    const codex = new Codex({ apiKey });
-
-    // Resume existing thread or start new one
-    let thread;
-    if (options.sdkSessionId) {
-      try {
-        thread = codex.resumeThread(options.sdkSessionId);
-      } catch {
-        // If resume fails, start a new thread
-        thread = codex.startThread();
-      }
-    } else {
-      thread = codex.startThread();
-    }
-
-    const promptText = buildPromptText(options, systemPrompt);
-
-    // Build run options with reasoning effort if supported
-    const runOptions: {
-      signal?: AbortSignal;
-      reasoning?: { effort: string };
-    } = {
-      signal: options.abortController?.signal,
-    };
-
-    // Add reasoning effort if model supports it and reasoningEffort is specified
-    if (
-      options.reasoningEffort &&
-      supportsReasoningEffort(options.model) &&
-      options.reasoningEffort !== 'none'
-    ) {
-      runOptions.reasoning = { effort: options.reasoningEffort };
-    }
-
-    // Run the query
-    const result = await thread.run(promptText, runOptions);
-
-    // Extract response text (from finalResponse property)
-    const outputText = result.finalResponse ?? DEFAULT_RESPONSE_TEXT;
-
-    // Get thread ID (may be null if not populated yet)
-    const threadId = thread.id ?? undefined;
-
-    // Yield assistant message
-    yield {
-      type: 'assistant',
-      session_id: threadId,
-      message: {
-        role: 'assistant',
-        content: [{ type: 'text', text: outputText }],
-      },
-    };
-
-    // Yield result
-    yield {
-      type: 'result',
-      subtype: 'success',
-      session_id: threadId,
-      result: outputText,
-    };
-  } catch (error) {
-    const errorInfo = classifyError(error);
-    const userMessage = getUserFriendlyErrorMessage(error);
-    const combinedMessage = buildSdkErrorMessage(errorInfo.message, userMessage);
-    console.error('[CodexSDK] executeQuery() error during execution:', {
-      type: errorInfo.type,
-      message: errorInfo.message,
-      isRateLimit: errorInfo.isRateLimit,
-      retryAfter: errorInfo.retryAfter,
-      stack: error instanceof Error ? error.stack : undefined,
-    });
-    yield { type: 'error', error: combinedMessage };
-  }
-}

apps/server/src/providers/codex-tool-mapping.ts

@@ -1,436 +0,0 @@
-export type CodexToolResolution = {
-  name: string;
-  input: Record<string, unknown>;
-};
-
-export type CodexTodoItem = {
-  content: string;
-  status: 'pending' | 'in_progress' | 'completed';
-  activeForm?: string;
-};
-
-const TOOL_NAME_BASH = 'Bash';
-const TOOL_NAME_READ = 'Read';
-const TOOL_NAME_EDIT = 'Edit';
-const TOOL_NAME_WRITE = 'Write';
-const TOOL_NAME_GREP = 'Grep';
-const TOOL_NAME_GLOB = 'Glob';
-const TOOL_NAME_TODO = 'TodoWrite';
-const TOOL_NAME_DELETE = 'Delete';
-const TOOL_NAME_LS = 'Ls';
-
-const INPUT_KEY_COMMAND = 'command';
-const INPUT_KEY_FILE_PATH = 'file_path';
-const INPUT_KEY_PATTERN = 'pattern';
-
-const SHELL_WRAPPER_PATTERNS = [
-  /^\/bin\/bash\s+-lc\s+["']([\s\S]+)["']$/,
-  /^bash\s+-lc\s+["']([\s\S]+)["']$/,
-  /^\/bin\/sh\s+-lc\s+["']([\s\S]+)["']$/,
-  /^sh\s+-lc\s+["']([\s\S]+)["']$/,
-  /^cmd\.exe\s+\/c\s+["']?([\s\S]+)["']?$/i,
-  /^powershell(?:\.exe)?\s+-Command\s+["']?([\s\S]+)["']?$/i,
-  /^pwsh(?:\.exe)?\s+-Command\s+["']?([\s\S]+)["']?$/i,
-] as const;
-
-const COMMAND_SEPARATOR_PATTERN = /\s*(?:&&|\|\||;)\s*/;
-const SEGMENT_SKIP_PREFIXES = ['cd ', 'export ', 'set ', 'pushd '] as const;
-const WRAPPER_COMMANDS = new Set(['sudo', 'env', 'command']);
-const READ_COMMANDS = new Set(['cat', 'sed', 'head', 'tail', 'less', 'more', 'bat', 'stat', 'wc']);
-const SEARCH_COMMANDS = new Set(['rg', 'grep', 'ag', 'ack']);
-const GLOB_COMMANDS = new Set(['ls', 'find', 'fd', 'tree']);
-const DELETE_COMMANDS = new Set(['rm', 'del', 'erase', 'remove', 'unlink']);
-const LIST_COMMANDS = new Set(['ls', 'dir', 'll', 'la']);
-const WRITE_COMMANDS = new Set(['tee', 'touch', 'mkdir']);
-const APPLY_PATCH_COMMAND = 'apply_patch';
-const APPLY_PATCH_PATTERN = /\bapply_patch\b/;
-const REDIRECTION_TARGET_PATTERN = /(?:>>|>)\s*([^\s]+)/;
-const SED_IN_PLACE_FLAGS = new Set(['-i', '--in-place']);
-const PERL_IN_PLACE_FLAG = /-.*i/;
-const SEARCH_PATTERN_FLAGS = new Set(['-e', '--regexp']);
-const SEARCH_VALUE_FLAGS = new Set([
-  '-g',
-  '--glob',
-  '--iglob',
-  '--type',
-  '--type-add',
-  '--type-clear',
-  '--encoding',
-]);
-const SEARCH_FILE_LIST_FLAGS = new Set(['--files']);
-const TODO_LINE_PATTERN = /^[-*]\s*(?:\[(?<status>[ x~])\]\s*)?(?<content>.+)$/;
-const TODO_STATUS_COMPLETED = 'completed';
-const TODO_STATUS_IN_PROGRESS = 'in_progress';
-const TODO_STATUS_PENDING = 'pending';
-const PATCH_FILE_MARKERS = [
-  '*** Update File: ',
-  '*** Add File: ',
-  '*** Delete File: ',
-  '*** Move to: ',
-] as const;
-
-function stripShellWrapper(command: string): string {
-  const trimmed = command.trim();
-  for (const pattern of SHELL_WRAPPER_PATTERNS) {
-    const match = trimmed.match(pattern);
-    if (match && match[1]) {
-      return unescapeCommand(match[1].trim());
-    }
-  }
-  return trimmed;
-}
-
-function unescapeCommand(command: string): string {
-  return command.replace(/\\(["'])/g, '$1');
-}
-
-function extractPrimarySegment(command: string): string {
-  const segments = command
-    .split(COMMAND_SEPARATOR_PATTERN)
-    .map((segment) => segment.trim())
-    .filter(Boolean);
-
-  for (const segment of segments) {
-    const shouldSkip = SEGMENT_SKIP_PREFIXES.some((prefix) => segment.startsWith(prefix));
-    if (!shouldSkip) {
-      return segment;
-    }
-  }
-
-  return command.trim();
-}
-
-function tokenizeCommand(command: string): string[] {
-  const tokens: string[] = [];
-  let current = '';
-  let inSingleQuote = false;
-  let inDoubleQuote = false;
-  let isEscaped = false;
-
-  for (const char of command) {
-    if (isEscaped) {
-      current += char;
-      isEscaped = false;
-      continue;
-    }
-
-    if (char === '\\') {
-      isEscaped = true;
-      continue;
-    }
-
-    if (char === "'" && !inDoubleQuote) {
-      inSingleQuote = !inSingleQuote;
-      continue;
-    }
-
-    if (char === '"' && !inSingleQuote) {
-      inDoubleQuote = !inDoubleQuote;
-      continue;
-    }
-
-    if (!inSingleQuote && !inDoubleQuote && /\s/.test(char)) {
-      if (current) {
-        tokens.push(current);
-        current = '';
-      }
-      continue;
-    }
-
-    current += char;
-  }
-
-  if (current) {
-    tokens.push(current);
-  }
-
-  return tokens;
-}
-
-function stripWrapperTokens(tokens: string[]): string[] {
-  let index = 0;
-  while (index < tokens.length && WRAPPER_COMMANDS.has(tokens[index].toLowerCase())) {
-    index += 1;
-  }
-  return tokens.slice(index);
-}
-
-function extractFilePathFromTokens(tokens: string[]): string | null {
-  const candidates = tokens.slice(1).filter((token) => token && !token.startsWith('-'));
-  if (candidates.length === 0) return null;
-  return candidates[candidates.length - 1];
-}
-
-function extractSearchPattern(tokens: string[]): string | null {
-  const remaining = tokens.slice(1);
-
-  for (let index = 0; index < remaining.length; index += 1) {
-    const token = remaining[index];
-    if (token === '--') {
-      return remaining[index + 1] ?? null;
-    }
-    if (SEARCH_PATTERN_FLAGS.has(token)) {
-      return remaining[index + 1] ?? null;
-    }
-    if (SEARCH_VALUE_FLAGS.has(token)) {
-      index += 1;
-      continue;
-    }
-    if (token.startsWith('-')) {
-      continue;
-    }
-    return token;
-  }
-
-  return null;
-}
-
-function extractTeeTarget(tokens: string[]): string | null {
-  const teeIndex = tokens.findIndex((token) => token === 'tee');
-  if (teeIndex < 0) return null;
-  const candidate = tokens[teeIndex + 1];
-  return candidate && !candidate.startsWith('-') ? candidate : null;
-}
-
-function extractRedirectionTarget(command: string): string | null {
-  const match = command.match(REDIRECTION_TARGET_PATTERN);
-  return match?.[1] ?? null;
-}
-
-function extractFilePathFromDeleteTokens(tokens: string[]): string | null {
-  // rm file.txt or rm /path/to/file.txt
-  // Skip flags and get the first non-flag argument
-  for (let i = 1; i < tokens.length; i++) {
-    const token = tokens[i];
-    if (token && !token.startsWith('-')) {
-      return token;
-    }
-  }
-  return null;
-}
-
-function hasSedInPlaceFlag(tokens: string[]): boolean {
-  return tokens.some((token) => SED_IN_PLACE_FLAGS.has(token) || token.startsWith('-i'));
-}
-
-function hasPerlInPlaceFlag(tokens: string[]): boolean {
-  return tokens.some((token) => PERL_IN_PLACE_FLAG.test(token));
-}
-
-function extractPatchFilePath(command: string): string | null {
-  for (const marker of PATCH_FILE_MARKERS) {
-    const index = command.indexOf(marker);
-    if (index < 0) continue;
-    const start = index + marker.length;
-    const end = command.indexOf('\n', start);
-    const rawPath = (end === -1 ? command.slice(start) : command.slice(start, end)).trim();
-    if (rawPath) return rawPath;
-  }
-  return null;
-}
-
-function buildInputWithFilePath(filePath: string | null): Record<string, unknown> {
-  return filePath ? { [INPUT_KEY_FILE_PATH]: filePath } : {};
-}
-
-function buildInputWithPattern(pattern: string | null): Record<string, unknown> {
-  return pattern ? { [INPUT_KEY_PATTERN]: pattern } : {};
-}
-
-export function resolveCodexToolCall(command: string): CodexToolResolution {
-  const normalized = stripShellWrapper(command);
-  const primarySegment = extractPrimarySegment(normalized);
-  const tokens = stripWrapperTokens(tokenizeCommand(primarySegment));
-  const commandToken = tokens[0]?.toLowerCase() ?? '';
-
-  const redirectionTarget = extractRedirectionTarget(primarySegment);
-  if (redirectionTarget) {
-    return {
-      name: TOOL_NAME_WRITE,
-      input: buildInputWithFilePath(redirectionTarget),
-    };
-  }
-
-  if (commandToken === APPLY_PATCH_COMMAND || APPLY_PATCH_PATTERN.test(primarySegment)) {
-    return {
-      name: TOOL_NAME_EDIT,
-      input: buildInputWithFilePath(extractPatchFilePath(primarySegment)),
-    };
-  }
-
-  if (commandToken === 'sed' && hasSedInPlaceFlag(tokens)) {
-    return {
-      name: TOOL_NAME_EDIT,
-      input: buildInputWithFilePath(extractFilePathFromTokens(tokens)),
-    };
-  }
-
-  if (commandToken === 'perl' && hasPerlInPlaceFlag(tokens)) {
-    return {
-      name: TOOL_NAME_EDIT,
-      input: buildInputWithFilePath(extractFilePathFromTokens(tokens)),
-    };
-  }
-
-  if (WRITE_COMMANDS.has(commandToken)) {
-    const filePath =
-      commandToken === 'tee' ? extractTeeTarget(tokens) : extractFilePathFromTokens(tokens);
-    return {
-      name: TOOL_NAME_WRITE,
-      input: buildInputWithFilePath(filePath),
-    };
-  }
-
-  if (SEARCH_COMMANDS.has(commandToken)) {
-    if (tokens.some((token) => SEARCH_FILE_LIST_FLAGS.has(token))) {
-      return {
-        name: TOOL_NAME_GLOB,
-        input: buildInputWithPattern(extractFilePathFromTokens(tokens)),
-      };
-    }
-
-    return {
-      name: TOOL_NAME_GREP,
-      input: buildInputWithPattern(extractSearchPattern(tokens)),
-    };
-  }
-
-  // Handle Delete commands (rm, del, erase, remove, unlink)
-  if (DELETE_COMMANDS.has(commandToken)) {
-    // Skip if -r or -rf flags (recursive delete should go to Bash)
-    if (
-      tokens.some((token) => token === '-r' || token === '-rf' || token === '-f' || token === '-rf')
-    ) {
-      return {
-        name: TOOL_NAME_BASH,
-        input: { [INPUT_KEY_COMMAND]: normalized },
-      };
-    }
-    // Simple file deletion - extract the file path
-    const filePath = extractFilePathFromDeleteTokens(tokens);
-    if (filePath) {
-      return {
-        name: TOOL_NAME_DELETE,
-        input: { path: filePath },
-      };
-    }
-    // Fall back to bash if we can't determine the file path
-    return {
-      name: TOOL_NAME_BASH,
-      input: { [INPUT_KEY_COMMAND]: normalized },
-    };
-  }
-
-  // Handle simple Ls commands (just listing, not find/glob)
-  if (LIST_COMMANDS.has(commandToken)) {
-    const filePath = extractFilePathFromTokens(tokens);
-    return {
-      name: TOOL_NAME_LS,
-      input: { path: filePath || '.' },
-    };
-  }
-
-  if (GLOB_COMMANDS.has(commandToken)) {
-    return {
-      name: TOOL_NAME_GLOB,
-      input: buildInputWithPattern(extractFilePathFromTokens(tokens)),
-    };
-  }
-
-  if (READ_COMMANDS.has(commandToken)) {
-    return {
-      name: TOOL_NAME_READ,
-      input: buildInputWithFilePath(extractFilePathFromTokens(tokens)),
-    };
-  }
-
-  return {
-    name: TOOL_NAME_BASH,
-    input: { [INPUT_KEY_COMMAND]: normalized },
-  };
-}
-
-function parseTodoLines(lines: string[]): CodexTodoItem[] {
-  const todos: CodexTodoItem[] = [];
-
-  for (const line of lines) {
-    const match = line.match(TODO_LINE_PATTERN);
-    if (!match?.groups?.content) continue;
-
-    const statusToken = match.groups.status;
-    const status =
-      statusToken === 'x'
-        ? TODO_STATUS_COMPLETED
-        : statusToken === '~'
-          ? TODO_STATUS_IN_PROGRESS
-          : TODO_STATUS_PENDING;
-
-    todos.push({ content: match.groups.content.trim(), status });
-  }
-
-  return todos;
-}
-
-function extractTodoFromArray(value: unknown[]): CodexTodoItem[] {
-  return value
-    .map((entry) => {
-      if (typeof entry === 'string') {
-        return { content: entry, status: TODO_STATUS_PENDING };
-      }
-      if (entry && typeof entry === 'object') {
-        const record = entry as Record<string, unknown>;
-        const content =
-          typeof record.content === 'string'
-            ? record.content
-            : typeof record.text === 'string'
-              ? record.text
-              : typeof record.title === 'string'
-                ? record.title
-                : null;
-        if (!content) return null;
-        const status =
-          record.status === TODO_STATUS_COMPLETED ||
-          record.status === TODO_STATUS_IN_PROGRESS ||
-          record.status === TODO_STATUS_PENDING
-            ? (record.status as CodexTodoItem['status'])
-            : TODO_STATUS_PENDING;
-        const activeForm = typeof record.activeForm === 'string' ? record.activeForm : undefined;
-        return { content, status, activeForm };
-      }
-      return null;
-    })
-    .filter((item): item is CodexTodoItem => Boolean(item));
-}
-
-export function extractCodexTodoItems(item: Record<string, unknown>): CodexTodoItem[] | null {
-  const todosValue = item.todos;
-  if (Array.isArray(todosValue)) {
-    const todos = extractTodoFromArray(todosValue);
-    return todos.length > 0 ? todos : null;
-  }
-
-  const itemsValue = item.items;
-  if (Array.isArray(itemsValue)) {
-    const todos = extractTodoFromArray(itemsValue);
-    return todos.length > 0 ? todos : null;
-  }
-
-  const textValue =
-    typeof item.text === 'string'
-      ? item.text
-      : typeof item.content === 'string'
-        ? item.content
-        : null;
-  if (!textValue) return null;
-
-  const lines = textValue
-    .split('\n')
-    .map((line) => line.trim())
-    .filter(Boolean);
-  const todos = parseTodoLines(lines);
-  return todos.length > 0 ? todos : null;
-}
-
-export function getCodexTodoToolName(): string {
-  return TOOL_NAME_TODO;
-}

apps/server/src/providers/cursor-config-manager.ts

@@ -44,7 +44,7 @@ export class CursorConfigManager {
 
     // Return default config with all available models
     return {
-      defaultModel: 'cursor-auto',
+      defaultModel: 'auto',
       models: getAllCursorModelIds(),
     };
   }
@@ -77,7 +77,7 @@ export class CursorConfigManager {
    * Get the default model
    */
   getDefaultModel(): CursorModelId {
-    return this.config.defaultModel || 'cursor-auto';
+    return this.config.defaultModel || 'auto';
   }
 
   /**
@@ -93,7 +93,7 @@ export class CursorConfigManager {
    * Get enabled models
    */
   getEnabledModels(): CursorModelId[] {
-    return this.config.models || ['cursor-auto'];
+    return this.config.models || ['auto'];
   }
 
   /**
@@ -174,7 +174,7 @@ export class CursorConfigManager {
    */
   reset(): void {
     this.config = {
-      defaultModel: 'cursor-auto',
+      defaultModel: 'auto',
       models: getAllCursorModelIds(),
     };
     this.saveConfig();

apps/server/src/providers/cursor-provider.ts

@@ -28,9 +28,7 @@ import type {
   ModelDefinition,
   ContentBlock,
 } from './types.js';
-import { validateBareModelId } from '@automaker/types';
-import { validateApiKey } from '../lib/auth-utils.js';
-import { getEffectivePermissions } from '../services/cursor-config-service.js';
+import { stripProviderPrefix } from '@automaker/types';
 import {
   type CursorStreamEvent,
   type CursorSystemEvent,
@@ -317,25 +315,18 @@ export class CursorProvider extends CliProvider {
   }
 
   buildCliArgs(options: ExecuteOptions): string[] {
-    // Model is already bare (no prefix) - validated by executeQuery
-    const model = options.model || 'auto';
+    // Extract model (strip 'cursor-' prefix if present)
+    const model = stripProviderPrefix(options.model || 'auto');
 
     // Build CLI arguments for cursor-agent
     // NOTE: Prompt is NOT included here - it's passed via stdin to avoid
     // shell escaping issues when content contains $(), backticks, etc.
-    const cliArgs: string[] = [];
-
-    // If using Cursor IDE (cliPath is 'cursor' not 'cursor-agent'), add 'agent' subcommand
-    if (this.cliPath && !this.cliPath.includes('cursor-agent')) {
-      cliArgs.push('agent');
-    }
-
-    cliArgs.push(
+    const cliArgs: string[] = [
       '-p', // Print mode (non-interactive)
       '--output-format',
       'stream-json',
-      '--stream-partial-output' // Real-time streaming
-    );
+      '--stream-partial-output', // Real-time streaming
+    ];
 
     // Only add --force if NOT in read-only mode
     // Without --force, Cursor CLI suggests changes but doesn't apply them
@@ -481,9 +472,7 @@ export class CursorProvider extends CliProvider {
   // ==========================================================================
 
   /**
-   * Override CLI detection to add Cursor-specific checks:
-   * 1. Versions directory for cursor-agent installations
-   * 2. Cursor IDE with 'cursor agent' subcommand support
+   * Override CLI detection to add Cursor-specific versions directory check
    */
   protected detectCli(): CliDetectionResult {
     // First try standard detection (PATH, common paths, WSL)
@@ -518,39 +507,6 @@ export class CursorProvider extends CliProvider {
       }
     }
 
-    // If cursor-agent not found, try to find 'cursor' IDE and use 'cursor agent' subcommand
-    // The Cursor IDE includes the agent as a subcommand: cursor agent
-    if (process.platform !== 'win32') {
-      const cursorPaths = [
-        '/usr/bin/cursor',
-        '/usr/local/bin/cursor',
-        path.join(os.homedir(), '.local/bin/cursor'),
-        '/opt/cursor/cursor',
-      ];
-
-      for (const cursorPath of cursorPaths) {
-        if (fs.existsSync(cursorPath)) {
-          // Verify cursor agent subcommand works
-          try {
-            execSync(`"${cursorPath}" agent --version`, {
-              encoding: 'utf8',
-              timeout: 5000,
-              stdio: 'pipe',
-            });
-            logger.debug(`Using cursor agent via Cursor IDE: ${cursorPath}`);
-            // Return cursor path but we'll use 'cursor agent' subcommand
-            return {
-              cliPath: cursorPath,
-              useWsl: false,
-              strategy: 'native',
-            };
-          } catch {
-            // cursor agent subcommand doesn't work, try next path
-          }
-        }
-      }
-    }
-
     return result;
   }
 
@@ -649,10 +605,6 @@ export class CursorProvider extends CliProvider {
   async *executeQuery(options: ExecuteOptions): AsyncGenerator<ProviderMessage> {
     this.ensureCliDetected();
 
-    // Validate that model doesn't have a provider prefix
-    // AgentService should strip prefixes before passing to providers
-    validateBareModelId(options.model, 'CursorProvider');
-
     if (!this.cliPath) {
       throw this.createError(
         CursorErrorCode.NOT_INSTALLED,
@@ -690,9 +642,6 @@ export class CursorProvider extends CliProvider {
 
     logger.debug(`CursorProvider.executeQuery called with model: "${options.model}"`);
 
-    // Get effective permissions for this project
-    const effectivePermissions = await getEffectivePermissions(options.cwd || process.cwd());
-
     // Debug: log raw events when AUTOMAKER_DEBUG_RAW_OUTPUT is enabled
     const debugRawEvents =
       process.env.AUTOMAKER_DEBUG_RAW_OUTPUT === 'true' ||
@@ -889,16 +838,9 @@ export class CursorProvider extends CliProvider {
         });
         return result;
       }
-
-      // If using Cursor IDE, use 'cursor agent --version'
-      const versionCmd = this.cliPath.includes('cursor-agent')
-        ? `"${this.cliPath}" --version`
-        : `"${this.cliPath}" agent --version`;
-
-      const result = execSync(versionCmd, {
+      const result = execSync(`"${this.cliPath}" --version`, {
         encoding: 'utf8',
         timeout: 5000,
-        stdio: 'pipe',
       }).trim();
       return result;
     } catch {
@@ -915,13 +857,8 @@ export class CursorProvider extends CliProvider {
       return { authenticated: false, method: 'none' };
     }
 
-    // Check for API key in environment with validation
+    // Check for API key in environment
     if (process.env.CURSOR_API_KEY) {
-      const validation = validateApiKey(process.env.CURSOR_API_KEY, 'cursor');
-      if (!validation.isValid) {
-        logger.warn('Cursor API key validation failed:', validation.error);
-        return { authenticated: false, method: 'api_key', error: validation.error };
-      }
       return { authenticated: true, method: 'api_key' };
     }
 

apps/server/src/providers/index.ts

@@ -25,16 +25,5 @@ export { ClaudeProvider } from './claude-provider.js';
 export { CursorProvider, CursorErrorCode, CursorError } from './cursor-provider.js';
 export { CursorConfigManager } from './cursor-config-manager.js';
 
-// OpenCode provider
-export { OpencodeProvider } from './opencode-provider.js';
-
 // Provider factory
 export { ProviderFactory } from './provider-factory.js';
-
-// Simple query service - unified interface for basic AI queries
-export { simpleQuery, streamingQuery } from './simple-query-service.js';
-export type {
-  SimpleQueryOptions,
-  SimpleQueryResult,
-  StreamingQueryOptions,
-} from './simple-query-service.js';

apps/server/src/providers/provider-factory.ts

@@ -7,27 +7,7 @@
 
 import { BaseProvider } from './base-provider.js';
 import type { InstallationStatus, ModelDefinition } from './types.js';
-import { isCursorModel, isCodexModel, isOpencodeModel, type ModelProvider } from '@automaker/types';
-import * as fs from 'fs';
-import * as path from 'path';
-
-const DISCONNECTED_MARKERS: Record<string, string> = {
-  claude: '.claude-disconnected',
-  codex: '.codex-disconnected',
-  cursor: '.cursor-disconnected',
-  opencode: '.opencode-disconnected',
-};
-
-/**
- * Check if a provider CLI is disconnected from the app
- */
-export function isProviderDisconnected(providerName: string): boolean {
-  const markerFile = DISCONNECTED_MARKERS[providerName.toLowerCase()];
-  if (!markerFile) return false;
-
-  const markerPath = path.join(process.cwd(), '.automaker', markerFile);
-  return fs.existsSync(markerPath);
-}
+import { isCursorModel, type ModelProvider } from '@automaker/types';
 
 /**
  * Provider registration entry
@@ -95,26 +75,10 @@ export class ProviderFactory {
    * Get the appropriate provider for a given model ID
    *
    * @param modelId Model identifier (e.g., "claude-opus-4-5-20251101", "cursor-gpt-4o", "cursor-auto")
-   * @param options Optional settings
-   * @param options.throwOnDisconnected Throw error if provider is disconnected (default: true)
    * @returns Provider instance for the model
-   * @throws Error if provider is disconnected and throwOnDisconnected is true
    */
-  static getProviderForModel(
-    modelId: string,
-    options: { throwOnDisconnected?: boolean } = {}
-  ): BaseProvider {
-    const { throwOnDisconnected = true } = options;
-    const providerName = this.getProviderForModelName(modelId);
-
-    // Check if provider is disconnected
-    if (throwOnDisconnected && isProviderDisconnected(providerName)) {
-      throw new Error(
-        `${providerName.charAt(0).toUpperCase() + providerName.slice(1)} CLI is disconnected from the app. ` +
-          `Please go to Settings > Providers and click "Sign In" to reconnect.`
-      );
-    }
-
+  static getProviderForModel(modelId: string): BaseProvider {
+    const providerName = this.getProviderNameForModel(modelId);
     const provider = this.getProviderByName(providerName);
 
     if (!provider) {
@@ -129,35 +93,6 @@ export class ProviderFactory {
     return provider;
   }
 
-  /**
-   * Get the provider name for a given model ID (without creating provider instance)
-   */
-  static getProviderForModelName(modelId: string): string {
-    const lowerModel = modelId.toLowerCase();
-
-    // Get all registered providers sorted by priority (descending)
-    const registrations = Array.from(providerRegistry.entries()).sort(
-      ([, a], [, b]) => (b.priority ?? 0) - (a.priority ?? 0)
-    );
-
-    // Check each provider's canHandleModel function
-    for (const [name, reg] of registrations) {
-      if (reg.canHandleModel?.(lowerModel)) {
-        return name;
-      }
-    }
-
-    // Fallback: Check for explicit prefixes
-    for (const [name] of registrations) {
-      if (lowerModel.startsWith(`${name}-`)) {
-        return name;
-      }
-    }
-
-    // Default to claude (first registered provider or claude)
-    return 'claude';
-  }
-
   /**
    * Get all available providers
    */
@@ -221,41 +156,6 @@ export class ProviderFactory {
   static getRegisteredProviderNames(): string[] {
     return Array.from(providerRegistry.keys());
   }
-
-  /**
-   * Check if a specific model supports vision/image input
-   *
-   * @param modelId Model identifier
-   * @returns Whether the model supports vision (defaults to true if model not found)
-   */
-  static modelSupportsVision(modelId: string): boolean {
-    const provider = this.getProviderForModel(modelId);
-    const models = provider.getAvailableModels();
-
-    // Find the model in the available models list
-    for (const model of models) {
-      if (
-        model.id === modelId ||
-        model.modelString === modelId ||
-        model.id.endsWith(`-${modelId}`) ||
-        model.modelString.endsWith(`-${modelId}`) ||
-        model.modelString === modelId.replace(/^(claude|cursor|codex)-/, '') ||
-        model.modelString === modelId.replace(/-(claude|cursor|codex)$/, '')
-      ) {
-        return model.supportsVision ?? true;
-      }
-    }
-
-    // Also try exact match with model string from provider's model map
-    for (const model of models) {
-      if (model.modelString === modelId || model.id === modelId) {
-        return model.supportsVision ?? true;
-      }
-    }
-
-    // Default to true (Claude SDK supports vision by default)
-    return true;
-  }
 }
 
 // =============================================================================
@@ -265,8 +165,6 @@ export class ProviderFactory {
 // Import providers for registration side-effects
 import { ClaudeProvider } from './claude-provider.js';
 import { CursorProvider } from './cursor-provider.js';
-import { CodexProvider } from './codex-provider.js';
-import { OpencodeProvider } from './opencode-provider.js';
 
 // Register Claude provider
 registerProvider('claude', {
@@ -286,18 +184,3 @@ registerProvider('cursor', {
   canHandleModel: (model: string) => isCursorModel(model),
   priority: 10, // Higher priority - check Cursor models first
 });
-
-// Register Codex provider
-registerProvider('codex', {
-  factory: () => new CodexProvider(),
-  aliases: ['openai'],
-  canHandleModel: (model: string) => isCodexModel(model),
-  priority: 5, // Medium priority - check after Cursor but before Claude
-});
-
-// Register OpenCode provider
-registerProvider('opencode', {
-  factory: () => new OpencodeProvider(),
-  canHandleModel: (model: string) => isOpencodeModel(model),
-  priority: 3, // Between codex (5) and claude (0)
-});

apps/server/src/providers/simple-query-service.ts

@@ -1,275 +0,0 @@
-/**
- * Simple Query Service - Simplified interface for basic AI queries
- *
- * Use this for routes that need simple text responses without
- * complex event handling. This service abstracts away the provider
- * selection and streaming details, providing a clean interface
- * for common query patterns.
- *
- * Benefits:
- * - No direct SDK imports needed in route files
- * - Consistent provider routing based on model
- * - Automatic text extraction from streaming responses
- * - Structured output support for JSON schema responses
- * - Eliminates duplicate extractTextFromStream() functions
- */
-
-import { ProviderFactory } from './provider-factory.js';
-import type {
-  ProviderMessage,
-  ContentBlock,
-  ThinkingLevel,
-  ReasoningEffort,
-  ClaudeApiProfile,
-  ClaudeCompatibleProvider,
-  Credentials,
-} from '@automaker/types';
-import { stripProviderPrefix } from '@automaker/types';
-
-/**
- * Options for simple query execution
- */
-export interface SimpleQueryOptions {
-  /** The prompt to send to the AI (can be text or multi-part content) */
-  prompt: string | Array<{ type: string; text?: string; source?: object }>;
-  /** Model to use (with or without provider prefix) */
-  model?: string;
-  /** Working directory for the query */
-  cwd: string;
-  /** System prompt (combined with user prompt for some providers) */
-  systemPrompt?: string;
-  /** Maximum turns for agentic operations (default: 1) */
-  maxTurns?: number;
-  /** Tools to allow (default: [] for simple queries) */
-  allowedTools?: string[];
-  /** Abort controller for cancellation */
-  abortController?: AbortController;
-  /** Structured output format for JSON responses */
-  outputFormat?: {
-    type: 'json_schema';
-    schema: Record<string, unknown>;
-  };
-  /** Thinking level for Claude models */
-  thinkingLevel?: ThinkingLevel;
-  /** Reasoning effort for Codex/OpenAI models */
-  reasoningEffort?: ReasoningEffort;
-  /** If true, runs in read-only mode (no file writes) */
-  readOnly?: boolean;
-  /** Setting sources for CLAUDE.md loading */
-  settingSources?: Array<'user' | 'project' | 'local'>;
-  /**
-   * Active Claude API profile for alternative endpoint configuration
-   * @deprecated Use claudeCompatibleProvider instead
-   */
-  claudeApiProfile?: ClaudeApiProfile;
-  /**
-   * Claude-compatible provider for alternative endpoint configuration.
-   * Takes precedence over claudeApiProfile if both are set.
-   */
-  claudeCompatibleProvider?: ClaudeCompatibleProvider;
-  /** Credentials for resolving 'credentials' apiKeySource in Claude API profiles/providers */
-  credentials?: Credentials;
-}
-
-/**
- * Result from a simple query
- */
-export interface SimpleQueryResult {
-  /** The accumulated text response */
-  text: string;
-  /** Structured output if outputFormat was specified and provider supports it */
-  structured_output?: Record<string, unknown>;
-}
-
-/**
- * Options for streaming query execution
- */
-export interface StreamingQueryOptions extends SimpleQueryOptions {
-  /** Callback for each text chunk received */
-  onText?: (text: string) => void;
-  /** Callback for tool use events */
-  onToolUse?: (tool: string, input: unknown) => void;
-  /** Callback for thinking blocks (if available) */
-  onThinking?: (thinking: string) => void;
-}
-
-/**
- * Default model to use when none specified
- */
-const DEFAULT_MODEL = 'claude-sonnet-4-20250514';
-
-/**
- * Execute a simple query and return the text result
- *
- * Use this for simple, non-streaming queries where you just need
- * the final text response. For more complex use cases with progress
- * callbacks, use streamingQuery() instead.
- *
- * @example
- * ```typescript
- * const result = await simpleQuery({
- *   prompt: 'Generate a title for: user authentication',
- *   cwd: process.cwd(),
- *   systemPrompt: 'You are a title generator...',
- *   maxTurns: 1,
- *   allowedTools: [],
- * });
- * console.log(result.text); // "Add user authentication"
- * ```
- */
-export async function simpleQuery(options: SimpleQueryOptions): Promise<SimpleQueryResult> {
-  const model = options.model || DEFAULT_MODEL;
-  const provider = ProviderFactory.getProviderForModel(model);
-  const bareModel = stripProviderPrefix(model);
-
-  let responseText = '';
-  let structuredOutput: Record<string, unknown> | undefined;
-
-  // Build provider options
-  const providerOptions = {
-    prompt: options.prompt,
-    model: bareModel,
-    originalModel: model,
-    cwd: options.cwd,
-    systemPrompt: options.systemPrompt,
-    maxTurns: options.maxTurns ?? 1,
-    allowedTools: options.allowedTools ?? [],
-    abortController: options.abortController,
-    outputFormat: options.outputFormat,
-    thinkingLevel: options.thinkingLevel,
-    reasoningEffort: options.reasoningEffort,
-    readOnly: options.readOnly,
-    settingSources: options.settingSources,
-    claudeApiProfile: options.claudeApiProfile, // Legacy: Pass active Claude API profile for alternative endpoint configuration
-    claudeCompatibleProvider: options.claudeCompatibleProvider, // New: Pass Claude-compatible provider (takes precedence)
-    credentials: options.credentials, // Pass credentials for resolving 'credentials' apiKeySource
-  };
-
-  for await (const msg of provider.executeQuery(providerOptions)) {
-    // Handle error messages
-    if (msg.type === 'error') {
-      const errorMessage = msg.error || 'Provider returned an error';
-      throw new Error(errorMessage);
-    }
-
-    // Extract text from assistant messages
-    if (msg.type === 'assistant' && msg.message?.content) {
-      for (const block of msg.message.content) {
-        if (block.type === 'text' && block.text) {
-          responseText += block.text;
-        }
-      }
-    }
-
-    // Handle result messages
-    if (msg.type === 'result') {
-      if (msg.subtype === 'success') {
-        // Use result text if longer than accumulated text
-        if (msg.result && msg.result.length > responseText.length) {
-          responseText = msg.result;
-        }
-        // Capture structured output if present
-        if (msg.structured_output) {
-          structuredOutput = msg.structured_output;
-        }
-      } else if (msg.subtype === 'error_max_turns') {
-        // Max turns reached - return what we have
-        break;
-      } else if (msg.subtype === 'error_max_structured_output_retries') {
-        throw new Error('Could not produce valid structured output after retries');
-      }
-    }
-  }
-
-  return { text: responseText, structured_output: structuredOutput };
-}
-
-/**
- * Execute a streaming query with event callbacks
- *
- * Use this for queries where you need real-time progress updates,
- * such as when displaying streaming output to a user.
- *
- * @example
- * ```typescript
- * const result = await streamingQuery({
- *   prompt: 'Analyze this project and suggest improvements',
- *   cwd: '/path/to/project',
- *   maxTurns: 250,
- *   allowedTools: ['Read', 'Glob', 'Grep'],
- *   onText: (text) => emitProgress(text),
- *   onToolUse: (tool, input) => emitToolUse(tool, input),
- * });
- * ```
- */
-export async function streamingQuery(options: StreamingQueryOptions): Promise<SimpleQueryResult> {
-  const model = options.model || DEFAULT_MODEL;
-  const provider = ProviderFactory.getProviderForModel(model);
-  const bareModel = stripProviderPrefix(model);
-
-  let responseText = '';
-  let structuredOutput: Record<string, unknown> | undefined;
-
-  // Build provider options
-  const providerOptions = {
-    prompt: options.prompt,
-    model: bareModel,
-    originalModel: model,
-    cwd: options.cwd,
-    systemPrompt: options.systemPrompt,
-    maxTurns: options.maxTurns ?? 250,
-    allowedTools: options.allowedTools ?? ['Read', 'Glob', 'Grep'],
-    abortController: options.abortController,
-    outputFormat: options.outputFormat,
-    thinkingLevel: options.thinkingLevel,
-    reasoningEffort: options.reasoningEffort,
-    readOnly: options.readOnly,
-    settingSources: options.settingSources,
-    claudeApiProfile: options.claudeApiProfile, // Legacy: Pass active Claude API profile for alternative endpoint configuration
-    claudeCompatibleProvider: options.claudeCompatibleProvider, // New: Pass Claude-compatible provider (takes precedence)
-    credentials: options.credentials, // Pass credentials for resolving 'credentials' apiKeySource
-  };
-
-  for await (const msg of provider.executeQuery(providerOptions)) {
-    // Handle error messages
-    if (msg.type === 'error') {
-      const errorMessage = msg.error || 'Provider returned an error';
-      throw new Error(errorMessage);
-    }
-
-    // Extract content from assistant messages
-    if (msg.type === 'assistant' && msg.message?.content) {
-      for (const block of msg.message.content) {
-        if (block.type === 'text' && block.text) {
-          responseText += block.text;
-          options.onText?.(block.text);
-        } else if (block.type === 'tool_use' && block.name) {
-          options.onToolUse?.(block.name, block.input);
-        } else if (block.type === 'thinking' && block.thinking) {
-          options.onThinking?.(block.thinking);
-        }
-      }
-    }
-
-    // Handle result messages
-    if (msg.type === 'result') {
-      if (msg.subtype === 'success') {
-        // Use result text if longer than accumulated text
-        if (msg.result && msg.result.length > responseText.length) {
-          responseText = msg.result;
-        }
-        // Capture structured output if present
-        if (msg.structured_output) {
-          structuredOutput = msg.structured_output;
-        }
-      } else if (msg.subtype === 'error_max_turns') {
-        // Max turns reached - return what we have
-        break;
-      } else if (msg.subtype === 'error_max_structured_output_retries') {
-        throw new Error('Could not produce valid structured output after retries');
-      }
-    }
-  }
-
-  return { text: responseText, structured_output: structuredOutput };
-}

apps/server/src/routes/app-spec/common.ts

@@ -6,103 +6,26 @@ import { createLogger } from '@automaker/utils';
 
 const logger = createLogger('SpecRegeneration');
 
-// Types for running generation
-export type GenerationType = 'spec_regeneration' | 'feature_generation' | 'sync';
-
-interface RunningGeneration {
-  isRunning: boolean;
-  type: GenerationType;
-  startedAt: string;
-}
-
-// Shared state for tracking generation status - scoped by project path
-const runningProjects = new Map<string, RunningGeneration>();
-const abortControllers = new Map<string, AbortController>();
+// Shared state for tracking generation status - private
+let isRunning = false;
+let currentAbortController: AbortController | null = null;
 
 /**
- * Get the running state for a specific project
+ * Get the current running state
  */
-export function getSpecRegenerationStatus(projectPath?: string): {
+export function getSpecRegenerationStatus(): {
   isRunning: boolean;
   currentAbortController: AbortController | null;
-  projectPath?: string;
-  type?: GenerationType;
-  startedAt?: string;
 } {
-  if (projectPath) {
-    const generation = runningProjects.get(projectPath);
-    return {
-      isRunning: generation?.isRunning || false,
-      currentAbortController: abortControllers.get(projectPath) || null,
-      projectPath,
-      type: generation?.type,
-      startedAt: generation?.startedAt,
-    };
-  }
-  // Fallback: check if any project is running (for backward compatibility)
-  const isAnyRunning = Array.from(runningProjects.values()).some((g) => g.isRunning);
-  return { isRunning: isAnyRunning, currentAbortController: null };
+  return { isRunning, currentAbortController };
 }
 
 /**
- * Get the project path that is currently running (if any)
+ * Set the running state and abort controller
  */
-export function getRunningProjectPath(): string | null {
-  for (const [path, running] of runningProjects.entries()) {
-    if (running) return path;
-  }
-  return null;
-}
-
-/**
- * Set the running state and abort controller for a specific project
- */
-export function setRunningState(
-  projectPath: string,
-  running: boolean,
-  controller: AbortController | null = null,
-  type: GenerationType = 'spec_regeneration'
-): void {
-  if (running) {
-    runningProjects.set(projectPath, {
-      isRunning: true,
-      type,
-      startedAt: new Date().toISOString(),
-    });
-    if (controller) {
-      abortControllers.set(projectPath, controller);
-    }
-  } else {
-    runningProjects.delete(projectPath);
-    abortControllers.delete(projectPath);
-  }
-}
-
-/**
- * Get all running spec/feature generations for the running agents view
- */
-export function getAllRunningGenerations(): Array<{
-  projectPath: string;
-  type: GenerationType;
-  startedAt: string;
-}> {
-  const results: Array<{
-    projectPath: string;
-    type: GenerationType;
-    startedAt: string;
-  }> = [];
-
-  for (const [projectPath, generation] of runningProjects.entries()) {
-    if (generation.isRunning) {
-      results.push({
-        projectPath,
-        type: generation.type,
-        startedAt: generation.startedAt,
-      });
-    }
-  }
-
-  return results;
+export function setRunningState(running: boolean, controller: AbortController | null = null): void {
+  isRunning = running;
+  currentAbortController = controller;
 }
 
 /**

apps/server/src/routes/app-spec/generate-features-from-spec.ts

@@ -5,21 +5,19 @@
  * (defaults to Sonnet for balanced speed and quality).
  */
 
+import { query } from '@anthropic-ai/claude-agent-sdk';
 import * as secureFs from '../../lib/secure-fs.js';
 import type { EventEmitter } from '../../lib/events.js';
 import { createLogger } from '@automaker/utils';
-import { DEFAULT_PHASE_MODELS } from '@automaker/types';
+import { DEFAULT_PHASE_MODELS, isCursorModel } from '@automaker/types';
 import { resolvePhaseModel } from '@automaker/model-resolver';
-import { streamingQuery } from '../../providers/simple-query-service.js';
+import { createFeatureGenerationOptions } from '../../lib/sdk-options.js';
+import { ProviderFactory } from '../../providers/provider-factory.js';
+import { logAuthStatus } from './common.js';
 import { parseAndCreateFeatures } from './parse-and-create-features.js';
 import { getAppSpecPath } from '@automaker/platform';
 import type { SettingsService } from '../../services/settings-service.js';
-import {
-  getAutoLoadClaudeMdSetting,
-  getPromptCustomization,
-  getPhaseModelWithOverrides,
-} from '../../lib/settings-helpers.js';
-import { FeatureLoader } from '../../services/feature-loader.js';
+import { getAutoLoadClaudeMdSetting } from '../../lib/settings-helpers.js';
 
 const logger = createLogger('SpecRegeneration');
 
@@ -58,48 +56,38 @@ export async function generateFeaturesFromSpec(
     return;
   }
 
-  // Get customized prompts from settings
-  const prompts = await getPromptCustomization(settingsService, '[FeatureGeneration]');
-
-  // Load existing features to prevent duplicates
-  const featureLoader = new FeatureLoader();
-  const existingFeatures = await featureLoader.getAll(projectPath);
-
-  logger.info(`Found ${existingFeatures.length} existing features to exclude from generation`);
-
-  // Build existing features context for the prompt
-  let existingFeaturesContext = '';
-  if (existingFeatures.length > 0) {
-    const featuresList = existingFeatures
-      .map(
-        (f) =>
-          `- "${f.title}" (ID: ${f.id}): ${f.description?.substring(0, 100) || 'No description'}`
-      )
-      .join('\n');
-    existingFeaturesContext = `
-
-## EXISTING FEATURES (DO NOT REGENERATE THESE)
-
-The following ${existingFeatures.length} features already exist in the project. You MUST NOT generate features that duplicate or overlap with these:
-
-${featuresList}
-
-CRITICAL INSTRUCTIONS:
-- DO NOT generate any features with the same or similar titles as the existing features listed above
-- DO NOT generate features that cover the same functionality as existing features
-- ONLY generate NEW features that are not yet in the system
-- If a feature from the roadmap already exists, skip it entirely
-- Generate unique feature IDs that do not conflict with existing IDs: ${existingFeatures.map((f) => f.id).join(', ')}
-`;
-  }
-
   const prompt = `Based on this project specification:
 
 ${spec}
-${existingFeaturesContext}
-${prompts.appSpec.generateFeaturesFromSpecPrompt}
 
-Generate ${featureCount} NEW features that build on each other logically. Remember: ONLY generate features that DO NOT already exist.`;
+Generate a prioritized list of implementable features. For each feature provide:
+
+1. **id**: A unique lowercase-hyphenated identifier
+2. **category**: Functional category (e.g., "Core", "UI", "API", "Authentication", "Database")
+3. **title**: Short descriptive title
+4. **description**: What this feature does (2-3 sentences)
+5. **priority**: 1 (high), 2 (medium), or 3 (low)
+6. **complexity**: "simple", "moderate", or "complex"
+7. **dependencies**: Array of feature IDs this depends on (can be empty)
+
+Format as JSON:
+{
+  "features": [
+    {
+      "id": "feature-id",
+      "category": "Feature Category",
+      "title": "Feature Title",
+      "description": "What it does",
+      "priority": 1,
+      "complexity": "moderate",
+      "dependencies": []
+    }
+  ]
+}
+
+Generate ${featureCount} features that build on each other logically.
+
+IMPORTANT: Do not ask for clarification. The specification is provided above. Generate the JSON immediately.`;
 
   logger.info('========== PROMPT BEING SENT ==========');
   logger.info(`Prompt length: ${prompt.length} chars`);
@@ -119,53 +107,127 @@ Generate ${featureCount} NEW features that build on each other logically. Rememb
     '[FeatureGeneration]'
   );
 
-  // Get model from phase settings with provider info
-  const {
-    phaseModel: phaseModelEntry,
-    provider,
-    credentials,
-  } = settingsService
-    ? await getPhaseModelWithOverrides(
-        'featureGenerationModel',
-        settingsService,
-        projectPath,
-        '[FeatureGeneration]'
-      )
-    : {
-        phaseModel: DEFAULT_PHASE_MODELS.featureGenerationModel,
-        provider: undefined,
-        credentials: undefined,
-      };
+  // Get model from phase settings
+  const settings = await settingsService?.getGlobalSettings();
+  const phaseModelEntry =
+    settings?.phaseModels?.featureGenerationModel || DEFAULT_PHASE_MODELS.featureGenerationModel;
   const { model, thinkingLevel } = resolvePhaseModel(phaseModelEntry);
 
-  logger.info('Using model:', model, provider ? `via provider: ${provider.name}` : 'direct API');
+  logger.info('Using model:', model);
 
-  // Use streamingQuery with event callbacks
-  const result = await streamingQuery({
-    prompt,
-    model,
-    cwd: projectPath,
-    maxTurns: 250,
-    allowedTools: ['Read', 'Glob', 'Grep'],
-    abortController,
-    thinkingLevel,
-    readOnly: true, // Feature generation only reads code, doesn't write
-    settingSources: autoLoadClaudeMd ? ['user', 'project', 'local'] : undefined,
-    claudeCompatibleProvider: provider, // Pass provider for alternative endpoint configuration
-    credentials, // Pass credentials for resolving 'credentials' apiKeySource
-    onText: (text) => {
-      logger.debug(`Feature text block received (${text.length} chars)`);
-      events.emit('spec-regeneration:event', {
-        type: 'spec_regeneration_progress',
-        content: text,
-        projectPath: projectPath,
-      });
-    },
-  });
+  let responseText = '';
+  let messageCount = 0;
 
-  const responseText = result.text;
+  // Route to appropriate provider based on model type
+  if (isCursorModel(model)) {
+    // Use Cursor provider for Cursor models
+    logger.info('[FeatureGeneration] Using Cursor provider');
 
-  logger.info(`Feature stream complete.`);
+    const provider = ProviderFactory.getProviderForModel(model);
+
+    // Add explicit instructions for Cursor to return JSON in response
+    const cursorPrompt = `${prompt}
+
+CRITICAL INSTRUCTIONS:
+1. DO NOT write any files. Return the JSON in your response only.
+2. Respond with ONLY a JSON object - no explanations, no markdown, just raw JSON.
+3. Your entire response should be valid JSON starting with { and ending with }. No text before or after.`;
+
+    for await (const msg of provider.executeQuery({
+      prompt: cursorPrompt,
+      model,
+      cwd: projectPath,
+      maxTurns: 250,
+      allowedTools: ['Read', 'Glob', 'Grep'],
+      abortController,
+      readOnly: true, // Feature generation only reads code, doesn't write
+    })) {
+      messageCount++;
+
+      if (msg.type === 'assistant' && msg.message?.content) {
+        for (const block of msg.message.content) {
+          if (block.type === 'text' && block.text) {
+            responseText += block.text;
+            logger.debug(`Feature text block received (${block.text.length} chars)`);
+            events.emit('spec-regeneration:event', {
+              type: 'spec_regeneration_progress',
+              content: block.text,
+              projectPath: projectPath,
+            });
+          }
+        }
+      } else if (msg.type === 'result' && msg.subtype === 'success' && msg.result) {
+        // Use result if it's a final accumulated message
+        if (msg.result.length > responseText.length) {
+          responseText = msg.result;
+        }
+      }
+    }
+  } else {
+    // Use Claude SDK for Claude models
+    logger.info('[FeatureGeneration] Using Claude SDK');
+
+    const options = createFeatureGenerationOptions({
+      cwd: projectPath,
+      abortController,
+      autoLoadClaudeMd,
+      model,
+      thinkingLevel, // Pass thinking level for extended thinking
+    });
+
+    logger.debug('SDK Options:', JSON.stringify(options, null, 2));
+    logger.info('Calling Claude Agent SDK query() for features...');
+
+    logAuthStatus('Right before SDK query() for features');
+
+    let stream;
+    try {
+      stream = query({ prompt, options });
+      logger.debug('query() returned stream successfully');
+    } catch (queryError) {
+      logger.error('❌ query() threw an exception:');
+      logger.error('Error:', queryError);
+      throw queryError;
+    }
+
+    logger.debug('Starting to iterate over feature stream...');
+
+    try {
+      for await (const msg of stream) {
+        messageCount++;
+        logger.debug(
+          `Feature stream message #${messageCount}:`,
+          JSON.stringify({ type: msg.type, subtype: (msg as any).subtype }, null, 2)
+        );
+
+        if (msg.type === 'assistant' && msg.message.content) {
+          for (const block of msg.message.content) {
+            if (block.type === 'text') {
+              responseText += block.text;
+              logger.debug(`Feature text block received (${block.text.length} chars)`);
+              events.emit('spec-regeneration:event', {
+                type: 'spec_regeneration_progress',
+                content: block.text,
+                projectPath: projectPath,
+              });
+            }
+          }
+        } else if (msg.type === 'result' && (msg as any).subtype === 'success') {
+          logger.debug('Received success result for features');
+          responseText = (msg as any).result || responseText;
+        } else if ((msg as { type: string }).type === 'error') {
+          logger.error('❌ Received error message from feature stream:');
+          logger.error('Error message:', JSON.stringify(msg, null, 2));
+        }
+      }
+    } catch (streamError) {
+      logger.error('❌ Error while iterating feature stream:');
+      logger.error('Stream error:', streamError);
+      throw streamError;
+    }
+  }
+
+  logger.info(`Feature stream complete. Total messages: ${messageCount}`);
   logger.info(`Feature response length: ${responseText.length} chars`);
   logger.info('========== FULL RESPONSE TEXT ==========');
   logger.info(responseText);

apps/server/src/routes/app-spec/generate-spec.ts

@@ -5,22 +5,27 @@
  * (defaults to Opus for high-quality specification generation).
  */
 
+import { query } from '@anthropic-ai/claude-agent-sdk';
+import path from 'path';
 import * as secureFs from '../../lib/secure-fs.js';
 import type { EventEmitter } from '../../lib/events.js';
-import { specOutputSchema, specToXml, type SpecOutput } from '../../lib/app-spec-format.js';
+import {
+  specOutputSchema,
+  specToXml,
+  getStructuredSpecPromptInstruction,
+  type SpecOutput,
+} from '../../lib/app-spec-format.js';
 import { createLogger } from '@automaker/utils';
 import { DEFAULT_PHASE_MODELS, isCursorModel } from '@automaker/types';
 import { resolvePhaseModel } from '@automaker/model-resolver';
+import { createSpecGenerationOptions } from '../../lib/sdk-options.js';
 import { extractJson } from '../../lib/json-extractor.js';
-import { streamingQuery } from '../../providers/simple-query-service.js';
+import { ProviderFactory } from '../../providers/provider-factory.js';
+import { logAuthStatus } from './common.js';
 import { generateFeaturesFromSpec } from './generate-features-from-spec.js';
 import { ensureAutomakerDir, getAppSpecPath } from '@automaker/platform';
 import type { SettingsService } from '../../services/settings-service.js';
-import {
-  getAutoLoadClaudeMdSetting,
-  getPromptCustomization,
-  getPhaseModelWithOverrides,
-} from '../../lib/settings-helpers.js';
+import { getAutoLoadClaudeMdSetting } from '../../lib/settings-helpers.js';
 
 const logger = createLogger('SpecRegeneration');
 
@@ -42,9 +47,6 @@ export async function generateSpec(
   logger.info('analyzeProject:', analyzeProject);
   logger.info('maxFeatures:', maxFeatures);
 
-  // Get customized prompts from settings
-  const prompts = await getPromptCustomization(settingsService, '[SpecRegeneration]');
-
   // Build the prompt based on whether we should analyze the project
   let analysisInstructions = '';
   let techStackDefaults = '';
@@ -68,7 +70,9 @@ export async function generateSpec(
 Use these technologies as the foundation for the specification.`;
   }
 
-  const prompt = `${prompts.appSpec.generateSpecSystemPrompt}
+  const prompt = `You are helping to define a software project specification.
+
+IMPORTANT: Never ask for clarification or additional information. Use the information provided and make reasonable assumptions to create the best possible specification. If details are missing, infer them based on common patterns and best practices.
 
 Project Overview:
 ${projectOverview}
@@ -77,7 +81,7 @@ ${techStackDefaults}
 
 ${analysisInstructions}
 
-${prompts.appSpec.structuredSpecInstructions}`;
+${getStructuredSpecPromptInstruction()}`;
 
   logger.info('========== PROMPT BEING SENT ==========');
   logger.info(`Prompt length: ${prompt.length} chars`);
@@ -96,37 +100,28 @@ ${prompts.appSpec.structuredSpecInstructions}`;
     '[SpecRegeneration]'
   );
 
-  // Get model from phase settings with provider info
-  const {
-    phaseModel: phaseModelEntry,
-    provider,
-    credentials,
-  } = settingsService
-    ? await getPhaseModelWithOverrides(
-        'specGenerationModel',
-        settingsService,
-        projectPath,
-        '[SpecRegeneration]'
-      )
-    : {
-        phaseModel: DEFAULT_PHASE_MODELS.specGenerationModel,
-        provider: undefined,
-        credentials: undefined,
-      };
+  // Get model from phase settings
+  const settings = await settingsService?.getGlobalSettings();
+  const phaseModelEntry =
+    settings?.phaseModels?.specGenerationModel || DEFAULT_PHASE_MODELS.specGenerationModel;
   const { model, thinkingLevel } = resolvePhaseModel(phaseModelEntry);
 
-  logger.info('Using model:', model, provider ? `via provider: ${provider.name}` : 'direct API');
+  logger.info('Using model:', model);
 
   let responseText = '';
+  let messageCount = 0;
   let structuredOutput: SpecOutput | null = null;
 
-  // Determine if we should use structured output (Claude supports it, Cursor doesn't)
-  const useStructuredOutput = !isCursorModel(model);
+  // Route to appropriate provider based on model type
+  if (isCursorModel(model)) {
+    // Use Cursor provider for Cursor models
+    logger.info('[SpecGeneration] Using Cursor provider');
 
-  // Build the final prompt - for Cursor, include JSON schema instructions
-  let finalPrompt = prompt;
-  if (!useStructuredOutput) {
-    finalPrompt = `${prompt}
+    const provider = ProviderFactory.getProviderForModel(model);
+
+    // For Cursor, include the JSON schema in the prompt with clear instructions
+    // to return JSON in the response (not write to a file)
+    const cursorPrompt = `${prompt}
 
 CRITICAL INSTRUCTIONS:
 1. DO NOT write any files. DO NOT create any files like "project_specification.json".
@@ -136,59 +131,153 @@ CRITICAL INSTRUCTIONS:
 ${JSON.stringify(specOutputSchema, null, 2)}
 
 Your entire response should be valid JSON starting with { and ending with }. No text before or after.`;
-  }
 
-  // Use streamingQuery with event callbacks
-  const result = await streamingQuery({
-    prompt: finalPrompt,
-    model,
-    cwd: projectPath,
-    maxTurns: 250,
-    allowedTools: ['Read', 'Glob', 'Grep'],
-    abortController,
-    thinkingLevel,
-    readOnly: true, // Spec generation only reads code, we write the spec ourselves
-    settingSources: autoLoadClaudeMd ? ['user', 'project', 'local'] : undefined,
-    claudeCompatibleProvider: provider, // Pass provider for alternative endpoint configuration
-    credentials, // Pass credentials for resolving 'credentials' apiKeySource
-    outputFormat: useStructuredOutput
-      ? {
-          type: 'json_schema',
-          schema: specOutputSchema,
+    for await (const msg of provider.executeQuery({
+      prompt: cursorPrompt,
+      model,
+      cwd: projectPath,
+      maxTurns: 250,
+      allowedTools: ['Read', 'Glob', 'Grep'],
+      abortController,
+      readOnly: true, // Spec generation only reads code, we write the spec ourselves
+    })) {
+      messageCount++;
+
+      if (msg.type === 'assistant' && msg.message?.content) {
+        for (const block of msg.message.content) {
+          if (block.type === 'text' && block.text) {
+            responseText += block.text;
+            logger.info(
+              `Text block received (${block.text.length} chars), total now: ${responseText.length} chars`
+            );
+            events.emit('spec-regeneration:event', {
+              type: 'spec_regeneration_progress',
+              content: block.text,
+              projectPath: projectPath,
+            });
+          } else if (block.type === 'tool_use') {
+            logger.info('Tool use:', block.name);
+            events.emit('spec-regeneration:event', {
+              type: 'spec_tool',
+              tool: block.name,
+              input: block.input,
+            });
+          }
         }
-      : undefined,
-    onText: (text) => {
-      responseText += text;
-      logger.info(
-        `Text block received (${text.length} chars), total now: ${responseText.length} chars`
-      );
-      events.emit('spec-regeneration:event', {
-        type: 'spec_regeneration_progress',
-        content: text,
-        projectPath: projectPath,
-      });
-    },
-    onToolUse: (tool, input) => {
-      logger.info('Tool use:', tool);
-      events.emit('spec-regeneration:event', {
-        type: 'spec_tool',
-        tool,
-        input,
-      });
-    },
-  });
+      } else if (msg.type === 'result' && msg.subtype === 'success' && msg.result) {
+        // Use result if it's a final accumulated message
+        if (msg.result.length > responseText.length) {
+          responseText = msg.result;
+        }
+      }
+    }
 
-  // Get structured output if available
-  if (result.structured_output) {
-    structuredOutput = result.structured_output as unknown as SpecOutput;
-    logger.info('✅ Received structured output');
-    logger.debug('Structured output:', JSON.stringify(structuredOutput, null, 2));
-  } else if (!useStructuredOutput && responseText) {
-    // For non-Claude providers, parse JSON from response text
-    structuredOutput = extractJson<SpecOutput>(responseText, { logger });
+    // Parse JSON from the response text using shared utility
+    if (responseText) {
+      structuredOutput = extractJson<SpecOutput>(responseText, { logger });
+    }
+  } else {
+    // Use Claude SDK for Claude models
+    logger.info('[SpecGeneration] Using Claude SDK');
+
+    const options = createSpecGenerationOptions({
+      cwd: projectPath,
+      abortController,
+      autoLoadClaudeMd,
+      model,
+      thinkingLevel, // Pass thinking level for extended thinking
+      outputFormat: {
+        type: 'json_schema',
+        schema: specOutputSchema,
+      },
+    });
+
+    logger.debug('SDK Options:', JSON.stringify(options, null, 2));
+    logger.info('Calling Claude Agent SDK query()...');
+
+    // Log auth status right before the SDK call
+    logAuthStatus('Right before SDK query()');
+
+    let stream;
+    try {
+      stream = query({ prompt, options });
+      logger.debug('query() returned stream successfully');
+    } catch (queryError) {
+      logger.error('❌ query() threw an exception:');
+      logger.error('Error:', queryError);
+      throw queryError;
+    }
+
+    logger.info('Starting to iterate over stream...');
+
+    try {
+      for await (const msg of stream) {
+        messageCount++;
+        logger.info(
+          `Stream message #${messageCount}: type=${msg.type}, subtype=${(msg as any).subtype}`
+        );
+
+        if (msg.type === 'assistant') {
+          const msgAny = msg as any;
+          if (msgAny.message?.content) {
+            for (const block of msgAny.message.content) {
+              if (block.type === 'text') {
+                responseText += block.text;
+                logger.info(
+                  `Text block received (${block.text.length} chars), total now: ${responseText.length} chars`
+                );
+                events.emit('spec-regeneration:event', {
+                  type: 'spec_regeneration_progress',
+                  content: block.text,
+                  projectPath: projectPath,
+                });
+              } else if (block.type === 'tool_use') {
+                logger.info('Tool use:', block.name);
+                events.emit('spec-regeneration:event', {
+                  type: 'spec_tool',
+                  tool: block.name,
+                  input: block.input,
+                });
+              }
+            }
+          }
+        } else if (msg.type === 'result' && (msg as any).subtype === 'success') {
+          logger.info('Received success result');
+          // Check for structured output - this is the reliable way to get spec data
+          const resultMsg = msg as any;
+          if (resultMsg.structured_output) {
+            structuredOutput = resultMsg.structured_output as SpecOutput;
+            logger.info('✅ Received structured output');
+            logger.debug('Structured output:', JSON.stringify(structuredOutput, null, 2));
+          } else {
+            logger.warn('⚠️ No structured output in result, will fall back to text parsing');
+          }
+        } else if (msg.type === 'result') {
+          // Handle error result types
+          const subtype = (msg as any).subtype;
+          logger.info(`Result message: subtype=${subtype}`);
+          if (subtype === 'error_max_turns') {
+            logger.error('❌ Hit max turns limit!');
+          } else if (subtype === 'error_max_structured_output_retries') {
+            logger.error('❌ Failed to produce valid structured output after retries');
+            throw new Error('Could not produce valid spec output');
+          }
+        } else if ((msg as { type: string }).type === 'error') {
+          logger.error('❌ Received error message from stream:');
+          logger.error('Error message:', JSON.stringify(msg, null, 2));
+        } else if (msg.type === 'user') {
+          // Log user messages (tool results)
+          logger.info(`User message (tool result): ${JSON.stringify(msg).substring(0, 500)}`);
+        }
+      }
+    } catch (streamError) {
+      logger.error('❌ Error while iterating stream:');
+      logger.error('Stream error:', streamError);
+      throw streamError;
+    }
   }
 
-  logger.info(`Stream iteration complete.`);
+  logger.info(`Stream iteration complete. Total messages: ${messageCount}`);
   logger.info(`Response text length: ${responseText.length} chars`);
 
   // Determine XML content to save
@@ -220,33 +309,19 @@ Your entire response should be valid JSON starting with { and ending with }. No
       xmlContent = responseText.substring(xmlStart, xmlEnd + '</project_specification>'.length);
       logger.info(`Extracted XML content: ${xmlContent.length} chars (from position ${xmlStart})`);
     } else {
-      // No XML found, try JSON extraction
-      logger.warn('⚠️ No XML tags found, attempting JSON extraction...');
-      const extractedJson = extractJson<SpecOutput>(responseText, { logger });
-
-      if (
-        extractedJson &&
-        typeof extractedJson.project_name === 'string' &&
-        typeof extractedJson.overview === 'string' &&
-        Array.isArray(extractedJson.technology_stack) &&
-        Array.isArray(extractedJson.core_capabilities) &&
-        Array.isArray(extractedJson.implemented_features)
-      ) {
-        logger.info('✅ Successfully extracted JSON from response text');
-        xmlContent = specToXml(extractedJson);
-        logger.info(`✅ Converted extracted JSON to XML: ${xmlContent.length} chars`);
-      } else {
-        // Neither XML nor valid JSON found
-        logger.error('❌ Response does not contain valid XML or JSON structure');
-        logger.error(
-          'This typically happens when structured output failed and the agent produced conversational text instead of structured output'
-        );
-        throw new Error(
-          'Failed to generate spec: No valid XML or JSON structure found in response. ' +
-            'The response contained conversational text but no <project_specification> tags or valid JSON. ' +
-            'Please try again.'
-        );
-      }
+      // No valid XML structure found in the response text
+      // This happens when structured output was expected but not received, and the agent
+      // output conversational text instead of XML (e.g., "The project directory appears to be empty...")
+      // We should NOT save this conversational text as it's not a valid spec
+      logger.error('❌ Response does not contain valid <project_specification> XML structure');
+      logger.error(
+        'This typically happens when structured output failed and the agent produced conversational text instead of XML'
+      );
+      throw new Error(
+        'Failed to generate spec: No valid XML structure found in response. ' +
+          'The response contained conversational text but no <project_specification> tags. ' +
+          'Please try again.'
+      );
     }
   }
 

apps/server/src/routes/app-spec/index.ts

@@ -7,7 +7,6 @@ import type { EventEmitter } from '../../lib/events.js';
 import { createCreateHandler } from './routes/create.js';
 import { createGenerateHandler } from './routes/generate.js';
 import { createGenerateFeaturesHandler } from './routes/generate-features.js';
-import { createSyncHandler } from './routes/sync.js';
 import { createStopHandler } from './routes/stop.js';
 import { createStatusHandler } from './routes/status.js';
 import type { SettingsService } from '../../services/settings-service.js';
@@ -21,7 +20,6 @@ export function createSpecRegenerationRoutes(
   router.post('/create', createCreateHandler(events));
   router.post('/generate', createGenerateHandler(events, settingsService));
   router.post('/generate-features', createGenerateFeaturesHandler(events, settingsService));
-  router.post('/sync', createSyncHandler(events, settingsService));
   router.post('/stop', createStopHandler());
   router.get('/status', createStatusHandler());
 

apps/server/src/routes/app-spec/parse-and-create-features.ts

@@ -5,10 +5,9 @@
 import path from 'path';
 import * as secureFs from '../../lib/secure-fs.js';
 import type { EventEmitter } from '../../lib/events.js';
-import { createLogger, atomicWriteJson, DEFAULT_BACKUP_COUNT } from '@automaker/utils';
+import { createLogger } from '@automaker/utils';
 import { getFeaturesDir } from '@automaker/platform';
 import { extractJsonWithArray } from '../../lib/json-extractor.js';
-import { getNotificationService } from '../../services/notification-service.js';
 
 const logger = createLogger('SpecRegeneration');
 
@@ -74,10 +73,10 @@ export async function parseAndCreateFeatures(
         updatedAt: new Date().toISOString(),
       };
 
-      // Use atomic write with backup support for crash protection
-      await atomicWriteJson(path.join(featureDir, 'feature.json'), featureData, {
-        backupCount: DEFAULT_BACKUP_COUNT,
-      });
+      await secureFs.writeFile(
+        path.join(featureDir, 'feature.json'),
+        JSON.stringify(featureData, null, 2)
+      );
 
       createdFeatures.push({ id: feature.id, title: feature.title });
     }
@@ -89,15 +88,6 @@ export async function parseAndCreateFeatures(
       message: `Spec regeneration complete! Created ${createdFeatures.length} features.`,
       projectPath: projectPath,
     });
-
-    // Create notification for spec generation completion
-    const notificationService = getNotificationService();
-    await notificationService.createNotification({
-      type: 'spec_regeneration_complete',
-      title: 'Spec Generation Complete',
-      message: `Created ${createdFeatures.length} features from the project specification.`,
-      projectPath: projectPath,
-    });
   } catch (error) {
     logger.error('❌ parseAndCreateFeatures() failed:');
     logger.error('Error:', error);

apps/server/src/routes/app-spec/routes/create.ts

@@ -47,17 +47,17 @@ export function createCreateHandler(events: EventEmitter) {
         return;
       }
 
-      const { isRunning } = getSpecRegenerationStatus(projectPath);
+      const { isRunning } = getSpecRegenerationStatus();
       if (isRunning) {
-        logger.warn('Generation already running for project:', projectPath);
-        res.json({ success: false, error: 'Spec generation already running for this project' });
+        logger.warn('Generation already running, rejecting request');
+        res.json({ success: false, error: 'Spec generation already running' });
         return;
       }
 
       logAuthStatus('Before starting generation');
 
       const abortController = new AbortController();
-      setRunningState(projectPath, true, abortController);
+      setRunningState(true, abortController);
       logger.info('Starting background generation task...');
 
       // Start generation in background
@@ -80,7 +80,7 @@ export function createCreateHandler(events: EventEmitter) {
         })
         .finally(() => {
           logger.info('Generation task finished (success or error)');
-          setRunningState(projectPath, false, null);
+          setRunningState(false, null);
         });
 
       logger.info('Returning success response (generation running in background)');

apps/server/src/routes/app-spec/routes/generate-features.ts

@@ -40,17 +40,17 @@ export function createGenerateFeaturesHandler(
         return;
       }
 
-      const { isRunning } = getSpecRegenerationStatus(projectPath);
+      const { isRunning } = getSpecRegenerationStatus();
       if (isRunning) {
-        logger.warn('Generation already running for project:', projectPath);
-        res.json({ success: false, error: 'Generation already running for this project' });
+        logger.warn('Generation already running, rejecting request');
+        res.json({ success: false, error: 'Generation already running' });
         return;
       }
 
       logAuthStatus('Before starting feature generation');
 
       const abortController = new AbortController();
-      setRunningState(projectPath, true, abortController, 'feature_generation');
+      setRunningState(true, abortController);
       logger.info('Starting background feature generation task...');
 
       generateFeaturesFromSpec(projectPath, events, abortController, maxFeatures, settingsService)
@@ -63,7 +63,7 @@ export function createGenerateFeaturesHandler(
         })
         .finally(() => {
           logger.info('Feature generation task finished (success or error)');
-          setRunningState(projectPath, false, null);
+          setRunningState(false, null);
         });
 
       logger.info('Returning success response (generation running in background)');

apps/server/src/routes/app-spec/routes/generate.ts

@@ -48,17 +48,17 @@ export function createGenerateHandler(events: EventEmitter, settingsService?: Se
         return;
       }
 
-      const { isRunning } = getSpecRegenerationStatus(projectPath);
+      const { isRunning } = getSpecRegenerationStatus();
       if (isRunning) {
-        logger.warn('Generation already running for project:', projectPath);
-        res.json({ success: false, error: 'Spec generation already running for this project' });
+        logger.warn('Generation already running, rejecting request');
+        res.json({ success: false, error: 'Spec generation already running' });
         return;
       }
 
       logAuthStatus('Before starting generation');
 
       const abortController = new AbortController();
-      setRunningState(projectPath, true, abortController);
+      setRunningState(true, abortController);
       logger.info('Starting background generation task...');
 
       generateSpec(
@@ -81,7 +81,7 @@ export function createGenerateHandler(events: EventEmitter, settingsService?: Se
         })
         .finally(() => {
           logger.info('Generation task finished (success or error)');
-          setRunningState(projectPath, false, null);
+          setRunningState(false, null);
         });
 
       logger.info('Returning success response (generation running in background)');

apps/server/src/routes/app-spec/routes/status.ts

@@ -6,11 +6,10 @@ import type { Request, Response } from 'express';
 import { getSpecRegenerationStatus, getErrorMessage } from '../common.js';
 
 export function createStatusHandler() {
-  return async (req: Request, res: Response): Promise<void> => {
+  return async (_req: Request, res: Response): Promise<void> => {
     try {
-      const projectPath = req.query.projectPath as string | undefined;
-      const { isRunning } = getSpecRegenerationStatus(projectPath);
-      res.json({ success: true, isRunning, projectPath });
+      const { isRunning } = getSpecRegenerationStatus();
+      res.json({ success: true, isRunning });
     } catch (error) {
       res.status(500).json({ success: false, error: getErrorMessage(error) });
     }

apps/server/src/routes/app-spec/routes/stop.ts

@@ -6,16 +6,13 @@ import type { Request, Response } from 'express';
 import { getSpecRegenerationStatus, setRunningState, getErrorMessage } from '../common.js';
 
 export function createStopHandler() {
-  return async (req: Request, res: Response): Promise<void> => {
+  return async (_req: Request, res: Response): Promise<void> => {
     try {
-      const { projectPath } = req.body as { projectPath?: string };
-      const { currentAbortController } = getSpecRegenerationStatus(projectPath);
+      const { currentAbortController } = getSpecRegenerationStatus();
       if (currentAbortController) {
         currentAbortController.abort();
       }
-      if (projectPath) {
-        setRunningState(projectPath, false, null);
-      }
+      setRunningState(false, null);
       res.json({ success: true });
     } catch (error) {
       res.status(500).json({ success: false, error: getErrorMessage(error) });

apps/server/src/routes/app-spec/routes/sync.ts

@@ -1,76 +0,0 @@
-/**
- * POST /sync endpoint - Sync spec with codebase and features
- */
-
-import type { Request, Response } from 'express';
-import type { EventEmitter } from '../../../lib/events.js';
-import { createLogger } from '@automaker/utils';
-import {
-  getSpecRegenerationStatus,
-  setRunningState,
-  logAuthStatus,
-  logError,
-  getErrorMessage,
-} from '../common.js';
-import { syncSpec } from '../sync-spec.js';
-import type { SettingsService } from '../../../services/settings-service.js';
-
-const logger = createLogger('SpecSync');
-
-export function createSyncHandler(events: EventEmitter, settingsService?: SettingsService) {
-  return async (req: Request, res: Response): Promise<void> => {
-    logger.info('========== /sync endpoint called ==========');
-    logger.debug('Request body:', JSON.stringify(req.body, null, 2));
-
-    try {
-      const { projectPath } = req.body as {
-        projectPath: string;
-      };
-
-      logger.debug('projectPath:', projectPath);
-
-      if (!projectPath) {
-        logger.error('Missing projectPath parameter');
-        res.status(400).json({ success: false, error: 'projectPath required' });
-        return;
-      }
-
-      const { isRunning } = getSpecRegenerationStatus(projectPath);
-      if (isRunning) {
-        logger.warn('Generation/sync already running for project:', projectPath);
-        res.json({ success: false, error: 'Operation already running for this project' });
-        return;
-      }
-
-      logAuthStatus('Before starting spec sync');
-
-      const abortController = new AbortController();
-      setRunningState(projectPath, true, abortController, 'sync');
-      logger.info('Starting background spec sync task...');
-
-      syncSpec(projectPath, events, abortController, settingsService)
-        .then((result) => {
-          logger.info('Spec sync completed successfully');
-          logger.info('Result:', JSON.stringify(result, null, 2));
-        })
-        .catch((error) => {
-          logError(error, 'Spec sync failed with error');
-          events.emit('spec-regeneration:event', {
-            type: 'spec_regeneration_error',
-            error: getErrorMessage(error),
-            projectPath,
-          });
-        })
-        .finally(() => {
-          logger.info('Spec sync task finished (success or error)');
-          setRunningState(projectPath, false, null);
-        });
-
-      logger.info('Returning success response (sync running in background)');
-      res.json({ success: true });
-    } catch (error) {
-      logError(error, 'Sync route handler failed');
-      res.status(500).json({ success: false, error: getErrorMessage(error) });
-    }
-  };
-}

apps/server/src/routes/app-spec/sync-spec.ts

@@ -1,328 +0,0 @@
-/**
- * Sync spec with current codebase and feature state
- *
- * Updates the spec file based on:
- * - Completed Automaker features
- * - Code analysis for tech stack and implementations
- * - Roadmap phase status updates
- */
-
-import * as secureFs from '../../lib/secure-fs.js';
-import type { EventEmitter } from '../../lib/events.js';
-import { createLogger } from '@automaker/utils';
-import { DEFAULT_PHASE_MODELS } from '@automaker/types';
-import { resolvePhaseModel } from '@automaker/model-resolver';
-import { streamingQuery } from '../../providers/simple-query-service.js';
-import { getAppSpecPath } from '@automaker/platform';
-import type { SettingsService } from '../../services/settings-service.js';
-import {
-  getAutoLoadClaudeMdSetting,
-  getPhaseModelWithOverrides,
-} from '../../lib/settings-helpers.js';
-import { FeatureLoader } from '../../services/feature-loader.js';
-import {
-  extractImplementedFeatures,
-  extractTechnologyStack,
-  extractRoadmapPhases,
-  updateImplementedFeaturesSection,
-  updateTechnologyStack,
-  updateRoadmapPhaseStatus,
-  type ImplementedFeature,
-  type RoadmapPhase,
-} from '../../lib/xml-extractor.js';
-import { getNotificationService } from '../../services/notification-service.js';
-
-const logger = createLogger('SpecSync');
-
-/**
- * Result of a sync operation
- */
-export interface SyncResult {
-  techStackUpdates: {
-    added: string[];
-    removed: string[];
-  };
-  implementedFeaturesUpdates: {
-    addedFromFeatures: string[];
-    removed: string[];
-  };
-  roadmapUpdates: Array<{ phaseName: string; newStatus: string }>;
-  summary: string;
-}
-
-/**
- * Sync the spec with current codebase and feature state
- */
-export async function syncSpec(
-  projectPath: string,
-  events: EventEmitter,
-  abortController: AbortController,
-  settingsService?: SettingsService
-): Promise<SyncResult> {
-  logger.info('========== syncSpec() started ==========');
-  logger.info('projectPath:', projectPath);
-
-  const result: SyncResult = {
-    techStackUpdates: { added: [], removed: [] },
-    implementedFeaturesUpdates: { addedFromFeatures: [], removed: [] },
-    roadmapUpdates: [],
-    summary: '',
-  };
-
-  // Read existing spec
-  const specPath = getAppSpecPath(projectPath);
-  let specContent: string;
-
-  try {
-    specContent = (await secureFs.readFile(specPath, 'utf-8')) as string;
-    logger.info(`Spec loaded successfully (${specContent.length} chars)`);
-  } catch (readError) {
-    logger.error('Failed to read spec file:', readError);
-    events.emit('spec-regeneration:event', {
-      type: 'spec_regeneration_error',
-      error: 'No project spec found. Create or regenerate spec first.',
-      projectPath,
-    });
-    throw new Error('No project spec found');
-  }
-
-  events.emit('spec-regeneration:event', {
-    type: 'spec_regeneration_progress',
-    content: '[Phase: sync] Starting spec sync...\n',
-    projectPath,
-  });
-
-  // Extract current state from spec
-  const currentImplementedFeatures = extractImplementedFeatures(specContent);
-  const currentTechStack = extractTechnologyStack(specContent);
-  const currentRoadmapPhases = extractRoadmapPhases(specContent);
-
-  logger.info(`Current spec has ${currentImplementedFeatures.length} implemented features`);
-  logger.info(`Current spec has ${currentTechStack.length} technologies`);
-  logger.info(`Current spec has ${currentRoadmapPhases.length} roadmap phases`);
-
-  // Load completed Automaker features
-  const featureLoader = new FeatureLoader();
-  const allFeatures = await featureLoader.getAll(projectPath);
-  const completedFeatures = allFeatures.filter(
-    (f) => f.status === 'completed' || f.status === 'verified'
-  );
-
-  logger.info(`Found ${completedFeatures.length} completed/verified features in Automaker`);
-
-  events.emit('spec-regeneration:event', {
-    type: 'spec_regeneration_progress',
-    content: `Found ${completedFeatures.length} completed features to sync...\n`,
-    projectPath,
-  });
-
-  // Build new implemented features list from completed Automaker features
-  const newImplementedFeatures: ImplementedFeature[] = [];
-  const existingNames = new Set(currentImplementedFeatures.map((f) => f.name.toLowerCase()));
-
-  for (const feature of completedFeatures) {
-    const name = feature.title || `Feature: ${feature.id}`;
-    if (!existingNames.has(name.toLowerCase())) {
-      newImplementedFeatures.push({
-        name,
-        description: feature.description || '',
-      });
-      result.implementedFeaturesUpdates.addedFromFeatures.push(name);
-    }
-  }
-
-  // Merge: keep existing + add new from completed features
-  const mergedFeatures = [...currentImplementedFeatures, ...newImplementedFeatures];
-
-  // Update spec with merged features
-  if (result.implementedFeaturesUpdates.addedFromFeatures.length > 0) {
-    specContent = updateImplementedFeaturesSection(specContent, mergedFeatures);
-    logger.info(
-      `Added ${result.implementedFeaturesUpdates.addedFromFeatures.length} features to spec`
-    );
-  }
-
-  // Analyze codebase for tech stack updates using AI
-  events.emit('spec-regeneration:event', {
-    type: 'spec_regeneration_progress',
-    content: 'Analyzing codebase for technology updates...\n',
-    projectPath,
-  });
-
-  const autoLoadClaudeMd = await getAutoLoadClaudeMdSetting(
-    projectPath,
-    settingsService,
-    '[SpecSync]'
-  );
-
-  // Get model from phase settings with provider info
-  const {
-    phaseModel: phaseModelEntry,
-    provider,
-    credentials,
-  } = settingsService
-    ? await getPhaseModelWithOverrides(
-        'specGenerationModel',
-        settingsService,
-        projectPath,
-        '[SpecSync]'
-      )
-    : {
-        phaseModel: DEFAULT_PHASE_MODELS.specGenerationModel,
-        provider: undefined,
-        credentials: undefined,
-      };
-  const { model, thinkingLevel } = resolvePhaseModel(phaseModelEntry);
-
-  logger.info('Using model:', model, provider ? `via provider: ${provider.name}` : 'direct API');
-
-  // Use AI to analyze tech stack
-  const techAnalysisPrompt = `Analyze this project and return ONLY a JSON object with the current technology stack.
-
-Current known technologies: ${currentTechStack.join(', ')}
-
-Look at package.json, config files, and source code to identify:
-- Frameworks (React, Vue, Express, etc.)
-- Languages (TypeScript, JavaScript, Python, etc.)
-- Build tools (Vite, Webpack, etc.)
-- Databases (PostgreSQL, MongoDB, etc.)
-- Key libraries and tools
-
-Return ONLY this JSON format, no other text:
-{
-  "technologies": ["Technology 1", "Technology 2", ...]
-}`;
-
-  try {
-    const techResult = await streamingQuery({
-      prompt: techAnalysisPrompt,
-      model,
-      cwd: projectPath,
-      maxTurns: 10,
-      allowedTools: ['Read', 'Glob', 'Grep'],
-      abortController,
-      thinkingLevel,
-      readOnly: true,
-      settingSources: autoLoadClaudeMd ? ['user', 'project', 'local'] : undefined,
-      claudeCompatibleProvider: provider, // Pass provider for alternative endpoint configuration
-      credentials, // Pass credentials for resolving 'credentials' apiKeySource
-      onText: (text) => {
-        logger.debug(`Tech analysis text: ${text.substring(0, 100)}`);
-      },
-    });
-
-    // Parse tech stack from response
-    const jsonMatch = techResult.text.match(/\{[\s\S]*"technologies"[\s\S]*\}/);
-    if (jsonMatch) {
-      const parsed = JSON.parse(jsonMatch[0]);
-      if (Array.isArray(parsed.technologies)) {
-        const newTechStack = parsed.technologies as string[];
-
-        // Calculate differences
-        const currentSet = new Set(currentTechStack.map((t) => t.toLowerCase()));
-        const newSet = new Set(newTechStack.map((t) => t.toLowerCase()));
-
-        for (const tech of newTechStack) {
-          if (!currentSet.has(tech.toLowerCase())) {
-            result.techStackUpdates.added.push(tech);
-          }
-        }
-
-        for (const tech of currentTechStack) {
-          if (!newSet.has(tech.toLowerCase())) {
-            result.techStackUpdates.removed.push(tech);
-          }
-        }
-
-        // Update spec with new tech stack if there are changes
-        if (
-          result.techStackUpdates.added.length > 0 ||
-          result.techStackUpdates.removed.length > 0
-        ) {
-          specContent = updateTechnologyStack(specContent, newTechStack);
-          logger.info(
-            `Updated tech stack: +${result.techStackUpdates.added.length}, -${result.techStackUpdates.removed.length}`
-          );
-        }
-      }
-    }
-  } catch (error) {
-    logger.warn('Failed to analyze tech stack:', error);
-    // Continue with other sync operations
-  }
-
-  // Update roadmap phase statuses based on completed features
-  events.emit('spec-regeneration:event', {
-    type: 'spec_regeneration_progress',
-    content: 'Checking roadmap phase statuses...\n',
-    projectPath,
-  });
-
-  // For each phase, check if all its features are completed
-  // This is a heuristic - we check if the phase name appears in any feature titles/descriptions
-  for (const phase of currentRoadmapPhases) {
-    if (phase.status === 'completed') continue; // Already completed
-
-    // Check if this phase should be marked as completed
-    // A phase is considered complete if we have completed features that mention it
-    const phaseNameLower = phase.name.toLowerCase();
-    const relatedCompletedFeatures = completedFeatures.filter(
-      (f) =>
-        f.title?.toLowerCase().includes(phaseNameLower) ||
-        f.description?.toLowerCase().includes(phaseNameLower) ||
-        f.category?.toLowerCase().includes(phaseNameLower)
-    );
-
-    // If we have related completed features and the phase is still pending/in_progress,
-    // update it to in_progress or completed based on feature count
-    if (relatedCompletedFeatures.length > 0 && phase.status !== 'completed') {
-      const newStatus = 'in_progress';
-      specContent = updateRoadmapPhaseStatus(specContent, phase.name, newStatus);
-      result.roadmapUpdates.push({ phaseName: phase.name, newStatus });
-      logger.info(`Updated phase "${phase.name}" to ${newStatus}`);
-    }
-  }
-
-  // Save updated spec
-  await secureFs.writeFile(specPath, specContent, 'utf-8');
-  logger.info('Spec saved successfully');
-
-  // Build summary
-  const summaryParts: string[] = [];
-  if (result.implementedFeaturesUpdates.addedFromFeatures.length > 0) {
-    summaryParts.push(
-      `Added ${result.implementedFeaturesUpdates.addedFromFeatures.length} implemented features`
-    );
-  }
-  if (result.techStackUpdates.added.length > 0) {
-    summaryParts.push(`Added ${result.techStackUpdates.added.length} technologies`);
-  }
-  if (result.techStackUpdates.removed.length > 0) {
-    summaryParts.push(`Removed ${result.techStackUpdates.removed.length} technologies`);
-  }
-  if (result.roadmapUpdates.length > 0) {
-    summaryParts.push(`Updated ${result.roadmapUpdates.length} roadmap phases`);
-  }
-
-  result.summary = summaryParts.length > 0 ? summaryParts.join(', ') : 'Spec is already up to date';
-
-  // Create notification
-  const notificationService = getNotificationService();
-  await notificationService.createNotification({
-    type: 'spec_regeneration_complete',
-    title: 'Spec Sync Complete',
-    message: result.summary,
-    projectPath,
-  });
-
-  events.emit('spec-regeneration:event', {
-    type: 'spec_regeneration_complete',
-    message: `Spec sync complete! ${result.summary}`,
-    projectPath,
-  });
-
-  logger.info('========== syncSpec() completed ==========');
-  logger.info('Summary:', result.summary);
-
-  return result;
-}

apps/server/src/routes/auth/index.ts

@@ -117,27 +117,9 @@ export function createAuthRoutes(): Router {
    *
    * Returns whether the current request is authenticated.
    * Used by the UI to determine if login is needed.
-   *
-   * If AUTOMAKER_AUTO_LOGIN=true is set, automatically creates a session
-   * for unauthenticated requests (useful for development).
    */
-  router.get('/status', async (req, res) => {
-    let authenticated = isRequestAuthenticated(req);
-
-    // Auto-login for development: create session automatically if enabled
-    // Only works in non-production environments as a safeguard
-    if (
-      !authenticated &&
-      process.env.AUTOMAKER_AUTO_LOGIN === 'true' &&
-      process.env.NODE_ENV !== 'production'
-    ) {
-      const sessionToken = await createSession();
-      const cookieOptions = getSessionCookieOptions();
-      const cookieName = getSessionCookieName();
-      res.cookie(cookieName, sessionToken, cookieOptions);
-      authenticated = true;
-    }
-
+  router.get('/status', (req, res) => {
+    const authenticated = isRequestAuthenticated(req);
     res.json({
       success: true,
       authenticated,
@@ -247,13 +229,12 @@ export function createAuthRoutes(): Router {
       await invalidateSession(sessionToken);
     }
 
-    // Clear the cookie by setting it to empty with immediate expiration
-    // Using res.cookie() with maxAge: 0 is more reliable than clearCookie()
-    // in cross-origin development environments
-    res.cookie(cookieName, '', {
-      ...getSessionCookieOptions(),
-      maxAge: 0,
-      expires: new Date(0),
+    // Clear the cookie
+    res.clearCookie(cookieName, {
+      httpOnly: true,
+      secure: process.env.NODE_ENV === 'production',
+      sameSite: 'strict',
+      path: '/',
     });
 
     res.json({

apps/server/src/routes/auto-mode/index.ts

@@ -10,8 +10,6 @@ import { validatePathParams } from '../../middleware/validate-paths.js';
 import { createStopFeatureHandler } from './routes/stop-feature.js';
 import { createStatusHandler } from './routes/status.js';
 import { createRunFeatureHandler } from './routes/run-feature.js';
-import { createStartHandler } from './routes/start.js';
-import { createStopHandler } from './routes/stop.js';
 import { createVerifyFeatureHandler } from './routes/verify-feature.js';
 import { createResumeFeatureHandler } from './routes/resume-feature.js';
 import { createContextExistsHandler } from './routes/context-exists.js';
@@ -19,15 +17,10 @@ import { createAnalyzeProjectHandler } from './routes/analyze-project.js';
 import { createFollowUpFeatureHandler } from './routes/follow-up-feature.js';
 import { createCommitFeatureHandler } from './routes/commit-feature.js';
 import { createApprovePlanHandler } from './routes/approve-plan.js';
-import { createResumeInterruptedHandler } from './routes/resume-interrupted.js';
 
 export function createAutoModeRoutes(autoModeService: AutoModeService): Router {
   const router = Router();
 
-  // Auto loop control routes
-  router.post('/start', validatePathParams('projectPath'), createStartHandler(autoModeService));
-  router.post('/stop', validatePathParams('projectPath'), createStopHandler(autoModeService));
-
   router.post('/stop-feature', createStopFeatureHandler(autoModeService));
   router.post('/status', validatePathParams('projectPath?'), createStatusHandler(autoModeService));
   router.post(
@@ -70,11 +63,6 @@ export function createAutoModeRoutes(autoModeService: AutoModeService): Router {
     validatePathParams('projectPath'),
     createApprovePlanHandler(autoModeService)
   );
-  router.post(
-    '/resume-interrupted',
-    validatePathParams('projectPath'),
-    createResumeInterruptedHandler(autoModeService)
-  );
 
   return router;
 }

apps/server/src/routes/auto-mode/routes/follow-up-feature.ts

@@ -31,9 +31,7 @@ export function createFollowUpFeatureHandler(autoModeService: AutoModeService) {
       // Start follow-up in background
       // followUpFeature derives workDir from feature.branchName
       autoModeService
-        // Default to false to match run-feature/resume-feature behavior.
-        // Worktrees should only be used when explicitly enabled by the user.
-        .followUpFeature(projectPath, featureId, prompt, imagePaths, useWorktrees ?? false)
+        .followUpFeature(projectPath, featureId, prompt, imagePaths, useWorktrees ?? true)
         .catch((error) => {
           logger.error(`[AutoMode] Follow up feature ${featureId} error:`, error);
         })

apps/server/src/routes/auto-mode/routes/resume-interrupted.ts

@@ -1,42 +0,0 @@
-/**
- * Resume Interrupted Features Handler
- *
- * Checks for features that were interrupted (in pipeline steps or in_progress)
- * when the server was restarted and resumes them.
- */
-
-import type { Request, Response } from 'express';
-import { createLogger } from '@automaker/utils';
-import type { AutoModeService } from '../../../services/auto-mode-service.js';
-
-const logger = createLogger('ResumeInterrupted');
-
-interface ResumeInterruptedRequest {
-  projectPath: string;
-}
-
-export function createResumeInterruptedHandler(autoModeService: AutoModeService) {
-  return async (req: Request, res: Response): Promise<void> => {
-    const { projectPath } = req.body as ResumeInterruptedRequest;
-
-    if (!projectPath) {
-      res.status(400).json({ error: 'Project path is required' });
-      return;
-    }
-
-    logger.info(`Checking for interrupted features in ${projectPath}`);
-
-    try {
-      await autoModeService.resumeInterruptedFeatures(projectPath);
-      res.json({
-        success: true,
-        message: 'Resume check completed',
-      });
-    } catch (error) {
-      logger.error('Error resuming interrupted features:', error);
-      res.status(500).json({
-        error: error instanceof Error ? error.message : 'Unknown error',
-      });
-    }
-  };
-}

apps/server/src/routes/auto-mode/routes/run-feature.ts

@@ -26,24 +26,6 @@ export function createRunFeatureHandler(autoModeService: AutoModeService) {
         return;
       }
 
-      // Check per-worktree capacity before starting
-      const capacity = await autoModeService.checkWorktreeCapacity(projectPath, featureId);
-      if (!capacity.hasCapacity) {
-        const worktreeDesc = capacity.branchName
-          ? `worktree "${capacity.branchName}"`
-          : 'main worktree';
-        res.status(429).json({
-          success: false,
-          error: `Agent limit reached for ${worktreeDesc} (${capacity.currentAgents}/${capacity.maxAgents}). Wait for running tasks to complete or increase the limit.`,
-          details: {
-            currentAgents: capacity.currentAgents,
-            maxAgents: capacity.maxAgents,
-            branchName: capacity.branchName,
-          },
-        });
-        return;
-      }
-
       // Start execution in background
       // executeFeature derives workDir from feature.branchName
       autoModeService

apps/server/src/routes/auto-mode/routes/start.ts

@@ -1,67 +0,0 @@
-/**
- * POST /start endpoint - Start auto mode loop for a project
- */
-
-import type { Request, Response } from 'express';
-import type { AutoModeService } from '../../../services/auto-mode-service.js';
-import { createLogger } from '@automaker/utils';
-import { getErrorMessage, logError } from '../common.js';
-
-const logger = createLogger('AutoMode');
-
-export function createStartHandler(autoModeService: AutoModeService) {
-  return async (req: Request, res: Response): Promise<void> => {
-    try {
-      const { projectPath, branchName, maxConcurrency } = req.body as {
-        projectPath: string;
-        branchName?: string | null;
-        maxConcurrency?: number;
-      };
-
-      if (!projectPath) {
-        res.status(400).json({
-          success: false,
-          error: 'projectPath is required',
-        });
-        return;
-      }
-
-      // Normalize branchName: undefined becomes null
-      const normalizedBranchName = branchName ?? null;
-      const worktreeDesc = normalizedBranchName
-        ? `worktree ${normalizedBranchName}`
-        : 'main worktree';
-
-      // Check if already running
-      if (autoModeService.isAutoLoopRunningForProject(projectPath, normalizedBranchName)) {
-        res.json({
-          success: true,
-          message: `Auto mode is already running for ${worktreeDesc}`,
-          alreadyRunning: true,
-          branchName: normalizedBranchName,
-        });
-        return;
-      }
-
-      // Start the auto loop for this project/worktree
-      const resolvedMaxConcurrency = await autoModeService.startAutoLoopForProject(
-        projectPath,
-        normalizedBranchName,
-        maxConcurrency
-      );
-
-      logger.info(
-        `Started auto loop for ${worktreeDesc} in project: ${projectPath} with maxConcurrency: ${resolvedMaxConcurrency}`
-      );
-
-      res.json({
-        success: true,
-        message: `Auto mode started with max ${resolvedMaxConcurrency} concurrent features`,
-        branchName: normalizedBranchName,
-      });
-    } catch (error) {
-      logError(error, 'Start auto mode failed');
-      res.status(500).json({ success: false, error: getErrorMessage(error) });
-    }
-  };
-}

apps/server/src/routes/auto-mode/routes/status.ts

@@ -1,8 +1,5 @@
 /**
  * POST /status endpoint - Get auto mode status
- *
- * If projectPath is provided, returns per-project status including autoloop state.
- * If no projectPath, returns global status for backward compatibility.
  */
 
 import type { Request, Response } from 'express';
@@ -12,41 +9,10 @@ import { getErrorMessage, logError } from '../common.js';
 export function createStatusHandler(autoModeService: AutoModeService) {
   return async (req: Request, res: Response): Promise<void> => {
     try {
-      const { projectPath, branchName } = req.body as {
-        projectPath?: string;
-        branchName?: string | null;
-      };
-
-      // If projectPath is provided, return per-project/worktree status
-      if (projectPath) {
-        // Normalize branchName: undefined becomes null
-        const normalizedBranchName = branchName ?? null;
-        const projectStatus = autoModeService.getStatusForProject(
-          projectPath,
-          normalizedBranchName
-        );
-        res.json({
-          success: true,
-          isRunning: projectStatus.runningCount > 0,
-          isAutoLoopRunning: projectStatus.isAutoLoopRunning,
-          runningFeatures: projectStatus.runningFeatures,
-          runningCount: projectStatus.runningCount,
-          maxConcurrency: projectStatus.maxConcurrency,
-          projectPath,
-          branchName: normalizedBranchName,
-        });
-        return;
-      }
-
-      // Fall back to global status for backward compatibility
       const status = autoModeService.getStatus();
-      const activeProjects = autoModeService.getActiveAutoLoopProjects();
-      const activeWorktrees = autoModeService.getActiveAutoLoopWorktrees();
       res.json({
         success: true,
         ...status,
-        activeAutoLoopProjects: activeProjects,
-        activeAutoLoopWorktrees: activeWorktrees,
       });
     } catch (error) {
       logError(error, 'Get status failed');

apps/server/src/routes/auto-mode/routes/stop.ts

@@ -1,66 +0,0 @@
-/**
- * POST /stop endpoint - Stop auto mode loop for a project
- */
-
-import type { Request, Response } from 'express';
-import type { AutoModeService } from '../../../services/auto-mode-service.js';
-import { createLogger } from '@automaker/utils';
-import { getErrorMessage, logError } from '../common.js';
-
-const logger = createLogger('AutoMode');
-
-export function createStopHandler(autoModeService: AutoModeService) {
-  return async (req: Request, res: Response): Promise<void> => {
-    try {
-      const { projectPath, branchName } = req.body as {
-        projectPath: string;
-        branchName?: string | null;
-      };
-
-      if (!projectPath) {
-        res.status(400).json({
-          success: false,
-          error: 'projectPath is required',
-        });
-        return;
-      }
-
-      // Normalize branchName: undefined becomes null
-      const normalizedBranchName = branchName ?? null;
-      const worktreeDesc = normalizedBranchName
-        ? `worktree ${normalizedBranchName}`
-        : 'main worktree';
-
-      // Check if running
-      if (!autoModeService.isAutoLoopRunningForProject(projectPath, normalizedBranchName)) {
-        res.json({
-          success: true,
-          message: `Auto mode is not running for ${worktreeDesc}`,
-          wasRunning: false,
-          branchName: normalizedBranchName,
-        });
-        return;
-      }
-
-      // Stop the auto loop for this project/worktree
-      const runningCount = await autoModeService.stopAutoLoopForProject(
-        projectPath,
-        normalizedBranchName
-      );
-
-      logger.info(
-        `Stopped auto loop for ${worktreeDesc} in project: ${projectPath}, ${runningCount} features still running`
-      );
-
-      res.json({
-        success: true,
-        message: 'Auto mode stopped',
-        runningFeaturesCount: runningCount,
-        branchName: normalizedBranchName,
-      });
-    } catch (error) {
-      logError(error, 'Stop auto mode failed');
-      res.status(500).json({ success: false, error: getErrorMessage(error) });
-    }
-  };
-}

apps/server/src/routes/backlog-plan/common.ts

@@ -3,31 +3,12 @@
  */
 
 import { createLogger } from '@automaker/utils';
-import { ensureAutomakerDir, getAutomakerDir } from '@automaker/platform';
-import * as secureFs from '../../lib/secure-fs.js';
-import path from 'path';
-import type { BacklogPlanResult } from '@automaker/types';
 
 const logger = createLogger('BacklogPlan');
 
 // State for tracking running generation
 let isRunning = false;
 let currentAbortController: AbortController | null = null;
-let runningDetails: {
-  projectPath: string;
-  prompt: string;
-  model?: string;
-  startedAt: string;
-} | null = null;
-
-const BACKLOG_PLAN_FILENAME = 'backlog-plan.json';
-
-export interface StoredBacklogPlan {
-  savedAt: string;
-  prompt: string;
-  model?: string;
-  result: BacklogPlanResult;
-}
 
 export function getBacklogPlanStatus(): { isRunning: boolean } {
   return { isRunning };
@@ -35,125 +16,20 @@ export function getBacklogPlanStatus(): { isRunning: boolean } {
 
 export function setRunningState(running: boolean, abortController?: AbortController | null): void {
   isRunning = running;
-  if (!running) {
-    runningDetails = null;
-  }
   if (abortController !== undefined) {
     currentAbortController = abortController;
   }
 }
 
-export function setRunningDetails(
-  details: {
-    projectPath: string;
-    prompt: string;
-    model?: string;
-    startedAt: string;
-  } | null
-): void {
-  runningDetails = details;
-}
-
-export function getRunningDetails(): {
-  projectPath: string;
-  prompt: string;
-  model?: string;
-  startedAt: string;
-} | null {
-  return runningDetails;
-}
-
-function getBacklogPlanPath(projectPath: string): string {
-  return path.join(getAutomakerDir(projectPath), BACKLOG_PLAN_FILENAME);
-}
-
-export async function saveBacklogPlan(projectPath: string, plan: StoredBacklogPlan): Promise<void> {
-  await ensureAutomakerDir(projectPath);
-  const filePath = getBacklogPlanPath(projectPath);
-  await secureFs.writeFile(filePath, JSON.stringify(plan, null, 2), 'utf-8');
-}
-
-export async function loadBacklogPlan(projectPath: string): Promise<StoredBacklogPlan | null> {
-  try {
-    const filePath = getBacklogPlanPath(projectPath);
-    const raw = await secureFs.readFile(filePath, 'utf-8');
-    const parsed = JSON.parse(raw as string) as StoredBacklogPlan;
-    if (!Array.isArray(parsed?.result?.changes)) {
-      return null;
-    }
-    return parsed;
-  } catch {
-    return null;
-  }
-}
-
-export async function clearBacklogPlan(projectPath: string): Promise<void> {
-  try {
-    const filePath = getBacklogPlanPath(projectPath);
-    await secureFs.unlink(filePath);
-  } catch {
-    // ignore missing file
-  }
-}
-
 export function getAbortController(): AbortController | null {
   return currentAbortController;
 }
 
-/**
- * Map SDK/CLI errors to user-friendly messages
- */
-export function mapBacklogPlanError(rawMessage: string): string {
-  // Claude Code spawn failures
-  if (
-    rawMessage.includes('Failed to spawn Claude Code process') ||
-    rawMessage.includes('spawn node ENOENT') ||
-    rawMessage.includes('Claude Code executable not found') ||
-    rawMessage.includes('Claude Code native binary not found')
-  ) {
-    return 'Claude CLI could not be launched. Make sure the Claude CLI is installed and available in PATH, or check that Node.js is correctly installed. Try running "which claude" or "claude --version" in your terminal to verify.';
-  }
-
-  // Claude Code process crash
-  if (rawMessage.includes('Claude Code process exited')) {
-    return 'Claude exited unexpectedly. Try again. If it keeps happening, re-run `claude login` or update your API key in Setup.';
-  }
-
-  // Rate limiting
-  if (rawMessage.toLowerCase().includes('rate limit') || rawMessage.includes('429')) {
-    return 'Rate limited. Please wait a moment and try again.';
-  }
-
-  // Network errors
-  if (
-    rawMessage.toLowerCase().includes('network') ||
-    rawMessage.toLowerCase().includes('econnrefused') ||
-    rawMessage.toLowerCase().includes('timeout')
-  ) {
-    return 'Network error. Check your internet connection and try again.';
-  }
-
-  // Authentication errors
-  if (
-    rawMessage.toLowerCase().includes('not authenticated') ||
-    rawMessage.toLowerCase().includes('unauthorized') ||
-    rawMessage.includes('401')
-  ) {
-    return 'Authentication failed. Please check your API key or run `claude login` to authenticate.';
-  }
-
-  // Return original message for unknown errors
-  return rawMessage;
-}
-
 export function getErrorMessage(error: unknown): string {
-  let rawMessage: string;
   if (error instanceof Error) {
-    rawMessage = error.message;
-  } else {
-    rawMessage = String(error);
+    return error.message;
   }
-  return mapBacklogPlanError(rawMessage);
+  return String(error);
 }
 
 export function logError(error: unknown, context: string): void {

apps/server/src/routes/backlog-plan/generate-plan.ts

@@ -7,29 +7,14 @@
 
 import type { EventEmitter } from '../../lib/events.js';
 import type { Feature, BacklogPlanResult, BacklogChange, DependencyUpdate } from '@automaker/types';
-import {
-  DEFAULT_PHASE_MODELS,
-  isCursorModel,
-  stripProviderPrefix,
-  type ThinkingLevel,
-} from '@automaker/types';
+import { DEFAULT_PHASE_MODELS, isCursorModel, type ThinkingLevel } from '@automaker/types';
 import { resolvePhaseModel } from '@automaker/model-resolver';
 import { FeatureLoader } from '../../services/feature-loader.js';
 import { ProviderFactory } from '../../providers/provider-factory.js';
 import { extractJsonWithArray } from '../../lib/json-extractor.js';
-import {
-  logger,
-  setRunningState,
-  setRunningDetails,
-  getErrorMessage,
-  saveBacklogPlan,
-} from './common.js';
+import { logger, setRunningState, getErrorMessage } from './common.js';
 import type { SettingsService } from '../../services/settings-service.js';
-import {
-  getAutoLoadClaudeMdSetting,
-  getPromptCustomization,
-  getPhaseModelWithOverrides,
-} from '../../lib/settings-helpers.js';
+import { getAutoLoadClaudeMdSetting, getPromptCustomization } from '../../lib/settings-helpers.js';
 
 const featureLoader = new FeatureLoader();
 
@@ -121,43 +106,20 @@ export async function generateBacklogPlan(
       content: 'Generating plan with AI...',
     });
 
-    // Get the model to use from settings or provided override with provider info
+    // Get the model to use from settings or provided override
     let effectiveModel = model;
     let thinkingLevel: ThinkingLevel | undefined;
-    let claudeCompatibleProvider: import('@automaker/types').ClaudeCompatibleProvider | undefined;
-    let credentials: import('@automaker/types').Credentials | undefined;
-
-    if (effectiveModel) {
-      // Use explicit override - just get credentials
-      credentials = await settingsService?.getCredentials();
-    } else if (settingsService) {
-      // Use settings-based model with provider info
-      const phaseResult = await getPhaseModelWithOverrides(
-        'backlogPlanningModel',
-        settingsService,
-        projectPath,
-        '[BacklogPlan]'
-      );
-      const resolved = resolvePhaseModel(phaseResult.phaseModel);
-      effectiveModel = resolved.model;
-      thinkingLevel = resolved.thinkingLevel;
-      claudeCompatibleProvider = phaseResult.provider;
-      credentials = phaseResult.credentials;
-    } else {
-      // Fallback to defaults
-      const resolved = resolvePhaseModel(DEFAULT_PHASE_MODELS.backlogPlanningModel);
+    if (!effectiveModel) {
+      const settings = await settingsService?.getGlobalSettings();
+      const phaseModelEntry =
+        settings?.phaseModels?.backlogPlanningModel || DEFAULT_PHASE_MODELS.backlogPlanningModel;
+      const resolved = resolvePhaseModel(phaseModelEntry);
       effectiveModel = resolved.model;
       thinkingLevel = resolved.thinkingLevel;
     }
-    logger.info(
-      '[BacklogPlan] Using model:',
-      effectiveModel,
-      claudeCompatibleProvider ? `via provider: ${claudeCompatibleProvider.name}` : 'direct API'
-    );
+    logger.info('[BacklogPlan] Using model:', effectiveModel);
 
     const provider = ProviderFactory.getProviderForModel(effectiveModel);
-    // Strip provider prefix - providers expect bare model IDs
-    const bareModel = stripProviderPrefix(effectiveModel);
 
     // Get autoLoadClaudeMd setting
     const autoLoadClaudeMd = await getAutoLoadClaudeMdSetting(
@@ -189,7 +151,7 @@ ${userPrompt}`;
     // Execute the query
     const stream = provider.executeQuery({
       prompt: finalPrompt,
-      model: bareModel,
+      model: effectiveModel,
       cwd: projectPath,
       systemPrompt: finalSystemPrompt,
       maxTurns: 1,
@@ -198,8 +160,6 @@ ${userPrompt}`;
       settingSources: autoLoadClaudeMd ? ['user', 'project'] : undefined,
       readOnly: true, // Plan generation only generates text, doesn't write files
       thinkingLevel, // Pass thinking level for extended thinking
-      claudeCompatibleProvider, // Pass provider for alternative endpoint configuration
-      credentials, // Pass credentials for resolving 'credentials' apiKeySource
     });
 
     let responseText = '';
@@ -233,13 +193,6 @@ ${userPrompt}`;
     // Parse the response
     const result = parsePlanResponse(responseText);
 
-    await saveBacklogPlan(projectPath, {
-      savedAt: new Date().toISOString(),
-      prompt,
-      model: effectiveModel,
-      result,
-    });
-
     events.emit('backlog-plan:event', {
       type: 'backlog_plan_complete',
       result,
@@ -258,6 +211,5 @@ ${userPrompt}`;
     throw error;
   } finally {
     setRunningState(false, null);
-    setRunningDetails(null);
   }
 }

apps/server/src/routes/backlog-plan/index.ts

@@ -9,7 +9,6 @@ import { createGenerateHandler } from './routes/generate.js';
 import { createStopHandler } from './routes/stop.js';
 import { createStatusHandler } from './routes/status.js';
 import { createApplyHandler } from './routes/apply.js';
-import { createClearHandler } from './routes/clear.js';
 import type { SettingsService } from '../../services/settings-service.js';
 
 export function createBacklogPlanRoutes(
@@ -24,9 +23,8 @@ export function createBacklogPlanRoutes(
     createGenerateHandler(events, settingsService)
   );
   router.post('/stop', createStopHandler());
-  router.get('/status', validatePathParams('projectPath'), createStatusHandler());
+  router.get('/status', createStatusHandler());
   router.post('/apply', validatePathParams('projectPath'), createApplyHandler());
-  router.post('/clear', validatePathParams('projectPath'), createClearHandler());
 
   return router;
 }

apps/server/src/routes/backlog-plan/routes/apply.ts

@@ -5,29 +5,18 @@
 import type { Request, Response } from 'express';
 import type { BacklogPlanResult, BacklogChange, Feature } from '@automaker/types';
 import { FeatureLoader } from '../../../services/feature-loader.js';
-import { clearBacklogPlan, getErrorMessage, logError, logger } from '../common.js';
+import { getErrorMessage, logError, logger } from '../common.js';
 
 const featureLoader = new FeatureLoader();
 
 export function createApplyHandler() {
   return async (req: Request, res: Response): Promise<void> => {
     try {
-      const {
-        projectPath,
-        plan,
-        branchName: rawBranchName,
-      } = req.body as {
+      const { projectPath, plan } = req.body as {
         projectPath: string;
         plan: BacklogPlanResult;
-        branchName?: string;
       };
 
-      // Validate branchName: must be undefined or a non-empty trimmed string
-      const branchName =
-        typeof rawBranchName === 'string' && rawBranchName.trim().length > 0
-          ? rawBranchName.trim()
-          : undefined;
-
       if (!projectPath) {
         res.status(400).json({ success: false, error: 'projectPath required' });
         return;
@@ -85,16 +74,14 @@ export function createApplyHandler() {
         if (!change.feature) continue;
 
         try {
-          // Create the new feature - use the AI-generated ID if provided
+          // Create the new feature
           const newFeature = await featureLoader.create(projectPath, {
-            id: change.feature.id, // Use descriptive ID from AI if provided
             title: change.feature.title,
             description: change.feature.description || '',
             category: change.feature.category || 'Uncategorized',
             dependencies: change.feature.dependencies,
             priority: change.feature.priority,
             status: 'backlog',
-            branchName,
           });
 
           appliedChanges.push(`added:${newFeature.id}`);
@@ -148,17 +135,6 @@ export function createApplyHandler() {
         }
       }
 
-      // Clear the plan before responding
-      try {
-        await clearBacklogPlan(projectPath);
-      } catch (error) {
-        logger.warn(
-          `[BacklogPlan] Failed to clear backlog plan after apply:`,
-          getErrorMessage(error)
-        );
-        // Don't throw - operation succeeded, just cleanup failed
-      }
-
       res.json({
         success: true,
         appliedChanges,

apps/server/src/routes/backlog-plan/routes/clear.ts

@@ -1,25 +0,0 @@
-/**
- * POST /clear endpoint - Clear saved backlog plan
- */
-
-import type { Request, Response } from 'express';
-import { clearBacklogPlan, getErrorMessage, logError } from '../common.js';
-
-export function createClearHandler() {
-  return async (req: Request, res: Response): Promise<void> => {
-    try {
-      const { projectPath } = req.body as { projectPath: string };
-
-      if (!projectPath) {
-        res.status(400).json({ success: false, error: 'projectPath required' });
-        return;
-      }
-
-      await clearBacklogPlan(projectPath);
-      res.json({ success: true });
-    } catch (error) {
-      logError(error, 'Clear backlog plan failed');
-      res.status(500).json({ success: false, error: getErrorMessage(error) });
-    }
-  };
-}

apps/server/src/routes/backlog-plan/routes/generate.ts

@@ -4,13 +4,7 @@
 
 import type { Request, Response } from 'express';
 import type { EventEmitter } from '../../../lib/events.js';
-import {
-  getBacklogPlanStatus,
-  setRunningState,
-  setRunningDetails,
-  getErrorMessage,
-  logError,
-} from '../common.js';
+import { getBacklogPlanStatus, setRunningState, getErrorMessage, logError } from '../common.js';
 import { generateBacklogPlan } from '../generate-plan.js';
 import type { SettingsService } from '../../../services/settings-service.js';
 
@@ -43,26 +37,20 @@ export function createGenerateHandler(events: EventEmitter, settingsService?: Se
       }
 
       setRunningState(true);
-      setRunningDetails({
-        projectPath,
-        prompt,
-        model,
-        startedAt: new Date().toISOString(),
-      });
       const abortController = new AbortController();
       setRunningState(true, abortController);
 
       // Start generation in background
-      // Note: generateBacklogPlan handles its own error event emission,
-      // so we only log here to avoid duplicate error toasts
       generateBacklogPlan(projectPath, prompt, events, abortController, settingsService, model)
         .catch((error) => {
-          // Just log - error event already emitted by generateBacklogPlan
           logError(error, 'Generate backlog plan failed (background)');
+          events.emit('backlog-plan:event', {
+            type: 'backlog_plan_error',
+            error: getErrorMessage(error),
+          });
         })
         .finally(() => {
           setRunningState(false, null);
-          setRunningDetails(null);
         });
 
       res.json({ success: true });

apps/server/src/routes/backlog-plan/routes/status.ts

@@ -3,15 +3,13 @@
  */
 
 import type { Request, Response } from 'express';
-import { getBacklogPlanStatus, loadBacklogPlan, getErrorMessage, logError } from '../common.js';
+import { getBacklogPlanStatus, getErrorMessage, logError } from '../common.js';
 
 export function createStatusHandler() {
-  return async (req: Request, res: Response): Promise<void> => {
+  return async (_req: Request, res: Response): Promise<void> => {
     try {
       const status = getBacklogPlanStatus();
-      const projectPath = typeof req.query.projectPath === 'string' ? req.query.projectPath : '';
-      const savedPlan = projectPath ? await loadBacklogPlan(projectPath) : null;
-      res.json({ success: true, ...status, savedPlan });
+      res.json({ success: true, ...status });
     } catch (error) {
       logError(error, 'Get backlog plan status failed');
       res.status(500).json({ success: false, error: getErrorMessage(error) });

apps/server/src/routes/backlog-plan/routes/stop.ts

@@ -3,13 +3,7 @@
  */
 
 import type { Request, Response } from 'express';
-import {
-  getAbortController,
-  setRunningState,
-  setRunningDetails,
-  getErrorMessage,
-  logError,
-} from '../common.js';
+import { getAbortController, setRunningState, getErrorMessage, logError } from '../common.js';
 
 export function createStopHandler() {
   return async (_req: Request, res: Response): Promise<void> => {
@@ -18,7 +12,6 @@ export function createStopHandler() {
       if (abortController) {
         abortController.abort();
         setRunningState(false, null);
-        setRunningDetails(null);
       }
       res.json({ success: true });
     } catch (error) {

apps/server/src/routes/claude/index.ts

@@ -13,10 +13,7 @@ export function createClaudeRoutes(service: ClaudeUsageService): Router {
       // Check if Claude CLI is available first
       const isAvailable = await service.isAvailable();
       if (!isAvailable) {
-        // IMPORTANT: This endpoint is behind Automaker session auth already.
-        // Use a 200 + error payload for Claude CLI issues so the UI doesn't
-        // interpret it as an invalid Automaker session (401/403 triggers logout).
-        res.status(200).json({
+        res.status(503).json({
           error: 'Claude CLI not found',
           message: "Please install Claude Code CLI and run 'claude login' to authenticate",
         });
@@ -29,20 +26,12 @@ export function createClaudeRoutes(service: ClaudeUsageService): Router {
       const message = error instanceof Error ? error.message : 'Unknown error';
 
       if (message.includes('Authentication required') || message.includes('token_expired')) {
-        // Do NOT use 401/403 here: that status code is reserved for Automaker session auth.
-        res.status(200).json({
+        res.status(401).json({
           error: 'Authentication required',
           message: "Please run 'claude login' to authenticate",
         });
-      } else if (message.includes('TRUST_PROMPT_PENDING')) {
-        // Trust prompt appeared but couldn't be auto-approved
-        res.status(200).json({
-          error: 'Trust prompt pending',
-          message:
-            'Claude CLI needs folder permission. Please run "claude" in your terminal and approve access.',
-        });
       } else if (message.includes('timed out')) {
-        res.status(200).json({
+        res.status(504).json({
           error: 'Command timed out',
           message: 'The Claude CLI took too long to respond',
         });

apps/server/src/routes/codex/index.ts

@@ -1,90 +0,0 @@
-import { Router, Request, Response } from 'express';
-import { CodexUsageService } from '../../services/codex-usage-service.js';
-import { CodexModelCacheService } from '../../services/codex-model-cache-service.js';
-import { createLogger } from '@automaker/utils';
-
-const logger = createLogger('Codex');
-
-export function createCodexRoutes(
-  usageService: CodexUsageService,
-  modelCacheService: CodexModelCacheService
-): Router {
-  const router = Router();
-
-  // Get current usage (attempts to fetch from Codex CLI)
-  router.get('/usage', async (_req: Request, res: Response) => {
-    try {
-      // Check if Codex CLI is available first
-      const isAvailable = await usageService.isAvailable();
-      if (!isAvailable) {
-        // IMPORTANT: This endpoint is behind Automaker session auth already.
-        // Use a 200 + error payload for Codex CLI issues so the UI doesn't
-        // interpret it as an invalid Automaker session (401/403 triggers logout).
-        res.status(200).json({
-          error: 'Codex CLI not found',
-          message: "Please install Codex CLI and run 'codex login' to authenticate",
-        });
-        return;
-      }
-
-      const usage = await usageService.fetchUsageData();
-      res.json(usage);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : 'Unknown error';
-
-      if (message.includes('not authenticated') || message.includes('login')) {
-        // Do NOT use 401/403 here: that status code is reserved for Automaker session auth.
-        res.status(200).json({
-          error: 'Authentication required',
-          message: "Please run 'codex login' to authenticate",
-        });
-      } else if (message.includes('not available') || message.includes('does not provide')) {
-        // This is the expected case - Codex doesn't provide usage stats
-        res.status(200).json({
-          error: 'Usage statistics not available',
-          message: message,
-        });
-      } else if (message.includes('timed out')) {
-        res.status(200).json({
-          error: 'Command timed out',
-          message: 'The Codex CLI took too long to respond',
-        });
-      } else {
-        logger.error('Error fetching usage:', error);
-        res.status(500).json({ error: message });
-      }
-    }
-  });
-
-  // Get available Codex models (cached)
-  router.get('/models', async (req: Request, res: Response) => {
-    try {
-      const forceRefresh = req.query.refresh === 'true';
-      const { models, cachedAt } = await modelCacheService.getModelsWithMetadata(forceRefresh);
-
-      if (models.length === 0) {
-        res.status(503).json({
-          success: false,
-          error: 'Codex CLI not available or not authenticated',
-          message: "Please install Codex CLI and run 'codex login' to authenticate",
-        });
-        return;
-      }
-
-      res.json({
-        success: true,
-        models,
-        cachedAt,
-      });
-    } catch (error) {
-      logger.error('Error fetching models:', error);
-      const message = error instanceof Error ? error.message : 'Unknown error';
-      res.status(500).json({
-        success: false,
-        error: message,
-      });
-    }
-  });
-
-  return router;
-}

apps/server/src/routes/context/routes/describe-file.ts

@@ -11,18 +11,17 @@
  */
 
 import type { Request, Response } from 'express';
+import { query } from '@anthropic-ai/claude-agent-sdk';
 import { createLogger } from '@automaker/utils';
+import { DEFAULT_PHASE_MODELS, isCursorModel } from '@automaker/types';
 import { PathNotAllowedError } from '@automaker/platform';
 import { resolvePhaseModel } from '@automaker/model-resolver';
-import { simpleQuery } from '../../../providers/simple-query-service.js';
+import { createCustomOptions } from '../../../lib/sdk-options.js';
+import { ProviderFactory } from '../../../providers/provider-factory.js';
 import * as secureFs from '../../../lib/secure-fs.js';
 import * as path from 'path';
 import type { SettingsService } from '../../../services/settings-service.js';
-import {
-  getAutoLoadClaudeMdSetting,
-  getPromptCustomization,
-  getPhaseModelWithOverrides,
-} from '../../../lib/settings-helpers.js';
+import { getAutoLoadClaudeMdSetting } from '../../../lib/settings-helpers.js';
 
 const logger = createLogger('DescribeFile');
 
@@ -50,6 +49,31 @@ interface DescribeFileErrorResponse {
   error: string;
 }
 
+/**
+ * Extract text content from Claude SDK response messages
+ */
+async function extractTextFromStream(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  stream: AsyncIterable<any>
+): Promise<string> {
+  let responseText = '';
+
+  for await (const msg of stream) {
+    if (msg.type === 'assistant' && msg.message?.content) {
+      const blocks = msg.message.content as Array<{ type: string; text?: string }>;
+      for (const block of blocks) {
+        if (block.type === 'text' && block.text) {
+          responseText += block.text;
+        }
+      }
+    } else if (msg.type === 'result' && msg.subtype === 'success') {
+      responseText = msg.result || responseText;
+    }
+  }
+
+  return responseText;
+}
+
 /**
  * Create the describe-file request handler
  *
@@ -133,17 +157,18 @@ export function createDescribeFileHandler(
       // Get the filename for context
       const fileName = path.basename(resolvedPath);
 
-      // Get customized prompts from settings
-      const prompts = await getPromptCustomization(settingsService, '[DescribeFile]');
-
       // Build prompt with file content passed as structured data
       // The file content is included directly, not via tool invocation
-      const prompt = `${prompts.contextDescription.describeFilePrompt}
+      const instructionText = `Analyze the following file and provide a 1-2 sentence description suitable for use as context in an AI coding assistant. Focus on what the file contains, its purpose, and why an AI agent might want to use this context in the future (e.g., "API documentation for the authentication endpoints", "Configuration file for database connections", "Coding style guidelines for the project").
 
-File: ${fileName}${truncated ? ' (truncated)' : ''}
+Respond with ONLY the description text, no additional formatting, preamble, or explanation.
 
---- FILE CONTENT ---
-${contentToAnalyze}`;
+File: ${fileName}${truncated ? ' (truncated)' : ''}`;
+
+      const promptContent = [
+        { type: 'text' as const, text: instructionText },
+        { type: 'text' as const, text: `\n\n--- FILE CONTENT ---\n${contentToAnalyze}` },
+      ];
 
       // Use the file's directory as the working directory
       const cwd = path.dirname(resolvedPath);
@@ -155,39 +180,76 @@ ${contentToAnalyze}`;
         '[DescribeFile]'
       );
 
-      // Get model from phase settings with provider info
-      const {
-        phaseModel: phaseModelEntry,
-        provider,
-        credentials,
-      } = await getPhaseModelWithOverrides(
-        'fileDescriptionModel',
-        settingsService,
-        cwd,
-        '[DescribeFile]'
-      );
+      // Get model from phase settings
+      const settings = await settingsService?.getGlobalSettings();
+      logger.info(`Raw phaseModels from settings:`, JSON.stringify(settings?.phaseModels, null, 2));
+      const phaseModelEntry =
+        settings?.phaseModels?.fileDescriptionModel || DEFAULT_PHASE_MODELS.fileDescriptionModel;
+      logger.info(`fileDescriptionModel entry:`, JSON.stringify(phaseModelEntry));
       const { model, thinkingLevel } = resolvePhaseModel(phaseModelEntry);
 
-      logger.info(
-        `Resolved model: ${model}, thinkingLevel: ${thinkingLevel}`,
-        provider ? `via provider: ${provider.name}` : 'direct API'
-      );
+      logger.info(`Resolved model: ${model}, thinkingLevel: ${thinkingLevel}`);
 
-      // Use simpleQuery - provider abstraction handles routing to correct provider
-      const result = await simpleQuery({
-        prompt,
-        model,
-        cwd,
-        maxTurns: 1,
-        allowedTools: [],
-        thinkingLevel,
-        readOnly: true, // File description only reads, doesn't write
-        settingSources: autoLoadClaudeMd ? ['user', 'project', 'local'] : undefined,
-        claudeCompatibleProvider: provider, // Pass provider for alternative endpoint configuration
-        credentials, // Pass credentials for resolving 'credentials' apiKeySource
-      });
+      let description: string;
 
-      const description = result.text;
+      // Route to appropriate provider based on model type
+      if (isCursorModel(model)) {
+        // Use Cursor provider for Cursor models
+        logger.info(`Using Cursor provider for model: ${model}`);
+
+        const provider = ProviderFactory.getProviderForModel(model);
+
+        // Build a simple text prompt for Cursor (no multi-part content blocks)
+        const cursorPrompt = `${instructionText}\n\n--- FILE CONTENT ---\n${contentToAnalyze}`;
+
+        let responseText = '';
+        for await (const msg of provider.executeQuery({
+          prompt: cursorPrompt,
+          model,
+          cwd,
+          maxTurns: 1,
+          allowedTools: [],
+          readOnly: true, // File description only reads, doesn't write
+        })) {
+          if (msg.type === 'assistant' && msg.message?.content) {
+            for (const block of msg.message.content) {
+              if (block.type === 'text' && block.text) {
+                responseText += block.text;
+              }
+            }
+          }
+        }
+        description = responseText;
+      } else {
+        // Use Claude SDK for Claude models
+        logger.info(`Using Claude SDK for model: ${model}`);
+
+        // Use centralized SDK options with proper cwd validation
+        // No tools needed since we're passing file content directly
+        const sdkOptions = createCustomOptions({
+          cwd,
+          model,
+          maxTurns: 1,
+          allowedTools: [],
+          autoLoadClaudeMd,
+          sandbox: { enabled: true, autoAllowBashIfSandboxed: true },
+          thinkingLevel, // Pass thinking level for extended thinking
+        });
+
+        const promptGenerator = (async function* () {
+          yield {
+            type: 'user' as const,
+            session_id: '',
+            message: { role: 'user' as const, content: promptContent },
+            parent_tool_use_id: null,
+          };
+        })();
+
+        const stream = query({ prompt: promptGenerator, options: sdkOptions });
+
+        // Extract the description from the response
+        description = await extractTextFromStream(stream);
+      }
 
       if (!description || description.trim().length === 0) {
         logger.warn('Received empty response from Claude');

apps/server/src/routes/context/routes/describe-image.ts

@@ -12,18 +12,16 @@
  */
 
 import type { Request, Response } from 'express';
+import { query } from '@anthropic-ai/claude-agent-sdk';
 import { createLogger, readImageAsBase64 } from '@automaker/utils';
-import { isCursorModel } from '@automaker/types';
+import { DEFAULT_PHASE_MODELS, isCursorModel } from '@automaker/types';
 import { resolvePhaseModel } from '@automaker/model-resolver';
-import { simpleQuery } from '../../../providers/simple-query-service.js';
+import { createCustomOptions } from '../../../lib/sdk-options.js';
+import { ProviderFactory } from '../../../providers/provider-factory.js';
 import * as secureFs from '../../../lib/secure-fs.js';
 import * as path from 'path';
 import type { SettingsService } from '../../../services/settings-service.js';
-import {
-  getAutoLoadClaudeMdSetting,
-  getPromptCustomization,
-  getPhaseModelWithOverrides,
-} from '../../../lib/settings-helpers.js';
+import { getAutoLoadClaudeMdSetting } from '../../../lib/settings-helpers.js';
 
 const logger = createLogger('DescribeImage');
 
@@ -180,10 +178,57 @@ function mapDescribeImageError(rawMessage: string | undefined): {
   return baseResponse;
 }
 
+/**
+ * Extract text content from Claude SDK response messages and log high-signal stream events.
+ */
+async function extractTextFromStream(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  stream: AsyncIterable<any>,
+  requestId: string
+): Promise<string> {
+  let responseText = '';
+  let messageCount = 0;
+
+  logger.info(`[${requestId}] [Stream] Begin reading SDK stream...`);
+
+  for await (const msg of stream) {
+    messageCount++;
+    const msgType = msg?.type;
+    const msgSubtype = msg?.subtype;
+
+    // Keep this concise but informative. Full error object is logged in catch blocks.
+    logger.info(
+      `[${requestId}] [Stream] #${messageCount} type=${String(msgType)} subtype=${String(msgSubtype ?? '')}`
+    );
+
+    if (msgType === 'assistant' && msg.message?.content) {
+      const blocks = msg.message.content as Array<{ type: string; text?: string }>;
+      logger.info(`[${requestId}] [Stream] assistant blocks=${blocks.length}`);
+      for (const block of blocks) {
+        if (block.type === 'text' && block.text) {
+          responseText += block.text;
+        }
+      }
+    }
+
+    if (msgType === 'result' && msgSubtype === 'success') {
+      if (typeof msg.result === 'string' && msg.result.length > 0) {
+        responseText = msg.result;
+      }
+    }
+  }
+
+  logger.info(
+    `[${requestId}] [Stream] End of stream. messages=${messageCount} textLength=${responseText.length}`
+  );
+
+  return responseText;
+}
+
 /**
  * Create the describe-image request handler
  *
- * Uses the provider abstraction with multi-part content blocks to include the image (base64),
+ * Uses Claude SDK query with multi-part content blocks to include the image (base64),
  * matching the agent runner behavior.
  *
  * @param settingsService - Optional settings service for loading autoLoadClaudeMd setting
@@ -264,6 +309,27 @@ export function createDescribeImageHandler(
         `[${requestId}] image meta filename=${imageData.filename} mime=${imageData.mimeType} base64Len=${base64Length} estBytes=${estimatedBytes}`
       );
 
+      // Build multi-part prompt with image block (no Read tool required)
+      const instructionText =
+        `Describe this image in 1-2 sentences suitable for use as context in an AI coding assistant. ` +
+        `Focus on what the image shows and its purpose (e.g., "UI mockup showing login form with email/password fields", ` +
+        `"Architecture diagram of microservices", "Screenshot of error message in terminal").\n\n` +
+        `Respond with ONLY the description text, no additional formatting, preamble, or explanation.`;
+
+      const promptContent = [
+        { type: 'text' as const, text: instructionText },
+        {
+          type: 'image' as const,
+          source: {
+            type: 'base64' as const,
+            media_type: imageData.mimeType,
+            data: imageData.base64,
+          },
+        },
+      ];
+
+      logger.info(`[${requestId}] Built multi-part prompt blocks=${promptContent.length}`);
+
       const cwd = path.dirname(actualPath);
       logger.info(`[${requestId}] Using cwd=${cwd}`);
 
@@ -274,78 +340,92 @@ export function createDescribeImageHandler(
         '[DescribeImage]'
       );
 
-      // Get model from phase settings with provider info
-      const {
-        phaseModel: phaseModelEntry,
-        provider,
-        credentials,
-      } = await getPhaseModelWithOverrides(
-        'imageDescriptionModel',
-        settingsService,
-        cwd,
-        '[DescribeImage]'
-      );
+      // Get model from phase settings
+      const settings = await settingsService?.getGlobalSettings();
+      const phaseModelEntry =
+        settings?.phaseModels?.imageDescriptionModel || DEFAULT_PHASE_MODELS.imageDescriptionModel;
       const { model, thinkingLevel } = resolvePhaseModel(phaseModelEntry);
 
-      logger.info(
-        `[${requestId}] Using model: ${model}`,
-        provider ? `via provider: ${provider.name}` : 'direct API'
-      );
+      logger.info(`[${requestId}] Using model: ${model}`);
 
-      // Get customized prompts from settings
-      const prompts = await getPromptCustomization(settingsService, '[DescribeImage]');
-
-      // Build the instruction text from centralized prompts
-      const instructionText = prompts.contextDescription.describeImagePrompt;
-
-      // Build prompt based on provider capability
-      // Some providers (like Cursor) may not support image content blocks
-      let prompt: string | Array<{ type: string; text?: string; source?: object }>;
+      let description: string;
 
+      // Route to appropriate provider based on model type
       if (isCursorModel(model)) {
-        // Cursor may not support base64 image blocks directly
-        // Use text prompt with image path reference
-        logger.info(`[${requestId}] Using text prompt for Cursor model`);
-        prompt = `${instructionText}\n\nImage file: ${actualPath}\nMIME type: ${imageData.mimeType}`;
+        // Use Cursor provider for Cursor models
+        // Note: Cursor may have limited support for image content blocks
+        logger.info(`[${requestId}] Using Cursor provider for model: ${model}`);
+
+        const provider = ProviderFactory.getProviderForModel(model);
+
+        // Build prompt with image reference for Cursor
+        // Note: Cursor CLI may not support base64 image blocks directly,
+        // so we include the image path as context
+        const cursorPrompt = `${instructionText}\n\nImage file: ${actualPath}\nMIME type: ${imageData.mimeType}`;
+
+        let responseText = '';
+        const queryStart = Date.now();
+        for await (const msg of provider.executeQuery({
+          prompt: cursorPrompt,
+          model,
+          cwd,
+          maxTurns: 1,
+          allowedTools: ['Read'], // Allow Read tool so Cursor can read the image if needed
+          readOnly: true, // Image description only reads, doesn't write
+        })) {
+          if (msg.type === 'assistant' && msg.message?.content) {
+            for (const block of msg.message.content) {
+              if (block.type === 'text' && block.text) {
+                responseText += block.text;
+              }
+            }
+          }
+        }
+        logger.info(`[${requestId}] Cursor query completed in ${Date.now() - queryStart}ms`);
+        description = responseText;
       } else {
-        // Claude and other vision-capable models support multi-part prompts with images
-        logger.info(`[${requestId}] Using multi-part prompt with image block`);
-        prompt = [
-          { type: 'text', text: instructionText },
-          {
-            type: 'image',
-            source: {
-              type: 'base64',
-              media_type: imageData.mimeType,
-              data: imageData.base64,
-            },
-          },
-        ];
+        // Use Claude SDK for Claude models (supports image content blocks)
+        logger.info(`[${requestId}] Using Claude SDK for model: ${model}`);
+
+        // Use the same centralized option builder used across the server (validates cwd)
+        const sdkOptions = createCustomOptions({
+          cwd,
+          model,
+          maxTurns: 1,
+          allowedTools: [],
+          autoLoadClaudeMd,
+          sandbox: { enabled: true, autoAllowBashIfSandboxed: true },
+          thinkingLevel, // Pass thinking level for extended thinking
+        });
+
+        logger.info(
+          `[${requestId}] SDK options model=${sdkOptions.model} maxTurns=${sdkOptions.maxTurns} allowedTools=${JSON.stringify(
+            sdkOptions.allowedTools
+          )} sandbox=${JSON.stringify(sdkOptions.sandbox)}`
+        );
+
+        const promptGenerator = (async function* () {
+          yield {
+            type: 'user' as const,
+            session_id: '',
+            message: { role: 'user' as const, content: promptContent },
+            parent_tool_use_id: null,
+          };
+        })();
+
+        logger.info(`[${requestId}] Calling query()...`);
+        const queryStart = Date.now();
+        const stream = query({ prompt: promptGenerator, options: sdkOptions });
+        logger.info(`[${requestId}] query() returned stream in ${Date.now() - queryStart}ms`);
+
+        // Extract the description from the response
+        const extractStart = Date.now();
+        description = await extractTextFromStream(stream, requestId);
+        logger.info(`[${requestId}] extractMs=${Date.now() - extractStart}`);
       }
 
-      logger.info(`[${requestId}] Calling simpleQuery...`);
-      const queryStart = Date.now();
-
-      // Use simpleQuery - provider abstraction handles routing
-      const result = await simpleQuery({
-        prompt,
-        model,
-        cwd,
-        maxTurns: 1,
-        allowedTools: isCursorModel(model) ? ['Read'] : [], // Allow Read for Cursor to read image if needed
-        thinkingLevel,
-        readOnly: true, // Image description only reads, doesn't write
-        settingSources: autoLoadClaudeMd ? ['user', 'project', 'local'] : undefined,
-        claudeCompatibleProvider: provider, // Pass provider for alternative endpoint configuration
-        credentials, // Pass credentials for resolving 'credentials' apiKeySource
-      });
-
-      logger.info(`[${requestId}] simpleQuery completed in ${Date.now() - queryStart}ms`);
-
-      const description = result.text;
-
       if (!description || description.trim().length === 0) {
-        logger.warn(`[${requestId}] Received empty response from AI`);
+        logger.warn(`[${requestId}] Received empty response from Claude`);
         const response: DescribeImageErrorResponse = {
           success: false,
           error: 'Failed to generate description - empty response',

apps/server/src/routes/enhance-prompt/routes/enhance.ts

@@ -1,18 +1,23 @@
 /**
  * POST /enhance-prompt endpoint - Enhance user input text
  *
- * Uses the provider abstraction to enhance text based on the specified
- * enhancement mode. Works with any configured provider (Claude, Cursor, etc.).
- * Supports modes: improve, technical, simplify, acceptance, ux-reviewer
+ * Uses Claude AI or Cursor to enhance text based on the specified enhancement mode.
+ * Supports modes: improve, technical, simplify, acceptance
  */
 
 import type { Request, Response } from 'express';
+import { query } from '@anthropic-ai/claude-agent-sdk';
 import { createLogger } from '@automaker/utils';
 import { resolveModelString } from '@automaker/model-resolver';
-import { CLAUDE_MODEL_MAP, type ThinkingLevel } from '@automaker/types';
-import { simpleQuery } from '../../../providers/simple-query-service.js';
+import {
+  CLAUDE_MODEL_MAP,
+  isCursorModel,
+  ThinkingLevel,
+  getThinkingTokenBudget,
+} from '@automaker/types';
+import { ProviderFactory } from '../../../providers/provider-factory.js';
 import type { SettingsService } from '../../../services/settings-service.js';
-import { getPromptCustomization, getProviderByModelId } from '../../../lib/settings-helpers.js';
+import { getPromptCustomization } from '../../../lib/settings-helpers.js';
 import {
   buildUserPrompt,
   isValidEnhancementMode,
@@ -31,10 +36,8 @@ interface EnhanceRequestBody {
   enhancementMode: string;
   /** Optional model override */
   model?: string;
-  /** Optional thinking level for Claude models */
+  /** Optional thinking level for Claude models (ignored for Cursor models) */
   thinkingLevel?: ThinkingLevel;
-  /** Optional project path for per-project Claude API profile */
-  projectPath?: string;
 }
 
 /**
@@ -53,6 +56,74 @@ interface EnhanceErrorResponse {
   error: string;
 }
 
+/**
+ * Extract text content from Claude SDK response messages
+ *
+ * @param stream - The async iterable from the query function
+ * @returns The extracted text content
+ */
+async function extractTextFromStream(
+  stream: AsyncIterable<{
+    type: string;
+    subtype?: string;
+    result?: string;
+    message?: {
+      content?: Array<{ type: string; text?: string }>;
+    };
+  }>
+): Promise<string> {
+  let responseText = '';
+
+  for await (const msg of stream) {
+    if (msg.type === 'assistant' && msg.message?.content) {
+      for (const block of msg.message.content) {
+        if (block.type === 'text' && block.text) {
+          responseText += block.text;
+        }
+      }
+    } else if (msg.type === 'result' && msg.subtype === 'success') {
+      responseText = msg.result || responseText;
+    }
+  }
+
+  return responseText;
+}
+
+/**
+ * Execute enhancement using Cursor provider
+ *
+ * @param prompt - The enhancement prompt
+ * @param model - The Cursor model to use
+ * @returns The enhanced text
+ */
+async function executeWithCursor(prompt: string, model: string): Promise<string> {
+  const provider = ProviderFactory.getProviderForModel(model);
+
+  let responseText = '';
+
+  for await (const msg of provider.executeQuery({
+    prompt,
+    model,
+    cwd: process.cwd(), // Enhancement doesn't need a specific working directory
+    readOnly: true, // Prompt enhancement only generates text, doesn't write files
+  })) {
+    if (msg.type === 'assistant' && msg.message?.content) {
+      for (const block of msg.message.content) {
+        if (block.type === 'text' && block.text) {
+          responseText += block.text;
+        }
+      }
+    } else if (msg.type === 'result' && msg.subtype === 'success' && msg.result) {
+      // Use result if it's a final accumulated message
+      if (msg.result.length > responseText.length) {
+        responseText = msg.result;
+      }
+    }
+  }
+
+  return responseText;
+}
+
 /**
  * Create the enhance request handler
  *
@@ -64,7 +135,7 @@ export function createEnhanceHandler(
 ): (req: Request, res: Response) => Promise<void> {
   return async (req: Request, res: Response): Promise<void> => {
     try {
-      const { originalText, enhancementMode, model, thinkingLevel, projectPath } =
+      const { originalText, enhancementMode, model, thinkingLevel } =
         req.body as EnhanceRequestBody;
 
       // Validate required fields
@@ -114,60 +185,54 @@ export function createEnhanceHandler(
         technical: prompts.enhancement.technicalSystemPrompt,
         simplify: prompts.enhancement.simplifySystemPrompt,
         acceptance: prompts.enhancement.acceptanceSystemPrompt,
-        'ux-reviewer': prompts.enhancement.uxReviewerSystemPrompt,
       };
       const systemPrompt = systemPromptMap[validMode];
 
       logger.debug(`Using ${validMode} system prompt (length: ${systemPrompt.length} chars)`);
 
       // Build the user prompt with few-shot examples
+      // This helps the model understand this is text transformation, not a coding task
       const userPrompt = buildUserPrompt(validMode, trimmedText, true);
 
-      // Check if the model is a provider model (like "GLM-4.5-Air")
-      // If so, get the provider config and resolved Claude model
-      let claudeCompatibleProvider: import('@automaker/types').ClaudeCompatibleProvider | undefined;
-      let providerResolvedModel: string | undefined;
-      let credentials = await settingsService?.getCredentials();
-
-      if (model && settingsService) {
-        const providerResult = await getProviderByModelId(
-          model,
-          settingsService,
-          '[EnhancePrompt]'
-        );
-        if (providerResult.provider) {
-          claudeCompatibleProvider = providerResult.provider;
-          providerResolvedModel = providerResult.resolvedModel;
-          credentials = providerResult.credentials;
-          logger.info(
-            `Using provider "${providerResult.provider.name}" for model "${model}"` +
-              (providerResolvedModel ? ` -> resolved to "${providerResolvedModel}"` : '')
-          );
-        }
-      }
-
-      // Resolve the model - use provider resolved model, passed model, or default to sonnet
-      const resolvedModel =
-        providerResolvedModel || resolveModelString(model, CLAUDE_MODEL_MAP.sonnet);
+      // Resolve the model - use the passed model, default to sonnet for quality
+      const resolvedModel = resolveModelString(model, CLAUDE_MODEL_MAP.sonnet);
 
       logger.debug(`Using model: ${resolvedModel}`);
 
-      // Use simpleQuery - provider abstraction handles routing to correct provider
-      // The system prompt is combined with user prompt since some providers
-      // don't have a separate system prompt concept
-      const result = await simpleQuery({
-        prompt: `${systemPrompt}\n\n${userPrompt}`,
-        model: resolvedModel,
-        cwd: process.cwd(), // Enhancement doesn't need a specific working directory
-        maxTurns: 1,
-        allowedTools: [],
-        thinkingLevel,
-        readOnly: true, // Prompt enhancement only generates text, doesn't write files
-        credentials, // Pass credentials for resolving 'credentials' apiKeySource
-        claudeCompatibleProvider, // Pass provider for alternative endpoint configuration
-      });
+      let enhancedText: string;
 
-      const enhancedText = result.text;
+      // Route to appropriate provider based on model
+      if (isCursorModel(resolvedModel)) {
+        // Use Cursor provider for Cursor models
+        logger.info(`Using Cursor provider for model: ${resolvedModel}`);
+
+        // Cursor doesn't have a separate system prompt concept, so combine them
+        const combinedPrompt = `${systemPrompt}\n\n${userPrompt}`;
+        enhancedText = await executeWithCursor(combinedPrompt, resolvedModel);
+      } else {
+        // Use Claude SDK for Claude models
+        logger.info(`Using Claude provider for model: ${resolvedModel}`);
+
+        // Convert thinkingLevel to maxThinkingTokens for SDK
+        const maxThinkingTokens = getThinkingTokenBudget(thinkingLevel);
+        const queryOptions: Parameters<typeof query>[0]['options'] = {
+          model: resolvedModel,
+          systemPrompt,
+          maxTurns: 1,
+          allowedTools: [],
+          permissionMode: 'acceptEdits',
+        };
+        if (maxThinkingTokens) {
+          queryOptions.maxThinkingTokens = maxThinkingTokens;
+        }
+
+        const stream = query({
+          prompt: userPrompt,
+          options: queryOptions,
+        });
+
+        enhancedText = await extractTextFromStream(stream);
+      }
 
       if (!enhancedText || enhancedText.trim().length === 0) {
         logger.warn('Received empty response from AI');

apps/server/src/routes/event-history/common.ts

@@ -1,19 +0,0 @@
-/**
- * Common utilities for event history routes
- */
-
-import { createLogger } from '@automaker/utils';
-import { getErrorMessage as getErrorMessageShared, createLogError } from '../common.js';
-
-/** Logger instance for event history operations */
-export const logger = createLogger('EventHistory');
-
-/**
- * Extract user-friendly error message from error objects
- */
-export { getErrorMessageShared as getErrorMessage };
-
-/**
- * Log error with automatic logger binding
- */
-export const logError = createLogError(logger);

apps/server/src/routes/event-history/index.ts

@@ -1,68 +0,0 @@
-/**
- * Event History routes - HTTP API for event history management
- *
- * Provides endpoints for:
- * - Listing events with filtering
- * - Getting individual event details
- * - Deleting events
- * - Clearing all events
- * - Replaying events to test hooks
- *
- * Mounted at /api/event-history in the main server.
- */
-
-import { Router } from 'express';
-import type { EventHistoryService } from '../../services/event-history-service.js';
-import type { SettingsService } from '../../services/settings-service.js';
-import { validatePathParams } from '../../middleware/validate-paths.js';
-import { createListHandler } from './routes/list.js';
-import { createGetHandler } from './routes/get.js';
-import { createDeleteHandler } from './routes/delete.js';
-import { createClearHandler } from './routes/clear.js';
-import { createReplayHandler } from './routes/replay.js';
-
-/**
- * Create event history router with all endpoints
- *
- * Endpoints:
- * - POST /list - List events with optional filtering
- * - POST /get - Get a single event by ID
- * - POST /delete - Delete an event by ID
- * - POST /clear - Clear all events for a project
- * - POST /replay - Replay an event to trigger hooks
- *
- * @param eventHistoryService - Instance of EventHistoryService
- * @param settingsService - Instance of SettingsService (for replay)
- * @returns Express Router configured with all event history endpoints
- */
-export function createEventHistoryRoutes(
-  eventHistoryService: EventHistoryService,
-  settingsService: SettingsService
-): Router {
-  const router = Router();
-
-  // List events with filtering
-  router.post('/list', validatePathParams('projectPath'), createListHandler(eventHistoryService));
-
-  // Get single event
-  router.post('/get', validatePathParams('projectPath'), createGetHandler(eventHistoryService));
-
-  // Delete event
-  router.post(
-    '/delete',
-    validatePathParams('projectPath'),
-    createDeleteHandler(eventHistoryService)
-  );
-
-  // Clear all events
-  router.post('/clear', validatePathParams('projectPath'), createClearHandler(eventHistoryService));
-
-  // Replay event
-  router.post(
-    '/replay',
-    validatePathParams('projectPath'),
-    createReplayHandler(eventHistoryService, settingsService)
-  );
-
-  return router;
-}

apps/server/src/routes/event-history/routes/clear.ts

@@ -1,33 +0,0 @@
-/**
- * POST /api/event-history/clear - Clear all events for a project
- *
- * Request body: { projectPath: string }
- * Response: { success: true, cleared: number }
- */
-
-import type { Request, Response } from 'express';
-import type { EventHistoryService } from '../../../services/event-history-service.js';
-import { getErrorMessage, logError } from '../common.js';
-
-export function createClearHandler(eventHistoryService: EventHistoryService) {
-  return async (req: Request, res: Response): Promise<void> => {
-    try {
-      const { projectPath } = req.body as { projectPath: string };
-
-      if (!projectPath || typeof projectPath !== 'string') {
-        res.status(400).json({ success: false, error: 'projectPath is required' });
-        return;
-      }
-
-      const cleared = await eventHistoryService.clearEvents(projectPath);
-
-      res.json({
-        success: true,
-        cleared,
-      });
-    } catch (error) {
-      logError(error, 'Clear events failed');
-      res.status(500).json({ success: false, error: getErrorMessage(error) });
-    }
-  };
-}

apps/server/src/routes/event-history/routes/delete.ts

@@ -1,43 +0,0 @@
-/**
- * POST /api/event-history/delete - Delete an event by ID
- *
- * Request body: { projectPath: string, eventId: string }
- * Response: { success: true } or { success: false, error: string }
- */
-
-import type { Request, Response } from 'express';
-import type { EventHistoryService } from '../../../services/event-history-service.js';
-import { getErrorMessage, logError } from '../common.js';
-
-export function createDeleteHandler(eventHistoryService: EventHistoryService) {
-  return async (req: Request, res: Response): Promise<void> => {
-    try {
-      const { projectPath, eventId } = req.body as {
-        projectPath: string;
-        eventId: string;
-      };
-
-      if (!projectPath || typeof projectPath !== 'string') {
-        res.status(400).json({ success: false, error: 'projectPath is required' });
-        return;
-      }
-
-      if (!eventId || typeof eventId !== 'string') {
-        res.status(400).json({ success: false, error: 'eventId is required' });
-        return;
-      }
-
-      const deleted = await eventHistoryService.deleteEvent(projectPath, eventId);
-
-      if (!deleted) {
-        res.status(404).json({ success: false, error: 'Event not found' });
-        return;
-      }
-
-      res.json({ success: true });
-    } catch (error) {
-      logError(error, 'Delete event failed');
-      res.status(500).json({ success: false, error: getErrorMessage(error) });
-    }
-  };
-}

apps/server/src/routes/event-history/routes/get.ts

@@ -1,46 +0,0 @@
-/**
- * POST /api/event-history/get - Get a single event by ID
- *
- * Request body: { projectPath: string, eventId: string }
- * Response: { success: true, event: StoredEvent } or { success: false, error: string }
- */
-
-import type { Request, Response } from 'express';
-import type { EventHistoryService } from '../../../services/event-history-service.js';
-import { getErrorMessage, logError } from '../common.js';
-
-export function createGetHandler(eventHistoryService: EventHistoryService) {
-  return async (req: Request, res: Response): Promise<void> => {
-    try {
-      const { projectPath, eventId } = req.body as {
-        projectPath: string;
-        eventId: string;
-      };
-
-      if (!projectPath || typeof projectPath !== 'string') {
-        res.status(400).json({ success: false, error: 'projectPath is required' });
-        return;
-      }
-
-      if (!eventId || typeof eventId !== 'string') {
-        res.status(400).json({ success: false, error: 'eventId is required' });
-        return;
-      }
-
-      const event = await eventHistoryService.getEvent(projectPath, eventId);
-
-      if (!event) {
-        res.status(404).json({ success: false, error: 'Event not found' });
-        return;
-      }
-
-      res.json({
-        success: true,
-        event,
-      });
-    } catch (error) {
-      logError(error, 'Get event failed');
-      res.status(500).json({ success: false, error: getErrorMessage(error) });
-    }
-  };
-}

apps/server/src/routes/event-history/routes/list.ts

@@ -1,53 +0,0 @@
-/**
- * POST /api/event-history/list - List events for a project
- *
- * Request body: {
- *   projectPath: string,
- *   filter?: {
- *     trigger?: EventHookTrigger,
- *     featureId?: string,
- *     since?: string,
- *     until?: string,
- *     limit?: number,
- *     offset?: number
- *   }
- * }
- * Response: { success: true, events: StoredEventSummary[], total: number }
- */
-
-import type { Request, Response } from 'express';
-import type { EventHistoryService } from '../../../services/event-history-service.js';
-import type { EventHistoryFilter } from '@automaker/types';
-import { getErrorMessage, logError } from '../common.js';
-
-export function createListHandler(eventHistoryService: EventHistoryService) {
-  return async (req: Request, res: Response): Promise<void> => {
-    try {
-      const { projectPath, filter } = req.body as {
-        projectPath: string;
-        filter?: EventHistoryFilter;
-      };
-
-      if (!projectPath || typeof projectPath !== 'string') {
-        res.status(400).json({ success: false, error: 'projectPath is required' });
-        return;
-      }
-
-      const events = await eventHistoryService.getEvents(projectPath, filter);
-      const total = await eventHistoryService.getEventCount(projectPath, {
-        ...filter,
-        limit: undefined,
-        offset: undefined,
-      });
-
-      res.json({
-        success: true,
-        events,
-        total,
-      });
-    } catch (error) {
-      logError(error, 'List events failed');
-      res.status(500).json({ success: false, error: getErrorMessage(error) });
-    }
-  };
-}

apps/server/src/routes/event-history/routes/replay.ts

@@ -1,234 +0,0 @@
-/**
- * POST /api/event-history/replay - Replay an event to trigger hooks
- *
- * Request body: {
- *   projectPath: string,
- *   eventId: string,
- *   hookIds?: string[]  // Optional: specific hooks to run (if not provided, runs all enabled matching hooks)
- * }
- * Response: { success: true, result: EventReplayResult }
- */
-
-import type { Request, Response } from 'express';
-import type { EventHistoryService } from '../../../services/event-history-service.js';
-import type { SettingsService } from '../../../services/settings-service.js';
-import type { EventReplayResult, EventReplayHookResult, EventHook } from '@automaker/types';
-import { exec } from 'child_process';
-import { promisify } from 'util';
-import { getErrorMessage, logError, logger } from '../common.js';
-
-const execAsync = promisify(exec);
-
-/** Default timeout for shell commands (30 seconds) */
-const DEFAULT_SHELL_TIMEOUT = 30000;
-
-/** Default timeout for HTTP requests (10 seconds) */
-const DEFAULT_HTTP_TIMEOUT = 10000;
-
-interface HookContext {
-  featureId?: string;
-  featureName?: string;
-  projectPath?: string;
-  projectName?: string;
-  error?: string;
-  errorType?: string;
-  timestamp: string;
-  eventType: string;
-}
-
-/**
- * Substitute {{variable}} placeholders in a string
- */
-function substituteVariables(template: string, context: HookContext): string {
-  return template.replace(/\{\{(\w+)\}\}/g, (match, variable) => {
-    const value = context[variable as keyof HookContext];
-    if (value === undefined || value === null) {
-      return '';
-    }
-    return String(value);
-  });
-}
-
-/**
- * Execute a single hook and return the result
- */
-async function executeHook(hook: EventHook, context: HookContext): Promise<EventReplayHookResult> {
-  const hookName = hook.name || hook.id;
-  const startTime = Date.now();
-
-  try {
-    if (hook.action.type === 'shell') {
-      const command = substituteVariables(hook.action.command, context);
-      const timeout = hook.action.timeout || DEFAULT_SHELL_TIMEOUT;
-
-      logger.info(`Replaying shell hook "${hookName}": ${command}`);
-
-      await execAsync(command, {
-        timeout,
-        maxBuffer: 1024 * 1024,
-      });
-
-      return {
-        hookId: hook.id,
-        hookName: hook.name,
-        success: true,
-        durationMs: Date.now() - startTime,
-      };
-    } else if (hook.action.type === 'http') {
-      const url = substituteVariables(hook.action.url, context);
-      const method = hook.action.method || 'POST';
-
-      const headers: Record<string, string> = {
-        'Content-Type': 'application/json',
-      };
-      if (hook.action.headers) {
-        for (const [key, value] of Object.entries(hook.action.headers)) {
-          headers[key] = substituteVariables(value, context);
-        }
-      }
-
-      let body: string | undefined;
-      if (hook.action.body) {
-        body = substituteVariables(hook.action.body, context);
-      } else if (method !== 'GET') {
-        body = JSON.stringify({
-          eventType: context.eventType,
-          timestamp: context.timestamp,
-          featureId: context.featureId,
-          projectPath: context.projectPath,
-          projectName: context.projectName,
-          error: context.error,
-        });
-      }
-
-      logger.info(`Replaying HTTP hook "${hookName}": ${method} ${url}`);
-
-      const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), DEFAULT_HTTP_TIMEOUT);
-
-      const response = await fetch(url, {
-        method,
-        headers,
-        body: method !== 'GET' ? body : undefined,
-        signal: controller.signal,
-      });
-
-      clearTimeout(timeoutId);
-
-      if (!response.ok) {
-        return {
-          hookId: hook.id,
-          hookName: hook.name,
-          success: false,
-          error: `HTTP ${response.status}: ${response.statusText}`,
-          durationMs: Date.now() - startTime,
-        };
-      }
-
-      return {
-        hookId: hook.id,
-        hookName: hook.name,
-        success: true,
-        durationMs: Date.now() - startTime,
-      };
-    }
-
-    return {
-      hookId: hook.id,
-      hookName: hook.name,
-      success: false,
-      error: 'Unknown hook action type',
-      durationMs: Date.now() - startTime,
-    };
-  } catch (error) {
-    const errorMessage =
-      error instanceof Error
-        ? error.name === 'AbortError'
-          ? 'Request timed out'
-          : error.message
-        : String(error);
-
-    return {
-      hookId: hook.id,
-      hookName: hook.name,
-      success: false,
-      error: errorMessage,
-      durationMs: Date.now() - startTime,
-    };
-  }
-}
-
-export function createReplayHandler(
-  eventHistoryService: EventHistoryService,
-  settingsService: SettingsService
-) {
-  return async (req: Request, res: Response): Promise<void> => {
-    try {
-      const { projectPath, eventId, hookIds } = req.body as {
-        projectPath: string;
-        eventId: string;
-        hookIds?: string[];
-      };
-
-      if (!projectPath || typeof projectPath !== 'string') {
-        res.status(400).json({ success: false, error: 'projectPath is required' });
-        return;
-      }
-
-      if (!eventId || typeof eventId !== 'string') {
-        res.status(400).json({ success: false, error: 'eventId is required' });
-        return;
-      }
-
-      // Get the event
-      const event = await eventHistoryService.getEvent(projectPath, eventId);
-      if (!event) {
-        res.status(404).json({ success: false, error: 'Event not found' });
-        return;
-      }
-
-      // Get hooks from settings
-      const settings = await settingsService.getGlobalSettings();
-      let hooks = settings.eventHooks || [];
-
-      // Filter to matching trigger and enabled hooks
-      hooks = hooks.filter((h) => h.enabled && h.trigger === event.trigger);
-
-      // If specific hook IDs requested, filter to those
-      if (hookIds && hookIds.length > 0) {
-        hooks = hooks.filter((h) => hookIds.includes(h.id));
-      }
-
-      // Build context for variable substitution
-      const context: HookContext = {
-        featureId: event.featureId,
-        featureName: event.featureName,
-        projectPath: event.projectPath,
-        projectName: event.projectName,
-        error: event.error,
-        errorType: event.errorType,
-        timestamp: event.timestamp,
-        eventType: event.trigger,
-      };
-
-      // Execute all hooks in parallel
-      const hookResults = await Promise.all(hooks.map((hook) => executeHook(hook, context)));
-
-      const result: EventReplayResult = {
-        eventId,
-        hooksTriggered: hooks.length,
-        hookResults,
-      };
-
-      logger.info(`Replayed event ${eventId}: ${hooks.length} hooks triggered`);
-
-      res.json({
-        success: true,
-        result,
-      });
-    } catch (error) {
-      logError(error, 'Replay event failed');
-      res.status(500).json({ success: false, error: getErrorMessage(error) });
-    }
-  };
-}

apps/server/src/routes/features/index.ts

@@ -4,48 +4,26 @@
 
 import { Router } from 'express';
 import { FeatureLoader } from '../../services/feature-loader.js';
-import type { SettingsService } from '../../services/settings-service.js';
-import type { EventEmitter } from '../../lib/events.js';
 import { validatePathParams } from '../../middleware/validate-paths.js';
 import { createListHandler } from './routes/list.js';
 import { createGetHandler } from './routes/get.js';
 import { createCreateHandler } from './routes/create.js';
 import { createUpdateHandler } from './routes/update.js';
-import { createBulkUpdateHandler } from './routes/bulk-update.js';
-import { createBulkDeleteHandler } from './routes/bulk-delete.js';
 import { createDeleteHandler } from './routes/delete.js';
 import { createAgentOutputHandler, createRawOutputHandler } from './routes/agent-output.js';
 import { createGenerateTitleHandler } from './routes/generate-title.js';
 
-export function createFeaturesRoutes(
-  featureLoader: FeatureLoader,
-  settingsService?: SettingsService,
-  events?: EventEmitter
-): Router {
+export function createFeaturesRoutes(featureLoader: FeatureLoader): Router {
   const router = Router();
 
   router.post('/list', validatePathParams('projectPath'), createListHandler(featureLoader));
   router.post('/get', validatePathParams('projectPath'), createGetHandler(featureLoader));
-  router.post(
-    '/create',
-    validatePathParams('projectPath'),
-    createCreateHandler(featureLoader, events)
-  );
+  router.post('/create', validatePathParams('projectPath'), createCreateHandler(featureLoader));
   router.post('/update', validatePathParams('projectPath'), createUpdateHandler(featureLoader));
-  router.post(
-    '/bulk-update',
-    validatePathParams('projectPath'),
-    createBulkUpdateHandler(featureLoader)
-  );
-  router.post(
-    '/bulk-delete',
-    validatePathParams('projectPath'),
-    createBulkDeleteHandler(featureLoader)
-  );
   router.post('/delete', validatePathParams('projectPath'), createDeleteHandler(featureLoader));
   router.post('/agent-output', createAgentOutputHandler(featureLoader));
   router.post('/raw-output', createRawOutputHandler(featureLoader));
-  router.post('/generate-title', createGenerateTitleHandler(settingsService));
+  router.post('/generate-title', createGenerateTitleHandler());
 
   return router;
 }

apps/server/src/routes/features/routes/bulk-delete.ts

@@ -1,69 +0,0 @@
-/**
- * POST /bulk-delete endpoint - Delete multiple features at once
- */
-
-import type { Request, Response } from 'express';
-import { FeatureLoader } from '../../../services/feature-loader.js';
-import { getErrorMessage, logError } from '../common.js';
-
-interface BulkDeleteRequest {
-  projectPath: string;
-  featureIds: string[];
-}
-
-interface BulkDeleteResult {
-  featureId: string;
-  success: boolean;
-  error?: string;
-}
-
-export function createBulkDeleteHandler(featureLoader: FeatureLoader) {
-  return async (req: Request, res: Response): Promise<void> => {
-    try {
-      const { projectPath, featureIds } = req.body as BulkDeleteRequest;
-
-      if (!projectPath || !featureIds || !Array.isArray(featureIds) || featureIds.length === 0) {
-        res.status(400).json({
-          success: false,
-          error: 'projectPath and featureIds (non-empty array) are required',
-        });
-        return;
-      }
-
-      // Process in parallel batches of 20 for efficiency
-      const BATCH_SIZE = 20;
-      const results: BulkDeleteResult[] = [];
-
-      for (let i = 0; i < featureIds.length; i += BATCH_SIZE) {
-        const batch = featureIds.slice(i, i + BATCH_SIZE);
-        const batchResults = await Promise.all(
-          batch.map(async (featureId) => {
-            const success = await featureLoader.delete(projectPath, featureId);
-            if (success) {
-              return { featureId, success: true };
-            }
-            return {
-              featureId,
-              success: false,
-              error: 'Deletion failed. Check server logs for details.',
-            };
-          })
-        );
-        results.push(...batchResults);
-      }
-
-      const successCount = results.reduce((count, r) => count + (r.success ? 1 : 0), 0);
-      const failureCount = results.length - successCount;
-
-      res.json({
-        success: failureCount === 0,
-        deletedCount: successCount,
-        failedCount: failureCount,
-        results,
-      });
-    } catch (error) {
-      logError(error, 'Bulk delete features failed');
-      res.status(500).json({ success: false, error: getErrorMessage(error) });
-    }
-  };
-}

apps/server/src/routes/features/routes/bulk-update.ts

@@ -1,94 +0,0 @@
-/**
- * POST /bulk-update endpoint - Update multiple features at once
- */
-
-import type { Request, Response } from 'express';
-import { FeatureLoader } from '../../../services/feature-loader.js';
-import type { Feature } from '@automaker/types';
-import { getErrorMessage, logError } from '../common.js';
-
-interface BulkUpdateRequest {
-  projectPath: string;
-  featureIds: string[];
-  updates: Partial<Feature>;
-}
-
-interface BulkUpdateResult {
-  featureId: string;
-  success: boolean;
-  error?: string;
-}
-
-export function createBulkUpdateHandler(featureLoader: FeatureLoader) {
-  return async (req: Request, res: Response): Promise<void> => {
-    try {
-      const { projectPath, featureIds, updates } = req.body as BulkUpdateRequest;
-
-      if (!projectPath || !featureIds || !Array.isArray(featureIds) || featureIds.length === 0) {
-        res.status(400).json({
-          success: false,
-          error: 'projectPath and featureIds (non-empty array) are required',
-        });
-        return;
-      }
-
-      if (!updates || Object.keys(updates).length === 0) {
-        res.status(400).json({
-          success: false,
-          error: 'updates object with at least one field is required',
-        });
-        return;
-      }
-
-      const results: BulkUpdateResult[] = [];
-      const updatedFeatures: Feature[] = [];
-
-      // Process in parallel batches of 20 for efficiency
-      const BATCH_SIZE = 20;
-      for (let i = 0; i < featureIds.length; i += BATCH_SIZE) {
-        const batch = featureIds.slice(i, i + BATCH_SIZE);
-        const batchResults = await Promise.all(
-          batch.map(async (featureId) => {
-            try {
-              const updated = await featureLoader.update(projectPath, featureId, updates);
-              return { featureId, success: true as const, feature: updated };
-            } catch (error) {
-              return {
-                featureId,
-                success: false as const,
-                error: getErrorMessage(error),
-              };
-            }
-          })
-        );
-
-        for (const result of batchResults) {
-          if (result.success) {
-            results.push({ featureId: result.featureId, success: true });
-            updatedFeatures.push(result.feature);
-          } else {
-            results.push({
-              featureId: result.featureId,
-              success: false,
-              error: result.error,
-            });
-          }
-        }
-      }
-
-      const successCount = results.filter((r) => r.success).length;
-      const failureCount = results.filter((r) => !r.success).length;
-
-      res.json({
-        success: failureCount === 0,
-        updatedCount: successCount,
-        failedCount: failureCount,
-        results,
-        features: updatedFeatures,
-      });
-    } catch (error) {
-      logError(error, 'Bulk update features failed');
-      res.status(500).json({ success: false, error: getErrorMessage(error) });
-    }
-  };
-}

apps/server/src/routes/features/routes/create.ts

@@ -4,11 +4,10 @@
 
 import type { Request, Response } from 'express';
 import { FeatureLoader } from '../../../services/feature-loader.js';
-import type { EventEmitter } from '../../../lib/events.js';
 import type { Feature } from '@automaker/types';
 import { getErrorMessage, logError } from '../common.js';
 
-export function createCreateHandler(featureLoader: FeatureLoader, events?: EventEmitter) {
+export function createCreateHandler(featureLoader: FeatureLoader) {
   return async (req: Request, res: Response): Promise<void> => {
     try {
       const { projectPath, feature } = req.body as {
@@ -24,30 +23,7 @@ export function createCreateHandler(featureLoader: FeatureLoader, events?: Event
         return;
       }
 
-      // Check for duplicate title if title is provided
-      if (feature.title && feature.title.trim()) {
-        const duplicate = await featureLoader.findDuplicateTitle(projectPath, feature.title);
-        if (duplicate) {
-          res.status(409).json({
-            success: false,
-            error: `A feature with title "${feature.title}" already exists`,
-            duplicateFeatureId: duplicate.id,
-          });
-          return;
-        }
-      }
-
       const created = await featureLoader.create(projectPath, feature);
-
-      // Emit feature_created event for hooks
-      if (events) {
-        events.emit('feature:created', {
-          featureId: created.id,
-          featureName: created.name,
-          projectPath,
-        });
-      }
-
       res.json({ success: true, feature: created });
     } catch (error) {
       logError(error, 'Create feature failed');

apps/server/src/routes/features/routes/generate-title.ts

@@ -1,22 +1,18 @@
 /**
  * POST /features/generate-title endpoint - Generate a concise title from description
  *
- * Uses the provider abstraction to generate a short, descriptive title
- * from a feature description. Works with any configured provider (Claude, Cursor, etc.).
+ * Uses Claude Haiku to generate a short, descriptive title from feature description.
  */
 
 import type { Request, Response } from 'express';
+import { query } from '@anthropic-ai/claude-agent-sdk';
 import { createLogger } from '@automaker/utils';
 import { CLAUDE_MODEL_MAP } from '@automaker/model-resolver';
-import { simpleQuery } from '../../../providers/simple-query-service.js';
-import type { SettingsService } from '../../../services/settings-service.js';
-import { getPromptCustomization } from '../../../lib/settings-helpers.js';
 
 const logger = createLogger('GenerateTitle');
 
 interface GenerateTitleRequestBody {
   description: string;
-  projectPath?: string;
 }
 
 interface GenerateTitleSuccessResponse {
@@ -29,12 +25,46 @@ interface GenerateTitleErrorResponse {
   error: string;
 }
 
-export function createGenerateTitleHandler(
-  settingsService?: SettingsService
-): (req: Request, res: Response) => Promise<void> {
+const SYSTEM_PROMPT = `You are a title generator. Your task is to create a concise, descriptive title (5-10 words max) for a software feature based on its description.
+
+Rules:
+- Output ONLY the title, nothing else
+- Keep it short and action-oriented (e.g., "Add dark mode toggle", "Fix login validation")
+- Start with a verb when possible (Add, Fix, Update, Implement, Create, etc.)
+- No quotes, periods, or extra formatting
+- Capture the essence of the feature in a scannable way`;
+
+async function extractTextFromStream(
+  stream: AsyncIterable<{
+    type: string;
+    subtype?: string;
+    result?: string;
+    message?: {
+      content?: Array<{ type: string; text?: string }>;
+    };
+  }>
+): Promise<string> {
+  let responseText = '';
+
+  for await (const msg of stream) {
+    if (msg.type === 'assistant' && msg.message?.content) {
+      for (const block of msg.message.content) {
+        if (block.type === 'text' && block.text) {
+          responseText += block.text;
+        }
+      }
+    } else if (msg.type === 'result' && msg.subtype === 'success') {
+      responseText = msg.result || responseText;
+    }
+  }
+
+  return responseText;
+}
+
+export function createGenerateTitleHandler(): (req: Request, res: Response) => Promise<void> {
   return async (req: Request, res: Response): Promise<void> => {
     try {
-      const { description, projectPath } = req.body as GenerateTitleRequestBody;
+      const { description } = req.body as GenerateTitleRequestBody;
 
       if (!description || typeof description !== 'string') {
         const response: GenerateTitleErrorResponse = {
@@ -57,29 +87,23 @@ export function createGenerateTitleHandler(
 
       logger.info(`Generating title for description: ${trimmedDescription.substring(0, 50)}...`);
 
-      // Get customized prompts from settings
-      const prompts = await getPromptCustomization(settingsService, '[GenerateTitle]');
-      const systemPrompt = prompts.titleGeneration.systemPrompt;
-
-      // Get credentials for API calls (uses hardcoded haiku model, no phase setting)
-      const credentials = await settingsService?.getCredentials();
-
       const userPrompt = `Generate a concise title for this feature:\n\n${trimmedDescription}`;
 
-      // Use simpleQuery - provider abstraction handles all the streaming/extraction
-      const result = await simpleQuery({
-        prompt: `${systemPrompt}\n\n${userPrompt}`,
-        model: CLAUDE_MODEL_MAP.haiku,
-        cwd: process.cwd(),
-        maxTurns: 1,
-        allowedTools: [],
-        credentials, // Pass credentials for resolving 'credentials' apiKeySource
+      const stream = query({
+        prompt: userPrompt,
+        options: {
+          model: CLAUDE_MODEL_MAP.haiku,
+          systemPrompt: SYSTEM_PROMPT,
+          maxTurns: 1,
+          allowedTools: [],
+          permissionMode: 'default',
+        },
       });
 
-      const title = result.text;
+      const title = await extractTextFromStream(stream);
 
       if (!title || title.trim().length === 0) {
-        logger.warn('Received empty response from AI');
+        logger.warn('Received empty response from Claude');
         const response: GenerateTitleErrorResponse = {
           success: false,
           error: 'Failed to generate title - empty response',

apps/server/src/routes/features/routes/update.ts

@@ -4,32 +4,16 @@
 
 import type { Request, Response } from 'express';
 import { FeatureLoader } from '../../../services/feature-loader.js';
-import type { Feature, FeatureStatus } from '@automaker/types';
+import type { Feature } from '@automaker/types';
 import { getErrorMessage, logError } from '../common.js';
-import { createLogger } from '@automaker/utils';
-
-const logger = createLogger('features/update');
-
-// Statuses that should trigger syncing to app_spec.txt
-const SYNC_TRIGGER_STATUSES: FeatureStatus[] = ['verified', 'completed'];
 
 export function createUpdateHandler(featureLoader: FeatureLoader) {
   return async (req: Request, res: Response): Promise<void> => {
     try {
-      const {
-        projectPath,
-        featureId,
-        updates,
-        descriptionHistorySource,
-        enhancementMode,
-        preEnhancementDescription,
-      } = req.body as {
+      const { projectPath, featureId, updates } = req.body as {
         projectPath: string;
         featureId: string;
         updates: Partial<Feature>;
-        descriptionHistorySource?: 'enhance' | 'edit';
-        enhancementMode?: 'improve' | 'technical' | 'simplify' | 'acceptance' | 'ux-reviewer';
-        preEnhancementDescription?: string;
       };
 
       if (!projectPath || !featureId || !updates) {
@@ -40,52 +24,7 @@ export function createUpdateHandler(featureLoader: FeatureLoader) {
         return;
       }
 
-      // Check for duplicate title if title is being updated
-      if (updates.title && updates.title.trim()) {
-        const duplicate = await featureLoader.findDuplicateTitle(
-          projectPath,
-          updates.title,
-          featureId // Exclude the current feature from duplicate check
-        );
-        if (duplicate) {
-          res.status(409).json({
-            success: false,
-            error: `A feature with title "${updates.title}" already exists`,
-            duplicateFeatureId: duplicate.id,
-          });
-          return;
-        }
-      }
-
-      // Get the current feature to detect status changes
-      const currentFeature = await featureLoader.get(projectPath, featureId);
-      const previousStatus = currentFeature?.status as FeatureStatus | undefined;
-      const newStatus = updates.status as FeatureStatus | undefined;
-
-      const updated = await featureLoader.update(
-        projectPath,
-        featureId,
-        updates,
-        descriptionHistorySource,
-        enhancementMode,
-        preEnhancementDescription
-      );
-
-      // Trigger sync to app_spec.txt when status changes to verified or completed
-      if (newStatus && SYNC_TRIGGER_STATUSES.includes(newStatus) && previousStatus !== newStatus) {
-        try {
-          const synced = await featureLoader.syncFeatureToAppSpec(projectPath, updated);
-          if (synced) {
-            logger.info(
-              `Synced feature "${updated.title || updated.id}" to app_spec.txt on status change to ${newStatus}`
-            );
-          }
-        } catch (syncError) {
-          // Log the sync error but don't fail the update operation
-          logger.error(`Failed to sync feature to app_spec.txt:`, syncError);
-        }
-      }
-
+      const updated = await featureLoader.update(projectPath, featureId, updates);
       res.json({ success: true, feature: updated });
     } catch (error) {
       logError(error, 'Update feature failed');

apps/server/src/routes/fs/routes/image.ts

@@ -1,12 +1,5 @@
 /**
  * GET /image endpoint - Serve image files
- *
- * Requires authentication via auth middleware:
- * - apiKey query parameter (Electron mode)
- * - token query parameter (web mode)
- * - session cookie (web mode)
- * - X-API-Key header (Electron mode)
- * - X-Session-Token header (web mode)
  */
 
 import type { Request, Response } from 'express';

apps/server/src/routes/github/routes/check-github-remote.ts

@@ -5,43 +5,6 @@
 import type { Request, Response } from 'express';
 import { execAsync, execEnv, getErrorMessage, logError } from './common.js';
 
-const GIT_REMOTE_ORIGIN_COMMAND = 'git remote get-url origin';
-const GH_REPO_VIEW_COMMAND = 'gh repo view --json name,owner';
-const GITHUB_REPO_URL_PREFIX = 'https://github.com/';
-const GITHUB_HTTPS_REMOTE_REGEX = /https:\/\/github\.com\/([^/]+)\/([^/.]+)/;
-const GITHUB_SSH_REMOTE_REGEX = /git@github\.com:([^/]+)\/([^/.]+)/;
-
-interface GhRepoViewResponse {
-  name?: string;
-  owner?: {
-    login?: string;
-  };
-}
-
-async function resolveRepoFromGh(projectPath: string): Promise<{
-  owner: string;
-  repo: string;
-} | null> {
-  try {
-    const { stdout } = await execAsync(GH_REPO_VIEW_COMMAND, {
-      cwd: projectPath,
-      env: execEnv,
-    });
-
-    const data = JSON.parse(stdout) as GhRepoViewResponse;
-    const owner = typeof data.owner?.login === 'string' ? data.owner.login : null;
-    const repo = typeof data.name === 'string' ? data.name : null;
-
-    if (!owner || !repo) {
-      return null;
-    }
-
-    return { owner, repo };
-  } catch {
-    return null;
-  }
-}
-
 export interface GitHubRemoteStatus {
   hasGitHubRemote: boolean;
   remoteUrl: string | null;
@@ -58,38 +21,19 @@ export async function checkGitHubRemote(projectPath: string): Promise<GitHubRemo
   };
 
   try {
-    let remoteUrl = '';
-    try {
-      // Get the remote URL (origin by default)
-      const { stdout } = await execAsync(GIT_REMOTE_ORIGIN_COMMAND, {
-        cwd: projectPath,
-        env: execEnv,
-      });
-      remoteUrl = stdout.trim();
-      status.remoteUrl = remoteUrl || null;
-    } catch {
-      // Ignore missing origin remote
-    }
+    // Get the remote URL (origin by default)
+    const { stdout } = await execAsync('git remote get-url origin', {
+      cwd: projectPath,
+      env: execEnv,
+    });
 
-    const ghRepo = await resolveRepoFromGh(projectPath);
-    if (ghRepo) {
-      status.hasGitHubRemote = true;
-      status.owner = ghRepo.owner;
-      status.repo = ghRepo.repo;
-      if (!status.remoteUrl) {
-        status.remoteUrl = `${GITHUB_REPO_URL_PREFIX}${ghRepo.owner}/${ghRepo.repo}`;
-      }
-      return status;
-    }
+    const remoteUrl = stdout.trim();
+    status.remoteUrl = remoteUrl;
 
     // Check if it's a GitHub URL
     // Formats: https://github.com/owner/repo.git, git@github.com:owner/repo.git
-    if (!remoteUrl) {
-      return status;
-    }
-
-    const httpsMatch = remoteUrl.match(GITHUB_HTTPS_REMOTE_REGEX);
-    const sshMatch = remoteUrl.match(GITHUB_SSH_REMOTE_REGEX);
+    const httpsMatch = remoteUrl.match(/https:\/\/github\.com\/([^/]+)\/([^/.]+)/);
+    const sshMatch = remoteUrl.match(/git@github\.com:([^/]+)\/([^/.]+)/);
 
     const match = httpsMatch || sshMatch;
     if (match) {

apps/server/src/routes/github/routes/list-comments.ts

@@ -25,24 +25,19 @@ interface GraphQLComment {
   updatedAt: string;
 }
 
-interface GraphQLCommentConnection {
-  totalCount: number;
-  pageInfo: {
-    hasNextPage: boolean;
-    endCursor: string | null;
-  };
-  nodes: GraphQLComment[];
-}
-
-interface GraphQLIssueOrPullRequest {
-  __typename: 'Issue' | 'PullRequest';
-  comments: GraphQLCommentConnection;
-}
-
 interface GraphQLResponse {
   data?: {
     repository?: {
-      issueOrPullRequest?: GraphQLIssueOrPullRequest | null;
+      issue?: {
+        comments: {
+          totalCount: number;
+          pageInfo: {
+            hasNextPage: boolean;
+            endCursor: string | null;
+          };
+          nodes: GraphQLComment[];
+        };
+      };
     };
   };
   errors?: Array<{ message: string }>;
@@ -50,7 +45,6 @@ interface GraphQLResponse {
 
 /** Timeout for GitHub API requests in milliseconds */
 const GITHUB_API_TIMEOUT_MS = 30000;
-const COMMENTS_PAGE_SIZE = 50;
 
 /**
  * Validate cursor format (GraphQL cursors are typically base64 strings)
@@ -60,7 +54,7 @@ function isValidCursor(cursor: string): boolean {
 }
 
 /**
- * Fetch comments for a specific issue or pull request using GitHub GraphQL API
+ * Fetch comments for a specific issue using GitHub GraphQL API
  */
 async function fetchIssueComments(
   projectPath: string,
@@ -76,52 +70,24 @@ async function fetchIssueComments(
 
   // Use GraphQL variables instead of string interpolation for safety
   const query = `
-    query GetIssueComments(
-      $owner: String!
-      $repo: String!
-      $issueNumber: Int!
-      $cursor: String
-      $pageSize: Int!
-    ) {
+    query GetIssueComments($owner: String!, $repo: String!, $issueNumber: Int!, $cursor: String) {
       repository(owner: $owner, name: $repo) {
-        issueOrPullRequest(number: $issueNumber) {
-          __typename
-          ... on Issue {
-            comments(first: $pageSize, after: $cursor) {
-              totalCount
-              pageInfo {
-                hasNextPage
-                endCursor
-              }
-              nodes {
-                id
-                author {
-                  login
-                  avatarUrl
-                }
-                body
-                createdAt
-                updatedAt
-              }
+        issue(number: $issueNumber) {
+          comments(first: 50, after: $cursor) {
+            totalCount
+            pageInfo {
+              hasNextPage
+              endCursor
             }
-          }
-          ... on PullRequest {
-            comments(first: $pageSize, after: $cursor) {
-              totalCount
-              pageInfo {
-                hasNextPage
-                endCursor
-              }
-              nodes {
-                id
-                author {
-                  login
-                  avatarUrl
-                }
-                body
-                createdAt
-                updatedAt
+            nodes {
+              id
+              author {
+                login
+                avatarUrl
               }
+              body
+              createdAt
+              updatedAt
             }
           }
         }
@@ -133,7 +99,6 @@ async function fetchIssueComments(
     repo,
     issueNumber,
     cursor: cursor || null,
-    pageSize: COMMENTS_PAGE_SIZE,
   };
 
   const requestBody = JSON.stringify({ query, variables });
@@ -175,10 +140,10 @@ async function fetchIssueComments(
     throw new Error(response.errors[0].message);
   }
 
-  const commentsData = response.data?.repository?.issueOrPullRequest?.comments;
+  const commentsData = response.data?.repository?.issue?.comments;
 
   if (!commentsData) {
-    throw new Error('Issue or pull request not found or no comments data available');
+    throw new Error('Issue not found or no comments data available');
   }
 
   const comments: GitHubComment[] = commentsData.nodes.map((node) => ({

apps/server/src/routes/github/routes/list-issues.ts

@@ -9,17 +9,6 @@ import { checkGitHubRemote } from './check-github-remote.js';
 import { createLogger } from '@automaker/utils';
 
 const logger = createLogger('ListIssues');
-const OPEN_ISSUES_LIMIT = 100;
-const CLOSED_ISSUES_LIMIT = 50;
-const ISSUE_LIST_FIELDS = 'number,title,state,author,createdAt,labels,url,body,assignees';
-const ISSUE_STATE_OPEN = 'open';
-const ISSUE_STATE_CLOSED = 'closed';
-const GH_ISSUE_LIST_COMMAND = 'gh issue list';
-const GH_STATE_FLAG = '--state';
-const GH_JSON_FLAG = '--json';
-const GH_LIMIT_FLAG = '--limit';
-const LINKED_PRS_BATCH_SIZE = 20;
-const LINKED_PRS_TIMELINE_ITEMS = 10;
 
 export interface GitHubLabel {
   name: string;
@@ -80,68 +69,34 @@ async function fetchLinkedPRs(
 
   // Build GraphQL query for batch fetching linked PRs
   // We fetch up to 20 issues at a time to avoid query limits
-  for (let i = 0; i < issueNumbers.length; i += LINKED_PRS_BATCH_SIZE) {
-    const batch = issueNumbers.slice(i, i + LINKED_PRS_BATCH_SIZE);
+  const batchSize = 20;
+  for (let i = 0; i < issueNumbers.length; i += batchSize) {
+    const batch = issueNumbers.slice(i, i + batchSize);
 
     const issueQueries = batch
       .map(
         (num, idx) => `
-        issue${idx}: issueOrPullRequest(number: ${num}) {
-          ... on Issue {
-            number
-            timelineItems(
-              first: ${LINKED_PRS_TIMELINE_ITEMS}
-              itemTypes: [CROSS_REFERENCED_EVENT, CONNECTED_EVENT]
-            ) {
-              nodes {
-                ... on CrossReferencedEvent {
-                  source {
-                    ... on PullRequest {
-                      number
-                      title
-                      state
-                      url
-                    }
-                  }
-                }
-                ... on ConnectedEvent {
-                  subject {
-                    ... on PullRequest {
-                      number
-                      title
-                      state
-                      url
-                    }
+        issue${idx}: issue(number: ${num}) {
+          number
+          timelineItems(first: 10, itemTypes: [CROSS_REFERENCED_EVENT, CONNECTED_EVENT]) {
+            nodes {
+              ... on CrossReferencedEvent {
+                source {
+                  ... on PullRequest {
+                    number
+                    title
+                    state
+                    url
                   }
                 }
               }
-            }
-          }
-          ... on PullRequest {
-            number
-            timelineItems(
-              first: ${LINKED_PRS_TIMELINE_ITEMS}
-              itemTypes: [CROSS_REFERENCED_EVENT, CONNECTED_EVENT]
-            ) {
-              nodes {
-                ... on CrossReferencedEvent {
-                  source {
-                    ... on PullRequest {
-                      number
-                      title
-                      state
-                      url
-                    }
-                  }
-                }
-                ... on ConnectedEvent {
-                  subject {
-                    ... on PullRequest {
-                      number
-                      title
-                      state
-                      url
-                    }
+              ... on ConnectedEvent {
+                subject {
+                  ... on PullRequest {
+                    number
+                    title
+                    state
+                    url
                   }
                 }
               }
@@ -258,35 +213,16 @@ export function createListIssuesHandler() {
       }
 
       // Fetch open and closed issues in parallel (now including assignees)
-      const repoQualifier =
-        remoteStatus.owner && remoteStatus.repo ? `${remoteStatus.owner}/${remoteStatus.repo}` : '';
-      const repoFlag = repoQualifier ? `-R ${repoQualifier}` : '';
       const [openResult, closedResult] = await Promise.all([
         execAsync(
-          [
-            GH_ISSUE_LIST_COMMAND,
-            repoFlag,
-            `${GH_STATE_FLAG} ${ISSUE_STATE_OPEN}`,
-            `${GH_JSON_FLAG} ${ISSUE_LIST_FIELDS}`,
-            `${GH_LIMIT_FLAG} ${OPEN_ISSUES_LIMIT}`,
-          ]
-            .filter(Boolean)
-            .join(' '),
+          'gh issue list --state open --json number,title,state,author,createdAt,labels,url,body,assignees --limit 100',
           {
             cwd: projectPath,
             env: execEnv,
           }
         ),
         execAsync(
-          [
-            GH_ISSUE_LIST_COMMAND,
-            repoFlag,
-            `${GH_STATE_FLAG} ${ISSUE_STATE_CLOSED}`,
-            `${GH_JSON_FLAG} ${ISSUE_LIST_FIELDS}`,
-            `${GH_LIMIT_FLAG} ${CLOSED_ISSUES_LIMIT}`,
-          ]
-            .filter(Boolean)
-            .join(' '),
+          'gh issue list --state closed --json number,title,state,author,createdAt,labels,url,body,assignees --limit 50',
           {
             cwd: projectPath,
             env: execEnv,

apps/server/src/routes/github/routes/list-prs.ts

@@ -6,17 +6,6 @@ import type { Request, Response } from 'express';
 import { execAsync, execEnv, getErrorMessage, logError } from './common.js';
 import { checkGitHubRemote } from './check-github-remote.js';
 
-const OPEN_PRS_LIMIT = 100;
-const MERGED_PRS_LIMIT = 50;
-const PR_LIST_FIELDS =
-  'number,title,state,author,createdAt,labels,url,isDraft,headRefName,reviewDecision,mergeable,body';
-const PR_STATE_OPEN = 'open';
-const PR_STATE_MERGED = 'merged';
-const GH_PR_LIST_COMMAND = 'gh pr list';
-const GH_STATE_FLAG = '--state';
-const GH_JSON_FLAG = '--json';
-const GH_LIMIT_FLAG = '--limit';
-
 export interface GitHubLabel {
   name: string;
   color: string;
@@ -68,36 +57,16 @@ export function createListPRsHandler() {
         return;
       }
 
-      const repoQualifier =
-        remoteStatus.owner && remoteStatus.repo ? `${remoteStatus.owner}/${remoteStatus.repo}` : '';
-      const repoFlag = repoQualifier ? `-R ${repoQualifier}` : '';
-
       const [openResult, mergedResult] = await Promise.all([
         execAsync(
-          [
-            GH_PR_LIST_COMMAND,
-            repoFlag,
-            `${GH_STATE_FLAG} ${PR_STATE_OPEN}`,
-            `${GH_JSON_FLAG} ${PR_LIST_FIELDS}`,
-            `${GH_LIMIT_FLAG} ${OPEN_PRS_LIMIT}`,
-          ]
-            .filter(Boolean)
-            .join(' '),
+          'gh pr list --state open --json number,title,state,author,createdAt,labels,url,isDraft,headRefName,reviewDecision,mergeable,body --limit 100',
           {
             cwd: projectPath,
             env: execEnv,
           }
         ),
         execAsync(
-          [
-            GH_PR_LIST_COMMAND,
-            repoFlag,
-            `${GH_STATE_FLAG} ${PR_STATE_MERGED}`,
-            `${GH_JSON_FLAG} ${PR_LIST_FIELDS}`,
-            `${GH_LIMIT_FLAG} ${MERGED_PRS_LIMIT}`,
-          ]
-            .filter(Boolean)
-            .join(' '),
+          'gh pr list --state merged --json number,title,state,author,createdAt,labels,url,isDraft,headRefName,reviewDecision,mergeable,body --limit 50',
           {
             cwd: projectPath,
             env: execEnv,

apps/server/src/routes/github/routes/validate-issue.ts

@@ -1,44 +1,36 @@
 /**
- * POST /validate-issue endpoint - Validate a GitHub issue using provider abstraction (async)
+ * POST /validate-issue endpoint - Validate a GitHub issue using Claude SDK or Cursor (async)
  *
  * Scans the codebase to determine if an issue is valid, invalid, or needs clarification.
  * Runs asynchronously and emits events for progress and completion.
- * Supports Claude, Codex, Cursor, and OpenCode models.
+ * Supports both Claude models and Cursor models.
  */
 
 import type { Request, Response } from 'express';
+import { query } from '@anthropic-ai/claude-agent-sdk';
 import type { EventEmitter } from '../../../lib/events.js';
 import type {
   IssueValidationResult,
   IssueValidationEvent,
-  ModelId,
+  ModelAlias,
+  CursorModelId,
   GitHubComment,
   LinkedPRInfo,
   ThinkingLevel,
-  ReasoningEffort,
-} from '@automaker/types';
-import {
-  DEFAULT_PHASE_MODELS,
-  isClaudeModel,
-  isCodexModel,
-  isCursorModel,
-  isOpencodeModel,
 } from '@automaker/types';
+import { isCursorModel, DEFAULT_PHASE_MODELS } from '@automaker/types';
 import { resolvePhaseModel } from '@automaker/model-resolver';
+import { createSuggestionsOptions } from '../../../lib/sdk-options.js';
 import { extractJson } from '../../../lib/json-extractor.js';
 import { writeValidation } from '../../../lib/validation-storage.js';
-import { streamingQuery } from '../../../providers/simple-query-service.js';
+import { ProviderFactory } from '../../../providers/provider-factory.js';
 import {
   issueValidationSchema,
+  ISSUE_VALIDATION_SYSTEM_PROMPT,
   buildValidationPrompt,
   ValidationComment,
   ValidationLinkedPR,
 } from './validation-schema.js';
-import {
-  getPromptCustomization,
-  getAutoLoadClaudeMdSetting,
-  getProviderByModelId,
-} from '../../../lib/settings-helpers.js';
 import {
   trySetValidationRunning,
   clearValidationStatus,
@@ -47,6 +39,10 @@ import {
   logger,
 } from './validation-common.js';
 import type { SettingsService } from '../../../services/settings-service.js';
+import { getAutoLoadClaudeMdSetting } from '../../../lib/settings-helpers.js';
+
+/** Valid Claude model values for validation */
+const VALID_CLAUDE_MODELS: readonly ModelAlias[] = ['opus', 'sonnet', 'haiku'] as const;
 
 /**
  * Request body for issue validation
@@ -57,12 +53,10 @@ interface ValidateIssueRequestBody {
   issueTitle: string;
   issueBody: string;
   issueLabels?: string[];
-  /** Model to use for validation (Claude alias or provider model ID) */
-  model?: ModelId;
-  /** Thinking level for Claude models (ignored for non-Claude models) */
+  /** Model to use for validation (opus, sonnet, haiku, or cursor model IDs) */
+  model?: ModelAlias | CursorModelId;
+  /** Thinking level for Claude models (ignored for Cursor models) */
   thinkingLevel?: ThinkingLevel;
-  /** Reasoning effort for Codex models (ignored for non-Codex models) */
-  reasoningEffort?: ReasoningEffort;
   /** Comments to include in validation analysis */
   comments?: GitHubComment[];
   /** Linked pull requests for this issue */
@@ -74,7 +68,7 @@ interface ValidateIssueRequestBody {
  *
  * Emits events for start, progress, complete, and error.
  * Stores result on completion.
- * Supports Claude/Codex models (structured output) and Cursor/OpenCode models (JSON parsing).
+ * Supports both Claude models (with structured output) and Cursor models (with JSON parsing).
  */
 async function runValidation(
   projectPath: string,
@@ -82,14 +76,13 @@ async function runValidation(
   issueTitle: string,
   issueBody: string,
   issueLabels: string[] | undefined,
-  model: ModelId,
+  model: ModelAlias | CursorModelId,
   events: EventEmitter,
   abortController: AbortController,
   settingsService?: SettingsService,
   comments?: ValidationComment[],
   linkedPRs?: ValidationLinkedPR[],
-  thinkingLevel?: ThinkingLevel,
-  reasoningEffort?: ReasoningEffort
+  thinkingLevel?: ThinkingLevel
 ): Promise<void> {
   // Emit start event
   const startEvent: IssueValidationEvent = {
@@ -109,7 +102,7 @@ async function runValidation(
 
   try {
     // Build the prompt (include comments and linked PRs if provided)
-    const basePrompt = buildValidationPrompt(
+    const prompt = buildValidationPrompt(
       issueNumber,
       issueTitle,
       issueBody,
@@ -118,19 +111,18 @@ async function runValidation(
       linkedPRs
     );
 
+    let validationResult: IssueValidationResult | null = null;
     let responseText = '';
 
-    // Get customized prompts from settings
-    const prompts = await getPromptCustomization(settingsService, '[ValidateIssue]');
-    const issueValidationSystemPrompt = prompts.issueValidation.systemPrompt;
+    // Route to appropriate provider based on model
+    if (isCursorModel(model)) {
+      // Use Cursor provider for Cursor models
+      logger.info(`Using Cursor provider for validation with model: ${model}`);
 
-    // Determine if we should use structured output (Claude/Codex support it, Cursor/OpenCode don't)
-    const useStructuredOutput = isClaudeModel(model) || isCodexModel(model);
+      const provider = ProviderFactory.getProviderForModel(model);
 
-    // Build the final prompt - for Cursor, include system prompt and JSON schema instructions
-    let finalPrompt = basePrompt;
-    if (!useStructuredOutput) {
-      finalPrompt = `${issueValidationSystemPrompt}
+      // For Cursor, include the system prompt and schema in the user prompt
+      const cursorPrompt = `${ISSUE_VALIDATION_SYSTEM_PROMPT}
 
 CRITICAL INSTRUCTIONS:
 1. DO NOT write any files. Return the JSON in your response only.
@@ -141,101 +133,121 @@ ${JSON.stringify(issueValidationSchema, null, 2)}
 
 Your entire response should be valid JSON starting with { and ending with }. No text before or after.
 
-${basePrompt}`;
-    }
+${prompt}`;
 
-    // Load autoLoadClaudeMd setting
-    const autoLoadClaudeMd = await getAutoLoadClaudeMdSetting(
-      projectPath,
-      settingsService,
-      '[ValidateIssue]'
-    );
+      for await (const msg of provider.executeQuery({
+        prompt: cursorPrompt,
+        model,
+        cwd: projectPath,
+        readOnly: true, // Issue validation only reads code, doesn't write
+      })) {
+        if (msg.type === 'assistant' && msg.message?.content) {
+          for (const block of msg.message.content) {
+            if (block.type === 'text' && block.text) {
+              responseText += block.text;
 
-    // Use request overrides if provided, otherwise fall back to settings
-    let effectiveThinkingLevel: ThinkingLevel | undefined = thinkingLevel;
-    let effectiveReasoningEffort: ReasoningEffort | undefined = reasoningEffort;
-    if (!effectiveThinkingLevel || !effectiveReasoningEffort) {
-      const settings = await settingsService?.getGlobalSettings();
-      const phaseModelEntry =
-        settings?.phaseModels?.validationModel || DEFAULT_PHASE_MODELS.validationModel;
-      const resolved = resolvePhaseModel(phaseModelEntry);
+              // Emit progress event
+              const progressEvent: IssueValidationEvent = {
+                type: 'issue_validation_progress',
+                issueNumber,
+                content: block.text,
+                projectPath,
+              };
+              events.emit('issue-validation:event', progressEvent);
+            }
+          }
+        } else if (msg.type === 'result' && msg.subtype === 'success' && msg.result) {
+          // Use result if it's a final accumulated message
+          if (msg.result.length > responseText.length) {
+            responseText = msg.result;
+          }
+        }
+      }
+
+      // Parse JSON from the response text using shared utility
+      if (responseText) {
+        validationResult = extractJson<IssueValidationResult>(responseText, { logger });
+      }
+    } else {
+      // Use Claude SDK for Claude models
+      logger.info(`Using Claude provider for validation with model: ${model}`);
+
+      // Load autoLoadClaudeMd setting
+      const autoLoadClaudeMd = await getAutoLoadClaudeMdSetting(
+        projectPath,
+        settingsService,
+        '[ValidateIssue]'
+      );
+
+      // Use thinkingLevel from request if provided, otherwise fall back to settings
+      let effectiveThinkingLevel: ThinkingLevel | undefined = thinkingLevel;
       if (!effectiveThinkingLevel) {
+        const settings = await settingsService?.getGlobalSettings();
+        const phaseModelEntry =
+          settings?.phaseModels?.validationModel || DEFAULT_PHASE_MODELS.validationModel;
+        const resolved = resolvePhaseModel(phaseModelEntry);
         effectiveThinkingLevel = resolved.thinkingLevel;
       }
-      if (!effectiveReasoningEffort && typeof phaseModelEntry !== 'string') {
-        effectiveReasoningEffort = phaseModelEntry.reasoningEffort;
-      }
-    }
 
-    // Check if the model is a provider model (like "GLM-4.5-Air")
-    // If so, get the provider config and resolved Claude model
-    let claudeCompatibleProvider: import('@automaker/types').ClaudeCompatibleProvider | undefined;
-    let providerResolvedModel: string | undefined;
-    let credentials = await settingsService?.getCredentials();
+      // Create SDK options with structured output and abort controller
+      const options = createSuggestionsOptions({
+        cwd: projectPath,
+        model: model as ModelAlias,
+        systemPrompt: ISSUE_VALIDATION_SYSTEM_PROMPT,
+        abortController,
+        autoLoadClaudeMd,
+        thinkingLevel: effectiveThinkingLevel,
+        outputFormat: {
+          type: 'json_schema',
+          schema: issueValidationSchema as Record<string, unknown>,
+        },
+      });
 
-    if (settingsService) {
-      const providerResult = await getProviderByModelId(model, settingsService, '[ValidateIssue]');
-      if (providerResult.provider) {
-        claudeCompatibleProvider = providerResult.provider;
-        providerResolvedModel = providerResult.resolvedModel;
-        credentials = providerResult.credentials;
-        logger.info(
-          `Using provider "${providerResult.provider.name}" for model "${model}"` +
-            (providerResolvedModel ? ` -> resolved to "${providerResolvedModel}"` : '')
-        );
-      }
-    }
+      // Execute the query
+      const stream = query({ prompt, options });
 
-    // Use provider resolved model if available, otherwise use original model
-    const effectiveModel = providerResolvedModel || (model as string);
-    logger.info(`Using model: ${effectiveModel}`);
+      for await (const msg of stream) {
+        // Collect assistant text for debugging and emit progress
+        if (msg.type === 'assistant' && msg.message?.content) {
+          for (const block of msg.message.content) {
+            if (block.type === 'text') {
+              responseText += block.text;
 
-    // Use streamingQuery with event callbacks
-    const result = await streamingQuery({
-      prompt: finalPrompt,
-      model: effectiveModel,
-      cwd: projectPath,
-      systemPrompt: useStructuredOutput ? issueValidationSystemPrompt : undefined,
-      abortController,
-      thinkingLevel: effectiveThinkingLevel,
-      reasoningEffort: effectiveReasoningEffort,
-      readOnly: true, // Issue validation only reads code, doesn't write
-      settingSources: autoLoadClaudeMd ? ['user', 'project', 'local'] : undefined,
-      claudeCompatibleProvider, // Pass provider for alternative endpoint configuration
-      credentials, // Pass credentials for resolving 'credentials' apiKeySource
-      outputFormat: useStructuredOutput
-        ? {
-            type: 'json_schema',
-            schema: issueValidationSchema as Record<string, unknown>,
+              // Emit progress event
+              const progressEvent: IssueValidationEvent = {
+                type: 'issue_validation_progress',
+                issueNumber,
+                content: block.text,
+                projectPath,
+              };
+              events.emit('issue-validation:event', progressEvent);
+            }
           }
-        : undefined,
-      onText: (text) => {
-        responseText += text;
-        // Emit progress event
-        const progressEvent: IssueValidationEvent = {
-          type: 'issue_validation_progress',
-          issueNumber,
-          content: text,
-          projectPath,
-        };
-        events.emit('issue-validation:event', progressEvent);
-      },
-    });
+        }
+
+        // Extract structured output on success
+        if (msg.type === 'result' && msg.subtype === 'success') {
+          const resultMsg = msg as { structured_output?: IssueValidationResult };
+          if (resultMsg.structured_output) {
+            validationResult = resultMsg.structured_output;
+            logger.debug('Received structured output:', validationResult);
+          }
+        }
+
+        // Handle errors
+        if (msg.type === 'result') {
+          const resultMsg = msg as { subtype?: string };
+          if (resultMsg.subtype === 'error_max_structured_output_retries') {
+            logger.error('Failed to produce valid structured output after retries');
+            throw new Error('Could not produce valid validation output');
+          }
+        }
+      }
+    }
 
     // Clear timeout
     clearTimeout(timeoutId);
 
-    // Get validation result from structured output or parse from text
-    let validationResult: IssueValidationResult | null = null;
-
-    if (result.structured_output) {
-      validationResult = result.structured_output as unknown as IssueValidationResult;
-      logger.debug('Received structured output:', validationResult);
-    } else if (responseText) {
-      // Parse JSON from response text
-      validationResult = extractJson<IssueValidationResult>(responseText, { logger });
-    }
-
     // Require validation result
     if (!validationResult) {
       logger.error('No validation result received from AI provider');
@@ -285,7 +297,7 @@ ${basePrompt}`;
 /**
  * Creates the handler for validating GitHub issues against the codebase.
  *
- * Uses the provider abstraction with:
+ * Uses Claude SDK with:
  * - Read-only tools (Read, Glob, Grep) for codebase analysis
  * - JSON schema structured output for reliable parsing
  * - System prompt guiding the validation process
@@ -305,7 +317,6 @@ export function createValidateIssueHandler(
         issueLabels,
         model = 'opus',
         thinkingLevel,
-        reasoningEffort,
         comments: rawComments,
         linkedPRs: rawLinkedPRs,
       } = req.body as ValidateIssueRequestBody;
@@ -353,17 +364,14 @@ export function createValidateIssueHandler(
         return;
       }
 
-      // Validate model parameter at runtime - accept any supported provider model
-      const isValidModel =
-        isClaudeModel(model) ||
-        isCursorModel(model) ||
-        isCodexModel(model) ||
-        isOpencodeModel(model);
+      // Validate model parameter at runtime - accept Claude models or Cursor models
+      const isValidClaudeModel = VALID_CLAUDE_MODELS.includes(model as ModelAlias);
+      const isValidCursorModel = isCursorModel(model);
 
-      if (!isValidModel) {
+      if (!isValidClaudeModel && !isValidCursorModel) {
         res.status(400).json({
           success: false,
-          error: 'Invalid model. Must be a Claude, Cursor, Codex, or OpenCode model ID (or alias).',
+          error: `Invalid model. Must be one of: ${VALID_CLAUDE_MODELS.join(', ')}, or a Cursor model ID`,
         });
         return;
       }
@@ -394,8 +402,7 @@ export function createValidateIssueHandler(
         settingsService,
         validationComments,
         validationLinkedPRs,
-        thinkingLevel,
-        reasoningEffort
+        thinkingLevel
       )
         .catch(() => {
           // Error is already handled inside runValidation (event emitted)

apps/server/src/routes/github/routes/validation-schema.ts

@@ -1,11 +1,8 @@
 /**
- * Issue Validation Schema and Prompt Building
+ * Issue Validation Schema and System Prompt
  *
  * Defines the JSON schema for Claude's structured output and
- * helper functions for building validation prompts.
- *
- * Note: The system prompt is now centralized in @automaker/prompts
- * and accessed via getPromptCustomization() in validate-issue.ts
+ * the system prompt that guides the validation process.
  */
 
 /**
@@ -85,6 +82,76 @@ export const issueValidationSchema = {
   additionalProperties: false,
 } as const;
 
+/**
+ * System prompt that guides Claude in validating GitHub issues.
+ * Instructs the model to use read-only tools to analyze the codebase.
+ */
+export const ISSUE_VALIDATION_SYSTEM_PROMPT = `You are an expert code analyst validating GitHub issues against a codebase.
+
+Your task is to analyze a GitHub issue and determine if it's valid by scanning the codebase.
+
+## Validation Process
+
+1. **Read the issue carefully** - Understand what is being reported or requested
+2. **Search the codebase** - Use Glob to find relevant files by pattern, Grep to search for keywords
+3. **Examine the code** - Use Read to look at the actual implementation in relevant files
+4. **Check linked PRs** - If there are linked pull requests, use \`gh pr diff <PR_NUMBER>\` to review the changes
+5. **Form your verdict** - Based on your analysis, determine if the issue is valid
+
+## Verdicts
+
+- **valid**: The issue describes a real problem that exists in the codebase, or a clear feature request that can be implemented. The referenced files/components exist and the issue is actionable.
+
+- **invalid**: The issue describes behavior that doesn't exist, references non-existent files or components, is based on a misunderstanding of the code, or the described "bug" is actually expected behavior.
+
+- **needs_clarification**: The issue lacks sufficient detail to verify. Specify what additional information is needed in the missingInfo field.
+
+## For Bug Reports, Check:
+- Do the referenced files/components exist?
+- Does the code match what the issue describes?
+- Is the described behavior actually a bug or expected?
+- Can you locate the code that would cause the reported issue?
+
+## For Feature Requests, Check:
+- Does the feature already exist?
+- Is the implementation location clear?
+- Is the request technically feasible given the codebase structure?
+
+## Analyzing Linked Pull Requests
+
+When an issue has linked PRs (especially open ones), you MUST analyze them:
+
+1. **Run \`gh pr diff <PR_NUMBER>\`** to see what changes the PR makes
+2. **Run \`gh pr view <PR_NUMBER>\`** to see PR description and status
+3. **Evaluate if the PR fixes the issue** - Does the diff address the reported problem?
+4. **Provide a recommendation**:
+   - \`wait_for_merge\`: The PR appears to fix the issue correctly. No additional work needed - just wait for it to be merged.
+   - \`pr_needs_work\`: The PR attempts to fix the issue but is incomplete or has problems.
+   - \`no_pr\`: No relevant PR exists for this issue.
+
+5. **Include prAnalysis in your response** with:
+   - hasOpenPR: true/false
+   - prFixesIssue: true/false (based on diff analysis)
+   - prNumber: the PR number you analyzed
+   - prSummary: brief description of what the PR changes
+   - recommendation: one of the above values
+
+## Response Guidelines
+
+- **Always include relatedFiles** when you find relevant code
+- **Set bugConfirmed to true** only if you can definitively confirm a bug exists in the code
+- **Provide a suggestedFix** when you have a clear idea of how to address the issue
+- **Use missingInfo** when the verdict is needs_clarification to list what's needed
+- **Include prAnalysis** when there are linked PRs - this is critical for avoiding duplicate work
+- **Set estimatedComplexity** to help prioritize:
+  - trivial: Simple text changes, one-line fixes
+  - simple: Small changes to one file
+  - moderate: Changes to multiple files or moderate logic changes
+  - complex: Significant refactoring or new feature implementation
+  - very_complex: Major architectural changes or cross-cutting concerns
+
+Be thorough in your analysis but focus on files that are directly relevant to the issue.`;
+
 /**
  * Comment data structure for validation prompt
  */

apps/server/src/routes/health/routes/environment.ts

@@ -9,14 +9,12 @@ import type { Request, Response } from 'express';
 
 export interface EnvironmentResponse {
   isContainerized: boolean;
-  skipSandboxWarning?: boolean;
 }
 
 export function createEnvironmentHandler() {
   return (_req: Request, res: Response): void => {
     res.json({
       isContainerized: process.env.IS_CONTAINERIZED === 'true',
-      skipSandboxWarning: process.env.AUTOMAKER_SKIP_SANDBOX_WARNING === 'true',
     } satisfies EnvironmentResponse);
   };
 }