fix: gracefully handle missing gh CLI during push repo creation

Author: tc9011

src/commands/push.test.ts

@@ -1,7 +1,7 @@
 // src/commands/push.test.ts
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { getGitHubToken } from '../auth.js';
-import { pushSkills, getRepoRemoteUrl, ensureGitRepo, ensureRemote, createGitHubRepo } from '../git-ops.js';
+import { pushSkills, getRepoRemoteUrl, ensureGitRepo, ensureRemote, createGitHubRepo, isGhInstalled } from '../git-ops.js';
 
 const mockPrompts = vi.hoisted(() => ({
   intro: vi.fn(),
@@ -28,6 +28,7 @@ vi.mock('../git-ops.js', () => ({
   ensureGitRepo: vi.fn(),
   ensureRemote: vi.fn(),
   createGitHubRepo: vi.fn(),
+  isGhInstalled: vi.fn(),
   buildRemoteUrl: vi.fn((repo: string) => `https://github.com/${repo}.git`),
 }));
 
@@ -66,6 +67,7 @@ describe('push command logic', () => {
       remoteUrl: 'https://github.com/owner/my-skills.git',
       added: true,
     });
+    vi.mocked(isGhInstalled).mockReturnValue(true);
     // User declines creating a remote repo
     mockPrompts.confirm.mockResolvedValue(false);
     vi.mocked(pushSkills).mockResolvedValue({ committed: true, pushed: true });
@@ -88,6 +90,7 @@ describe('push command logic', () => {
       remoteUrl: 'https://github.com/owner/my-skills.git',
       added: true,
     });
+    vi.mocked(isGhInstalled).mockReturnValue(true);
     // User confirms creating repo
     mockPrompts.confirm.mockResolvedValue(true);
     vi.mocked(createGitHubRepo).mockReturnValue(undefined);
@@ -150,6 +153,7 @@ describe('push command logic', () => {
       remoteUrl: 'https://github.com/owner/my-skills.git',
       added: true,
     });
+    vi.mocked(isGhInstalled).mockReturnValue(true);
     // Simulate user pressing Ctrl+C on confirm prompt
     mockPrompts.confirm.mockResolvedValue(Symbol('cancel'));
     mockPrompts.isCancel.mockImplementation((val) => typeof val === 'symbol');
@@ -173,4 +177,44 @@ describe('push command logic', () => {
 
     expect(spinnerStop).toHaveBeenCalledWith('Unpushed commits pushed successfully!');
   });
+
+  it('shows note instead of confirm when gh CLI is not installed', async () => {
+    vi.mocked(getGitHubToken).mockReturnValue('ghp_test_token');
+    vi.mocked(ensureGitRepo).mockResolvedValue({ initialized: true });
+    vi.mocked(getRepoRemoteUrl).mockResolvedValue(null);
+    mockPrompts.text.mockResolvedValue('owner/my-skills');
+    vi.mocked(ensureRemote).mockResolvedValue({
+      remoteUrl: 'https://github.com/owner/my-skills.git',
+      added: true,
+    });
+    vi.mocked(isGhInstalled).mockReturnValue(false);
+    vi.mocked(pushSkills).mockResolvedValue({ committed: true, pushed: true });
+
+    const { pushCommand } = await import('./push.js');
+    await pushCommand({});
+
+    // Should show a note, not a confirm prompt
+    expect(mockPrompts.confirm).not.toHaveBeenCalled();
+    expect(createGitHubRepo).not.toHaveBeenCalled();
+    expect(mockPrompts.note).toHaveBeenCalledWith(
+      expect.stringContaining('gh CLI not found'),
+      expect.stringContaining('GitHub CLI not installed'),
+    );
+    // Should still proceed with push
+    expect(pushSkills).toHaveBeenCalledOnce();
+  });
+
+  it('skips gh check entirely when remote already exists', async () => {
+    vi.mocked(getGitHubToken).mockReturnValue('ghp_test_token');
+    vi.mocked(ensureGitRepo).mockResolvedValue({ initialized: false });
+    vi.mocked(getRepoRemoteUrl).mockResolvedValue('https://github.com/user/repo.git');
+    vi.mocked(pushSkills).mockResolvedValue({ committed: true, pushed: true });
+
+    const { pushCommand } = await import('./push.js');
+    await pushCommand({});
+
+    expect(isGhInstalled).not.toHaveBeenCalled();
+    expect(mockPrompts.confirm).not.toHaveBeenCalled();
+    expect(createGitHubRepo).not.toHaveBeenCalled();
+  });
 });

src/commands/push.ts

@@ -8,6 +8,7 @@ import {
   ensureGitRepo,
   ensureRemote,
   createGitHubRepo,
+  isGhInstalled,
 } from '../git-ops.js';
 import * as p from '@clack/prompts';
 
@@ -37,19 +38,27 @@ export async function pushCommand(options: { message?: string }): Promise<void>
 
     await ensureRemote(AGENTS_DIR, repo);
 
-    const shouldCreate = await p.confirm({
-      message: 'Create this repo on GitHub? (requires gh CLI)',
-    });
-    if (p.isCancel(shouldCreate)) {
-      p.cancel('Push cancelled.');
-      throw new CliError('Push cancelled by user.');
-    }
+    if (isGhInstalled()) {
+      const shouldCreate = await p.confirm({
+        message: 'Create this repo on GitHub? (requires gh CLI)',
+      });
+      if (p.isCancel(shouldCreate)) {
+        p.cancel('Push cancelled.');
+        throw new CliError('Push cancelled by user.');
+      }
 
-    if (shouldCreate === true) {
-      createGitHubRepo(repo);
+      if (shouldCreate === true) {
+        createGitHubRepo(repo);
+      }
+    } else {
+      p.note(
+        `gh CLI not found — cannot create the repo automatically.\nPlease create it manually at https://github.com/new and then re-run push.`,
+        '⚠ GitHub CLI not installed',
+      );
     }
   }
 
+
   // 5. Push
   const spinner = p.spinner();
   spinner.start('Pushing skills to GitHub...');

src/git-ops.test.ts

@@ -1,6 +1,6 @@
 // src/git-ops.test.ts
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { buildRemoteUrl, detectSuspiciousFiles, ensureGitignore, getRepoRemoteUrl, pushSkills, pullSkills, ensureGitRepo, ensureRemote, createGitHubRepo } from './git-ops.js';
+import { buildRemoteUrl, detectSuspiciousFiles, ensureGitignore, getRepoRemoteUrl, pushSkills, pullSkills, ensureGitRepo, ensureRemote, createGitHubRepo, isGhInstalled } from './git-ops.js';
 import { mkdtemp, rm, writeFile, readFile, mkdir } from 'node:fs/promises';
 import { join } from 'node:path';
 import { tmpdir } from 'node:os';
@@ -654,3 +654,28 @@ describe('createGitHubRepo', () => {
     expect(() => createGitHubRepo('owner/my-skills')).toThrow('Failed to create GitHub repository');
   });
 });
+
+// ---------------------------------------------------------------------------
+// isGhInstalled
+// ---------------------------------------------------------------------------
+describe('isGhInstalled', () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+  });
+
+  it('returns true when gh --version succeeds', () => {
+    mockExecSync.mockReturnValue('gh version 2.40.0');
+
+    expect(isGhInstalled()).toBe(true);
+    expect(mockExecSync).toHaveBeenCalledWith(
+      'gh --version',
+      expect.objectContaining({ stdio: ['pipe', 'pipe', 'pipe'] }),
+    );
+  });
+
+  it('returns false when gh is not installed', () => {
+    mockExecSync.mockImplementation(() => { throw new Error('command not found: gh'); });
+
+    expect(isGhInstalled()).toBe(false);
+  });
+});

src/git-ops.ts

@@ -332,6 +332,19 @@ export async function ensureRemote(
   return { remoteUrl, added: true };
 }
 
+/**
+ * Check whether the `gh` CLI is available on the system PATH.
+ */
+export function isGhInstalled(): boolean {
+  try {
+    execSync('gh --version', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+
 /**
  * Create a GitHub repository using the `gh` CLI.
  * Throws if `gh` is not installed or the command fails.