fix: address friction log issues from Greg's workos install test

- Fix silent commit failure: track postInstallError in state machine
  context so emitComplete emits success: false when commit/push/PR fails
- Capture pre-commit hook output: stageAndCommit now pipes stderr/stdout
  and includes hook output in error messages
- Include WORKOS_COOKIE_PASSWORD and redirect URI in Vercel env uploads
  by reading .env.local after generation
- Improve port detection: detect PORT=NNNN in dev scripts and .env files
- Add existing env var conflict detection before Vercel upload prompt
- Enhance agent spinner with file operation names and elapsed time
- Add tests for post-install, port detection, and env var upload

Author: nicknisi

src/lib/adapters/cli-adapter.ts

@@ -32,6 +32,8 @@ export class CLIAdapter implements InstallerAdapter {
 
   // Long-running agent update interval
   private agentUpdateInterval: NodeJS.Timeout | null = null;
+  private agentStartTime: number | null = null;
+  private lastFileOperation: string | null = null;
 
   constructor(config: AdapterConfig) {
     this.emitter = config.emitter;
@@ -107,6 +109,8 @@ export class CLIAdapter implements InstallerAdapter {
     this.subscribe('config:complete', this.handleConfigComplete);
     this.subscribe('agent:start', this.handleAgentStart);
     this.subscribe('agent:progress', this.handleAgentProgress);
+    this.subscribe('file:write', this.handleFileWrite);
+    this.subscribe('file:edit', this.handleFileEdit);
     this.subscribe('validation:start', this.handleValidationStart);
     this.subscribe('validation:issues', this.handleValidationIssues);
     this.subscribe('validation:complete', this.handleValidationComplete);
@@ -161,6 +165,8 @@ export class CLIAdapter implements InstallerAdapter {
       clearInterval(this.agentUpdateInterval);
       this.agentUpdateInterval = null;
     }
+    this.agentStartTime = null;
+    this.lastFileOperation = null;
   };
 
   private stopSpinner(message: string): void {
@@ -346,15 +352,18 @@ export class CLIAdapter implements InstallerAdapter {
   };
 
   private handleAgentStart = (): void => {
+    this.agentStartTime = Date.now();
+    this.lastFileOperation = null;
     this.spinner = clack.spinner();
     this.spinner.start('Running AI agent...');
 
-    // Periodic status updates for long-running operations
-    let dots = 0;
+    // Periodic status updates with elapsed time
     this.agentUpdateInterval = setInterval(() => {
-      dots = (dots + 1) % 4;
-      const dotStr = '.'.repeat(dots + 1);
-      this.spinner?.message(`Running AI agent${dotStr}`);
+      const elapsed = Math.round((Date.now() - (this.agentStartTime ?? Date.now())) / 1000);
+      const timeStr =
+        elapsed >= 60 ? `${Math.floor(elapsed / 60)}m ${elapsed % 60}s` : `${elapsed}s`;
+      const detail = this.lastFileOperation ?? 'Working';
+      this.spinner?.message(`${detail} (${timeStr})`);
     }, 2000);
   };
 
@@ -363,6 +372,18 @@ export class CLIAdapter implements InstallerAdapter {
     this.spinner?.message(message);
   };
 
+  private handleFileWrite = ({ path }: InstallerEvents['file:write']): void => {
+    const shortPath = path.split('/').slice(-2).join('/');
+    this.lastFileOperation = `Writing ${shortPath}`;
+    this.spinner?.message(this.lastFileOperation);
+  };
+
+  private handleFileEdit = ({ path }: InstallerEvents['file:edit']): void => {
+    const shortPath = path.split('/').slice(-2).join('/');
+    this.lastFileOperation = `Editing ${shortPath}`;
+    this.spinner?.message(this.lastFileOperation);
+  };
+
   private handleValidationStart = (): void => {
     this.stopAgentUpdates();
     this.stopSpinner('Agent completed');

src/lib/agent-runner.ts

@@ -15,6 +15,9 @@ import { uploadEnvironmentVariablesStep } from '../steps/index.js';
 import { autoConfigureWorkOSEnvironment } from './workos-management.js';
 import { detectPort, getCallbackPath } from './port-detection.js';
 import { writeEnvLocal } from './env-writer.js';
+import { readFile, access } from 'node:fs/promises';
+import { join } from 'node:path';
+import { parseEnvFile } from '../utils/env-parser.js';
 
 /**
  * Universal agent-powered wizard runner.
@@ -175,6 +178,25 @@ export async function runAgentInstaller(config: FrameworkConfig, options: Instal
   // Build environment variables from WorkOS credentials
   const envVars = config.environment.getEnvVars(apiKey, clientId);
 
+  // Supplement with additional vars from .env.local (cookie password, redirect URI)
+  // These are generated by writeEnvLocal during configuration but not in getEnvVars.
+  // We read .env.local rather than changing the shared getEnvVars interface (used by 15+ integrations).
+  const envLocalPath = join(options.installDir, '.env.local');
+  try {
+    await access(envLocalPath);
+    const envLocal = parseEnvFile(await readFile(envLocalPath, 'utf-8'));
+    if (envLocal.WORKOS_COOKIE_PASSWORD) {
+      envVars.WORKOS_COOKIE_PASSWORD = envLocal.WORKOS_COOKIE_PASSWORD;
+    }
+    for (const key of Object.keys(envLocal)) {
+      if (key.endsWith('WORKOS_REDIRECT_URI') && !envVars[key]) {
+        envVars[key] = envLocal[key];
+      }
+    }
+  } catch {
+    // .env.local doesn't exist yet — vars will be written by agent
+  }
+
   // Upload environment variables to hosting providers (if configured)
   let uploadedEnvVars: string[] = [];
   if (config.environment.uploadToHosting) {

src/lib/installer-core.ts

@@ -241,6 +241,9 @@ export const installerMachine = setup({
       const message = context.error?.message ?? 'Commit failed';
       context.emitter.emit('postinstall:commit:failed', { error: message });
     },
+    assignPostInstallError: assign({
+      postInstallError: ({ context }) => context.error?.message ?? 'Post-install step failed',
+    }),
     emitPrPrompt: ({ context }) => {
       context.emitter.emit('postinstall:pr:prompt', {});
     },
@@ -282,8 +285,11 @@ export const installerMachine = setup({
       context.emitter.emit('postinstall:manual', { instructions });
     },
     emitComplete: ({ context }) => {
-      const summary = context.agentSummary ?? 'WorkOS AuthKit installed successfully!';
-      context.emitter.emit('complete', { success: true, summary });
+      const hasPostInstallError = !!context.postInstallError;
+      const summary = hasPostInstallError
+        ? `Installation completed but post-install failed: ${context.postInstallError}`
+        : context.agentSummary ?? 'WorkOS AuthKit installed successfully!';
+      context.emitter.emit('complete', { success: !hasPostInstallError, summary });
     },
   },
 
@@ -936,7 +942,7 @@ export const installerMachine = setup({
             },
             onError: {
               target: 'done',
-              actions: ['assignError', 'emitCommitFailed'],
+              actions: ['assignError', 'assignPostInstallError', 'emitCommitFailed'],
             },
           },
         },
@@ -989,7 +995,7 @@ export const installerMachine = setup({
             onDone: { target: 'creatingPr' },
             onError: {
               target: 'showingManualInstructions',
-              actions: ['assignError', 'emitPushFailed'],
+              actions: ['assignError', 'assignPostInstallError', 'emitPushFailed'],
             },
           },
         },
@@ -1010,7 +1016,7 @@ export const installerMachine = setup({
             },
             onError: {
               target: 'done',
-              actions: ['assignError', 'emitPrFailed'],
+              actions: ['assignError', 'assignPostInstallError', 'emitPrFailed'],
             },
           },
         },

src/lib/installer-core.types.ts

@@ -59,6 +59,8 @@ export interface InstallerMachineContext {
   prUrl?: string;
   /** Summary message from agent execution */
   agentSummary?: string;
+  /** Error from post-install steps (commit, push, PR) */
+  postInstallError?: string;
 }
 
 /**

src/lib/port-detection.spec.ts

@@ -0,0 +1,86 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import * as fs from 'node:fs';
+import { detectPort } from './port-detection.js';
+
+vi.mock('node:fs', async () => {
+  const actual = await vi.importActual<typeof import('node:fs')>('node:fs');
+  return {
+    ...actual,
+    readFileSync: vi.fn(),
+  };
+});
+
+vi.mock('./settings.js', () => ({
+  getConfig: () => ({
+    frameworks: {},
+  }),
+}));
+
+const mockReadFileSync = vi.mocked(fs.readFileSync);
+
+describe('port-detection', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  describe('detectPort for nextjs', () => {
+    it('detects port from -p flag in dev script', () => {
+      mockReadFileSync.mockReturnValue(
+        JSON.stringify({ scripts: { dev: 'next dev -p 4000' } }),
+      );
+      expect(detectPort('nextjs', '/test')).toBe(4000);
+    });
+
+    it('detects port from --port flag in dev script', () => {
+      mockReadFileSync.mockReturnValue(
+        JSON.stringify({ scripts: { dev: 'next dev --port 5000' } }),
+      );
+      expect(detectPort('nextjs', '/test')).toBe(5000);
+    });
+
+    it('detects port from --port= flag in dev script', () => {
+      mockReadFileSync.mockReturnValue(
+        JSON.stringify({ scripts: { dev: 'next dev --port=3123' } }),
+      );
+      expect(detectPort('nextjs', '/test')).toBe(3123);
+    });
+
+    it('detects PORT=NNNN inline env var in dev script', () => {
+      mockReadFileSync.mockReturnValue(
+        JSON.stringify({ scripts: { dev: 'PORT=3123 next dev' } }),
+      );
+      expect(detectPort('nextjs', '/test')).toBe(3123);
+    });
+
+    it('prefers -p flag over PORT= env var', () => {
+      mockReadFileSync.mockReturnValue(
+        JSON.stringify({ scripts: { dev: 'PORT=4000 next dev -p 5000' } }),
+      );
+      expect(detectPort('nextjs', '/test')).toBe(5000);
+    });
+
+    it('falls back to .env file PORT when no script port', () => {
+      // First call: package.json (no port in script)
+      mockReadFileSync.mockReturnValueOnce(
+        JSON.stringify({ scripts: { dev: 'next dev' } }),
+      );
+      // Second call: .env.local
+      mockReadFileSync.mockReturnValueOnce('PORT=3123\nOTHER_VAR=foo');
+
+      expect(detectPort('nextjs', '/test')).toBe(3123);
+    });
+
+    it('falls back to default 3000 when no port found anywhere', () => {
+      // package.json - no port
+      mockReadFileSync.mockReturnValueOnce(
+        JSON.stringify({ scripts: { dev: 'next dev' } }),
+      );
+      // All .env files throw (don't exist)
+      mockReadFileSync.mockImplementation(() => {
+        throw new Error('ENOENT');
+      });
+
+      expect(detectPort('nextjs', '/test')).toBe(3000);
+    });
+  });
+});

src/lib/port-detection.ts

@@ -46,7 +46,7 @@ function parseViteConfigPort(configPath: string): number | null {
 
 /**
  * Parse port from Next.js package.json scripts.
- * Next.js uses: "dev": "next dev -p 4000" or --port 4000
+ * Checks for: -p 4000, --port 4000, --port=4000, PORT=4000
  */
 function parseNextConfigPort(installDir: string): number | null {
   try {
@@ -60,12 +60,38 @@ function parseNextConfigPort(installDir: string): number | null {
     if (portMatch) {
       return parseInt(portMatch[1] || portMatch[2], 10);
     }
+
+    // Match: PORT=4000 (inline env var in script)
+    const portEnvMatch = devScript.match(/PORT=(\d+)/);
+    if (portEnvMatch) {
+      return parseInt(portEnvMatch[1], 10);
+    }
   } catch {
     // Can't read package.json
   }
   return null;
 }
 
+/**
+ * Parse PORT from .env files.
+ * Checks .env.local, .env.development, .env in order.
+ */
+function parseEnvFilePort(installDir: string): number | null {
+  const envFiles = ['.env.local', '.env.development', '.env'];
+  for (const file of envFiles) {
+    try {
+      const content = fs.readFileSync(join(installDir, file), 'utf-8');
+      const match = content.match(/^PORT=(\d+)/m);
+      if (match) {
+        return parseInt(match[1], 10);
+      }
+    } catch {
+      // File doesn't exist
+    }
+  }
+  return null;
+}
+
 /**
  * Parse port from TanStack Start app.config.ts.
  * Uses Vinxi: server: { port: N }
@@ -121,5 +147,6 @@ export function detectPort(integration: Integration, installDir: string): number
     }
   }
 
-  return detectedPort ?? getDefaultPort(integration);
+  // Fallback: check .env files for PORT before using framework default
+  return detectedPort ?? parseEnvFilePort(installDir) ?? getDefaultPort(integration);
 }