automata-cli 0.1.0-bugfix-nextwork.57 → 0.1.0-feature-021-execute-command.125

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { Command as Command4 } from "commander";
+import { Command as Command6 } from "commander";
 
 // src/version.ts
 import { readFileSync } from "fs";
@@ -19,16 +19,46 @@ import React2 from "react";
 // src/config/ConfigWizard.tsx
 import { useState } from "react";
 import { Box, Text, useInput, useApp } from "ink";
+import { writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "fs";
+import { join as join2 } from "path";
 
 // src/config/configStore.ts
 import { readFileSync as readFileSync2, writeFileSync, mkdirSync } from "fs";
-import { join } from "path";
+import { join, resolve as resolve2, sep } from "path";
+var DEFAULT_CLAUDE_SYSTEM_PROMPT = "You are an expert software engineer. Implement the following issue according to the project's existing conventions and style. Make minimal, targeted changes that satisfy the requirements. Run tests and linting before finishing.";
+var DEFAULT_FIX_COMMENTS_PROMPT = "You are an expert software engineer reviewing a pull request. Below are the open review comments left by reviewers on this PR. Please address each comment by making the appropriate code changes. Focus on the reviewer's concerns and make minimal, targeted changes that resolve each comment without altering unrelated code.";
+var DEFAULT_SONAR_PROMPT = "You are an expert software engineer. You have been given the URL of a SonarCloud analysis for this pull request. If the `sonar-quality-gate` skill is available in this repository, use it. The project is public, so use the SonarCloud REST API directly (no authentication required) rather than scraping the URL. Inspect both the quality gate and the list of issues for this pull request. If the quality gate fails because of duplication or another metric-based condition, use the relevant Sonar APIs to identify the affected files and details instead of relying only on the issues endpoint. Fix all new issues and quality-gate failures reported. Focus on code smells, bugs, vulnerabilities, and blocking quality-gate conditions flagged in this PR. Make targeted, minimal changes that resolve each issue without altering unrelated code.";
 var CONFIG_DIR = ".automata";
 var CONFIG_FILE = "config.json";
 function configPath() {
   return join(process.cwd(), CONFIG_DIR, CONFIG_FILE);
 }
-function readConfig() {
+function automataDir() {
+  return join(process.cwd(), CONFIG_DIR);
+}
+function resolvePromptRef(value, dir) {
+  if (!value.endsWith(".md")) return value;
+  if (value.includes("/") || value.includes("\\")) {
+    throw new Error(`Prompt file "${value}" must be a plain filename with no subdirectories`);
+  }
+  const fullPath = resolve2(dir, value);
+  const safeBase = resolve2(dir) + sep;
+  if (!fullPath.startsWith(safeBase)) {
+    throw new Error(`Prompt file "${value}" resolves outside .automata/`);
+  }
+  try {
+    return readFileSync2(fullPath, "utf8");
+  } catch (err) {
+    if (err?.code === "ENOENT") {
+      throw new Error(
+        `Prompt file "${value}" not found in "${dir}". Expected path: ${fullPath}`,
+        { cause: err }
+      );
+    }
+    throw err;
+  }
+}
+function readRawConfig() {
   try {
     const raw = readFileSync2(configPath(), "utf8");
     return JSON.parse(raw);
@@ -36,6 +66,26 @@ function readConfig() {
     return {};
   }
 }
+function readConfig() {
+  let config;
+  try {
+    const raw = readFileSync2(configPath(), "utf8");
+    config = JSON.parse(raw);
+  } catch {
+    return {};
+  }
+  const dir = automataDir();
+  if (config.claudeSystemPrompt) {
+    config.claudeSystemPrompt = resolvePromptRef(config.claudeSystemPrompt, dir);
+  }
+  if (config.prompts?.sonar) {
+    config.prompts.sonar = resolvePromptRef(config.prompts.sonar, dir);
+  }
+  if (config.prompts?.fixComments) {
+    config.prompts.fixComments = resolvePromptRef(config.prompts.fixComments, dir);
+  }
+  return config;
+}
 function writeConfig(config) {
   const dir = join(process.cwd(), CONFIG_DIR);
   mkdirSync(dir, { recursive: true });
@@ -44,6 +94,11 @@ function writeConfig(config) {
 
 // src/config/ConfigWizard.tsx
 import { jsx, jsxs } from "react/jsx-runtime";
+function writePromptFile(filename, content) {
+  const dir = join2(process.cwd(), ".automata");
+  mkdirSync2(dir, { recursive: true });
+  writeFileSync2(join2(dir, filename), content, "utf8");
+}
 var REMOTE_OPTIONS = [
   { label: "GitHub", value: "gh" },
   { label: "Azure DevOps", value: "azdo" }
@@ -53,22 +108,48 @@ var TECHNIQUE_OPTIONS = [
   { label: "By Assignee", value: "assignee" },
   { label: "By Title Contains", value: "title-contains" }
 ];
+var MAIN_MENU_OPTIONS = ["Remote / Mode", "Implement-Next", "Prompts"];
+var PROMPTS_MENU_OPTIONS = ["Sonar", "Fix-Comments"];
 function ConfigWizard() {
   const existing = readConfig();
+  const rawExisting = readRawConfig();
   const initialRemoteIndex = REMOTE_OPTIONS.findIndex((o) => o.value === existing.remoteType);
   const initialTechIndex = TECHNIQUE_OPTIONS.findIndex((o) => o.value === existing.issueDiscoveryTechnique);
-  const [screen, setScreen] = useState("remote");
+  const [screen, setScreen] = useState("main");
+  const [mainMenuIndex, setMainMenuIndex] = useState(0);
   const [selectedRemoteIndex, setSelectedRemoteIndex] = useState(initialRemoteIndex >= 0 ? initialRemoteIndex : 0);
   const [selectedTechIndex, setSelectedTechIndex] = useState(initialTechIndex >= 0 ? initialTechIndex : 0);
   const [discoveryValue, setDiscoveryValue] = useState(existing.issueDiscoveryValue ?? "");
   const [systemPrompt, setSystemPrompt] = useState(existing.claudeSystemPrompt ?? "");
+  const [promptsMenuIndex, setPromptsMenuIndex] = useState(0);
+  const [sonarPrompt, setSonarPrompt] = useState(existing.prompts?.sonar ?? DEFAULT_SONAR_PROMPT);
+  const [fixCommentsPrompt, setFixCommentsPrompt] = useState(
+    existing.prompts?.fixComments ?? DEFAULT_FIX_COMMENTS_PROMPT
+  );
   const [pendingRemote, setPendingRemote] = useState(existing.remoteType ?? "gh");
   const [pendingTechnique, setPendingTechnique] = useState(
     existing.issueDiscoveryTechnique ?? "label"
   );
   const { exit } = useApp();
   useInput((input, key) => {
-    if (screen === "remote") {
+    if (screen === "main") {
+      if (key.upArrow) {
+        setMainMenuIndex((i) => i > 0 ? i - 1 : MAIN_MENU_OPTIONS.length - 1);
+      } else if (key.downArrow) {
+        setMainMenuIndex((i) => i < MAIN_MENU_OPTIONS.length - 1 ? i + 1 : 0);
+      } else if (key.return) {
+        const chosen = MAIN_MENU_OPTIONS[mainMenuIndex];
+        if (chosen === "Remote / Mode") {
+          setScreen("remote");
+        } else if (chosen === "Implement-Next") {
+          setScreen("technique");
+        } else {
+          setScreen("prompts-menu");
+        }
+      } else if (key.escape || key.ctrl && input === "c") {
+        exit();
+      }
+    } else if (screen === "remote") {
       if (key.upArrow) {
         setSelectedRemoteIndex((i) => i > 0 ? i - 1 : REMOTE_OPTIONS.length - 1);
       } else if (key.downArrow) {
@@ -79,10 +160,12 @@ function ConfigWizard() {
         if (chosen.value === "gh") {
           setScreen("technique");
         } else {
-          writeConfig({ ...existing, remoteType: chosen.value });
+          writeConfig({ ...rawExisting, remoteType: chosen.value });
           exit();
         }
-      } else if (key.escape || key.ctrl && input === "c") {
+      } else if (key.escape) {
+        setScreen("main");
+      } else if (key.ctrl && input === "c") {
         exit();
       }
     } else if (screen === "technique") {
@@ -94,7 +177,9 @@ function ConfigWizard() {
         const chosen = TECHNIQUE_OPTIONS[selectedTechIndex];
         setPendingTechnique(chosen.value);
         setScreen("value");
-      } else if (key.escape || key.ctrl && input === "c") {
+      } else if (key.escape) {
+        setScreen("main");
+      } else if (key.ctrl && input === "c") {
         exit();
       }
     } else if (screen === "value") {
@@ -102,46 +187,128 @@ function ConfigWizard() {
         setScreen("system-prompt");
       } else if (key.backspace || key.delete) {
         setDiscoveryValue((v) => v.slice(0, -1));
-      } else if (key.escape || key.ctrl && input === "c") {
+      } else if (key.escape) {
+        setScreen("main");
+      } else if (key.ctrl && input === "c") {
         exit();
       } else if (input && !key.ctrl && !key.meta) {
         setDiscoveryValue((v) => v + input);
       }
     } else if (screen === "system-prompt") {
       if (key.return) {
+        let claudeSystemPromptValue;
+        if (systemPrompt) {
+          writePromptFile("claude-system-prompt.md", systemPrompt);
+          claudeSystemPromptValue = "claude-system-prompt.md";
+        }
         writeConfig({
-          ...existing,
+          ...rawExisting,
           remoteType: pendingRemote,
           issueDiscoveryTechnique: pendingTechnique,
           issueDiscoveryValue: discoveryValue || void 0,
-          claudeSystemPrompt: systemPrompt || void 0
+          claudeSystemPrompt: claudeSystemPromptValue
         });
         exit();
       } else if (key.backspace || key.delete) {
         setSystemPrompt((v) => v.slice(0, -1));
-      } else if (key.escape || key.ctrl && input === "c") {
+      } else if (key.escape) {
+        setScreen("main");
+      } else if (key.ctrl && input === "c") {
         exit();
       } else if (input && !key.ctrl && !key.meta) {
         setSystemPrompt((v) => v + input);
       }
+    } else if (screen === "prompts-menu") {
+      if (key.upArrow) {
+        setPromptsMenuIndex((i) => i > 0 ? i - 1 : PROMPTS_MENU_OPTIONS.length - 1);
+      } else if (key.downArrow) {
+        setPromptsMenuIndex((i) => i < PROMPTS_MENU_OPTIONS.length - 1 ? i + 1 : 0);
+      } else if (key.return) {
+        const chosen = PROMPTS_MENU_OPTIONS[promptsMenuIndex];
+        if (chosen === "Sonar") {
+          setScreen("sonar-prompt");
+        } else {
+          setScreen("fix-comments-prompt");
+        }
+      } else if (key.escape) {
+        setScreen("main");
+      } else if (key.ctrl && input === "c") {
+        exit();
+      }
+    } else if (screen === "sonar-prompt") {
+      if (key.return) {
+        let sonarValue;
+        if (sonarPrompt) {
+          writePromptFile("sonar-prompt.md", sonarPrompt);
+          sonarValue = "sonar-prompt.md";
+        }
+        const current = readRawConfig();
+        writeConfig({
+          ...current,
+          prompts: { ...current.prompts, sonar: sonarValue }
+        });
+        setScreen("prompts-menu");
+      } else if (key.backspace || key.delete) {
+        setSonarPrompt((v) => v.slice(0, -1));
+      } else if (key.escape) {
+        setScreen("prompts-menu");
+      } else if (key.ctrl && input === "c") {
+        exit();
+      } else if (input && !key.ctrl && !key.meta) {
+        setSonarPrompt((v) => v + input);
+      }
+    } else if (screen === "fix-comments-prompt") {
+      if (key.return) {
+        let fixCommentsValue;
+        if (fixCommentsPrompt) {
+          writePromptFile("fix-comments-prompt.md", fixCommentsPrompt);
+          fixCommentsValue = "fix-comments-prompt.md";
+        }
+        const current = readRawConfig();
+        writeConfig({
+          ...current,
+          prompts: { ...current.prompts, fixComments: fixCommentsValue }
+        });
+        setScreen("prompts-menu");
+      } else if (key.backspace || key.delete) {
+        setFixCommentsPrompt((v) => v.slice(0, -1));
+      } else if (key.escape) {
+        setScreen("prompts-menu");
+      } else if (key.ctrl && input === "c") {
+        exit();
+      } else if (input && !key.ctrl && !key.meta) {
+        setFixCommentsPrompt((v) => v + input);
+      }
     }
   });
-  if (screen === "remote") {
+  if (screen === "main") {
     return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginY: 1, children: [
       /* @__PURE__ */ jsx(Text, { bold: true, children: "Configure Automata" }),
       /* @__PURE__ */ jsx(Text, { children: " " }),
+      MAIN_MENU_OPTIONS.map((option, index) => /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsxs(Text, { color: index === mainMenuIndex ? "cyan" : void 0, children: [
+        index === mainMenuIndex ? "\u276F " : "  ",
+        option
+      ] }) }, option)),
+      /* @__PURE__ */ jsx(Text, { children: " " }),
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2191/\u2193 to move \xB7 Enter to select \xB7 Ctrl+C to cancel" })
+    ] });
+  }
+  if (screen === "remote") {
+    return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginY: 1, children: [
+      /* @__PURE__ */ jsx(Text, { bold: true, children: "Remote / Mode" }),
+      /* @__PURE__ */ jsx(Text, { children: " " }),
       /* @__PURE__ */ jsx(Text, { children: "Remote environment type:" }),
       REMOTE_OPTIONS.map((option, index) => /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsxs(Text, { color: index === selectedRemoteIndex ? "cyan" : void 0, children: [
         index === selectedRemoteIndex ? "\u276F " : "  ",
         option.label
       ] }) }, option.value)),
       /* @__PURE__ */ jsx(Text, { children: " " }),
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2191/\u2193 to move \xB7 Enter to confirm \xB7 Ctrl+C to cancel" })
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2191/\u2193 to move \xB7 Enter to confirm \xB7 Esc to go back \xB7 Ctrl+C to cancel" })
     ] });
   }
   if (screen === "technique") {
     return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginY: 1, children: [
-      /* @__PURE__ */ jsx(Text, { bold: true, children: "Configure Issue Discovery Technique" }),
+      /* @__PURE__ */ jsx(Text, { bold: true, children: "Implement-Next \u2014 Issue Discovery Technique" }),
       /* @__PURE__ */ jsx(Text, { children: " " }),
       /* @__PURE__ */ jsx(Text, { children: "How to find the next issue to work on:" }),
       TECHNIQUE_OPTIONS.map((option, index) => /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsxs(Text, { color: index === selectedTechIndex ? "cyan" : void 0, children: [
@@ -149,13 +316,13 @@ function ConfigWizard() {
         option.label
       ] }) }, option.value)),
       /* @__PURE__ */ jsx(Text, { children: " " }),
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2191/\u2193 to move \xB7 Enter to confirm \xB7 Ctrl+C to cancel" })
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2191/\u2193 to move \xB7 Enter to confirm \xB7 Esc to go back \xB7 Ctrl+C to cancel" })
     ] });
   }
   if (screen === "value") {
     const techLabel = TECHNIQUE_OPTIONS.find((t) => t.value === pendingTechnique)?.label ?? pendingTechnique;
     return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginY: 1, children: [
-      /* @__PURE__ */ jsx(Text, { bold: true, children: "Configure Issue Discovery Value" }),
+      /* @__PURE__ */ jsx(Text, { bold: true, children: "Implement-Next \u2014 Issue Discovery Value" }),
       /* @__PURE__ */ jsx(Text, { children: " " }),
       /* @__PURE__ */ jsxs(Text, { children: [
         techLabel,
@@ -167,22 +334,66 @@ function ConfigWizard() {
         ] })
       ] }),
       /* @__PURE__ */ jsx(Text, { children: " " }),
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Type value \xB7 Enter to confirm \xB7 Ctrl+C to cancel" })
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Type value \xB7 Enter to continue \xB7 Esc to go back \xB7 Ctrl+C to cancel" })
+    ] });
+  }
+  if (screen === "system-prompt") {
+    return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginY: 1, children: [
+      /* @__PURE__ */ jsx(Text, { bold: true, children: "Implement-Next \u2014 Claude System Prompt" }),
+      /* @__PURE__ */ jsx(Text, { children: " " }),
+      /* @__PURE__ */ jsxs(Text, { children: [
+        "System prompt (optional):",
+        " ",
+        /* @__PURE__ */ jsxs(Text, { color: "cyan", children: [
+          systemPrompt,
+          /* @__PURE__ */ jsx(Text, { children: "_" })
+        ] })
+      ] }),
+      /* @__PURE__ */ jsx(Text, { children: " " }),
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Type prompt \xB7 Enter to save and exit \xB7 Esc to go back \xB7 Ctrl+C to cancel" })
+    ] });
+  }
+  if (screen === "prompts-menu") {
+    return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginY: 1, children: [
+      /* @__PURE__ */ jsx(Text, { bold: true, children: "Prompts" }),
+      /* @__PURE__ */ jsx(Text, { children: " " }),
+      PROMPTS_MENU_OPTIONS.map((option, index) => /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsxs(Text, { color: index === promptsMenuIndex ? "cyan" : void 0, children: [
+        index === promptsMenuIndex ? "\u276F " : "  ",
+        option
+      ] }) }, option)),
+      /* @__PURE__ */ jsx(Text, { children: " " }),
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2191/\u2193 to move \xB7 Enter to edit \xB7 Esc to go back \xB7 Ctrl+C to cancel" })
+    ] });
+  }
+  if (screen === "sonar-prompt") {
+    return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginY: 1, children: [
+      /* @__PURE__ */ jsx(Text, { bold: true, children: "Prompts \u2014 Sonar" }),
+      /* @__PURE__ */ jsx(Text, { children: " " }),
+      /* @__PURE__ */ jsxs(Text, { children: [
+        "Sonar prompt:",
+        " ",
+        /* @__PURE__ */ jsxs(Text, { color: "cyan", children: [
+          sonarPrompt,
+          /* @__PURE__ */ jsx(Text, { children: "_" })
+        ] })
+      ] }),
+      /* @__PURE__ */ jsx(Text, { children: " " }),
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Type prompt \xB7 Enter to save \xB7 Esc to go back \xB7 Ctrl+C to cancel" })
     ] });
   }
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginY: 1, children: [
-    /* @__PURE__ */ jsx(Text, { bold: true, children: "Configure Claude System Prompt" }),
+    /* @__PURE__ */ jsx(Text, { bold: true, children: "Prompts \u2014 Fix-Comments" }),
     /* @__PURE__ */ jsx(Text, { children: " " }),
     /* @__PURE__ */ jsxs(Text, { children: [
-      "System prompt (optional):",
+      "Fix-Comments prompt:",
       " ",
       /* @__PURE__ */ jsxs(Text, { color: "cyan", children: [
-        systemPrompt,
+        fixCommentsPrompt,
         /* @__PURE__ */ jsx(Text, { children: "_" })
       ] })
     ] }),
     /* @__PURE__ */ jsx(Text, { children: " " }),
-    /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Type prompt \xB7 Enter to save and exit \xB7 Ctrl+C to cancel" })
+    /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Type prompt \xB7 Enter to save \xB7 Esc to go back \xB7 Ctrl+C to cancel" })
   ] });
 }
 
