@rotorsoft/gent 1.12.0 → 1.13.0

package/dist/index.js

@@ -14,7 +14,6 @@ import {
   createIssue,
   createPullRequest,
   createSpinner,
-  extractPriorityFromLabels,
   extractTypeFromLabels,
   generateDefaultConfig,
   getConfigPath,
@@ -26,6 +25,7 @@ import {
   getWorkflowLabels,
   isValidIssueNumber,
   listIssues,
+  listOpenPrs,
   loadAgentInstructions,
   loadConfig,
   logger,
@@ -33,10 +33,9 @@ import {
   sanitizeSlug,
   setupLabelsCommand,
   sortByPriority,
-  updateConfigProvider,
   updateIssueLabels,
   withSpinner
-} from "./chunk-TLGYE7J2.js";
+} from "./chunk-KLHUMY5L.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -197,7 +196,7 @@ async function initCommand(options) {
     }
   ]);
   if (setupLabels) {
-    const { setupLabelsCommand: setupLabelsCommand2 } = await import("./setup-labels-FLCGVPFY.js");
+    const { setupLabelsCommand: setupLabelsCommand2 } = await import("./setup-labels-3ANC76NF.js");
     await setupLabelsCommand2();
   }
 }
@@ -473,7 +472,7 @@ META:type=<type>,priority=<priority>,risk=<risk>,area=<area>
 Example: META:type=feature,priority=high,risk=low,area=ui`;
   return basePrompt;
 }
-function buildImplementationPrompt(issue, agentInstructions, progressContent, config, reviewFeedback = null) {
+function buildImplementationPrompt(issue, agentInstructions, progressContent, config, extraContext = null) {
   const providerName = getProviderDisplayName(config.ai.provider);
   const providerEmail = getProviderEmail(config.ai.provider);
   return `GitHub Issue #${issue.number}: ${issue.title}
@@ -488,8 +487,7 @@ ${progressContent ? `## Previous Progress
 ${progressContent}
 
 ` : ""}
