automata-cli 0.1.0-feature-021-execute-command.127 → 0.1.0-feature-028-normalize-execute-prompt.153

package/README.md

@@ -113,6 +113,19 @@ See [docs/execute.md](docs/execute.md) for full details.
 
 ---
 
+## `automata execute-prompt`
+
+Run predefined AI workflows that gather context from the current branch before invoking Claude or Codex.
+
+```bash
+automata execute-prompt sonar --with claude
+automata execute-prompt fix-comments --with codex --model o3
+```
+
+See [docs/execute-prompt.md](docs/execute-prompt.md) for full details.
+
+---
+
 ## Development
 
 ### Prerequisites

package/dist/index.js

@@ -1564,6 +1564,7 @@ import { Command as Command3 } from "commander";
 
 // src/config/githubService.ts
 import { spawnSync as spawnSync3 } from "child_process";
+var GITHUB_ISSUE_COMMENT_URL_RE = /github\.com\/([^/]+\/[^/]+)\/issues\/\d+#issuecomment-(\d+)/;
 function run3(cmd, args) {
   const result = spawnSync3(cmd, args, { encoding: "utf8" });
   if (result.error) {
@@ -1613,6 +1614,73 @@ function postComment(issueNumber, body) {
   if (status !== 0) {
     throw new Error(stderr.trim() || `Failed to post comment on issue #${issueNumber}.`);
   }
+  const match = /https:\/\/github\.com\/[^\s]+#issuecomment-\d+/.exec(stderr);
+  return match ? match[0] : void 0;
+}
+function editComment(commentUrl, body) {
+  const match = GITHUB_ISSUE_COMMENT_URL_RE.exec(commentUrl);
+  if (!match) {
+    throw new Error(`Cannot parse comment URL: ${commentUrl}`);
+  }
+  const [, ownerRepo, commentId] = match;
+  const { stderr, status } = run3("gh", [
+    "api",
+    `repos/${ownerRepo}/issues/comments/${commentId}`,
+    "-X",
+    "PATCH",
+    "-f",
+    `body=${body}`
+  ]);
+  if (status !== 0) {
+    throw new Error(stderr.trim() || `Failed to edit comment ${commentId}.`);
+  }
+}
+function getCurrentBranchPr(branch) {
+  const args = ["pr", "view"];
+  if (branch) {
+    args.push(branch);
+  }
+  args.push("--json", "number,url,body");
+  const { stdout, stderr, status } = run3("gh", args);
+  if (status !== 0) {
+    if (stderr.includes("no pull requests found") || stderr.includes("Could not resolve")) {
+      return null;
+    }
+    throw new Error(stderr.trim() || "Failed to query PR for current branch.");
+  }
+  return JSON.parse(stdout);
+}
+function addClosesRefToPr(prNumber, issueNumber) {
+  const { stdout, status: viewStatus } = run3("gh", [
+    "pr",
+    "view",
+    String(prNumber),
+    "--json",
+    "body",
+    "-q",
+    ".body"
+  ]);
+  if (viewStatus !== 0) {
+    throw new Error(`Failed to read PR #${prNumber} body.`);
+  }
+  const currentBody = stdout.trimEnd();
+  const closesRef = `Closes #${issueNumber}`;
+  if (currentBody.includes(closesRef)) {
+    return;
+  }
+  const newBody = currentBody + `
+
+${closesRef}`;
+  const { stderr, status } = run3("gh", ["pr", "edit", String(prNumber), "--body", newBody]);
+  if (status !== 0) {
+    throw new Error(stderr.trim() || `Failed to update PR #${prNumber} body.`);
+  }
+}
+function addCopilotReviewer(prNumber) {
+  const { stderr, status } = run3("gh", ["pr", "edit", String(prNumber), "--add-reviewer", "@copilot"]);
+  if (status !== 0) {
+    throw new Error(stderr.trim() || `Failed to add Copilot reviewer to PR #${prNumber}.`);
+  }
 }
 
 // src/claude/claudeService.ts
@@ -1659,20 +1727,6 @@ function resolveCommand(name) {
   }
   return name;
 }
-var MODEL_IDS = {
-  opus: "claude-opus-4-6",
-  sonnet: "claude-sonnet-4-6",
-  haiku: "claude-haiku-4-5-20251001"
-};
-function resolveModelOption(opts) {
-  const selected = ["opus", "sonnet", "haiku"].filter((m) => opts[m]);
-  if (selected.length > 1) {
-    process.stderr.write(`Error: --${selected[0]} and --${selected[1]} are mutually exclusive.
-`);
-    process.exit(1);
-  }
-  return selected.length === 1 ? MODEL_IDS[selected[0]] : void 0;
-}
 function invokeClaudeCode(prompt, options = {}) {
   if (options.verbose) {
     return invokeClaudeCodeVerbose(prompt, options.yolo ?? false, options.model);
@@ -1879,7 +1933,7 @@ Title:  ${issue.title}
   }
   return issue;
 }
-var implementNextCommand = new Command3("implement-next").description("Find the next open GitHub issue matching the configured filter, claim it, and invoke the AI code assistant (Claude or Codex)").option("--json", "Output issue details as JSON").option("--no-claude", "Skip all AI invocation (Claude or Codex) after claiming the issue").option("--codex", "Use Codex CLI instead of Claude Code").option("--query-only", "Print issue content and exit without claiming or invoking any AI tools").option("--yolo", "Launch with --dangerously-skip-permissions (Claude) or --dangerously-bypass-approvals-and-sandbox (Codex)").option("--verbose", "Show step-by-step progress summary and final result").option("--opus", "Use claude-opus-4-6").option("--sonnet", "Use claude-sonnet-4-6").option("--haiku", "Use claude-haiku-4-5-20251001").option("--take-first", "When multiple issues match, pick the first without prompting").option("--limit <n>", "Max issues to fetch and display (default: 10)", "10").action(async (options) => {
+var implementNextCommand = new Command3("implement-next").description("Find the next open GitHub issue matching the configured filter, claim it, and invoke the AI code assistant (Claude or Codex)").option("--json", "Output issue details as JSON").option("--no-claude", "Skip all AI invocation (Claude or Codex) after claiming the issue").option("--with <executor>", "Executor to use: claude or codex", "claude").option("--query-only", "Print issue content and exit without claiming or invoking any AI tools").option("--yolo", "Launch with --dangerously-skip-permissions (Claude) or --dangerously-bypass-approvals-and-sandbox (Codex)").option("--silent", "Suppress step-by-step Claude output; show only the final summary").option("--model <string>", "Model identifier to pass to the executor").option("--take-first", "When multiple issues match, pick the first without prompting").option("--limit <n>", "Max issues to fetch and display (default: 10)", "10").option("--ask-copilot-review", "Request a Copilot code review on the PR after AI invocation finishes").action(async (options) => {
   const config = readConfig();
   validateConfig(config);
   const limit = Number.parseInt(options.limit, 10);
@@ -1908,8 +1962,19 @@ ${issue.body}
   if (options.queryOnly) {
     process.exit(0);
   }
+  let executor;
+  if (options.claude !== false) {
+    const requestedExecutor = options.with.toLowerCase();
+    if (requestedExecutor !== "claude" && requestedExecutor !== "codex") {
+      process.stderr.write(`Error: --with must be 'claude' or 'codex', got '${options.with}'.
+`);
+      process.exit(1);
+    }
+    executor = requestedExecutor;
+  }
+  let commentUrl;
   try {
-    postComment(issue.number, "working");
+    commentUrl = postComment(issue.number, "working");
   } catch (err) {
     process.stderr.write(`Error: ${err.message}
 `);
@@ -1922,12 +1987,44 @@ ${issue.body}
 ${systemPrompt}
 
 ${issue.body}`;
-    if (options.codex) {
-      await invokeCodexCode(prompt, { yolo: options.yolo, verbose: options.verbose });
+    if (executor === "codex") {
+      if (options.silent) {
+        process.stderr.write("Warning: --silent is only supported with Claude and has no effect when used with Codex.\n");
+      }
+      invokeCodexCode(prompt, { yolo: options.yolo, model: options.model });
     } else {
-      const model = resolveModelOption(options);
-      await invokeClaudeCode(prompt, { yolo: options.yolo, verbose: options.verbose, model });
+      await invokeClaudeCode(prompt, { yolo: options.yolo, verbose: !options.silent, model: options.model });
+    }
+  }
+  try {
+    const pr = getCurrentBranchPr();
+    if (pr) {
+      if (commentUrl) {
+        try {
+          editComment(commentUrl, `Working on this in PR #${pr.number} \u2014 ${pr.url}`);
+        } catch (err) {
+          process.stderr.write(`Warning: could not update issue comment: ${err.message}
+`);
+        }
+      }
+      try {
+        addClosesRefToPr(pr.number, issue.number);
+      } catch (err) {
+        process.stderr.write(`Warning: could not add Closes #${issue.number} to PR: ${err.message}
+`);
+      }
+      if (options.askCopilotReview) {
+        try {
+          addCopilotReviewer(pr.number);
+        } catch (err) {
+          process.stderr.write(`Warning: could not request Copilot review: ${err.message}
+`);
+        }
+      }
     }
+  } catch (err) {
+    process.stderr.write(`Warning: could not detect current branch PR: ${err.message}
+`);
   }
 });
 
