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

package/src/ai/prompts/baseline/consolidation/balanced.js

@@ -123,9 +123,11 @@ Assess severity based on the evidence and reasoning across all reviewers. When r
 
 <section name="summary-synthesis" required="true">
 ## Summary Synthesis
-The summary field should synthesize the findings, not list them.
-- Synthesize the key findings into a single cohesive paragraph
-- **Draw on reviewer summaries**: Use these as evidence for your own synthesis — integrate their insights into a cohesive conclusion rather than listing them individually
+The summary field should synthesize the findings, but it should not be one big paragraph.
+- Start with 1-2 sentences describing the overall assessment
+- Then include a markdown bullet list using "- " bullets for the key specific points
+- **Draw on reviewer summaries**: Use these as evidence for your own synthesis — integrate their insights into the overview and bullets rather than listing reviewer-by-reviewer conclusions
+- After the bullets, add extra sentences or short paragraphs only when needed for requested context or follow-up detail
 - Write as if a single reviewer produced this analysis — do not mention consolidation, merging, or multiple reviewers
 </section>
 
@@ -160,7 +162,7 @@ Output JSON with this structure:
     "confidence": 0.0-1.0,
     "reasoning": ["Step-by-step reasoning explaining why this issue was flagged (optional)"]
   }],
-  "summary": "Single cohesive paragraph summarizing key findings. Write as a single reviewer."
+  "summary": "Formatted markdown summary following the Summary Synthesis guidance above."
 }
 
 ### GitHub Suggestion Syntax

package/src/ai/prompts/baseline/consolidation/fast.js

@@ -83,7 +83,11 @@ Deduplicate, don't concatenate: merge duplicate findings, preserve distinct ones
 </section>
 
 <section name="summary-synthesis" required="true" tier="fast">
-Draw on reviewer summaries as evidence for your own synthesis. Write one cohesive paragraph — no mention of consolidation/merging.
+Draw on reviewer summaries as evidence for your own synthesis. The summary field should be markdown, not one big paragraph.
+- Start with 1-2 sentences describing the overall assessment
+- Then include a markdown bullet list using "- " bullets for the key specific points
+- After the bullets, add extra sentences or short paragraphs only when needed for requested context or follow-up detail
+- Write as a single reviewer with no mention of consolidation or merging
 </section>
 
 <section name="output-schema" locked="true">
@@ -109,7 +113,7 @@ Draw on reviewer summaries as evidence for your own synthesis. Write one cohesiv
     "suggestion": "How to address the file-level concern (omit for praise items)",
     "confidence": 0.0-1.0
   }],
-  "summary": "Single cohesive paragraph of key findings. Write as single reviewer."
+  "summary": "Formatted markdown summary following the summary guidance above."
 }
 
 ### GitHub Suggestion Syntax

package/src/ai/prompts/baseline/consolidation/thorough.js

@@ -167,13 +167,14 @@ Note: Confidence is about certainty of value, not severity.
 
 <section name="summary-synthesis" required="true" tier="thorough">
 ## Summary Synthesis Guidance
-The summary field should synthesize the findings, not list them.
+The summary field should synthesize the findings, but it should not be one big paragraph.
 
 **Effective Summary Approach:**
-- **Lead with the most important insight**: What should the reviewer focus on first?
-- **Connect the dots**: How do individual findings relate to each other?
-- **Calibrate severity**: Is this code fundamentally sound with minor issues, or are there structural problems?
-- **Draw on reviewer summaries**: Use these as evidence for your own synthesis — integrate their insights into a cohesive conclusion rather than listing them individually.
+- **Start with 1-2 sentences of overall assessment**: Lead with the most important insight and calibrate the overall severity
+- **Then use a markdown bullet list with "- " bullets**: Capture the key specific points the reviewer should keep in view
+- **Connect the dots**: Make the overview and bullets feel like one coherent review, not disconnected fragments
+- **Draw on reviewer summaries**: Use these as evidence for your own synthesis — integrate their insights into the overview and bullets rather than listing reviewer-by-reviewer conclusions.
+- **After the bullets, add extra sentences or short paragraphs only when needed**: Use them for requested context, caveats, or follow-up detail
 - **Write as a single reviewer**: Do not mention consolidation, merging, or multiple reviewers -- unless specifically requested
 </section>
 
