feat: Improve commit message generation & execution

Author: prod-broke-again

src/application/services/ProjectAnalyzer.ts

@@ -31,6 +31,10 @@ export interface ServerCommandsConfig {
   projectPath?: string;
   /** Run on the developer machine before SSH (e.g. npm run build, rsync). */
   localCommands?: string[];
+  /**
+   * When true, smart deploy never adds `npm run build` on the server (e.g. you build locally and upload assets).
+   */
+  skipRemoteNpmBuild?: boolean;
   server?: {
     host: string;
     user: string;
@@ -253,8 +257,13 @@ export class ProjectAnalyzer {
   /**
    * Generate smart deployment commands based on analysis
    */
-  public generateSmartDeployCommands(analysis: SmartDeployAnalysis): string[] {
+  public generateSmartDeployCommands(
+    analysis: SmartDeployAnalysis,
+    options?: { skipRemoteNpmBuild?: boolean }
+  ): string[] {
     const commands: string[] = [];
+    const skipRemoteNpmBuild = options?.skipRemoteNpmBuild === true;
+    const runRemoteNpmBuild = analysis.needsNpmBuild && !skipRemoteNpmBuild;
 
     // Always pull latest changes
     if (analysis.needsGitPull) {
@@ -270,7 +279,7 @@ export class ProjectAnalyzer {
     if (analysis.needsNpmInstall) {
       commands.push('npm install --production');
     }
-    if (analysis.needsNpmBuild) {
+    if (runRemoteNpmBuild) {
       commands.push('npm run build');
     }
 
@@ -282,8 +291,8 @@ export class ProjectAnalyzer {
       commands.push('php artisan migrate --force');
     }
 
-    // PM2 restart for Node.js projects
-    if (analysis.needsNpmBuild || analysis.needsNpmInstall) {
+    // PM2 restart when npm install or when we actually run a remote build
+    if (analysis.needsNpmInstall || runRemoteNpmBuild) {
       commands.push('pm2 restart 0');
     }
 

src/application/services/ServerCommandExecutor.ts

@@ -54,21 +54,51 @@ export class ServerCommandExecutor {
 
   /**
    * If localCommands use rsync, ensure rsync exists in PATH before starting deploy.
+   * On Windows, commands may use `wsl rsync ...`; in that case only WSL's rsync is checked.
    */
   public async validateLocalDeployPrerequisites(localCommands?: string[]): Promise<string[]> {
     const cmds = localCommands ?? [];
     const needsRsync = cmds.some(c => /\brsync\b/i.test(c));
     if (!needsRsync) {
       return [];
     }
+
+    const usesWslRsync = cmds.some(
+      c => /^\s*wsl\s+/i.test(c) && /\brsync\b/i.test(c)
+    );
+
+    if (usesWslRsync) {
+      try {
+        await execAsync('wsl rsync --version', { timeout: 8000 });
+        return [];
+      } catch {
+        return [
+          'localCommands use `wsl rsync`, but rsync was not found in WSL. In WSL run: sudo apt install rsync (Debian/Ubuntu) or equivalent, then retry.'
+        ];
+      }
+    }
+
     try {
       await execAsync('rsync --version', { timeout: 8000 });
+      return [];
     } catch {
+      if (process.platform === 'win32') {
+        try {
+          await execAsync('wsl rsync --version', { timeout: 8000 });
+          return [
+            'localCommands reference rsync, but `rsync` is not in PATH on Windows. Options: (1) Change the line to `wsl rsync ...` if you use WSL (fix paths if needed, e.g. /mnt/c/...). (2) Install rsync: `choco install rsync` or `scoop install rsync`, then reopen the terminal so PATH updates.'
+          ];
+        } catch {
+          /* fall through */
+        }
+        return [
+          'localCommands reference rsync, but rsync was not found in PATH. Install rsync (e.g. `choco install rsync` or `scoop install rsync`), use Git Bash with rsync, or use `wsl rsync ...` after installing rsync inside WSL.'
+        ];
+      }
       return [
         'localCommands reference rsync, but rsync was not found in PATH. Install rsync or adjust localCommands.'
       ];
     }
-    return [];
   }
 
   /**

src/cli/SmartCommitCli.ts

@@ -351,14 +351,19 @@ export class SmartCommitCli {
 
       const analysis = await projectAnalyzer.analyzeChangesForSmartDeploy(projectPath, projectType);
 
+      const skipRemoteNpmBuild = serverConfig.skipRemoteNpmBuild === true;
+
       // Show analysis results
       console.log(chalk.green('\n📊 Analysis Results:'));
       analysis.reasons.forEach(reason => {
         console.log(chalk.gray(`  • ${reason}`));
       });
+      if (skipRemoteNpmBuild && analysis.needsNpmBuild) {
+        console.log(chalk.gray('  • Remote npm run build skipped (skipRemoteNpmBuild in config)'));
+      }
 
       // Generate smart commands
-      const smartCommands = projectAnalyzer.generateSmartDeployCommands(analysis);
+      const smartCommands = projectAnalyzer.generateSmartDeployCommands(analysis, { skipRemoteNpmBuild });
 
       if (smartCommands.length === 0) {
         console.log(chalk.yellow('✅ No deployment needed - no changes detected!'));

tests/application/services/ProjectAnalyzer.test.ts

@@ -173,5 +173,52 @@ describe('ProjectAnalyzer.analyzeChangesForSmartDeploy', () => {
 
       expect(commands).not.toContain('npm run build');
     });
+
+    it('does NOT include npm run build or pm2 when needsNpmBuild but skipRemoteNpmBuild is true', () => {
+      const { ProjectAnalyzer: PA } = require('../../../src/application/services/ProjectAnalyzer');
+      const analyzer = new PA({} as IAiAssistant);
+
+      const commands = analyzer.generateSmartDeployCommands(
+        {
+          needsGitPull: true,
+          needsComposerInstall: false,
+          needsComposerUpdate: false,
+          needsNpmInstall: false,
+          needsNpmBuild: true,
+          needsLaravelOptimize: false,
+          needsLaravelMigrate: false,
+          needsSystemRestart: false,
+          reasons: [],
+        },
+        { skipRemoteNpmBuild: true }
+      );
+
+      expect(commands).not.toContain('npm run build');
+      expect(commands).not.toContain('pm2 restart 0');
+    });
+
+    it('still runs npm install and pm2 when skipRemoteNpmBuild but needsNpmInstall', () => {
+      const { ProjectAnalyzer: PA } = require('../../../src/application/services/ProjectAnalyzer');
+      const analyzer = new PA({} as IAiAssistant);
+
+      const commands = analyzer.generateSmartDeployCommands(
+        {
+          needsGitPull: true,
+          needsComposerInstall: false,
+          needsComposerUpdate: false,
+          needsNpmInstall: true,
+          needsNpmBuild: true,
+          needsLaravelOptimize: false,
+          needsLaravelMigrate: false,
+          needsSystemRestart: false,
+          reasons: [],
+        },
+        { skipRemoteNpmBuild: true }
+      );
+
+      expect(commands).not.toContain('npm run build');
+      expect(commands).toContain('npm install --production');
+      expect(commands).toContain('pm2 restart 0');
+    });
   });
 });