Save work before checking out remote branch

Author: osolmaz

src/index.ts

@@ -42,23 +42,44 @@ export class ClaudeSandbox {
       let branchName = "";
 
       if (this.config.prNumber) {
-        // Checkout PR
+        // Checkout PR - get the actual branch name from GitHub
         console.log(chalk.blue(`Fetching PR #${this.config.prNumber}...`));
         try {
-          branchName = `pr-${this.config.prNumber}`;
+          const { execSync } = require("child_process");
 
-          // Check if PR branch already exists locally
+          // Check for uncommitted changes first
+          const status = await this.git.status();
+          if (!status.isClean()) {
+            console.log(chalk.yellow("Warning: You have uncommitted changes. Committing them first..."));
+            await this.git.add("./*");
+            await this.git.commit("Save work before checking out PR");
+            console.log(chalk.green("✓ Committed uncommitted changes"));
+          }
+          
+          // Get PR info to find the actual branch name
+          const prInfo = execSync(`gh pr view ${this.config.prNumber} --json headRefName`, {
+            encoding: 'utf-8',
+            cwd: process.cwd()
+          });
+          const prData = JSON.parse(prInfo);
+          const actualBranchName = prData.headRefName;
+          
+          console.log(chalk.blue(`PR #${this.config.prNumber} uses branch: ${actualBranchName}`));
+          
+          // Fetch the PR
+          await this.git.fetch('origin', `pull/${this.config.prNumber}/head:${actualBranchName}`);
+          
+          // Check if branch exists locally
           const branches = await this.git.branchLocal();
-          if (branches.all.includes(branchName)) {
-            // PR branch exists, just checkout
-            await this.git.checkout(branchName);
-            console.log(chalk.green(`✓ Switched to existing PR branch: ${branchName}`));
+          if (branches.all.includes(actualBranchName)) {
+            await this.git.checkout(actualBranchName);
+            console.log(chalk.green(`✓ Switched to existing branch: ${actualBranchName}`));
           } else {
-            // Fetch and create new PR branch
-            await this.git.fetch("origin", `pull/${this.config.prNumber}/head:${branchName}`);
-            await this.git.checkout(branchName);
-            console.log(chalk.green(`✓ Checked out PR #${this.config.prNumber}`));
+            await this.git.checkout(actualBranchName);
+            console.log(chalk.green(`✓ Checked out PR #${this.config.prNumber} as branch: ${actualBranchName}`));
           }
+          
+          branchName = actualBranchName;
         } catch (error) {
           console.error(chalk.red(`✗ Failed to checkout PR #${this.config.prNumber}:`), error);
           throw error;
@@ -67,21 +88,43 @@ export class ClaudeSandbox {
         // Checkout remote branch
         console.log(chalk.blue(`Checking out remote branch: ${this.config.remoteBranch}...`));
         try {
-          await this.git.fetch("origin");
-          const localBranchName = this.config.remoteBranch.replace("origin/", "");
+          // Check for uncommitted changes first
+          const status = await this.git.status();
+          if (!status.isClean()) {
+            console.log(chalk.yellow("Warning: You have uncommitted changes. Committing them first..."));
+            await this.git.add("./*");
+            await this.git.commit("Save work before checking out remote branch");
+            console.log(chalk.green("✓ Committed uncommitted changes"));
+          }
 
-          // Check if local branch already exists
+          // Parse remote/branch format
+          const parts = this.config.remoteBranch.split('/');
+          if (parts.length < 2) {
+            throw new Error('Remote branch must be in format "remote/branch" (e.g., "origin/feature-branch")');
+          }
+          
+          const remote = parts[0];
+          const branch = parts.slice(1).join('/');
+          
+          console.log(chalk.blue(`Remote: ${remote}, Branch: ${branch}`));
+          
+          // Fetch from remote
+          await this.git.fetch(remote);
+          
+          // Check if local branch exists
           const branches = await this.git.branchLocal();
-          if (branches.all.includes(localBranchName)) {
-            // Local branch exists, just checkout
-            await this.git.checkout(localBranchName);
-            console.log(chalk.green(`✓ Switched to existing branch: ${localBranchName}`));
+          if (branches.all.includes(branch)) {
+            // Local branch exists, switch to it and pull
+            await this.git.checkout(branch);
+            await this.git.pull(remote, branch);
+            console.log(chalk.green(`✓ Switched to existing local branch: ${branch}`));
           } else {
-            // Create new local branch from remote
-            await this.git.checkoutBranch(localBranchName, this.config.remoteBranch);
-            console.log(chalk.green(`✓ Checked out remote branch: ${this.config.remoteBranch}`));
+            // Create new local branch tracking the remote
+            await this.git.checkoutBranch(branch, `${remote}/${branch}`);
+            console.log(chalk.green(`✓ Created and checked out new branch: ${branch} tracking ${remote}/${branch}`));
           }
-          branchName = localBranchName;
+          
+          branchName = branch;
         } catch (error) {
           console.error(chalk.red(`✗ Failed to checkout remote branch ${this.config.remoteBranch}:`), error);
           throw error;