Merge main into feat/cursor-cli-integration

Carefully merged latest changes from main branch into the Cursor CLI integration
branch. This merge brings in important improvements and fixes while preserving
all Cursor-related functionality.

Key changes from main:
- Sandbox mode security improvements and cloud storage compatibility
- Version-based settings migrations (v2 schema)
- Port configuration centralization
- System paths utilities for CLI detection
- Enhanced error handling in HttpApiClient
- Windows MCP process cleanup fixes
- New validation and build commands
- GitHub issue templates and release process improvements

Resolved conflicts in:
- apps/server/src/routes/context/routes/describe-image.ts
  (Combined Cursor provider routing with secure-fs imports)
- apps/server/src/services/auto-mode-service.ts
  (Merged failure tracking with raw output logging)
- apps/server/tests/unit/services/terminal-service.test.ts
  (Updated to async tests with systemPathExists mocking)
- libs/platform/src/index.ts
  (Combined WSL utilities with system-paths exports)
- libs/types/src/settings.ts
  (Merged DEFAULT_PHASE_MODELS with SETTINGS_VERSION constants)

All Cursor CLI integration features remain intact including:
- CursorProvider and CliProvider base class
- Phase-based model configuration
- Provider registry and factory patterns
- WSL support for Windows
- Model override UI components
- Cursor-specific settings and configurations

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

apps/ui/src/components/views/board-view.tsx

@@ -206,6 +206,7 @@ export function BoardView() {
     checkContextExists,
     features: hookFeatures,
     isLoading,
+    featuresWithContext,
     setFeaturesWithContext,
   });
 

apps/ui/src/components/views/board-view/components/kanban-card/card-actions.tsx

