@rallycry/conveyor-agent 10.0.3 → 10.0.5

package/dist/{chunk-QKRPJ7DB.js → chunk-S72TAMGA.js}

@@ -944,8 +944,10 @@ function createServiceLogger(service) {
 }
 
 // src/runner/git-utils.ts
-import { execSync } from "child_process";
+import { execSync, exec } from "child_process";
 import { realpathSync } from "fs";
+import { promisify } from "util";
+var execAsync = promisify(exec);
 function syncWithBaseBranch(cwd, baseBranch) {
   if (!baseBranch) return true;
   try {
@@ -1057,20 +1059,15 @@ function stageAndCommit(cwd, message) {
     return null;
   }
 }
-function tryPush(cwd, branch, skipVerify = false) {
+async function tryPush(cwd, branch, skipVerify = false) {
   const noVerify = skipVerify ? "--no-verify " : "";
   try {
-    execSync(`git push ${noVerify}origin ${branch}`, {
-      cwd,
-      stdio: ["ignore", "pipe", "pipe"],
-      timeout: 3e4
-    });
+    await execAsync(`git push ${noVerify}origin ${branch}`, { cwd, timeout: 3e4 });
     return true;
   } catch {
     try {
-      execSync(`git push ${noVerify}--force-with-lease origin ${branch}`, {
+      await execAsync(`git push ${noVerify}--force-with-lease origin ${branch}`, {
         cwd,
-        stdio: ["ignore", "pipe", "pipe"],
         timeout: 3e4
       });
       return true;
@@ -1079,9 +1076,9 @@ function tryPush(cwd, branch, skipVerify = false) {
     }
   }
 }
-function isAuthError(cwd) {
+async function isAuthError(cwd) {
   try {
-    execSync("git push --dry-run", { cwd, stdio: ["ignore", "pipe", "pipe"], timeout: 3e4 });
+    await execAsync("git push --dry-run", { cwd, timeout: 3e4 });
     return false;
   } catch (err) {
     if (err.killed) return true;
@@ -1243,14 +1240,14 @@ async function pushToOrigin(cwd, refreshToken, skipVerify = false) {
       } catch {
       }
     }
-    if (tryPush(cwd, currentBranch, skipVerify)) return true;
-    if (refreshToken && isAuthError(cwd)) {
+    if (await tryPush(cwd, currentBranch, skipVerify)) return true;
+    if (refreshToken && await isAuthError(cwd)) {
       const token = await refreshToken();
       if (token) {
         updateRemoteToken(cwd, token);
         process.env.GITHUB_TOKEN = token;
         process.env.GH_TOKEN = token;
-        return tryPush(cwd, currentBranch, skipVerify);
+        return await tryPush(cwd, currentBranch, skipVerify);
       }
     }
     return false;
@@ -1779,11 +1776,11 @@ function execErrorDetail(err) {
   const message = withStreams.message ?? String(err);
   return stderr ? `${message} \u2014 stderr: ${stderr}` : message;
 }
-function dumpPostgresIfPresent(exec = execSync2) {
+function dumpPostgresIfPresent(exec2 = execSync2) {
   if (!hasPostgresDep()) return Promise.resolve({ dumped: false });
   const outputPath = path.join(tmpdir(), `conveyor-pgdump-${randomUUID()}.sql`);
   try {
-    exec(buildPgDumpCommand({ outputPath }), {
+    exec2(buildPgDumpCommand({ outputPath }), {
       stdio: ["ignore", "pipe", "pipe"],
       timeout: 6e4
     });
@@ -1794,10 +1791,10 @@ function dumpPostgresIfPresent(exec = execSync2) {
     return Promise.resolve({ dumped: false });
   }
 }
-function applyPgDumpIfConfigured(dumpPath, exec = execSync2) {
+function applyPgDumpIfConfigured(dumpPath, exec2 = execSync2) {
   if (!hasPostgresDep()) return false;
   try {
-    exec(buildPsqlRestoreCommand({ dumpPath }), {
+    exec2(buildPsqlRestoreCommand({ dumpPath }), {
       stdio: ["ignore", "pipe", "pipe"],
       timeout: 12e4
     });
@@ -4890,6 +4887,95 @@ function truncatePlanForPrompt(plan) {
   return `${head}${PLAN_TRUNCATION_MARKER}${tail}`;
 }
 
+// src/execution/pm-relaunch-instructions.ts
+function resolvePmRelaunchIntent(context, isAuto, agentMode) {
+  switch (agentMode) {
+    case "building":
+      return "build" /* Build */;
+    case "review":
+      return "review" /* Review */;
+    default:
+      break;
+  }
+  if (!isAuto) return "wait_for_team" /* WaitForTeam */;
+  return context.plan?.trim() ? "auto_with_plan" /* AutoWithPlan */ : "auto_planning" /* AutoPlanning */;
+}
+function buildRelaunchMessageSummary(context, lastAgentIdx) {
+  const newMessages = context.chatHistory.slice(lastAgentIdx + 1).filter((m) => m.role === "user");
+  if (newMessages.length === 0) {
+    return [`You have been relaunched. No new messages since your last session.`];
+  }
+  return [
+    `You have been relaunched. Here are new messages since your last session:`,
+    ...newMessages.map((m) => `[${m.userName ?? "user"}]: ${m.content}`)
+  ];
+}
+function buildPmBuildRelaunchParts(context, isAuto) {
+  const parts = [
+    `
+Your plan has been approved. Begin implementing it now.`,
+    `Work on the git branch "${context.githubBranch}". Stay on this branch \u2014 do not checkout or create other branches.`,
+    `Start by reading the relevant source files mentioned in the plan, then write code.`,
+    `When finished, use the mcp__conveyor__create_pull_request tool to open a PR. Do NOT use gh CLI.`
+  ];
+  if (isAuto) {
+    parts.push(
+      `
+CRITICAL: You are in Auto mode. Do NOT report status, ask for confirmation, or go idle without making code changes.`,
+      `Your FIRST action must be reading source files from the plan, then immediately writing code.`,
+      `Do NOT summarize the plan or say "ready to implement" \u2014 start implementing.`,
+      `If you are genuinely blocked, explain the specific blocker \u2014 do not go idle silently.`
+    );
+  }
+  return parts;
+}
+function buildPmReviewRelaunchParts() {
+  return [
+    `
+Resume reviewing and coordinating this task.`,
+    `Call list_subtasks to check current child-task state and progress.`,
+    `Review children in ReviewPR status first, then approve and merge passing PRs.`,
+    `Fire next child builds with start_child_cloud_build when ready.`,
+    `Do not implement code directly or create a new PR from the PM review session.`
+  ];
+}
+function buildPmAutoWithPlanRelaunchParts() {
+  return [
+    `
+You are in auto mode. A plan already exists for this task.`,
+    `Verify that story points, title, and tags are set via get_current_plan, then call ExitPlanMode immediately to transition to building.`,
+    `Do NOT wait for team input \u2014 proceed autonomously.`
+  ];
+}
+function buildPmAutoPlanningRelaunchParts() {
+  return [
+    `
+You are in auto mode. Continue planning autonomously.`,
+    `When the plan and all required properties are set, call ExitPlanMode to transition to building.`,
+    `Do NOT wait for team input \u2014 proceed autonomously.`
+  ];
+}
+function buildPmWaitForTeamRelaunchParts() {
+  return [
+    `
+You are the project manager for this task.`,
+    `Review the context above and wait for the team to provide instructions before taking action.`
+  ];
+}
+function buildPmRelaunchParts(context, lastAgentIdx, isAuto, agentMode) {
+  const parts = buildRelaunchMessageSummary(context, lastAgentIdx);
+  const intent = resolvePmRelaunchIntent(context, isAuto, agentMode);
+  const intentPartsByIntent = {
+    ["build" /* Build */]: () => buildPmBuildRelaunchParts(context, isAuto),
+    ["review" /* Review */]: buildPmReviewRelaunchParts,
+    ["auto_with_plan" /* AutoWithPlan */]: buildPmAutoWithPlanRelaunchParts,
+    ["auto_planning" /* AutoPlanning */]: buildPmAutoPlanningRelaunchParts,
+    ["wait_for_team" /* WaitForTeam */]: buildPmWaitForTeamRelaunchParts
+  };
+  parts.push(...intentPartsByIntent[intent]());
+  return parts;
+}
+
 // src/execution/mode-prompt.ts
 var SP_DESC_MAX_CHARS = 80;
 function truncateDescription(desc, maxChars) {
@@ -5360,59 +5446,6 @@ function detectRelaunchScenario(context, trustChatHistory = false) {
   const hasNewUserMessages = messagesAfterAgent.some((m) => m.role === "user");
   return hasNewUserMessages ? "feedback_relaunch" : "idle_relaunch";
 }
-function buildPmRelaunchParts(context, lastAgentIdx, isAuto, agentMode) {
-  const parts = [];
-  const newMessages = context.chatHistory.slice(lastAgentIdx + 1).filter((m) => m.role === "user");
-  if (newMessages.length > 0) {
-    parts.push(
-      `You have been relaunched. Here are new messages since your last session:`,
-      ...newMessages.map((m) => `[${m.userName ?? "user"}]: ${m.content}`)
-    );
-  } else {
-    parts.push(`You have been relaunched. No new messages since your last session.`);
-  }
-  if (agentMode === "building" || agentMode === "review") {
-    parts.push(
-      `
-Your plan has been approved. Begin implementing it now.`,
-      `Work on the git branch "${context.githubBranch}". Stay on this branch \u2014 do not checkout or create other branches.`,
-      `Start by reading the relevant source files mentioned in the plan, then write code.`,
-      `When finished, use the mcp__conveyor__create_pull_request tool to open a PR. Do NOT use gh CLI.`
-    );
-    if (isAuto) {
-      parts.push(
-        `
-CRITICAL: You are in Auto mode. Do NOT report status, ask for confirmation, or go idle without making code changes.`,
-        `Your FIRST action must be reading source files from the plan, then immediately writing code.`,
-        `Do NOT summarize the plan or say "ready to implement" \u2014 start implementing.`,
-        `If you are genuinely blocked, explain the specific blocker \u2014 do not go idle silently.`
-      );
-    }
-  } else if (isAuto) {
-    if (context.plan?.trim()) {
-      parts.push(
-        `
-You are in auto mode. A plan already exists for this task.`,
-        `Verify that story points, title, and tags are set via get_current_plan, then call ExitPlanMode immediately to transition to building.`,
-        `Do NOT wait for team input \u2014 proceed autonomously.`
-      );
-    } else {
-      parts.push(
-        `
-You are in auto mode. Continue planning autonomously.`,
-        `When the plan and all required properties are set, call ExitPlanMode to transition to building.`,
-        `Do NOT wait for team input \u2014 proceed autonomously.`
-      );
-    }
-  } else {
-    parts.push(
-      `
-You are the project manager for this task.`,
-      `Review the context above and wait for the team to provide instructions before taking action.`
-    );
-  }
-  return parts;
-}
 function buildRelaunchWithSession(mode, context, agentMode, isAuto) {
   const scenario = detectRelaunchScenario(context);
   const hasPriorTurn = !!context.lastSeenMessageId || !!context.claudeSessionId;
@@ -5527,7 +5560,10 @@ ${truncatePlanForPrompt(context.plan)}`);
   }
   return parts;
 }
-function buildFreshInstructions(isPm, isAutoMode, context, agentMode) {
+function buildFreshInstructions(isPm, isCodeReview, isAutoMode, context, agentMode) {
+  if (isCodeReview) {
+    return buildFreshCodeReviewInstructions(context);
+  }
   if (isPm && agentMode === "building") {
     return [
       `Your plan has been approved. Begin implementing it now.`,
@@ -5595,6 +5631,21 @@ CRITICAL: You are in Auto mode. Do NOT report status, ask for confirmation, or g
   }
   return parts;
 }
+function buildFreshCodeReviewInstructions(context) {
+  const parts = [
+    `Perform the automated code review for this PR.`,
+    `Work on the git branch "${context.githubBranch}". Stay on this branch for the entire review. Do not checkout or create other branches.`,
+    `Start by running \`git diff ${context.baseBranch ?? "dev"}..HEAD\` to inspect the submitted changes, then read the task plan and surrounding code as needed.`,
+    `Review for correctness, security, performance, error handling, test coverage, and consistency with existing patterns.`,
+    `If small fixes are needed, make them directly, commit, push, and re-review the result.`,
+    `Use approve_code_review when the PR passes review.`,
+    `Use request_code_changes when substantive issues remain that you cannot fix directly.`
+  ];
+  if (context.githubPRUrl) {
+    parts.push(`The PR under review is ${context.githubPRUrl}. Do not create a new PR.`);
+  }
+  return parts;
+}
 function buildFeedbackInstructions(context, isPm, agentMode, isAuto) {
   const lastAgentIdx = findLastAgentMessageIndex2(context.chatHistory);
   const newMessages = context.chatHistory.slice(lastAgentIdx + 1).filter((m) => m.role === "user");
@@ -5700,8 +5751,11 @@ function buildInstructions(mode, context, scenario, agentMode, isAuto) {
   const parts = [`
 ## Instructions`];
   const isPm = mode === "pm";
+  const isCodeReview = mode === "code-review" || !isPm && agentMode === "review";
   if (scenario === "fresh") {
-    parts.push(...buildFreshInstructions(isPm, agentMode === "auto", context, agentMode));
+    parts.push(
+      ...buildFreshInstructions(isPm, isCodeReview, agentMode === "auto", context, agentMode)
+    );
     return parts;
   }
   if (scenario === "idle_relaunch") {
@@ -6072,7 +6126,7 @@ function buildCreatePullRequestTool(connection, config) {
         "Commit message for staging uncommitted changes. If not provided, a default message based on the PR title will be used."
       ),
       skipVerify: z5.boolean().optional().describe(
-        "Pass --no-verify to the git push, bypassing the local pre-push quality gate (lint/typecheck/test). Use this if a previous attempt failed on the pre-push hook in an environment where you've already run the gates yourself \u2014 CI still runs on the resulting PR."
+        "Controls the local pre-push quality gate (lint/typecheck/test). Defaults to true (--no-verify): the push skips the local gate because you should run gates yourself before opening the PR and CI re-runs them on the resulting PR. Running the full gate synchronously during the push would block the agent's event loop long enough to drop the Conveyor socket connection. Pass false to force the local pre-push hook to run."
       )
     },
     async ({ title, body, branch, baseBranch, commitMessage, skipVerify }) => {
@@ -6107,7 +6161,7 @@ Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com>`;
                 return void 0;
               }
             },
-            skipVerify ?? false
+            skipVerify ?? true
           );
           if (pushSuccess) {
             connection.sendEvent({
@@ -9859,4 +9913,4 @@ export {
   runStartCommand,
   unshallowRepo
 };
-//# sourceMappingURL=chunk-QKRPJ7DB.js.map
+//# sourceMappingURL=chunk-S72TAMGA.js.map