@rallycry/conveyor-agent 5.0.0 → 5.0.2

package/dist/{chunk-DODEEME6.js → chunk-7BQDIIDG.js}

@@ -646,13 +646,6 @@ function runStartCommand(cmd, cwd, onOutput) {
 
 // src/setup/codespace.ts
 import { execSync as execSync3 } from "child_process";
-function initRtk() {
-  try {
-    execSync3("rtk --version", { stdio: "ignore" });
-    execSync3("rtk init --global --auto-patch", { stdio: "ignore" });
-  } catch {
-  }
-}
 function unshallowRepo(workspaceDir) {
   try {
     execSync3("git fetch --unshallow", {
@@ -2466,7 +2459,7 @@ function buildQueryOptions(host, context) {
   const mode = host.agentMode;
   const isCloud = host.config.mode === "pm";
   const isReadOnly = isReadOnlyMode(mode, host.hasExitedPlanMode);
-  const needsCanUseTool = isCloud && isReadOnly;
+  const needsCanUseTool = isReadOnly;
   const systemPromptText = buildSystemPrompt(
     host.config.mode,
     context,
@@ -2498,7 +2491,7 @@ function buildQueryOptions(host, context) {
     disallowedTools: buildDisallowedTools(settings, mode, host.hasExitedPlanMode),
     enableFileCheckpointing: settings.enableFileCheckpointing
   };
-  if (needsCanUseTool) {
+  if (isCloud && isReadOnly) {
     baseOptions.sandbox = buildSandboxConfig(host);
   }
   return baseOptions;
@@ -2911,41 +2904,6 @@ ${message}`);
     return false;
   }
 }
-async function rebasePullBranch(runnerConfig, connection, callbacks, setupLog) {
-  const pullBranch = process.env.CONVEYOR_PULL_BRANCH;
-  if (!pullBranch) return true;
-  pushSetupLog(setupLog, `[conveyor] Rebasing onto latest ${pullBranch}...`);
-  connection.sendEvent({
-    type: "setup_output",
-    stream: "stdout",
-    data: `Rebasing onto latest ${pullBranch}...
-`
-  });
-  try {
-    await runSetupCommand(
-      `git fetch origin ${pullBranch} && git rebase origin/${pullBranch}`,
-      runnerConfig.workspaceDir,
-      (stream, data) => {
-        connection.sendEvent({ type: "setup_output", stream, data });
-        for (const line of data.split("\n").filter(Boolean)) {
-          pushSetupLog(setupLog, `[${stream}] ${line}`);
-        }
-      }
-    );
-    pushSetupLog(setupLog, `[conveyor] Rebase complete`);
-    return true;
-  } catch (error) {
-    const message = `Failed to rebase onto ${pullBranch}: ${error instanceof Error ? error.message : "unknown error"}`;
-    connection.sendEvent({ type: "setup_error", message });
-    await callbacks.onEvent({ type: "setup_error", message });
-    connection.postChatMessage(
-      `Failed to rebase onto latest \`${pullBranch}\`. There may be conflicts between the task branch and dev.
-
-${message}`
-    );
-    return false;
-  }
-}
 async function runSetupSafe(runnerConfig, connection, callbacks, setupLog, effectiveAgentMode, setState) {
   await setState("setup");
   const ports = await loadForwardPorts(runnerConfig.workspaceDir);
@@ -2960,9 +2918,6 @@ async function runSetupSafe(runnerConfig, connection, callbacks, setupLog, effec
   if (!await checkoutTaskBranch(runnerConfig, connection, callbacks, setupLog)) {
     return { ok: false, deferredStartConfig: null };
   }
-  if (!await rebasePullBranch(runnerConfig, connection, callbacks, setupLog)) {
-    return { ok: false, deferredStartConfig: null };
-  }
   const taskBranch = process.env.CONVEYOR_TASK_BRANCH;
   if (taskBranch) {
     pushSetupLog(setupLog, `[conveyor] Switching to task branch ${taskBranch}...`);
@@ -3266,7 +3221,6 @@ var AgentRunner = class {
       }
       this.deferredStartConfig = result.deferredStartConfig;
     }
-    initRtk();
     this.tryInitWorktree();
     if (!await this.fetchAndInitContext()) return;
     if (process.env.CODESPACES === "true" && this.taskContext) {
@@ -3858,7 +3812,22 @@ var ProjectRunner = class {
       projectId: config.projectId
     });
   }
+  async checkoutWorkspaceBranch() {
+    const workspaceBranch = process.env.CONVEYOR_WORKSPACE_BRANCH;
+    if (!workspaceBranch) return;
+    try {
+      execSync5(`git fetch origin ${workspaceBranch}`, { cwd: this.projectDir, stdio: "pipe" });
+      execSync5(`git checkout ${workspaceBranch}`, { cwd: this.projectDir, stdio: "pipe" });
+      logger4.info("Checked out workspace branch", { workspaceBranch });
+    } catch (err) {
+      logger4.warn("Failed to checkout workspace branch, continuing on current branch", {
+        workspaceBranch,
+        ...errorMeta(err)
+      });
+    }
+  }
   async start() {
+    await this.checkoutWorkspaceBranch();
     await this.connection.connect();
     this.connection.onTaskAssignment((assignment) => {
       this.handleAssignment(assignment);
@@ -4073,4 +4042,4 @@ export {
   ProjectRunner,
   FileCache
 };
-//# sourceMappingURL=chunk-DODEEME6.js.map
+//# sourceMappingURL=chunk-7BQDIIDG.js.map