@in-the-loop-labs/pair-review 1.2.1 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@in-the-loop-labs/pair-review",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Your AI-powered code review partner - Close the feedback loop with AI coding agents",
   "main": "src/server.js",
   "bin": {
@@ -30,7 +30,7 @@
     "test:e2e:debug": "playwright test --debug",
     "generate:skill-prompts": "node scripts/generate-skill-prompts.js",
     "changeset": "changeset",
-    "version": "changeset version && node scripts/sync-plugin-versions.js && git add package.json package-lock.json CHANGELOG.md .changeset .claude-plugin/marketplace.json plugin/.claude-plugin/plugin.json plugin-code-critic/.claude-plugin/plugin.json && git commit -m 'RELEASING: Bump versions'",
+    "version": "changeset version && npm install --package-lock-only && node scripts/sync-plugin-versions.js && git add package.json package-lock.json CHANGELOG.md .changeset .claude-plugin/marketplace.json plugin/.claude-plugin/plugin.json plugin-code-critic/.claude-plugin/plugin.json && git commit -m 'RELEASING: Bump versions'",
     "release": "npm whoami > /dev/null || { echo 'Error: Not logged in to npm. Run: npm login'; exit 1; } && npm run version && changeset tag && npm publish && git push && git push --tags"
   },
   "keywords": [

package/plugin/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "pair-review",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "pair-review app integration — Open PRs and local changes in the pair-review web UI, run server-side AI analysis, and address review feedback. Requires the pair-review MCP server.",
   "author": {
     "name": "in-the-loop-labs",

package/plugin-code-critic/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "code-critic",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "AI-powered code review analysis — Run three-level AI analysis and implement-review-fix loops directly in your coding agent. Works standalone, no server required.",
   "author": {
     "name": "in-the-loop-labs",

package/src/github/parser.js

@@ -218,6 +218,62 @@ class PRArgumentParser {
     return process.cwd();
   }
 
+  /**
+   * Check if a directory is a git repository that matches the specified owner/repo.
+   * Compares the git remote origin URL against the expected owner/repo.
+   *
+   * @param {string} directory - Directory path to check
+   * @param {string} expectedOwner - Expected repository owner
+   * @param {string} expectedRepo - Expected repository name
+   * @returns {Promise<boolean>} True if the directory is a matching git repository
+   */
+  async isMatchingRepository(directory, expectedOwner, expectedRepo) {
+    try {
+      // Use _createGitForDirectory for testability (can be overridden in tests)
+      const git = this._createGitForDirectory(directory);
+
+      // Check if it's a git repository
+      const isRepo = await git.checkIsRepo();
+      if (!isRepo) {
+        return false;
+      }
+
+      // Get remote origin URL
+      const remotes = await git.getRemotes(true);
+      const origin = remotes.find(remote => remote.name === 'origin');
+
+      if (!origin) {
+        return false;
+      }
+
+      const remoteUrl = origin.refs.fetch || origin.refs.push;
+      if (!remoteUrl) {
+        return false;
+      }
+
+      // Parse the owner/repo from the remote URL
+      const { owner, repo } = this.parseRepositoryFromURL(remoteUrl);
+
+      // Compare case-insensitively (GitHub repos are case-insensitive)
+      return owner.toLowerCase() === expectedOwner.toLowerCase() &&
+             repo.toLowerCase() === expectedRepo.toLowerCase();
+    } catch (error) {
+      // Any error means the directory doesn't match
+      return false;
+    }
+  }
+
+  /**
+   * Create a git instance for a given directory.
+   * This method exists for testability - tests can override it.
+   * @param {string} directory - Directory path
+   * @returns {Object} simpleGit instance
+   * @private
+   */
+  _createGitForDirectory(directory) {
+    return simpleGit(directory);
+  }
+
   /**
    * Check if current directory is a git repository
    * @returns {Promise<boolean>} Whether current directory is a git repo

package/src/main.js

@@ -9,7 +9,7 @@ const { startServer } = require('./server');
 const Analyzer = require('./ai/analyzer');
 const { applyConfigOverrides } = require('./ai');
 const { handleLocalReview, findMainGitRoot } = require('./local-review');
-const { storePRData, registerRepositoryLocation } = require('./setup/pr-setup');
+const { storePRData, registerRepositoryLocation, findRepositoryPath } = require('./setup/pr-setup');
 const { normalizeRepository, resolveRenamedFile, resolveRenamedFileOld } = require('./utils/paths');
 const logger = require('./utils/logger');
 const simpleGit = require('simple-git');
@@ -484,16 +484,39 @@ async function handlePullRequest(args, config, db, flags = {}) {
     console.log('Fetching pull request data from GitHub...');
     const prData = await githubClient.fetchPullRequest(prInfo.owner, prInfo.repo, prInfo.number);
 
-    // Get current repository path
+    // Determine repository path: only use cwd if it matches the target repo
     const currentDir = parser.getCurrentDirectory();
+    const isMatchingRepo = await parser.isMatchingRepository(currentDir, prInfo.owner, prInfo.repo);
 
-    // Register the known repository location for future web UI usage
-    await registerRepositoryLocation(db, currentDir, prInfo.owner, prInfo.repo);
+    let repositoryPath;
+    if (isMatchingRepo) {
+      // Current directory is a checkout of the target repository
+      repositoryPath = currentDir;
+      // Register the known repository location for future web UI usage
+      await registerRepositoryLocation(db, currentDir, prInfo.owner, prInfo.repo);
+    } else {
+      // Current directory is not the target repository - find or clone it
+      console.log(`Current directory is not a checkout of ${prInfo.owner}/${prInfo.repo}, locating repository...`);
+      const repository = normalizeRepository(prInfo.owner, prInfo.repo);
+      const result = await findRepositoryPath({
+        db,
+        owner: prInfo.owner,
+        repo: prInfo.repo,
+        repository,
+        prNumber: prInfo.number,
+        onProgress: (progress) => {
+          if (progress.message) {
+            console.log(progress.message);
+          }
+        }
+      });
+      repositoryPath = result.repositoryPath;
+    }
 
     // Setup git worktree
     console.log('Setting up git worktree...');
     const worktreeManager = new GitWorktreeManager(db);
-    const worktreePath = await worktreeManager.createWorktreeForPR(prInfo, prData, currentDir);
+    const worktreePath = await worktreeManager.createWorktreeForPR(prInfo, prData, repositoryPath);
 
     // Generate unified diff
     console.log('Generating unified diff...');
@@ -701,7 +724,6 @@ async function performHeadlessReview(args, config, db, flags, options) {
     console.log('Fetching pull request data from GitHub...');
     const prData = await githubClient.fetchPullRequest(prInfo.owner, prInfo.repo, prInfo.number);
 
-    const repository = normalizeRepository(prInfo.owner, prInfo.repo);
     let worktreePath;
     let diff;
     let changedFiles;
@@ -709,6 +731,16 @@ async function performHeadlessReview(args, config, db, flags, options) {
     // Determine working directory: --use-checkout uses current directory
     if (flags.useCheckout) {
       worktreePath = process.cwd();
+
+      // Verify cwd matches the target repository when using --use-checkout
+      const isMatchingRepo = await parser.isMatchingRepository(worktreePath, prInfo.owner, prInfo.repo);
+      if (!isMatchingRepo) {
+        throw new Error(
+          `--use-checkout requires running from a checkout of ${prInfo.owner}/${prInfo.repo}, ` +
+          `but current directory does not match. Either cd to the correct repository or remove --use-checkout.`
+        );
+      }
+
       await registerRepositoryLocation(db, worktreePath, prInfo.owner, prInfo.repo);
       console.log(`Using current checkout at ${worktreePath}`);
 
@@ -752,13 +784,37 @@ async function performHeadlessReview(args, config, db, flags, options) {
         return result;
       });
     } else {
-      // Use worktree approach
+      // Use worktree approach - only use cwd if it matches the target repo
       const currentDir = parser.getCurrentDirectory();
-      await registerRepositoryLocation(db, currentDir, prInfo.owner, prInfo.repo);
+      const isMatchingRepo = await parser.isMatchingRepository(currentDir, prInfo.owner, prInfo.repo);
+
+      let repositoryPath;
+      if (isMatchingRepo) {
+        // Current directory is a checkout of the target repository
+        repositoryPath = currentDir;
+        await registerRepositoryLocation(db, currentDir, prInfo.owner, prInfo.repo);
+      } else {
+        // Current directory is not the target repository - find or clone it
+        console.log(`Current directory is not a checkout of ${prInfo.owner}/${prInfo.repo}, locating repository...`);
+        const repository = normalizeRepository(prInfo.owner, prInfo.repo);
+        const result = await findRepositoryPath({
+          db,
+          owner: prInfo.owner,
+          repo: prInfo.repo,
+          repository,
+          prNumber: prInfo.number,
+          onProgress: (progress) => {
+            if (progress.message) {
+              console.log(progress.message);
+            }
+          }
+        });
+        repositoryPath = result.repositoryPath;
+      }
 
       console.log('Setting up git worktree...');
       const worktreeManager = new GitWorktreeManager(db);
-      worktreePath = await worktreeManager.createWorktreeForPR(prInfo, prData, currentDir);
+      worktreePath = await worktreeManager.createWorktreeForPR(prInfo, prData, repositoryPath);
 
       console.log('Generating unified diff...');
       diff = await worktreeManager.generateUnifiedDiff(worktreePath, prData);