AndyMik90
diff --git a/‎apps/frontend/scripts/download-python.cjs‎
Lines changed: 35 additions & 0 deletions b/‎apps/frontend/scripts/download-python.cjs‎
Lines changed: 35 additions & 0 deletions
diff --git a/‎apps/frontend/src/main/cli-tool-manager.ts‎
Lines changed: 9 additions & 0 deletions b/‎apps/frontend/src/main/cli-tool-manager.ts‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎apps/frontend/src/main/env-utils.ts‎
Lines changed: 3 additions & 2 deletions b/‎apps/frontend/src/main/env-utils.ts‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎apps/frontend/src/main/ipc-handlers/agent-events-handlers.ts‎
Lines changed: 32 additions & 1 deletion b/‎apps/frontend/src/main/ipc-handlers/agent-events-handlers.ts‎
Lines changed: 32 additions & 1 deletion
@@ -46,6 +46,8 @@ const STRIP_PATTERNS = {
     '.pytest_cache',
     '.mypy_cache',
     '__pypackages__',
+    // Windows-specific bloat
+    'pythonwin',       // PyWin32 IDE - not needed (9MB)
   ],
   // File extensions to remove
   extensions: [
@@ -68,6 +70,7 @@ const STRIP_PATTERNS = {
     '.gitignore',
     '.gitattributes',
     '.editorconfig',
+    '.chm',      // Windows help files - not needed
   ],
   // Specific files to remove
   files: [
@@ -97,6 +100,12 @@ const STRIP_PATTERNS = {
     'conftest.py',
     'pytest.ini',
   ],
+  // Specific paths within packages to remove (relative to package directory)
+  // Format: 'package_name/subpath' - removes the entire subpath
+  packagePaths: [
+    'googleapiclient/discovery_cache/documents',  // Cached Google API discovery docs (92MB!)
+    'claude_agent_sdk/_bundled',                  // Bundled Claude CLI (224MB!) - users have it installed separately
+  ],
   // Packages that should NEVER be bundled (too large, specialized)
   // If these appear in dependencies, warn and skip
   blockedPackages: [
@@ -455,6 +464,32 @@ function stripSitePackages(sitePackagesDir) {
   const sizeBefore = getDirectorySize(sitePackagesDir);
   let removedCount = 0;
 
+  // First, remove specific package paths (e.g., googleapiclient/discovery_cache/documents)
+  // Use try/catch instead of existsSync to avoid TOCTOU race conditions
+  if (STRIP_PATTERNS.packagePaths) {
+    for (const pkgPath of STRIP_PATTERNS.packagePaths) {
+      const fullPath = path.join(sitePackagesDir, pkgPath);
+      try {
+        // Get size first (may throw ENOENT if path doesn't exist)
+        let pathSize = 0;
+        try {
+          pathSize = getDirectorySize(fullPath);
+        } catch {
+          // Path doesn't exist or can't get size - skip
+          continue;
+        }
+        fs.rmSync(fullPath, { recursive: true, force: true });
+        console.log(`[download-python] Removed ${pkgPath} (${formatBytes(pathSize)})`);
+        removedCount++;
+      } catch (err) {
+        // ENOENT means file was already gone - not an error
+        if (err.code !== 'ENOENT') {
+          console.warn(`[download-python] Failed to remove ${pkgPath}: ${err.message}`);
+        }
+      }
+    }
+  }
+
   function shouldRemoveDir(name) {
     return STRIP_PATTERNS.dirs.includes(name.toLowerCase());
   }
 
@@ -674,10 +674,19 @@ class CLIToolManager {
    */
   private validateClaude(claudeCmd: string): ToolValidation {
     try {
+      // On Windows, .cmd files need shell: true to execute properly.
+      // SECURITY NOTE: shell: true is safe here because:
+      // 1. claudeCmd comes from internal path detection (user config or known system paths)
+      // 2. Only '--version' is passed as an argument (no user input)
+      // If claudeCmd origin ever changes to accept user input, use escapeShellArgWindows.
+      const needsShell = process.platform === 'win32' &&
+        (claudeCmd.endsWith('.cmd') || claudeCmd.endsWith('.bat'));
+
       const version = execFileSync(claudeCmd, ['--version'], {
         encoding: 'utf-8',
         timeout: 5000,
         windowsHide: true,
+        shell: needsShell,
       }).trim();
 
       // Claude CLI version output format: "claude-code version X.Y.Z" or similar
 
@@ -157,9 +157,10 @@ export function findExecutable(command: string): string | null {
   const pathSeparator = process.platform === 'win32' ? ';' : ':';
   const pathDirs = (env.PATH || '').split(pathSeparator);
 
-  // On Windows, also check with common extensions
+  // On Windows, check Windows-native extensions first (.exe, .cmd) before
+  // extensionless files (which are typically bash/sh scripts for Git Bash/Cygwin)
   const extensions = process.platform === 'win32'
-    ? ['', '.exe', '.cmd', '.bat', '.ps1']
+    ? ['.exe', '.cmd', '.bat', '.ps1', '']
     : [''];
 
   for (const dir of pathDirs) {
 
@@ -1,6 +1,5 @@
 import type { BrowserWindow } from 'electron';
 import path from 'path';
-import { existsSync, readFileSync, writeFileSync } from 'fs';
 import { IPC_CHANNELS, getSpecsDir, AUTO_BUILD_PATHS } from '../../shared/constants';
 import type {
   SDKRateLimitInfo,
@@ -15,6 +14,7 @@ import { titleGenerator } from '../title-generator';
 import { fileWatcher } from '../file-watcher';
 import { projectStore } from '../project-store';
 import { notificationService } from '../notification-service';
+import { persistPlanStatusSync, getPlanPath } from './task/plan-file-utils';
 
 
 /**
@@ -92,6 +92,15 @@ export function registerAgenteventsHandlers(
 
         if (task && project) {
           const taskTitle = task.title || task.specId;
+          const planPath = getPlanPath(project, task);
+
+          // Use shared utility for persisting status (prevents race conditions)
+          const persistStatus = (status: TaskStatus) => {
+            const persisted = persistPlanStatusSync(planPath, status);
+            if (persisted) {
+              console.log(`[Task ${taskId}] Persisted status to plan: ${status}`);
+            }
+          };
 
           if (code === 0) {
             notificationService.notifyReviewNeeded(taskTitle, project.id, taskId);
@@ -105,6 +114,7 @@ export function registerAgenteventsHandlers(
 
             if (isActiveStatus && !hasIncompleteSubtasks) {
               console.log(`[Task ${taskId}] Fallback: Moving to human_review (process exited successfully)`);
+              persistStatus('human_review');
               mainWindow.webContents.send(
                 IPC_CHANNELS.TASK_STATUS_CHANGE,
                 taskId,
@@ -113,6 +123,7 @@ export function registerAgenteventsHandlers(
             }
           } else {
             notificationService.notifyTaskFailed(taskTitle, project.id, taskId);
+            persistStatus('human_review');
             mainWindow.webContents.send(
               IPC_CHANNELS.TASK_STATUS_CHANGE,
               taskId,
@@ -148,6 +159,26 @@ export function registerAgenteventsHandlers(
           taskId,
           newStatus
         );
+
+        // CRITICAL: Persist status to plan file to prevent flip-flop on task list refresh
+        // When getTasks() is called, it reads status from the plan file. Without persisting,
+        // the status in the file might differ from the UI, causing inconsistent state.
+        // Uses shared utility with locking to prevent race conditions.
+        try {
+          const projects = projectStore.getProjects();
+          for (const p of projects) {
+            const tasks = projectStore.getTasks(p.id);
+            const task = tasks.find((t) => t.id === taskId || t.specId === taskId);
+            if (task) {
+              const planPath = getPlanPath(p, task);
+              persistPlanStatusSync(planPath, newStatus);
+              break;
+            }
+          }
+        } catch (err) {
+          // Ignore persistence errors - UI will still work, just might flip on refresh
+          console.warn('[execution-progress] Could not persist status:', err);
+        }
       }
     }
   });