claude-code-runner 0.2.10 → 0.2.12

package/README.md

@@ -54,7 +54,7 @@ npm install -g claude-code-runner
 >
 > For the fastest setup with pre-built image, use the official image by setting `buildImage: false` in your config. The default image (`ghcr.io/yanranxiaoxi/claude-code-runner:latest`) will be used automatically.
 
-Simply run in any git repository:
+Simply run in any directory:
 
 ```bash
 claude-run
@@ -67,6 +67,19 @@ This will:
 3. Launch a web UI at `http://localhost:3456`
 4. Open your browser automatically
 
+> [!WARNING]
+>
+> **Non-Git Directory Support**
+>
+> If you run `claude-run` in a non-git directory, the tool will prompt you to initialize a git repository. If you agree, it will automatically run `git init`, create an initial commit, and start the container. **Important**: After initialization, you must manually set up a remote repository (e.g., on GitHub) and configure the upstream to save your changes. Use commands like:
+>
+> ```bash
+> git remote add origin <your-repo-url>
+> git push -u origin main
+> ```
+>
+> Without setting up the upstream, your changes will only exist locally in the container.
+
 > [!NOTE]
 >
 > **Working with Passphrase-Protected SSH Keys**
@@ -83,6 +96,13 @@ This will:
 
 ### Commands
 
+#### Shortcuts
+
+The following commands are shortcuts for `claude-run`:
+
+- `clauderun`
+- `ccrun`
+
 #### `claude-run` (default)
 
 Start a new container with web UI (recommended):
@@ -227,6 +247,7 @@ Create a `claude-run.config.json` file (see `claude-run.config.example.json` for
 	"forwardSshKeys": true,
 	"forwardGpgKeys": true,
 	"forwardSshAgent": true,
+	"forwardGpgAgent": false,
 	"enableGpgSigning": false
 }
 ```
@@ -254,6 +275,7 @@ Create a `claude-run.config.json` file (see `claude-run.config.example.json` for
 - `forwardSshKeys`: Forward SSH keys from `~/.ssh` to container (default: true)
 - `forwardGpgKeys`: Forward GPG keys from `~/.gnupg` to container (default: true)
 - `forwardSshAgent`: Forward SSH agent for passphrase-protected keys (default: true)
+- `forwardGpgAgent`: Forward GPG agent for passphrase-protected GPG keys (default: false, requires explicit enabling)
 - `enableGpgSigning`: Enable GPG commit signing in container (default: false)
 
 #### Mount Configuration
@@ -362,7 +384,9 @@ Claude Code Runner now supports Podman as an alternative to Docker. The tool aut
 - **Custom socket paths**: Use the `dockerSocketPath` configuration option to specify a custom socket
 - **Environment variable**: Set `DOCKER_HOST` to override socket detection
 
-> **Important**: If you're using Podman in rootless mode, you need to enable the Podman socket service:
+> [!IMPORTANT]
+>
+> If you're using Podman in rootless mode, you need to enable the Podman socket service:
 >
 > ```bash
 > systemctl --user enable --now podman.socket
@@ -410,6 +434,8 @@ claude-run  # SSH agent is forwarded to container
 
 The container will use your host's SSH agent, so you don't need to enter the passphrase again.
 
+> [!NOTE]
+>
 > **Troubleshooting: SSH Agent Connection Failed**
 >
 > If running `ssh-add -l` inside the container shows "communication with agent failed":
@@ -427,17 +453,35 @@ The container will use your host's SSH agent, so you don't need to enter the pas
 
 #### GPG Key Support
 
-GPG keys from `~/.gnupg` are also automatically forwarded to the container. However, **GPG commit signing is disabled by default** to avoid passphrase prompts in non-interactive environments.
+GPG keys from `~/.gnupg` are automatically forwarded to the container. **GPG commit signing is disabled by default** to avoid passphrase prompts in non-interactive environments.
 
-**To enable GPG commit signing**, add this to your `claude-run.config.json`:
+**Three ways to use GPG:**
 
-```json
-{
-  "enableGpgSigning": true
-}
-```
+1. **Direct GPG key usage (recommended for keys without passphrase)**
+   - GPG key files are automatically copied to the container
+   - No additional configuration needed
+   - Only works for keys without a passphrase
 
