Fix replay command not including --format, --output-type, --include-archived, --group-by-team-prefix

Author: shouze

github-code-search.ts

@@ -155,7 +155,10 @@ async function searchAction(
 
   if (isCI) {
     console.log(
-      buildOutput(groups, query, org, excludedRepos, excludedExtractRefs, format, outputType),
+      buildOutput(groups, query, org, excludedRepos, excludedExtractRefs, format, outputType, {
+        includeArchived,
+        groupByTeamPrefix: opts.groupByTeamPrefix,
+      }),
     );
   } else {
     await runInteractive(
@@ -166,6 +169,8 @@ async function searchAction(
       excludedExtractRefs,
       format,
       outputType,
+      includeArchived,
+      opts.groupByTeamPrefix,
     );
   }
 }

src/output.test.ts

@@ -9,6 +9,7 @@ import {
   shortExtractRef,
   shortRepo,
 } from "./output.ts";
+import type { ReplayOptions } from "./output.ts";
 import type { RepoGroup } from "./types.ts";
 
 const ORG = "myorg";
@@ -125,6 +126,62 @@ describe("buildReplayCommand", () => {
     const count = (cmd.match(/repoA/g) ?? []).length;
     expect(count).toBe(1);
   });
+
+  it("includes --format json when format is json", () => {
+    const groups = [makeGroup("myorg/repoA", ["a.ts"])];
+    const opts: ReplayOptions = { format: "json" };
+    const cmd = buildReplayCommand(groups, QUERY, ORG, new Set(), new Set(), opts);
+    expect(cmd).toContain("--format json");
+  });
+
+  it("does not include --format when format is markdown (default)", () => {
+    const groups = [makeGroup("myorg/repoA", ["a.ts"])];
+    const opts: ReplayOptions = { format: "markdown" };
+    const cmd = buildReplayCommand(groups, QUERY, ORG, new Set(), new Set(), opts);
+    expect(cmd).not.toContain("--format");
+  });
+
+  it("includes --output-type repo-only when outputType is repo-only", () => {
+    const groups = [makeGroup("myorg/repoA", ["a.ts"])];
+    const opts: ReplayOptions = { outputType: "repo-only" };
+    const cmd = buildReplayCommand(groups, QUERY, ORG, new Set(), new Set(), opts);
+    expect(cmd).toContain("--output-type repo-only");
+  });
+
+  it("does not include --output-type when outputType is repo-and-matches (default)", () => {
+    const groups = [makeGroup("myorg/repoA", ["a.ts"])];
+    const opts: ReplayOptions = { outputType: "repo-and-matches" };
+    const cmd = buildReplayCommand(groups, QUERY, ORG, new Set(), new Set(), opts);
+    expect(cmd).not.toContain("--output-type");
+  });
+
+  it("includes --include-archived when includeArchived is true", () => {
+    const groups = [makeGroup("myorg/repoA", ["a.ts"])];
+    const opts: ReplayOptions = { includeArchived: true };
+    const cmd = buildReplayCommand(groups, QUERY, ORG, new Set(), new Set(), opts);
+    expect(cmd).toContain("--include-archived");
+  });
+
+  it("does not include --include-archived when includeArchived is false (default)", () => {
+    const groups = [makeGroup("myorg/repoA", ["a.ts"])];
+    const opts: ReplayOptions = { includeArchived: false };
+    const cmd = buildReplayCommand(groups, QUERY, ORG, new Set(), new Set(), opts);
+    expect(cmd).not.toContain("--include-archived");
+  });
+
+  it("includes --group-by-team-prefix when groupByTeamPrefix is set", () => {
+    const groups = [makeGroup("myorg/repoA", ["a.ts"])];
+    const opts: ReplayOptions = { groupByTeamPrefix: "squad-,chapter-" };
+    const cmd = buildReplayCommand(groups, QUERY, ORG, new Set(), new Set(), opts);
+    expect(cmd).toContain("--group-by-team-prefix squad-,chapter-");
+  });
+
+  it("does not include --group-by-team-prefix when groupByTeamPrefix is empty (default)", () => {
+    const groups = [makeGroup("myorg/repoA", ["a.ts"])];
+    const opts: ReplayOptions = { groupByTeamPrefix: "" };
+    const cmd = buildReplayCommand(groups, QUERY, ORG, new Set(), new Set(), opts);
+    expect(cmd).not.toContain("--group-by-team-prefix");
+  });
 });
 
 describe("buildReplayDetails", () => {
@@ -439,4 +496,53 @@ describe("buildOutput", () => {
     expect(out).not.toContain("[src/foo.ts]");
     expect(out).toContain("myorg/repoA");
   });
+
+  it("threads --format json into replay command", () => {
+    const groups = [makeGroup("myorg/repoA", ["src/foo.ts"])];
+    const out = buildOutput(
+      groups,
+      QUERY,
+      ORG,
+      new Set(),
+      new Set(),
+      "markdown",
+      "repo-and-matches",
+      { includeArchived: false, groupByTeamPrefix: "" },
+    );
+    expect(out).not.toContain("--format");
+  });
+
+  it("threads --output-type repo-only into markdown replay command", () => {
+    const groups = [makeGroup("myorg/repoA", ["src/foo.ts"])];
+    const out = buildOutput(groups, QUERY, ORG, new Set(), new Set(), "markdown", "repo-only", {
+      includeArchived: false,
+      groupByTeamPrefix: "",
+    });
+    expect(out).toContain("--output-type repo-only");
+  });
+
+  it("threads --include-archived into markdown replay command", () => {
+    const groups = [makeGroup("myorg/repoA", ["src/foo.ts"])];
+    const out = buildOutput(
+      groups,
+      QUERY,
+      ORG,
+      new Set(),
+      new Set(),
+      "markdown",
+      "repo-and-matches",
+      { includeArchived: true, groupByTeamPrefix: "" },
+    );
+    expect(out).toContain("--include-archived");
+  });
+
+  it("threads --group-by-team-prefix into json replay command", () => {
+    const groups = [makeGroup("myorg/repoA", ["src/foo.ts"])];
+    const out = buildOutput(groups, QUERY, ORG, new Set(), new Set(), "json", "repo-and-matches", {
+      includeArchived: false,
+      groupByTeamPrefix: "squad-",
+    });
+    const parsed = JSON.parse(out);
+    expect(parsed.replayCommand).toContain("--group-by-team-prefix squad-");
+  });
 });

