@rotorsoft/gent 1.13.1 → 1.13.3

package/dist/index.js

@@ -30,12 +30,14 @@ import {
   loadConfig,
   logger,
   replyToReviewComment,
+  resolveProvider,
   sanitizeSlug,
+  setRuntimeProvider,
   setupLabelsCommand,
   sortByPriority,
   updateIssueLabels,
   withSpinner
-} from "./chunk-KLHUMY5L.js";
+} from "./chunk-SKWCS6Z2.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -182,11 +184,14 @@ async function initCommand(options) {
   initializeProgress(config, cwd);
   logger.success(`Created ${colors.file(config.progress.file)}`);
   logger.newline();
-  logger.box("Setup Complete", `Next steps:
+  logger.box(
+    "Setup Complete",
+    `Next steps:
 1. Edit ${colors.file("AGENT.md")} with your project-specific instructions
 2. Edit ${colors.file(".gent.yml")} to customize settings
 3. Run ${colors.command("gent setup-labels")} to create GitHub labels
-4. Run ${colors.command("gent create <description>")} to create your first ticket`);
+4. Run ${colors.command("gent create <description>")} to create your first ticket`
+  );
   const { setupLabels } = await inquirer.prompt([
     {
       type: "confirm",
@@ -196,7 +201,7 @@ async function initCommand(options) {
     }
   ]);
   if (setupLabels) {
-    const { setupLabelsCommand: setupLabelsCommand2 } = await import("./setup-labels-3ANC76NF.js");
+    const { setupLabelsCommand: setupLabelsCommand2 } = await import("./setup-labels-C6YHJ637.js");
     await setupLabelsCommand2();
   }
 }
