@in-the-loop-labs/pair-review 3.2.3 → 3.3.1

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,