src/output.ts

@@ -18,6 +18,16 @@ export function shortExtractRef(full: string, org: string): string {
   return shortRepo(repoPart, org) + rest;
 }
 
+// ─── Replay options ───────────────────────────────────────────────────────────
+
+/** Options that affect the generated replay command. */
+export interface ReplayOptions {
+  format?: OutputFormat;
+  outputType?: OutputType;
+  includeArchived?: boolean;
+  groupByTeamPrefix?: string;
+}
+
 // ─── Replay command ───────────────────────────────────────────────────────────
 
 export function buildReplayCommand(
@@ -26,7 +36,10 @@ export function buildReplayCommand(
   org: string,
   excludedRepos: Set<string>,
   excludedExtractRefs: Set<string>,
+  // 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 parts: string[] = [
     `github-code-search ${JSON.stringify(query)} --org ${org} --no-interactive`,
   ];
@@ -60,6 +73,19 @@ export function buildReplayCommand(
     parts.push(`--exclude-extracts ${excludedExtractsList.join(",")}`);
   }
 
+  if (format && format !== "markdown") {
+    parts.push(`--format ${format}`);
+  }
+  if (outputType && outputType !== "repo-and-matches") {
+    parts.push(`--output-type ${outputType}`);
+  }
+  if (includeArchived) {
+    parts.push("--include-archived");
+  }
+  if (groupByTeamPrefix) {
+    parts.push(`--group-by-team-prefix ${groupByTeamPrefix}`);
+  }
+
   return `# Replay:\n${parts.join(" \\\n  ")}`;
 }
 