-> **Note**: GPG signing requires a GPG key without a passphrase, or proper GPG agent configuration. For security, consider using SSH commit signing instead.
+2. **GPG agent forwarding (recommended for password-protected keys)**
+   - Enable in your config:
+   ```json
+   {
+     "forwardGpgAgent": true,
+     "enableGpgSigning": true
+   }
+   ```
+   - Host GPG agent is automatically forwarded when container starts
+   - Supports password-protected keys (no need to enter passphrase in container)
+   - Requires `gpg-agent` running on your host machine
+
+3. **Completely disable GPG signing**
+   - Default behavior (if you don't set `enableGpgSigning`)
+   - GPG signing will be disabled even if your host `.gitconfig` has `commit.gpgsign = true`
+   - This prevents signing failures in containerized environments where `/dev/tty` is not accessible
+
+> [!NOTE]
+>
+> For security, consider using SSH commit signing (if your Git server supports it). This way you don't need to configure GPG at all.
 
 #### Disabling SSH/GPG Forwarding
 
@@ -447,7 +491,8 @@ If you don't want to forward your keys, you can disable this feature:
 {
   "forwardSshKeys": false,
   "forwardGpgKeys": false,
-  "forwardSshAgent": false
+  "forwardSshAgent": false,
+  "forwardGpgAgent": false
 }
 ```
 

package/README.zh-Hans.md

@@ -52,7 +52,7 @@ npm install -g claude-code-runner
 
 > **提示**：为了最快的启动速度，使用预构建的官方镜像：在配置中设置 `buildImage: false`。默认镜像（`ghcr.io/yanranxiaoxi/claude-code-runner:latest`）会自动使用。
 
-只需在任何 Git 仓库文件夹中运行：
+只需在任何目录中运行：
 
 ```bash
 claude-run
@@ -65,6 +65,19 @@ claude-run
 3. 在 `http://localhost:3456` 上启动 Web UI
 4. 自动打开浏览器
 
+> [!WARNING]
+>
+> **非 Git 目录支持**
+>
+> 如果你在非 Git 目录中运行 `claude-run`，工具会提示你初始化 Git 仓库。如果你同意，它会自动运行 `git init`，创建初始提交，并启动容器。**重要**：初始化后，你必须手动设置远程仓库（例如在 GitHub 上）并配置上游以保存更改。使用如下命令：
+>
+> ```bash
+> git remote add origin <你的仓库 URL>
+> git push -u origin main
+> ```
+>
+> 如果不设置上游，你的更改将仅存在于容器内的本地。
+
 > [!NOTE]
 >
 > **使用带密码的 SSH 密钥**
@@ -101,6 +114,13 @@ claude-run
 
 ### 命令
 
+#### 快捷命令
+
+以下命令是 `claude-run` 的快捷方式：
+
+- `clauderun`
+- `ccrun`
+
 #### `claude-run` (默认)
 
 使用 Web UI 启动新容器（推荐）：
@@ -247,6 +267,7 @@ claud-run update        # 别名
 	"forwardSshKeys": true,
 	"forwardGpgKeys": true,
 	"forwardSshAgent": true,
+	"forwardGpgAgent": false,
 	"enableGpgSigning": false
 }
 ```
@@ -274,6 +295,7 @@ claud-run update        # 别名
 - `forwardSshKeys`: 将 `~/.ssh` 中的 SSH 密钥转发到容器（默认：true）
 - `forwardGpgKeys`: 将 `~/.gnupg` 中的 GPG 密钥转发到容器（默认：true）
 - `forwardSshAgent`: 转发 SSH agent 以支持带密码的密钥（默认：true）
+- `forwardGpgAgent`: 转发 GPG agent 以支持带密码的 GPG 密钥（默认：false，需显式启用）
 - `enableGpgSigning`: 在容器中启用 GPG 提交签名（默认：false）
 
 #### 挂载配置
@@ -382,7 +404,9 @@ Claude Code Runner 还支持 Podman 作为 Docker 的替代方案。该工具通
 - **自定义套接字路径**: 使用 `dockerSocketPath` 配置选项指定自定义套接字
 - **环境变量**: 设置 `DOCKER_HOST` 来覆盖套接字检测
 
-> **重要提示**：如果你使用 Podman 的 rootless（无根）模式，需要启用 Podman socket 服务：
+> [!IMPORTANT]
+>
+> 如果你使用 Podman 的 rootless（无根）模式，需要启用 Podman socket 服务：
 >
 > ```bash
 > systemctl --user enable --now podman.socket
