fix: Fixing Git clones

Author: yhakbar

electron/main/ipc/git.ts

@@ -8,8 +8,8 @@
 import { Effect, Stream } from "effect"
 import { ipcMain } from "electron"
 import { runtime, sessionManager } from "./runtime.ts"
+import { ProcessSpawner } from "../../../src/services/ProcessSpawner.ts"
 import {
-  cloneRepository,
   resolveClonePaths,
   countFiles,
   deleteBranch,
@@ -19,6 +19,8 @@ import {
 } from "../../../src/domain/git/operations.ts"
 import type { CloneOptions, PushOptions } from "../../../src/services/GitClient.ts"
 import { isContainedIn } from "../../../src/path-validation.ts"
+import * as fs from "node:fs"
+function debugLog(msg: string) { fs.appendFileSync("/tmp/runbooks-git-debug.log", new Date().toISOString() + " " + msg + "\n") }
 import { PathTraversalError } from "../../../src/errors/index.ts"
 import { validateSessionPath } from "./path-guard.ts"
 
@@ -35,6 +37,7 @@ export function registerGitHandlers(): void {
       },
     ) => {
       return runtime.runPromise(
+        Effect.scoped(
         Effect.gen(function* () {
           // Resolve clone destination paths
           const session = yield* sessionManager.getSession()
@@ -59,35 +62,64 @@ export function registerGitHandlers(): void {
             token: params.credentials?.token,
           }
 
-          // Get the progress stream
-          const progressStream = yield* cloneRepository(
-            params.url,
-            paths.absolutePath,
-            options,
-          )
+          // Clone the repository using direct process spawning.
+          // We avoid the GitClient's stream-based API because
+          // Stream.runCollect hangs in Electron's runtime.runPromise.
+          const spawner = yield* ProcessSpawner
+          const cloneArgs = ["clone", "--progress"]
+          if (options.ref) cloneArgs.push("--branch", options.ref)
+
+          const effectiveUrl = options.token
+            ? (() => { try { const u = new URL(params.url); u.username = "x-access-token"; u.password = options.token!; return u.toString(); } catch { return params.url; } })()
+            : params.url
 
-          // Stream progress events to the renderer
-          yield* Stream.runForEach(progressStream, (progress) =>
+          cloneArgs.push(effectiveUrl, paths.absolutePath)
+
+          // debugLog("[git:clone] spawning git process...")
+          const proc = yield* spawner.spawn("git", cloneArgs, {})
+
+          // debugLog("[git:clone] draining output stream...")
+          yield* Stream.runForEach(proc.output, (line) =>
             Effect.sync(() => {
               event.sender.send("git:clone-progress", {
-                line: progress.line,
-                timestamp: progress.timestamp,
+                line: line.line,
+                timestamp: new Date().toISOString(),
               })
             }),
           )
 
-          // Count files in the cloned repo
+          // debugLog("[git:clone] getting exit code...")
+          const exitCode = yield* proc.exitCode
+          // debugLog("[git:clone] exit code: " + exitCode)
+          if (exitCode !== 0) {
+            return yield* Effect.fail(
+              new PathTraversalError({
+                path: paths.absolutePath,
+                message: `git clone failed with exit code ${exitCode}`,
+              }),
+            )
+          }
+
+          event.sender.send("git:clone-progress", {
+            line: "Clone complete. Counting files...",
+            timestamp: new Date().toISOString(),
+          })
+
+          // Count tracked files using `git ls-files` (fast, ~10ms)
           const fileCount = yield* countFiles(paths.absolutePath)
 
           // Register the worktree path
           sessionManager.registerWorkTreePath(paths.absolutePath)
+          // debugLog("[git:clone] registered worktree, returning result")
 
           return {
             absolutePath: paths.absolutePath,
             relativePath: paths.relativePath,
             fileCount,
+            status: "success" as const,
           }
         }),
+        ),
       )
     },
   )

electron/main/ipc/runbook.ts

@@ -10,6 +10,7 @@ import {
   runtime,
   runbookConfig,
   executableRegistry,
+  sessionManager,
   setExecutableRegistry,
   setRunbookConfig,
 } from "./runtime.ts"
@@ -45,6 +46,12 @@ export function registerRunbookHandlers(): void {
       }
       setRunbookConfig(config)
 
+      // Update the session's working directory to the runbook's parent dir.
+      // The session may have been created with '.' before the runbook path
+      // was known.
+      const runbookDir = path.dirname(runbookPath)
+      sessionManager.setWorkingDir(runbookDir)
+
       // Read the runbook file content
       const fileData = await runtime.runPromise(readFileMetadata(runbookPath))
 

src/domain/git/operations.ts

@@ -3,7 +3,7 @@
  * Port of api/git_clone.go and api/github_pull_request.go.
  */
 import path from "path"
-import { Effect, Stream } from "effect"
+import { Effect, Stream, Chunk } from "effect"
 import { GitClient } from "../../services/GitClient.ts"
 import type {
   CloneOptions,
@@ -12,6 +12,7 @@ import type {
 import { GitHubClient } from "../../services/GitHubClient.ts"
 import type { CreatePRParams } from "../../services/GitHubClient.ts"
 import { FileSystem } from "../../services/FileSystem.ts"
+import { ProcessSpawner } from "../../services/ProcessSpawner.ts"
 import { GitError } from "../../errors/index.ts"
 
 // ---------------------------------------------------------------------------
@@ -226,24 +227,19 @@ export const resolveClonePaths = (
 // ---------------------------------------------------------------------------
 
 /**
- * Count files in a directory, excluding the .git directory.
+ * Count tracked files in a git repository using `git ls-files`.
+ * Falls back to 0 if the command fails (e.g., not a git repo).
  */
 export const countFiles = (dir: string) =>
   Effect.gen(function* () {
-    const fs = yield* FileSystem
-
-    let count = 0
-    yield* fs.walk(dir).pipe(
-      Stream.filter((entry) => entry.isFile && !entry.relativePath.startsWith(".git/") && entry.relativePath !== ".git"),
-      Stream.runForEach(() =>
-        Effect.sync(() => {
-          count++
-        }),
-      ),
-    )
-
-    return count
-  })
+    const spawner = yield* ProcessSpawner
+    const proc = yield* spawner.spawn("git", ["ls-files"], { cwd: dir })
+    const chunks = yield* Stream.runCollect(proc.output)
+    const lines = Chunk.toArray(chunks)
+    const code = yield* proc.exitCode
+    if (code !== 0) return 0
+    return lines.filter((l) => l.source === "stdout" && l.line.trim() !== "").length
+  }).pipe(Effect.catchAll(() => Effect.succeed(0)))
 
 // ---------------------------------------------------------------------------
 // URL Parsing

src/domain/session/manager.ts

@@ -221,6 +221,17 @@ export class SessionManager {
     return this.session !== null
   }
 
+  /**
+   * Update the session's working directory.
+   * Called when the runbook loads and we know the actual path.
+   */
+  setWorkingDir(dir: string): void {
+    if (this.session) {
+      this.session.workingDir = dir
+      this.session.initialWorkDir = dir
+    }
+  }
+
   /**
    * Reset the session to its initial environment and working directory.
    */