@@ -75,8 +101,9 @@ export function buildReplayDetails(
   org: string,
   excludedRepos: Set<string>,
   excludedExtractRefs: Set<string>,
+  options: ReplayOptions = {},
 ): string {
-  const raw = buildReplayCommand(groups, query, org, excludedRepos, excludedExtractRefs);
+  const raw = buildReplayCommand(groups, query, org, excludedRepos, excludedExtractRefs, options);
   // Strip the leading "# Replay:\n" comment so only the runnable lines remain.
   const shellCmd = raw.replace(/^# Replay:\n/, "");
   return [
@@ -106,6 +133,7 @@ export function buildMarkdownOutput(
   excludedRepos: Set<string>,
   excludedExtractRefs: Set<string>,
   outputType: OutputType = "repo-and-matches",
+  options: ReplayOptions = {},
 ): string {
   // repo-only: return the repo names followed by the replay command
   if (outputType === "repo-only") {
@@ -116,7 +144,7 @@ export function buildMarkdownOutput(
     return (
       repos.join("\n") +
       "\n\n" +
-      buildReplayDetails(groups, query, org, excludedRepos, excludedExtractRefs) +
+      buildReplayDetails(groups, query, org, excludedRepos, excludedExtractRefs, options) +
       "\n"
     );
   }
@@ -154,7 +182,7 @@ export function buildMarkdownOutput(
   }
 
   lines.push("");
-  lines.push(buildReplayDetails(groups, query, org, excludedRepos, excludedExtractRefs));
+  lines.push(buildReplayDetails(groups, query, org, excludedRepos, excludedExtractRefs, options));
 
   return lines.join("\n");
 }
@@ -168,6 +196,7 @@ export function buildJsonOutput(
   excludedRepos: Set<string>,
   excludedExtractRefs: Set<string>,
   outputType: OutputType = "repo-and-matches",
+  options: ReplayOptions = {},
 ): string {
   const results = groups
     .filter((g) => g.repoSelected)
@@ -192,7 +221,14 @@ export function buildJsonOutput(
     0,
   );
 
-  const replayCommand = buildReplayCommand(groups, query, org, excludedRepos, excludedExtractRefs);
+  const replayCommand = buildReplayCommand(
+    groups,
+    query,
+    org,
+    excludedRepos,
+    excludedExtractRefs,
+    options,
+  );
 
   return JSON.stringify(
     {
@@ -217,9 +253,27 @@ export function buildOutput(
   excludedExtractRefs: Set<string>,
   format: OutputFormat,
   outputType: OutputType = "repo-and-matches",
+  extraOptions: Pick<ReplayOptions, "includeArchived" | "groupByTeamPrefix"> = {},
 ): string {
+  const options: ReplayOptions = { format, outputType, ...extraOptions };
   if (format === "json") {
-    return buildJsonOutput(groups, query, org, excludedRepos, excludedExtractRefs, outputType);
+    return buildJsonOutput(
+      groups,
+      query,
+      org,
+      excludedRepos,
+      excludedExtractRefs,
+      outputType,
+      options,
+    );
   }
-  return buildMarkdownOutput(groups, query, org, excludedRepos, excludedExtractRefs, outputType);
+  return buildMarkdownOutput(
+    groups,
+    query,
+    org,
+    excludedRepos,
+    excludedExtractRefs,
+    outputType,
+    options,
+  );
 }

src/tui.ts

@@ -31,6 +31,8 @@ export async function runInteractive(
   excludedExtractRefs: Set<string>,
   format: OutputFormat,
   outputType: OutputType = "repo-and-matches",
+  includeArchived = false,
+  groupByTeamPrefix = "",
 ): Promise<void> {
   if (groups.length === 0) {
     console.log(pc.yellow("No results found."));
@@ -123,7 +125,10 @@ export async function runInteractive(
       process.stdout.write(ANSI_CLEAR);
       process.stdin.setRawMode(false);
       console.log(
-        buildOutput(groups, query, org, excludedRepos, excludedExtractRefs, format, outputType),
+        buildOutput(groups, query, org, excludedRepos, excludedExtractRefs, format, outputType, {
+          includeArchived,
+          groupByTeamPrefix,
+        }),
       );
       process.exit(0);
     }