@rotorsoft/gent 1.14.2 → 1.15.1

package/dist/index.js

@@ -2150,7 +2150,7 @@ import { homedir } from "os";
 // package.json
 var package_default = {
   name: "@rotorsoft/gent",
-  version: "1.14.2",
+  version: "1.15.1",
   description: "AI-powered GitHub workflow CLI - leverage AI (Claude, Gemini, or Codex) to create tickets, implement features, and manage PRs",
   keywords: [
     "cli",
@@ -2703,6 +2703,7 @@ function getAvailableActions(state) {
   if (state.isOnMain) {
     actions.push({ id: "create", label: "new", shortcut: "n" });
     actions.push({ id: "list", label: "list", shortcut: "l" });
+    actions.push({ id: "refresh", label: "refresh", shortcut: "f" });
     actions.push({ id: "switch-provider", label: "ai", shortcut: "a" });
     actions.push({ id: "quit", label: "quit", shortcut: "q" });
     return actions;
@@ -2719,10 +2720,8 @@ function getAvailableActions(state) {
   if (state.issue && state.pr?.state !== "merged") {
     actions.push({ id: "run", label: "run", shortcut: "u" });
   }
-  if (state.pr && (state.pr.state === "merged" || state.pr.state === "closed")) {
-    actions.push({ id: "checkout-main", label: "main", shortcut: "m" });
-  }
   actions.push({ id: "list", label: "list", shortcut: "l" });
+  actions.push({ id: "refresh", label: "refresh", shortcut: "f" });
   actions.push({ id: "switch-provider", label: "ai", shortcut: "a" });
   actions.push({ id: "quit", label: "quit", shortcut: "q" });
   return actions;
@@ -2880,58 +2879,38 @@ function buildDashboardLines(state, actions, hint, refreshing) {
     out(botRow(w));
     return lines;
   }
-  if (state.isOnMain) {
-    out(
-      row(
-        chalk3.magenta(state.branch) + chalk3.dim("  \xB7  ready to start new work"),
-        w
-      )
-    );
-    if (state.hasUncommittedChanges) {
-      out(row(chalk3.yellow("\u25CF uncommitted changes"), w));
-    }
-    if (hint) {
-      out(midRow("Hint", w));
-      out(row(chalk3.yellow(hint), w));
-    }
-    out(divRow(w));
-    if (refreshing) {
-      out(row(chalk3.yellow("Refreshing\u2026"), w));
-    } else {
-      for (const line of formatCommandBar(actions, w)) {
-        out(row(line, w));
-      }
-    }
-    out(botRow(w));
-    out("");
-    return lines;
-  }
   const section = (title) => {
     out(midRow(title, w));
   };
-  section("Ticket");
-  if (state.issue) {
-    out(
-      row(
-        chalk3.cyan(`#${state.issue.number}`) + "  " + chalk3.bold(truncate(state.issue.title, descMax - 6)),
-        w
-      )
-    );
-    const desc = extractDescription(state.issue.body, descMax);
-    if (desc) out(row(chalk3.dim(desc), w));
-    const tags = [];
-    if (state.workflowStatus !== "none")
-      tags.push(workflowBadge(state.workflowStatus));
-    for (const prefix of ["type:", "priority:", "risk:", "area:"]) {
-      const l = state.issue.labels.find((x) => x.startsWith(prefix));
-      if (l) tags.push(chalk3.dim(l));
-    }
-    if (tags.length) out(row(tags.join("  "), w));
-  } else {
-    out(row(chalk3.dim("No linked issue"), w));
+  if (state.issue || !state.isOnMain) {
+    section("Ticket");
+    if (state.issue) {
+      out(
+        row(
+          chalk3.cyan(`#${state.issue.number}`) + "  " + chalk3.bold(truncate(state.issue.title, descMax - 6)),
+          w
+        )
+      );
+      const desc = extractDescription(state.issue.body, descMax);
+      if (desc) out(row(chalk3.dim(desc), w));
+      const tags = [];
+      if (state.workflowStatus !== "none")
+        tags.push(workflowBadge(state.workflowStatus));
+      for (const prefix of ["type:", "priority:", "risk:", "area:"]) {
+        const l = state.issue.labels.find((x) => x.startsWith(prefix));
+        if (l) tags.push(chalk3.dim(l));
+      }
+      if (tags.length) out(row(tags.join("  "), w));
+    } else {
+      out(row(chalk3.dim("No linked issue"), w));
+    }
   }
   section("Branch");
-  out(row(chalk3.magenta(state.branch), w));
+  let branchLine = chalk3.magenta(state.branch);
+  if (state.isOnMain && !state.hasUncommittedChanges) {
+    branchLine += chalk3.dim("  \xB7  ready to start new work");
+  }
+  out(row(branchLine, w));
   const bits = [];
   if (state.commits.length > 0)
     bits.push(chalk3.dim(`${state.commits.length} ahead`));
@@ -2941,48 +2920,52 @@ function buildDashboardLines(state, actions, hint, refreshing) {
     bits.push(chalk3.green("\u25CF synced"));
   }
   if (bits.length) out(row(bits.join(chalk3.dim("  \xB7  ")), w));
-  section("Pull Request");
-  if (state.pr) {
-    const titleText = state.pr.title ? "  " + truncate(state.pr.title, descMax - 12) : "";
-    out(row(chalk3.cyan(`#${state.pr.number}`) + titleText, w));
-    out(
-      row(
-        prBadge(state.pr.state, state.pr.isDraft) + reviewBadge(state.pr.reviewDecision),
-        w
-      )
-    );
-    if (state.hasActionableFeedback) {
-      const n = state.reviewFeedback.length;
+  if (state.pr || !state.isOnMain) {
+    section("Pull Request");
+    if (state.pr) {
+      const titleText = state.pr.title ? "  " + truncate(state.pr.title, descMax - 12) : "";
+      out(row(chalk3.cyan(`#${state.pr.number}`) + titleText, w));
       out(
         row(
-          chalk3.yellow(`${n} actionable comment${n !== 1 ? "s" : ""} pending`),
-          w
-        )
-      );
-    }
-    if (state.hasUIChanges && state.isPlaywrightAvailable && state.config.video.enabled && state.pr.state === "open") {
-      out(
-        row(
-          chalk3.cyan("UI changes detected") + chalk3.dim(" \xB7 video capture available"),
+          prBadge(state.pr.state, state.pr.isDraft) + reviewBadge(state.pr.reviewDecision),
           w
         )
       );
+      if (state.hasActionableFeedback) {
+        const n = state.reviewFeedback.length;
+        out(
+          row(
+            chalk3.yellow(`${n} actionable comment${n !== 1 ? "s" : ""} pending`),
+            w
+          )
+        );
+      }
+      if (state.hasUIChanges && state.isPlaywrightAvailable && state.config.video.enabled && state.pr.state === "open") {
+        out(
+          row(
+            chalk3.cyan("UI changes detected") + chalk3.dim(" \xB7 video capture available"),
+            w
+          )
+        );
+      }
+      out(row(chalk3.dim(state.pr.url), w));
+    } else {
+      out(row(chalk3.dim("No PR created"), w));
     }
-    out(row(chalk3.dim(state.pr.url), w));
-  } else {
-    out(row(chalk3.dim("No PR created"), w));
   }
-  section("Commits");
-  if (state.commits.length > 0) {
-    const max = 6;
-    for (const c of state.commits.slice(0, max)) {
-      out(row(c.substring(0, w - 5), w));
-    }
-    if (state.commits.length > max) {
-      out(row(chalk3.dim(`\u2026 and ${state.commits.length - max} more`), w));
+  if (state.commits.length > 0 || !state.isOnMain) {
+    section("Commits");
+    if (state.commits.length > 0) {
+      const max = 6;
+      for (const c of state.commits.slice(0, max)) {
+        out(row(c.substring(0, w - 5), w));
+      }
+      if (state.commits.length > max) {
+        out(row(chalk3.dim(`\u2026 and ${state.commits.length - max} more`), w));
+      }
+    } else {
+      out(row(chalk3.dim("No commits"), w));
     }
-  } else {
-    out(row(chalk3.dim("No commits"), w));
   }
   if (hint) {
     section("Hint");
@@ -3446,8 +3429,7 @@ async function executeAction(actionId, state, dashboardLines) {
     case "switch-provider":
       await handleSwitchProvider(state, dashboardLines);
       return SKIP_REFRESH;
-    case "checkout-main":
-      await handleCheckoutMain(dashboardLines);
+    case "refresh":
       return CONTINUE;
     default:
       return SKIP_REFRESH;
@@ -3625,21 +3607,12 @@ async function handleSwitchProvider(state, dashboardLines) {
   setRuntimeProvider(provider);
   state.config.ai.provider = provider;
 }
-async function handleCheckoutMain(dashboardLines) {
-  try {
-    showStatus("Switching", "Switching to main...", dashboardLines);
-    await execa4("git", ["checkout", "main"]);
-    await execa4("git", ["pull"]);
-  } catch (error) {
-    logger.error(`Checkout failed: ${error}`);
-  }
-}
 async function handleList(dashboardLines) {
   try {
     showStatus("Loading", "Fetching tickets...", dashboardLines);
     const config = loadConfig();
     const workflowLabels = getWorkflowLabels(config);
-    const [inProgress, ready, prs, localBranches] = await Promise.all([
+    const [inProgress, ready, prs, localBranches, dirty] = await Promise.all([
       listIssues({
         labels: [workflowLabels.inProgress],
         state: "open",
@@ -3651,7 +3624,8 @@ async function handleList(dashboardLines) {
         limit: 20
       }),
       listOpenPrs(30),
-      listLocalBranches()
+      listLocalBranches(),
+      hasUncommittedChanges()
     ]);
     sortByPriority(inProgress);
     sortByPriority(ready);
@@ -3659,8 +3633,16 @@ async function handleList(dashboardLines) {
     const currentBranch = await getCurrentBranch();
     const defaultBranch = await getDefaultBranch();
     const items = [];
-    const mainLabel = defaultBranch + (currentBranch === defaultBranch ? " (current)" : "");
-    items.push({ name: mainLabel, value: "__main__" });
+    const isMain = currentBranch === defaultBranch;
+    const mainLabel = defaultBranch + (isMain ? " (current)" : "");
+    if (dirty && !isMain) {
+      items.push({
+        name: `${mainLabel} (disabled - uncommitted changes)`,
+        value: "__main_disabled__"
+      });
+    } else {
+      items.push({ name: mainLabel, value: "__main__" });
+    }
     const inProgressChoices = choices.filter(
       (c) => c.category === "in-progress"
     );
@@ -3693,28 +3675,23 @@ async function handleList(dashboardLines) {
         });
       }
     }
-    if (choices.length === 0) {
-      showStatus("List", "No tickets found", dashboardLines);
-      await new Promise((r) => setTimeout(r, 1500));
-      return false;
-    }
     const selected = await showSelect({
       title: "Switch Ticket",
       items,
       dashboardLines
     });
     if (!selected) return false;
+    if (selected === "__main_disabled__") {
+      showStatus(
+        "Uncommitted Changes",
+        "Commit or stash changes before switching to main",
+        dashboardLines
+      );
+      await new Promise((r) => setTimeout(r, 2e3));
+      return false;
+    }
     if (selected === "__main__") {
       if (currentBranch === defaultBranch) return false;
-      const dirty2 = await hasUncommittedChanges();
-      if (dirty2) {
-        const ok = await showConfirm({
-          title: "Uncommitted Changes",
-          message: "You have uncommitted changes. Continue?",
-          dashboardLines
-        });
-        if (!ok) return false;
-      }
       showStatus("Switching", `Switching to ${defaultBranch}...`, dashboardLines);
       await checkoutBranch(defaultBranch);
       return true;
@@ -3722,7 +3699,6 @@ async function handleList(dashboardLines) {
     const issueNumber = parseInt(selected, 10);
     const ticket = choices.find((c) => c.issueNumber === issueNumber);
     if (!ticket) return false;
-    const dirty = await hasUncommittedChanges();
     if (dirty) {
       const ok = await showConfirm({
         title: "Uncommitted Changes",