Address PR review comments: rename dispatchMode→repickMode, fix hints text, add tests, update docs

Author: shouze

docs/usage/team-grouping.md

@@ -109,6 +109,8 @@ github-code-search query "useFeatureFlag" --org fulll \
 
 The flag is repeatable — add one `--pick-team` per combined section to resolve. The replay command emits `--pick-team` automatically when a pick was confirmed in the TUI.
 
+> **Note:** Per-repo re-picks performed in the TUI (pressing `t` on a `◈` repo) are **not** encoded in the replay command. They are interactive-only adjustments and must be repeated manually if you re-run the command.
+
 If the combined label is not found (typo, or the section was not formed), a warning is emitted on stderr listing the available combined sections — the run continues without error.
 
 ## Re-pick & undo pick
@@ -149,7 +151,7 @@ Pressing `0` or `u` in re-pick mode restores the repo to the combined section it
 ▶ ◈  fulll/frontend-app
 ```
 
-In **non-interactive mode**, undoing a pick is implicit: simply omit the `--pick-team` flag for the repo in the replay command.
+In **non-interactive mode**, undoing a pick is implicit: simply omit the `--pick-team` flag for that combined section in the replay command.
 
 ## Team list cache
 

src/group.ts

@@ -204,7 +204,7 @@ export function undoPickedRepo(groups: RepoGroup[], repoIndex: number): RepoGrou
       i === dstIdx ? { ...s, groups: [...s.groups, restoredRepo] } : s,
     );
   } else {
-    // Re-insert at the position of the original source section (best-effort)
+    // No existing section found — append a new combined section at the end.
     sections = [...sections, { label: combinedLabel, groups: [restoredRepo] }];
   }
 

src/render.test.ts

@@ -1981,3 +1981,82 @@ describe("normalizeScrollOffset", () => {
     expect(normalizeScrollOffset(1, rows, groups, 3)).toBe(1);
   });
 });
+
+// ─── renderGroups — re-pick mode hints bar ────────────────────────────────────
+
+describe("renderGroups — re-pick mode hints bar", () => {
+  it("shows Re-pick: prefix and candidate teams when repickMode is active", () => {
+    const groups = [makeGroup("org/repo", ["a.ts"])];
+    const rows = buildRows(groups);
+    const out = renderGroups(groups, 0, rows, 40, 0, "q", "org", {
+      repickMode: {
+        active: true,
+        repoIndex: 0,
+        candidates: ["squad-frontend", "squad-mobile"],
+        focusedIndex: 0,
+      },
+      termWidth: 120,
+    });
+    const stripped = out.replace(/\x1b\[[0-9;]*m/g, "");
+    expect(stripped).toContain("Re-pick:");
+    expect(stripped).toContain("squad-frontend");
+    expect(stripped).toContain("0/u restore");
+    expect(stripped).toContain("Esc/t cancel");
+  });
+
+  it("re-pick hints line visible width never exceeds termWidth", () => {
+    // Fix: clip hints to termWidth so the line never wraps — see issue #105.
+    const groups = [makeGroup("org/repo", ["a.ts"])];
+    const rows = buildRows(groups);
+    const termWidth = 60;
+    const out = renderGroups(groups, 0, rows, 40, 0, "q", "org", {
+      repickMode: {
+        active: true,
+        repoIndex: 0,
+        candidates: ["squad-frontend", "squad-mobile"],
+        focusedIndex: 0,
+      },
+      termWidth,
+    });
+    const stripped = out.replace(/\x1b\[[0-9;]*m/g, "");
+    const repickLine = stripped.split("\n").find((l) => l.includes("Re-pick:"));
+    expect(repickLine).toBeDefined();
+    expect(repickLine!.length).toBeLessThanOrEqual(termWidth);
+  });
+
+  it("truncates suffix gracefully on very narrow terminal without crashing", () => {
+    const groups = [makeGroup("org/repo", ["a.ts"])];
+    const rows = buildRows(groups);
+    const termWidth = 25; // narrow — full suffix won't fit
+    const out = renderGroups(groups, 0, rows, 40, 0, "q", "org", {
+      repickMode: {
+        active: true,
+        repoIndex: 0,
+        candidates: ["squad-frontend", "squad-mobile"],
+        focusedIndex: 0,
+      },
+      termWidth,
+    });
+    const stripped = out.replace(/\x1b\[[0-9;]*m/g, "");
+    const repickLine = stripped.split("\n").find((l) => l.includes("Re-pick:"));
+    expect(repickLine).toBeDefined();
+    expect(repickLine!.length).toBeLessThanOrEqual(termWidth);
+  });
+
+  it("focuses the correct candidate in [ brackets ]", () => {
+    const groups = [makeGroup("org/repo", ["a.ts"])];
+    const rows = buildRows(groups);
+    const out = renderGroups(groups, 0, rows, 40, 0, "q", "org", {
+      repickMode: {
+        active: true,
+        repoIndex: 0,
+        candidates: ["squad-alpha", "squad-beta"],
+        focusedIndex: 1,
+      },
+      termWidth: 120,
+    });
+    const stripped = out.replace(/\x1b\[[0-9;]*m/g, "");
+    // focusedIndex=1 → squad-beta is focused → should appear in [ brackets ]
+    expect(stripped).toContain("[ squad-beta ]");
+  });
+});

src/render.ts

@@ -320,8 +320,8 @@ interface RenderOptions {
     candidates: string[];
     focusedIndex: number;
   };
-  /** Active team dispatch (re-pick) mode state — when set, shows the re-pick bar in the hints line. */
-  dispatchMode?: {
+  /** Active team re-pick mode state — when set, shows the re-pick bar in the hints line. */
+  repickMode?: {
     active: boolean;
     repoIndex: number;
     candidates: string[];
@@ -465,12 +465,12 @@ export function renderGroups(
   }
 
   // Fix: clip hints to termWidth visible chars so the line never wraps — see issue #105.
-  if (opts.dispatchMode?.active) {
-    const dm = opts.dispatchMode;
+  if (opts.repickMode?.active) {
+    const dm = opts.repickMode;
     // Re-pick bar: same layout as pick mode — focused team in [ brackets ], others dimmed.
     // Suffix with 0/u undo and Esc/t cancel hints, clipped to one line with horizontal scroll.
     const REPICK_PREFIX = "Re-pick: ";
-    const REPICK_SUFFIX = "  0/u restore  ← → move  ↵ confirm  Esc cancel";
+    const REPICK_SUFFIX = "  0/u restore  ← → move  ↵ confirm  Esc/t cancel";
     const barWidth = Math.max(0, termWidth - REPICK_PREFIX.length - REPICK_SUFFIX.length);
     const bar = renderTeamPickHeader(dm.candidates, dm.focusedIndex, barWidth);
     const barPlain = stripAnsi(bar);

src/tui.ts

@@ -200,9 +200,9 @@ export async function runInteractive(
    *  so they are included in the replay command even if no additional interactive picks are made. */
   const confirmedPicks: Record<string, string> = { ...initialPickTeams };
 
-  // ─── Team dispatch (re-pick) mode state ───────────────────────────────────────
+  // ─── Team re-pick mode state ──────────────────────────────────────────────────
   // Feat: re-pick mode — re-assign a picked (◈) repo to a different team — see issue #87
-  let dispatchMode: {
+  let repickMode: {
     active: boolean;
     repoIndex: number;
     candidates: string[];
@@ -250,7 +250,7 @@ export async function runInteractive(
       filterTarget,
       filterRegex,
       teamPickMode: teamPickMode.active ? teamPickMode : undefined,
-      dispatchMode: dispatchMode.active ? dispatchMode : undefined,
+      repickMode: repickMode.active ? repickMode : undefined,
     });
     process.stdout.write(ANSI_CLEAR);
     process.stdout.write(rendered);
@@ -310,51 +310,51 @@ export async function runInteractive(
 
     // ── Team re-pick mode key handler ─────────────────────────────────────────
     // Feat: re-pick mode — re-assign a picked (◈) repo to a different team — see issue #87
-    if (dispatchMode.active) {
+    if (repickMode.active) {
       if (key === KEY_CTRL_C) {
         process.stdout.write(ANSI_CLEAR);
         process.stdin.setRawMode(false);
         process.exit(0);
       } else if (key === ANSI_ARROW_LEFT) {
         // ← — cycle candidate teams backwards
-        dispatchMode = {
-          ...dispatchMode,
+        repickMode = {
+          ...repickMode,
           focusedIndex:
-            (dispatchMode.focusedIndex - 1 + dispatchMode.candidates.length) %
-            dispatchMode.candidates.length,
+            (repickMode.focusedIndex - 1 + repickMode.candidates.length) %
+            repickMode.candidates.length,
         };
       } else if (key === ANSI_ARROW_RIGHT) {
         // → — cycle candidate teams forwards
-        dispatchMode = {
-          ...dispatchMode,
-          focusedIndex: (dispatchMode.focusedIndex + 1) % dispatchMode.candidates.length,
+        repickMode = {
+          ...repickMode,
+          focusedIndex: (repickMode.focusedIndex + 1) % repickMode.candidates.length,
         };
       } else if (key === KEY_ENTER_CR || key === KEY_ENTER_LF) {
         // Enter — confirm re-pick, move repo to the focused candidate team
-        const targetTeam = dispatchMode.candidates[dispatchMode.focusedIndex];
-        const g = groups[dispatchMode.repoIndex];
+        const targetTeam = repickMode.candidates[repickMode.focusedIndex];
+        const g = groups[repickMode.repoIndex];
         groups = moveRepoToSection(groups, g.repoFullName, targetTeam);
         const newRows = buildRows(groups, filterPath, filterTarget, filterRegex);
         cursor = Math.min(cursor, Math.max(0, newRows.length - 1));
         scrollOffset = Math.min(scrollOffset, cursor);
-        dispatchMode = { active: false, repoIndex: -1, candidates: [], focusedIndex: 0 };
+        repickMode = { active: false, repoIndex: -1, candidates: [], focusedIndex: 0 };
       } else if (key === "0" || key === "u") {
         // 0 / u — undo pick, restore repo to its original combined section.
         // Remove the confirmedPick entry for the combined label so the replay
         // command no longer emits --pick-team for that section.
-        const combinedLabel = groups[dispatchMode.repoIndex]?.pickedFrom;
+        const combinedLabel = groups[repickMode.repoIndex]?.pickedFrom;
         if (combinedLabel) delete confirmedPicks[combinedLabel];
-        groups = undoPickedRepo(groups, dispatchMode.repoIndex);
+        groups = undoPickedRepo(groups, repickMode.repoIndex);
         const newRows = buildRows(groups, filterPath, filterTarget, filterRegex);
         cursor = Math.min(cursor, Math.max(0, newRows.length - 1));
         scrollOffset = Math.min(scrollOffset, cursor);
-        dispatchMode = { active: false, repoIndex: -1, candidates: [], focusedIndex: 0 };
+        repickMode = { active: false, repoIndex: -1, candidates: [], focusedIndex: 0 };
       } else if (key === "\x1b" && !key.startsWith("\x1b[") && !key.startsWith("\x1b\x1b")) {
         // Esc — cancel re-pick mode
-        dispatchMode = { active: false, repoIndex: -1, candidates: [], focusedIndex: 0 };
+        repickMode = { active: false, repoIndex: -1, candidates: [], focusedIndex: 0 };
       } else if (key === "t") {
         // t — toggle re-pick mode off
-        dispatchMode = { active: false, repoIndex: -1, candidates: [], focusedIndex: 0 };
+        repickMode = { active: false, repoIndex: -1, candidates: [], focusedIndex: 0 };
       }
       redraw();
       continue;
@@ -535,17 +535,17 @@ export async function runInteractive(
       continue;
     }
 
-    // `t` — on a picked repo (◈, has pickedFrom): enter dispatch mode to re-assign to a
+    // `t` — on a picked repo (◈, has pickedFrom): enter re-pick mode to re-assign to a
     // different team. Otherwise cycle the filter target: path → content → repo → path.
-    // Feat: team dispatch mode — see issue #86
+    // Feat: re-pick mode — see issue #87
     if (key === "t") {
       const isPickedRepo =
         groupByTeamPrefix && row?.type === "repo" && !!groups[row.repoIndex]?.pickedFrom;
       if (isPickedRepo) {
-        // Enter dispatch mode — candidates come from the original combined label
+        // Enter re-pick mode — candidates come from the original combined label
         const pickedFrom = groups[row!.repoIndex].pickedFrom!;
         const candidates = pickedFrom.split(" + ").map((c) => c.trim());
-        dispatchMode = { active: true, repoIndex: row!.repoIndex, candidates, focusedIndex: 0 };
+        repickMode = { active: true, repoIndex: row!.repoIndex, candidates, focusedIndex: 0 };
       } else {
         // Cycle filter target when not on a picked repo
         filterTarget =