@rallycry/conveyor-agent 7.0.9 → 7.0.11

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

@@ -501,23 +501,17 @@ var ModeController = class {
       this._mode = "code-review";
       return this._mode;
     }
-    if (this._mode === "auto") {
-      const pastPlanning = context.status !== "Planning" && context.status !== "Unidentified";
-      if (pastPlanning) {
-        this.transitionToBuilding(context);
-        return this._mode;
-      }
+    if (this._mode === "auto" && this.canBypassPlanning(context)) {
+      this.transitionToBuilding(context);
+      return this._mode;
     }
     return this._mode;
   }
   /** Check if auto-mode can bypass planning (task already has plan + properties) */
   canBypassPlanning(context) {
     if (this._mode !== "auto") return false;
-    const pastPlanning = context.status !== "Planning" && context.status !== "Unidentified";
-    if (pastPlanning) return true;
-    if (context.status === "Planning" && context.plan?.trim() && context.storyPointId) {
-      return true;
-    }
+    if (context.status !== "Planning") return true;
+    if (context.plan?.trim() && context.storyPointId) return true;
     return false;
   }
   // ── Mode transitions ───────────────────────────────────────────────
@@ -678,6 +672,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,
@@ -941,7 +957,8 @@ var GetSuggestionsRequestSchema = z.object({
   sessionId: z.string()
 });
 var GetTaskIncidentsRequestSchema = z.object({
-  sessionId: z.string()
+  sessionId: z.string(),
+  taskId: z.string().optional()
 });
 var CreatePullRequestRequestSchema = CreatePRInputSchema.extend({ sessionId: z.string() });
 var UpdateTaskStatusRequestSchema = z.object({
@@ -1022,7 +1039,8 @@ var UpdateTaskPropertiesRequestSchema = z.object({
   sessionId: z.string(),
   title: z.string().optional(),
   storyPointValue: z.number().int().positive().optional(),
-  tagIds: z.array(z.string()).optional()
+  tagIds: z.array(z.string()).optional(),
+  githubPRUrl: z.string().url().optional()
 });
 var ListIconsRequestSchema = z.object({
   sessionId: z.string()
@@ -2308,6 +2326,33 @@ async function resolveTaskTagContext(context) {
   );
   return injectedSection || null;
 }
+function formatRepoRefs(repoRefs) {
+  const parts = [];
+  parts.push(`
+## Repository References`);
+  for (const ref of repoRefs) {
+    const icon = ref.refType === "folder" ? "folder" : "file";
+    parts.push(`- [${icon}] \`${ref.path}\``);
+  }
+  return parts;
+}
+function formatIncidents(incidents) {
+  const parts = [];
+  parts.push(`
+## Linked Incidents`);
+  parts.push(
+    `This task has linked incidents. Review them for context on the problem being addressed.
+`
+  );
+  for (const inc of incidents) {
+    const severity = inc.severity ? ` [${inc.severity}]` : "";
+    const status = inc.status ? ` (${inc.status})` : "";
+    parts.push(`### ${inc.title}${severity}${status}`);
+    if (inc.description) parts.push(inc.description);
+    if (inc.source) parts.push(`Source: ${inc.source}`);
+  }
+  return parts;
+}
 async function buildTaskBody(context) {
   const parts = [];
   parts.push(`# Task: ${context.title}`);
@@ -2335,15 +2380,13 @@ ${context.plan}`);
     }
   }
   if (context.repoRefs && context.repoRefs.length > 0) {
-    parts.push(`
-## Repository References`);
-    for (const ref of context.repoRefs) {
-      const icon = ref.refType === "folder" ? "folder" : "file";
-      parts.push(`- [${icon}] \`${ref.path}\``);
-    }
+    parts.push(...formatRepoRefs(context.repoRefs));
   }
   const tagSection = await resolveTaskTagContext(context);
   if (tagSection) parts.push(tagSection);
+  if (context.incidents && context.incidents.length > 0) {
+    parts.push(...formatIncidents(context.incidents));
+  }
   if (context.chatHistory.length > 0) {
     parts.push(...formatChatHistory(context.chatHistory));
   }
@@ -3425,21 +3468,24 @@ function buildDiscoveryTools(connection) {
       {
         title: z4.string().optional().describe("The new task title"),
         storyPointValue: z4.number().optional().describe(SP_DESCRIPTION2),
-        tagIds: z4.array(z4.string()).optional().describe("Array of tag IDs to assign")
+        tagIds: z4.array(z4.string()).optional().describe("Array of tag IDs to assign"),
+        githubPRUrl: z4.string().url().optional().describe("GitHub pull request URL to link to this task")
       },
-      async ({ title, storyPointValue, tagIds }) => {
+      async ({ title, storyPointValue, tagIds, githubPRUrl }) => {
         try {
           await connection.call("updateTaskProperties", {
             sessionId: connection.sessionId,
             title,
             storyPointValue,
-            tagIds
+            tagIds,
+            githubPRUrl
           });
           const updatedFields = [];
           if (title !== void 0) updatedFields.push(`title to "${title}"`);
           if (storyPointValue !== void 0)
             updatedFields.push(`story points to ${storyPointValue}`);
           if (tagIds !== void 0) updatedFields.push(`tags (${tagIds.length} tag(s))`);
+          if (githubPRUrl !== void 0) updatedFields.push(`PR link to "${githubPRUrl}"`);
           return textResult(`Task properties updated: ${updatedFields.join(", ")}`);
         } catch (error) {
           return textResult(
@@ -5769,6 +5815,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 +5936,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 +5951,9 @@ var QueryBridge = class {
   set isParentTask(val) {
     this._isParentTask = val;
   }
+  get wasRateLimited() {
+    return this._wasRateLimited;
+  }
   stop() {
     this._stopped = true;
     this._abortController?.abort();
@@ -5917,6 +5968,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 +6018,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;
       },
@@ -5998,6 +6056,27 @@ var QueryBridge = class {
 };
 
 // src/runner/session-runner.ts
+function mapChatHistory(messages) {
+  if (!messages) return [];
+  return messages.map((m) => ({
+    role: m.role ?? "user",
+    content: m.content ?? "",
+    userId: m.userId,
+    userName: m.user?.name ?? void 0,
+    createdAt: m.createdAt,
+    ...m.files && m.files.length > 0 ? {
+      files: m.files.map((f) => ({
+        fileId: f.id,
+        fileName: f.fileName,
+        mimeType: f.mimeType,
+        fileSize: f.fileSize,
+        downloadUrl: f.downloadUrl ?? "",
+        content: f.content,
+        contentEncoding: f.contentEncoding
+      }))
+    } : {}
+  }));
+}
 var SessionRunner = class _SessionRunner {
   connection;
   mode;
@@ -6104,13 +6183,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 +6221,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 +6263,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 +6371,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;
@@ -6323,24 +6424,7 @@ var SessionRunner = class _SessionRunner {
   }
   // ── Context & bridge construction ────────────────────────────────
   buildFullContext(ctx) {
-    const chatHistory = (ctx.chatHistory ?? []).map((m) => ({
-      role: m.role ?? "user",
-      content: m.content ?? "",
-      userId: m.userId,
-      userName: m.user?.name ?? void 0,
-      createdAt: m.createdAt,
-      ...m.files && m.files.length > 0 ? {
-        files: m.files.map((f) => ({
-          fileId: f.id,
-          fileName: f.fileName,
-          mimeType: f.mimeType,
-          fileSize: f.fileSize,
-          downloadUrl: f.downloadUrl ?? "",
-          content: f.content,
-          contentEncoding: f.contentEncoding
-        }))
-      } : {}
-    }));
+    const chatHistory = mapChatHistory(ctx.chatHistory);
     return {
       taskId: ctx.id,
       projectId: ctx.projectId ?? "",
@@ -6349,7 +6433,8 @@ var SessionRunner = class _SessionRunner {
       plan: ctx.plan,
       status: ctx.status,
       chatHistory,
-      agentId: null,
+      agentId: ctx.agentId ?? null,
+      _runnerSessionId: this.sessionId,
       agentInstructions: ctx.agentInstructions ?? "",
       model: ctx.model,
       githubBranch: ctx.githubBranch ?? "",
@@ -6363,7 +6448,8 @@ var SessionRunner = class _SessionRunner {
       projectAgents: ctx.projectAgents ?? void 0,
       projectTags: ctx.projectTags ?? void 0,
       taskTagIds: ctx.taskTagIds ?? void 0,
-      projectObjectives: ctx.projectObjectives ?? void 0
+      projectObjectives: ctx.projectObjectives ?? void 0,
+      incidents: ctx.incidents ?? void 0
     };
   }
   createQueryBridge() {
@@ -7450,7 +7536,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 +7957,4 @@ export {
   loadForwardPorts,
   loadConveyorConfig
 };
-//# sourceMappingURL=chunk-LKO3CBJU.js.map
+//# sourceMappingURL=chunk-OUARAX27.js.map