@rallycry/conveyor-agent 7.0.9 → 7.0.10

package/dist/{chunk-LKO3CBJU.js → chunk-BOFWZIL6.js}

@@ -678,6 +678,28 @@ function syncWithBaseBranch(cwd, baseBranch) {
 `);
   return true;
 }
+function ensureOnTaskBranch(cwd, taskBranch) {
+  if (!taskBranch) return true;
+  const current = getCurrentBranch(cwd);
+  if (current === taskBranch) return true;
+  try {
+    execSync(`git fetch origin ${taskBranch}`, { cwd, stdio: "ignore", timeout: 6e4 });
+  } catch {
+    process.stderr.write(`[conveyor-agent] Warning: git fetch origin ${taskBranch} failed
+`);
+    return false;
+  }
+  try {
+    execSync(`git checkout ${taskBranch}`, { cwd, stdio: "ignore", timeout: 3e4 });
+  } catch {
+    process.stderr.write(`[conveyor-agent] Warning: git checkout ${taskBranch} failed
+`);
+    return false;
+  }
+  process.stderr.write(`[conveyor-agent] Checked out task branch ${taskBranch}
+`);
+  return true;
+}
 function hasUncommittedChanges(cwd) {
   const status = execSync("git status --porcelain", {
     cwd,
@@ -5769,6 +5791,7 @@ async function emitRetryStatus(host, attempt, delayMs) {
   await host.callbacks.onStatusChange("running");
 }
 function handleRateLimitPause(host, rateLimitResetsAt) {
+  host.wasRateLimited = true;
   host.connection.emitRateLimitPause(rateLimitResetsAt);
   host.connection.postChatMessage(
     `Rate limited. The task will be automatically re-queued and resume after ${new Date(rateLimitResetsAt).toLocaleString()}.`
@@ -5889,6 +5912,7 @@ var QueryBridge = class {
   pendingToolOutputs = [];
   _stopped = false;
   _isParentTask = false;
+  _wasRateLimited = false;
   _abortController = null;
   /** Called by SessionRunner when ExitPlanMode triggers a mode transition. */
   onModeTransition;
@@ -5903,6 +5927,9 @@ var QueryBridge = class {
   set isParentTask(val) {
     this._isParentTask = val;
   }
+  get wasRateLimited() {
+    return this._wasRateLimited;
+  }
   stop() {
     this._stopped = true;
     this._abortController?.abort();
@@ -5917,6 +5944,7 @@ var QueryBridge = class {
    */
   async execute(context, followUpContent) {
     this._stopped = false;
+    this._wasRateLimited = false;
     this._abortController = new AbortController();
     const host = this.buildHost();
     try {
@@ -5966,6 +5994,12 @@ var QueryBridge = class {
       set pendingModeRestart(val) {
         bridge.mode.pendingModeRestart = val;
       },
+      get wasRateLimited() {
+        return bridge._wasRateLimited;
+      },
+      set wasRateLimited(val) {
+        bridge._wasRateLimited = val;
+      },
       get activeQuery() {
         return bridge.activeQuery;
       },
@@ -6104,13 +6138,20 @@ var SessionRunner = class _SessionRunner {
       await this.shutdown("error");
       return;
     }
+    if (this.fullContext?.githubBranch) {
+      ensureOnTaskBranch(this.config.workspaceDir, this.fullContext.githubBranch);
+    }
     if (this.fullContext?.baseBranch) {
       syncWithBaseBranch(this.config.workspaceDir, this.fullContext.baseBranch);
     }
     this.mode.resolveInitialMode(this.taskContext);
     this.queryBridge = this.createQueryBridge();
     this.logInitialization();
+    const staleMessageCount = this.pendingMessages.length;
     await this.executeInitialMode();
+    if (staleMessageCount > 0) {
+      this.pendingMessages.splice(0, staleMessageCount);
+    }
     if (!this.stopped && this._state !== "error") {
       this.hasCompleted = true;
     }
@@ -6135,14 +6176,31 @@ var SessionRunner = class _SessionRunner {
     await this.run();
   }
   // ── Message filtering ──────────────────────────────────────────────
-  /** Returns true if the message should be skipped (not processed). */
+  /**
+   * Returns true if the message should be skipped (not processed).
+   *
+   * After the agent has completed, we only process:
+   *  1. Critical automated sources (e.g. CI failure) — always process
+   *  2. Messages with source: "user" — real user typed in chat
+   *  3. Messages from flushAllCombined — have a real userId but no source
+   *
+   * Everything else (system messages, stale history replays) is skipped.
+   */
   shouldSkipMessage(msg) {
-    if (!this.hasCompleted || msg.userId !== "system") return false;
+    if (!this.hasCompleted) return false;
     const isCritical = !!msg.source && CRITICAL_AUTOMATED_SOURCES.has(msg.source);
     if (isCritical) {
       this.hasCompleted = false;
       return false;
     }
+    if (msg.source === "user") {
+      this.hasCompleted = false;
+      return false;
+    }
+    if (!msg.source && msg.userId !== "system") {
+      this.hasCompleted = false;
+      return false;
+    }
     return true;
   }
   // ── Core loop ──────────────────────────────────────────────────────
@@ -6160,9 +6218,6 @@ var SessionRunner = class _SessionRunner {
           break;
         }
         if (this.shouldSkipMessage(msg)) continue;
-        if (msg.userId !== "system") {
-          this.hasCompleted = false;
-        }
         await this.setState("running");
         this.interrupted = false;
         await this.callbacks.onEvent({
@@ -6271,6 +6326,7 @@ var SessionRunner = class _SessionRunner {
   static MAX_PR_NUDGES = 3;
   needsPRNudge() {
     if (!this.config.isAuto || this.stopped) return false;
+    if (this.queryBridge?.wasRateLimited) return false;
     if (this.prNudgeCount > _SessionRunner.MAX_PR_NUDGES) return false;
     if (!this.taskContext) return false;
     return this.taskContext.status === "InProgress" && !this.taskContext.githubPRUrl;
@@ -7450,7 +7506,7 @@ var ProjectRunner = class {
   async handleAuditTags(request) {
     this.connection.emitStatus("busy");
     try {
-      const { handleTagAudit } = await import("./tag-audit-handler-4RRGIHVB.js");
+      const { handleTagAudit } = await import("./tag-audit-handler-L7YPDXTA.js");
       await handleTagAudit(request, this.connection, this.projectDir);
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error);
@@ -7871,4 +7927,4 @@ export {
   loadForwardPorts,
   loadConveyorConfig
 };
-//# sourceMappingURL=chunk-LKO3CBJU.js.map
+//# sourceMappingURL=chunk-BOFWZIL6.js.map