@in-the-loop-labs/pair-review 3.2.2 → 3.3.0

package/public/js/repo-settings.js

@@ -14,6 +14,7 @@ class RepoSettingsPage {
     this.providers = {};
     this.selectedProvider = null;
     this.councils = [];
+    this.worktreeData = null;
 
     this.init();
   }
@@ -39,6 +40,9 @@ class RepoSettingsPage {
 
     // Load settings
     await this.loadSettings();
+
+    // Load worktrees (non-blocking, section stays hidden on error)
+    await this.loadWorktrees();
   }
 
   /**
@@ -210,6 +214,16 @@ class RepoSettingsPage {
       });
     }
 
+    // Load skills select
+    const loadSkillsSelect = document.getElementById('load-skills-select');
+    if (loadSkillsSelect) {
+      loadSkillsSelect.addEventListener('change', () => {
+        const val = loadSkillsSelect.value;
+        this.currentSettings.load_skills = val === '' ? null : parseInt(val, 10);
+        this.checkForChanges();
+      });
+    }
+
     // Analysis mode segmented control
     const modeToggle = document.getElementById('analysis-mode-toggle');
     if (modeToggle) {
@@ -249,6 +263,22 @@ class RepoSettingsPage {
       clearLocalPathBtn.addEventListener('click', () => this.handleClearLocalPath());
     }
 
+    // Worktree actions (delegated)
+    const worktreesContent = document.getElementById('worktrees-content');
+    if (worktreesContent) {
+      worktreesContent.addEventListener('click', (e) => {
+        const deleteBtn = e.target.closest('.worktree-delete-btn');
+        if (deleteBtn) {
+          this.deleteWorktree(deleteBtn.dataset.worktreeId);
+          return;
+        }
+        const deleteAllBtn = e.target.closest('.worktree-delete-all-btn');
+        if (deleteAllBtn) {
+          this.deleteAllWorktrees();
+        }
+      });
+    }
+
     // Warn before leaving with unsaved changes
     window.addEventListener('beforeunload', (e) => {
       if (this.hasUnsavedChanges) {
@@ -825,7 +855,10 @@ class RepoSettingsPage {
         default_council_id: settings.default_council_id || null,
         default_instructions: settings.default_instructions || '',
         local_path: settings.local_path || null,
-        default_chat_instructions: settings.default_chat_instructions || ''
+        default_chat_instructions: settings.default_chat_instructions || '',
+        pool_size: settings.pool_size ?? null,
+        pool_fetch_interval_minutes: settings.pool_fetch_interval_minutes ?? null,
+        load_skills: settings.load_skills ?? null
       };
 
       // Set current settings
@@ -844,13 +877,279 @@ class RepoSettingsPage {
         default_council_id: null,
         default_instructions: '',
         local_path: null,
-        default_chat_instructions: ''
+        default_chat_instructions: '',
+        pool_size: null,
+        pool_fetch_interval_minutes: null,
+        load_skills: null
       };
       this.currentSettings = { ...this.originalSettings };
       this.updateUI();
     }
   }
 
+  /**
+   * Load worktree data for the current repository
+   */
+  async loadWorktrees() {
+    if (!this.owner || !this.repo) return;
+
+    try {
+      const response = await fetch(`/api/repos/${this.owner}/${this.repo}/worktrees`);
+      if (!response.ok) {
+        throw new Error('Failed to load worktrees');
+      }
+      this.worktreeData = await response.json();
+
+      // Seed pool settings from resolved config values when DB has no override
+      const pool = this.worktreeData.pool || {};
+      if (this.originalSettings.pool_size == null && pool.size) {
+        this.originalSettings.pool_size = pool.size;
+        this.currentSettings.pool_size = pool.size;
+      }
+      if (this.originalSettings.pool_fetch_interval_minutes == null && pool.fetch_interval_minutes) {
+        this.originalSettings.pool_fetch_interval_minutes = pool.fetch_interval_minutes;
+        this.currentSettings.pool_fetch_interval_minutes = pool.fetch_interval_minutes;
+      }
+
+      this.renderWorktrees();
+    } catch (error) {
+      console.error('Error loading worktrees:', error);
+    }
+  }
+
+  /**
+   * Render the worktrees section content
+   */
+  renderWorktrees() {
+    const section = document.getElementById('worktrees-section');
+    const content = document.getElementById('worktrees-content');
+    if (!section || !content) return;
+
+    if (!this.worktreeData) return;
+
+    section.style.display = '';
+
+    const pool = this.worktreeData.pool || {};
+    const worktrees = this.worktreeData.worktrees || [];
+    let html = '';
+
+    // Pool settings (editable)
+    const poolSizeValue = this.currentSettings.pool_size ?? '';
+    const fetchIntervalValue = this.currentSettings.pool_fetch_interval_minutes ?? '';
+    const currentCount = pool.current_count || 0;
+    const countNote = poolSizeValue ? ` (${currentCount} active)` : '';
+
+    html += `<div class="worktree-pool-config">
+      <div class="worktree-pool-config-items">
+        <div class="worktree-pool-config-item">
+          <label class="worktree-pool-config-label" for="pool-size-input">Pool Size</label>
+          <div class="worktree-pool-input-group">
+            <input type="number" id="pool-size-input" class="worktree-pool-input"
+              min="0" max="20" step="1" placeholder="0"
+              value="${this.escapeHtml(String(poolSizeValue))}">
+            <span class="worktree-pool-input-note">${this.escapeHtml(countNote)}</span>
+          </div>
+        </div>
+        <div class="worktree-pool-config-item">
+          <label class="worktree-pool-config-label" for="pool-fetch-interval-input">Fetch Interval</label>
+          <div class="worktree-pool-input-group">
+            <input type="number" id="pool-fetch-interval-input" class="worktree-pool-input"
+              min="0" max="1440" step="1" placeholder="Off"
+              value="${this.escapeHtml(String(fetchIntervalValue))}">
+            <span class="worktree-pool-input-note">minutes</span>
+          </div>
+        </div>
+      </div>
+      <p class="worktree-pool-hint">
+        <svg width="16" height="16" viewBox="0 0 16 16" fill="currentColor"><path d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8zm6.5-.25A.75.75 0 017.25 7h1a.75.75 0 01.75.75v2.75h.25a.75.75 0 010 1.5h-2a.75.75 0 010-1.5h.25v-2h-.25a.75.75 0 01-.75-.75zM8 6a1 1 0 100-2 1 1 0 000 2z"/></svg>
+        Pre-warms worktrees so PR reviews start instantly. Set size to 0 to disable.
+      </p>
+    </div>`;
+
+    // Worktree list
+    if (worktrees.length > 0) {
+      html += '<div class="worktree-list">';
+      for (const wt of worktrees) {
+        const badgeHtml = wt.is_pool
+          ? '<span class="worktree-pool-badge">Pool</span>'
+          : '<span class="worktree-adhoc-badge">Ad-hoc</span>';
+        const prInfo = wt.pr_number ? '#' + wt.pr_number : 'Unassigned';
+        const branchInfo = wt.branch ? ' &middot; ' + this.escapeHtml(wt.branch) : '';
+        const fullPath = wt.path || '';
+        const diskWarning = !wt.disk_exists
+          ? '<span class="worktree-disk-warning">Missing from disk</span>'
+          : '';
+        const statusIcon = this.getWorktreeStatusIcon(wt.status);
+        const statusLabel = this.getWorktreeStatusLabel(wt.status);
+        const fetchedHtml = wt.last_fetched_at
+          ? `<span class="worktree-timestamp">Fetched ${this.formatRelativeTime(wt.last_fetched_at)}</span>`
+          : '';
+
+        html += `<div class="worktree-item">
+          <div class="worktree-item-top">
+            <div class="worktree-item-left">
+              ${badgeHtml}
+              <span class="worktree-pr-info">${prInfo}${branchInfo}</span>
+              ${diskWarning}
+            </div>
+            <div class="worktree-item-right">
+              <span class="worktree-status worktree-status--${this.escapeHtml(wt.status || 'unknown')}">
+                ${statusIcon} ${statusLabel}
+              </span>
+              ${fetchedHtml}
+              <button class="worktree-delete-btn" data-worktree-id="${this.escapeHtml(wt.id)}" title="Delete worktree">
+                <svg width="16" height="16" viewBox="0 0 16 16" fill="currentColor">
+                  <path fill-rule="evenodd" d="M6.5 1.75a.25.25 0 01.25-.25h2.5a.25.25 0 01.25.25V3h-3V1.75zm4.5 0V3h2.25a.75.75 0 010 1.5H2.75a.75.75 0 010-1.5H5V1.75C5 .784 5.784 0 6.75 0h2.5C10.216 0 11 .784 11 1.75zM4.496 6.675a.75.75 0 10-1.492.15l.66 6.6A1.75 1.75 0 005.405 15h5.19a1.75 1.75 0 001.741-1.575l.66-6.6a.75.75 0 00-1.492-.15l-.66 6.6a.25.25 0 01-.249.225h-5.19a.25.25 0 01-.249-.225l-.66-6.6z"/>
+                </svg>
+              </button>
+            </div>
+          </div>
+          <div class="worktree-item-bottom">
+            <span class="worktree-path">${this.escapeHtml(fullPath)}</span>
+          </div>
+        </div>`;
+      }
+      html += '</div>';
+
+      // Delete all button
+      html += `<div class="worktree-actions">
+        <button class="worktree-delete-all-btn">
+          <svg width="16" height="16" viewBox="0 0 16 16" fill="currentColor">
+            <path fill-rule="evenodd" d="M6.5 1.75a.25.25 0 01.25-.25h2.5a.25.25 0 01.25.25V3h-3V1.75zm4.5 0V3h2.25a.75.75 0 010 1.5H2.75a.75.75 0 010-1.5H5V1.75C5 .784 5.784 0 6.75 0h2.5C10.216 0 11 .784 11 1.75zM4.496 6.675a.75.75 0 10-1.492.15l.66 6.6A1.75 1.75 0 005.405 15h5.19a1.75 1.75 0 001.741-1.575l.66-6.6a.75.75 0 00-1.492-.15l-.66 6.6a.25.25 0 01-.249.225h-5.19a.25.25 0 01-.249-.225l-.66-6.6z"/>
+          </svg>
+          Delete All Worktrees
+        </button>
+      </div>`;
+    } else {
+      html += '<div class="worktree-empty">No worktrees found for this repository.</div>';
+    }
+
+    content.innerHTML = html;
+
+    // Wire up pool setting inputs
+    const poolSizeInput = document.getElementById('pool-size-input');
+    if (poolSizeInput) {
+      poolSizeInput.addEventListener('input', () => {
+        const val = poolSizeInput.value.trim();
+        this.currentSettings.pool_size = val === '' ? null : parseInt(val, 10);
+        this.checkForChanges();
+      });
+    }
+    const poolFetchInput = document.getElementById('pool-fetch-interval-input');
+    if (poolFetchInput) {
+      poolFetchInput.addEventListener('input', () => {
+        const val = poolFetchInput.value.trim();
+        this.currentSettings.pool_fetch_interval_minutes = val === '' ? null : parseInt(val, 10);
+        this.checkForChanges();
+      });
+    }
+  }
+
+  /**
+   * Get the SVG icon for a worktree status
+   * @param {string} status
+   * @returns {string} Inline SVG string
+   */
+  getWorktreeStatusIcon(status) {
+    switch (status) {
+      case 'available':
+        return '<svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor"><circle cx="8" cy="8" r="4" fill="#2da44e"/></svg>';
+      case 'in_use':
+        return '<svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor"><path d="M4 4a4 4 0 0 1 8 0v2h.25c.966 0 1.75.784 1.75 1.75v5.5A1.75 1.75 0 0 1 12.25 15h-8.5A1.75 1.75 0 0 1 2 13.25v-5.5C2 6.784 2.784 6 3.75 6H4Zm8.25 3.5h-8.5a.25.25 0 0 0-.25.25v5.5c0 .138.112.25.25.25h8.5a.25.25 0 0 0 .25-.25v-5.5a.25.25 0 0 0-.25-.25ZM10.5 6V4a2.5 2.5 0 1 0-5 0v2Z"/></svg>';
+      case 'switching':
+        return '<svg class="worktree-icon-spin" width="14" height="14" viewBox="0 0 16 16" fill="currentColor"><path d="M8 2.5a5.5 5.5 0 00-5.23 3.79.75.75 0 01-1.42-.48A7.001 7.001 0 0115 8a7 7 0 01-13.65 2.19.75.75 0 011.42-.48A5.5 5.5 0 108 2.5z"/></svg>';
+      case 'creating':
+        return '<svg class="worktree-icon-spin" width="14" height="14" viewBox="0 0 16 16" fill="currentColor"><path d="M8 2.5a5.5 5.5 0 00-5.23 3.79.75.75 0 01-1.42-.48A7.001 7.001 0 0115 8a7 7 0 01-13.65 2.19.75.75 0 011.42-.48A5.5 5.5 0 108 2.5z"/></svg>';
+      case 'active':
+        return '<svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor"><circle cx="8" cy="8" r="4" fill="#0969da"/></svg>';
+      default:
+        return '<svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor"><circle cx="8" cy="8" r="4" fill="#8b949e"/></svg>';
+    }
+  }
+
+  /**
+   * Get the display label for a worktree status
+   * @param {string} status
+   * @returns {string}
+   */
+  getWorktreeStatusLabel(status) {
+    switch (status) {
+      case 'available': return 'Available';
+      case 'in_use': return 'In use';
+      case 'switching': return 'Switching';
+      case 'creating': return 'Creating';
+      case 'active': return 'Active';
+      default: return status || 'Unknown';
+    }
+  }
+
+
+
+  /**
+   * Format an ISO timestamp as a human-readable relative time string
+   * @param {string} isoString
+   * @returns {string}
+   */
+  formatRelativeTime(isoString) {
+    if (!isoString) return '';
+    const seconds = Math.floor((Date.now() - new Date(isoString).getTime()) / 1000);
+    if (seconds < 60) return 'just now';
+    const minutes = Math.floor(seconds / 60);
+    if (minutes < 60) return minutes + 'm ago';
+    const hours = Math.floor(minutes / 60);
+    if (hours < 24) return hours + 'h ago';
+    const days = Math.floor(hours / 24);
+    if (days === 1) return 'yesterday';
+    return days + 'd ago';
+  }
+
+  /**
+   * Delete a single worktree by ID
+   * @param {string} worktreeId
+   */
+  async deleteWorktree(worktreeId) {
+    if (!confirm('Delete this worktree? This removes it from disk and cannot be undone.')) return;
+
+    try {
+      const response = await fetch(`/api/repos/${this.owner}/${this.repo}/worktrees/${worktreeId}`, {
+        method: 'DELETE'
+      });
+      if (!response.ok) {
+        const data = await response.json().catch(() => ({}));
+        throw new Error(data.error || 'Failed to delete worktree');
+      }
+      this.showToast('success', 'Worktree deleted');
+      await this.loadWorktrees();
+    } catch (error) {
+      this.showToast('error', 'Failed to delete worktree: ' + error.message);
+    }
+  }
+
+  /**
+   * Delete all worktrees for the current repository
+   */
+  async deleteAllWorktrees() {
+    const count = this.worktreeData && this.worktreeData.worktrees
+      ? this.worktreeData.worktrees.length
+      : 0;
+    if (!confirm(`Delete all ${count} worktree(s)? This removes them from disk and cannot be undone.`)) return;
+
+    try {
+      const response = await fetch(`/api/repos/${this.owner}/${this.repo}/worktrees`, {
+        method: 'DELETE'
+      });
+      if (!response.ok) {
+        const data = await response.json().catch(() => ({}));
+        throw new Error(data.error || 'Failed to delete worktrees');
+      }
+      const data = await response.json();
+      this.showToast('success', `Deleted ${data.deleted} worktree(s)`);
+      await this.loadWorktrees();
+    } catch (error) {
+      this.showToast('error', 'Failed to delete worktrees: ' + error.message);
+    }
+  }
+
   updateUI() {
     // Update provider selection - validate provider exists before selecting
     let providerId = this.currentSettings.default_provider;
@@ -908,6 +1207,23 @@ class RepoSettingsPage {
 
     // Update local path display
     this.updateLocalPathDisplay();
+
+    // Update pool setting inputs
+    const poolSizeInput = document.getElementById('pool-size-input');
+    if (poolSizeInput) {
+      poolSizeInput.value = this.currentSettings.pool_size ?? '';
+    }
+    const poolFetchInput = document.getElementById('pool-fetch-interval-input');
+    if (poolFetchInput) {
+      poolFetchInput.value = this.currentSettings.pool_fetch_interval_minutes ?? '';
+    }
+
+    // Update load skills select
+    const loadSkillsSelect = document.getElementById('load-skills-select');
+    if (loadSkillsSelect) {
+      const val = this.currentSettings.load_skills;
+      loadSkillsSelect.value = val === null || val === undefined ? '' : String(val);
+    }
   }
 
   /**
@@ -957,8 +1273,11 @@ class RepoSettingsPage {
     const councilChanged = (this.currentSettings.default_council_id ?? null) !== (this.originalSettings.default_council_id ?? null);
     const instructionsChanged = (this.currentSettings.default_instructions ?? '') !== (this.originalSettings.default_instructions ?? '');
     const chatInstructionsChanged = (this.currentSettings.default_chat_instructions ?? '') !== (this.originalSettings.default_chat_instructions ?? '');
+    const poolSizeChanged = (this.currentSettings.pool_size ?? null) !== (this.originalSettings.pool_size ?? null);
+    const poolFetchChanged = (this.currentSettings.pool_fetch_interval_minutes ?? null) !== (this.originalSettings.pool_fetch_interval_minutes ?? null);
+    const loadSkillsChanged = (this.currentSettings.load_skills ?? null) !== (this.originalSettings.load_skills ?? null);
 
-    this.hasUnsavedChanges = providerChanged || modelChanged || tabChanged || councilChanged || instructionsChanged || chatInstructionsChanged;
+    this.hasUnsavedChanges = providerChanged || modelChanged || tabChanged || councilChanged || instructionsChanged || chatInstructionsChanged || poolSizeChanged || poolFetchChanged || loadSkillsChanged;
 
     // Show/hide action bar
     const actionBar = document.getElementById('action-bar');
@@ -993,7 +1312,10 @@ class RepoSettingsPage {
           default_tab: this.currentSettings.default_tab,
           default_council_id: this.currentSettings.default_council_id,
           default_instructions: this.currentSettings.default_instructions,
-          default_chat_instructions: this.currentSettings.default_chat_instructions
+          default_chat_instructions: this.currentSettings.default_chat_instructions,
+          pool_size: this.currentSettings.pool_size,
+          pool_fetch_interval_minutes: this.currentSettings.pool_fetch_interval_minutes,
+          load_skills: this.currentSettings.load_skills
         })
       });
 
@@ -1068,7 +1390,10 @@ class RepoSettingsPage {
           default_council_id: null,
           default_instructions: '',
           local_path: null,
-          default_chat_instructions: ''
+          default_chat_instructions: '',
+          pool_size: null,
+          pool_fetch_interval_minutes: null,
+          load_skills: null
         })
       });
 
@@ -1084,7 +1409,10 @@ class RepoSettingsPage {
         default_council_id: null,
         default_instructions: '',
         local_path: null,
-        default_chat_instructions: ''
+        default_chat_instructions: '',
+        pool_size: null,
+        pool_fetch_interval_minutes: null,
+        load_skills: null
       };
       this.currentSettings = { ...this.originalSettings };
       this.hasUnsavedChanges = false;

package/public/repo-settings.html

@@ -198,6 +198,22 @@ Examples:
                         </div>
                     </section>
 
+                    <!-- Provider Skill Discovery Section -->
+                    <section class="settings-section">
+                        <div class="section-header">
+                            <h2>Provider Skill Discovery</h2>
+                            <p class="section-description">Controls whether AI providers load environment-level skills automatically. Currently applies to Pi's skill auto-discovery. When disabled, Pi runs with <code>--no-skills</code>.</p>
+                        </div>
+                        <div class="form-group" style="max-width: 300px;">
+                            <label for="load-skills-select" class="settings-label">Load Skills</label>
+                            <select class="settings-select" id="load-skills-select">
+                                <option value="">Default (inherit from config)</option>
+                                <option value="1">Enabled</option>
+                                <option value="0">Disabled</option>
+                            </select>
+                        </div>
+                    </section>
+
                     <!-- Repository Location Section -->
                     <section class="settings-section" id="local-path-section">
                         <div class="section-header">
@@ -227,6 +243,19 @@ Examples:
                         </div>
                     </section>
 
+                    <!-- Worktrees Section -->
+                    <section class="settings-section" id="worktrees-section" style="display: none;">
+                        <div class="section-header">
+                            <h2>Worktrees</h2>
+                            <p class="section-description">
+                                Manage worktree directories used for reviewing pull requests in this repository.
+                            </p>
+                        </div>
+                        <div id="worktrees-content">
+                            <!-- Rendered dynamically by JS -->
+                        </div>
+                    </section>
+
                     <!-- Danger Zone -->
                     <section class="settings-section danger-zone">
                         <div class="section-header">

package/src/ai/analyzer.js

@@ -73,9 +73,10 @@ async function captureDiffSnapshot(analyzer, worktreePath, prMetadata, logPrefix
  * @param {Object|null} instructions - Instructions object { repoInstructions, requestInstructions }
  * @param {Function|null} progressCallback - Parent progress callback to wrap
  * @param {Object} db - Database instance
+ * @param {Object} providerOverrides - Per-call config overrides passed to createProvider (optional)
  * @returns {Object} { voiceAnalyzer, voiceKey, reviewerLabel, voiceRequestInstructions, voiceProgressCallback, voiceTier, voiceTimeout }
  */
-function buildVoiceContext(voice, idx, instructions, progressCallback, db) {
+function buildVoiceContext(voice, idx, instructions, progressCallback, db, providerOverrides = {}, providerOverridesMap = null) {
   const voiceKey = `${voice.provider}-${voice.model}${idx > 0 ? `-${idx}` : ''}`;
   const reviewerLabel = buildReviewerLabel(idx, voice);
 
@@ -87,13 +88,16 @@ function buildVoiceContext(voice, idx, instructions, progressCallback, db) {
       : voice.customInstructions;
   }
 
+  // Resolve per-voice overrides: prefer provider-specific from map, fall back to shared overrides
+  const effectiveOverrides = providerOverridesMap?.[voice.provider] || providerOverrides;
+
   const ProviderClass = getProviderClass(voice.provider);
   const isExecutable = ProviderClass?.isExecutable || false;
 
   // Only create Analyzer for native voices
-  const voiceAnalyzer = isExecutable ? null : new Analyzer(db, voice.model, voice.provider);
+  const voiceAnalyzer = isExecutable ? null : new Analyzer(db, voice.model, voice.provider, effectiveOverrides);
   // Create provider instance for executable voices (used directly)
-  const voiceProvider = isExecutable ? createProvider(voice.provider, voice.model) : null;
+  const voiceProvider = isExecutable ? createProvider(voice.provider, voice.model, effectiveOverrides) : null;
 
   const voiceTier = voice.tier || 'balanced';
   const voiceTimeout = voice.timeout || ProviderClass?.defaultTimeout || 600000;
@@ -272,12 +276,16 @@ class Analyzer {
    * @param {Object} database - Database instance
    * @param {string} model - Model to use (e.g., 'opus', 'gemini-2.5-pro')
    * @param {string} provider - Provider ID (e.g., 'claude', 'gemini'). Defaults to 'claude'.
+   * @param {Object} providerOverrides - Per-call config overrides passed to createProvider (optional)
+   * @param {Object|null} providerOverridesMap - Per-provider overrides map for council mode (provider ID → overrides)
    */
-  constructor(database, model = 'opus', provider = 'claude') {
+  constructor(database, model = 'opus', provider = 'claude', providerOverrides = {}, providerOverridesMap = null) {
     // Store model and provider for creating provider instances per level
     this.model = model;
     this.provider = provider;
     this.db = database;
+    this.providerOverrides = providerOverrides;
+    this.providerOverridesMap = providerOverridesMap;
     this.testContextCache = new Map(); // Cache test detection results per worktree
     this._worktreeManager = null; // Lazy-initialized for sparse-checkout queries
   }
@@ -1015,7 +1023,7 @@ Or simply ignore any changes to files matching these patterns in your analysis.
       }
 
       // Create provider instance for this level
-      const aiProvider = createProvider(this.provider, this.model);
+      const aiProvider = createProvider(this.provider, this.model, this.providerOverrides);
 
       const updateProgress = (step) => {
         const progress = `${lp}[Level 1] ${step}...`;
@@ -1975,7 +1983,7 @@ If you are unsure, use "NEW" - it is correct for the vast majority of suggestion
       }
 
       // Create provider instance for this level
-      const aiProvider = createProvider(this.provider, this.model);
+      const aiProvider = createProvider(this.provider, this.model, this.providerOverrides);
 
       const updateProgress = (step) => {
         const progress = `${lp}[Level 2] ${step}...`;
@@ -2085,7 +2093,7 @@ If you are unsure, use "NEW" - it is correct for the vast majority of suggestion
       }
 
       // Create provider instance for this level
-      const aiProvider = createProvider(this.provider, this.model);
+      const aiProvider = createProvider(this.provider, this.model, this.providerOverrides);
 
       const updateProgress = (step) => {
         const progress = `${lp}[Level 3] ${step}...`;
@@ -2655,7 +2663,7 @@ File-level suggestions should NOT have a line number. They apply to the entire f
       }
 
       // Create provider instance for consolidation (use overrides if provided)
-      const aiProvider = createProvider(providerOverride || this.provider, modelOverride || this.model);
+      const aiProvider = createProvider(providerOverride || this.provider, modelOverride || this.model, this.providerOverrides);
 
       // Build the consolidation prompt
       const prompt = this.buildOrchestrationPrompt(allSuggestions, prMetadata, customInstructions, worktreePath, tier, lp, { excludePrevious, dedupContext });
@@ -2932,7 +2940,7 @@ File-level suggestions should NOT have a line number. They apply to the entire f
     if (voices.length === 1) {
       const voice = voices[0];
       const { voiceAnalyzer, voiceProvider, isExecutable, voiceKey, reviewerLabel, voiceRequestInstructions, voiceProgressCallback, voiceTier, voiceTimeout } =
-        buildVoiceContext(voice, 0, instructions, progressCallback, this.db);
+        buildVoiceContext(voice, 0, instructions, progressCallback, this.db, this.providerOverrides, this.providerOverridesMap);
       logger.info(`[ReviewerCouncil] Single reviewer (${reviewerLabel}) — running directly on parent run, no child run`);
 
       // Report voice-centric progress structure
@@ -3034,7 +3042,7 @@ File-level suggestions should NOT have a line number. They apply to the entire f
     const commentRepo = new CommentRepository(this.db);
     const voicePromises = voices.map(async (voice, idx) => {
       const { voiceAnalyzer, voiceProvider, isExecutable, voiceKey, reviewerLabel, voiceRequestInstructions, voiceProgressCallback, voiceTier, voiceTimeout } =
-        buildVoiceContext(voice, idx, instructions, progressCallback, this.db);
+        buildVoiceContext(voice, idx, instructions, progressCallback, this.db, this.providerOverrides, this.providerOverridesMap);
       const childRunId = uuidv4();
 
       // Create child analysis run record
@@ -3271,7 +3279,7 @@ File-level suggestions should NOT have a line number. They apply to the entire f
 
       const consolidated = await this._crossVoiceConsolidate(
         voiceReviews, prMetadata, consolInstructions, worktreePath,
-        { provider: consolProvider, model: consolModel, tier: consolTier, timeout: consolConfig.timeout, analysisId, progressCallback, excludePrevious, dedupContext }
+        { provider: consolProvider, model: consolModel, tier: consolTier, timeout: consolConfig.timeout, analysisId, progressCallback, excludePrevious, dedupContext, providerOverrides: this.providerOverrides }
       );
 
       const finalSuggestions = this.validateAndFinalizeSuggestions(
@@ -3410,7 +3418,8 @@ File-level suggestions should NOT have a line number. They apply to the entire f
           tier,
           timeout: voice.timeout || VoiceProviderClass?.defaultTimeout || 600000,
           customInstructions: voiceInstructions,
-          voiceCustomInstructions: voice.customInstructions || null
+          voiceCustomInstructions: voice.customInstructions || null,
+          providerOverrides: this.providerOverridesMap?.[voice.provider] || this.providerOverrides
         });
       }
     }
@@ -3575,7 +3584,7 @@ File-level suggestions should NOT have a line number. They apply to the entire f
           }));
           const consolidated = await this._intraLevelConsolidate(
             level, voiceGroups, prMetadata, orchInstructions, worktreePath,
-            { provider: orchProvider, model: orchModel, tier: orchTier, timeout: orchConfig.timeout, analysisId, progressCallback, reviewerCount: successfulVoicesForLevel.length }
+            { provider: orchProvider, model: orchModel, tier: orchTier, timeout: orchConfig.timeout, analysisId, progressCallback, reviewerCount: successfulVoicesForLevel.length, providerOverrides: this.providerOverrides }
           );
           consolidatedPerLevel[level] = consolidated;
           // Report intra-level consolidation step as completed
@@ -3661,7 +3670,7 @@ File-level suggestions should NOT have a line number. They apply to the entire f
    * @private
    */
   async _executeCouncilVoice(task, context) {
-    const { voiceId, reviewerLabel, reviewerLogPrefix, level, provider, model, tier, timeout = 600000, customInstructions } = task;
+    const { voiceId, reviewerLabel, reviewerLogPrefix, level, provider, model, tier, timeout = 600000, customInstructions, providerOverrides } = task;
     const { reviewId, runId, worktreePath, prMetadata, generatedPatterns, validFiles, analysisId, progressCallback } = context;
     const displayLabel = reviewerLabel || voiceId;
 
@@ -3672,7 +3681,7 @@ File-level suggestions should NOT have a line number. They apply to the entire f
     }
 
     // Create provider instance for this voice
-    const aiProvider = createProvider(provider, model);
+    const aiProvider = createProvider(provider, model, providerOverrides || {});
 
     // Build prompt based on level
     let prompt;
@@ -3748,9 +3757,9 @@ File-level suggestions should NOT have a line number. They apply to the entire f
    * @private
    */
   async _intraLevelConsolidate(level, voiceGroups, prMetadata, customInstructions, worktreePath, orchConfig) {
-    const { provider, model, tier, timeout, analysisId, progressCallback, reviewerCount } = orchConfig;
+    const { provider, model, tier, timeout, analysisId, progressCallback, reviewerCount, providerOverrides } = orchConfig;
 
-    const aiProvider = createProvider(provider, model);
+    const aiProvider = createProvider(provider, model, providerOverrides || {});
 
     const isLocal = prMetadata.reviewType === 'local';
     const reviewDescription = isLocal
@@ -3916,9 +3925,9 @@ File-level suggestions should NOT have a line number. They apply to the entire f
    * @private
    */
   async _crossVoiceConsolidate(voiceReviews, prMetadata, customInstructions, worktreePath, config) {
-    const { provider, model, tier, timeout, analysisId, progressCallback, excludePrevious, dedupContext } = config;
+    const { provider, model, tier, timeout, analysisId, progressCallback, excludePrevious, dedupContext, providerOverrides } = config;
 
-    const aiProvider = createProvider(provider, model);
+    const aiProvider = createProvider(provider, model, providerOverrides || {});
 
     const voiceDescriptions = voiceReviews.map(v => {
       let desc = `### Reviewer: ${v.voiceKey}`;

package/src/ai/claude-cli.js

@@ -53,6 +53,8 @@ class ClaudeCLI {
       });
 
       const pid = claude.pid;
+      const fullCommand = this.useShell ? this.command : `${this.command} ${this.args.join(' ')}`;
+      logger.debug(`${levelPrefix} Claude CLI command: ${fullCommand}`);
       logger.info(`${levelPrefix} Spawned Claude CLI process: PID ${pid}`);
 
       let stdout = '';

package/src/ai/claude-provider.js

@@ -257,7 +257,8 @@ class ClaudeProvider extends AIProvider {
       logger.info(`${levelPrefix} Executing Claude CLI...`);
       logger.info(`${levelPrefix} Writing prompt: ${prompt.length} bytes`);
 
-      const claude = spawn(this.command, this.args, {
+      const spawnArgs = [...this.args];
+      const claude = spawn(this.command, spawnArgs, {
         cwd,
         env: {
           ...process.env,
@@ -268,6 +269,8 @@ class ClaudeProvider extends AIProvider {
       });
 
       const pid = claude.pid;
+      const fullCommand = this.useShell ? this.command : `${this.command} ${spawnArgs.join(' ')}`;
+      logger.debug(`${levelPrefix} Claude CLI command: ${fullCommand}`);
       logger.info(`${levelPrefix} Spawned Claude CLI process: PID ${pid}`);
 
       // Register process for cancellation tracking if analysisId provided