Address third round of Copilot review comments on PR #121

Author: shouze

github-code-search.ts

@@ -332,11 +332,27 @@ async function searchAction(
   // ─── Team-prefix grouping ─────────────────────────────────────────────────
   const pickTeams: Record<string, string> = {};
   if (!opts.groupByTeamPrefix && opts.pickTeam && opts.pickTeam.length > 0) {
-    process.stderr.write(
-      pc.yellow(
-        "warning: --pick-team has no effect without --group-by-team-prefix; picks are being ignored.\n",
-      ),
-    );
+    // Emit per-assignment warnings (same validation as when grouping is enabled) — see issue #121.
+    for (const assignment of opts.pickTeam) {
+      const eqIndex = assignment.indexOf("=");
+      if (eqIndex === -1) {
+        process.stderr.write(
+          `warning: --pick-team "${assignment}" is missing the = separator; skipping\n`,
+        );
+        continue;
+      }
+      const combined = assignment.slice(0, eqIndex).trim();
+      const chosen = assignment.slice(eqIndex + 1).trim();
+      if (!combined || !chosen) {
+        process.stderr.write(
+          `warning: --pick-team "${assignment}" must have non-empty combined and chosen labels; skipping\n`,
+        );
+        continue;
+      }
+      process.stderr.write(
+        `warning: --pick-team: no section found with label "${combined}"\n  (no combined sections remain)\n`,
+      );
+    }
   }
   if (opts.groupByTeamPrefix) {
     const prefixes = opts.groupByTeamPrefix
@@ -368,6 +384,18 @@ async function searchAction(
           );
           continue;
         }
+        // Validate that chosen is one of the teams in the combined label — see issue #121.
+        const combinedCandidates = combined
+          .split(" + ")
+          .map((part) => part.trim())
+          .filter((part) => part.length > 0);
+        if (combinedCandidates.length > 1 && !combinedCandidates.includes(chosen)) {
+          process.stderr.write(
+            `warning: --pick-team "${assignment}" has chosen label "${chosen}" which is not one of the teams in ` +
+              `"${combined}". Allowed choices: ${combinedCandidates.map((c) => `"${c}"`).join(", ")}; skipping\n`,
+          );
+          continue;
+        }
         const updated = applyTeamPick(sections, combined, chosen);
         if (updated === sections) {
           // applyTeamPick returns the same reference when the combined label is not found.

src/render.ts

@@ -557,7 +557,19 @@ export function renderGroups(
               : row.sectionLabel.length > maxCharsWithHint
                 ? row.sectionLabel.slice(0, Math.max(1, maxCharsWithHint - 1)) + "…"
                 : row.sectionLabel;
-          lines.push(`${pc.bgMagenta(pc.bold(`── ${activeLabel} `))}${pc.dim(hintPlain)}`);
+          // Fix: clip the hint itself when it doesn't fit in the remaining space — see issue #121.
+          const remainingWidth = termWidth - SECTION_FIXED - activeLabel.length;
+          let hint = "";
+          if (remainingWidth > 0) {
+            if (hintPlain.length <= remainingWidth) {
+              hint = hintPlain;
+            } else if (remainingWidth === 1) {
+              hint = "…";
+            } else {
+              hint = hintPlain.slice(0, remainingWidth - 1) + "…";
+            }
+          }
+          lines.push(`${pc.bgMagenta(pc.bold(`── ${activeLabel} `))}${hint ? pc.dim(hint) : ""}`);
         } else {
           lines.push(pc.bgMagenta(pc.bold(`── ${label} `)));
         }