automata-cli 0.1.0-feature-030-do-work.182 → 0.1.0-feature-030-do-work.184

package/dist/{ConfigWizard-HIO2ZAEZ.js → ConfigWizard-KXVUQJ76.js}

@@ -69,9 +69,7 @@ function ConfigWizard() {
     existing.doWork?.baseBranch ?? DEFAULT_DO_WORK.baseBranch
   );
   const initialExecutorIndex = EXECUTOR_OPTIONS.findIndex((o) => o.value === existing.doWork?.executor);
-  const [doWorkExecutorIndex, setDoWorkExecutorIndex] = useState(
-    initialExecutorIndex >= 0 ? initialExecutorIndex : 0
-  );
+  const [doWorkExecutorIndex, setDoWorkExecutorIndex] = useState(Math.max(initialExecutorIndex, 0));
   const [doWorkMaxRuns, setDoWorkMaxRuns] = useState(
     String(existing.doWork?.maxRunsPerTick ?? DEFAULT_DO_WORK.maxRunsPerTick)
   );
@@ -86,7 +84,118 @@ function ConfigWizard() {
     existing.issueDiscoveryTechnique ?? "label"
   );
   const { exit } = useApp();
+  const handleDoWorkInput = (input, key) => {
+    if (screen === "do-work-base-branch") {
+      if (key.return) {
+        setScreen("do-work-executor");
+      } else if (key.backspace || key.delete) {
+        setDoWorkBaseBranch((v) => v.slice(0, -1));
+      } else if (key.escape) {
+        setScreen("main");
+      } else if (key.ctrl && input === "c") {
+        exit();
+      } else if (input && !key.ctrl && !key.meta) {
+        setDoWorkBaseBranch((v) => v + input);
+      }
+      return true;
+    }
+    if (screen === "do-work-executor") {
+      if (key.upArrow) {
+        setDoWorkExecutorIndex((i) => i > 0 ? i - 1 : EXECUTOR_OPTIONS.length - 1);
+      } else if (key.downArrow) {
+        setDoWorkExecutorIndex((i) => i < EXECUTOR_OPTIONS.length - 1 ? i + 1 : 0);
+      } else if (key.return) {
+        setScreen("do-work-max-runs");
+      } else if (key.escape) {
+        setScreen("do-work-base-branch");
+      } else if (key.ctrl && input === "c") {
+        exit();
+      }
+      return true;
+    }
+    if (screen === "do-work-max-runs") {
+      if (key.return) {
+        const parsedMaxRuns = Number.parseInt(doWorkMaxRuns, 10);
+        const current = readRawConfig();
+        writeConfig({
+          ...current,
+          doWork: {
+            ...current.doWork,
+            baseBranch: doWorkBaseBranch.trim() || void 0,
+            executor: EXECUTOR_OPTIONS[doWorkExecutorIndex].value,
+            maxRunsPerTick: Number.isNaN(parsedMaxRuns) || parsedMaxRuns < 0 ? void 0 : parsedMaxRuns
+          }
+        });
+        exit();
+      } else if (key.backspace || key.delete) {
+        setDoWorkMaxRuns((v) => v.slice(0, -1));
+      } else if (key.escape) {
+        setScreen("do-work-executor");
+      } else if (key.ctrl && input === "c") {
+        exit();
+      } else if (input && !key.ctrl && !key.meta) {
+        setDoWorkMaxRuns((v) => v + input);
+      }
+      return true;
+    }
+    if (screen === "do-work-discuss-prompt") {
+      if (key.return) {
+        let discussValue;
+        if (doWorkDiscussPrompt) {
+          writePromptFile("do-work-issue-discuss.md", doWorkDiscussPrompt);
+          discussValue = "do-work-issue-discuss.md";
+        }
+        const current = readRawConfig();
+        writeConfig({
+          ...current,
+          doWork: {
+            ...current.doWork,
+            prompts: { ...current.doWork?.prompts, issueDiscuss: discussValue }
+          }
+        });
+        setScreen("prompts-menu");
+      } else if (key.backspace || key.delete) {
+        setDoWorkDiscussPrompt((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) {
+        setDoWorkDiscussPrompt((v) => v + input);
+      }
+      return true;
+    }
+    if (screen === "do-work-pr-prompt") {
+      if (key.return) {
+        let prValue;
+        if (doWorkPrPrompt) {
+          writePromptFile("do-work-pr-work.md", doWorkPrPrompt);
+          prValue = "do-work-pr-work.md";
+        }
+        const current = readRawConfig();
+        writeConfig({
+          ...current,
+          doWork: {
+            ...current.doWork,
+            prompts: { ...current.doWork?.prompts, prWork: prValue }
+          }
+        });
+        setScreen("prompts-menu");
+      } else if (key.backspace || key.delete) {
+        setDoWorkPrPrompt((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) {
+        setDoWorkPrPrompt((v) => v + input);
+      }
+      return true;
+    }
+    return false;
+  };
   useInput((input, key) => {
+    if (handleDoWorkInput(input, key)) return;
     if (screen === "main") {
       if (key.upArrow) {
         setMainMenuIndex((i) => i > 0 ? i - 1 : MAIN_MENU_OPTIONS.length - 1);
@@ -301,103 +410,6 @@ function ConfigWizard() {
       } else if (input && !key.ctrl && !key.meta) {
         setAgentUser((v) => v + input);
       }
-    } else if (screen === "do-work-base-branch") {
-      if (key.return) {
-        setScreen("do-work-executor");
-      } else if (key.backspace || key.delete) {
-        setDoWorkBaseBranch((v) => v.slice(0, -1));
-      } else if (key.escape) {
-        setScreen("main");
-      } else if (key.ctrl && input === "c") {
-        exit();
-      } else if (input && !key.ctrl && !key.meta) {
-        setDoWorkBaseBranch((v) => v + input);
-      }
-    } else if (screen === "do-work-executor") {
-      if (key.upArrow) {
-        setDoWorkExecutorIndex((i) => i > 0 ? i - 1 : EXECUTOR_OPTIONS.length - 1);
-      } else if (key.downArrow) {
-        setDoWorkExecutorIndex((i) => i < EXECUTOR_OPTIONS.length - 1 ? i + 1 : 0);
-      } else if (key.return) {
-        setScreen("do-work-max-runs");
-      } else if (key.escape) {
-        setScreen("do-work-base-branch");
-      } else if (key.ctrl && input === "c") {
-        exit();
-      }
-    } else if (screen === "do-work-max-runs") {
-      if (key.return) {
-        const parsedMaxRuns = Number.parseInt(doWorkMaxRuns, 10);
-        const current = readRawConfig();
-        writeConfig({
-          ...current,
-          doWork: {
-            ...current.doWork,
-            baseBranch: doWorkBaseBranch.trim() || void 0,
-            executor: EXECUTOR_OPTIONS[doWorkExecutorIndex].value,
-            maxRunsPerTick: Number.isNaN(parsedMaxRuns) || parsedMaxRuns < 0 ? void 0 : parsedMaxRuns
-          }
-        });
-        exit();
-      } else if (key.backspace || key.delete) {
-        setDoWorkMaxRuns((v) => v.slice(0, -1));
-      } else if (key.escape) {
-        setScreen("do-work-executor");
-      } else if (key.ctrl && input === "c") {
-        exit();
-      } else if (input && !key.ctrl && !key.meta) {
-        setDoWorkMaxRuns((v) => v + input);
-      }
-    } else if (screen === "do-work-discuss-prompt") {
-      if (key.return) {
-        let discussValue;
-        if (doWorkDiscussPrompt) {
-          writePromptFile("do-work-issue-discuss.md", doWorkDiscussPrompt);
-          discussValue = "do-work-issue-discuss.md";
-        }
-        const current = readRawConfig();
-        writeConfig({
-          ...current,
-          doWork: {
-            ...current.doWork,
-            prompts: { ...current.doWork?.prompts, issueDiscuss: discussValue }
-          }
-        });
-        setScreen("prompts-menu");
-      } else if (key.backspace || key.delete) {
-        setDoWorkDiscussPrompt((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) {
-        setDoWorkDiscussPrompt((v) => v + input);
-      }
-    } else if (screen === "do-work-pr-prompt") {
-      if (key.return) {
-        let prValue;
-        if (doWorkPrPrompt) {
-          writePromptFile("do-work-pr-work.md", doWorkPrPrompt);
-          prValue = "do-work-pr-work.md";
-        }
-        const current = readRawConfig();
-        writeConfig({
-          ...current,
-          doWork: {
-            ...current.doWork,
-            prompts: { ...current.doWork?.prompts, prWork: prValue }
-          }
-        });
-        setScreen("prompts-menu");
-      } else if (key.backspace || key.delete) {
-        setDoWorkPrPrompt((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) {
-        setDoWorkPrPrompt((v) => v + input);
-      }
     }
   });
   if (screen === "main") {

package/dist/index.js

@@ -175,7 +175,7 @@ var configCommand = new Command("config").description("Configure automata settin
   const [{ render }, React, { ConfigWizard }] = await Promise.all([
     import("ink"),
     import("react"),
-    import("./ConfigWizard-HIO2ZAEZ.js")
+    import("./ConfigWizard-KXVUQJ76.js")
   ]);
   const { waitUntilExit } = render(React.createElement(ConfigWizard));
   await waitUntilExit();
@@ -699,6 +699,22 @@ function checkoutAndPull(targetBranch) {
     throw new Error(`Failed to pull ${targetBranch}: ${pull.stderr.trim()}`);
   }
 }
+function gitCommand(args) {
+  const { stderr, status } = run2("git", args);
+  return { ok: status === 0, stderr: stderr.trim() };
+}
+function checkoutBranch(branch) {
+  return gitCommand(["checkout", branch]);
+}
+function createTrackingBranch(branch) {
+  return gitCommand(["checkout", "-b", branch, `origin/${branch}`]);
+}
+function fetchBranch(branch) {
+  return gitCommand(["fetch", "origin", branch]);
+}
+function pullFastForwardOnly(branch) {
+  return gitCommand(branch === void 0 ? ["pull", "--ff-only"] : ["pull", "--ff-only", "origin", branch]);
+}
 function fetchPrune() {
   const result = run2("git", ["fetch", "--prune"]);
   if (result.status !== 0) {
@@ -1297,7 +1313,7 @@ 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);
+var gitCommand2 = 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";
@@ -1901,8 +1917,8 @@ function analyzeSurface(messages, p) {
 }
 function lastAuthorClass(messages, p) {
   if (messages.length === 0) return "none";
-  const newest = [...messages].sort(byCreatedAt)[messages.length - 1];
-  return classify(newest.author, p);
+  const newest = [...messages].sort(byCreatedAt).at(-1);
+  return newest === void 0 ? "none" : classify(newest.author, p);
 }
 function formatMessages(messages) {
   return messages.map((message) => {
@@ -2330,6 +2346,11 @@ query($owner:String!,$repo:String!,$prNumber:Int!){
     }
   }
 }`.trim();
+function normalizePrState(state) {
+  if (state === "MERGED") return "MERGED";
+  if (state === "CLOSED") return "CLOSED";
+  return "OPEN";
+}
 function getPrSurface(prNumber) {
   const raw = ghJson(
     [
@@ -2386,7 +2407,7 @@ function getPrSurface(prNumber) {
       })).sort(byCreatedAt2)
     })
   );
-  const state = raw.state === "MERGED" ? "MERGED" : raw.state === "CLOSED" ? "CLOSED" : "OPEN";
+  const state = normalizePrState(raw.state);
   return {
     pr: {
       number: raw.number,
@@ -2562,7 +2583,7 @@ function agentAnsweredAfter(messages, agentUser, marker) {
 function formatThreads(threads) {
   return threads.map((thread) => {
     const location = thread.line === null ? `${thread.path}:(file)` : `${thread.path}:${String(thread.line)}`;
-    const newest = thread.comments[thread.comments.length - 1];
+    const newest = thread.comments.at(-1);
     const author = newest?.author ?? "unknown";
     const body = newest?.body ?? "";
     return `[${author}] ${location}
@@ -2629,18 +2650,6 @@ function composePrompt(input) {
 }
 
 // src/git/workspaceService.ts
-import { spawnSync as spawnSync7 } from "child_process";
-function git(args) {
-  const result = spawnSync7("git", args, { encoding: "utf8" });
-  if (result.error) {
-    const err = result.error;
-    if (err.code === "ENOENT") {
-      throw new Error("`git` is not installed or not on PATH.");
-    }
-    throw new Error(err.message);
-  }
-  return { stdout: result.stdout ?? "", stderr: result.stderr ?? "", status: result.status ?? 1 };
-}
 function dirtyTree() {
   return {
     ok: false,
@@ -2650,33 +2659,33 @@ function dirtyTree() {
 }
 function prepareBaseBranch(baseBranch) {
   if (hasUncommittedChanges()) return dirtyTree();
-  const checkout = git(["checkout", baseBranch]);
-  if (checkout.status !== 0) {
-    return { ok: false, reason: "checkout-failed", detail: checkout.stderr.trim() };
+  const checkout = checkoutBranch(baseBranch);
+  if (!checkout.ok) {
+    return { ok: false, reason: "checkout-failed", detail: checkout.stderr };
   }
-  const pull = git(["pull", "--ff-only"]);
-  if (pull.status !== 0) {
-    return { ok: false, reason: "pull-failed", detail: pull.stderr.trim() };
+  const pull = pullFastForwardOnly();
+  if (!pull.ok) {
+    return { ok: false, reason: "pull-failed", detail: pull.stderr };
   }
   return { ok: true, branch: baseBranch };
 }
 function preparePrBranch(headRefName) {
   if (hasUncommittedChanges()) return dirtyTree();
-  const fetch2 = git(["fetch", "origin", headRefName]);
-  if (fetch2.status !== 0) {
-    return { ok: false, reason: "checkout-failed", detail: fetch2.stderr.trim() };
-  }
-  const checkout = git(["checkout", headRefName]);
-  if (checkout.status !== 0) {
-    const created = git(["checkout", "-b", headRefName, `origin/${headRefName}`]);
-    if (created.status !== 0) {
-      return { ok: false, reason: "checkout-failed", detail: created.stderr.trim() };
+  const fetched = fetchBranch(headRefName);
+  if (!fetched.ok) {
+    return { ok: false, reason: "checkout-failed", detail: fetched.stderr };
+  }
+  const checkout = checkoutBranch(headRefName);
+  if (!checkout.ok) {
+    const created = createTrackingBranch(headRefName);
+    if (!created.ok) {
+      return { ok: false, reason: "checkout-failed", detail: created.stderr };
     }
     return { ok: true, branch: headRefName };
   }
-  const pull = git(["pull", "--ff-only", "origin", headRefName]);
-  if (pull.status !== 0) {
-    return { ok: false, reason: "pull-failed", detail: pull.stderr.trim() };
+  const pull = pullFastForwardOnly(headRefName);
+  if (!pull.ok) {
+    return { ok: false, reason: "pull-failed", detail: pull.stderr };
   }
   return { ok: true, branch: headRefName };
 }
@@ -3140,7 +3149,7 @@ function toPlanJson(decision) {
 var program = new Command7();
 program.name("automata").description("Automata CLI tool").version(version, "-v, --version");
 program.addCommand(configCommand);
-program.addCommand(gitCommand);
+program.addCommand(gitCommand2);
 program.addCommand(implementNextCommand);
 program.addCommand(executeCommand);
 program.addCommand(executePromptCommand);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "automata-cli",
-  "version": "0.1.0-feature-030-do-work.182",
+  "version": "0.1.0-feature-030-do-work.184",
   "description": "Automata CLI tool",
   "type": "module",
   "bin": {