@ai-development-environment/control-agent 0.0.134 → 0.0.136

package/dist/control-agent.js

@@ -6752,6 +6752,14 @@ var AgentGraphQLClient = class {
       { jobId, attemptId, chunks }
     );
   }
+  reportBuildDeploymentLaunched(jobId, deploymentId, launchedAt) {
+    return this.request(
+      `mutation ReportBuildDeploymentLaunched($jobId: ID!, $deploymentId: ID!, $launchedAt: String!) {
+        reportBuildDeploymentLaunched(jobId: $jobId, deploymentId: $deploymentId, launchedAt: $launchedAt)
+      }`,
+      { jobId, deploymentId, launchedAt }
+    );
+  }
   reportBuildProgress(input) {
     return this.request(
       `mutation ReportBuildProgress($input: BuildProgressInput!) {
@@ -8133,6 +8141,7 @@ var WORKTREE_INSPECT_JOB_KIND = "worktree.inspect";
 var WORKTREE_OPERATION_JOB_KIND = "worktree.operation";
 var WORKTREE_COMMIT_JOB_KIND = "worktree.commit";
 var WORKTREE_AUTO_SYNC_JOB_KIND = "worktree.auto-sync";
+var WORKTREE_REVIEWED_SYNC_CAPABILITY = "worktree.auto-sync.reviewed-head";
 var WORKTREE_PREPARATION_JOB_KIND = "worktree.prepare";
 var WORKTREE_GIT_INSPECT_JOB_KIND = "worktree.git.inspect";
 var WORKTREE_GIT_OPERATION_JOB_KIND = "worktree.git.operation";
@@ -8142,6 +8151,7 @@ var JIRA_BRANCH_GENERATE_JOB_KIND = "jira.branch.generate";
 var WORKTREE_MOVE_PUSH_JOB_KIND = "worktree.move.push";
 var WORKTREE_MOVE_CHECKOUT_JOB_KIND = "worktree.move.checkout";
 var WORKTREE_DELETE_JOB_KIND = "worktree.delete";
+var WORKTREE_DELETE_BUILD_DATA_CAPABILITY = "worktree.delete.xcode-cleanup";
 var WORKTREE_DIFF_JOB_KIND = "worktree.diff.inspect";
 var WORKTREE_DIFF_ASSET_JOB_KIND = "worktree.diff.asset";
 var WORKTREE_JOB_KINDS = [
@@ -8560,6 +8570,7 @@ function worktreeMoveCheckoutJobPayload(value) {
 function worktreeDeleteJobPayload(value) {
   const payload = objectValue4(value, "worktree delete payload");
   const allowed = /* @__PURE__ */ new Set([
+    "derivedData",
     "moveId",
     "codebaseId",
     "rootFolder",
@@ -8593,7 +8604,20 @@ function worktreeDeleteJobPayload(value) {
   if (payload.requireClean && !expectedHeadSha) {
     throw new Error("Clean worktree deletion requires an expected HEAD");
   }
+  const derivedData = payload.derivedData === void 0 ? { mode: "DEFAULT", path: null } : objectValue4(payload.derivedData, "worktree delete payload.derivedData");
+  const unexpectedDerivedData = Object.keys(derivedData).find(
+    (key) => !["mode", "path"].includes(key)
+  );
+  if (unexpectedDerivedData)
+    throw new Error(`Unexpected derived data field: ${unexpectedDerivedData}`);
   return {
+    derivedData: {
+      mode: parseDerivedDataLocationMode(derivedData.mode),
+      path: nullableString3(
+        derivedData.path,
+        "worktree delete payload.derivedData.path"
+      )
+    },
     moveId: nullableString3(payload.moveId, "worktree delete payload.moveId"),
     codebaseId: stringValue4(
       payload.codebaseId,
@@ -8749,7 +8773,8 @@ function worktreeAutoSyncJobPayload(value) {
     "baseBranch",
     "phase",
     "forcePreparations",
-    "preparations"
+    "preparations",
+    "mergeGuard"
   ]);
   const unexpected = Object.keys(payload).find((key) => !allowed.has(key));
   if (unexpected) {
@@ -8765,6 +8790,27 @@ function worktreeAutoSyncJobPayload(value) {
       "worktree auto sync payload.forcePreparations must be a boolean"
     );
   }
+  let mergeGuard;
+  if (payload.mergeGuard !== void 0) {
+    const guard = objectValue4(payload.mergeGuard, "merge sync guard");
+    mergeGuard = {
+      expectedHeadSha: stringValue4(
+        guard.expectedHeadSha,
+        "merge sync expected head"
+      ),
+      targetUrl: stringValue4(guard.targetUrl, "merge sync target URL"),
+      targetBranch: stringValue4(guard.targetBranch, "merge sync target branch"),
+      targetSha: stringValue4(guard.targetSha, "merge sync target SHA")
+    };
+    if (!/^[a-f0-9]{40,64}$/i.test(mergeGuard.expectedHeadSha))
+      throw new Error("Invalid merge sync source SHA");
+    if (!/^[a-f0-9]{40,64}$/i.test(mergeGuard.targetSha))
+      throw new Error("Invalid merge sync target SHA");
+    if (!validGitBranchName(mergeGuard.targetBranch))
+      throw new Error("Invalid merge sync target branch");
+    if (payload.phase !== "SYNC")
+      throw new Error("Reviewed sync requires the SYNC phase");
+  }
   return {
     codebaseId: stringValue4(
       payload.codebaseId,
@@ -8788,6 +8834,7 @@ function worktreeAutoSyncJobPayload(value) {
       "worktree auto sync payload.baseBranch"
     ),
     phase: payload.phase,
+    ...mergeGuard ? { mergeGuard } : {},
     forcePreparations: payload.forcePreparations === true,
     preparations: preparationDefinitions(
       payload.preparations ?? [],
@@ -11152,7 +11199,7 @@ function tailscaleServeRemovePayload(value) {
 // package.json
 var package_default = {
   name: "@ai-development-environment/control-agent",
-  version: "0.0.134",
+  version: "0.0.136",
   description: "Control agent for the AI Development Environment",
   license: "MIT",
   repository: {
@@ -11223,6 +11270,7 @@ var PORTABLE_AGENT_CAPABILITIES = [
   ...CODEBASE_JOB_KINDS,
   CODEBASE_RECONCILE_EVENT_CAPABILITY,
   ...WORKTREE_JOB_KINDS,
+  WORKTREE_REVIEWED_SYNC_CAPABILITY,
   ...SKILL_JOB_KINDS,
   ...COVERAGE_JOB_KINDS,
   "runs.protocol.v1",
@@ -11233,6 +11281,7 @@ var PORTABLE_AGENT_CAPABILITIES = [
   ...WORKFLOW_JOB_KINDS
 ];
 var MACOS_AGENT_CAPABILITIES = [
+  WORKTREE_DELETE_BUILD_DATA_CAPABILITY,
   ...BUILD_DATA_JOB_KINDS,
   ...IOS_BUILD_JOB_KINDS,
   ...SIGNING_ASSET_JOB_KINDS,
@@ -47672,6 +47721,7 @@ async function deployPreparedIosBuild(input, folder, appPath, timeoutMs, signal2
       const logPath = join12(directory, "deployment.log");
       const started = Date.now();
       let failure = null;
+      let launchedAt = null;
       try {
         if (deployment.destination.type === "SIMULATOR") {
           if (deployment.destination.state !== "Booted") {
@@ -47719,7 +47769,9 @@ async function deployPreparedIosBuild(input, folder, appPath, timeoutMs, signal2
               logPath
             });
             if (bootStatus.exitCode !== 0)
-              failure = cleanError2(bootStatus.output);
+              failure = cleanError2(
+                bootStatus.output || "Simulator did not finish booting"
+              );
           }
           if (!failure) {
             const install = await runSimpleLogged(logger, {
@@ -47731,7 +47783,10 @@ async function deployPreparedIosBuild(input, folder, appPath, timeoutMs, signal2
               scopeId: deployment.id,
               logPath
             });
-            if (install.exitCode !== 0) failure = cleanError2(install.output);
+            if (install.exitCode !== 0)
+              failure = cleanError2(
+                install.output || "Could not install the app"
+              );
           }
           if (!failure) {
             const launch = await runSimpleLogged(logger, {
@@ -47748,7 +47803,9 @@ async function deployPreparedIosBuild(input, folder, appPath, timeoutMs, signal2
               scopeId: deployment.id,
               logPath
             });
-            if (launch.exitCode !== 0) failure = cleanError2(launch.output);
+            if (launch.exitCode !== 0)
+              failure = cleanError2(launch.output || "Could not launch the app");
+            else launchedAt = (/* @__PURE__ */ new Date()).toISOString();
           }
         } else {
           const verify = await runLoggedCommand({
@@ -47784,7 +47841,10 @@ async function deployPreparedIosBuild(input, folder, appPath, timeoutMs, signal2
               scopeId: deployment.id,
               logPath
             });
-            if (install.exitCode !== 0) failure = cleanError2(install.output);
+            if (install.exitCode !== 0)
+              failure = cleanError2(
+                install.output || "Could not install the app"
+              );
           }
           if (!failure) {
             const launch = await runSimpleLogged(logger, {
@@ -47805,7 +47865,9 @@ async function deployPreparedIosBuild(input, folder, appPath, timeoutMs, signal2
               scopeId: deployment.id,
               logPath
             });
-            if (launch.exitCode !== 0) failure = cleanError2(launch.output);
+            if (launch.exitCode !== 0)
+              failure = cleanError2(launch.output || "Could not launch the app");
+            else launchedAt = (/* @__PURE__ */ new Date()).toISOString();
           }
         }
       } catch (deploymentError) {
@@ -47818,10 +47880,27 @@ async function deployPreparedIosBuild(input, folder, appPath, timeoutMs, signal2
           deployment.id
         );
       }
+      if (launchedAt && context?.reportBuildDeploymentLaunched) {
+        try {
+          await context.reportBuildDeploymentLaunched(
+            deployment.id,
+            launchedAt
+          );
+        } catch (error) {
+          logger.emit(
+            "LAUNCH",
+            "SYSTEM",
+            `Launch reporting will be retried on completion: ${cleanError2(error)}`,
+            "DEPLOYMENT",
+            deployment.id
+          );
+        }
+      }
       outcomes.push({
         id: deployment.id,
         status: signal2.aborted ? "CANCELLED" : failure ? "FAILED" : "SUCCEEDED",
         error: failure,
+        launchedAt,
         durationMs: Date.now() - started,
         outputRelativePath: relative4(input.artifactDirectory, logPath)
       });
@@ -49226,7 +49305,14 @@ import {
   statfs
 } from "node:fs/promises";
 import { homedir as homedir12 } from "node:os";
-import { basename as basename4, dirname as dirname8, isAbsolute as isAbsolute6, join as join16, resolve as resolve7 } from "node:path";
+import {
+  basename as basename4,
+  dirname as dirname8,
+  isAbsolute as isAbsolute6,
+  join as join16,
+  relative as relative7,
+  resolve as resolve7
+} from "node:path";
 var successfulProcess7 = {
   exitCode: 0,
   signal: null,
@@ -49388,6 +49474,53 @@ var scanBuildData = async (rawPayload, timeoutMs, signal2) => {
   if (deviceSupport.warning) warnings.push(deviceSupport.warning);
   return { ...successfulProcess7, entries, warnings };
 };
+async function ownedWorktreeBuildData(folder, configuration, timeoutMs, signal2) {
+  const within = (parent, child) => {
+    const path = relative7(parent, child);
+    return path === "" || !path.startsWith(`..${process.platform === "win32" ? "\\" : "/"}`) && path !== ".." && !isAbsolute6(path);
+  };
+  const roots = await configuredRoots({
+    ...configuration,
+    worktrees: [{ id: "deleted-worktree", folder }]
+  });
+  const targets = [];
+  const warnings = [];
+  for (const root of new Set(roots)) {
+    const report = await scanRoot(root, timeoutMs, signal2);
+    if (report.warning) warnings.push(report.warning);
+    for (const entry of report.entries) {
+      if (entry.kind !== "PROJECT" || !entry.workspacePath || !isAbsolute6(entry.workspacePath) || entry.name.toLowerCase().endsWith(".noindex"))
+        continue;
+      if (!within(folder, resolve7(entry.workspacePath)) || within(folder, entry.path))
+        continue;
+      try {
+        const workspace = await realpath6(entry.workspacePath);
+        if (!within(folder, workspace)) continue;
+      } catch (error) {
+        if (error.code !== "ENOENT") {
+          warnings.push(`${entry.path}: ${errorMessage(error)}`);
+          continue;
+        }
+        let ancestor = dirname8(entry.workspacePath);
+        while (within(folder, ancestor) && ancestor !== folder) {
+          try {
+            if (!within(folder, await realpath6(ancestor))) ancestor = "";
+            break;
+          } catch (parentError) {
+            if (parentError.code !== "ENOENT") {
+              ancestor = "";
+              break;
+            }
+            ancestor = dirname8(ancestor);
+          }
+        }
+        if (!ancestor) continue;
+      }
+      targets.push({ path: entry.path, rootPath: entry.rootPath });
+    }
+  }
+  return { targets, warnings };
+}
 function assertDirectChild(rootPath2, path) {
   if (!isAbsolute6(rootPath2) || !isAbsolute6(path)) {
     throw new Error("Build Data targets must use absolute paths");
@@ -49636,7 +49769,7 @@ import {
   writeFile as writeFile8
 } from "node:fs/promises";
 import { homedir as homedir13 } from "node:os";
-import { dirname as dirname9, isAbsolute as isAbsolute7, join as join17, relative as relative7, resolve as resolve8, sep as sep8 } from "node:path";
+import { dirname as dirname9, isAbsolute as isAbsolute7, join as join17, relative as relative8, resolve as resolve8, sep as sep8 } from "node:path";
 import { promisify as promisify3 } from "node:util";
 var executeFile = promisify3(execFile3);
 var successfulProcess8 = {
@@ -49742,7 +49875,7 @@ async function listPackageFiles(skillDirectory) {
       const metadata = await lstat4(path);
       if (metadata.isSymbolicLink()) {
         throw new Error(
-          `Nested symbolic link is not supported: ${relative7(skillDirectory, path)}`
+          `Nested symbolic link is not supported: ${relative8(skillDirectory, path)}`
         );
       }
       if (metadata.isDirectory()) {
@@ -49754,14 +49887,14 @@ async function listPackageFiles(skillDirectory) {
         throw new Error("Skill contains too many files");
       if (metadata.size > MAX_SKILL_FILE_BYTES) {
         throw new Error(
-          `${relative7(skillDirectory, path)} exceeds the per-file limit`
+          `${relative8(skillDirectory, path)} exceeds the per-file limit`
         );
       }
       totalBytes += metadata.size;
       if (totalBytes > MAX_SKILL_PACKAGE_BYTES)
         throw new Error("Skill exceeds the package size limit");
       files.push({
-        path: relative7(skillDirectory, path).split(sep8).join("/"),
+        path: relative8(skillDirectory, path).split(sep8).join("/"),
         contentsBase64: (await readFile8(path)).toString("base64"),
         executable: (metadata.mode & 73) !== 0
       });
@@ -49840,7 +49973,7 @@ async function scanRoot2(location, configured, targets, warnings) {
     const directory = join17(root, entry.name);
     try {
       const skillPackage = await readPackage(directory, resolvedRoot);
-      const relativeDirectory = location.folder ? relative7(location.folder, directory).split(sep8).join("/") : "";
+      const relativeDirectory = location.folder ? relative8(location.folder, directory).split(sep8).join("/") : "";
       installations.push({
         ...location,
         codebaseId: target2?.codebaseId ?? null,
@@ -49967,7 +50100,7 @@ ${MANAGED_EXCLUDE_END}` : "";
 }
 async function assertUntracked(location, skillDirectory) {
   if (location.scope !== "PROJECT") return;
-  const relativeDirectory = relative7(location.folder, skillDirectory).split(sep8).join("/");
+  const relativeDirectory = relative8(location.folder, skillDirectory).split(sep8).join("/");
   if (await trackedProjectPath(location.folder, relativeDirectory)) {
     throw new Error(
       `${relativeDirectory} is tracked by Git and cannot be managed automatically`
@@ -50041,7 +50174,7 @@ var applySkills = async (payload) => {
     if (operation.scope === "PROJECT" && operation.manageGitExclude) {
       await updateManagedExclude(
         operation.folder,
-        relative7(operation.folder, destination),
+        relative8(operation.folder, destination),
         operation.kind === "WRITE"
       );
     }
@@ -50452,7 +50585,7 @@ var runWorkflowGitCheckpoint = async (payloadValue, _timeoutMs, signal2) => {
 import { createWriteStream as createWriteStream3, watch } from "node:fs";
 import { mkdtemp as mkdtemp9, open as open3, readFile as readFile11, realpath as realpath10, rm as rm18, stat as stat11 } from "node:fs/promises";
 import { tmpdir as tmpdir9 } from "node:os";
-import { basename as basename5, dirname as dirname11, isAbsolute as isAbsolute9, join as join21, relative as relative9 } from "node:path";
+import { basename as basename5, dirname as dirname11, isAbsolute as isAbsolute9, join as join21, relative as relative10 } from "node:path";
 import { spawn as spawn9 } from "node:child_process";
 
 // src/handlers/worktree-preparations.ts
@@ -50466,7 +50599,7 @@ import {
   rm as rm17,
   writeFile as writeFile10
 } from "node:fs/promises";
-import { dirname as dirname10, isAbsolute as isAbsolute8, join as join20, relative as relative8, resolve as resolve9 } from "node:path";
+import { dirname as dirname10, isAbsolute as isAbsolute8, join as join20, relative as relative9, resolve as resolve9 } from "node:path";
 var EXCLUDE_BEGIN = "# BEGIN AIDE PREPARATIONS";
 var EXCLUDE_END = "# END AIDE PREPARATIONS";
 function cleanError3(value) {
@@ -50508,7 +50641,7 @@ async function exists(path) {
 async function safeTarget(folder, path) {
   const root = await realpath9(folder);
   const target2 = resolve9(root, path);
-  const fromRoot = relative8(root, target2);
+  const fromRoot = relative9(root, target2);
   if (!fromRoot || fromRoot.startsWith("..") || isAbsolute8(fromRoot) || path.includes("\0")) {
     throw new Error(
       "Preparation path must be an exact file inside the worktree"
@@ -51300,7 +51433,7 @@ async function inspectWorktreeItem(folderValue2, rootFolder, baseBranch, primary
     return {
       gitDirectory: gitDir,
       folder,
-      relativePath: relative9(rootFolder, folder) || ".",
+      relativePath: relative10(rootFolder, folder) || ".",
       primary,
       branch,
       headSha: headResult.exitCode === 0 ? headResult.stdout.trim() : null,
@@ -51328,7 +51461,7 @@ async function inspectWorktreeItem(folderValue2, rootFolder, baseBranch, primary
     return {
       gitDirectory: folderValue2,
       folder: folderValue2,
-      relativePath: relative9(rootFolder, folderValue2) || ".",
+      relativePath: relative10(rootFolder, folderValue2) || ".",
       primary,
       branch: null,
       headSha: null,
@@ -51782,7 +51915,7 @@ async function availableSide(side, folder, timeoutMs, signal2) {
   }
   try {
     const resolved = await realpath10(side.path);
-    const difference = relative9(folder, resolved);
+    const difference = relative10(folder, resolved);
     return difference !== ".." && !difference.startsWith("../") && (await stat11(resolved)).isFile();
   } catch {
     return false;
@@ -52019,7 +52152,7 @@ var downloadWorktreeDiffAsset = async (payload, timeoutMs, signal2, _onLog, cont
   try {
     if (selected.kind === "FILE") {
       uploadPath = await realpath10(selected.path);
-      const difference = relative9(folder, uploadPath);
+      const difference = relative10(folder, uploadPath);
       if (difference === ".." || difference.startsWith("../")) {
         throw new Error("Diff image resolves outside the worktree");
       }
@@ -53013,6 +53146,26 @@ var deleteWorktree = async (payload, timeoutMs, signal2) => {
       requireSuccess4(remote, `Could not inspect origin/${branch}`);
     }
   }
+  const buildDataCleanup = {
+    deleted: [],
+    warnings: []
+  };
+  let buildDataTargets = [];
+  try {
+    const owned = await ownedWorktreeBuildData(
+      folder,
+      input.derivedData,
+      timeoutMs,
+      signal2
+    );
+    buildDataTargets = owned.targets;
+    buildDataCleanup.warnings.push(...owned.warnings);
+  } catch (error) {
+    signal2.throwIfAborted();
+    buildDataCleanup.warnings.push(
+      `Could not inspect Xcode build data: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
   requireSuccess4(
     await git4(
       rootFolder,
@@ -53022,6 +53175,26 @@ var deleteWorktree = async (payload, timeoutMs, signal2) => {
     ),
     "Could not remove the worktree"
   );
+  if (buildDataTargets.length) {
+    try {
+      const result = await deleteBuildData(
+        { targets: buildDataTargets },
+        timeoutMs,
+        signal2,
+        async () => void 0
+      );
+      buildDataCleanup.deleted.push(...result.deleted);
+      buildDataCleanup.warnings.push(
+        ...result.deleted.filter((entry) => !entry.deleted).map(
+          (entry) => `${entry.path}: ${entry.error ?? "Could not remove Xcode build data"}`
+        )
+      );
+    } catch (error) {
+      buildDataCleanup.warnings.push(
+        `Could not remove Xcode build data: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
   if (branch && await refExists(rootFolder, `refs/heads/${branch}`, timeoutMs, signal2)) {
     requireSuccess4(
       await git4(rootFolder, ["branch", "-D", branch], timeoutMs, signal2),
@@ -53033,7 +53206,8 @@ var deleteWorktree = async (payload, timeoutMs, signal2) => {
     moveId: input.moveId,
     deleted: true,
     branch,
-    remoteBranchDeleted: input.deleteRemoteBranch
+    remoteBranchDeleted: input.deleteRemoteBranch,
+    buildDataCleanup
   };
 };
 var operateWorktree = async (payload, timeoutMs, signal2) => {
@@ -53362,6 +53536,145 @@ var operateWorktree = async (payload, timeoutMs, signal2) => {
     worktree: await worktreeResult()
   };
 };
+async function syncReviewedBranch(input, folder, timeoutMs, signal2) {
+  const guard = input.mergeGuard;
+  const run = async (args, message2) => {
+    const result2 = await git4(folder, args, timeoutMs, signal2);
+    if (result2.exitCode !== 0)
+      throw new Error(
+        `${message2}: ${cleanError4(result2.stderr || result2.stdout)}`
+      );
+    return result2;
+  };
+  const head = async () => (await run(["rev-parse", "HEAD"], "Could not read HEAD")).stdout.trim();
+  const clean2 = async () => {
+    if ((await run(
+      ["status", "--porcelain=v1", "-z"],
+      "Could not inspect changes"
+    )).stdout)
+      throw new Error("Stash or commit changes before Auto Merge can sync");
+  };
+  if (await head() !== guard.expectedHeadSha)
+    throw new Error(
+      "The worktree source commit changed. Review it before resuming Auto Merge."
+    );
+  await clean2();
+  const remoteHead = (await run(
+    [
+      "ls-remote",
+      "--heads",
+      "--",
+      "origin",
+      `refs/heads/${input.expectedBranch}`
+    ],
+    "Could not read the remote source revision"
+  )).stdout.trim().split(/\s+/)[0];
+  if (remoteHead !== guard.expectedHeadSha)
+    throw new Error(
+      "The remote source commit changed. Review it before resuming Auto Merge."
+    );
+  const targetOrigin = normalizeGitOrigin(guard.targetUrl).canonicalOrigin;
+  let targetTransport = targetOrigin === input.expectedOrigin ? "origin" : guard.targetUrl;
+  if (targetTransport !== "origin" && /^https?:/.test(guard.targetUrl)) {
+    const sourceUrl = (await run(["remote", "get-url", "origin"], "Could not read origin")).stdout.trim();
+    const targetUrl = new URL(guard.targetUrl);
+    if (sourceUrl.startsWith("ssh://")) {
+      const source = new URL(sourceUrl);
+      if (source.hostname === targetUrl.hostname) {
+        source.pathname = targetUrl.pathname;
+        targetTransport = source.toString();
+      }
+    } else {
+      const source = /^([^@]+@([^:]+)):/.exec(sourceUrl);
+      if (source?.[2] === targetUrl.hostname)
+        targetTransport = `${source[1]}:${targetUrl.pathname.replace(/^\//, "")}`;
+    }
+  }
+  await run(
+    [
+      "fetch",
+      "--no-tags",
+      "--no-write-fetch-head",
+      "--",
+      targetTransport,
+      guard.targetSha
+    ],
+    "Could not fetch the merge target"
+  );
+  const syncedTargetSha = guard.targetSha;
+  const ancestor = await git4(
+    folder,
+    ["merge-base", "--is-ancestor", syncedTargetSha, "HEAD"],
+    timeoutMs,
+    signal2
+  );
+  if (ancestor.exitCode !== 0 && ancestor.exitCode !== 1)
+    throw new Error("Could not compare the merge target");
+  const result = async (outcome) => ({
+    ...successfulProcess9,
+    outcome,
+    previousHeadSha: guard.expectedHeadSha,
+    syncedHeadSha: await head(),
+    syncedTargetSha,
+    checkedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    preparations: await executeWorktreePreparations(
+      folder,
+      input.preparations,
+      "INSPECT",
+      timeoutMs,
+      signal2
+    ),
+    worktree: await inspectWorktreeItem(
+      folder,
+      folder,
+      input.baseBranch,
+      false,
+      Math.min(timeoutMs, 3e4),
+      signal2
+    )
+  });
+  if (await head() !== guard.expectedHeadSha)
+    throw new Error("The worktree source commit changed during sync");
+  await clean2();
+  if (ancestor.exitCode === 0) return result("NO_CHANGE");
+  const paths = await preparationConflictPaths(
+    folder,
+    input.preparations,
+    syncedTargetSha,
+    timeoutMs,
+    signal2
+  );
+  if (paths.length)
+    return {
+      ...await result("PREPARATION_CONFLICT"),
+      preparationConflictPaths: paths
+    };
+  const rebase = await git4(
+    folder,
+    ["rebase", syncedTargetSha],
+    timeoutMs,
+    signal2
+  );
+  if (rebase.exitCode !== 0) {
+    if (await rebaseInProgress(folder, timeoutMs, signal2))
+      return result("CONFLICT");
+    throw new Error(cleanError4(rebase.stderr || "Auto Merge rebase failed"));
+  }
+  const syncedHeadSha = await head();
+  await clean2();
+  await run(
+    [
+      "push",
+      `--force-with-lease=refs/heads/${input.expectedBranch}:${guard.expectedHeadSha}`,
+      "origin",
+      `${syncedHeadSha}:refs/heads/${input.expectedBranch}`
+    ],
+    "Auto Merge push failed; review the local and remote revisions before resuming"
+  );
+  if (await head() !== syncedHeadSha)
+    throw new Error("The worktree source commit changed during push");
+  return result("SYNCED");
+}
 var autoSyncWorktree = async (payload, timeoutMs, signal2) => {
   const input = worktreeAutoSyncJobPayload(payload);
   const folder = await validateWorktree2(input, timeoutMs, signal2);
@@ -53398,6 +53711,8 @@ var autoSyncWorktree = async (payload, timeoutMs, signal2) => {
       `Auto Sync expected branch ${input.expectedBranch}, but found ${branch ?? "detached HEAD"}`
     );
   }
+  if (input.mergeGuard)
+    return syncReviewedBranch(input, folder, timeoutMs, signal2);
   const upstreamResult = branch ? await git4(
     folder,
     ["rev-parse", "--abbrev-ref", "@{upstream}"],
@@ -54134,6 +54449,11 @@ var JobExecutor = class {
             controller.signal
           ),
           reportBuildProgress: (input) => this.client.reportBuildProgress(input),
+          reportBuildDeploymentLaunched: (deploymentId, launchedAt) => this.client.reportBuildDeploymentLaunched(
+            claimed.id,
+            deploymentId,
+            launchedAt
+          ),
           appendBuildLogChunks: (buildId, chunks) => this.client.appendBuildLogChunks(buildId, chunks),
           uploadBuildArtifact: (input) => this.client.uploadBuildArtifact(input),
           uploadBuildArtifactTransfer: (input) => this.client.uploadBuildArtifactTransfer(input),

package/package.json

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