@@ -208,7 +209,7 @@ Output JSON with this structure:
     "confidence": 0.0-1.0,
     "reasoning": ["Step-by-step reasoning explaining why this issue was flagged"]
   }],
-  "summary": "Single cohesive paragraph synthesizing key findings and their significance. Write as a single reviewer — do not mention consolidation, merging, or multiple reviewers."
+  "summary": "Formatted markdown summary following the Summary Synthesis Guidance above."
 }
 
 ### GitHub Suggestion Syntax

package/src/ai/prompts/baseline/orchestration/balanced.js

@@ -121,6 +121,16 @@ Prioritize suggestions in this order:
 - **Provide context** for why each suggestion matters to the reviewer
 </section>
 
+<section name="summary-synthesis" required="true">
+## Summary Structure
+The summary field should synthesize the findings, but it should not be one big paragraph.
+- Start with 1-2 sentences describing the overall assessment
+- Then include a markdown bullet list using "- " bullets for the key specific points
+- After the bullets, add extra sentences or short paragraphs only when needed for requested context or follow-up detail
+- Focus on WHAT was found, not HOW it was found
+- Write as if a single reviewer produced this analysis
+</section>
+
 <section name="output-schema" locked="true">
 ## Output Format
 
@@ -151,7 +161,7 @@ Output JSON with this structure:
     "confidence": 0.0-1.0,
     "reasoning": ["Step-by-step reasoning explaining why this issue was flagged (optional)"]
   }],
-  "summary": "Brief summary of the key findings and their significance to the reviewer. Focus on WHAT was found, not HOW it was found. Do NOT mention 'orchestration', 'levels', 'merged from Level 1/2/3' etc. Write as if a single reviewer produced this analysis."
+  "summary": "Formatted markdown summary following the Summary Structure guidance above."
 }
 
 ### GitHub Suggestion Syntax
@@ -218,6 +228,7 @@ const sections = [
   { name: 'priority-curation', required: true },
   { name: 'balanced-output', required: true },
   { name: 'human-centric-framing', required: true },
+  { name: 'summary-synthesis', required: true },
   { name: 'output-schema', locked: true },
   { name: 'diff-instructions', required: true },
   { name: 'file-level-guidance', optional: true, tier: ['balanced', 'thorough'] },
@@ -240,6 +251,7 @@ const defaultOrder = [
   'priority-curation',
   'balanced-output',
   'human-centric-framing',
+  'summary-synthesis',
   'output-schema',
   'diff-instructions',
   'file-level-guidance',

package/src/ai/prompts/baseline/orchestration/fast.js

@@ -103,6 +103,15 @@ Max 2-3 praise items. Prefer line-level over file-level. Include actionable sugg
 Use "Consider...", "Worth noting..." - guidance not mandates.
 </section>
 
+<section name="summary-synthesis" required="true" tier="fast">
+### Summary
+The summary field should be markdown, not one big paragraph.
+- Start with 1-2 sentences describing the overall assessment
+- Then include a markdown bullet list using "- " bullets for the key specific points
+- After the bullets, add extra sentences or short paragraphs only when needed for requested context or follow-up detail
+- Write as a single reviewer; do not mention levels or orchestration
+</section>
+
 <section name="output-schema" locked="true">
 ## JSON Schema
 {
@@ -127,7 +136,7 @@ Use "Consider...", "Worth noting..." - guidance not mandates.
     "suggestion": "How to fix (omit for praise)",
     "confidence": 0.0-1.0
   }],
-  "summary": "Key findings as if from single reviewer (no mention of levels/orchestration)"
+  "summary": "Formatted markdown summary following the Summary guidance above."
 }
 
 ### GitHub Suggestion Syntax
