@rallycry/conveyor-agent 7.0.2 → 7.0.4

package/dist/{chunk-NZ3IPMLO.js → chunk-K2TJHPMA.js}

@@ -141,25 +141,7 @@ var AgentConnection = class {
       });
       this.socket.io.on("reconnect", () => {
         process.stderr.write("[conveyor-agent] Reconnected\n");
-        this.call("connectAgent", { sessionId: this.config.sessionId }).then(({ pendingMessages }) => {
-          for (const msg of pendingMessages) {
-            if (msg.content) {
-              if (this.messageCallback) {
-                this.messageCallback({ content: msg.content, userId: msg.userId });
-              } else {
-                this.earlyMessages.push({ content: msg.content, userId: msg.userId });
-              }
-            }
-          }
-        }).catch(() => {
-        });
-        if (this.lastEmittedStatus) {
-          void this.call("reportAgentStatus", {
-            sessionId: this.config.sessionId,
-            status: this.lastEmittedStatus
-          }).catch(() => {
-          });
-        }
+        void this.reconnectToSession();
       });
       this.socket.io.on("reconnect_attempt", () => {
       });
@@ -174,6 +156,53 @@ var AgentConnection = class {
       this.socket = null;
     }
   }
+  // ── Reconnect with retry ────────────────────────────────────────────
+  async reconnectToSession() {
+    const maxRetries = 5;
+    const baseDelayMs = 2e3;
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+      try {
+        const { pendingMessages } = await this.call("connectAgent", {
+          sessionId: this.config.sessionId
+        });
+        this.drainPendingMessages(pendingMessages);
+        process.stderr.write("[conveyor-agent] Reconnected to session successfully\n");
+        if (this.lastEmittedStatus) {
+          void this.call("reportAgentStatus", {
+            sessionId: this.config.sessionId,
+            status: this.lastEmittedStatus
+          }).catch(() => {
+          });
+        }
+        return;
+      } catch (err) {
+        const errMsg = err instanceof Error ? err.message : String(err);
+        const delayMs = baseDelayMs * 2 ** (attempt - 1);
+        process.stderr.write(
+          `[conveyor-agent] connectAgent failed (attempt ${attempt}/${maxRetries}): ${errMsg} \u2014 retrying in ${delayMs / 1e3}s
+`
+        );
+        await new Promise((resolve2) => {
+          setTimeout(resolve2, delayMs);
+        });
+      }
+    }
+    process.stderr.write(
+      `[conveyor-agent] Failed to reconnect to session after ${maxRetries} attempts, exiting
+`
+    );
+    process.exit(1);
+  }
+  drainPendingMessages(messages) {
+    for (const msg of messages) {
+      if (!msg.content) continue;
+      if (this.messageCallback) {
+        this.messageCallback({ content: msg.content, userId: msg.userId });
+      } else {
+        this.earlyMessages.push({ content: msg.content, userId: msg.userId });
+      }
+    }
+  }
   // ── Callback registration with early-buffer draining ───────────────
   onMessage(callback) {
     this.messageCallback = callback;
@@ -234,6 +263,7 @@ var AgentConnection = class {
     };
     const heartbeatStatus = statusMap[this.lastEmittedStatus ?? "idle"] ?? "active";
     void this.call("heartbeat", {
+      sessionId: this.config.sessionId,
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       status: heartbeatStatus
     }).catch(() => {
@@ -1143,6 +1173,14 @@ function buildDiscoveryPrompt(context) {
     `- If the work fits in a single task (1-3 SP), update YOUR OWN plan and properties \u2014 do not create subtasks`,
     `- Only create subtasks when the work genuinely requires multiple independent pieces (e.g., Pack-tier work, 8+ SP)`,
     ``,
+    `### Subtask Plan Requirements`,
+    `When creating subtasks, each MUST include a detailed \`plan\` field:`,
+    `- Plans should be multi-step implementation guides, not vague descriptions`,
+    `- Include specific file paths, function names, and code patterns to modify`,
+    `- Reference existing implementations when relevant (e.g., "follow the pattern in src/services/foo.ts")`,
+    `- Include testing requirements and acceptance criteria`,
+    `- Set \`storyPointValue\` based on estimated complexity`,
+    ``,
     `### Finishing Planning`,
     `Once your plan is complete and all required properties are set, call the **ExitPlanMode** tool.`,
     `- Required before ExitPlanMode will succeed: **plan** (via update_task), **story points** (via update_task_properties), **title** (via update_task_properties)`,
@@ -1174,6 +1212,14 @@ function buildAutoPrompt(context) {
     `- Once ExitPlanMode succeeds, the system will automatically restart your session in Building mode with the appropriate model`,
     `- You do NOT need to do anything after calling ExitPlanMode \u2014 the transition is handled for you`,
     ``,
+    `### Subtask Plan Requirements`,
+    `When creating subtasks, each MUST include a detailed \`plan\` field:`,
+    `- Plans should be multi-step implementation guides, not vague descriptions`,
+    `- Include specific file paths, function names, and code patterns to modify`,
+    `- Reference existing implementations when relevant`,
+    `- Include testing requirements and acceptance criteria`,
+    `- Set \`storyPointValue\` based on estimated complexity`,
+    ``,
     `### Autonomous Guidelines:`,
     `- Make decisions independently \u2014 do not ask the team for approval at each step`,
     `- Only escalate when genuinely blocked (ambiguous requirements, missing access, conflicting instructions)`,
@@ -1200,13 +1246,12 @@ function buildModePrompt(agentMode, context) {
         parts.push(
           ``,
           `### Resource Management`,
-          `Your pod starts with minimal resources (0.25 CPU / 1 Gi). You MUST call \`scale_up_resources\``,
-          `BEFORE running any of these operations \u2014 they WILL fail or OOM at baseline resources:`,
-          `- **light** (1 CPU / 4 Gi) \u2014 bun/npm/yarn install, pip install, basic dev servers, light builds`,
-          `- **standard** (2 CPU / 8 Gi) \u2014 full dev servers, test suites, typecheck, lint`,
-          `- **heavy** (4 CPU / 16 Gi) \u2014 E2E/browser automation, large parallel builds`,
-          `Scaling is one-way (up only) and capped by project limits.`,
-          `CRITICAL: Always scale to at least "light" before running any package install command.`
+          `Your pod starts with minimal resources. You MUST call \`scale_up_resources\``,
+          `BEFORE running any resource-intensive operations \u2014 they WILL fail or OOM at baseline resources:`,
+          `- **setup** \u2014 package installs, basic dev servers, light builds`,
+          `- **build** \u2014 full dev servers, test suites, typecheck, lint, E2E tests`,
+          `Actual CPU/memory values are configured per-project. Scaling is one-way (up only).`,
+          `CRITICAL: Always scale to at least "setup" before running any package install command.`
         );
       }
       return parts.join("\n");
@@ -2305,6 +2350,7 @@ Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com>`;
           }
         }
         const result = await connection.call("createPullRequest", {
+          sessionId: connection.sessionId,
           title,
           body,
           head: branch,
@@ -2318,7 +2364,15 @@ Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com>`;
         return textResult(`Pull request #${result.prNumber} created: ${result.prUrl}`);
       } catch (error) {
         const msg = error instanceof Error ? error.message : "Unknown error";
-        return textResult(`Failed to create pull request: ${msg}`);
+        return textResult(
+          `Failed to create pull request: ${msg}
+
+Troubleshooting:
+- Ensure all changes are committed and pushed to the remote branch
+- Check that the branch exists on the remote (run: git push -u origin HEAD)
+- Verify there isn't already an open PR for this branch
+- If git auth fails, the token may have expired \u2014 retry the operation`
+        );
       }
     }
   );
@@ -2455,9 +2509,9 @@ function buildVoteSuggestionTool(connection) {
 function buildScaleUpResourcesTool(connection) {
   return defineTool(
     "scale_up_resources",
-    "Scale up the pod's CPU and memory resources. Use before running dev servers, tests, builds, or other resource-intensive operations. Tiers: 'light' (1 CPU / 4 Gi \u2014 installs, basic dev servers), 'standard' (2 CPU / 8 Gi \u2014 full dev servers, test suites, typecheck), 'heavy' (4 CPU / 16 Gi \u2014 E2E tests, large parallel builds). Scaling is one-way (up only) and capped by project limits.",
+    "Scale up the pod's CPU and memory resources. Use before running dev servers, tests, builds, or other resource-intensive operations. Phases: 'setup' (installs, basic dev servers), 'build' (full dev servers, test suites, typecheck, builds). Actual CPU/memory values are configured per-project. Scaling is one-way (up only).",
     {
-      tier: z.enum(["initial", "light", "standard", "heavy"]).describe("The resource tier to scale up to"),
+      tier: z.enum(["initial", "setup", "build"]).describe("The resource phase to scale up to"),
       reason: z.string().optional().describe("Brief reason for scaling (e.g., 'running test suite')")
     },
     async ({ tier, reason }) => {
@@ -2468,13 +2522,8 @@ function buildScaleUpResourcesTool(connection) {
           reason
         });
         if (result.success) {
-          if (result.currentTier === result.previousTier) {
-            return textResult(
-              `Already at ${result.currentTier} tier (${result.cpu} CPU / ${result.memory} Gi). No scaling needed.`
-            );
-          }
           return textResult(
-            `Scaled to ${result.cpu} CPU / ${result.memory} Gi (${result.currentTier} tier, was ${result.previousTier}).`
+            `Scaled to ${result.currentTier} phase (${result.cpu}). Was ${result.previousTier}.`
           );
         }
         return textResult(
@@ -2551,14 +2600,15 @@ function buildCreateSubtaskTool(connection) {
       ordinal: z2.number().optional().describe("Step/order number (0-based)"),
       storyPointValue: z2.number().optional().describe(SP_DESCRIPTION)
     },
-    async ({ title, description, plan: _plan, ordinal, storyPointValue }) => {
+    async ({ title, description, plan, ordinal, storyPointValue }) => {
       try {
         const result = await connection.call("createSubtask", {
           sessionId: connection.sessionId,
           title,
-          description,
-          storyPoints: storyPointValue,
-          ordinal
+          ...description !== void 0 && { description },
+          ...plan !== void 0 && { plan },
+          ...storyPointValue !== void 0 && { storyPointValue },
+          ...ordinal !== void 0 && { ordinal }
         });
         return textResult(`Subtask created with ID: ${result.id}`);
       } catch (error) {
@@ -2581,20 +2631,15 @@ function buildUpdateSubtaskTool(connection) {
       ordinal: z2.number().optional(),
       storyPointValue: z2.number().optional().describe(SP_DESCRIPTION)
     },
-    async ({
-      subtaskId,
-      title,
-      description,
-      plan: _plan,
-      ordinal: _ordinal,
-      storyPointValue: _sp
-    }) => {
+    async ({ subtaskId, title, description, plan, storyPointValue }) => {
       try {
         await connection.call("updateSubtask", {
           sessionId: connection.sessionId,
           subtaskId,
-          title,
-          description
+          ...title !== void 0 && { title },
+          ...description !== void 0 && { description },
+          ...plan !== void 0 && { plan },
+          ...storyPointValue !== void 0 && { storyPointValue }
         });
         return textResult("Subtask updated.");
       } catch (error) {
@@ -4656,15 +4701,39 @@ function handleAutoToolAccess(toolName, input, hasExitedPlanMode, isParentTask)
   }
   return { behavior: "allow", updatedInput: input };
 }
+function collectMissingProps(taskProps) {
+  const missing = [];
+  if (!taskProps.plan?.trim()) missing.push("plan (save via update_task)");
+  if (!taskProps.storyPointId) missing.push("story points (use update_task_properties)");
+  if (!taskProps.title || taskProps.title === "Untitled")
+    missing.push("title (use update_task_properties)");
+  return missing;
+}
 async function handleExitPlanMode(host, input) {
+  if (host.hasExitedPlanMode) {
+    return { behavior: "allow", updatedInput: input };
+  }
   try {
     host.syncPlanFile();
     const taskProps = await host.connection.getTaskProperties();
-    const missingProps = [];
-    if (!taskProps.plan?.trim()) missingProps.push("plan (save via update_task)");
-    if (!taskProps.storyPointId) missingProps.push("story points (use update_task_properties)");
-    if (!taskProps.title || taskProps.title === "Untitled")
-      missingProps.push("title (use update_task_properties)");
+    const missingProps = collectMissingProps(taskProps);
+    if (host.isParentTask) {
+      try {
+        const subtasks = await host.connection.call("listSubtasks", {
+          sessionId: host.connection.sessionId
+        });
+        const subtasksWithoutPlans = subtasks.filter(
+          (s) => !s.plan?.trim()
+        );
+        if (subtasksWithoutPlans.length > 0) {
+          const names = subtasksWithoutPlans.map((s) => s.title).join(", ");
+          missingProps.push(
+            `subtask plans \u2014 these subtasks are missing plans: ${names} (use update_subtask with plan field)`
+          );
+        }
+      } catch {
+      }
+    }
     if (missingProps.length > 0) {
       return {
         behavior: "deny",
@@ -5223,6 +5292,8 @@ var QueryBridge = class {
       const msg = err instanceof Error ? err.message : String(err);
       logger2.error("Query execution failed", { error: msg });
       this.connection.sendEvent({ type: "error", message: msg });
+    } finally {
+      this.mode.pendingModeRestart = false;
     }
   }
   // ── QueryHost construction ──────────────────────────────────────────
@@ -5431,6 +5502,7 @@ var SessionRunner = class _SessionRunner {
         if (!this.stopped && this.pendingMessages.length === 0) {
           await this.maybeSendPRNudge();
         }
+        this.hasCompleted = true;
         if (!this.stopped) await this.setState("idle");
       } else if (this._state === "error") {
         await this.setState("idle");
@@ -6624,7 +6696,7 @@ var ProjectRunner = class {
   }
   // ── Event wiring ───────────────────────────────────────────────────────
   wireEventHandlers() {
-    this.connection.onTaskAssignment((assignment) => this.handleAssignment(assignment));
+    this.connection.onTaskAssignment((assignment) => void this.handleAssignment(assignment));
     this.connection.onStopTask((data) => this.handleStopTask(data.taskId));
     this.connection.onShutdown(() => void this.stop());
     this.connection.onChatMessage((msg) => {
@@ -6682,13 +6754,42 @@ var ProjectRunner = class {
     }
   }
   // ── Task management ────────────────────────────────────────────────────
-  handleAssignment(assignment) {
+  async killAgent(agent, taskId) {
+    const shortId = taskId.slice(0, 8);
+    if (agent.process.exitCode !== null) {
+      logger6.info("Agent process already exited", { taskId: shortId });
+      return;
+    }
+    logger6.info("Killing agent process", { taskId: shortId });
+    agent.process.kill("SIGTERM");
+    await new Promise((resolve2) => {
+      const timer = setTimeout(() => {
+        if (agent.process.exitCode === null) {
+          logger6.warn("Agent did not exit after SIGTERM, sending SIGKILL", { taskId: shortId });
+          agent.process.kill("SIGKILL");
+        }
+        resolve2();
+      }, STOP_TIMEOUT_MS);
+      agent.process.on("exit", () => {
+        clearTimeout(timer);
+        resolve2();
+      });
+    });
+  }
+  // oxlint-disable-next-line max-lines-per-function -- re-assignment logic requires sequential checks
+  async handleAssignment(assignment) {
     const { taskId, mode } = assignment;
     const shortId = taskId.slice(0, 8);
     const agentKey = assignment.agentMode === "code-review" ? `${taskId}:code-review` : taskId;
-    if (this.activeAgents.has(agentKey)) {
-      logger6.info("Task already running, skipping", { taskId: shortId });
-      return;
+    const existing = this.activeAgents.get(agentKey);
+    if (existing) {
+      if (existing.process.exitCode === null) {
+        logger6.info("Re-assignment received, killing existing agent", { taskId: shortId });
+        await this.killAgent(existing, taskId);
+      } else {
+        logger6.info("Stale agent entry (process already exited), cleaning up", { taskId: shortId });
+      }
+      this.activeAgents.delete(agentKey);
     }
     if (this.activeAgents.size >= MAX_CONCURRENT) {
       logger6.warn("Max concurrent agents reached", { maxConcurrent: MAX_CONCURRENT });
@@ -6730,16 +6831,11 @@ var ProjectRunner = class {
     }
   }
   handleStopTask(taskId) {
-    let agent = this.activeAgents.get(taskId);
-    if (!agent) agent = this.activeAgents.get(`${taskId}:code-review`);
+    const agentKey = this.activeAgents.has(taskId) ? taskId : `${taskId}:code-review`;
+    const agent = this.activeAgents.get(agentKey);
     if (!agent) return;
     logger6.info("Stopping task", { taskId: taskId.slice(0, 8) });
-    agent.process.kill("SIGTERM");
-    const timer = setTimeout(() => {
-      if (this.activeAgents.has(taskId)) agent.process.kill("SIGKILL");
-    }, STOP_TIMEOUT_MS);
-    agent.process.on("exit", () => {
-      clearTimeout(timer);
+    void this.killAgent(agent, taskId).then(() => {
       if (agent.usesWorktree) {
         try {
           removeWorktree(this.projectDir, taskId);
@@ -7027,4 +7123,4 @@ export {
   removeWorktree,
   ProjectRunner
 };
-//# sourceMappingURL=chunk-NZ3IPMLO.js.map
+//# sourceMappingURL=chunk-K2TJHPMA.js.map