@@ -2000,7 +2097,24 @@ function formatPrInfoContext(pr) {
   return JSON.stringify(pr, null, 2);
 }
 function addAiOptions(cmd) {
-  return cmd.option("--codex", "Use Codex CLI instead of Claude Code").option("--verbose", "Show step-by-step progress (Claude only; ignored for Codex)").option("--push", "Append instruction to commit and push changes after the AI finishes").option("--opus", "Use claude-opus-4-6 (Claude only)").option("--sonnet", "Use claude-sonnet-4-6 (Claude only)").option("--haiku", "Use claude-haiku-4-5-20251001 (Claude only)");
+  return cmd.requiredOption("--with <executor>", "Executor to use: claude or codex").option("--model <string>", "Model identifier to pass to the executor").option("--silent", "Suppress step-by-step Claude output; show only the final summary").option("--push", "Append instruction to commit and push changes after the AI finishes");
+}
+function resolveExecutor(withOption) {
+  const executor = withOption.toLowerCase();
+  if (executor !== "claude" && executor !== "codex") {
+    process.stderr.write(`Error: --with must be 'claude' or 'codex', got '${withOption}'.
+`);
+    process.exit(1);
+  }
+  return executor;
+}
+function invokeSelectedExecutor(prompt, options) {
+  const executor = resolveExecutor(options.with);
+  if (executor === "codex") {
+    invokeCodexCode(prompt, { yolo: true, model: options.model });
+    return;
+  }
+  return invokeClaudeCode(prompt, { yolo: true, verbose: !options.silent, model: options.model });
 }
 var executeSonarCmd = addAiOptions(
   new Command5("sonar").description(
@@ -2046,12 +2160,7 @@ Current PR context from automata git get-pr-info --json:
 ${formatPrInfoContext(pr)}`,
     options.push
   );
-  if (options.codex) {
-    invokeCodexCode(fullPrompt, { yolo: true });
-  } else {
-    const model = resolveModelOption(options);
-    await invokeClaudeCode(fullPrompt, { yolo: true, verbose: options.verbose, model });
-  }
+  await invokeSelectedExecutor(fullPrompt, options);
 });
 function formatComments(comments) {
   return comments.map((c) => {
@@ -2101,12 +2210,7 @@ Open review comments:
 ${formatComments(comments)}`,
     options.push
   );
-  if (options.codex) {
-    invokeCodexCode(fullPrompt, { yolo: true });
-  } else {
-    const model = resolveModelOption(options);
-    await invokeClaudeCode(fullPrompt, { yolo: true, verbose: options.verbose, model });
-  }
+  await invokeSelectedExecutor(fullPrompt, options);
 });
 var executePromptCommand = new Command5("execute-prompt").description("Execute a configured custom prompt using an AI assistant").addCommand(executeSonarCmd).addCommand(executeFixCommentsCmd);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "automata-cli",
-  "version": "0.1.0-feature-021-execute-command.127",
+  "version": "0.1.0-feature-028-normalize-execute-prompt.153",
   "description": "Automata CLI tool",
   "type": "module",
   "bin": {