fix: abort rebase on failure in LocalRuntime

execAsync throws on non-zero exit, so the rebase abort was never
reached when git rebase failed. Wrap in nested try-catch to ensure
we always clean up stuck rebases.

Addresses code review feedback: #800

Author: ibetitsmike

src/node/runtime/LocalRuntime.ts

@@ -398,21 +398,24 @@ export class LocalRuntime implements Runtime {
       initLogger.logStep("Rebasing on latest...");
 
       // Attempt rebase on origin/<trunkBranch>
-      using rebaseProc = execAsync(`git -C "${workspacePath}" rebase "origin/${trunkBranch}"`);
-      const rebaseResult = await rebaseProc.result;
-
-      if (rebaseResult.stderr?.includes("CONFLICT")) {
-        // Rebase has conflicts - abort and warn
-        using abortProc = execAsync(`git -C "${workspacePath}" rebase --abort`);
-        await abortProc.result;
-        initLogger.logStderr(
-          "Warning: Rebase failed due to conflicts, continuing with current state"
-        );
-      } else {
+      // execAsync throws on non-zero exit, so we catch rebase failures separately
+      try {
+        using rebaseProc = execAsync(`git -C "${workspacePath}" rebase "origin/${trunkBranch}"`);
+        await rebaseProc.result;
         initLogger.logStep("Rebased on latest successfully");
+      } catch (rebaseError) {
+        // Rebase failed (conflicts or other error) - abort and warn
+        try {
+          using abortProc = execAsync(`git -C "${workspacePath}" rebase --abort`);
+          await abortProc.result;
+        } catch {
+          // Abort may fail if rebase wasn't in progress; ignore
+        }
+        const errorMsg = getErrorMessage(rebaseError);
+        initLogger.logStderr(`Warning: Rebase failed (${errorMsg}), continuing with current state`);
       }
     } catch (error) {
-      // Non-fatal: log warning and continue
+      // Non-fatal: log warning and continue (fetch failed)
       const errorMsg = getErrorMessage(error);
       initLogger.logStderr(`Warning: Failed to pull latest (${errorMsg}), continuing anyway`);
     }