@@ -195,7 +406,7 @@ var configSetType = new Command("type").description("Set the remote environment
 `);
     process.exit(1);
   }
-  const current = readConfig();
+  const current = readRawConfig();
   writeConfig({ ...current, remoteType: value });
   process.stdout.write(`Remote type set to: ${value}
 `);
@@ -206,19 +417,19 @@ var configSetIssueDiscoveryTechnique = new Command("issue-discovery-technique").
 `);
     process.exit(1);
   }
-  const current = readConfig();
+  const current = readRawConfig();
   writeConfig({ ...current, issueDiscoveryTechnique: value });
   process.stdout.write(`Issue discovery technique set to: ${value}
 `);
 });
 var configSetIssueDiscoveryValue = new Command("issue-discovery-value").description("Set the value for the issue discovery technique (label name, username, or search string)").argument("<value>", "The filter value").action((value) => {
-  const current = readConfig();
+  const current = readRawConfig();
   writeConfig({ ...current, issueDiscoveryValue: value });
   process.stdout.write(`Issue discovery value set to: ${value}
 `);
 });
 var configSetClaudeSystemPrompt = new Command("claude-system-prompt").description("Set the system prompt used when invoking Claude Code").argument("<value>", "System prompt text").action((value) => {
-  const current = readConfig();
+  const current = readRawConfig();
   writeConfig({ ...current, claudeSystemPrompt: value });
   process.stdout.write(`Claude system prompt set.
 `);
@@ -299,6 +510,8 @@ function getCurrentBranch() {
   }
   return stdout.trim();
 }
+var SONAR_FETCH_TIMEOUT_MS = 5e3;
+var SONAR_FAIL_CONCLUSIONS = /* @__PURE__ */ new Set(["FAILURE", "TIMED_OUT", "ACTION_REQUIRED", "CANCELLED"]);
 function parseOwnerRepo() {
   const { stdout, status } = run2("git", ["remote", "get-url", "origin"]);
   if (status !== 0) return null;
@@ -335,7 +548,295 @@ function fetchCheckRunOutputs(ownerRepo, sha) {
   }
   return map;
 }
-function getPrInfoGh(branch) {
+function extractSonarProjectKey(url) {
+  try {
+    const parsed = new URL(url);
+    const id = parsed.searchParams.get("id");
+    return id ?? null;
+  } catch {
+    return null;
+  }
+}
+function isSonarUrl(url) {
+  try {
+    const hostname = new URL(url).hostname;
+    return hostname === "sonarcloud.io" || hostname.endsWith(".sonarcloud.io");
+  } catch {
+    return false;
+  }
+}
+function stripHtml(text) {
+  let stripped = "";
+  let inTag = false;
+  for (const char of text) {
+    if (char === "<") {
+      inTag = true;
+      stripped += " ";
+      continue;
+    }
+    if (char === ">") {
+      inTag = false;
+      continue;
+    }
+    if (!inTag) {
+      stripped += char;
+    }
+  }
+  return stripped;
+}
+function normalizeText(text) {
+  if (!text) return void 0;
+  const normalized = stripHtml(text).replaceAll(/\s+/g, " ").trim();
+  return normalized || void 0;
+}
+function resolveSonarPath(componentKey, components) {
+  if (!componentKey) return void 0;
+  const mapped = components.get(componentKey);
+  if (mapped) return mapped;
+  const separatorIndex = componentKey.indexOf(":");
+  if (separatorIndex === -1) return void 0;
+  const path = componentKey.slice(separatorIndex + 1).trim();
+  return path || void 0;
+}
+function mapSonarIssuesPage(data, targetIssues, components, rules) {
+  for (const component of data.components ?? []) {
+    if (component.key && component.path) {
+      components.set(component.key, component.path);
+    }
+  }
+  for (const rule of data.rules ?? []) {
+    if (!rule.key) continue;
+    const explanation = normalizeText(rule.htmlDesc) ?? normalizeText(rule.htmlNote) ?? normalizeText(rule.name);
+    if (explanation) {
+      rules.set(rule.key, explanation);
+    }
+  }
+  for (const issue of data.issues ?? []) {
+    if (!issue.key || !issue.message) continue;
+    const ruleKey = issue.rule;
+    const mappedIssue = {
+      key: issue.key,
+      severity: issue.severity,
+      type: issue.type,
+      message: issue.message,
+      path: resolveSonarPath(issue.component, components),
+      line: issue.line ?? issue.textRange?.startLine ?? null,
+      ...ruleKey ? { rule: ruleKey } : {},
+      ...ruleKey && rules.has(ruleKey) ? { explanation: rules.get(ruleKey) } : {}
+    };
+    targetIssues.push(mappedIssue);
+  }
+}
+function mapSonarHotspotsPage(data, targetHotspots, components) {
+  for (const component of data.components ?? []) {
+    if (component.key && component.path) {
+      components.set(component.key, component.path);
+    }
+  }
+  targetHotspots.push(...data.hotspots ?? []);
+}
+function mapSonarHotspot(hotspot, components, detail) {
+  const rule = detail?.rule;
+  return {
+    key: detail?.key ?? hotspot.key ?? "",
+    rule: hotspot.ruleKey ?? rule?.key ?? "",
+    ruleName: normalizeText(rule?.name),
+    status: detail?.status ?? hotspot.status ?? "UNKNOWN",
+    message: detail?.message ?? hotspot.message ?? "",
+    path: detail?.component?.path ?? resolveSonarPath(hotspot.component, components),
+    line: detail?.line ?? detail?.textRange?.startLine ?? hotspot.line ?? hotspot.textRange?.startLine ?? null,
+    securityCategory: rule?.securityCategory ?? hotspot.securityCategory,
+    vulnerabilityProbability: rule?.vulnerabilityProbability ?? hotspot.vulnerabilityProbability,
+    riskDescription: normalizeText(rule?.riskDescription),
+    vulnerabilityDescription: normalizeText(rule?.vulnerabilityDescription),
+    fixRecommendations: normalizeText(rule?.fixRecommendations)
+  };
+}
+async function fetchSonarJson(apiUrl) {
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), SONAR_FETCH_TIMEOUT_MS);
+  try {
+    const response = await fetch(apiUrl, { signal: controller.signal });
+    if (!response.ok) {
+      return { ok: false, status: response.status };
+    }
+    return {
+      ok: true,
+      status: response.status,
+      data: await response.json()
+    };
+  } catch {
+    return { ok: false, status: null };
+  } finally {
+    clearTimeout(timeoutId);
+  }
+}
+async function fetchSonarNewIssues(projectKey, prNumber) {
+  const apiUrl = `https://sonarcloud.io/api/issues/search?componentKeys=${encodeURIComponent(projectKey)}&pullRequest=${String(prNumber)}&resolved=false&ps=1`;
+  const response = await fetchSonarJson(apiUrl);
+  if (!response.ok) {
+    return null;
+  }
+  return response.data.paging?.total ?? null;
+}
+async function fetchSonarGateViolations(projectKey, prNumber) {
+  const apiUrl = `https://sonarcloud.io/api/qualitygates/project_status?projectKey=${encodeURIComponent(projectKey)}&pullRequest=${String(prNumber)}`;
+  const response = await fetchSonarJson(apiUrl);
+  if (!response.ok) {
+    return response;
+  }
+  const projectStatus = response.data.projectStatus;
+  const gateViolations = (projectStatus?.conditions ?? []).filter((condition) => condition.status !== void 0 && condition.status !== "OK").map((condition) => ({
+    metricKey: condition.metricKey ?? "unknown",
+    status: condition.status ?? "ERROR",
+    comparator: condition.comparator,
+    actualValue: condition.actualValue,
+    errorThreshold: condition.errorThreshold
+  }));
+  return {
+    ok: true,
+    status: response.status,
+    data: {
+      status: "available",
+      qualityGateStatus: projectStatus?.status,
+      gateViolations,
+      issues: [],
+      securityHotspots: []
+    }
+  };
+}
+async function fetchSonarIssues(projectKey, prNumber) {
+  const pageSize = 100;
+  const issues = [];
+  const components = /* @__PURE__ */ new Map();
+  const rules = /* @__PURE__ */ new Map();
+  let page = 1;
+  let total = null;
+  while (true) {
+    const apiUrl = `https://sonarcloud.io/api/issues/search?componentKeys=${encodeURIComponent(projectKey)}&pullRequest=${String(prNumber)}&resolved=false&ps=${String(pageSize)}&p=${String(page)}&additionalFields=_all`;
+    const response = await fetchSonarJson(apiUrl);
+    if (!response.ok) {
+      return response;
+    }
+    const paging = response.data.paging;
+    total ??= paging?.total ?? null;
+    mapSonarIssuesPage(response.data, issues, components, rules);
+    const fetchedCount = page * (paging?.pageSize ?? pageSize);
+    if (paging?.total === void 0 || fetchedCount >= paging.total) {
+      break;
+    }
+    page += 1;
+  }
+  return {
+    ok: true,
+    status: 200,
+    data: {
+      total,
+      issues
+    }
+  };
+}
+async function fetchSonarHotspotDetail(hotspotKey) {
+  const apiUrl = `https://sonarcloud.io/api/hotspots/show?hotspot=${encodeURIComponent(hotspotKey)}`;
+  return fetchSonarJson(apiUrl);
+}
+async function fetchSonarHotspots(projectKey, prNumber) {
+  const pageSize = 100;
+  const rawHotspots = [];
+  const components = /* @__PURE__ */ new Map();
+  let page = 1;
+  while (true) {
+    const apiUrl = `https://sonarcloud.io/api/hotspots/search?projectKey=${encodeURIComponent(projectKey)}&pullRequest=${String(prNumber)}&onlyMine=false&sinceLeakPeriod=true&ps=${String(pageSize)}&p=${String(page)}`;
+    const response = await fetchSonarJson(apiUrl);
+    if (!response.ok) {
+      return response;
+    }
+    const paging = response.data.paging;
+    mapSonarHotspotsPage(response.data, rawHotspots, components);
+    const fetchedCount = page * (paging?.pageSize ?? pageSize);
+    if (paging?.total === void 0 || fetchedCount >= paging.total) {
+      break;
+    }
+    page += 1;
+  }
+  const detailResults = await Promise.all(rawHotspots.map((hotspot) => fetchSonarHotspotDetail(hotspot.key ?? "")));
+  const securityHotspots = [];
+  for (let index = 0; index < rawHotspots.length; index += 1) {
+    const hotspot = rawHotspots[index];
+    const detailResult = detailResults[index];
+    if (detailResult && !detailResult.ok && detailResult.status === 401) {
+      return detailResult;
+    }
+    securityHotspots.push(mapSonarHotspot(hotspot, components, detailResult?.ok ? detailResult.data : void 0));
+  }
+  return {
+    ok: true,
+    status: 200,
+    data: securityHotspots
+  };
+}
+function sonarPrivateFailureSummary(sonarcloudUrl) {
+  return {
+    status: "private",
+    gateViolations: [],
+    issues: [],
+    securityHotspots: [],
+    privateMessage: `SonarCloud project is private. Open the Sonar URL in an authenticated browser: ${sonarcloudUrl}`
+  };
+}
+async function fetchSonarFailureSummary(projectKey, prNumber, sonarcloudUrl) {
+  const [gateResult, issuesResult, hotspotsResult] = await Promise.all([
+    fetchSonarGateViolations(projectKey, prNumber),
+    fetchSonarIssues(projectKey, prNumber),
+    fetchSonarHotspots(projectKey, prNumber)
+  ]);
+  if (!gateResult.ok && gateResult.status === 401) {
+    return {
+      summary: sonarPrivateFailureSummary(sonarcloudUrl),
+      issueTotal: null
+    };
+  }
+  if (!issuesResult.ok && issuesResult.status === 401) {
+    return {
+      summary: sonarPrivateFailureSummary(sonarcloudUrl),
+      issueTotal: null
+    };
+  }
+  if (!hotspotsResult.ok && hotspotsResult.status === 401) {
+    return {
+      summary: sonarPrivateFailureSummary(sonarcloudUrl),
+      issueTotal: null
+    };
+  }
+  const gateViolations = gateResult.ok ? gateResult.data.gateViolations : [];
+  const issues = issuesResult.ok ? issuesResult.data.issues : [];
+  const securityHotspots = hotspotsResult.ok ? hotspotsResult.data : [];
+  const qualityGateStatus = gateResult.ok ? gateResult.data.qualityGateStatus : void 0;
+  const issueTotal = issuesResult.ok ? issuesResult.data.total : null;
+  if (gateViolations.length === 0 && issues.length === 0 && securityHotspots.length === 0 && !qualityGateStatus) {
+    return {
+      summary: {
+        status: "unavailable",
+        gateViolations: [],
+        issues: [],
+        securityHotspots: [],
+        unavailableMessage: "SonarCloud failure details are unavailable right now."
+      },
+      issueTotal
+    };
+  }
+  return {
+    summary: {
+      status: "available",
+      qualityGateStatus,
+      gateViolations,
+      issues,
+      securityHotspots
+    },
+    issueTotal
+  };
+}
+async function getPrInfoGh(branch) {
   const { stdout, stderr, status } = run2("gh", [
     "pr",
     "view",
@@ -365,9 +866,36 @@ function getPrInfoGh(branch) {
       detailsUrl: enriched?.detailsUrl || c.detailsUrl || ""
     };
   });
-  return { number: raw.number, title: raw.title, state: raw.state, url: raw.url, checks };
+  const sonarCheck = checks.find((c) => isSonarUrl(c.detailsUrl));
+  let sonarcloudUrl;
+  let sonarNewIssues;
+  let sonarFailures;
+  if (sonarCheck) {
+    sonarcloudUrl = sonarCheck.detailsUrl;
+    const projectKey = extractSonarProjectKey(sonarCheck.detailsUrl);
+    if (projectKey) {
+      if (sonarCheck.conclusion !== null && SONAR_FAIL_CONCLUSIONS.has(sonarCheck.conclusion)) {
+        const sonarSummary = await fetchSonarFailureSummary(projectKey, raw.number, sonarcloudUrl);
+        sonarFailures = sonarSummary.summary;
+        sonarNewIssues = sonarSummary.issueTotal;
+      } else {
+        sonarNewIssues = await fetchSonarNewIssues(projectKey, raw.number);
+      }
+    } else {
+      sonarNewIssues = null;
+    }
+  }
+  return {
+    number: raw.number,
+    title: raw.title,
+    state: raw.state,
+    url: raw.url,
+    checks,
+    ...sonarcloudUrl === void 0 ? {} : { sonarcloudUrl, sonarNewIssues },
+    ...sonarFailures === void 0 ? {} : { sonarFailures }
+  };
 }
