@the-open-engine/zeroshot 6.38.1 → 6.39.1

package/README.md

@@ -106,6 +106,7 @@ zeroshot run <input>             # issue, URL, markdown file, or inline text
 zeroshot run 123 --docker        # container isolation
 zeroshot run 123 --pr            # worktree + pull request
 zeroshot run 123 --ship          # worktree + PR + merge after approval
+zeroshot run 123 --pr --pr-body $'## Summary\n\nCustom text\n\n{{issue_reference}}'
 zeroshot run 123 -d              # background run
 
 zeroshot list                    # tasks and clusters (--json)
@@ -120,6 +121,11 @@ zeroshot settings                # effective settings
 zeroshot agents list             # available agents
 ```
 
+`--pr-body` supplies a deterministic pull-request body for `--pr` and `--ship` runs. The
+template supports `{{issue_number}}`, `{{issue_title}}`, and `{{issue_reference}}`; all three
+expand to empty text for tasks without an issue, so manual runs never emit `Closes #unknown`.
+The unrendered template is retained for detached and resumed runs.
+
 </details>
 
 <details>

package/cli/event-copy.js

@@ -1,12 +1,13 @@
+"use strict";
 const EVENT_COPY = {
-  IMPLEMENTATION_READY: 'Implementation ready',
-  PR_CREATED: 'Pull request created',
+    IMPLEMENTATION_READY: 'Implementation ready',
+    PR_CREATED: 'Pull request created',
 };
-
 function formatMergeStatus(merged) {
-  if (merged === true || merged === 'true') return 'merged';
-  if (merged === false || merged === 'false') return 'auto-merge pending approval';
-  return null;
+    if (merged === true || merged === 'true')
+        return 'merged';
+    if (merged === false || merged === 'false')
+        return 'auto-merge pending approval';
+    return null;
 }
-
 module.exports = { EVENT_COPY, formatMergeStatus };

package/cli/event-copy.ts

@@ -0,0 +1,12 @@
+const EVENT_COPY = {
+  IMPLEMENTATION_READY: 'Implementation ready',
+  PR_CREATED: 'Pull request created',
+} as const;
+
+function formatMergeStatus(merged: unknown): string | null {
+  if (merged === true || merged === 'true') return 'merged';
+  if (merged === false || merged === 'false') return 'auto-merge pending approval';
+  return null;
+}
+
+export = { EVENT_COPY, formatMergeStatus };

package/cli/index.js

@@ -35,7 +35,12 @@ const {
   formatClusterFailed,
   formatGenericMessage,
 } = require('./message-formatters-normal');