-${reviewFeedback ? `## Review Feedback
-${reviewFeedback}
+${extraContext ? `${extraContext}
 
 ` : ""}
 
@@ -664,11 +662,11 @@ async function createCommand(description, options) {
   ]);
   if (!ghAuth) {
     logger.error("Not authenticated with GitHub. Run 'gh auth login' first.");
-    process.exit(1);
+    return;
   }
   if (!aiOk) {
     logger.error(`${providerName} CLI not found. Please install ${provider} CLI first.`);
-    process.exit(1);
+    return;
   }
   const agentInstructions = loadAgentInstructions();
   let aiOutput;
@@ -810,105 +808,6 @@ Next steps:
 
 // src/commands/list.ts
 import chalk2 from "chalk";
-async function listCommand(options) {
-  const isAuthed = await checkGhAuth();
-  if (!isAuthed) {
-    logger.error("Not authenticated with GitHub. Run 'gh auth login' first.");
-    process.exit(1);
-  }
-  const config = loadConfig();
-  const workflowLabels = getWorkflowLabels(config);
-  const labels = [];
-  if (options.label) {
-    labels.push(options.label);
-  }
-  if (options.status && options.status !== "all") {
-    switch (options.status) {
-      case "ready":
-        labels.push(workflowLabels.ready);
-        break;
-      case "in-progress":
-        labels.push(workflowLabels.inProgress);
-        break;
-      case "completed":
-        labels.push(workflowLabels.completed);
-        break;
-      case "blocked":
-        labels.push(workflowLabels.blocked);
-        break;
-    }
-  } else if (!options.status) {
-    labels.push(workflowLabels.ready);
-  }
-  let issues;
-  try {
-    issues = await listIssues({
-      labels: labels.length > 0 ? labels : void 0,
-      state: "open",
-      limit: options.limit || 20
-    });
-  } catch (error) {
-    logger.error(`Failed to fetch issues: ${error}`);
-    return;
-  }
-  if (issues.length === 0) {
-    logger.info("No issues found matching the criteria.");
-    return;
-  }
-  sortByPriority(issues);
-  logger.bold(`Found ${issues.length} issue(s):`);
-  logger.newline();
-  for (const issue of issues) {
-    const type = extractTypeFromLabels(issue.labels);
-    const priority = extractPriorityFromLabels(issue.labels);
-    const status = getIssueStatus(issue.labels, workflowLabels);
-    const priorityColor = getPriorityColor(priority);
-    const statusColor = getStatusColor(status);
-    console.log(
-      `  ${colors.issue(`#${issue.number.toString().padStart(4)}`)} ${priorityColor(`[${priority}]`.padEnd(10))} ${statusColor(`[${status}]`.padEnd(14))} ${colors.label(`[${type}]`.padEnd(10))} ` + issue.title.slice(0, 50) + (issue.title.length > 50 ? "..." : "")
-    );
-  }
-  logger.newline();
-  logger.dim(`Run ${colors.command("gent run <issue-number>")} to implement an issue`);
-  logger.dim(`Run ${colors.command("gent run --auto")} to auto-select highest priority`);
-}
-function getIssueStatus(labels, workflowLabels) {
-  if (labels.includes(workflowLabels.ready)) return "ready";
-  if (labels.includes(workflowLabels.inProgress)) return "in-progress";
-  if (labels.includes(workflowLabels.completed)) return "completed";
-  if (labels.includes(workflowLabels.blocked)) return "blocked";
-  return "unknown";
-}
-function getPriorityColor(priority) {
-  switch (priority) {
-    case "critical":
-      return chalk2.red;
-    case "high":
-      return chalk2.yellow;
-    case "medium":
-      return chalk2.blue;
-    case "low":
-      return chalk2.green;
-    default:
-      return chalk2.gray;
-  }
-}
-function getStatusColor(status) {
-  switch (status) {
-    case "ready":
-      return chalk2.green;
-    case "in-progress":
-      return chalk2.yellow;
-    case "completed":
-      return chalk2.blue;
-    case "blocked":
-      return chalk2.red;
-    default:
-      return chalk2.gray;
-  }
-}
-
-// src/commands/run.ts
 import inquirer3 from "inquirer";
 
 // src/lib/git.ts
@@ -1030,6 +929,22 @@ async function getLastCommitTimestamp() {
   const { stdout } = await execa2("git", ["log", "-1", "--format=%cI"]);
   return stdout.trim();
 }
+async function listLocalBranches() {
+  const { stdout } = await execa2("git", ["branch", "--format=%(refname:short)"]);
+  return stdout.trim().split("\n").filter(Boolean);
+}
+async function remoteBranchExists(name) {
+  try {
+    await execa2("git", ["ls-remote", "--exit-code", "--heads", "origin", name]);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function fetchAndCheckout(name) {
+  await execa2("git", ["fetch", "origin", `${name}:${name}`]);
+  await execa2("git", ["checkout", name]);
+}
 
 // src/lib/branch.ts
 async function generateBranchName(config, issueNumber, issueTitle, type) {
@@ -1102,7 +1017,308 @@ function extractIssueNumber(branchName) {
   return info?.issueNumber ?? null;
 }
 
+// src/commands/list.ts
+function findBranchForIssue(issueNumber, branches) {
+  for (const branch of branches) {
+    const info = parseBranchName(branch);
+    if (info && info.issueNumber === issueNumber) {
+      return branch;
+    }
+  }
+  return null;
+}
+function buildTicketChoices(inProgressIssues, readyIssues, openPrs, localBranches) {
+  const choices = [];
+  const seen = /* @__PURE__ */ new Set();
+  const prByIssue = /* @__PURE__ */ new Map();
+  for (const pr of openPrs) {
+    const info = parseBranchName(pr.headRefName);
+    if (info) {
+      prByIssue.set(info.issueNumber, pr);
+    }
+  }
+  for (const issue of inProgressIssues) {
+    if (seen.has(issue.number)) continue;
+    seen.add(issue.number);
+    const branch = findBranchForIssue(issue.number, localBranches);
+    const pr = prByIssue.get(issue.number);
+    choices.push({
+      issueNumber: issue.number,
+      title: issue.title,
+      branch: branch || pr?.headRefName || null,
+      category: pr ? "open-pr" : "in-progress"
+    });
+  }
+  for (const [issueNumber, pr] of prByIssue) {
+    if (seen.has(issueNumber)) continue;
+    seen.add(issueNumber);
+    const issue = [...inProgressIssues, ...readyIssues].find(
+      (i) => i.number === issueNumber
+    );
+    choices.push({
+      issueNumber,
+      title: issue?.title || pr.title,
+      branch: pr.headRefName,
+      category: "open-pr"
+    });
+  }
+  for (const issue of readyIssues) {
+    if (seen.has(issue.number)) continue;
+    seen.add(issue.number);
+    const branch = findBranchForIssue(issue.number, localBranches);
+    choices.push({
+      issueNumber: issue.number,
+      title: issue.title,
+      branch,
+      category: "ready"
+    });
+  }
+  return choices;
+}
+function categoryLabel(category) {
+  switch (category) {
+    case "in-progress":
+      return chalk2.yellow("[in progress]");
+    case "open-pr":
+      return chalk2.blue("[open PR]");
+    case "ready":
+      return chalk2.green("[ready]");
+  }
+}
+function formatChoice(choice) {
+  const num = colors.issue(`#${choice.issueNumber}`);
+  const cat = categoryLabel(choice.category);
+  const title = choice.title.length > 50 ? choice.title.slice(0, 50) + "..." : choice.title;
+  return `${num} ${cat} ${title}`;
+}
+async function listCommand(options) {
+  const isAuthed = await checkGhAuth();
+  if (!isAuthed) {
+    logger.error("Not authenticated with GitHub. Run 'gh auth login' first.");
+    return;
+  }
+  const config = loadConfig();
+  const workflowLabels = getWorkflowLabels(config);
+  const currentBranch = await getCurrentBranch();
+  const defaultBranch = await getDefaultBranch();
+  const statusFilter = options.status;
+  const limit = options.limit || 20;
+  let inProgressIssues = [];
+  let readyIssues = [];
+  if (statusFilter && statusFilter !== "all") {
+    const labels = [];
+    if (options.label) labels.push(options.label);
+    switch (statusFilter) {
+      case "ready":
+        labels.push(workflowLabels.ready);
+        break;
+      case "in-progress":
+        labels.push(workflowLabels.inProgress);
+        break;
+      case "completed":
+        labels.push(workflowLabels.completed);
+        break;
+      case "blocked":
+        labels.push(workflowLabels.blocked);
+        break;
+    }
+    const [issues, localBranches2] = await withSpinner(
+      "Fetching tickets...",
+      () => Promise.all([
+        listIssues({ labels, state: "open", limit }),
+        listLocalBranches()
+      ])
+    );
+    sortByPriority(issues);
+    if (statusFilter === "in-progress") {
+      inProgressIssues = issues;
+    } else {
+      readyIssues = issues;
+    }
+    const choices2 = buildTicketChoices(
+      inProgressIssues,
+      readyIssues,
+      [],
+      localBranches2
+    );
+    if (choices2.length === 0) {
+      logger.info("No issues found matching the criteria.");
+      return;
+    }
+    await presentSelector(
+      choices2,
+      currentBranch,
+      defaultBranch,
+      config
+    );
+    return;
+  }
+  const labelFilter = options.label ? [options.label] : [];
+  const [inProgress, ready, prs, localBranches] = await withSpinner(
+    "Fetching tickets...",
+    () => Promise.all([
+      listIssues({
+        labels: [workflowLabels.inProgress, ...labelFilter],
+        state: "open",
+        limit
+      }),
+      listIssues({
+        labels: [workflowLabels.ready, ...labelFilter],
+        state: "open",
+        limit
+      }),
+      listOpenPrs(30),
+      listLocalBranches()
+    ])
+  );
+  sortByPriority(inProgress);
+  sortByPriority(ready);
+  const choices = buildTicketChoices(inProgress, ready, prs, localBranches);
+  if (choices.length === 0) {
+    logger.info("No tickets found.");
+    logger.dim(
+      `Create a ticket with ${colors.command("gent create")} or add the '${workflowLabels.ready}' label to an issue.`
+    );
+    return;
+  }
+  await presentSelector(choices, currentBranch, defaultBranch, config);
+}
+async function presentSelector(choices, currentBranch, defaultBranch, config) {
+  const dirty = await hasUncommittedChanges();
+  const inquirerChoices = [];
+  inquirerChoices.push({
+    name: `${chalk2.magenta(defaultBranch)}${currentBranch === defaultBranch ? chalk2.dim(" (current)") : ""}`,
+    value: "__main__"
+  });
+  inquirerChoices.push(new inquirer3.Separator("\u2500"));
+  const inProgress = choices.filter((c) => c.category === "in-progress");
+  const openPrChoices = choices.filter((c) => c.category === "open-pr");
+  const ready = choices.filter((c) => c.category === "ready");
+  if (inProgress.length > 0) {
+    inquirerChoices.push(new inquirer3.Separator(chalk2.yellow(" In Progress")));
+    for (const c of inProgress) {
+      inquirerChoices.push({
+        name: formatChoice(c),
+        value: String(c.issueNumber)
+      });
+    }
+  }
+  if (openPrChoices.length > 0) {
+    inquirerChoices.push(new inquirer3.Separator(chalk2.blue(" Open PRs")));
+    for (const c of openPrChoices) {
+      inquirerChoices.push({
+        name: formatChoice(c),
+        value: String(c.issueNumber)
+      });
+    }
+  }
+  if (ready.length > 0) {
+    inquirerChoices.push(new inquirer3.Separator(chalk2.green(" Ready")));
+    for (const c of ready) {
+      inquirerChoices.push({
+        name: formatChoice(c),
+        value: String(c.issueNumber)
+      });
+    }
+  }
+  const { selected } = await inquirer3.prompt([
+    {
+      type: "list",
+      name: "selected",
+      message: "Select a ticket to switch to:",
+      choices: inquirerChoices,
+      pageSize: 20
+    }
+  ]);
+  if (selected === "__main__") {
+    if (currentBranch === defaultBranch) {
+      logger.info(`Already on ${colors.branch(defaultBranch)}`);
+      return;
+    }
+    if (dirty) {
+      const ok = await confirmDirty();
+      if (!ok) return;
+    }
+    await withSpinner(`Switching to ${defaultBranch}...`, async () => {
+      await checkoutBranch(defaultBranch);
+    });
+    logger.success(`Switched to ${colors.branch(defaultBranch)}`);
+    return;
+  }
+  const issueNumber = parseInt(selected, 10);
+  const ticket = choices.find((c) => c.issueNumber === issueNumber);
+  if (!ticket) return;
+  if (dirty) {
+    const ok = await confirmDirty();
+    if (!ok) return;
+  }
+  const targetBranch = ticket.branch;
+  if (targetBranch) {
+    if (await branchExists(targetBranch)) {
+      await withSpinner(`Switching to ${targetBranch}...`, async () => {
+        await checkoutBranch(targetBranch);
+      });
+      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)}`
+      );
+    } else {
+      logger.warning(
+        `Branch ${colors.branch(targetBranch)} not found locally or on remote.`
+      );
+      await offerCreateBranch(config, issueNumber, ticket.title);
+    }
+  } else {
+    await offerCreateBranch(config, issueNumber, ticket.title);
+  }
+}
+async function confirmDirty() {
+  logger.warning("You have uncommitted changes.");
+  const { proceed } = await inquirer3.prompt([
+    {
+      type: "confirm",
+      name: "proceed",
+      message: "Continue anyway? (changes will carry over to the new branch)",
+      default: false
+    }
+  ]);
+  if (!proceed) {
+    logger.info("Aborting. Please commit or stash your changes first.");
+  }
+  return proceed;
+}
+async function offerCreateBranch(config, issueNumber, title) {
+  const branchName = await generateBranchName(
+    config,
+    issueNumber,
+    title,
+    "feature"
+  );
+  const { create } = await inquirer3.prompt([
+    {
+      type: "confirm",
+      name: "create",
+      message: `No branch exists. Create ${colors.branch(branchName)}?`,
+      default: true
+    }
+  ]);
+  if (!create) return;
+  const defaultBranch = await getDefaultBranch();
+  await withSpinner(`Creating branch ${branchName}...`, async () => {
+    await createBranch(branchName, defaultBranch);
+  });
+  logger.success(`Created and switched to ${colors.branch(branchName)}`);
+}
+
 // src/commands/run.ts
+import inquirer4 from "inquirer";
 async function runCommand(issueNumberArg, options) {
   logger.bold("Running AI implementation workflow...");
   logger.newline();
@@ -1115,16 +1331,16 @@ async function runCommand(issueNumberArg, options) {
   ]);
   if (!ghAuth) {
     logger.error("Not authenticated with GitHub. Run 'gh auth login' first.");
-    process.exit(1);
+    return;
   }
   if (!aiOk) {
     logger.error(`${providerName} CLI not found. Please install ${provider} CLI first.`);
-    process.exit(1);
+    return;
   }
   const hasChanges = await hasUncommittedChanges();
   if (hasChanges) {
     logger.warning("You have uncommitted changes.");
-    const { proceed } = await inquirer3.prompt([
+    const { proceed } = await inquirer4.prompt([
       {
         type: "confirm",
         name: "proceed",
@@ -1134,28 +1350,20 @@ async function runCommand(issueNumberArg, options) {
     ]);
     if (!proceed) {
       logger.info("Aborting. Please commit or stash your changes first.");
-      process.exit(0);
+      return;
     }
   }
   const workflowLabels = getWorkflowLabels(config);
   let issueNumber;
-  if (options.auto) {
-    const autoIssue = await autoSelectIssue(workflowLabels.ready);
-    if (!autoIssue) {
-      logger.error("No ai-ready issues found.");
-      process.exit(1);
-    }
-    issueNumber = autoIssue.number;
-    logger.info(`Auto-selected: ${colors.issue(`#${issueNumber}`)} - ${autoIssue.title}`);
-  } else if (issueNumberArg) {
+  if (issueNumberArg) {
     if (!isValidIssueNumber(issueNumberArg)) {
       logger.error("Invalid issue number.");
-      process.exit(1);
+      return;
     }
     issueNumber = parseInt(issueNumberArg, 10);
   } else {
-    logger.error("Please provide an issue number or use --auto");
-    process.exit(1);
+    logger.error("Please provide an issue number. Use 'gent switch' to browse tickets.");
+    return;
   }
   let issue;
   try {
@@ -1168,7 +1376,7 @@ async function runCommand(issueNumberArg, options) {
   }
   if (!issue.labels.includes(workflowLabels.ready)) {
     logger.warning(`Issue #${issueNumber} does not have the '${workflowLabels.ready}' label.`);
-    const { proceed } = await inquirer3.prompt([
+    const { proceed } = await inquirer4.prompt([
       {
         type: "confirm",
         name: "proceed",
@@ -1190,7 +1398,7 @@ Labels: ${issue.labels.join(", ")}`);
   const onMain = await isOnMainBranch();
   if (await branchExists(branchName)) {
     logger.info(`Branch ${colors.branch(branchName)} already exists.`);
-    const { action } = await inquirer3.prompt([
+    const { action } = await inquirer4.prompt([
       {
         type: "list",
         name: "action",
@@ -1212,7 +1420,7 @@ Labels: ${issue.labels.join(", ")}`);
   } else {
     if (!onMain) {
       logger.warning(`Not on main branch (currently on ${colors.branch(currentBranch)}).`);
-      const { fromMain } = await inquirer3.prompt([
+      const { fromMain } = await inquirer4.prompt([
         {
           type: "confirm",
           name: "fromMain",
@@ -1333,31 +1541,9 @@ No commits were created. Please retry later.`
 3. Push branch: ${colors.command("git push -u origin " + branchName)}
 4. Create PR: ${colors.command("gent pr")}`);
 }
-async function autoSelectIssue(readyLabel) {
-  let issues = await listIssues({
-    labels: [readyLabel, "priority:critical"],
-    state: "open",
-    limit: 1
-  });
-  if (issues.length > 0) return issues[0];
-  issues = await listIssues({
-    labels: [readyLabel, "priority:high"],
-    state: "open",
-    limit: 1
-  });
-  if (issues.length > 0) return issues[0];
-  issues = await listIssues({
-    labels: [readyLabel],
-    state: "open",
-    limit: 10
-  });
-  if (issues.length === 0) return null;
-  sortByPriority(issues);
-  return issues[0];
-}
 
 // src/commands/pr.ts
-import inquirer4 from "inquirer";
+import inquirer5 from "inquirer";
 
 // src/lib/playwright.ts
 import { execa as execa3 } from "execa";
@@ -1438,7 +1624,7 @@ async function prCommand(options) {
   const hasUnpushed = await getUnpushedCommits();
   if (hasUnpushed) {
     logger.warning("Branch has unpushed commits.");
-    const { push } = await inquirer4.prompt([
+    const { push } = await inquirer5.prompt([
       {
         type: "confirm",
         name: "push",
@@ -1575,7 +1761,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 = [
@@ -1766,7 +1952,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",
@@ -1814,7 +2000,8 @@ async function fixCommand(options) {
   });
   const agentInstructions = loadAgentInstructions();
   const progressContent = readProgress(config);
-  const prompt = buildImplementationPrompt(issue, agentInstructions, progressContent, config, 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.");
@@ -1894,7 +2081,7 @@ import { homedir } from "os";
 // package.json
 var package_default = {
   name: "@rotorsoft/gent",
-  version: "1.12.0",
+  version: "1.13.0",
   description: "AI-powered GitHub workflow CLI - leverage AI (Claude, Gemini, or Codex) to create tickets, implement features, and manage PRs",
   keywords: [
     "cli",
@@ -2304,7 +2491,7 @@ async function statusCommand() {
 }
 
 // src/commands/tui.ts
-import inquirer6 from "inquirer";
+import inquirer7 from "inquirer";
 import { execa as execa4 } from "execa";
 
 // src/tui/state.ts
@@ -2433,7 +2620,6 @@ function getAvailableActions(state) {
   }
   if (state.isOnMain) {
     actions.push({ id: "create", label: "new", shortcut: "n" });
-    actions.push({ id: "run-auto", label: "run next", shortcut: "r" });
     actions.push({ id: "list", label: "list", shortcut: "l" });
     actions.push({ id: "switch-provider", label: "switch", shortcut: "s" });
     actions.push({ id: "quit", label: "quit", shortcut: "q" });
@@ -2442,16 +2628,16 @@ function getAvailableActions(state) {
   if (state.hasUncommittedChanges) {
     actions.push({ id: "commit", label: "commit", shortcut: "c" });
   }
-  if (state.hasUnpushedCommits) {
+  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: "Create pr", shortcut: "C" });
   }
+  if (state.issue) {
+    actions.push({ id: "implement", label: "implement", shortcut: "i" });
+  }
   if (state.pr && state.pr.state === "open") {
-    if (state.hasActionableFeedback) {
-      actions.push({ id: "fix", label: "fix feedback", shortcut: "f" });
-    }
     if (state.hasUIChanges && state.isPlaywrightAvailable && state.config.video.enabled) {
       actions.push({ id: "video", label: "video", shortcut: "v" });
     }
@@ -2459,6 +2645,7 @@ function getAvailableActions(state) {
   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: "switch-provider", label: "switch", shortcut: "s" });
   actions.push({ id: "quit", label: "quit", shortcut: "q" });
   return actions;
@@ -2602,6 +2789,14 @@ function renderModal(message) {
   for (let i = 0; i < padY; i++) console.log();
   for (const line of lines) console.log(line);
 }
+function renderActionPanel(title, content) {
+  const w = termWidth();
+  console.log(topRow(title, w));
+  for (const line of content) {
+    console.log(row(line, w));
+  }
+  console.log(botRow(w));
+}
 function renderSettings(state, w) {
   const provider = getProviderDisplayName(state.config.ai.provider);
   const provTag = state.isAIProviderAvailable ? chalk3.green(provider) : chalk3.red(provider);
@@ -2732,7 +2927,7 @@ function clearScreen() {
 // src/commands/tui.ts
 var CANCEL = /* @__PURE__ */ Symbol("cancel");
 async function confirm(message) {
-  const { ok } = await inquirer6.prompt([
+  const { ok } = await inquirer7.prompt([
     {
       type: "confirm",
       name: "ok",
@@ -2773,24 +2968,23 @@ async function waitForKey(validKeys) {
     stdin.on("data", onData);
   });
 }
-async function executeAction(actionId, state) {
+async function executeAction(actionId, state, providerSetter) {
   switch (actionId) {
     case "quit":
       return false;
-    case "list":
+    case "list": {
       clearScreen();
-      await listCommand({ status: "ready", limit: 20 });
+      try {
+        await listCommand({});
+      } catch (error) {
+        logger.error(`List failed: ${error}`);
+      }
       await promptContinue();
       return true;
-    case "run-auto": {
-      clearScreen();
-      if (!await confirm("Start AI agent to implement next ticket?")) return true;
-      await runCommand(void 0, { auto: true });
-      return false;
     }
     case "create": {
       clearScreen();
-      const { description } = await inquirer6.prompt([
+      const { description } = await inquirer7.prompt([
         {
           type: "input",
           name: "description",
@@ -2801,7 +2995,11 @@ async function executeAction(actionId, state) {
         logger.info("Cancelled");
         return true;
       }
-      await createCommand(description, {});
+      try {
+        await createCommand(description, {});
+      } catch (error) {
+        logger.error(`Create failed: ${error}`);
+      }
       await promptContinue();
       return true;
     }
@@ -2822,10 +3020,20 @@ async function executeAction(actionId, state) {
       await promptContinue();
       return true;
     }
-    case "fix": {
+    case "implement": {
       clearScreen();
-      if (!await confirm("Start AI agent to fix review feedback?")) return true;
-      await fixCommand({});
+      const hasCommits = state.commits.length > 0;
+      const hasFeedback = state.hasActionableFeedback;
+      let msg;
+      if (hasFeedback && hasCommits) {
+        msg = "Start AI agent to address review feedback?";
+      } else if (hasCommits) {
+        msg = "Start AI agent to continue implementation from existing commits?";
+      } else {
+        msg = "Start AI agent to implement this ticket from scratch?";
+      }
+      if (!await confirm(msg)) return true;
+      await handleImplement(state);
       return false;
     }
     case "video": {
@@ -2837,7 +3045,7 @@ async function executeAction(actionId, state) {
     }
     case "switch-provider":
       clearScreen();
-      await handleSwitchProvider(state);
+      await handleSwitchProvider(state, providerSetter);
       return true;
     case "checkout-main": {
       clearScreen();
@@ -2910,7 +3118,7 @@ async function generateCommitMessage(diffContent, issueNumber, issueTitle, state
   } catch {
     logger.warning("AI commit message generation failed");
     console.log();
-    const { message } = await inquirer6.prompt([
+    const { message } = await inquirer7.prompt([
       {
         type: "input",
         name: "message",
@@ -2920,6 +3128,50 @@ async function generateCommitMessage(diffContent, issueNumber, issueTitle, state
     return message.trim() || CANCEL;
   }
 }
+async function handleImplement(state) {
+  if (!state.issue) {
+    logger.error("No linked issue found");
+    return;
+  }
+  const agentInstructions = loadAgentInstructions();
+  const progressContent = readProgress(state.config);
+  const contextParts = [];
+  if (state.commits.length > 0) {
+    contextParts.push(
+      `## Current Progress
+There are ${state.commits.length} existing commit(s) on this branch:
+${state.commits.map((c) => `- ${c}`).join("\n")}
+
+Continue the implementation from where it left off. Review the existing work and complete any remaining tasks.`
+    );
+  }
+  if (state.hasActionableFeedback && state.reviewFeedback.length > 0) {
+    const feedbackLines = state.reviewFeedback.map((f) => `- [${f.source}] ${f.body.slice(0, 200)}`).join("\n");
+    contextParts.push(`## Review Feedback
+${feedbackLines}`);
+  }
+  const extraContext = contextParts.length > 0 ? contextParts.join("\n\n") : null;
+  const prompt = buildImplementationPrompt(
+    state.issue,
+    agentInstructions,
+    progressContent,
+    state.config,
+    extraContext
+  );
+  const providerName = getProviderDisplayName(state.config.ai.provider);
+  clearScreen();
+  renderActionPanel(`${providerName} Session`, [
+    `Implementing: #${state.issue.number} ${state.issue.title}`,
+    state.commits.length > 0 ? `Continuing from ${state.commits.length} existing commit(s)` : "Starting fresh implementation",
+    ...state.hasActionableFeedback ? [`Includes ${state.reviewFeedback.length} review feedback item(s)`] : []
+  ]);
+  console.log();
+  try {
+    await invokeAIInteractive(prompt, state.config);
+  } catch (error) {
+    logger.error(`${providerName} session failed: ${error}`);
+  }
+}
 async function handlePush() {
   try {
     const { stdout: branch } = await execa4("git", ["branch", "--show-current"]);
@@ -2933,9 +3185,9 @@ async function handlePush() {
   }
 }
 var PROVIDERS = ["claude", "gemini", "codex"];
-async function handleSwitchProvider(state) {
+async function handleSwitchProvider(state, setProvider) {
   const current = state.config.ai.provider;
-  const { provider } = await inquirer6.prompt([
+  const { provider } = await inquirer7.prompt([
     {
       type: "list",
       name: "provider",
@@ -2948,12 +3200,8 @@ async function handleSwitchProvider(state) {
     }
   ]);
   if (provider === current) return;
-  try {
-    updateConfigProvider(provider);
-    logger.success(`Provider switched to ${provider}`);
-  } catch (error) {
-    logger.error(`Failed to switch provider: ${error}`);
-  }
+  setProvider(provider);
+  logger.success(`Provider switched to ${provider} (session only)`);
 }
 async function handleCheckoutMain() {
   try {
@@ -2971,6 +3219,13 @@ async function handleVideoCapture(state) {
     logger.error("No linked issue found");
     return;
   }
+  const providerName = getProviderDisplayName(state.config.ai.provider);
+  clearScreen();
+  renderActionPanel("Video Capture", [
+    `Recording: #${state.issue.number} ${state.issue.title}`,
+    `Provider: ${providerName}`
+  ]);
+  console.log();
   try {
     const agentInstructions = loadAgentInstructions();
     const videoPrompt = buildVideoPrompt(
@@ -2987,7 +3242,7 @@ async function handleVideoCapture(state) {
 }
 async function promptContinue() {
   console.log();
-  await inquirer6.prompt([
+  await inquirer7.prompt([
     {
       type: "input",
       name: "continue",
@@ -2997,8 +3252,15 @@ async function promptContinue() {
 }
 async function tuiCommand() {
   let running = true;
+  let providerOverride = null;
+  const setProvider = (p) => {
+    providerOverride = p;
+  };
   while (running) {
     const state = await loadState();
+    if (providerOverride) {
+      state.config.ai.provider = providerOverride;
+    }
     clearScreen();
     const actions = getAvailableActions(state);
     let hint;
@@ -3014,7 +3276,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);
+      running = await executeAction(action.id, state, setProvider);
     }
   }
 }
@@ -3046,15 +3308,15 @@ program.command("setup-labels").description("Setup GitHub labels for AI workflow
 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 GitHub issues by label/status").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("-a, --auto", "Auto-select highest priority ai-ready issue").option("-p, --provider <provider>", "AI provider to use (claude, gemini, or codex)").action(async (issueNumber, options) => {
-  await runCommand(issueNumber, { auto: options.auto, provider: options.provider });
+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) => {
   await prCommand({