bugfix-309-setup-crash: Enhance CLI setup process by allowing token provision via command line, improving user guidance on token requirements. Update tests to verify behavior when token is provided, ensuring proper handling of setup conditions.

Author: efraespada

src/__tests__/cli.test.ts

@@ -34,19 +34,33 @@ jest.mock('../data/repository/ai_repository', () => ({
   })),
 }));
 
+jest.mock('../utils/setup_files', () => {
+  const actual = jest.requireActual<typeof import('../utils/setup_files')>('../utils/setup_files');
+  return {
+    ...actual,
+    hasValidSetupToken: jest.fn((cwd: string) => actual.hasValidSetupToken(cwd)),
+  };
+});
+
 describe('CLI', () => {
   let exitSpy: jest.SpyInstance;
+  let consoleErrorSpy: jest.SpyInstance;
+  let consoleLogSpy: jest.SpyInstance;
 
   beforeEach(() => {
     jest.clearAllMocks();
     exitSpy = jest.spyOn(process, 'exit').mockImplementation((() => {}) as () => never);
     (execSync as jest.Mock).mockReturnValue(Buffer.from('https://github.com/test-owner/test-repo.git'));
     (runLocalAction as jest.Mock).mockResolvedValue(undefined);
     mockIsIssue.mockResolvedValue(true);
+    consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+    consoleLogSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
   });
 
   afterEach(() => {
     exitSpy?.mockRestore();
+    consoleErrorSpy?.mockRestore();
+    consoleLogSpy?.mockRestore();
   });
 
   describe('think', () => {
@@ -265,8 +279,7 @@ describe('CLI', () => {
 
   describe('setup', () => {
     // Token check: hasValidSetupToken/setupEnvFileExists and message variants are covered in
-    // setup_files.test.ts and initial_setup_use_case.test.ts. Full "exit with proposal" path
-    // is hard to test here because Commander captures options.token default at CLI load time.
+    // setup_files.test.ts and initial_setup_use_case.test.ts.
     it('calls runLocalAction with INITIAL_SETUP', async () => {
       await program.parseAsync(['node', 'cli', 'setup']);
 
@@ -277,6 +290,19 @@ describe('CLI', () => {
       expect(params[INPUT_KEYS.WELCOME_TITLE]).toContain('Initial Setup');
     });
 
+    it('proceeds when --token is provided even if env/.env has no token', async () => {
+      const { hasValidSetupToken } = require('../utils/setup_files');
+      (hasValidSetupToken as jest.Mock).mockReturnValue(false);
+
+      await program.parseAsync(['node', 'cli', 'setup', '--token', 'ghp_abcdefghijklmnopqrstuvwxyz12']);
+
+      expect(exitSpy).not.toHaveBeenCalled();
+      expect(runLocalAction).toHaveBeenCalledTimes(1);
+      const params = (runLocalAction as jest.Mock).mock.calls[0][0];
+      expect(params[INPUT_KEYS.TOKEN]).toBe('ghp_abcdefghijklmnopqrstuvwxyz12');
+      expect(params[INPUT_KEYS.SINGLE_ACTION]).toBe(ACTIONS.INITIAL_SETUP);
+    });
+
     it('exits when not inside a git repo', async () => {
       (execSync as jest.Mock).mockImplementation((cmd: string) => {
         if (typeof cmd === 'string' && cmd.includes('is-inside-work-tree')) throw new Error('not a repo');

src/cli.ts

@@ -444,9 +444,11 @@ program
     }
     logInfo(`📦 Repository: ${gitInfo.owner}/${gitInfo.repo}`);
 
-    if (!hasValidSetupToken(cwd)) {
+    const hasTokenFromCli = Boolean(options.token && String(options.token).trim());
+    if (!hasTokenFromCli && !hasValidSetupToken(cwd)) {
       logError('🛑 Setup requires PERSONAL_ACCESS_TOKEN with a valid token.');
       logInfo('   You can:');
+      logInfo('   • Pass it on the command line: copilot setup --token <your_github_token>');
       logInfo('   • Add it to your environment: export PERSONAL_ACCESS_TOKEN=your_github_token');
       if (setupEnvFileExists(cwd)) {
         logInfo('   • Or add PERSONAL_ACCESS_TOKEN=your_github_token to your existing .env file');