-const { getColorForSender, buildMessagePrefix } = require('./message-formatter-utils');
+const {
+  getColorForSender,
+  buildMessagePrefix,
+  formatLifecycleEvent,
+  partitionValidationCriteria,
+} = require('./message-formatter-utils');
 const {
   loadSettings,
   mutateSettings,
@@ -102,6 +107,8 @@ const {
   runLegacyUpdateIfRequested,
 } = require('./lib/update-checker');
 const { checkBinDirOnPath, printPathWarning } = require('../lib/path-check');
+const { quoteShellArgument } = require('../lib/git-remote-utils');
+const { renderPullRequestBody, resolveIssueContext } = require('../src/pr-body-template');
 const { StatusFooter, AGENT_STATE, ACTIVE_STATES } = require('../src/status-footer');
 const { EVENT_COPY, formatMergeStatus } = require('./event-copy');
 
@@ -2007,9 +2014,25 @@ function buildContextSummary({
   return contextSummary;
 }
 
-function buildCompletionPrompt({ contextSummary, taskText, issueNumber, issueTitle }) {
-  const mergeGoal = 'CREATE PR AND MERGE IT';
-  const mergeStep = `
+function buildDefaultFinishPrBody({ taskText, issueNumber, issueTitle }) {
+  const issueReference = renderPullRequestBody(undefined, { issueNumber, issueTitle });
+  return [
+    issueReference,
+    issueReference ? '' : null,
+    '## Summary',
+    `${String(taskText || 'Unknown task').slice(0, 200)}...`,
+    '',
+    '## Changes',
+    '- Implementation complete',
+    '- All validations addressed',
+    '',
+    '🤖 Generated with zeroshot finish',
+  ]
+    .filter((line) => line !== null)
+    .join('\n');
+}
+
+const FINISH_MERGE_STEP = `
 8. MERGE THE PR - THIS IS MANDATORY:
    \`\`\`bash
    gh pr merge --merge --auto
@@ -2024,7 +2047,29 @@ function buildCompletionPrompt({ contextSummary, taskText, issueNumber, issueTit
 
    REPEAT UNTIL MERGED. DO NOT GIVE UP.`;
 
-  return `# YOUR MISSION: ${mergeGoal}
+function buildFinishCommandArguments({ taskText, issueNumber, issueTitle, prBody }) {
+  const issueContext = resolveIssueContext({ issueNumber, issueTitle });
+  const resolvedTitle = issueContext.issueTitle;
+  const resolvedBody =
+    typeof prBody === 'string'
+      ? renderPullRequestBody(prBody, { issueNumber, issueTitle: resolvedTitle })
+      : buildDefaultFinishPrBody({ taskText, issueNumber, issueTitle: resolvedTitle });
+  return {
+    commitMessage: quoteShellArgument(resolvedTitle || 'feat: implement task'),
+    branch: quoteShellArgument(
+      issueContext.issueNumber !== 'unknown'
+        ? `issue-${issueContext.issueNumber}`
+        : 'feature/implementation'
+    ),
+    prTitle: quoteShellArgument(resolvedTitle),
+    prBody: quoteShellArgument(resolvedBody),
+  };
+}
+
+function buildCompletionPrompt({ contextSummary, taskText, issueNumber, issueTitle, prBody }) {
+  const args = buildFinishCommandArguments({ taskText, issueNumber, issueTitle, prBody });
+
+  return `# YOUR MISSION: CREATE PR AND MERGE IT
 
 ${contextSummary}
 
@@ -2045,12 +2090,12 @@ You are the FINISHER. Your ONLY job is to take this cluster's work and push it a
 2. COMMIT ALL CHANGES - Stage and commit everything:
    \`\`\`bash
    git add .
-   git commit -m "${issueTitle || 'feat: implement task'}"
+   git commit -m ${args.commitMessage}
    \`\`\`
 
 3. CREATE BRANCH - Use issue number if available:
    \`\`\`bash
-   ${issueNumber ? `git checkout -b issue-${issueNumber}` : 'git checkout -b feature/implementation'}
+   git checkout -b ${args.branch}
    \`\`\`
 
 4. PUSH TO REMOTE:
@@ -2060,16 +2105,7 @@ You are the FINISHER. Your ONLY job is to take this cluster's work and push it a
 
 5. CREATE PULL REQUEST:
    \`\`\`bash
-   gh pr create --title "${issueTitle || 'Implementation'}" --body "Closes #${issueNumber || 'N/A'}
-
-## Summary
-${taskText.slice(0, 200)}...
-
-## Changes
-- Implementation complete
-- All validations addressed
-
-🤖 Generated with zeroshot finish"
+   gh pr create --title ${args.prTitle} --body ${args.prBody}
    \`\`\`
 
 6. GET PR URL:
@@ -2078,7 +2114,7 @@ ${taskText.slice(0, 200)}...
    \`\`\`
 
 7. OUTPUT THE PR URL - Print it clearly so user can see it
-${mergeStep}
+${FINISH_MERGE_STEP}
 
 ## RULES
 
@@ -2702,6 +2738,10 @@ program
     'Full automation: worktree isolation + PR + auto-merge (use --docker for Docker)'
   )
   .option('--pr-base <branch>', 'Target branch for PRs (default: repo default branch)')
+  .option(
+    '--pr-body <template>',
+    'PR body template; supports {{issue_number}}, {{issue_title}}, and {{issue_reference}}'
+  )
   .option('--merge-queue', 'Use GitHub merge queue instead of direct merge')
   .option(
     '--close-issue <mode>',
@@ -3709,6 +3749,10 @@ program
   .helpGroup('Control:')
   .description('Take existing cluster and create completion-focused task (creates PR and merges)')
   .option('-y, --yes', 'Skip confirmation if cluster is running')
+  .option(
+    '--pr-body <template>',
+    'PR body template; supports {{issue_number}}, {{issue_title}}, and {{issue_reference}}'
+  )
   .action(async (id, options) => {
     try {
       const orchestrator = await getOrchestrator();
@@ -3727,6 +3771,7 @@ program
         taskText: context.taskText,
         issueNumber: context.issueNumber,
         issueTitle: context.issueTitle,
+        prBody: options.prBody ?? cluster.prOptions?.prBody,
       });
       printCompletionPromptPreview(completionPrompt);
 
@@ -5325,34 +5370,6 @@ function flushAllRenderBuffers(lines, buffers) {
   }
 }
 
-function formatLifecycleEvent(data) {
-  const event = data?.event;
-  let icon;
-  let eventText;
-
-  switch (event) {
-    case 'STARTED': {
-      icon = chalk.green('▶');
-      const triggers = data?.triggers?.join(', ') || 'none';
-      eventText = `started (listening for: ${chalk.dim(triggers)})`;
-      break;
-    }
-    case 'TASK_STARTED':
-      icon = chalk.yellow('⚡');
-      eventText = `${chalk.cyan(data.triggeredBy)} → task #${data.iteration} (${chalk.dim(data.model)})`;
-      break;
-    case 'TASK_COMPLETED':
-      icon = chalk.green('✓');
-      eventText = `task #${data.iteration} completed`;
-      break;
-    default:
-      icon = chalk.dim('•');
-      eventText = event || 'unknown event';
-  }
-
-  return { icon, eventText };
-}
-
 function handleLifecycleRender({ msg, prefix, lines }) {
   const data = msg.content?.data;
   const { icon, eventText } = formatLifecycleEvent(data);
@@ -5427,7 +5444,7 @@ function appendCriteriaGroup({ lines, prefix, label, items, color, reasonLabel }
 function appendCriteriaResults(lines, prefix, criteriaResults) {
   if (!Array.isArray(criteriaResults)) return;
 
-  const cannotValidateYet = criteriaResults.filter((c) => c.status === 'CANNOT_VALIDATE_YET');
+  const { cannotValidateYet, cannotValidate } = partitionValidationCriteria(criteriaResults);
   appendCriteriaGroup({
     lines,
     prefix,
@@ -5437,7 +5454,6 @@ function appendCriteriaResults(lines, prefix, criteriaResults) {
     reasonLabel: 'work incomplete',
   });
 
-  const cannotValidate = criteriaResults.filter((c) => c.status === 'CANNOT_VALIDATE');
   appendCriteriaGroup({
     lines,
     prefix,
@@ -6214,6 +6230,9 @@ module.exports = {
   isStartupUpdateEligible,
   handleNoArgumentInvocation,
   shouldRunInitialSetup,
+  extractFinishContext,
+  buildDefaultFinishPrBody,
+  buildCompletionPrompt,
   resolveRunMode,
   killRunningClusters,
 };

package/cli/json-export.js

@@ -1,77 +1,74 @@
-const fs = require('fs');
-
+"use strict";
+const fs = require("fs");
+function isInteger(value) {
+    return Number.isInteger(value);
+}
 function indentJson(value, spaces) {
-  const prefix = ' '.repeat(spaces);
-  return JSON.stringify(value, null, 2)
-    .split('\n')
-    .map((line) => `${prefix}${line}`)
-    .join('\n');
+    const prefix = ' '.repeat(spaces);
+    return JSON.stringify(value, null, 2)
+        .split('\n')
+        .map((line) => `${prefix}${line}`)
+        .join('\n');
 }
-
 function writeAll(fd, value) {
-  const bytes = Buffer.from(value);
-  let offset = 0;
-  while (offset < bytes.length) {
-    const written = fs.writeSync(fd, bytes, offset, bytes.length - offset);
-    if (!Number.isInteger(written) || written <= 0) {
-      throw new Error('JSON export destination stopped accepting bytes');
+    const bytes = Buffer.from(value);
+    let offset = 0;
+    while (offset < bytes.length) {
+        const written = fs.writeSync(fd, bytes, offset, bytes.length - offset);
+        if (!Number.isInteger(written) || written <= 0) {
+            throw new Error('JSON export destination stopped accepting bytes');
+        }
+        offset += written;
     }
-    offset += written;
-  }
 }
-
 function createDestination(outputPath, stdout) {
-  if (outputPath) {
-    const fd = fs.openSync(outputPath, 'w');
-    return {
-      close: () => fs.closeSync(fd),
-      write: (value) => writeAll(fd, value),
-    };
-  }
-
-  if (Number.isInteger(stdout.fd)) {
+    if (outputPath) {
+        const fd = fs.openSync(outputPath, 'w');
+        return {
+            close: () => fs.closeSync(fd),
+            write: (value) => writeAll(fd, value),
+        };
+    }
+    if (isInteger(stdout.fd)) {
+        const fd = stdout.fd;
+        return {
+            close() { },
+            write: (value) => writeAll(fd, value),
+        };
+    }
     return {
-      close() {},
-      write: (value) => writeAll(stdout.fd, value),
+        close() { },
+        write: (value) => {
+            stdout.write(value);
+        },
     };
-  }
-
-  return {
-    close() {},
-    write: (value) => stdout.write(value),
-  };
 }
-
-function streamClusterJsonExport({
-  ledger,
-  clusterId,
-  outputPath = null,
-  stdout = process.stdout,
-}) {
-  const destination = createDestination(outputPath, stdout);
-  const iterator = ledger.iterateAll(clusterId);
-  try {
-    destination.write(`{\n  "cluster_id": ${JSON.stringify(clusterId)},\n  "messages": `);
-    let current = iterator.next();
-    if (current.done) {
-      destination.write('[]\n}\n');
-      return;
-    }
-
-    destination.write('[\n');
-    while (!current.done) {
-      destination.write(indentJson(current.value, 4));
-      current = iterator.next();
-      destination.write(current.done ? '\n' : ',\n');
-    }
-    destination.write('  ]\n}\n');
-  } finally {
+function streamClusterJsonExport({ ledger, clusterId, outputPath = null, stdout = process.stdout, }) {
+    const destination = createDestination(outputPath, stdout);
+    const iterator = ledger.iterateAll(clusterId);
     try {
-      if (typeof iterator.return === 'function') iterator.return();
-    } finally {
-      destination.close();
+        destination.write(`{\n  "cluster_id": ${JSON.stringify(clusterId)},\n  "messages": `);
+        let current = iterator.next();
+        if (current.done) {
+            destination.write('[]\n}\n');
+            return;
+        }
+        destination.write('[\n');
+        while (!current.done) {
+            destination.write(indentJson(current.value, 4));
+            current = iterator.next();
+            destination.write(current.done ? '\n' : ',\n');
+        }
+        destination.write('  ]\n}\n');
+    }
+    finally {
+        try {
+            if (typeof iterator.return === 'function')
+                iterator.return();
+        }
+        finally {
+            destination.close();
+        }
     }
-  }
 }
-
 module.exports = { streamClusterJsonExport };

package/cli/json-export.ts

@@ -0,0 +1,112 @@
+import fs = require('fs');
+
+interface LedgerMessageIterator extends Iterator<unknown> {
+  return?: () => IteratorResult<unknown>;
+}
+
+interface ClusterLedger {
+  iterateAll(clusterId: string): LedgerMessageIterator;
+}
+
+interface ExportStream {
+  readonly fd?: number;
+  write(value: string): unknown;
+}
+
+interface JsonExportOptions {
+  ledger: ClusterLedger;
+  clusterId: string;
+  outputPath?: string | null;
+  stdout?: ExportStream;
+}
+
+interface Destination {
+  close(): void;
+  write(value: string): void;
+}
+
+function isInteger(value: unknown): value is number {
+  return Number.isInteger(value);
+}
+
+function indentJson(value: unknown, spaces: number): string {
+  const prefix = ' '.repeat(spaces);
+  return JSON.stringify(value, null, 2)
+    .split('\n')
+    .map((line) => `${prefix}${line}`)
+    .join('\n');
+}
+
+function writeAll(fd: number, value: string): void {
+  const bytes = Buffer.from(value);
+  let offset = 0;
+  while (offset < bytes.length) {
+    const written = fs.writeSync(fd, bytes, offset, bytes.length - offset);
+    if (!Number.isInteger(written) || written <= 0) {
+      throw new Error('JSON export destination stopped accepting bytes');
+    }
+    offset += written;
+  }
+}
+
+function createDestination(
+  outputPath: string | null | undefined,
+  stdout: ExportStream
+): Destination {
+  if (outputPath) {
+    const fd = fs.openSync(outputPath, 'w');
+    return {
+      close: () => fs.closeSync(fd),
+      write: (value) => writeAll(fd, value),
+    };
+  }
+
+  if (isInteger(stdout.fd)) {
+    const fd = stdout.fd;
+    return {
+      close(): void {},
+      write: (value) => writeAll(fd, value),
+    };
+  }
+
+  return {
+    close(): void {},
+    write: (value): void => {
+      stdout.write(value);
+    },
+  };
+}
+
+function streamClusterJsonExport({
+  ledger,
+  clusterId,
+  outputPath = null,
+  stdout = process.stdout,
+}: JsonExportOptions): void {
+  const destination = createDestination(outputPath, stdout);
+  const iterator = ledger.iterateAll(clusterId);
+  try {
+    destination.write(`{\n  "cluster_id": ${JSON.stringify(clusterId)},\n  "messages": `);
+    let current = iterator.next();
+    if (current.done) {
+      destination.write('[]\n}\n');
+      return;
+    }
+
+    destination.write('[\n');
+    while (!current.done) {
+      destination.write(indentJson(current.value, 4));
+      current = iterator.next();
+      destination.write(current.done ? '\n' : ',\n');
+    }
+    destination.write('  ]\n}\n');
+  } finally {
+    try {
+      if (typeof iterator.return === 'function') iterator.return();
+    } finally {
+      destination.close();
+    }
+  }
+}
+
+export = { streamClusterJsonExport };

package/cli/message-formatter-utils.js

@@ -1,75 +1,87 @@
+"use strict";
+const chalk = require("chalk");
 /**
- * Message formatting utilities for CLI output
- * Extracted from index.js to reduce complexity
- */
-
-const chalk = require('chalk');
-
-/**
- * Get color for sender based on consistent hashing
- * @param {string} sender - Sender name
- * @returns {Function} Chalk color function
+ * Get color for sender based on consistent hashing.
  */
 function getColorForSender(sender) {
-  const colors = [chalk.cyan, chalk.magenta, chalk.yellow, chalk.green, chalk.blue];
-  let hash = 0;
-  for (let i = 0; i < sender.length; i++) {
-    hash = (hash << 5) - hash + sender.charCodeAt(i);
-    hash = hash & hash;
-  }
-  return colors[Math.abs(hash) % colors.length];
+    const colors = [chalk.cyan, chalk.magenta, chalk.yellow, chalk.green, chalk.blue];
+    let hash = 0;
+    for (let i = 0; i < sender.length; i++) {
+        hash = (hash << 5) - hash + sender.charCodeAt(i);
+        hash = hash & hash;
+    }
+    return colors[Math.abs(hash) % colors.length] ?? chalk.cyan;
 }
-
 /**
- * Build message prefix with timestamp, sender, and optional cluster ID
- * @param {Object} msg - Message object
- * @param {boolean} showClusterId - Whether to show cluster ID
- * @param {boolean} isActive - Whether cluster is active
- * @returns {string} Formatted prefix
+ * Build message prefix with timestamp, sender, and optional cluster ID.
  */
 function buildMessagePrefix(msg, showClusterId, isActive) {
-  const color = isActive ? getColorForSender(msg.sender) : chalk.dim;
-
-  let senderLabel = msg.sender;
-  if (showClusterId && msg.cluster_id) {
-    senderLabel = `${msg.cluster_id}/${msg.sender}`;
-  }
-
-  const modelSuffix = msg.sender_model ? chalk.dim(` [${msg.sender_model}]`) : '';
-  return color(`${senderLabel.padEnd(showClusterId ? 25 : 15)} |`) + modelSuffix;
+    const color = isActive ? getColorForSender(msg.sender) : chalk.dim;
+    let senderLabel = msg.sender;
+    if (showClusterId && msg.cluster_id) {
+        senderLabel = `${msg.cluster_id}/${msg.sender}`;
+    }
+    const modelSuffix = msg.sender_model ? chalk.dim(` [${msg.sender_model}]`) : '';
+    return color(`${senderLabel.padEnd(showClusterId ? 25 : 15)} |`) + modelSuffix;
 }
-
 /**
- * Build cluster prefix for watch mode
- * @param {string} clusterId - Cluster ID
- * @param {boolean} isActive - Whether cluster is active
- * @returns {string} Formatted prefix
+ * Build cluster prefix for watch mode.
  */
 function buildClusterPrefix(clusterId, isActive) {
-  return isActive
-    ? chalk.white(`${clusterId.padEnd(20)} |`)
-    : chalk.dim(`${clusterId.padEnd(20)} |`);
+    const color = isActive ? chalk.white : chalk.dim;
+    return color(`${clusterId.padEnd(20)} |`);
 }
-
 /**
- * Parse and normalize data fields (handles string JSON)
- * @param {string|Array} data - Data to parse
- * @returns {Array} Parsed array
+ * Parse and normalize data fields (handles string JSON).
  */
 function parseDataField(data) {
-  if (typeof data === 'string') {
-    try {
-      return JSON.parse(data);
-    } catch {
-      return [];
+    if (typeof data === 'string') {
+        try {
+            const parsed = JSON.parse(data);
+            return parsed;
+        }
+        catch {
+            return [];
+        }
     }
-  }
-  return Array.isArray(data) ? data : [];
+    return Array.isArray(data) ? data : [];
+}
+function formatLifecycleEvent(data) {
+    const event = data?.event;
+    let icon;
+    let eventText;
+    switch (event) {
+        case 'STARTED': {
+            icon = chalk.green('▶');
+            const triggers = data?.triggers?.join(', ') || 'none';
+            eventText = `started (listening for: ${chalk.dim(triggers)})`;
+            break;
+        }
+        case 'TASK_STARTED':
+            icon = chalk.yellow('⚡');
+            eventText = `${chalk.cyan(data?.triggeredBy)} → task #${data?.iteration} (${chalk.dim(data?.model)})`;
+            break;
+        case 'TASK_COMPLETED':
+            icon = chalk.green('✓');
+            eventText = `task #${data?.iteration} completed`;
+            break;
+        default:
+            icon = chalk.dim('•');
+            eventText = event || 'unknown event';
+    }
+    return { icon, eventText };
+}
+function partitionValidationCriteria(criteria) {
+    return {
+        cannotValidateYet: criteria.filter((criterion) => criterion.status === 'CANNOT_VALIDATE_YET'),
+        cannotValidate: criteria.filter((criterion) => criterion.status === 'CANNOT_VALIDATE'),
+    };
 }
-
 module.exports = {
-  getColorForSender,
-  buildMessagePrefix,
-  buildClusterPrefix,
-  parseDataField,
+    getColorForSender,
+    buildMessagePrefix,
+    buildClusterPrefix,
+    parseDataField,
+    formatLifecycleEvent,
+    partitionValidationCriteria,
 };