Merge main branch and fix tempDir -> runtimeTempDir for SSH tests

Author: ammar-agent

.github/actions/setup-cmux/action.yml

@@ -1,5 +1,10 @@
 name: "Setup Cmux"
 description: "Setup Bun and install dependencies with caching"
+inputs:
+  install-imagemagick:
+    description: "Install ImageMagick (needed for electron-builder icon generation)"
+    required: false
+    default: "false"
 runs:
   using: "composite"
   steps:
@@ -29,42 +34,31 @@ runs:
         restore-keys: |
           ${{ runner.os }}-bun-cache-
 
-    - name: Cache Homebrew (macOS)
-      if: runner.os == 'macOS'
-      uses: actions/cache@v4
-      with:
-        path: ~/Library/Caches/Homebrew
-        key: ${{ runner.os }}-brew-cache-${{ hashFiles('**/bun.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-brew-cache-
-
     - name: Install dependencies
       shell: bash
       run: bun install --frozen-lockfile
 
     - name: Install ImageMagick (macOS)
-      if: runner.os == 'macOS'
+      if: inputs.install-imagemagick == 'true' && runner.os == 'macOS'
       shell: bash
       run: |
-        if ! brew list imagemagick &>/dev/null; then
-          echo "📦 Installing ImageMagick..."
-          time brew install imagemagick
+        if command -v magick &>/dev/null; then
+          echo "✅ ImageMagick already available"
         else
-          echo "✅ ImageMagick already installed"
-          brew list imagemagick --versions
+          echo "📦 Installing ImageMagick..."
+          HOMEBREW_NO_AUTO_UPDATE=1 brew install imagemagick
         fi
-        # Verify it's in PATH
-        which magick
         magick --version | head -1
 
     - name: Install ImageMagick (Linux)
-      if: runner.os == 'Linux'
+      if: inputs.install-imagemagick == 'true' && runner.os == 'Linux'
       shell: bash
       run: |
-        if ! command -v convert &> /dev/null; then
-          echo "Installing ImageMagick..."
-          sudo apt-get update -qq
-          sudo apt-get install -y imagemagick
+        if command -v convert &>/dev/null; then
+          echo "✅ ImageMagick already available"
         else
-          echo "ImageMagick already installed"
+          echo "📦 Installing ImageMagick..."
+          sudo apt-get update -qq
+          sudo apt-get install -y --no-install-recommends imagemagick
         fi
+        convert --version | head -1

.github/workflows/build.yml

@@ -17,6 +17,8 @@ jobs:
           fetch-depth: 0 # Required for git describe to find tags
 
       - uses: ./.github/actions/setup-cmux
+        with:
+          install-imagemagick: true
 
       - name: Build application
         run: bun run build
@@ -71,6 +73,8 @@ jobs:
           fetch-depth: 0 # Required for git describe to find tags
 
       - uses: ./.github/actions/setup-cmux
+        with:
+          install-imagemagick: true
 
       - name: Build application
         run: bun run build

.github/workflows/release.yml

@@ -18,6 +18,8 @@ jobs:
           fetch-depth: 0 # Required for git describe to find tags
 
       - uses: ./.github/actions/setup-cmux
+        with:
+          install-imagemagick: true
 
       - name: Build application
         run: bun run build
@@ -46,6 +48,8 @@ jobs:
           fetch-depth: 0 # Required for git describe to find tags
 
       - uses: ./.github/actions/setup-cmux
+        with:
+          install-imagemagick: true
 
       - name: Build application
         run: bun run build

src/runtime/LocalRuntime.ts

@@ -303,6 +303,16 @@ export class LocalRuntime implements Runtime {
     }
   }
 
+  normalizePath(targetPath: string, basePath: string): string {
+    // For local runtime, use Node.js path resolution
+    // Handle special case: current directory
+    const target = targetPath.trim();
+    if (target === ".") {
+      return path.resolve(basePath);
+    }
+    return path.resolve(basePath, target);
+  }
+
   getWorkspacePath(projectPath: string, workspaceName: string): string {
     const projectName = getProjectName(projectPath);
     return path.join(this.srcBaseDir, projectName, workspaceName);

src/runtime/Runtime.ts

@@ -195,6 +195,25 @@ export interface Runtime {
    */
   stat(path: string): Promise<FileStat>;
 
+  /**
+   * Normalize a path for comparison purposes within this runtime's context.
+   * Handles runtime-specific path semantics (local vs remote).
+   *
+   * @param targetPath Path to normalize (may be relative or absolute)
+   * @param basePath Base path to resolve relative paths against
+   * @returns Normalized path suitable for string comparison
+   *
+   * @example
+   * // LocalRuntime
+   * runtime.normalizePath(".", "/home/user") // => "/home/user"
+   * runtime.normalizePath("../other", "/home/user/project") // => "/home/user/other"
+   *
+   * // SSHRuntime
+   * runtime.normalizePath(".", "/home/user") // => "/home/user"
+   * runtime.normalizePath("~/project", "~") // => "~/project"
+   */
+  normalizePath(targetPath: string, basePath: string): string;
+
   /**
    * Compute absolute workspace path from project and workspace name.
    * This is the SINGLE source of truth for workspace path computation.

src/runtime/SSHRuntime.ts

@@ -24,6 +24,7 @@ import { expandTildeForSSH, cdCommandForSSH } from "./tildeExpansion";
 import { findBashPath } from "./executablePaths";
 import { getProjectName } from "../utils/runtime/helpers";
 import { getErrorMessage } from "../utils/errors";
+import { execAsync } from "../utils/disposableExec";
 
 /**
  * Shescape instance for bash shell escaping.
@@ -317,6 +318,41 @@ export class SSHRuntime implements Runtime {
     };
   }
 
+  normalizePath(targetPath: string, basePath: string): string {
+    // For SSH, handle paths in a POSIX-like manner without accessing the remote filesystem
+    const target = targetPath.trim();
+    let base = basePath.trim();
+
+    // Normalize base path - remove trailing slash (except for root "/")
+    if (base.length > 1 && base.endsWith("/")) {
+      base = base.slice(0, -1);
+    }
+
+    // Handle special case: current directory
+    if (target === ".") {
+      return base;
+    }
+
+    // Handle tilde expansion - keep as-is for comparison
+    let normalizedTarget = target;
+    if (target === "~" || target.startsWith("~/")) {
+      normalizedTarget = target;
+    } else if (target.startsWith("/")) {
+      // Absolute path - use as-is
+      normalizedTarget = target;
+    } else {
+      // Relative path - resolve against base using POSIX path joining
+      normalizedTarget = base.endsWith("/") ? base + target : base + "/" + target;
+    }
+
+    // Remove trailing slash for comparison (except for root "/")
+    if (normalizedTarget.length > 1 && normalizedTarget.endsWith("/")) {
+      normalizedTarget = normalizedTarget.slice(0, -1);
+    }
+
+    return normalizedTarget;
+  }
+
   /**
    * Build common SSH arguments based on runtime config
    * @param includeHost - Whether to include the host in the args (for direct ssh commands)
@@ -372,11 +408,28 @@ export class SSHRuntime implements Runtime {
     const bundleTempPath = `~/.cmux-bundle-${timestamp}.bundle`;
 
     try {
-      // Step 1: Create bundle locally and pipe to remote file via SSH
+      // Step 1: Get origin URL from local repository (if it exists)
+      let originUrl: string | null = null;
+      try {
+        using proc = execAsync(
+          `cd ${shescape.quote(projectPath)} && git remote get-url origin 2>/dev/null || true`
+        );
+        const { stdout } = await proc.result;
+        const url = stdout.trim();
+        // Only use URL if it's not a bundle path (avoids propagating bundle paths)
+        if (url && !url.includes(".bundle") && !url.includes(".cmux-bundle")) {
+          originUrl = url;
+        }
+      } catch (error) {
+        // If we can't get origin, continue without it
+        initLogger.logStderr(`Could not get origin URL: ${getErrorMessage(error)}`);
+      }
+
+      // Step 2: Create bundle locally and pipe to remote file via SSH
       initLogger.logStep(`Creating git bundle...`);
       await new Promise<void>((resolve, reject) => {
         const sshArgs = this.buildSSHArgs(true);
-        const command = `cd ${JSON.stringify(projectPath)} && git bundle create - --all | ssh ${sshArgs.join(" ")} "cat > ${bundleTempPath}"`;
+        const command = `cd ${shescape.quote(projectPath)} && git bundle create - --all | ssh ${sshArgs.join(" ")} "cat > ${bundleTempPath}"`;
 
         log.debug(`Creating bundle: ${command}`);
         const bashPath = findBashPath();
@@ -405,7 +458,7 @@ export class SSHRuntime implements Runtime {
         });
       });
 
-      // Step 2: Clone from bundle on remote using this.exec
+      // Step 3: Clone from bundle on remote using this.exec
       initLogger.logStep(`Cloning repository on remote...`);
 
       // Expand tilde in destination path for git clone
@@ -427,7 +480,37 @@ export class SSHRuntime implements Runtime {
         throw new Error(`Failed to clone repository: ${cloneStderr || cloneStdout}`);
       }
 
-      // Step 3: Remove bundle file
+      // Step 4: Update origin remote if we have an origin URL
+      if (originUrl) {
+        initLogger.logStep(`Setting origin remote to ${originUrl}...`);
+        const setOriginStream = await this.exec(
+          `git -C ${cloneDestPath} remote set-url origin ${shescape.quote(originUrl)}`,
+          {
+            cwd: "~",
+            timeout: 10,
+          }
+        );
+
+        const setOriginExitCode = await setOriginStream.exitCode;
+        if (setOriginExitCode !== 0) {
+          const stderr = await streamToString(setOriginStream.stderr);
+          log.info(`Failed to set origin remote: ${stderr}`);
+          // Continue anyway - this is not fatal
+        }
+      } else {
+        // No origin in local repo, remove the origin that points to bundle
+        initLogger.logStep(`Removing bundle origin remote...`);
+        const removeOriginStream = await this.exec(
+          `git -C ${cloneDestPath} remote remove origin 2>/dev/null || true`,
+          {
+            cwd: "~",
+            timeout: 10,
+          }
+        );
+        await removeOriginStream.exitCode;
+      }
+
+      // Step 5: Remove bundle file
       initLogger.logStep(`Cleaning up bundle file...`);
       const rmStream = await this.exec(`rm ${bundleTempPath}`, {
         cwd: "~",
@@ -615,7 +698,7 @@ export class SSHRuntime implements Runtime {
       // We create new branches from HEAD instead of the trunkBranch name to avoid issues
       // where the local repo's trunk name doesn't match the cloned repo's default branch
       initLogger.logStep(`Checking out branch: ${branchName}`);
-      const checkoutCmd = `(git checkout ${JSON.stringify(branchName)} 2>/dev/null || git checkout -b ${JSON.stringify(branchName)} HEAD)`;
+      const checkoutCmd = `(git checkout ${shescape.quote(branchName)} 2>/dev/null || git checkout -b ${shescape.quote(branchName)} HEAD)`;
 
       const checkoutStream = await this.exec(checkoutCmd, {
         cwd: workspacePath, // Use the full workspace path for git operations
@@ -826,7 +909,7 @@ export class SSHRuntime implements Runtime {
 /**
  * Helper to convert a ReadableStream to a string
  */
-async function streamToString(stream: ReadableStream<Uint8Array>): Promise<string> {
+export async function streamToString(stream: ReadableStream<Uint8Array>): Promise<string> {
   const reader = stream.getReader();
   const decoder = new TextDecoder("utf-8");
   let result = "";