-function getPrInfo2(branch) {
+async function getPrInfo2(branch) {
   const config = readConfig();
   if (config.remoteType === "azdo") {
     return getPrInfo();
@@ -471,6 +999,23 @@ function getPrComments(branch) {
   }
   return getPrCommentsGh(branch);
 }
+function resolveCurrentBranchComments() {
+  let branch;
+  try {
+    branch = getCurrentBranch();
+  } catch (err) {
+    return { ok: false, kind: "error", message: err.message };
+  }
+  let raw;
+  try {
+    raw = getPrComments(branch);
+  } catch (err) {
+    return { ok: false, kind: "error", message: err.message };
+  }
+  if (raw === "unsupported") return { ok: false, kind: "unsupported" };
+  if (raw === null) return { ok: false, kind: "no-pr", branch };
+  return { ok: true, branch, comments: raw };
+}
 var SEMVER_RE = /^v?(\d+)\.(\d+)\.(\d+)$/;
 function getLatestTagOnMaster() {
   const { stdout, status } = run2("git", [
@@ -553,33 +1098,131 @@ function formatChecks(checks) {
     const sym = checkSymbol(check);
     const pending = check.status !== "COMPLETED" ? " (pending)" : "";
     lines.push(`  ${sym} ${check.name}${pending}`);
-    if (check.conclusion !== null && FAIL_CONCLUSIONS.has(check.conclusion)) {
-      const desc = check.description.trim();
-      const url = check.detailsUrl.trim();
-      if (desc) lines.push(`    Details: ${desc}`);
-      if (url) lines.push(`    URL:     ${url}`);
-      if (!desc && !url) lines.push(`    Details: (no details available)`);
-    }
   }
   return lines.join("\n") + "\n";
 }
 function sleep(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
+  return new Promise((resolve3) => setTimeout(resolve3, ms));
+}
+function isSonarCheck(check) {
+  try {
+    const hostname = new URL(check.detailsUrl).hostname;
+    return hostname === "sonarcloud.io" || hostname.endsWith(".sonarcloud.io");
+  } catch {
+    return false;
+  }
 }
 function formatFailedChecks(failed) {
-  const lines = [];
+  const lines = ["FailedChecks:"];
   for (const check of failed) {
     lines.push(`  \u2717 ${check.name}`);
     const desc = check.description.trim();
     const url = check.detailsUrl.trim();
     if (desc) lines.push(`    Details: ${desc}`);
-    if (url) lines.push(`    URL:     ${url}`);
+    if (url && (isSonarCheck(check) || !desc)) lines.push(`    URL:     ${url}`);
     if (!desc && !url) lines.push(`    Details: (no details available)`);
   }
   return lines.join("\n") + "\n";
 }
+function formatGateViolation(violation) {
+  const parts = [sanitizeText(violation.metricKey)];
+  if (violation.actualValue) parts.push(`actual ${sanitizeText(violation.actualValue)}`);
+  if (violation.comparator && violation.errorThreshold) {
+    parts.push(`${sanitizeText(violation.comparator)} ${sanitizeText(violation.errorThreshold)}`);
+  } else if (violation.errorThreshold) {
+    parts.push(`threshold ${sanitizeText(violation.errorThreshold)}`);
+  }
+  return parts.join(" | ");
+}
+function formatLocation(path, line) {
+  if (!path) return void 0;
+  const safePath = sanitizeText(path);
+  if (!line) return safePath;
+  return `${safePath}:${String(line)}`;
+}
+function formatRuleWithName(rule, ruleName) {
+  const safeRule = sanitizeText(rule);
+  if (!ruleName) return safeRule;
+  return `${safeRule} (${sanitizeText(ruleName)})`;
+}
+function formatSonarIssue(issue) {
+  const lines = [`    - ${sanitizeText(issue.message)}`];
+  const location = formatLocation(issue.path, issue.line);
+  if (location) lines.push(`      Location: ${location}`);
+  if (issue.severity || issue.type) {
+    const labels = [issue.severity, issue.type].filter((label) => Boolean(label)).map(sanitizeText).join(" / ");
+    lines.push(`      Classification: ${labels}`);
+  }
+  if (issue.rule) lines.push(`      Rule: ${sanitizeText(issue.rule)}`);
+  if (issue.explanation) lines.push(`      Explanation: ${sanitizeText(issue.explanation)}`);
+  return lines;
+}
+function formatSonarHotspot(hotspot) {
+  const lines = [`    - ${sanitizeText(hotspot.message)}`];
+  const location = formatLocation(hotspot.path, hotspot.line);
+  if (location) lines.push(`      Location: ${location}`);
+  if (hotspot.status) lines.push(`      Status: ${sanitizeText(hotspot.status)}`);
+  if (hotspot.vulnerabilityProbability || hotspot.securityCategory) {
+    const labels = [hotspot.vulnerabilityProbability, hotspot.securityCategory].filter((label) => Boolean(label)).map(sanitizeText).join(" / ");
+    lines.push(`      Classification: ${labels}`);
+  }
+  if (hotspot.rule) {
+    lines.push(`      Rule: ${formatRuleWithName(hotspot.rule, hotspot.ruleName)}`);
+  }
+  if (hotspot.riskDescription) lines.push(`      Risk: ${sanitizeText(hotspot.riskDescription)}`);
+  if (hotspot.vulnerabilityDescription) lines.push(`      Review: ${sanitizeText(hotspot.vulnerabilityDescription)}`);
+  if (hotspot.fixRecommendations) lines.push(`      Fix: ${sanitizeText(hotspot.fixRecommendations)}`);
+  return lines;
+}
+function appendGateViolations(lines, gateViolations) {
+  if (gateViolations.length === 0) return;
+  lines.push("  Gate Violations:");
+  for (const violation of gateViolations) {
+    lines.push(`    - ${formatGateViolation(violation)}`);
+  }
+}
+function appendSonarIssues(lines, issues) {
+  if (issues.length === 0) return;
+  lines.push("  Issues:");
+  for (const issue of issues) {
+    lines.push(...formatSonarIssue(issue));
+  }
+}
+function appendSecurityHotspots(lines, securityHotspots) {
+  if (securityHotspots.length === 0) return;
+  lines.push("  Security Hotspots:");
+  for (const hotspot of securityHotspots) {
+    lines.push(...formatSonarHotspot(hotspot));
+  }
+}
+function hasSonarFailureDetails(sonarFailures) {
+  return Boolean(sonarFailures.qualityGateStatus) || sonarFailures.gateViolations.length > 0 || sonarFailures.issues.length > 0 || sonarFailures.securityHotspots.length > 0;
+}
+function formatSonarFailures(sonarFailures, sonarcloudUrl) {
+  const lines = ["Sonar Failures:"];
+  if (sonarFailures.status === "private") {
+    lines.push(`  Note: ${sanitizeText(sonarFailures.privateMessage ?? "SonarCloud project is private.")}`);
+    return lines.join("\n") + "\n";
+  }
+  if (sonarFailures.status === "unavailable") {
+    lines.push(`  Note: ${sanitizeText(sonarFailures.unavailableMessage ?? "SonarCloud failure details are unavailable.")}`);
+    if (sonarcloudUrl) lines.push(`  URL:  ${sonarcloudUrl}`);
+    return lines.join("\n") + "\n";
+  }
+  if (sonarFailures.qualityGateStatus) {
+    lines.push(`  Quality Gate: ${sanitizeText(sonarFailures.qualityGateStatus)}`);
+  }
+  appendGateViolations(lines, sonarFailures.gateViolations);
+  appendSonarIssues(lines, sonarFailures.issues);
+  appendSecurityHotspots(lines, sonarFailures.securityHotspots);
+  if (!hasSonarFailureDetails(sonarFailures)) {
+    lines.push("  Note: SonarCloud reported a failure but returned no violation, issue, or hotspot details.");
+    if (sonarcloudUrl) lines.push(`  URL:  ${sonarcloudUrl}`);
+  }
+  return lines.join("\n") + "\n";
+}
 var POLL_INTERVAL_MS = 1e4;
-var getPrInfoCmd = new Command2("get-pr-info").description("Show pull request info for the current branch").option("--json", "Output as JSON").option("--wait-finish-checks", "Poll until all checks complete, then report pass/fail (exit 1 on failure)").addHelpText(
+var getPrInfoCmd = new Command2("get-pr-info").description("Show pull request info for the current branch").option("--json", "Output as JSON").option("--wait-finish-checks", "Poll until all checks complete, then print the normal get-pr-info output").addHelpText(
   "after",
   `
 Check status symbols:
@@ -588,10 +1231,11 @@ Check status symbols:
   \u25CF  Pending       (status: QUEUED or IN_PROGRESS)
   \u25CB  Skipped       (conclusion: SKIPPED or NEUTRAL)
 
-Failure details are printed beneath each \u2717 check.
+When checks fail, details are printed in a trailing FailedChecks section.
 See docs/git.md for full output reference.`
 ).action(async (options) => {
   let branch;
+  let pr = null;
   try {
     branch = getCurrentBranch();
   } catch (err) {
@@ -600,54 +1244,31 @@ See docs/git.md for full output reference.`
     process.exit(1);
   }
   if (options.waitFinishChecks) {
-    let pr2;
     while (true) {
       try {
-        pr2 = getPrInfo2(branch);
+        pr = await getPrInfo2(branch);
       } catch (err) {
         process.stderr.write(`Error: ${err.message}
 `);
         process.exit(1);
       }
-      if (pr2 === null) {
-        process.stderr.write(`Error: No pull request found for branch: ${branch}
-`);
-        process.exit(1);
+      if (pr === null) {
+        break;
       }
-      const running = pr2.checks.filter((c) => c.status !== "COMPLETED");
+      const running = pr.checks.filter((c) => c.status !== "COMPLETED");
       if (running.length === 0) break;
       process.stdout.write(`Waiting for ${running.length} check(s) to complete...
 `);
       await sleep(POLL_INTERVAL_MS);
     }
-    const failed = pr2.checks.filter((c) => c.conclusion !== null && FAIL_CONCLUSIONS.has(c.conclusion));
-    if (failed.length === 0) {
-      if (options.json) {
-        process.stdout.write(JSON.stringify({ result: "passed" }, null, 2) + "\n");
-      } else {
-        process.stdout.write(`All checks passed. \u2713
-`);
-      }
-      process.exit(0);
-    } else {
-      if (options.json) {
-        process.stdout.write(JSON.stringify({ result: "failed", failed }, null, 2) + "\n");
-      } else {
-        process.stdout.write(`${failed.length} check(s) failed:
+  } else {
+    try {
+      pr = await getPrInfo2(branch);
+    } catch (err) {
+      process.stderr.write(`Error: ${err.message}
 `);
-        process.stdout.write(formatFailedChecks(failed));
-      }
       process.exit(1);
     }
-    return;
-  }
-  let pr;
-  try {
-    pr = getPrInfo2(branch);
-  } catch (err) {
-    process.stderr.write(`Error: ${err.message}
-`);
-    process.exit(1);
   }
   if (pr === null) {
     process.stdout.write(`No pull request found for branch: ${branch}
@@ -657,13 +1278,27 @@ See docs/git.md for full output reference.`
   if (options.json) {
     process.stdout.write(JSON.stringify(pr, null, 2) + "\n");
   } else {
+    const failed = pr.checks.filter((c) => c.conclusion !== null && FAIL_CONCLUSIONS.has(c.conclusion));
     process.stdout.write(`PR:    #${pr.number}
 Title: ${pr.title}
 State: ${pr.state}
 URL:   ${pr.url}
 `);
+    if (pr.sonarcloudUrl !== void 0) {
+      process.stdout.write(`Sonar: ${pr.sonarcloudUrl}
+`);
+      const issueStr = pr.sonarNewIssues === null || pr.sonarNewIssues === void 0 ? "unavailable" : String(pr.sonarNewIssues);
+      process.stdout.write(`Sonar New Issues: ${issueStr}
+`);
+    }
     process.stdout.write(formatCheckSummary(pr.checks));
     process.stdout.write(formatChecks(pr.checks));
+    if (failed.length > 0) {
+      process.stdout.write(formatFailedChecks(failed));
+    }
+    if (pr.sonarFailures !== void 0) {
+      process.stdout.write(formatSonarFailures(pr.sonarFailures, pr.sonarcloudUrl));
+    }
   }
 });
 var ANSI_ESCAPE_RE = new RegExp("\x1B(?:[@-Z\\\\-_]|\\[[0-?]*[ -/]*[@-~])", "g");
@@ -724,7 +1359,7 @@ ${safeBody}`);
   }
   process.stdout.write(lines.join("\n\n") + "\n");
 });
-var finishFeatureCmd = new Command2("finish-feature").description("Clean up a merged feature branch: checkout develop, pull, and delete local branch").action(() => {
+var finishFeatureCmd = new Command2("finish-feature").description("Clean up a merged feature branch: checkout develop, pull, and delete local branch").action(async () => {
   let branch;
   try {
     branch = getCurrentBranch();
@@ -745,7 +1380,7 @@ var finishFeatureCmd = new Command2("finish-feature").description("Clean up a me
   }
   let pr;
   try {
-    pr = getPrInfo2(branch);
+    pr = await getPrInfo2(branch);
   } catch (err) {
     process.stderr.write(`Error: ${err.message}
 `);
@@ -875,10 +1510,8 @@ minor segment is incremented (e.g. 1.2.0 \u2192 1.3.0).`
 var gitCommand = new Command2("git").description("Git workflow commands (some require gh CLI)").addCommand(getPrInfoCmd).addCommand(getPrCommentsCmd).addCommand(finishFeatureCmd).addCommand(publishReleaseCmd);
 
 // src/commands/getReady.ts
+import { createInterface as createInterface2 } from "readline";
 import { Command as Command3 } from "commander";
-import { spawnSync as spawnSync4 } from "child_process";
-import { existsSync } from "fs";
-import { delimiter, join as join2 } from "path";
 
 // src/config/githubService.ts
 import { spawnSync as spawnSync3 } from "child_process";
@@ -897,14 +1530,14 @@ function run3(cmd, args) {
     status: result.status ?? 1
   };
 }
-function listIssues(technique, value) {
+function listIssues(technique, value, limit = 10) {
   const baseArgs = [
     "issue",
     "list",
     "--state",
     "open",
     "--limit",
-    "1",
+    String(limit),
     "--json",
     "number,title,body,url"
   ];
@@ -924,11 +1557,7 @@ function listIssues(technique, value) {
   if (status !== 0) {
     throw new Error(stderr.trim() || "Failed to query GitHub issues. Is `gh` installed and authenticated?");
   }
-  const issues = JSON.parse(stdout);
-  if (issues.length === 0) {
-    return null;
-  }
-  return issues[0];
+  return JSON.parse(stdout);
 }
 function postComment(issueNumber, body) {
   const { stderr, status } = run3("gh", ["issue", "comment", String(issueNumber), "--body", body]);
@@ -937,40 +1566,222 @@ function postComment(issueNumber, body) {
   }
 }
 
-// src/commands/getReady.ts
+// src/claude/claudeService.ts
+import { spawn, spawnSync as spawnSync4 } from "child_process";
+import { createInterface } from "readline";
+import { existsSync } from "fs";
+import { delimiter, join as join3 } from "path";
+
+// src/cli/spawnUtils.ts
+function truncate(str, max) {
+  return str.length > max ? str.slice(0, max) + "..." : str;
+}
+function handleSpawnError(error, toolName) {
+  if (!error) return;
+  const err = error;
+  if (err.code === "ENOENT") {
+    process.stderr.write(`Error: \`${toolName}\` CLI is not installed or not on PATH.
+`);
+    process.exit(1);
+  }
+  process.stderr.write(`Error: ${err.message}
+`);
+  process.exit(1);
+}
+function handleExitCode(status, toolName) {
+  if (status === null) {
+    process.stderr.write(`Error: ${toolName} terminated abnormally (exit code is null, likely due to a signal).
+`);
+    process.exit(1);
+  }
+  if (status !== 0) {
+    process.stderr.write(`Error: ${toolName} exited with code ${status}.
+`);
+    process.exit(status);
+  }
+}
+
+// src/claude/claudeService.ts
 function resolveCommand(name) {
   const pathDirs = (process.env["PATH"] ?? "").split(delimiter);
   for (const dir of pathDirs) {
-    const candidate = join2(dir, name);
+    const candidate = join3(dir, name);
     if (existsSync(candidate)) return candidate;
   }
   return name;
 }
-function invokeClaudeCode(issue, systemPrompt, yolo) {
-  const prompt = systemPrompt ? `${systemPrompt}
-
-${issue.body}` : issue.body;
+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);
+  }
+  invokeClaudeCodeSync(prompt, options.yolo ?? false, options.model);
+}
+function invokeClaudeCodeSync(prompt, yolo, model) {
   const claudeBin = resolveCommand("claude");
-  const args = yolo ? ["--dangerously-skip-permissions", "-p", prompt] : ["-p", prompt];
+  const args = [];
+  if (yolo) args.push("--dangerously-skip-permissions");
+  if (model) args.push("--model", model);
+  args.push("-p", prompt);
   const result = spawnSync4(claudeBin, args, { encoding: "utf8", stdio: "inherit" });
-  if (result.error) {
-    const err = result.error;
-    if (err.code === "ENOENT") {
-      process.stderr.write("Error: `claude` CLI is not installed or not on PATH.\n");
-      process.exit(1);
+  handleSpawnError(result.error, "claude");
+  handleExitCode(result.status, "Claude Code");
+}
+function invokeClaudeCodeVerbose(prompt, yolo, model) {
+  return new Promise((resolve3) => {
+    const claudeBin = resolveCommand("claude");
+    const args = [];
+    if (yolo) args.push("--dangerously-skip-permissions");
+    if (model) args.push("--model", model);
+    args.push("--verbose", "--output-format", "stream-json", "-p", prompt);
+    const child = spawn(claudeBin, args, { stdio: ["inherit", "pipe", "inherit"] });
+    const rl = createInterface({ input: child.stdout });
+    let turnCount = 0;
+    child.on("error", (err) => {
+      handleSpawnError(err, "claude");
+    });
+    rl.on("line", (line) => {
+      try {
+        const event = JSON.parse(line);
+        formatEvent(event, turnCount);
+        if (event["type"] === "assistant") turnCount++;
+      } catch {
+      }
+    });
+    child.on("close", (code) => {
+      handleExitCode(code, "Claude Code");
+      resolve3();
+    });
+  });
+}
+function formatEvent(event, turnCount) {
+  const type = event["type"];
+  if (type === "assistant") {
+    const message = event["message"];
+    const content = message?.["content"];
+    if (!content) return;
+    for (const block of content) {
+      if (block["type"] === "tool_use") {
+        const toolName = block["name"];
+        const input = block["input"];
+        const summary = summarizeTool(toolName, input);
+        process.stderr.write(`  [step ${turnCount + 1}] ${summary}
+`);
+      } else if (block["type"] === "text") {
+        const text = block["text"] ?? "";
+        if (text.length > 0) {
+          const preview = text.length > 120 ? text.slice(0, 120) + "..." : text;
+          const firstLine = preview.split("\n")[0];
+          process.stderr.write(`  [step ${turnCount + 1}] ${firstLine}
+`);
+        }
+      }
     }
-    process.stderr.write(`Error: ${err.message}
+  } else if (type === "result") {
+    const result = event["result"];
+    const cost = event["cost_usd"];
+    const duration = event["duration_ms"];
+    const turns = event["num_turns"];
+    process.stderr.write("\n--- Result ---\n");
+    if (cost !== void 0 || duration !== void 0 || turns !== void 0) {
+      const parts = [];
+      if (turns !== void 0) parts.push(`${turns} turns`);
+      if (duration !== void 0) parts.push(`${(duration / 1e3).toFixed(1)}s`);
+      if (cost !== void 0) parts.push(`$${cost.toFixed(4)}`);
+      process.stderr.write(`  [info] ${parts.join(" | ")}
 `);
-    process.exit(1);
+    }
+    if (result) {
+      process.stdout.write(result + "\n");
+    }
   }
-  if (result.status !== 0) {
-    process.stderr.write(`Error: Claude Code exited with code ${result.status ?? "unknown"}.
+}
+function summarizeTool(name, input) {
+  if (!input) return `tool: ${name}`;
+  switch (name) {
+    case "Read":
+      return `reading ${input["file_path"] ?? "file"}`;
+    case "Write":
+      return `writing ${input["file_path"] ?? "file"}`;
+    case "Edit":
+      return `editing ${input["file_path"] ?? "file"}`;
+    case "Bash":
+      return `running: ${truncate(String(input["command"] ?? ""), 80)}`;
+    case "Glob":
+      return `searching files: ${input["pattern"] ?? ""}`;
+    case "Grep":
+      return `searching content: ${truncate(String(input["pattern"] ?? ""), 60)}`;
+    case "Agent":
+      return `spawning agent: ${input["description"] ?? name}`;
+    default:
+      return `tool: ${name}`;
+  }
+}
+
+// src/codex/codexService.ts
+import { spawnSync as spawnSync5 } from "child_process";
+function invokeCodexCode(prompt, options = {}) {
+  if (options.verbose) {
+    process.stderr.write("Warning: --verbose is not supported for Codex and will be ignored.\n");
+  }
+  invokeCodexCodeSync(prompt, options.yolo ?? false, options.model);
+}
+function invokeCodexCodeSync(prompt, yolo, model) {
+  const codexBin = resolveCommand("codex");
+  const args = ["exec"];
+  if (yolo) args.push("--dangerously-bypass-approvals-and-sandbox");
+  if (model) args.push("--model", model);
+  args.push(prompt);
+  const result = spawnSync5(codexBin, args, { encoding: "utf8", stdio: "inherit" });
+  handleSpawnError(result.error, "codex");
+  handleExitCode(result.status, "Codex");
+}
+
+// src/commands/getReady.ts
+function writeOverflowHint(output, issues, limit) {
+  if (issues.length === limit) {
+    output.write(`(Showing first ${limit} matching issues \u2014 there may be more. Use --limit to fetch more.)
 `);
-    process.exit(result.status ?? 1);
   }
 }
-var implementNextCommand = new Command3("implement-next").description("Find the next open GitHub issue matching the configured filter, claim it, and invoke Claude Code").option("--json", "Output issue details as JSON").option("--no-claude", "Skip Claude Code invocation after claiming the issue").option("--query-only", "Print issue content and exit without claiming or invoking Claude").option("--yolo", "Launch Claude Code with --dangerously-skip-permissions").action((options) => {
-  const config = readConfig();
+function writeIssueList(output, issues, limit) {
+  output.write("\nAvailable issues:\n");
+  for (let i = 0; i < issues.length; i++) {
+    output.write(`  [${i + 1}] #${issues[i].number} - ${issues[i].title}
+`);
+  }
+  writeOverflowHint(output, issues, limit);
+}
+async function promptSelection(issues, limit, output) {
+  writeIssueList(output, issues, limit);
+  const rl = createInterface2({ input: process.stdin, output });
+  const answer = await new Promise(
+    (resolve3) => rl.question(`
+Select issue (1-${issues.length}): `, resolve3)
+  );
+  rl.close();
+  const n = Number.parseInt(answer.trim(), 10);
+  if (Number.isNaN(n) || n < 1 || n > issues.length) {
+    process.stderr.write(`Error: Invalid selection "${answer.trim()}". Enter a number between 1 and ${issues.length}.
+`);
+    process.exit(1);
+  }
+  return issues[n - 1];
+}
+function validateConfig(config) {
   if (config.remoteType !== "gh") {
     process.stderr.write(
       "Error: implement-next is not supported in Azure DevOps mode. Work item discovery is not available in azdo-cli. See docs/azdo-gap.md for details.\n"
@@ -989,24 +1800,58 @@ var implementNextCommand = new Command3("implement-next").description("Find the
     );
     process.exit(1);
   }
+}
+async function resolveIssue(issues, options, limit) {
+  const selectionOutput = options.json ? process.stderr : process.stdout;
+  if (issues.length === 0) {
+    process.stdout.write("No issues found matching the configured filter.\n");
+    process.exit(0);
+  }
+  if (issues.length > 1 && options.queryOnly) {
+    writeIssueList(selectionOutput, issues, limit);
+    process.exit(0);
+  }
   let issue;
+  if (issues.length === 1) {
+    issue = issues[0];
+    selectionOutput.write(`Issue:  #${issue.number}
+Title:  ${issue.title}
+`);
+  } else if (options.takeFirst) {
+    issue = issues[0];
+    selectionOutput.write(`Selecting issue #${issue.number}: ${issue.title}
+`);
+  } else {
+    issue = await promptSelection(issues, limit, selectionOutput);
+    selectionOutput.write(`
+Issue:  #${issue.number}
+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) => {
+  const config = readConfig();
+  validateConfig(config);
+  const limit = Number.parseInt(options.limit, 10);
+  if (Number.isNaN(limit) || limit <= 0) {
+    process.stderr.write(`Error: --limit must be a positive integer (got "${options.limit}").
+`);
+    process.exit(1);
+  }
+  let issues;
   try {
-    issue = listIssues(config.issueDiscoveryTechnique, config.issueDiscoveryValue);
+    issues = listIssues(config.issueDiscoveryTechnique, config.issueDiscoveryValue, limit);
   } catch (err) {
     process.stderr.write(`Error: ${err.message}
 `);
     process.exit(1);
   }
-  if (issue === null) {
-    process.stdout.write("No issues found matching the configured filter.\n");
-    process.exit(0);
-  }
+  const issue = await resolveIssue(issues, options, limit);
   if (options.json) {
     process.stdout.write(JSON.stringify({ number: issue.number, title: issue.title, body: issue.body, url: issue.url }, null, 2) + "\n");
   } else {
-    process.stdout.write(`Issue:  #${issue.number}
-Title:  ${issue.title}
-URL:    ${issue.url}
+    process.stdout.write(`URL:    ${issue.url}
 
 ${issue.body}
 `);
@@ -1022,16 +1867,209 @@ ${issue.body}
     process.exit(1);
   }
   if (options.claude !== false) {
-    invokeClaudeCode(issue, config.claudeSystemPrompt, options.yolo ?? false);
+    const systemPrompt = config.claudeSystemPrompt ?? DEFAULT_CLAUDE_SYSTEM_PROMPT;
+    const prompt = `Resolving issue #${issue.number}:
+
+${systemPrompt}
+
+${issue.body}`;
+    if (options.codex) {
+      await invokeCodexCode(prompt, { yolo: options.yolo, verbose: options.verbose });
+    } else {
+      const model = resolveModelOption(options);
+      await invokeClaudeCode(prompt, { yolo: options.yolo, verbose: options.verbose, model });
+    }
+  }
+});
+
+// src/commands/execute.ts
+import { readFileSync as readFileSync3 } from "fs";
+import { Command as Command4 } from "commander";
+function readStdin() {
+  return new Promise((resolve3, reject) => {
+    const chunks = [];
+    process.stdin.on("data", (chunk) => chunks.push(chunk));
+    process.stdin.on("end", () => resolve3(Buffer.concat(chunks).toString("utf8").trim()));
+    process.stdin.on("error", reject);
+  });
+}
+async function resolvePrompt(options) {
+  const hasCli = options.prompt !== void 0;
+  const hasFile = options.filePrompt !== void 0;
+  const hasStdin = !process.stdin.isTTY;
+  if (hasCli && (hasFile || hasStdin)) {
+    process.stderr.write("Error: --prompt is mutually exclusive with --file-prompt and stdin.\n");
+    process.exit(1);
+  }
+  if (hasCli) {
+    return options.prompt;
+  }
+  if (hasFile) {
+    const path = options.filePrompt;
+    try {
+      return readFileSync3(path, "utf8");
+    } catch {
+      process.stderr.write(`Error: Cannot read file: ${path}
+`);
+      process.exit(1);
+    }
+  }
+  if (hasStdin) {
+    const content = await readStdin();
+    if (content.length === 0) {
+      process.stderr.write("Error: No prompt provided. Use --prompt, --file-prompt, or pipe via stdin.\n");
+      process.exit(1);
+    }
+    return content;
+  }
+  process.stderr.write("Error: No prompt provided. Use --prompt, --file-prompt, or pipe via stdin.\n");
+  process.exit(1);
+}
+var executeCommand = new Command4("execute").description("Delegate work to an AI executor").requiredOption("--with <executor>", "Executor to use: claude or codex").option("--prompt <string>", "Prompt to send to the executor").option("--file-prompt <path>", "Path to a file whose content is used as the prompt").option("--silent", "Suppress step-by-step output; show only the final summary").option("--model <string>", "Model identifier to pass to the executor").action(async (options) => {
+  const executor = options.with.toLowerCase();
+  if (executor !== "claude" && executor !== "codex") {
+    process.stderr.write(`Error: --with must be 'claude' or 'codex', got '${options.with}'.
+`);
+    process.exit(1);
+  }
+  const prompt = await resolvePrompt(options);
+  if (executor === "codex") {
+    invokeCodexCode(prompt, { yolo: true, model: options.model });
+  } else {
+    await invokeClaudeCode(prompt, { yolo: true, verbose: !options.silent, model: options.model });
+  }
+});
+
+// src/commands/executePrompt.ts
+import { Command as Command5 } from "commander";
+var PUSH_INSTRUCTION = "Once all changes are complete, stage every modified file, create a single commit with a clear and descriptive commit message that summarises what was fixed, and push the branch to the remote.";
+function withPush(prompt, push) {
+  return push ? `${prompt}
+
+${PUSH_INSTRUCTION}` : prompt;
+}
+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)");
+}
+var executeSonarCmd = addAiOptions(
+  new Command5("sonar").description(
+    "Check the current branch for a SonarCloud analysis and invoke the AI with the Sonar prompt and analysis URL"
+  )
+).action(async (options) => {
+  let branch;
+  try {
+    branch = getCurrentBranch();
+  } catch (err) {
+    process.stderr.write(`Error: ${err.message}
+`);
+    process.exit(1);
+  }
+  let pr;
+  try {
+    pr = await getPrInfo2(branch);
+  } catch (err) {
+    process.stderr.write(`Error: ${err.message}
+`);
+    process.exit(1);
+  }
+  if (pr === null) {
+    process.stderr.write(`Error: No pull request found for branch: ${branch}
+`);
+    process.exit(1);
+  }
+  if (!pr.sonarcloudUrl) {
+    process.stderr.write(
+      `Error: No SonarCloud analysis found for PR #${pr.number}. Ensure a SonarCloud check is configured on this repository.
+`
+    );
+    process.exit(1);
+  }
+  const config = readConfig();
+  const sonarPromptText = config.prompts?.sonar ?? DEFAULT_SONAR_PROMPT;
+  const fullPrompt = withPush(
+    `${sonarPromptText}
+
+SonarCloud analysis URL: ${pr.sonarcloudUrl}
+
+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 });
+  }
+});
+function formatComments(comments) {
+  return comments.map((c) => {
+    const loc = c.line === null ? `${c.path}:(file)` : `${c.path}:${String(c.line)}`;
+    return `[${c.author}] on ${loc}
+${c.body}`;
+  }).join("\n\n");
+}
+var executeFixCommentsCmd = addAiOptions(
+  new Command5("fix-comments").description(
+    "Fetch open review comments on the current PR and invoke the AI with the Fix-Comments prompt"
+  )
+).action(async (options) => {
+  const result = resolveCurrentBranchComments();
+  if (!result.ok) {
+    if (result.kind === "error") {
+      process.stderr.write(`Error: ${result.message}
+`);
+      process.exit(1);
+    }
+    if (result.kind === "unsupported") {
+      process.stderr.write(
+        `Error: fix-comments is not supported for Azure DevOps. See docs/azdo-gap.md for details.
+`
+      );
+      process.exit(1);
+    }
+    process.stderr.write(`Error: No pull request found for branch: ${result.branch}
+`);
+    process.exit(1);
+  }
+  const { comments } = result;
+  if (comments.length === 0) {
+    process.stderr.write(`Error: No open review comments found on the pull request.
+`);
+    process.exit(1);
+  }
+  process.stdout.write(`Found ${String(comments.length)} open review comment${comments.length === 1 ? "" : "s"} on PR. Invoking AI\u2026
+`);
+  const config = readConfig();
+  const promptText = config.prompts?.fixComments ?? DEFAULT_FIX_COMMENTS_PROMPT;
+  const fullPrompt = withPush(
+    `${promptText}
+
+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 });
   }
 });
+var executePromptCommand = new Command5("execute-prompt").description("Execute a configured custom prompt using an AI assistant").addCommand(executeSonarCmd).addCommand(executeFixCommentsCmd);
 
 // src/index.ts
-var program = new Command4();
+var program = new Command6();
 program.name("automata").description("Automata CLI tool").version(version, "-v, --version");
 program.addCommand(configCommand);
 program.addCommand(gitCommand);
 program.addCommand(implementNextCommand);
+program.addCommand(executeCommand);
+program.addCommand(executePromptCommand);
 program.showHelpAfterError();
 program.parse();
 if (process.argv.length <= 2) {