@@ -430,6 +454,8 @@ claude-run  # SSH agent 会被转发到容器
 
 容器将使用宿主机的 SSH agent，因此你无需再次输入密码。
 
+> [!NOTE]
+>
 > **故障排除：SSH Agent 无法连接**
 >
 > 如果在容器内运行 `ssh-add -l` 显示 "communication with agent failed"：
@@ -447,17 +473,35 @@ claude-run  # SSH agent 会被转发到容器
 
 #### GPG 密钥支持
 
-来自 `~/.gnupg` 的 GPG 密钥也会自动转发到容器。但是，**GPG 提交签名默认是禁用的**，以避免在非交互式环境中出现密码提示。
+来自 `~/.gnupg` 的 GPG 密钥会自动转发到容器。**GPG 提交签名默认是禁用的**，以避免在非交互式环境中出现密码提示。
 
-**要启用 GPG 提交签名**，在 `claude-run.config.json` 中添加：
+**三种使用方式：**
 
-```json
-{
-  "enableGpgSigning": true
-}
-```
+1. **直接使用 GPG 密钥（推荐用于无密码密钥）**
+   - GPG 密钥文件自动复制到容器
+   - 无需额外配置
+   - 仅适用于没有密码的 GPG 密钥
 
-> **注意**：GPG 签名需要一个没有密码的 GPG 密钥，或正确配置 GPG agent。为了安全起见，建议考虑使用 SSH 提交签名。
+2. **通过 GPG agent 转发（推荐用于密码保护的密钥）**
+   - 需要在配置中启用：
+   ```json
+   {
+     "forwardGpgAgent": true,
+     "enableGpgSigning": true
+   }
+   ```
+   - 宿主机 GPG agent 会在容器启动时自动转发
+   - 支持密码保护的密钥（无需在容器内输入密码）
+   - 需要宿主机 `gpg-agent` 正在运行
+
+3. **完全禁用 GPG 签名**
+   - 默认行为（如果不配置 `enableGpgSigning`）
+   - 即使宿主机配置了 `commit.gpgsign = true`，容器内也会禁用签名
+   - 这是为了避免在无法访问 `/dev/tty` 的容器环境中出现签名失败
+
+> [!NOTE]
+>
+> 为了安全起见，建议使用 SSH 提交签名（如果 Git 服务器支持）。这样不需要配置 GPG 就能实现签名。
 
 #### 禁用 SSH/GPG 转发
 
