Plumb --regex-hint into replay command; remove duplicate warn guidance

Author: shouze

github-code-search.ts

@@ -287,9 +287,8 @@ async function searchAction(
       process.exit(1);
     }
     if (warn && !opts.regexHint) {
-      console.error(
-        pc.yellow(`⚠  Regex mode — ${warn}\n   Provide a manual hint with --regex-hint <term>.`),
-      );
+      // warn already contains the --regex-hint guidance; print it as-is.
+      console.error(pc.yellow(`⚠  Regex mode — ${warn}`));
       process.exit(1);
     }
     effectiveQuery = opts.regexHint ?? apiQuery;
@@ -329,6 +328,7 @@ async function searchAction(
       buildOutput(groups, query, org, excludedRepos, excludedExtractRefs, format, outputType, {
         includeArchived,
         groupByTeamPrefix: opts.groupByTeamPrefix,
+        regexHint: opts.regexHint,
       }),
     );
     // Check for a newer version and notify on stderr so it never pollutes piped output.

src/output.test.ts

@@ -182,6 +182,20 @@ describe("buildReplayCommand", () => {
     const cmd = buildReplayCommand(groups, QUERY, ORG, new Set(), new Set(), opts);
     expect(cmd).not.toContain("--group-by-team-prefix");
   });
+
+  it("includes --regex-hint when regexHint is set", () => {
+    const groups = [makeGroup("myorg/repoA", ["a.ts"])];
+    const opts: ReplayOptions = { regexHint: '"axios"' };
+    const cmd = buildReplayCommand(groups, QUERY, ORG, new Set(), new Set(), opts);
+    expect(cmd).toContain("--regex-hint");
+    expect(cmd).toContain("axios");
+  });
+
+  it("does not include --regex-hint when regexHint is not set (default)", () => {
+    const groups = [makeGroup("myorg/repoA", ["a.ts"])];
+    const cmd = buildReplayCommand(groups, QUERY, ORG, new Set(), new Set());
+    expect(cmd).not.toContain("--regex-hint");
+  });
 });
 
 describe("buildReplayDetails", () => {

src/output.ts

@@ -26,6 +26,9 @@ export interface ReplayOptions {
   outputType?: OutputType;
   includeArchived?: boolean;
   groupByTeamPrefix?: string;
+  /** When set, appends `--regex-hint <term>` to the replay command so the
+   *  result set from a regex query can be reproduced exactly. */
+  regexHint?: string;
 }
 
 // ─── Replay command ───────────────────────────────────────────────────────────
@@ -39,7 +42,7 @@ export function buildReplayCommand(
   // Fix: forward all input options so the replay command is fully reproducible — see issue #11
   options: ReplayOptions = {},
 ): string {
-  const { format, outputType, includeArchived, groupByTeamPrefix } = options;
+  const { format, outputType, includeArchived, groupByTeamPrefix, regexHint } = options;
   const parts: string[] = [
     `github-code-search ${JSON.stringify(query)} --org ${org} --no-interactive`,
   ];
@@ -85,6 +88,9 @@ export function buildReplayCommand(
   if (groupByTeamPrefix) {
     parts.push(`--group-by-team-prefix ${groupByTeamPrefix}`);
   }
+  if (regexHint) {
+    parts.push(`--regex-hint ${JSON.stringify(regexHint)}`);
+  }
 
   return `# Replay:\n${parts.join(" \\\n  ")}`;
 }
@@ -253,7 +259,7 @@ export function buildOutput(
   excludedExtractRefs: Set<string>,
   format: OutputFormat,
   outputType: OutputType = "repo-and-matches",
-  extraOptions: Pick<ReplayOptions, "includeArchived" | "groupByTeamPrefix"> = {},
+  extraOptions: Pick<ReplayOptions, "includeArchived" | "groupByTeamPrefix" | "regexHint"> = {},
 ): string {
   const options: ReplayOptions = { format, outputType, ...extraOptions };
   if (format === "json") {