@towles/tool 0.0.66 → 0.0.68

package/src/utils/git/gh-cli-wrapper.test.ts

@@ -1,35 +1,32 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { x } from "tinyexec";
-import { getIssues, isGithubCliInstalled } from "./gh-cli-wrapper";
 
-vi.mock("tinyexec", () => ({
-  x: vi.fn().mockResolvedValue({ stdout: "[]" }),
-}));
+import type { XFn } from "./gh-cli-wrapper";
+import { getIssues, isGithubCliInstalled } from "./gh-cli-wrapper";
 
-const mockX = vi.mocked(x);
+const mockX: XFn = vi.fn().mockResolvedValue({ stdout: "[]", stderr: "", exitCode: 0 });
 
 describe("gh-cli-wrapper", () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    mockX.mockResolvedValue({ stdout: "[]" } as never);
+    vi.mocked(mockX).mockResolvedValue({ stdout: "[]", stderr: "", exitCode: 0 });
   });
 
   describe("getIssues", () => {
     it("passes --label flag when label provided", async () => {
-      await getIssues({ cwd: ".", label: "auto-claude" });
+      await getIssues({ cwd: ".", label: "auto-claude", exec: mockX });
 
       expect(mockX).toHaveBeenCalledWith("gh", expect.arrayContaining(["--label", "auto-claude"]));
     });
 
     it("does not pass --label flag when label not provided", async () => {
-      await getIssues({ cwd: "." });
+      await getIssues({ cwd: ".", exec: mockX });
 
-      const args = mockX.mock.calls[0]![1] as string[];
+      const args = vi.mocked(mockX).mock.calls[0]![1] as string[];
       expect(args).not.toContain("--label");
     });
 
     it("passes --assignee @me flag when assignedToMe is true", async () => {
-      await getIssues({ cwd: ".", assignedToMe: true });
+      await getIssues({ cwd: ".", assignedToMe: true, exec: mockX });
 
       expect(mockX).toHaveBeenCalledWith("gh", expect.arrayContaining(["--assignee", "@me"]));
     });
@@ -37,16 +34,20 @@ describe("gh-cli-wrapper", () => {
 
   describe("isGithubCliInstalled", () => {
     it("returns true when gh CLI outputs expected string", async () => {
-      mockX.mockResolvedValue({ stdout: "gh version 2.0.0 (https://github.com/cli/cli)" } as never);
+      vi.mocked(mockX).mockResolvedValue({
+        stdout: "gh version 2.0.0 (https://github.com/cli/cli)",
+        stderr: "",
+        exitCode: 0,
+      });
 
-      const result = await isGithubCliInstalled();
+      const result = await isGithubCliInstalled(mockX);
       expect(result).toBe(true);
     });
 
     it("returns false when gh CLI is not available", async () => {
-      mockX.mockRejectedValue(new Error("command not found"));
+      vi.mocked(mockX).mockRejectedValue(new Error("command not found"));
 
-      const result = await isGithubCliInstalled();
+      const result = await isGithubCliInstalled(mockX);
       expect(result).toBe(false);
     });
   });

package/src/utils/git/gh-cli-wrapper.ts

@@ -1,11 +1,18 @@
 import stripAnsi from "strip-ansi";
 import { x } from "tinyexec";
+import type { Output } from "tinyexec";
 
 import { execSafe } from "./exec.js";
 
-export async function isGithubCliInstalled(): Promise<boolean> {
+export type XFn = (
+  cmd: string,
+  args?: string[],
+  opts?: Record<string, unknown>,
+) => PromiseLike<Output>;
+
+export async function isGithubCliInstalled(exec: XFn = x as XFn): Promise<boolean> {
   try {
-    const proc = await x("gh", ["--version"]);
+    const proc = await exec("gh", ["--version"]);
     return proc.stdout.includes("https://github.com/cli/cli");
   } catch {
     // gh CLI not installed or not accessible
@@ -18,8 +25,12 @@ export async function gh<T = unknown>(args: string[]): Promise<T> {
   return JSON.parse(result.stdout.trim()) as T;
 }
 
-export async function ghRaw(args: string[]): Promise<string> {
-  const result = await execSafe("gh", args);
+export async function ghRaw(
+  args: string[],
+  exec?: (cmd: string, args: string[]) => Promise<{ stdout: string; ok: boolean }>,
+): Promise<string> {
+  const execFn = exec ?? execSafe;
+  const result = await execFn("gh", args);
   return result.stdout;
 }
 
@@ -37,9 +48,11 @@ export async function getIssues({
   assignedToMe,
   cwd,
   label,
+  exec = x as XFn,
 }: {
   assignedToMe?: boolean;
   cwd: string;
+  exec?: XFn;
   label?: string;
 }): Promise<Issue[]> {
   const args = ["issue", "list", "--json", "labels,number,title,state"];
@@ -52,7 +65,7 @@ export async function getIssues({
     args.push("--label", label);
   }
 
-  const result = await x("gh", args);
+  const result = await exec("gh", args);
   // Setting NO_COLOR=1 didn't remove colors so had to use stripAnsi
   const stripped = stripAnsi(result.stdout);