@@ -467,7 +511,8 @@ claude-run  # SSH agent 会被转发到容器
 {
   "forwardSshKeys": false,
   "forwardGpgKeys": false,
-  "forwardSshAgent": false
+  "forwardSshAgent": false,
+  "forwardGpgAgent": false
 }
 ```
 

package/dist/cli.js

@@ -17,7 +17,7 @@ const docker_config_1 = require("./docker-config");
 const index_1 = require("./index");
 const web_server_1 = require("./web-server");
 // Package info - injected at build time
-const currentVersion = '0.2.10';
+const currentVersion = '0.2.12';
 const packageName = 'claude-code-runner';
 // Check for updates (non-blocking)
 async function checkForUpdates() {

package/dist/container.d.ts

@@ -9,7 +9,6 @@ export declare class ContainerManager {
     private ensureImage;
     private pullImage;
     private formatBytes;
-    private buildDefaultImage;
     private buildImage;
     private createContainer;
     private prepareEnvironment;

package/dist/container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../src/container.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAe,aAAa,EAAE,MAAM,SAAS,CAAC;AAU1D,qBAAa,gBAAgB;IAC5B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,UAAU,CAA4C;gBAElD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa;IAK3C,KAAK,CAAC,eAAe,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;YA+DpC,WAAW;YAiDX,SAAS;IA6FvB,OAAO,CAAC,WAAW;YASL,iBAAiB;YAqIjB,UAAU;YAkCV,eAAe;IAoC7B,OAAO,CAAC,kBAAkB;IA4J1B,OAAO,CAAC,cAAc;YA2GR,qBAAqB;YAwIrB,iBAAiB;YAqMjB,cAAc;YAgFd,wBAAwB;YAqJxB,gBAAgB;IAuExB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAY9B"}
+{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../src/container.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAe,aAAa,EAAE,MAAM,SAAS,CAAC;AAU1D,qBAAa,gBAAgB;IAC5B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,UAAU,CAA4C;gBAElD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa;IAK3C,KAAK,CAAC,eAAe,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;YA+DpC,WAAW;YAgDX,SAAS;IA6FvB,OAAO,CAAC,WAAW;YASL,UAAU;YAkCV,eAAe;IAoC7B,OAAO,CAAC,kBAAkB;IAsK1B,OAAO,CAAC,cAAc;YAyHR,qBAAqB;YAwIrB,iBAAiB;YAqMjB,cAAc;YAgFd,wBAAwB;YA4IxB,gBAAgB;IAuExB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAY9B"}

package/dist/container.js

@@ -138,8 +138,7 @@ class ContainerManager {
                 await this.pullImage(imageName);
             }
             catch (error) {
-                console.log(chalk_1.default.yellow('⚠ Failed to pull image, using inline Dockerfile'));
-                await this.buildDefaultImage(imageName);
+                throw new Error(`Failed to pull image '${imageName}' and no Dockerfile available. Please ensure docker/Dockerfile exists or use a pre-built image.`);
             }
         }
     }
@@ -222,130 +221,6 @@ class ContainerManager {
         const i = Math.floor(Math.log(bytes) / Math.log(k));
         return `${(bytes / k ** i).toFixed(1)} ${sizes[i]}`;
     }
-    async buildDefaultImage(imageName) {
-        const dockerfile = `
-FROM docker.io/library/almalinux:10
-
-# Install system dependencies
-RUN dnf install -y epel-release && dnf install -y \
-    curl \\
-    git \\
-    openssh-clients \\
-    python3 \\
-    python3-pip \\
-    gcc \\
-    gcc-c++ \\
-    make \\
-    sudo \\
-    vim \\
-    jq \\
-    ca-certificates \\
-    gnupg2 \\
-    inotify-tools \\
-    rsync \\
-    && dnf clean all
-
-# Install GitHub CLI
-RUN dnf install -y 'dnf-command(config-manager)' \\
-    && dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo \\
-    && dnf install -y gh
-
-# Install Claude Code using native installer
-RUN curl -fsSL https://claude.ai/install.sh | bash
-
-# Ensure claude is in PATH for all users
-ENV PATH="/root/.local/bin:\${PATH}"
-
-# Create a non-root user with sudo privileges
-RUN useradd -m -s /bin/bash claude && \\
-    echo 'claude ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers && \\
-    usermod -aG wheel claude
-
-# Switch to claude user to install Claude Code
-USER claude
-
-# Install Claude Code for claude user
-RUN curl -fsSL https://claude.ai/install.sh | bash
-
-# Ensure claude is in PATH for claude user
-RUN echo 'export PATH="$HOME/.local/bin:$PATH"' >> /home/claude/.bashrc
-
-# Switch back to root for remaining setup
-USER root
-
-# Create workspace directory and set ownership
-RUN mkdir -p /workspace && \\
-    chown -R claude:claude /workspace
-
-# Switch to non-root user
-USER claude
-WORKDIR /workspace
-
-# Set up entrypoint
-ENTRYPOINT ["/bin/bash", "-c"]
-`;
-        /*
-RUN echo '#!/bin/bash\\n\\
-# Allow the initial branch creation\\n\\
-if [ ! -f /tmp/.branch-created ]; then\\n\\
-    /usr/bin/git "$@"\\n\\
-    if [[ "$1" == "checkout" ]] && [[ "$2" == "-b" ]]; then\\n\\
-        touch /tmp/.branch-created\\n\\
-    fi\\n\\
-else\\n\\
-    # After initial branch creation, prevent switching\\n\\
-    if [[ "$1" == "checkout" ]] && [[ "$2" != "-b" ]]; then\\n\\
-        echo "Branch switching is disabled in claude-code-runner"\\n\\
-        exit 1\\n\\
-    fi\\n\\
-    if [[ "$1" == "switch" ]]; then\\n\\
-        echo "Branch switching is disabled in claude-code-runner"\\n\\
-        exit 1\\n\\
-    fi\\n\\
-    /usr/bin/git "$@"\\n\\
-fi' > /usr/local/bin/git && \\
-    chmod +x /usr/local/bin/git
-# Create startup script
-RUN echo '#!/bin/bash\\n\\
-echo "Waiting for attachment..."\\n\\
-sleep 2\\n\\
-cd /workspace\\n\\
-git checkout -b "$1"\\n\\
-echo "Starting Claude Code on branch $1..."\\n\\
-exec claude --dangerously-skip-permissions' > /start-claude.sh && \\
-    chmod +x /start-claude.sh */
-        // Build image from string
-        const pack = tar_stream_1.default.pack();
-        // Add Dockerfile to tar
-        pack.entry({ name: 'Dockerfile' }, dockerfile, (err) => {
-            if (err)
-                throw err;
-            pack.finalize();
-        });
-        // Convert to buffer for docker
-        const chunks = [];
-        pack.on('data', (chunk) => chunks.push(chunk));
-        await new Promise((resolve) => {
-            pack.on('end', resolve);
-        });
-        const tarBuffer = node_buffer_1.Buffer.concat(chunks);
-        const buildStream = await this.docker.buildImage(tarBuffer, {
-            t: imageName,
-        });
-        // Wait for build to complete
-        await new Promise((resolve, reject) => {
-            this.docker.modem.followProgress(buildStream, (err, res) => {
-                if (err)
-                    reject(err);
-                else
-                    resolve(res);
-            }, (event) => {
-                if (event.stream) {
-                    node_process_1.default.stdout.write(event.stream);
-                }
-            });
-        });
-    }
     async buildImage(dockerfilePath, imageName) {
         const buildContext = node_path_1.default.dirname(dockerfilePath);
         const buildStream = await this.docker.buildImage({
@@ -493,8 +368,18 @@ exec claude --dangerously-skip-permissions' > /start-claude.sh && \\
         if (sshAuthSock && fs.existsSync(sshAuthSock)) {
             env.push('SSH_AUTH_SOCK=/tmp/.ssh-agent-sock');
         }
-        // GPG agent - disable TTY requirement for non-interactive use
-        env.push('GPG_TTY=');
+        // GPG agent forwarding - if enabled and socket is available
+        const gpgAgentSocket = node_path_1.default.join(os.homedir(), '.gnupg', 'S.gpg-agent');
+        if (this.config.forwardGpgAgent === true && fs.existsSync(gpgAgentSocket)) {
+            // Point to the container's GPG agent socket relay
+            env.push('GPG_TTY=/dev/tty');
+            // Set GNUPGHOME to use the forwarded agent
+            env.push('GNUPGHOME=/home/claude/.gnupg');
+        }
+        else {
+            // Disable TTY requirement for non-interactive use (no agent available)
+            env.push('GPG_TTY=');
+        }
         // Pass GPG signing preference to container
         if (this.config.enableGpgSigning) {
             env.push('GIT_COMMIT_GPG_SIGN=true');
@@ -541,6 +426,19 @@ exec claude --dangerously-skip-permissions' > /start-claude.sh && \\
             volumes.push(`${sshAuthSock}:/tmp/.ssh-agent-sock:rw`);
             console.log(chalk_1.default.blue('✓ SSH agent forwarding enabled'));
         }
+        // Mount GPG agent socket if available and explicitly enabled (for GPG signing)
+        const forwardGpgAgent = this.config.forwardGpgAgent === true; // Default: false - must be explicit
+        if (forwardGpgAgent) {
+            // GPG agent socket is typically at ~/.gnupg/S.gpg-agent
+            const gpgAgentSocket = node_path_1.default.join(os.homedir(), '.gnupg', 'S.gpg-agent');
+            if (fs.existsSync(gpgAgentSocket)) {
+                volumes.push(`${gpgAgentSocket}:/tmp/.gpg-agent-sock:rw`);
+                console.log(chalk_1.default.blue('✓ GPG agent forwarding enabled'));
+            }
+            else {
+                console.log(chalk_1.default.yellow('⚠ GPG agent socket not found - GPG signing may not work'));
+            }
+        }
         // Add custom volumes (legacy format)
         if (this.config.volumes) {
             volumes.push(...this.config.volumes);
@@ -949,11 +847,16 @@ exec /bin/bash`;
         git config --global --add safe.directory /workspace &&
         # Clean up macOS resource fork files in git pack directory
         find .git/objects/pack -name "._pack-*.idx" -type f -delete 2>/dev/null || true &&