@@ -143,7 +143,7 @@ export function CardActions({
               <CheckCircle2 className="w-3 h-3 mr-1" />
               Verify
             </Button>
-          ) : hasContext && onResume ? (
+          ) : onResume ? (
             <Button
               variant="default"
               size="sm"
@@ -158,21 +158,6 @@ export function CardActions({
               <RotateCcw className="w-3 h-3 mr-1" />
               Resume
             </Button>
-          ) : onVerify ? (
-            <Button
-              variant="default"
-              size="sm"
-              className="flex-1 h-7 text-[11px] bg-[var(--status-success)] hover:bg-[var(--status-success)]/90"
-              onClick={(e) => {
-                e.stopPropagation();
-                onVerify();
-              }}
-              onPointerDown={(e) => e.stopPropagation()}
-              data-testid={`verify-feature-${feature.id}`}
-            >
-              <PlayCircle className="w-3 h-3 mr-1" />
-              Resume
-            </Button>
           ) : null}
           {onViewOutput && !feature.skipTests && (
             <Button

apps/ui/src/components/views/board-view/dialogs/agent-output-modal.tsx

@@ -105,9 +105,21 @@ export function AgentOutputModal({
     const api = getElectronAPI();
     if (!api?.autoMode) return;
 
+    console.log('[AgentOutputModal] Subscribing to events for featureId:', featureId);
+
     const unsubscribe = api.autoMode.onEvent((event) => {
+      console.log(
+        '[AgentOutputModal] Received event:',
+        event.type,
+        'featureId:',
+        'featureId' in event ? event.featureId : 'none',
+        'modalFeatureId:',
+        featureId
+      );
+
       // Filter events for this specific feature only (skip events without featureId)
       if ('featureId' in event && event.featureId !== featureId) {
+        console.log('[AgentOutputModal] Skipping event - featureId mismatch');
         return;
       }
 

apps/ui/src/components/views/board-view/hooks/use-board-actions.ts

@@ -435,21 +435,33 @@ export function useBoardActions({
 
   const handleResumeFeature = useCallback(
     async (feature: Feature) => {
-      if (!currentProject) return;
+      console.log('[Board] handleResumeFeature called for feature:', feature.id);
+      if (!currentProject) {
+        console.error('[Board] No current project');
+        return;
+      }
 
       try {
         const api = getElectronAPI();
         if (!api?.autoMode) {
-          console.error('Auto mode API not available');
+          console.error('[Board] Auto mode API not available');
           return;
         }
 
+        console.log('[Board] Calling resumeFeature API...', {
+          projectPath: currentProject.path,
+          featureId: feature.id,
+          useWorktrees,
+        });
+
         const result = await api.autoMode.resumeFeature(
           currentProject.path,
           feature.id,
           useWorktrees
         );
 
+        console.log('[Board] resumeFeature result:', result);
+
         if (result.success) {
           console.log('[Board] Feature resume started successfully');
         } else {

apps/ui/src/components/views/board-view/hooks/use-board-background.ts

@@ -1,5 +1,6 @@
 import { useMemo } from 'react';
 import { useAppStore, defaultBackgroundSettings } from '@/store/app-store';
+import { getServerUrlSync } from '@/lib/http-api-client';
 
 interface UseBoardBackgroundProps {
   currentProject: { path: string; id: string } | null;
@@ -23,7 +24,7 @@ export function useBoardBackground({ currentProject }: UseBoardBackgroundProps)
 
     return {
       backgroundImage: `url(${
-        import.meta.env.VITE_SERVER_URL || 'http://localhost:3008'
+        import.meta.env.VITE_SERVER_URL || getServerUrlSync()
       }/api/fs/image?path=${encodeURIComponent(
         backgroundSettings.imagePath
       )}&projectPath=${encodeURIComponent(currentProject.path)}${

apps/ui/src/components/views/board-view/hooks/use-board-effects.ts

@@ -1,4 +1,4 @@
-import { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 import { getElectronAPI } from '@/lib/electron';
 import { useAppStore } from '@/store/app-store';
 
@@ -12,6 +12,7 @@ interface UseBoardEffectsProps {
   checkContextExists: (featureId: string) => Promise<boolean>;
   features: any[];
   isLoading: boolean;
+  featuresWithContext: Set<string>;
   setFeaturesWithContext: (set: Set<string>) => void;
 }
 
@@ -25,8 +26,14 @@ export function useBoardEffects({
   checkContextExists,
   features,
   isLoading,
+  featuresWithContext,
   setFeaturesWithContext,
 }: UseBoardEffectsProps) {
+  // Keep a ref to the current featuresWithContext for use in event handlers
+  const featuresWithContextRef = useRef(featuresWithContext);
+  useEffect(() => {
+    featuresWithContextRef.current = featuresWithContext;
+  }, [featuresWithContext]);
   // Make current project available globally for modal
   useEffect(() => {
     if (currentProject) {
@@ -146,4 +153,30 @@ export function useBoardEffects({
       checkAllContexts();
     }
   }, [features, isLoading, checkContextExists, setFeaturesWithContext]);
+
+  // Re-check context when a feature stops, completes, or errors
+  // This ensures hasContext is updated even if the features array doesn't change
+  useEffect(() => {
+    const api = getElectronAPI();
+    if (!api?.autoMode) return;
+
+    const unsubscribe = api.autoMode.onEvent(async (event) => {
+      // When a feature stops (error/abort) or completes, re-check its context
+      if (
+        (event.type === 'auto_mode_error' || event.type === 'auto_mode_feature_complete') &&
+        event.featureId
+      ) {
+        const hasContext = await checkContextExists(event.featureId);
+        if (hasContext) {
+          const newSet = new Set(featuresWithContextRef.current);
+          newSet.add(event.featureId);
+          setFeaturesWithContext(newSet);
+        }
+      }
+    });
+
+    return () => {
+      unsubscribe();
+    };
+  }, [checkContextExists, setFeaturesWithContext]);
 }

apps/ui/src/components/views/terminal-view.tsx

@@ -13,6 +13,7 @@ import {
   SquarePlus,
   Settings,
 } from 'lucide-react';
+import { getServerUrlSync } from '@/lib/http-api-client';
 import {
   useAppStore,
   type TerminalPanelContent,
@@ -272,7 +273,7 @@ export function TerminalView() {
   // Get the default run script from terminal settings
   const defaultRunScript = useAppStore((state) => state.terminalState.defaultRunScript);
 
-  const serverUrl = import.meta.env.VITE_SERVER_URL || 'http://localhost:3008';
+  const serverUrl = import.meta.env.VITE_SERVER_URL || getServerUrlSync();
 
   // Helper to collect all session IDs from all tabs
   const collectAllSessionIds = useCallback((): string[] => {

apps/ui/src/components/views/terminal-view/terminal-panel.tsx

@@ -40,7 +40,7 @@ import {
 } from '@/config/terminal-themes';
 import { toast } from 'sonner';
 import { getElectronAPI } from '@/lib/electron';
-import { getApiKey, getSessionToken } from '@/lib/http-api-client';
+import { getApiKey, getSessionToken, getServerUrlSync } from '@/lib/http-api-client';
 
 // Font size constraints
 const MIN_FONT_SIZE = 8;
@@ -483,7 +483,7 @@ export function TerminalPanel({
     [closeContextMenu, copySelection, pasteFromClipboard, selectAll, clearTerminal]
   );
 
-  const serverUrl = import.meta.env.VITE_SERVER_URL || 'http://localhost:3008';
+  const serverUrl = import.meta.env.VITE_SERVER_URL || getServerUrlSync();
   const wsUrl = serverUrl.replace(/^http/, 'ws');
 
   // Fetch a short-lived WebSocket token for secure authentication