@@ -167,6 +176,7 @@ const sections = [
   { name: 'priority-curation', required: true, tier: ['fast'] },
   { name: 'balanced-output', required: true, tier: ['fast'] },
   { name: 'human-centric-framing', required: true, tier: ['fast'] },
+  { name: 'summary-synthesis', required: true, tier: ['fast'] },
   { name: 'output-schema', locked: true },
   { name: 'diff-instructions', required: true, tier: ['fast'] },
   { name: 'guidelines', required: true, tier: ['fast'] }
@@ -189,6 +199,7 @@ const defaultOrder = [
   'priority-curation',
   'balanced-output',
   'human-centric-framing',
+  'summary-synthesis',
   'output-schema',
   'diff-instructions',
   'guidelines'

package/src/ai/prompts/baseline/orchestration/thorough.js

@@ -248,20 +248,21 @@ Note: Confidence is about certainty of value, not severity. A minor improvement
 
 <section name="summary-synthesis" required="true" tier="thorough">
 ## Summary Synthesis Guidance
-The summary field is not a list of findings - it's a synthesis that helps the reviewer see the forest, not just the trees.
+The summary field should help the reviewer see the forest, not just the trees, but it should not be one big paragraph.
 
 **Effective Summary Approach:**
-- **Synthesize, don't summarize**: Identify the overarching narrative of this PR's quality and concerns
-- **Lead with the most important insight**: What single thing should the reviewer understand first?
-- **Connect the dots**: How do individual findings relate to each other or to a common theme?
-- **Calibrate severity**: Is this PR fundamentally sound with minor issues, or does it have structural problems?
+- **Start with 1-2 sentences of overall assessment**: Identify the overarching narrative of this PR's quality and concerns
+- **Then use a markdown bullet list with "- " bullets**: Capture the key specific points the reviewer should track
+- **Connect the dots**: Make the overview and bullets feel like one coherent review
+- **Calibrate severity**: Make clear whether this PR is fundamentally sound with minor issues or has structural problems
+- **After the bullets, add extra sentences or short paragraphs only when needed**: Use them for requested context, caveats, or follow-up detail
 - **Respect reviewer time**: A good summary lets the reviewer decide where to focus attention
 
 **Summary Anti-patterns to Avoid:**
 - Listing findings ("Found 3 bugs, 2 improvements, 1 praise...")
 - Implementation details ("Merged Level 1 and Level 2 suggestions...")
 - Vague platitudes ("This PR has some issues to consider...")
-- Excessive length (2-3 sentences is ideal)
+- A single unbroken paragraph with no bullets
 </section>
 
 <section name="output-schema" locked="true">
@@ -294,7 +295,7 @@ Output JSON with this structure:
     "confidence": 0.0-1.0,
     "reasoning": ["Step-by-step reasoning explaining why this issue was flagged"]
   }],
-  "summary": "Brief summary of the key findings and their significance to the reviewer. Focus on WHAT was found, not HOW it was found. Do NOT mention 'orchestration', 'levels', 'merged from Level 1/2/3' etc. Write as if a single reviewer produced this analysis."
+  "summary": "Formatted markdown summary following the Summary Synthesis Guidance above."
 }
 
 ### GitHub Suggestion Syntax

package/src/ai/provider.js