-        # Configure git commit signing - disable GPG signing by default to avoid passphrase prompts
-        # Users can enable it by setting GIT_COMMIT_GPG_SIGN=true in environment
-        if [ -z "$GIT_COMMIT_GPG_SIGN" ] || [ "$GIT_COMMIT_GPG_SIGN" != "true" ]; then
+        # Configure git commit signing
+        # Disable GPG signing by default to avoid passphrase prompts in non-interactive environments
+        # Even if host .gitconfig has commit.gpgsign=true, override it unless explicitly enabled
+        ENABLE_GPG_SIGNING="${this.config.enableGpgSigning === true ? 'true' : 'false'}" &&
+        if [ "$ENABLE_GPG_SIGNING" = "true" ]; then
+          git config --global commit.gpgsign true
+          echo "✓ GPG signing enabled"
+        else
           git config --global commit.gpgsign false
-          echo "✓ GPG signing disabled (set GIT_COMMIT_GPG_SIGN=true to enable)"
+          echo "✓ GPG signing disabled (enable with enableGpgSigning: true in config)"
         fi &&
         # Start SSH agent if not already running and we have keys
         if [ -d "/home/claude/.ssh" ] && [ -z "$SSH_AUTH_SOCK" ]; then
@@ -976,33 +879,17 @@ exec /bin/bash`;
         if [ -n "${prFetchRef || ''}" ]; then
           echo "• Fetching PR branch..." &&
           git fetch origin ${prFetchRef} &&
-          if git show-ref --verify --quiet refs/heads/"${branchName}"; then
-            git checkout "${branchName}" &&
-            echo "✓ Switched to existing PR branch: ${branchName}"
-          else
-            git checkout "${branchName}" &&
-            echo "✓ Checked out PR branch: ${branchName}"
-          fi
+		  git checkout -B "${branchName}" FETCH_HEAD &&
+		  echo "✓ Checked out PR branch: ${branchName}"
         elif [ -n "${remoteFetchRef || ''}" ]; then
           echo "• Fetching remote branch..." &&
           git fetch origin &&
-          if git show-ref --verify --quiet refs/heads/"${branchName}"; then
-            git checkout "${branchName}" &&
-            git pull origin "${branchName}" &&
-            echo "✓ Switched to existing remote branch: ${branchName}"
-          else
-            git checkout -b "${branchName}" "${remoteFetchRef}" &&
-            echo "✓ Created local branch from remote: ${branchName}"
-          fi
+		  git checkout -B "${branchName}" "${remoteFetchRef}" &&
+		  echo "✓ Checked out remote branch: ${branchName}"
         else
           # Regular branch creation
-          if git show-ref --verify --quiet refs/heads/"${branchName}"; then
-            git checkout "${branchName}" &&
-            echo "✓ Switched to existing branch: ${branchName}"
-          else
-            git checkout -b "${branchName}" &&
-            echo "✓ Created new branch: ${branchName}"
-          fi
+		  git checkout -B "${branchName}" &&
+		  echo "✓ Checked out branch: ${branchName}"
         fi &&
         cat > /home/claude/start-session.sh << 'EOF'
 ${startupScript}
@@ -1028,6 +915,8 @@ EOF
                     || output.includes('✓ Switched to existing remote branch')
                     || output.includes('✓ Switched to existing PR branch')
                     || output.includes('✓ Checked out PR branch')
+                    || output.includes('✓ Checked out remote branch')
+                    || output.includes('✓ Checked out branch')
                     || output.includes('✓ Created local branch from remote'))
                     && output.includes('✓ Startup script created')) {
                     resolve();