@ai-development-environment/control-agent 0.0.52 → 0.0.53

package/dist/control-agent.js

@@ -5980,6 +5980,8 @@ var WORKTREE_OPERATIONS = [
   "OPEN_EDITOR",
   "FORCE_PUSH",
   "SYNC",
+  "REBASE",
+  "CANCEL_REBASE",
   "PUSH",
   "RESET",
   "STASH_ALL",
@@ -13422,7 +13424,7 @@ var runWorkflowGitCheckpoint = async (payloadValue, _timeoutMs, signal) => {
 import { createWriteStream as createWriteStream2, watch } from "node:fs";
 import { mkdtemp as mkdtemp5, open as open2, readFile as readFile7, realpath as realpath6, rm as rm8, stat as stat8 } from "node:fs/promises";
 import { tmpdir as tmpdir5 } from "node:os";
-import { basename as basename4, dirname as dirname6, join as join10, relative as relative5 } from "node:path";
+import { basename as basename4, dirname as dirname6, isAbsolute as isAbsolute5, join as join10, relative as relative5 } from "node:path";
 import { spawn as spawn5 } from "node:child_process";
 var successfulProcess7 = {
   exitCode: 0,
@@ -13446,9 +13448,13 @@ function statusChangeState(value) {
   const entries = value.split("\0").filter(Boolean);
   let hasStagedChanges = false;
   let hasUnstagedChanges = false;
+  let hasConflicts = false;
   for (let index = 0; index < entries.length; index += 1) {
     const code = entries[index].slice(0, 2);
     const untracked = code === "??";
+    if (["DD", "AU", "UD", "UA", "DU", "AA", "UU"].includes(code)) {
+      hasConflicts = true;
+    }
     if (!untracked && code[0] !== " " && code[0] !== "?" && code[0] !== "!") {
       hasStagedChanges = true;
     }
@@ -13459,7 +13465,50 @@ function statusChangeState(value) {
       index += 1;
     }
   }
-  return { hasStagedChanges, hasUnstagedChanges };
+  return { hasStagedChanges, hasUnstagedChanges, hasConflicts };
+}
+async function rebaseInProgress(folder, timeoutMs, signal) {
+  for (const name of ["rebase-merge", "rebase-apply"]) {
+    const pathResult = await git3(
+      folder,
+      ["rev-parse", "--git-path", name],
+      timeoutMs,
+      signal
+    );
+    if (pathResult.exitCode !== 0) continue;
+    const candidate = pathResult.stdout.trim();
+    if (!candidate) continue;
+    try {
+      await stat8(isAbsolute5(candidate) ? candidate : join10(folder, candidate));
+      return true;
+    } catch {
+    }
+  }
+  return false;
+}
+async function rebaseBranch(folder, timeoutMs, signal) {
+  for (const name of ["rebase-merge/head-name", "rebase-apply/head-name"]) {
+    const pathResult = await git3(
+      folder,
+      ["rev-parse", "--git-path", name],
+      timeoutMs,
+      signal
+    );
+    if (pathResult.exitCode !== 0) continue;
+    const candidate = pathResult.stdout.trim();
+    if (!candidate) continue;
+    try {
+      const headName = (await readFile7(
+        isAbsolute5(candidate) ? candidate : join10(folder, candidate),
+        "utf8"
+      )).trim();
+      if (headName.startsWith("refs/heads/")) {
+        return headName.slice("refs/heads/".length);
+      }
+    } catch {
+    }
+  }
+  return null;
 }
 function closeWorktreeWatch(entry) {
   if (entry.timer) clearTimeout(entry.timer);
@@ -13483,39 +13532,44 @@ async function flushWorktreeActivity(entry) {
   entry.pending = false;
   try {
     const signal = new AbortController().signal;
-    const [status2, branchResult, headResult, codeStateHash] = await Promise.all(
-      [
-        git3(
-          entry.folder,
-          [
-            "--no-optional-locks",
-            "status",
-            "--porcelain=v1",
-            "-z",
-            "--untracked-files=all"
-          ],
-          entry.timeoutMs,
-          signal
-        ),
-        git3(
-          entry.folder,
-          ["symbolic-ref", "--short", "-q", "HEAD"],
-          entry.timeoutMs,
-          signal
-        ),
-        git3(entry.folder, ["rev-parse", "HEAD"], entry.timeoutMs, signal),
-        worktreeCodeStateHash(entry.folder, entry.timeoutMs, signal)
-      ]
-    );
-    const branch = branchResult.exitCode === 0 ? branchResult.stdout.trim() : null;
+    const [status2, branchResult, headResult, codeStateHash, rebasing] = await Promise.all([
+      git3(
+        entry.folder,
+        [
+          "--no-optional-locks",
+          "status",
+          "--porcelain=v1",
+          "-z",
+          "--untracked-files=all"
+        ],
+        entry.timeoutMs,
+        signal
+      ),
+      git3(
+        entry.folder,
+        ["symbolic-ref", "--short", "-q", "HEAD"],
+        entry.timeoutMs,
+        signal
+      ),
+      git3(entry.folder, ["rev-parse", "HEAD"], entry.timeoutMs, signal),
+      worktreeCodeStateHash(entry.folder, entry.timeoutMs, signal),
+      rebaseInProgress(entry.folder, entry.timeoutMs, signal)
+    ]);
+    const symbolicBranch = branchResult.exitCode === 0 ? branchResult.stdout.trim() : null;
+    const branch = symbolicBranch ?? (rebasing ? await rebaseBranch(entry.folder, entry.timeoutMs, signal) : null);
     const headSha = headResult.exitCode === 0 ? headResult.stdout.trim() : null;
     const headIdentity = headSha ? `${branch ?? ""}\0${headSha}` : null;
-    const changes = status2.exitCode === 0 ? statusChangeState(status2.stdout) : { hasStagedChanges: false, hasUnstagedChanges: false };
+    const changes = status2.exitCode === 0 ? statusChangeState(status2.stdout) : {
+      hasStagedChanges: false,
+      hasUnstagedChanges: false,
+      hasConflicts: false
+    };
     const report = {
       codebaseId: entry.codebaseId,
       gitDirectory: entry.gitDirectory,
       codeStateHash,
       ...changes,
+      rebaseInProgress: rebasing,
       pushStatus: await worktreePushStatus(
         entry.folder,
         branch,
@@ -13686,9 +13740,14 @@ async function inspectWorktreeItem(folderValue2, rootFolder, baseBranch, primary
   const checkedAt = (/* @__PURE__ */ new Date()).toISOString();
   try {
     const folder = await realpath6(folderValue2);
-    const [gitDir, branchResult, headResult, statusResult] = await Promise.all([
+    const [gitDir, branchResult, headResult, statusResult, rebasing] = await Promise.all([
       gitDirectory(folder, timeoutMs, signal),
-      git3(folder, ["symbolic-ref", "--short", "-q", "HEAD"], timeoutMs, signal),
+      git3(
+        folder,
+        ["symbolic-ref", "--short", "-q", "HEAD"],
+        timeoutMs,
+        signal
+      ),
       git3(folder, ["rev-parse", "HEAD"], timeoutMs, signal),
       git3(
         folder,
@@ -13701,9 +13760,11 @@ async function inspectWorktreeItem(folderValue2, rootFolder, baseBranch, primary
         ],
         timeoutMs,
         signal
-      )
+      ),
+      rebaseInProgress(folder, timeoutMs, signal)
     ]);
-    const branch = branchResult.exitCode === 0 ? branchResult.stdout.trim() : null;
+    const symbolicBranch = branchResult.exitCode === 0 ? branchResult.stdout.trim() : null;
+    const branch = symbolicBranch ?? (rebasing ? await rebaseBranch(folder, timeoutMs, signal) : null);
     const upstreamResult = branch ? await git3(
       folder,
       ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{upstream}"],
@@ -13719,7 +13780,11 @@ async function inspectWorktreeItem(folderValue2, rootFolder, baseBranch, primary
       signal
     ) : { ahead: null, behind: null };
     const syncState = worktreeSyncState(branch, upstream, upstreamCounts);
-    const changes = statusResult.exitCode === 0 ? statusChangeState(statusResult.stdout) : { hasStagedChanges: false, hasUnstagedChanges: false };
+    const changes = statusResult.exitCode === 0 ? statusChangeState(statusResult.stdout) : {
+      hasStagedChanges: false,
+      hasUnstagedChanges: false,
+      hasConflicts: false
+    };
     return {
       gitDirectory: gitDir,
       folder,
@@ -13735,6 +13800,7 @@ async function inspectWorktreeItem(folderValue2, rootFolder, baseBranch, primary
       baseAhead: baseCounts.ahead,
       baseBehind: baseCounts.behind,
       ...changes,
+      rebaseInProgress: rebasing,
       pushStatus: await worktreePushStatus(
         folder,
         branch,
@@ -13763,6 +13829,8 @@ async function inspectWorktreeItem(folderValue2, rootFolder, baseBranch, primary
       baseBehind: null,
       hasStagedChanges: false,
       hasUnstagedChanges: false,
+      rebaseInProgress: false,
+      hasConflicts: false,
       pushStatus: "UNKNOWN",
       availability: "ERROR",
       error: cleanError3(error),
@@ -15239,12 +15307,59 @@ var operateWorktree = async (payload, timeoutMs, signal) => {
         signal
       );
       if (rebase.exitCode !== 0) {
-        await git3(folder, ["rebase", "--abort"], timeoutMs, signal);
+        const status2 = await git3(
+          folder,
+          ["status", "--porcelain=v1", "-z"],
+          timeoutMs,
+          signal
+        );
+        const conflicts = status2.exitCode === 0 && statusChangeState(status2.stdout).hasConflicts;
+        if (!(conflicts && await rebaseInProgress(folder, timeoutMs, signal))) {
+          await git3(folder, ["rebase", "--abort"], timeoutMs, signal);
+        }
         throw new Error(cleanError3(rebase.stderr || "Rebase failed"));
       }
       await runGit(["push", "--force-with-lease"], "Sync push failed");
       break;
     }
+    case "REBASE": {
+      if (!branch) throw new Error("Rebase requires a branch");
+      if (!input.baseBranch) throw new Error("Rebase requires a base branch");
+      const statusResult = await runGit(
+        ["status", "--porcelain"],
+        "Could not inspect worktree changes"
+      );
+      if (statusResult.stdout.trim())
+        throw new Error("Stash or commit changes before rebasing");
+      await runGit(["fetch", "origin"], "Could not fetch origin");
+      const rebase = await git3(
+        folder,
+        ["rebase", `refs/remotes/origin/${input.baseBranch}`],
+        timeoutMs,
+        signal
+      );
+      if (rebase.exitCode !== 0) {
+        const status2 = await git3(
+          folder,
+          ["status", "--porcelain=v1", "-z"],
+          timeoutMs,
+          signal
+        );
+        const conflicts = status2.exitCode === 0 && statusChangeState(status2.stdout).hasConflicts;
+        if (!(conflicts && await rebaseInProgress(folder, timeoutMs, signal))) {
+          await git3(folder, ["rebase", "--abort"], timeoutMs, signal);
+        }
+        throw new Error(cleanError3(rebase.stderr || "Rebase failed"));
+      }
+      break;
+    }
+    case "CANCEL_REBASE": {
+      if (!await rebaseInProgress(folder, timeoutMs, signal)) {
+        throw new Error("No rebase is in progress");
+      }
+      await runGit(["rebase", "--abort"], "Could not cancel rebase");
+      break;
+    }
     case "PUSH":
       if (!branch) throw new Error("Push requires a branch");
       await runGit(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-development-environment/control-agent",
-  "version": "0.0.52",
+  "version": "0.0.53",
   "description": "Control agent for the AI Development Environment",
   "license": "MIT",
   "repository": {