@@ -671,10 +671,11 @@ function getAllProvidersInfo() {
  * Create a provider instance
  * @param {string} providerId - Provider ID (e.g., 'claude', 'gemini')
  * @param {string} model - Model to use (optional, uses default if not specified)
+ * @param {Object} overrides - Per-call config overrides that supersede global providerConfigOverrides (optional)
  * @returns {AIProvider}
  * @throws {Error} If provider is not registered
  */
-function createProvider(providerId, model = null) {
+function createProvider(providerId, model = null, overrides = {}) {
   const ProviderClass = providerRegistry.get(providerId);
 
   if (!ProviderClass) {
@@ -683,7 +684,7 @@ function createProvider(providerId, model = null) {
   }
 
   // Get config overrides for this provider
-  const overrides = providerConfigOverrides.get(providerId);
+  const configOverrides = providerConfigOverrides.get(providerId);
 
   // Determine the actual model to use
   let actualModel = model;
@@ -691,8 +692,8 @@ function createProvider(providerId, model = null) {
     // Resolve default from merged models (config + built-in).
     // Checks both sources because some providers (e.g., Pi) define built-in
     // modes with default:true that aren't in config overrides.
-    if (overrides?.models || ProviderClass.getModels().length > 0) {
-      actualModel = resolveDefaultModel(mergeModels(ProviderClass.getModels(), overrides?.models));
+    if (configOverrides?.models || ProviderClass.getModels().length > 0) {
+      actualModel = resolveDefaultModel(mergeModels(ProviderClass.getModels(), configOverrides?.models));
     }
     // Fall back to provider's built-in default
     if (!actualModel) {
@@ -700,8 +701,8 @@ function createProvider(providerId, model = null) {
     }
   }
 
-  // Create provider instance with config overrides
-  return new ProviderClass(actualModel, { ...(overrides || {}), yolo: yoloMode });
+  // Create provider instance with config overrides, per-call overrides, and yolo mode
+  return new ProviderClass(actualModel, { ...(configOverrides || {}), ...overrides, yolo: yoloMode });
 }
 
 /**

package/src/chat/session-manager.js

@@ -43,7 +43,7 @@ class ChatSessionManager {
    * @param {string} [options.initialContext] - Initial context to prepend to the first user message
    * @returns {Promise<{id: number, status: string}>}
    */
-  async createSession({ provider, model, reviewId, contextCommentId, systemPrompt, cwd, initialContext }) {
+  async createSession({ provider, model, reviewId, contextCommentId, systemPrompt, cwd, initialContext, loadSkills }) {
     // Resolve provider definition once — used for model fallback and bridge construction
     const providerDef = getChatProvider(provider);
 
@@ -72,6 +72,7 @@ class ChatSessionManager {
       model: resolvedModel,
       cwd,
       systemPrompt,
+      loadSkills,
     }, providerDef);
 
     const listeners = {
@@ -413,9 +414,10 @@ class ChatSessionManager {
    * @param {Object} options
    * @param {string} [options.systemPrompt] - System prompt text
    * @param {string} [options.cwd] - Working directory for agent
+   * @param {boolean} [options.loadSkills] - Resolved load_skills override for the session
    * @returns {Promise<{id: number, status: string}>}
    */
-  async resumeSession(sessionId, { systemPrompt, cwd } = {}) {
+  async resumeSession(sessionId, { systemPrompt, cwd, loadSkills } = {}) {
     // Already active — return immediately
     if (this._sessions.has(sessionId)) {
       return { id: sessionId, status: 'active' };
@@ -459,6 +461,7 @@ class ChatSessionManager {
       model: row.model,
       cwd,
       systemPrompt,
+      loadSkills,
       ...resumeOptions,
     });
 
@@ -588,7 +591,7 @@ class ChatSessionManager {
       useShell: def?.useShell,
       tools: CHAT_TOOLS,
       extensions: appExtensions ? [taskExtensionDir] : [],
-      loadSkills: def?.load_skills,
+      loadSkills: options.loadSkills ?? def?.load_skills,
     });
   }
 

package/src/config.js

@@ -34,7 +34,7 @@ const DEFAULT_CONFIG = {
   chat: { enable_shortcuts: true, enter_to_send: true },  // Chat panel settings (enable_shortcuts: show action shortcut buttons, enter_to_send: Enter sends message instead of newline)
   providers: {},  // Custom AI analysis provider configurations (overrides built-in defaults)
   chat_providers: {},  // Custom chat provider configurations (overrides built-in defaults)
-  monorepos: {},  // Monorepo configurations: { "owner/repo": { path: "~/path/to/clone" } }
+  repos: {},  // Repository configurations: { "owner/repo": { path: "~/path/to/clone" } }
   assisted_by_url: "https://github.com/in-the-loop-labs/pair-review",  // URL for "Review assisted by" footer link
   hooks: {},  // Hook commands per event: { "review.started": { "my_hook": { "command": "..." } } }
   enable_graphite: false,  // When true, shows Graphite links alongside GitHub links
@@ -221,6 +221,20 @@ async function loadConfig() {
     }
   }
 
+  // Normalize legacy monorepos key into repos (monorepos values are overridden by repos)
+  if (mergedConfig.monorepos) {
+    mergedConfig.repos = deepMerge(mergedConfig.monorepos, mergedConfig.repos);
+  }
+
+  // Normalize repo keys to lowercase to match the database's COLLATE NOCASE identity
+  if (mergedConfig.repos) {
+    const normalized = {};
+    for (const [key, value] of Object.entries(mergedConfig.repos)) {
+      normalized[key.toLowerCase()] = value;
+    }
+    mergedConfig.repos = normalized;
+  }
+
   // Validate port
   if (!validatePort(mergedConfig.port)) {
     console.error(`Invalid port number ${mergedConfig.port}`);
@@ -393,83 +407,248 @@ function expandPath(p) {
 }
 
 /**
- * Gets the configured monorepo path for a repository
+ * Get repository configuration, checking `repos` key first, falling back to `monorepos`.
+ * @param {object} config
+ * @param {string} repository - owner/repo
+ * @returns {object|null}
+ */
+function getRepoConfig(config, repository) {
+  const reposSection = config.repos || {};
+  const entry = reposSection[repository];
+  if (entry) return entry;
+
+  const legacySection = config.monorepos || {};
+  return legacySection[repository] || null;
+}
+
+/**
+ * Gets the configured repository path
  * @param {Object} config - Configuration object from loadConfig()
  * @param {string} repository - Repository in "owner/repo" format
  * @returns {string|null} - Expanded path or null if not configured
  */
-function getMonorepoPath(config, repository) {
-  const monorepoConfig = config.monorepos?.[repository];
-  if (monorepoConfig?.path) {
-    return expandPath(monorepoConfig.path);
+function getRepoPath(config, repository) {
+  const repoConfig = getRepoConfig(config, repository);
+  if (repoConfig?.path) {
+    return expandPath(repoConfig.path);
   }
   return null;
 }
 
 /**
- * Gets the configured checkout script for a monorepo repository
+ * Gets the configured checkout script for a repository
  * @param {Object} config - Configuration object from loadConfig()
  * @param {string} repository - Repository in "owner/repo" format
  * @returns {string|null} - Checkout script path or null if not configured
  */
-function getMonorepoCheckoutScript(config, repository) {
-  const monorepoConfig = config.monorepos?.[repository];
-  return monorepoConfig?.checkout_script || null;
+function getRepoCheckoutScript(config, repository) {
+  const repoConfig = getRepoConfig(config, repository);
+  return repoConfig?.checkout_script || null;
 }
 
 /**
- * Gets the configured worktree directory for a monorepo repository
+ * Gets the configured worktree directory for a repository
  * @param {Object} config - Configuration object from loadConfig()
  * @param {string} repository - Repository in "owner/repo" format
  * @returns {string|null} - Expanded worktree directory path or null if not configured
  */
-function getMonorepoWorktreeDirectory(config, repository) {
-  const monorepoConfig = config.monorepos?.[repository];
-  if (monorepoConfig?.worktree_directory) {
-    return expandPath(monorepoConfig.worktree_directory);
+function getRepoWorktreeDirectory(config, repository) {
+  const repoConfig = getRepoConfig(config, repository);
+  if (repoConfig?.worktree_directory) {
+    return expandPath(repoConfig.worktree_directory);
   }
   return null;
 }
 
 /**
- * Gets the configured worktree name template for a monorepo repository
+ * Gets the configured worktree name template for a repository
  * @param {Object} config - Configuration object from loadConfig()
  * @param {string} repository - Repository in "owner/repo" format
  * @returns {string|null} - Template string or null if not configured
  */
-function getMonorepoWorktreeNameTemplate(config, repository) {
-  const monorepoConfig = config.monorepos?.[repository];
-  return monorepoConfig?.worktree_name_template || null;
+function getRepoWorktreeNameTemplate(config, repository) {
+  const repoConfig = getRepoConfig(config, repository);
+  return repoConfig?.worktree_name_template || null;
 }
 
 /**
- * Gets the configured checkout script timeout for a monorepo repository
+ * Computes the display name for a worktree path by deriving the relative
+ * path from the configured (or default) worktree base directory.
+ * Falls back to the basename when the path lies outside the base directory.
+ *
+ * @param {string} worktreePath - Absolute path to the worktree
+ * @param {Object} config - Configuration object from loadConfig()
+ * @param {string} repository - Repository in "owner/repo" format
+ * @returns {string|null} - Relative display name (e.g. "abc123/src") or basename fallback
+ */
+function getWorktreeDisplayName(worktreePath, config, repository) {
+  if (!worktreePath) return null;
+  const worktreeBaseDir = getRepoWorktreeDirectory(config, repository)
+    || path.join(getConfigDir(), 'worktrees');
+  const relativePath = path.relative(worktreeBaseDir, worktreePath);
+  if (relativePath.startsWith('..')) {
+    return path.basename(worktreePath);
+  }
+  return relativePath;
+}
+
+/**
+ * Gets the configured checkout script timeout for a repository
  * @param {Object} config - Configuration object from loadConfig()
  * @param {string} repository - Repository in "owner/repo" format
  * @returns {number} - Timeout in milliseconds (default: 300000 = 5 minutes)
  */
-function getMonorepoCheckoutTimeout(config, repository) {
-  const monorepoConfig = config.monorepos?.[repository];
-  if (monorepoConfig?.checkout_timeout_seconds > 0) {
-    return monorepoConfig.checkout_timeout_seconds * 1000;
+function getRepoCheckoutTimeout(config, repository) {
+  const repoConfig = getRepoConfig(config, repository);
+  if (repoConfig?.checkout_timeout_seconds > 0) {
+    return repoConfig.checkout_timeout_seconds * 1000;
   }
   return DEFAULT_CHECKOUT_TIMEOUT_MS; // 5 minutes default
 }
 
 /**
- * Resolves all monorepo worktree options for a repository into a single object.
+ * Gets the configured reset script for a repository
+ * @param {Object} config - Configuration object from loadConfig()
+ * @param {string} repository - Repository in "owner/repo" format
+ * @returns {string|null} - Reset script path or null if not configured
+ */
+function getRepoResetScript(config, repository) {
+  const repoConfig = getRepoConfig(config, repository);
+  return repoConfig?.reset_script || null;
+}
+
+/**
+ * Gets the configured pool size for a repository from file config only.
+ * Prefer resolvePoolConfig() when DB repo_settings are available.
+ * @param {Object} config - Configuration object from loadConfig()
+ * @param {string} repository - Repository in "owner/repo" format
+ * @returns {number} - Pool size (0 if not configured or invalid)
+ */
+function getRepoPoolSize(config, repository) {
+  const repoConfig = getRepoConfig(config, repository);
+  const size = repoConfig?.pool_size;
+  return (typeof size === 'number' && size > 0) ? size : 0;
+}
+
+/**
+ * Gets the configured pool fetch interval for a repository from file config only.
+ * Prefer resolvePoolConfig() when DB repo_settings are available.
+ * @param {Object} config - Configuration object from loadConfig()
+ * @param {string} repository - Repository in "owner/repo" format
+ * @returns {number|null} - Interval in minutes or null if not configured
+ */
+function getRepoPoolFetchInterval(config, repository) {
+  const repoConfig = getRepoConfig(config, repository);
+  const minutes = repoConfig?.pool_fetch_interval_minutes;
+  return (typeof minutes === 'number' && minutes > 0) ? minutes : null;
+}
+
+/**
+ * Gets the configured load_skills setting for a repository from file config.
+ * @param {Object} config - Configuration object from loadConfig()
+ * @param {string} repository - Repository in "owner/repo" format
+ * @returns {boolean|null} - true/false if set, null if not configured
+ */
+function getRepoLoadSkills(config, repository) {
+  const repoConfig = getRepoConfig(config, repository);
+  const val = repoConfig?.load_skills;
+  return typeof val === 'boolean' ? val : null;
+}
+
+/**
+ * Resolves the load_skills setting for a repository, checking DB repo_settings first,
+ * then repo JSON config, then provider config. Returns a boolean suitable for passing
+ * directly to provider constructors (which check `!== false`).
+ *
+ * @param {Object} config - Configuration object from loadConfig()
+ * @param {string} repository - Repository in "owner/repo" format
+ * @param {Object|null} repoSettings - DB repo_settings row (from RepoSettingsRepository.getRepoSettings)
+ * @param {boolean} [providerLoadSkills] - Provider-level load_skills from config.providers
+ * @returns {boolean} - Resolved load_skills value
+ */
+function resolveLoadSkills(config, repository, repoSettings, providerLoadSkills) {
+  // Tier 1: DB repo settings (1 = true, 0 = false, null = not set)
+  const dbVal = repoSettings?.load_skills;
+  if (typeof dbVal === 'number' && (dbVal === 0 || dbVal === 1)) {
+    return dbVal === 1;
+  }
+
+  // Tier 2: Repo JSON config (config.repos["owner/repo"].load_skills)
+  const repoVal = getRepoLoadSkills(config, repository);
+  if (repoVal !== null) {
+    return repoVal;
+  }
+
+  // Tier 3: Provider-level config
+  if (typeof providerLoadSkills === 'boolean') {
+    return providerLoadSkills;
+  }
+
+  // Tier 4: Default
+  return true;
+}
+
+/**
+ * Builds council-mode provider overrides: a shared (tier 1+2) base and a per-provider
+ * map that includes tier 3 resolution for each configured provider.
+ *
+ * @param {Object} config - Configuration object from loadConfig()
+ * @param {string} repository - Repository in "owner/repo" format
+ * @param {Object|null} repoSettings - DB repo_settings row
+ * @returns {{ providerOverrides: Object, providerOverridesMap: Object }}
+ */
+function buildCouncilProviderOverrides(config, repository, repoSettings) {
+  const baseLoadSkills = resolveLoadSkills(config, repository, repoSettings);
+  const providerOverrides = { load_skills: baseLoadSkills };
+  const providerOverridesMap = {};
+  if (config.providers) {
+    for (const [pid, pconf] of Object.entries(config.providers)) {
+      providerOverridesMap[pid] = {
+        load_skills: resolveLoadSkills(config, repository, repoSettings, pconf?.load_skills)
+      };
+    }
+  }
+  return { providerOverrides, providerOverridesMap };
+}
+
+/**
+ * Resolves pool configuration for a repository, checking DB repo_settings first,
+ * then falling back to file config. DB values take precedence when set (non-null).
+ * @param {Object} config - Configuration object from loadConfig()
+ * @param {string} repository - Repository in "owner/repo" format
+ * @param {Object|null} repoSettings - DB repo_settings row (from RepoSettingsRepository.getRepoSettings)
+ * @returns {{ poolSize: number, poolFetchIntervalMinutes: number|null }}
+ */
+function resolvePoolConfig(config, repository, repoSettings) {
+  const dbPoolSize = repoSettings?.pool_size;
+  const dbFetchInterval = repoSettings?.pool_fetch_interval_minutes;
+
+  const poolSize = (typeof dbPoolSize === 'number' && dbPoolSize >= 0)
+    ? dbPoolSize
+    : getRepoPoolSize(config, repository);
+
+  const poolFetchIntervalMinutes = (typeof dbFetchInterval === 'number' && dbFetchInterval >= 0)
+    ? (dbFetchInterval > 0 ? dbFetchInterval : null)
+    : getRepoPoolFetchInterval(config, repository);
+
+  return { poolSize, poolFetchIntervalMinutes };
+}
+
+/**
+ * Resolves all repository worktree options into a single object.
  * Composite helper that combines the individual getters into the shape expected
  * by GitWorktreeManager and createWorktreeForPR.
  *
  * @param {Object} config - Configuration object from loadConfig()
  * @param {string} repository - Repository in "owner/repo" format
- * @returns {{ checkoutScript: string|null, checkoutTimeout: number, worktreeConfig: Object|null }}
+ * @param {Object|null} [repoSettings=null] - DB repo_settings row (from RepoSettingsRepository.getRepoSettings)
+ * @returns {{ checkoutScript: string|null, checkoutTimeout: number, worktreeConfig: Object|null, resetScript: string|null, poolSize: number, poolFetchIntervalMinutes: number|null }}
  */
-function resolveMonorepoOptions(config, repository) {
-  const checkoutScript = getMonorepoCheckoutScript(config, repository);
-  const checkoutTimeout = getMonorepoCheckoutTimeout(config, repository);
-  const worktreeDirectory = getMonorepoWorktreeDirectory(config, repository);
-  const nameTemplate = getMonorepoWorktreeNameTemplate(config, repository);
+function resolveRepoOptions(config, repository, repoSettings = null) {
+  const checkoutScript = getRepoCheckoutScript(config, repository);
+  const checkoutTimeout = getRepoCheckoutTimeout(config, repository);
+  const worktreeDirectory = getRepoWorktreeDirectory(config, repository);
+  const nameTemplate = getRepoWorktreeNameTemplate(config, repository);
 
   let worktreeConfig = null;
   if (worktreeDirectory || nameTemplate) {
@@ -478,7 +657,10 @@ function resolveMonorepoOptions(config, repository) {
     if (nameTemplate) worktreeConfig.nameTemplate = nameTemplate;
   }
 
-  return { checkoutScript, checkoutTimeout, worktreeConfig };
+  const resetScript = getRepoResetScript(config, repository);
+  const { poolSize, poolFetchIntervalMinutes } = resolvePoolConfig(config, repository, repoSettings);
+
+  return { checkoutScript, checkoutTimeout, worktreeConfig, resetScript, poolSize, poolFetchIntervalMinutes };
 }
 
 /**
@@ -558,12 +740,22 @@ module.exports = {
   isRunningViaNpx,
   showWelcomeMessage,
   expandPath,
-  getMonorepoPath,
-  getMonorepoCheckoutScript,
-  getMonorepoWorktreeDirectory,
-  getMonorepoWorktreeNameTemplate,
-  getMonorepoCheckoutTimeout,
-  resolveMonorepoOptions,
+  // New repo-prefixed names
+  getRepoConfig,
+  getRepoPath,
+  getRepoCheckoutScript,
+  getRepoWorktreeDirectory,
+  getRepoWorktreeNameTemplate,
+  getWorktreeDisplayName,
+  getRepoCheckoutTimeout,
+  resolveRepoOptions,
+  getRepoResetScript,
+  getRepoPoolSize,
+  getRepoPoolFetchInterval,
+  getRepoLoadSkills,
+  resolvePoolConfig,
+  resolveLoadSkills,
+  buildCouncilProviderOverrides,
   resolveDbName,
   warnIfDevModeWithoutDbName,
   shouldSkipUpdateNotifier,