@@ -227,7 +232,9 @@ async function invokeAI(options, config, providerOverride) {
     if (isRateLimitError(error, provider)) {
       if (config.ai.auto_fallback && config.ai.fallback_provider && !providerOverride) {
         const fallback = config.ai.fallback_provider;
-        logger.warning(`Rate limit reached on ${getProviderDisplayName(provider)}, switching to ${getProviderDisplayName(fallback)}...`);
+        logger.warning(
+          `Rate limit reached on ${getProviderDisplayName(provider)}, switching to ${getProviderDisplayName(fallback)}...`
+        );
         const output = await invokeInternal(fallback, options);
         return { output, provider: fallback };
       }
@@ -654,7 +661,7 @@ async function createCommand(description, options) {
   logger.bold("Creating AI-enhanced ticket...");
   logger.newline();
   const config = loadConfig();
-  const provider = options.provider ?? config.ai.provider;
+  const provider = resolveProvider(options, config);
   const providerName = getProviderDisplayName(provider);
   const [ghAuth, aiOk] = await Promise.all([
     checkGhAuth(),
@@ -665,21 +672,39 @@ async function createCommand(description, options) {
     return;
   }
   if (!aiOk) {
-    logger.error(`${providerName} CLI not found. Please install ${provider} CLI first.`);
+    logger.error(
+      `${providerName} CLI not found. Please install ${provider} CLI first.`
+    );
     return;
   }
   const agentInstructions = loadAgentInstructions();
   let aiOutput;
   let additionalHints = null;
   while (true) {
-    const prompt = buildTicketPrompt(description, agentInstructions, additionalHints);
+    const prompt = buildTicketPrompt(
+      description,
+      agentInstructions,
+      additionalHints
+    );
     try {
-      console.log(chalk.dim(`\u250C\u2500 Generating ticket with ${providerName}... \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510`));
+      console.log(
+        chalk.dim(
+          `\u250C\u2500 Generating ticket with ${providerName}... \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510`
+        )
+      );
       logger.newline();
-      const result = await invokeAI({ prompt, streamOutput: true }, config, options.provider);
+      const result = await invokeAI(
+        { prompt, streamOutput: true },
+        config,
+        options.provider
+      );
       aiOutput = result.output;
       logger.newline();
-      console.log(chalk.dim("\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518"));
+      console.log(
+        chalk.dim(
+          "\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518"
+        )
+      );
       logger.newline();
     } catch (error) {
       logger.error(`${providerName} invocation failed: ${error}`);
@@ -687,7 +712,9 @@ async function createCommand(description, options) {
     }
     const meta = parseTicketMeta(aiOutput);
     if (!meta) {
-      logger.warning("Could not parse metadata from AI output. Using defaults.");
+      logger.warning(
+        "Could not parse metadata from AI output. Using defaults."
+      );
     }
     const finalMeta = meta || {
       type: "feature",
@@ -860,11 +887,7 @@ async function hasUncommittedChanges() {
 }
 async function getUnpushedCommits() {
   try {
-    const { stdout } = await execa2("git", [
-      "log",
-      "@{u}..HEAD",
-      "--oneline"
-    ]);
+    const { stdout } = await execa2("git", ["log", "@{u}..HEAD", "--oneline"]);
     return stdout.trim().length > 0;
   } catch {
     return true;
@@ -907,11 +930,7 @@ async function getCommitsSinceBase(base = "main") {
 }
 async function getDiffSummary(base = "main") {
   try {
-    const { stdout } = await execa2("git", [
-      "diff",
-      `${base}...HEAD`,
-      "--stat"
-    ]);
+    const { stdout } = await execa2("git", ["diff", `${base}...HEAD`, "--stat"]);
     return stdout.trim();
   } catch {
     return "";
@@ -930,7 +949,10 @@ async function getLastCommitTimestamp() {
   return stdout.trim();
 }
 async function listLocalBranches() {
-  const { stdout } = await execa2("git", ["branch", "--format=%(refname:short)"]);
+  const { stdout } = await execa2("git", [
+    "branch",
+    "--format=%(refname:short)"
+  ]);
   return stdout.trim().split("\n").filter(Boolean);
 }
 async function remoteBranchExists(name) {
@@ -1145,12 +1167,7 @@ async function listCommand(options) {
       logger.info("No issues found matching the criteria.");
       return;
     }
-    await presentSelector(
-      choices2,
-      currentBranch,
-      defaultBranch,
-      config
-    );
+    await presentSelector(choices2, currentBranch, defaultBranch, config);
     return;
   }
   const labelFilter = options.label ? [options.label] : [];
@@ -1260,15 +1277,10 @@ async function presentSelector(choices, currentBranch, defaultBranch, config) {
       });
       logger.success(`Switched to ${colors.branch(targetBranch)}`);
     } else if (await remoteBranchExists(targetBranch)) {
-      await withSpinner(
-        `Fetching ${targetBranch} from remote...`,
-        async () => {
-          await fetchAndCheckout(targetBranch);
-        }
-      );
-      logger.success(
-        `Fetched and switched to ${colors.branch(targetBranch)}`
-      );
+      await withSpinner(`Fetching ${targetBranch} from remote...`, async () => {
+        await fetchAndCheckout(targetBranch);
+      });
+      logger.success(`Fetched and switched to ${colors.branch(targetBranch)}`);
     } else {
       logger.warning(
         `Branch ${colors.branch(targetBranch)} not found locally or on remote.`
@@ -1334,7 +1346,9 @@ async function runCommand(issueNumberArg, options) {
     return;
   }
   if (!aiOk) {
-    logger.error(`${providerName} CLI not found. Please install ${provider} CLI first.`);
+    logger.error(
+      `${providerName} CLI not found. Please install ${provider} CLI first.`
+    );
     return;
   }
   const hasChanges = await hasUncommittedChanges();
@@ -1362,7 +1376,9 @@ async function runCommand(issueNumberArg, options) {
     }
     issueNumber = parseInt(issueNumberArg, 10);
   } else {
-    logger.error("Please provide an issue number. Use 'gent switch' to browse tickets.");
+    logger.error(
+      "Please provide an issue number. Use 'gent switch' to browse tickets."
+    );
     return;
   }
   let issue;
@@ -1375,7 +1391,9 @@ async function runCommand(issueNumberArg, options) {
     return;
   }
   if (!issue.labels.includes(workflowLabels.ready)) {
-    logger.warning(`Issue #${issueNumber} does not have the '${workflowLabels.ready}' label.`);
+    logger.warning(
+      `Issue #${issueNumber} does not have the '${workflowLabels.ready}' label.`
+    );
     const { proceed } = await inquirer4.prompt([
       {
         type: "confirm",
@@ -1389,11 +1407,19 @@ async function runCommand(issueNumberArg, options) {
     }
   }
   logger.newline();
-  logger.box("Issue Details", `#${issue.number}: ${issue.title}
-Labels: ${issue.labels.join(", ")}`);
+  logger.box(
+    "Issue Details",
+    `#${issue.number}: ${issue.title}
+Labels: ${issue.labels.join(", ")}`
+  );
   logger.newline();
   const type = extractTypeFromLabels(issue.labels);
-  const branchName = await generateBranchName(config, issueNumber, issue.title, type);
+  const branchName = await generateBranchName(
+    config,
+    issueNumber,
+    issue.title,
+    type
+  );
   const currentBranch = await getCurrentBranch();
   const onMain = await isOnMainBranch();
   if (await branchExists(branchName)) {
@@ -1419,7 +1445,9 @@ Labels: ${issue.labels.join(", ")}`);
     }
   } else {
     if (!onMain) {
-      logger.warning(`Not on main branch (currently on ${colors.branch(currentBranch)}).`);
+      logger.warning(
+        `Not on main branch (currently on ${colors.branch(currentBranch)}).`
+      );
       const { fromMain } = await inquirer4.prompt([
         {
           type: "confirm",
@@ -1443,15 +1471,24 @@ Labels: ${issue.labels.join(", ")}`);
       add: [workflowLabels.inProgress],
       remove: [workflowLabels.ready]
     });
-    logger.success(`Updated issue labels: ${colors.label(workflowLabels.ready)} \u2192 ${colors.label(workflowLabels.inProgress)}`);
+    logger.success(
+      `Updated issue labels: ${colors.label(workflowLabels.ready)} \u2192 ${colors.label(workflowLabels.inProgress)}`
+    );
   } catch (error) {
     logger.warning(`Failed to update labels: ${error}`);
   }
   const agentInstructions = loadAgentInstructions();
   const progressContent = readProgress(config);
-  const prompt = buildImplementationPrompt(issue, agentInstructions, progressContent, config);
+  const prompt = buildImplementationPrompt(
+    issue,
+    agentInstructions,
+    progressContent,
+    config
+  );
   logger.newline();
-  logger.info(`Starting ${colors.provider(providerName)} implementation session...`);
+  logger.info(
+    `Starting ${colors.provider(providerName)} implementation session...`
+  );
   logger.dim(`${providerName} will implement the feature and create a commit.`);
   logger.dim("Review the changes before pushing.");
   logger.newline();
@@ -1465,14 +1502,20 @@ Labels: ${issue.labels.join(", ")}`);
   let aiExitCode;
   let usedProvider = provider;
   try {
-    const { result, provider: actualProvider } = await invokeAIInteractive(prompt, config, options.provider);
+    const { result, provider: actualProvider } = await invokeAIInteractive(
+      prompt,
+      config,
+      options.provider
+    );
     usedProvider = actualProvider;
     aiExitCode = result.exitCode ?? void 0;
   } catch (error) {
     if (error && typeof error === "object" && "exitCode" in error) {
       aiExitCode = error.exitCode;
     }
-    logger.error(`${getProviderDisplayName(usedProvider)} session failed: ${error}`);
+    logger.error(
+      `${getProviderDisplayName(usedProvider)} session failed: ${error}`
+    );
   } finally {
     process.off("SIGINT", handleSignal);
     process.off("SIGTERM", handleSignal);
@@ -1491,7 +1534,9 @@ Labels: ${issue.labels.join(", ")}`);
         add: [workflowLabels.completed],
         remove: [workflowLabels.inProgress]
       });
-      logger.success(`Updated labels: ${colors.label(workflowLabels.inProgress)} \u2192 ${colors.label(workflowLabels.completed)}`);
+      logger.success(
+        `Updated labels: ${colors.label(workflowLabels.inProgress)} \u2192 ${colors.label(workflowLabels.completed)}`
+      );
     } catch (error) {
       logger.warning(`Failed to update labels: ${error}`);
     }
@@ -1509,13 +1554,17 @@ Please review the changes and create a PR when ready.`
   } else {
     const isRateLimited = aiExitCode === 2;
     if (isRateLimited) {
-      logger.warning(`${usedProviderName} session ended due to rate limits. No commits were created.`);
+      logger.warning(
+        `${usedProviderName} session ended due to rate limits. No commits were created.`
+      );
       try {
         await updateIssueLabels(issueNumber, {
           add: [workflowLabels.blocked],
           remove: [workflowLabels.inProgress]
         });
-        logger.info(`Updated labels: ${colors.label(workflowLabels.inProgress)} \u2192 ${colors.label(workflowLabels.blocked)}`);
+        logger.info(
+          `Updated labels: ${colors.label(workflowLabels.inProgress)} \u2192 ${colors.label(workflowLabels.blocked)}`
+        );
       } catch (error) {
         logger.warning(`Failed to update labels: ${error}`);
       }
@@ -1531,15 +1580,20 @@ No commits were created. Please retry later.`
         logger.warning(`Failed to post comment: ${error}`);
       }
     } else {
-      logger.warning(`${usedProviderName} session completed but no commits were created. Labels unchanged.`);
+      logger.warning(
+        `${usedProviderName} session completed but no commits were created. Labels unchanged.`
+      );
     }
     return;
   }
   logger.newline();
-  logger.box("Next Steps", `1. Review changes: ${colors.command("git diff HEAD~1")}
+  logger.box(
+    "Next Steps",
+    `1. Review changes: ${colors.command("git diff HEAD~1")}
 2. Run tests: ${colors.command("npm test")}
 3. Push branch: ${colors.command("git push -u origin " + branchName)}
-4. Create PR: ${colors.command("gent pr")}`);
+4. Create PR: ${colors.command("gent pr")}`
+  );
 }
 
 // src/commands/pr.ts
@@ -1605,7 +1659,9 @@ async function prCommand(options) {
     process.exit(1);
   }
   if (!aiOk) {
-    logger.error(`${providerName} CLI not found. Please install ${provider} CLI first.`);
+    logger.error(
+      `${providerName} CLI not found. Please install ${provider} CLI first.`
+    );
     process.exit(1);
   }
   if (await isOnMainBranch()) {
@@ -1614,7 +1670,9 @@ async function prCommand(options) {
   }
   const existingPr = await getPrForBranch();
   if (existingPr) {
-    logger.warning(`A PR already exists for this branch: ${colors.url(existingPr.url)}`);
+    logger.warning(
+      `A PR already exists for this branch: ${colors.url(existingPr.url)}`
+    );
     return;
   }
   const currentBranch = await getCurrentBranch();
@@ -1644,7 +1702,9 @@ async function prCommand(options) {
   if (issueNumber) {
     try {
       issue = await getIssue(issueNumber);
-      logger.info(`Linked issue: ${colors.issue(`#${issueNumber}`)} - ${issue.title}`);
+      logger.info(
+        `Linked issue: ${colors.issue(`#${issueNumber}`)} - ${issue.title}`
+      );
     } catch {
       logger.warning(`Could not fetch issue #${issueNumber}`);
     }
@@ -1671,7 +1731,9 @@ async function prCommand(options) {
         logger.warning("Playwright not available. Skipping video capture.");
         logger.dim("Install Playwright with: npm install -D playwright");
       } else {
-        logger.info("Playwright available - AI will capture demo video via MCP");
+        logger.info(
+          "Playwright available - AI will capture demo video via MCP"
+        );
         captureVideoInstructions = `
 
 IMPORTANT: This PR contains UI changes. Use the Playwright MCP plugin to:
@@ -1686,9 +1748,15 @@ 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.info(
+      `Generating PR description with ${colors.provider(providerName)}...`
+    );
     logger.newline();
-    const result = await invokeAI({ prompt, streamOutput: true }, config, options.provider);
+    const result = await invokeAI(
+      { prompt, streamOutput: true },
+      config,
+      options.provider
+    );
     prBody = result.output;
     logger.newline();
   } catch (error) {
@@ -1727,7 +1795,9 @@ IMPORTANT: This PR contains UI changes. Use the Playwright MCP plugin to:
         add: [workflowLabels.completed],
         remove: [workflowLabels.inProgress]
       });
-      logger.success(`Updated labels: ${colors.label(workflowLabels.inProgress)} \u2192 ${colors.label(workflowLabels.completed)}`);
+      logger.success(
+        `Updated labels: ${colors.label(workflowLabels.inProgress)} \u2192 ${colors.label(workflowLabels.completed)}`
+      );
     } catch {
     }
   }
@@ -1887,7 +1957,9 @@ function isActionableThread(thread) {
   if (thread.isResolved === false || thread.isResolved === void 0 || thread.isResolved === null) {
     return true;
   }
-  return (thread.comments ?? []).some((comment) => isActionableText(comment.body));
+  return (thread.comments ?? []).some(
+    (comment) => isActionableText(comment.body)
+  );
 }
 function isActionableText(text) {
   const normalized = text.toLowerCase();
@@ -1942,11 +2014,15 @@ async function fixCommand(options) {
     process.exit(1);
   }
   if (!aiOk) {
-    logger.error(`${providerName} CLI not found. Please install ${provider} CLI first.`);
+    logger.error(
+      `${providerName} CLI not found. Please install ${provider} CLI first.`
+    );
     process.exit(1);
   }
   if (await isOnMainBranch()) {
-    logger.error("Cannot apply fixes from main/master branch. Switch to the PR branch first.");
+    logger.error(
+      "Cannot apply fixes from main/master branch. Switch to the PR branch first."
+    );
     process.exit(1);
   }
   const hasChanges = await hasUncommittedChanges();
@@ -1969,21 +2045,30 @@ async function fixCommand(options) {
     return getPrForBranch();
   });
   if (!pr) {
-    logger.error("No pull request found for the current branch. Create one with 'gent pr' first.");
+    logger.error(
+      "No pull request found for the current branch. Create one with 'gent pr' first."
+    );
     process.exit(1);
   }
   const lastCommitTimestamp = await getLastCommitTimestamp();
-  const reviewData = await withSpinner("Fetching review feedback...", async () => {
-    return getPrReviewData(pr.number);
-  });
+  const reviewData = await withSpinner(
+    "Fetching review feedback...",
+    async () => {
+      return getPrReviewData(pr.number);
+    }
+  );
   const totalComments = countReviewComments(reviewData);
   if (totalComments === 0) {
     logger.error(`No review comments found for PR #${pr.number}.`);
     process.exit(1);
   }
-  const { items, summary } = summarizeReviewFeedback(reviewData, { afterTimestamp: lastCommitTimestamp });
+  const { items, summary } = summarizeReviewFeedback(reviewData, {
+    afterTimestamp: lastCommitTimestamp
+  });
   if (items.length === 0 || !summary) {
-    logger.error("No new actionable review feedback found since your last commit.");
+    logger.error(
+      "No new actionable review feedback found since your last commit."
+    );
     process.exit(1);
   }
   logger.newline();
@@ -2000,8 +2085,14 @@ async function fixCommand(options) {
   });
   const agentInstructions = loadAgentInstructions();
   const progressContent = readProgress(config);
-  const prompt = buildImplementationPrompt(issue, agentInstructions, progressContent, config, `## Review Feedback
-${summary}`);
+  const prompt = buildImplementationPrompt(
+    issue,
+    agentInstructions,
+    progressContent,
+    config,
+    `## Review Feedback
+${summary}`
+  );
   logger.newline();
   logger.info(`Starting ${colors.provider(providerName)} fix session...`);
   logger.dim("Review feedback will be appended to the implementation prompt.");
@@ -2015,7 +2106,11 @@ ${summary}`);
   process.on("SIGTERM", handleSignal);
   let aiExitCode;
   try {
-    const { result } = await invokeAIInteractive(prompt, config, options.provider);
+    const { result } = await invokeAIInteractive(
+      prompt,
+      config,
+      options.provider
+    );
     aiExitCode = result.exitCode ?? void 0;
   } catch (error) {
     if (error && typeof error === "object" && "exitCode" in error) {
@@ -2039,18 +2134,28 @@ ${summary}`);
   }
   const isRateLimited = aiExitCode === 2;
   if (isRateLimited) {
-    logger.warning(`${providerName} session ended due to rate limits. No commits were created.`);
+    logger.warning(
+      `${providerName} session ended due to rate limits. No commits were created.`
+    );
     return;
   }
-  logger.warning(`${providerName} session completed but no commits were created.`);
+  logger.warning(
+    `${providerName} session completed but no commits were created.`
+  );
 }
 function countReviewComments(data) {
-  const reviewBodies = data.reviews.filter((review) => review.body?.trim()).length;
+  const reviewBodies = data.reviews.filter(
+    (review) => review.body?.trim()
+  ).length;
   const threadBodies = data.reviewThreads.reduce((count, thread) => {
-    const threadCount = (thread.comments ?? []).filter((comment) => comment.body?.trim()).length;
+    const threadCount = (thread.comments ?? []).filter(
+      (comment) => comment.body?.trim()
+    ).length;
     return count + threadCount;
   }, 0);
-  const prComments = (data.comments ?? []).filter((comment) => comment.body?.trim()).length;
+  const prComments = (data.comments ?? []).filter(
+    (comment) => comment.body?.trim()
+  ).length;
   return reviewBodies + threadBodies + prComments;
 }
 async function replyToFeedbackItems(prNumber, items) {
@@ -2069,7 +2174,9 @@ async function replyToFeedbackItems(prNumber, items) {
     }
   }
   if (repliedCount > 0) {
-    logger.dim(`Replied to ${repliedCount} feedback item${repliedCount > 1 ? "s" : ""}.`);
+    logger.dim(
+      `Replied to ${repliedCount} feedback item${repliedCount > 1 ? "s" : ""}.`
+    );
   }
 }
 
@@ -2081,7 +2188,7 @@ import { homedir } from "os";
 // package.json
 var package_default = {
   name: "@rotorsoft/gent",
-  version: "1.13.1",
+  version: "1.13.3",
   description: "AI-powered GitHub workflow CLI - leverage AI (Claude, Gemini, or Codex) to create tickets, implement features, and manage PRs",
   keywords: [
     "cli",
@@ -2333,7 +2440,9 @@ async function statusCommand() {
   logger.info(`  Active: ${colors.provider(providerName)}`);
   if (config.ai.fallback_provider) {
     const fallbackName = getProviderDisplayName(config.ai.fallback_provider);
-    logger.info(`  Fallback: ${fallbackName} (auto: ${config.ai.auto_fallback ? "enabled" : "disabled"})`);
+    logger.info(
+      `  Fallback: ${fallbackName} (auto: ${config.ai.auto_fallback ? "enabled" : "disabled"})`
+    );
   }
   logger.newline();
   logger.bold("Prerequisites:");
@@ -2424,13 +2533,19 @@ async function statusCommand() {
         try {
           const lastCommitTimestamp = await getLastCommitTimestamp();
           const reviewData = await getPrReviewData(prStatus.number);
-          const { items } = summarizeReviewFeedback(reviewData, { afterTimestamp: lastCommitTimestamp });
+          const { items } = summarizeReviewFeedback(reviewData, {
+            afterTimestamp: lastCommitTimestamp
+          });
           hasActionableFeedback = items.length > 0;
           if (prStatus.reviewDecision) {
-            logger.info(`  Review: ${formatReviewDecision(prStatus.reviewDecision)}`);
+            logger.info(
+              `  Review: ${formatReviewDecision(prStatus.reviewDecision)}`
+            );
           }
           if (items.length > 0) {
-            logger.warning(`  ${items.length} actionable comment${items.length > 1 ? "s" : ""} to fix with ${colors.command("gent fix")}:`);
+            logger.warning(
+              `  ${items.length} actionable comment${items.length > 1 ? "s" : ""} to fix with ${colors.command("gent fix")}:`
+            );
             for (const item of items) {
               const location = formatFeedbackLocation(item);
               const body = truncateFeedbackBody(item.body, 60);
@@ -2445,10 +2560,14 @@ async function statusCommand() {
         }
       } else if (prStatus.state === "merged") {
         logger.success("  This PR has been merged!");
-        logger.dim(`  Run ${colors.command("git checkout main && git pull")} to sync`);
+        logger.dim(
+          `  Run ${colors.command("git checkout main && git pull")} to sync`
+        );
       } else if (prStatus.state === "closed") {
         logger.warning("  This PR was closed without merging");
-        logger.dim(`  Consider reopening or creating a new PR if changes are still needed`);
+        logger.dim(
+          `  Consider reopening or creating a new PR if changes are still needed`
+        );
       }
     } else {
       logger.info("  No PR created yet");
@@ -2580,7 +2699,9 @@ async function aggregateState() {
       try {
         const lastCommitTimestamp = await getLastCommitTimestamp();
         const reviewData = await getPrReviewData(pr.number);
-        const { items } = summarizeReviewFeedback(reviewData, { afterTimestamp: lastCommitTimestamp });
+        const { items } = summarizeReviewFeedback(reviewData, {
+          afterTimestamp: lastCommitTimestamp
+        });
         reviewFeedback = items;
         hasActionableFeedback = items.length > 0;
       } catch {
@@ -2621,7 +2742,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: "switch-provider", label: "switch", shortcut: "s" });
+    actions.push({ id: "switch-provider", label: "ai", shortcut: "a" });
     actions.push({ id: "quit", label: "quit", shortcut: "q" });
     return actions;
   }
@@ -2629,10 +2750,10 @@ function getAvailableActions(state) {
     actions.push({ id: "commit", label: "commit", shortcut: "c" });
   }
   if (state.hasUnpushedCommits && state.commits.length > 0) {
-    actions.push({ id: "push", label: "Push", shortcut: "P" });
+    actions.push({ id: "push", label: "push", shortcut: "p" });
   }
   if (!state.pr && state.commits.length > 0) {
-    actions.push({ id: "pr", label: "Create pr", shortcut: "C" });
+    actions.push({ id: "pr", label: "pr", shortcut: "r" });
   }
   if (state.issue && state.pr?.state !== "merged") {
     actions.push({ id: "implement", label: "implement", shortcut: "i" });
@@ -2646,7 +2767,7 @@ function getAvailableActions(state) {
     actions.push({ id: "checkout-main", label: "main", shortcut: "m" });
   }
   actions.push({ id: "list", label: "list", shortcut: "l" });
-  actions.push({ id: "switch-provider", label: "switch", shortcut: "s" });
+  actions.push({ id: "switch-provider", label: "ai", shortcut: "a" });
   actions.push({ id: "quit", label: "quit", shortcut: "q" });
   return actions;
 }
@@ -2788,11 +2909,14 @@ function renderDashboard(state, actions, hint, refreshing) {
   const w = termWidth();
   const descMax = w - 8;
   const version2 = getVersion();
-  const titleLabel = refreshing ? `gent v${version2}  ${chalk3.yellow("Refreshing\u2026")}` : `gent v${version2}`;
+  const titleLabel = `gent v${version2}`;
   console.log(topRow(titleLabel, w));
+  renderSettings(state, w);
   if (!state.isGitRepo) {
     console.log(row(chalk3.red("Not a git repository"), w));
-    console.log(row(chalk3.dim("Run gent init in a git repo to get started"), w));
+    console.log(
+      row(chalk3.dim("Run gent init in a git repo to get started"), w)
+    );
     console.log(botRow(w));
     return;
   }
@@ -2803,19 +2927,26 @@ function renderDashboard(state, actions, hint, refreshing) {
     return;
   }
   if (state.isOnMain) {
-    console.log(row(chalk3.magenta(state.branch) + chalk3.dim("  \xB7  ready to start new work"), w));
+    console.log(
+      row(
+        chalk3.magenta(state.branch) + chalk3.dim("  \xB7  ready to start new work"),
+        w
+      )
+    );
     if (state.hasUncommittedChanges) {
       console.log(row(chalk3.yellow("\u25CF uncommitted changes"), w));
     }
-    console.log(midRow("Settings", w));
-    renderSettings(state, w);
     if (hint) {
       console.log(midRow("Hint", w));
       console.log(row(chalk3.yellow(hint), w));
     }
     console.log(divRow(w));
-    for (const line of formatCommandBar(actions, w)) {
-      console.log(row(line, w));
+    if (refreshing) {
+      console.log(row(chalk3.yellow("Refreshing\u2026"), w));
+    } else {
+      for (const line of formatCommandBar(actions, w)) {
+        console.log(row(line, w));
+      }
     }
     console.log(botRow(w));
     console.log();
@@ -2826,14 +2957,17 @@ function renderDashboard(state, actions, hint, refreshing) {
   };
   section("Ticket");
   if (state.issue) {
-    console.log(row(
-      chalk3.cyan(`#${state.issue.number}`) + "  " + chalk3.bold(truncate(state.issue.title, descMax - 6)),
-      w
-    ));
+    console.log(
+      row(
+        chalk3.cyan(`#${state.issue.number}`) + "  " + chalk3.bold(truncate(state.issue.title, descMax - 6)),
+        w
+      )
+    );
     const desc = extractDescription(state.issue.body, descMax);
     if (desc) console.log(row(chalk3.dim(desc), w));
     const tags = [];
-    if (state.workflowStatus !== "none") tags.push(workflowBadge(state.workflowStatus));
+    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));
@@ -2845,7 +2979,8 @@ function renderDashboard(state, actions, hint, refreshing) {
   section("Branch");
   console.log(row(chalk3.magenta(state.branch), w));
   const bits = [];
-  if (state.commits.length > 0) bits.push(chalk3.dim(`${state.commits.length} ahead`));
+  if (state.commits.length > 0)
+    bits.push(chalk3.dim(`${state.commits.length} ahead`));
   if (state.hasUncommittedChanges) bits.push(chalk3.yellow("\u25CF uncommitted"));
   if (state.hasUnpushedCommits) bits.push(chalk3.yellow("\u25CF unpushed"));
   if (!state.hasUncommittedChanges && !state.hasUnpushedCommits && state.commits.length > 0) {
@@ -2855,20 +2990,29 @@ function renderDashboard(state, actions, hint, refreshing) {
   section("Pull Request");
   if (state.pr) {
     const titleText = state.pr.title ? "  " + truncate(state.pr.title, descMax - 12) : "";
-    console.log(row(
-      chalk3.cyan(`#${state.pr.number}`) + titleText,
-      w
-    ));
-    console.log(row(
-      prBadge(state.pr.state, state.pr.isDraft) + reviewBadge(state.pr.reviewDecision),
-      w
-    ));
+    console.log(row(chalk3.cyan(`#${state.pr.number}`) + titleText, w));
+    console.log(
+      row(
+        prBadge(state.pr.state, state.pr.isDraft) + reviewBadge(state.pr.reviewDecision),
+        w
+      )
+    );
     if (state.hasActionableFeedback) {
       const n = state.reviewFeedback.length;
-      console.log(row(chalk3.yellow(`${n} actionable comment${n !== 1 ? "s" : ""} pending`), w));
+      console.log(
+        row(
+          chalk3.yellow(`${n} actionable comment${n !== 1 ? "s" : ""} pending`),
+          w
+        )
+      );
     }
     if (state.hasUIChanges && state.isPlaywrightAvailable && state.config.video.enabled && state.pr.state === "open") {
-      console.log(row(chalk3.cyan("UI changes detected") + chalk3.dim(" \xB7 video capture available"), w));
+      console.log(
+        row(
+          chalk3.cyan("UI changes detected") + chalk3.dim(" \xB7 video capture available"),
+          w
+        )
+      );
     }
     console.log(row(chalk3.dim(state.pr.url), w));
   } else {
@@ -2878,23 +3022,27 @@ function renderDashboard(state, actions, hint, refreshing) {
   if (state.commits.length > 0) {
     const max = 6;
     for (const c of state.commits.slice(0, max)) {
-      console.log(row(c, w));
+      console.log(row(c.substring(0, w - 5), w));
     }
     if (state.commits.length > max) {
-      console.log(row(chalk3.dim(`\u2026 and ${state.commits.length - max} more`), w));
+      console.log(
+        row(chalk3.dim(`\u2026 and ${state.commits.length - max} more`), w)
+      );
     }
   } else {
     console.log(row(chalk3.dim("No commits"), w));
   }
-  section("Settings");
-  renderSettings(state, w);
   if (hint) {
     section("Hint");
     console.log(row(chalk3.yellow(hint), w));
   }
   console.log(divRow(w));
-  for (const line of formatCommandBar(actions, w)) {
-    console.log(row(line, w));
+  if (refreshing) {
+    console.log(row(chalk3.yellow("Refreshing\u2026"), w));
+  } else {
+    for (const line of formatCommandBar(actions, w)) {
+      console.log(row(line, w));
+    }
   }
   console.log(botRow(w));
 }
@@ -2940,7 +3088,7 @@ async function waitForKey(validKeys) {
     stdin.on("data", onData);
   });
 }
-async function executeAction(actionId, state, providerSetter) {
+async function executeAction(actionId, state) {
   switch (actionId) {
     case "quit":
       return false;
@@ -3017,7 +3165,7 @@ async function executeAction(actionId, state, providerSetter) {
     }
     case "switch-provider":
       clearScreen();
-      await handleSwitchProvider(state, providerSetter);
+      await handleSwitchProvider(state);
       return true;
     case "checkout-main": {
       clearScreen();
@@ -3040,15 +3188,47 @@ async function handleCommit(state) {
     console.log(status);
     console.log();
     await execa4("git", ["add", "-A"]);
-    const { stdout: diffStat } = await execa4("git", ["diff", "--cached", "--stat"]);
+    const { stdout: diffStat } = await execa4("git", [
+      "diff",
+      "--cached",
+      "--stat"
+    ]);
     const { stdout: diffPatch } = await execa4("git", ["diff", "--cached"]);
     const diffContent = (diffStat + "\n\n" + diffPatch).slice(0, 4e3);
     const issueNumber = state.issue?.number ?? null;
     const issueTitle = state.issue?.title ?? null;
     const provider = state.config.ai.provider;
     const providerName = getProviderDisplayName(provider);
-    logger.info(`Generating commit message with ${providerName}...`);
-    const message = await generateCommitMessage(diffContent, issueNumber, issueTitle, state);
+    const { mode } = await inquirer7.prompt([
+      {
+        type: "list",
+        name: "mode",
+        message: "How would you like to provide the commit message?",
+        choices: [
+          { name: `Generate with ${providerName}`, value: "ai" },
+          { name: "Enter manually", value: "manual" }
+        ]
+      }
+    ]);
+    let message;
+    if (mode === "manual") {
+      const { manualInput } = await inquirer7.prompt([
+        {
+          type: "input",
+          name: "manualInput",
+          message: "Commit message (empty to cancel):"
+        }
+      ]);
+      message = manualInput.trim() || CANCEL;
+    } else {
+      logger.info(`Generating commit message with ${providerName}...`);
+      message = await generateCommitMessage(
+        diffContent,
+        issueNumber,
+        issueTitle,
+        state
+      );
+    }
     if (message === CANCEL) {
       await execa4("git", ["reset", "HEAD"]);
       logger.info("Cancelled");
@@ -3076,7 +3256,11 @@ Co-Authored-By: ${providerName} <${providerEmail}>`;
 }
 async function generateCommitMessage(diffContent, issueNumber, issueTitle, state) {
   try {
-    const prompt = buildCommitMessagePrompt(diffContent, issueNumber, issueTitle);
+    const prompt = buildCommitMessagePrompt(
+      diffContent,
+      issueNumber,
+      issueTitle
+    );
     const result = await invokeAI({ prompt, streamOutput: true }, state.config);
     let message = result.output.trim().split("\n")[0].trim();
     for (const q of ['"', "'", "`"]) {
@@ -3157,7 +3341,7 @@ async function handlePush() {
   }
 }
 var PROVIDERS = ["claude", "gemini", "codex"];
-async function handleSwitchProvider(state, setProvider) {
+async function handleSwitchProvider(state) {
   const current = state.config.ai.provider;
   const { provider } = await inquirer7.prompt([
     {
@@ -3172,7 +3356,7 @@ async function handleSwitchProvider(state, setProvider) {
     }
   ]);
   if (provider === current) return;
-  setProvider(provider);
+  setRuntimeProvider(provider);
   logger.success(`Provider switched to ${provider} (session only)`);
 }
 async function handleCheckoutMain() {
@@ -3224,11 +3408,7 @@ async function promptContinue() {
 }
 async function tuiCommand() {
   let running = true;
-  let providerOverride = null;
   let lastActions = [];
-  const setProvider = (p) => {
-    providerOverride = p;
-  };
   const config = loadConfig();
   let lastState = {
     isGitRepo: true,
@@ -3256,9 +3436,6 @@ async function tuiCommand() {
     clearScreen();
     renderDashboard(lastState, lastActions, void 0, true);
     const state = await aggregateState();
-    if (providerOverride) {
-      state.config.ai.provider = providerOverride;
-    }
     const actions = getAvailableActions(state);
     lastState = state;
     lastActions = actions;
@@ -3276,7 +3453,7 @@ async function tuiCommand() {
     const key = await waitForKey(validKeys);
     const action = actions.find((a) => a.shortcut === key);
     if (action) {
-      running = await executeAction(action.id, state, setProvider);
+      running = await executeAction(action.id, state);
     }
   }
 }
@@ -3288,13 +3465,17 @@ function startVersionCheck() {
   checkForUpdates().then((result) => {
     if (result.updateAvailable && result.latestVersion) {
       logger.newline();
-      logger.warning(formatUpgradeNotification(result.currentVersion, result.latestVersion));
+      logger.warning(
+        formatUpgradeNotification(result.currentVersion, result.latestVersion)
+      );
     }
   }).catch(() => {
   });
 }
 var program = new Command();
-program.name("gent").description("AI-powered GitHub workflow CLI - leverage AI (Claude, Gemini, or Codex) to create tickets, implement features, and manage PRs").version(version).option("--skip-update-check", "Skip checking for CLI updates").hook("preAction", (thisCommand) => {
+program.name("gent").description(
+  "AI-powered GitHub workflow CLI - leverage AI (Claude, Gemini, or Codex) to create tickets, implement features, and manage PRs"
+).version(version).option("--skip-update-check", "Skip checking for CLI updates").hook("preAction", (thisCommand) => {
   if (!thisCommand.opts().skipUpdateCheck) {
     startVersionCheck();
   }
@@ -3305,27 +3486,46 @@ program.command("init").description("Initialize gent workflow in current reposit
 program.command("setup-labels").description("Setup GitHub labels for AI workflow").action(async () => {
   await setupLabelsCommand();
 });
-program.command("create <description>").description("Create an AI-enhanced GitHub issue").option("-y, --yes", "Skip confirmation and create issue immediately").option("-p, --provider <provider>", "AI provider to use (claude, gemini, or codex)").option("-t, --title <title>", "Override the generated issue title").action(async (description, options) => {
-  await createCommand(description, { yes: options.yes, provider: options.provider, title: options.title });
+program.command("create <description>").description("Create an AI-enhanced GitHub issue").option("-y, --yes", "Skip confirmation and create issue immediately").option(
+  "-p, --provider <provider>",
+  "AI provider to use (claude, gemini, or codex)"
+).option("-t, --title <title>", "Override the generated issue title").action(async (description, options) => {
+  await createCommand(description, {
+    yes: options.yes,
+    provider: options.provider,
+    title: options.title
+  });
 });
-program.command("list").description("List and switch to GitHub issues").option("-l, --label <label>", "Filter by label").option("-s, --status <status>", "Filter by workflow status (ready, in-progress, completed, blocked, all)").option("-n, --limit <number>", "Maximum number of issues to show", "20").action(async (options) => {
+program.command("list").description("List and switch to GitHub issues").option("-l, --label <label>", "Filter by label").option(
+  "-s, --status <status>",
+  "Filter by workflow status (ready, in-progress, completed, blocked, all)"
+).option("-n, --limit <number>", "Maximum number of issues to show", "20").action(async (options) => {
   await listCommand({
     label: options.label,
     status: options.status,
     limit: parseInt(options.limit, 10)
   });
 });
-program.command("run [issue-number]").description("Run AI to implement a GitHub issue").option("-p, --provider <provider>", "AI provider to use (claude, gemini, or codex)").action(async (issueNumber, options) => {
+program.command("run [issue-number]").description("Run AI to implement a GitHub issue").option(
+  "-p, --provider <provider>",
+  "AI provider to use (claude, gemini, or codex)"
+).action(async (issueNumber, options) => {
   await runCommand(issueNumber, { provider: options.provider });
 });
-program.command("pr").description("Create an AI-enhanced pull request").option("-d, --draft", "Create as draft PR").option("-p, --provider <provider>", "AI provider to use (claude, gemini, or codex)").option("--no-video", "Disable video capture for UI changes").action(async (options) => {
+program.command("pr").description("Create an AI-enhanced pull request").option("-d, --draft", "Create as draft PR").option(
+  "-p, --provider <provider>",
+  "AI provider to use (claude, gemini, or codex)"
+).option("--no-video", "Disable video capture for UI changes").action(async (options) => {
   await prCommand({
     draft: options.draft,
     provider: options.provider,
     video: options.video
   });
 });
-program.command("fix").description("Apply PR review feedback using AI").option("-p, --provider <provider>", "AI provider to use (claude, gemini, or codex)").action(async (options) => {
+program.command("fix").description("Apply PR review feedback using AI").option(
+  "-p, --provider <provider>",
+  "AI provider to use (claude, gemini, or codex)"
+).action(async (options) => {
   await fixCommand({ provider: options.provider });
 });
 program.command("status").description("Show current workflow status").action(async () => {