@rotorsoft/gent 1.15.1 → 1.15.3

package/dist/index.js

@@ -212,6 +212,17 @@ import chalk from "chalk";
 // src/lib/ai-provider.ts
 import { spawn } from "child_process";
 import { execa } from "execa";
+async function getOtherAvailableProviders(currentProvider) {
+  const allProviders = ["claude", "gemini", "codex"];
+  const others = allProviders.filter((p) => p !== currentProvider);
+  const available = [];
+  for (const p of others) {
+    if (await checkAIProvider(p)) {
+      available.push(p);
+    }
+  }
+  return available;
+}
 async function invokeInternal(provider, options) {
   switch (provider) {
     case "claude":
@@ -620,11 +631,10 @@ async function createCommand(description, options) {
   logger.bold("Creating AI-enhanced ticket...");
   logger.newline();
   const config = loadConfig();
-  const provider = resolveProvider(options, config);
-  const providerName = getProviderDisplayName(provider);
+  let currentProvider = resolveProvider(options, config);
   const [ghAuth, aiOk] = await Promise.all([
     checkGhAuth(),
-    checkAIProvider(provider)
+    checkAIProvider(currentProvider)
   ]);
   if (!ghAuth) {
     logger.error("Not authenticated with GitHub. Run 'gh auth login' first.");
@@ -632,7 +642,7 @@ async function createCommand(description, options) {
   }
   if (!aiOk) {
     logger.error(
-      `${providerName} CLI not found. Please install ${provider} CLI first.`
+      `${getProviderDisplayName(currentProvider)} CLI not found. Please install ${currentProvider} CLI first.`
     );
     return;
   }
@@ -640,6 +650,7 @@ async function createCommand(description, options) {
   let aiOutput;
   let additionalHints = null;
   while (true) {
+    const providerName = getProviderDisplayName(currentProvider);
     const prompt = buildTicketPrompt(
       description,
       agentInstructions,
@@ -655,7 +666,7 @@ async function createCommand(description, options) {
       const result = await invokeAI(
         { prompt, streamOutput: true },
         config,
-        options.provider
+        currentProvider
       );
       aiOutput = result.output;
       logger.newline();
@@ -666,6 +677,33 @@ async function createCommand(description, options) {
       );
       logger.newline();
     } catch (error) {
+      if (error && typeof error === "object" && "rateLimited" in error) {
+        logger.warning(`${providerName} is rate limited.`);
+        const others = await getOtherAvailableProviders(currentProvider);
+        if (others.length > 0) {
+          const { nextProvider } = await inquirer2.prompt([
+            {
+              type: "list",
+              name: "nextProvider",
+              message: "Would you like to try another provider?",
+              choices: [
+                ...others.map((p) => ({
+                  name: `Switch to ${getProviderDisplayName(p)}`,
+                  value: p
+                })),
+                { name: "Cancel", value: "cancel" }
+              ]
+            }
+          ]);
+          if (nextProvider !== "cancel") {
+            currentProvider = nextProvider;
+            logger.info(
+              `Switching to ${getProviderDisplayName(currentProvider)}...`
+            );
+            continue;
+          }
+        }
+      }
       logger.error(`${providerName} invocation failed: ${error}`);
       return;
     }
@@ -1600,15 +1638,15 @@ async function getChangedFiles(baseBranch = "main") {
 }
 
 // src/commands/pr.ts
+import inquirer5 from "inquirer";
 async function prCommand(options) {
   logger.bold("Creating AI-enhanced pull request...");
   logger.newline();
   const config = loadConfig();
-  const provider = options.provider ?? config.ai.provider;
-  const providerName = getProviderDisplayName(provider);
+  let currentProvider = options.provider ?? config.ai.provider;
   const [ghAuth, aiOk] = await Promise.all([
     checkGhAuth(),
-    checkAIProvider(provider)
+    checkAIProvider(currentProvider)
   ]);
   if (!ghAuth) {
     logger.error("Not authenticated with GitHub. Run 'gh auth login' first.");
@@ -1616,7 +1654,7 @@ async function prCommand(options) {
   }
   if (!aiOk) {
     logger.error(
-      `${providerName} CLI not found. Please install ${provider} CLI first.`
+      `${getProviderDisplayName(currentProvider)} CLI not found. Please install ${currentProvider} CLI first.`
     );
     return;
   }
@@ -1692,26 +1730,59 @@ IMPORTANT: This PR contains UI changes. Use the Playwright MCP plugin to:
   }
   const prompt = buildPrPrompt(issue, commits, diffSummary) + captureVideoInstructions;
   let prBody;
-  try {
-    logger.info(
-      `Generating PR description with ${colors.provider(providerName)}...`
-    );
-    logger.newline();
-    const result = await invokeAI(
-      { prompt, streamOutput: true },
-      config,
-      options.provider
-    );
-    prBody = result.output;
-    logger.newline();
-  } catch (error) {
-    logger.warning(`${providerName} invocation failed: ${error}`);
-    prBody = generateFallbackBody(issue, commits);
+  let usedProvider = currentProvider;
+  while (true) {
+    const providerName = getProviderDisplayName(usedProvider);
+    try {
+      logger.info(
+        `Generating PR description with ${colors.provider(providerName)}...`
+      );
+      logger.newline();
+      const result = await invokeAI(
+        { prompt, streamOutput: true },
+        config,
+        usedProvider
+      );
+      prBody = result.output;
+      logger.newline();
+      break;
+    } catch (error) {
+      if (error && typeof error === "object" && "rateLimited" in error) {
+        logger.warning(`${providerName} is rate limited.`);
+        const others = await getOtherAvailableProviders(usedProvider);
+        if (others.length > 0) {
+          const { nextProvider } = await inquirer5.prompt([
+            {
+              type: "list",
+              name: "nextProvider",
+              message: "Would you like to try another provider?",
+              choices: [
+                ...others.map((p) => ({
+                  name: `Switch to ${getProviderDisplayName(p)}`,
+                  value: p
+                })),
+                { name: "Fall back to basic description", value: "fallback" }
+              ]
+            }
+          ]);
+          if (nextProvider !== "fallback") {
+            usedProvider = nextProvider;
+            logger.info(
+              `Switching to ${getProviderDisplayName(usedProvider)}...`
+            );
+            continue;
+          }
+        }
+      }
+      logger.warning(`${providerName} invocation failed: ${error}`);
+      prBody = generateFallbackBody(issue, commits);
+      break;
+    }
   }
   prBody += `
 
 ---
-*Created with ${providerName} by [gent](https://github.com/Rotorsoft/gent)*`;
+*Created with ${getProviderDisplayName(usedProvider)} by [gent](https://github.com/Rotorsoft/gent)*`;
   const prTitle = issue?.title || commits[0] || currentBranch;
   let prUrl;
   try {
@@ -1793,7 +1864,7 @@ function generateFallbackBody(issue, commits) {
 }
 
 // src/commands/fix.ts
-import inquirer5 from "inquirer";
+import inquirer6 from "inquirer";
 
 // src/lib/review-feedback.ts
 var ACTIONABLE_KEYWORDS = [
@@ -1990,7 +2061,7 @@ async function fixCommand(options) {
   const hasChanges = await hasUncommittedChanges();
   if (hasChanges) {
     logger.warning("You have uncommitted changes.");
-    const { proceed } = await inquirer5.prompt([
+    const { proceed } = await inquirer6.prompt([
       {
         type: "confirm",
         name: "proceed",
@@ -2150,7 +2221,7 @@ import { homedir } from "os";
 // package.json
 var package_default = {
   name: "@rotorsoft/gent",
-  version: "1.15.1",
+  version: "1.15.3",
   description: "AI-powered GitHub workflow CLI - leverage AI (Claude, Gemini, or Codex) to create tickets, implement features, and manage PRs",
   keywords: [
     "cli",
@@ -2700,25 +2771,20 @@ function getAvailableActions(state) {
     actions.push({ id: "quit", label: "quit", shortcut: "q" });
     return actions;
   }
-  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;
-  }
-  if (state.hasUncommittedChanges) {
-    actions.push({ id: "commit", label: "commit", shortcut: "c" });
-  }
-  if (state.hasUnpushedCommits && state.commits.length > 0) {
-    actions.push({ id: "push", label: "push", shortcut: "p" });
-  }
-  if (!state.pr && state.commits.length > 0) {
-    actions.push({ id: "pr", label: "pr", shortcut: "r" });
-  }
-  if (state.issue && state.pr?.state !== "merged") {
-    actions.push({ id: "run", label: "run", shortcut: "u" });
+  actions.push({ id: "create", label: "new", shortcut: "n" });
+  if (!state.isOnMain) {
+    if (state.hasUncommittedChanges) {
+      actions.push({ id: "commit", label: "commit", shortcut: "c" });
+    }
+    if (state.hasUnpushedCommits && state.commits.length > 0) {
+      actions.push({ id: "push", label: "push", shortcut: "p" });
+    }
+    if (!state.pr && state.commits.length > 0) {
+      actions.push({ id: "pr", label: "pr", shortcut: "r" });
+    }
+    if (state.issue && state.pr?.state !== "merged") {
+      actions.push({ id: "run", label: "run", shortcut: "u" });
+    }
   }
   actions.push({ id: "list", label: "list", shortcut: "l" });
   actions.push({ id: "refresh", label: "refresh", shortcut: "f" });
@@ -2731,6 +2797,23 @@ function getAvailableActions(state) {
 import chalk3 from "chalk";
 var stripAnsi = (str) => str.replace(/\x1b\[[0-9;]*m/g, "");
 var visibleLen = (str) => stripAnsi(str).length;
+function truncateAnsi(text, max) {
+  if (visibleLen(text) <= max) return text;
+  let visible = 0;
+  let i = 0;
+  while (i < text.length && visible < max - 1) {
+    if (text[i] === "\x1B") {
+      const end = text.indexOf("m", i);
+      if (end !== -1) {
+        i = end + 1;
+        continue;
+      }
+    }
+    visible++;
+    i++;
+  }
+  return text.slice(0, i) + "\x1B[0m\u2026";
+}
 function termWidth() {
   return Math.min(process.stdout.columns || 80, 90);
 }
@@ -2770,8 +2853,9 @@ function botRow(w) {
 }
 function row(text, w) {
   const inner = w - 4;
-  const pad = Math.max(0, inner - visibleLen(text));
-  return chalk3.dim("\u2502") + " " + text + " ".repeat(pad) + " " + chalk3.dim("\u2502");
+  const fitted = truncateAnsi(text, inner);
+  const pad = Math.max(0, inner - visibleLen(fitted));
+  return chalk3.dim("\u2502") + " " + fitted + " ".repeat(pad) + " " + chalk3.dim("\u2502");
 }
 function workflowBadge(status) {
   switch (status) {
@@ -2887,12 +2971,12 @@ function buildDashboardLines(state, actions, hint, refreshing) {
     if (state.issue) {
       out(
         row(
-          chalk3.cyan(`#${state.issue.number}`) + "  " + chalk3.bold(truncate(state.issue.title, descMax - 6)),
+          chalk3.dim("\xB7 ") + chalk3.cyan(`#${state.issue.number}`) + " " + chalk3.bold(state.issue.title),
           w
         )
       );
       const desc = extractDescription(state.issue.body, descMax);
-      if (desc) out(row(chalk3.dim(desc), w));
+      if (desc) out(row("  " + chalk3.dim(desc), w));
       const tags = [];
       if (state.workflowStatus !== "none")
         tags.push(workflowBadge(state.workflowStatus));
@@ -2900,13 +2984,13 @@ function buildDashboardLines(state, actions, hint, refreshing) {
         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));
+      if (tags.length) out(row("  " + tags.join("  "), w));
     } else {
-      out(row(chalk3.dim("No linked issue"), w));
+      out(row(chalk3.dim("  No linked issue"), w));
     }
   }
   section("Branch");
-  let branchLine = chalk3.magenta(state.branch);
+  let branchLine = chalk3.dim("\xB7 ") + chalk3.magenta(state.branch);
   if (state.isOnMain && !state.hasUncommittedChanges) {
     branchLine += chalk3.dim("  \xB7  ready to start new work");
   }
@@ -2919,15 +3003,20 @@ function buildDashboardLines(state, actions, hint, refreshing) {
   if (!state.hasUncommittedChanges && !state.hasUnpushedCommits && state.commits.length > 0) {
     bits.push(chalk3.green("\u25CF synced"));
   }
-  if (bits.length) out(row(bits.join(chalk3.dim("  \xB7  ")), w));
+  if (bits.length) out(row("  " + bits.join(chalk3.dim("  \xB7  ")), w));
   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));
+      const titleText = state.pr.title ? " " + state.pr.title : "";
+      out(
+        row(
+          chalk3.dim("\xB7 ") + chalk3.cyan(`#${state.pr.number}`) + titleText,
+          w
+        )
+      );
       out(
         row(
-          prBadge(state.pr.state, state.pr.isDraft) + reviewBadge(state.pr.reviewDecision),
+          "  " + prBadge(state.pr.state, state.pr.isDraft) + reviewBadge(state.pr.reviewDecision),
           w
         )
       );
@@ -2935,7 +3024,7 @@ function buildDashboardLines(state, actions, hint, refreshing) {
         const n = state.reviewFeedback.length;
         out(
           row(
-            chalk3.yellow(`${n} actionable comment${n !== 1 ? "s" : ""} pending`),
+            "  " + chalk3.yellow(`${n} actionable comment${n !== 1 ? "s" : ""} pending`),
             w
           )
         );
@@ -2943,14 +3032,14 @@ function buildDashboardLines(state, actions, hint, refreshing) {
       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"),
+            "  " + chalk3.cyan("UI changes detected") + chalk3.dim(" \xB7 video capture available"),
             w
           )
         );
       }
-      out(row(chalk3.dim(state.pr.url), w));
+      out(row("  " + chalk3.dim(state.pr.url), w));
     } else {
-      out(row(chalk3.dim("No PR created"), w));
+      out(row(chalk3.dim("  No PR created"), w));
     }
   }
   if (state.commits.length > 0 || !state.isOnMain) {
@@ -2958,13 +3047,13 @@ function buildDashboardLines(state, actions, hint, refreshing) {
     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));
+        out(row(chalk3.dim("\xB7 ") + c, w));
       }
       if (state.commits.length > max) {
-        out(row(chalk3.dim(`\u2026 and ${state.commits.length - max} more`), w));
+        out(row(chalk3.dim(`  \u2026 and ${state.commits.length - max} more`), w));
       }
     } else {
-      out(row(chalk3.dim("No commits"), w));
+      out(row(chalk3.dim("  No commits"), w));
     }
   }
   if (hint) {
@@ -3005,23 +3094,6 @@ function modalDivRow(w) {
 function modalBotRow(w) {
   return chalk4.bold("\u2514" + "\u2500".repeat(w - 2) + "\u2518");
 }
-function truncateAnsi(text, max) {
-  if (visibleLen(text) <= max) return text;
-  let visible = 0;
-  let i = 0;
-  while (i < text.length && visible < max - 1) {
-    if (text[i] === "\x1B") {
-      const end = text.indexOf("m", i);
-      if (end !== -1) {
-        i = end + 1;
-        continue;
-      }
-    }
-    visible++;
-    i++;
-  }
-  return text.slice(0, i) + "\x1B[0m\u2026";
-}
 function modalRow(text, w) {
   const inner = w - 4;
   const fitted = truncateAnsi(text, inner);
@@ -3056,9 +3128,10 @@ function buildSelectContent(items, selectedIndex, maxWidth) {
     } else {
       const isSelected = selectableIdx === selectedIndex;
       const prefix = isSelected ? chalk4.cyan.bold("> ") : "  ";
-      const label = item.name.length > maxWidth - 2 ? item.name.slice(0, maxWidth - 3) + "\u2026" : item.name;
+      const bullet = chalk4.dim("\xB7 ");
+      const label = truncateAnsi(item.name, maxWidth - 4);
       lines.push(
-        prefix + (isSelected ? chalk4.bold(label) : label)
+        prefix + bullet + (isSelected ? chalk4.bold(label) : label)
       );
       selectableIdx++;
     }