jongio
diff --git a/‎cli/build.ps1‎
Lines changed: 67 additions & 25 deletions b/‎cli/build.ps1‎
Lines changed: 67 additions & 25 deletions
diff --git a/‎cli/build.sh‎
Lines changed: 61 additions & 31 deletions b/‎cli/build.sh‎
Lines changed: 61 additions & 31 deletions
@@ -10,40 +10,82 @@ $EXTENSION_DIR = Split-Path -Parent $MyInvocation.MyCommand.Path
 # Change to the script directory
 Set-Location -Path $EXTENSION_DIR
 
-# Check if .go files have changed by comparing timestamps
-# Only kill CLI processes if Go files need rebuilding
-$shouldKillProcesses = $false
-$goFiles = Get-ChildItem -Path "src" -Recurse -Filter "*.go" -ErrorAction SilentlyContinue
-
-if ($goFiles) {
-    # Check if any binary exists to compare against
-    $existingBinaries = Get-ChildItem -Path "bin" -Filter "*.exe" -ErrorAction SilentlyContinue | Where-Object { $_.Name -notlike "*.old" }
-    if ($existingBinaries) {
-        $newestBinary = $existingBinaries | Sort-Object LastWriteTime -Descending | Select-Object -First 1
-        $newestGoFile = $goFiles | Sort-Object LastWriteTime -Descending | Select-Object -First 1
-        if ($newestGoFile.LastWriteTime -gt $newestBinary.LastWriteTime) {
-            $shouldKillProcesses = $true
-        }
-    } else {
-        # No binary exists, will need to build (and kill any stale processes)
-        $shouldKillProcesses = $true
-    }
-}
-
-if ($shouldKillProcesses) {
-    # Kill any running app processes to allow rebuilding
-    # This is necessary on Windows where the binary cannot be overwritten while in use
-    Write-Host "Go files changed - stopping any running app processes..." -ForegroundColor Yellow
+# Helper function to kill extension processes
+# This is necessary on Windows where binaries cannot be overwritten while in use
+function Stop-ExtensionProcesses {
     $binaryName = "app"
     $extensionId = "jongio.azd.app"
     $extensionBinaryPrefix = $extensionId -replace '\.', '-'
 
-    # Kill processes silently (ignore errors if not running)
+    # Kill processes by name silently (ignore errors if not running)
     taskkill /F /IM "$binaryName.exe" 2>$null | Out-Null
     foreach ($arch in @("windows-amd64", "windows-arm64")) {
         $procName = "$extensionBinaryPrefix-$arch.exe"
         taskkill /F /IM $procName 2>$null | Out-Null
     }
+    
+    # Also kill any processes running from the installed extension directory
+    # This catches processes that azd x watch/install started
+    $installedExtensionDir = Join-Path $env:USERPROFILE ".azd\extensions\$extensionId"
+    if (Test-Path $installedExtensionDir) {
+        Get-Process | Where-Object { 
+            $_.Path -and $_.Path.StartsWith($installedExtensionDir) 
+        } | ForEach-Object {
+            Write-Host "  Stopping process: $($_.Name) (PID: $($_.Id))" -ForegroundColor Gray
+            Stop-Process -Id $_.Id -Force -ErrorAction SilentlyContinue
+        }
+    }
+    
+    # Give processes time to fully terminate and release file handles
+    Start-Sleep -Milliseconds 500
+}
+
+# Check if we need to rebuild the Go binary
+# This happens when: Go files changed OR embedded dashboard dist changed
+$needsGoBuild = $false
+$existingBinaries = Get-ChildItem -Path "bin" -Filter "*.exe" -ErrorAction SilentlyContinue | Where-Object { $_.Name -notlike "*.old" }
+
+if (-not $existingBinaries) {
+    # No binary exists, definitely need to build
+    $needsGoBuild = $true
+    Write-Host "No existing binary found, will build" -ForegroundColor Yellow
+} else {
+    $newestBinary = $existingBinaries | Sort-Object LastWriteTime -Descending | Select-Object -First 1
+    $binaryTime = $newestBinary.LastWriteTime
+    
+    # Check Go source files
+    $goFiles = Get-ChildItem -Path "src" -Recurse -Filter "*.go" -ErrorAction SilentlyContinue
+    if ($goFiles) {
+        $newestGoFile = $goFiles | Sort-Object LastWriteTime -Descending | Select-Object -First 1
+        if ($newestGoFile.LastWriteTime -gt $binaryTime) {
+            $needsGoBuild = $true
+            Write-Host "Go source files changed, will rebuild" -ForegroundColor Yellow
+        }
+    }
+    
+    # Check embedded dashboard dist (it's compiled into the binary)
+    $dashboardDistPath = "src\internal\dashboard\dist"
+    if (Test-Path $dashboardDistPath) {
+        $distFiles = Get-ChildItem -Path $dashboardDistPath -Recurse -File -ErrorAction SilentlyContinue
+        if ($distFiles) {
+            $newestDistFile = $distFiles | Sort-Object LastWriteTime -Descending | Select-Object -First 1
+            if ($newestDistFile.LastWriteTime -gt $binaryTime) {
+                $needsGoBuild = $true
+                Write-Host "Embedded dashboard dist changed, will rebuild" -ForegroundColor Yellow
+            }
+        }
+    }
+}
+
+# Only kill extension processes if we're actually going to rebuild the binary
+# This prevents unnecessary restarts when dashboard source changes (vite watcher handles that separately)
+if ($needsGoBuild) {
+    Write-Host "Stopping extension processes before rebuild..." -ForegroundColor Yellow
+    Stop-ExtensionProcesses
+} else {
+    # Nothing to rebuild - exit early to prevent azd x watch from trying to install
+    Write-Host "  ✓ Binary up to date, skipping build" -ForegroundColor Green
+    exit 0
 }
 
 Write-Host "Building App Extension..." -ForegroundColor Cyan
 
@@ -10,44 +10,74 @@ EXTENSION_DIR="$(cd "$(dirname "$0")" && pwd)"
 # Change to the script directory
 cd "$EXTENSION_DIR" || exit
 
-# Check if .go files have changed by comparing timestamps
-# Only kill CLI processes if Go files need rebuilding
-SHOULD_KILL_PROCESSES=false
-
-if [ -d "src" ]; then
-    # Find newest .go file
-    NEWEST_GO_FILE=$(find src -name "*.go" -type f -exec stat -c %Y {} \; 2>/dev/null | sort -n | tail -1 || \
-                     find src -name "*.go" -type f -exec stat -f %m {} \; 2>/dev/null | sort -n | tail -1)
+# Helper function to kill extension processes
+# This prevents "file in use" errors when azd x watch copies to ~/.azd/extensions/
+stop_extension_processes() {
+    BINARY_NAME="app"
+    EXTENSION_ID_FOR_KILL="jongio.azd.app"
+    EXTENSION_BINARY_PREFIX="${EXTENSION_ID_FOR_KILL//./-}"
+
+    # Kill processes by name silently (ignore errors if not running)
+    pkill -f "$BINARY_NAME" 2>/dev/null || true
+    pkill -f "$EXTENSION_BINARY_PREFIX" 2>/dev/null || true
 
-    if [ -d "bin" ]; then
-        # Find newest binary (excluding .old files)
-        NEWEST_BINARY=$(find bin -type f ! -name "*.old" -exec stat -c %Y {} \; 2>/dev/null | sort -n | tail -1 || \
-                        find bin -type f ! -name "*.old" -exec stat -f %m {} \; 2>/dev/null | sort -n | tail -1)
+    # Also kill any processes running from the installed extension directory
+    INSTALLED_EXT_DIR="$HOME/.azd/extensions/$EXTENSION_ID_FOR_KILL"
+    if [ -d "$INSTALLED_EXT_DIR" ]; then
+        pkill -f "$INSTALLED_EXT_DIR" 2>/dev/null || true
+    fi
+    
+    # Give processes time to fully terminate and release file handles
+    sleep 0.5
+}
+
+# Check if we need to rebuild the Go binary
+# This happens when: Go files changed OR embedded dashboard dist changed
+NEEDS_GO_BUILD=false
+
+if [ -d "bin" ]; then
+    # Find newest binary (excluding .old files)
+    NEWEST_BINARY_TIME=$(find bin -type f ! -name "*.old" -exec stat -c %Y {} \; 2>/dev/null | sort -n | tail -1 || \
+                         find bin -type f ! -name "*.old" -exec stat -f %m {} \; 2>/dev/null | sort -n | tail -1)
+    
+    if [ -z "$NEWEST_BINARY_TIME" ]; then
+        NEEDS_GO_BUILD=true
+        echo "No existing binary found, will build"
+    else
+        # Check Go source files
+        if [ -d "src" ]; then
+            NEWEST_GO_TIME=$(find src -name "*.go" -type f -exec stat -c %Y {} \; 2>/dev/null | sort -n | tail -1 || \
+                             find src -name "*.go" -type f -exec stat -f %m {} \; 2>/dev/null | sort -n | tail -1)
+            if [ -n "$NEWEST_GO_TIME" ] && [ "$NEWEST_GO_TIME" -gt "$NEWEST_BINARY_TIME" ]; then
+                NEEDS_GO_BUILD=true
+                echo "Go source files changed, will rebuild"
+            fi
+        fi
 
-        if [ -n "$NEWEST_GO_FILE" ] && [ -n "$NEWEST_BINARY" ]; then
-            if [ "$NEWEST_GO_FILE" -gt "$NEWEST_BINARY" ]; then
-                SHOULD_KILL_PROCESSES=true
+        # Check embedded dashboard dist (it's compiled into the binary)
+        DASHBOARD_DIST_PATH="src/internal/dashboard/dist"
+        if [ -d "$DASHBOARD_DIST_PATH" ]; then
+            NEWEST_DIST_TIME=$(find "$DASHBOARD_DIST_PATH" -type f -exec stat -c %Y {} \; 2>/dev/null | sort -n | tail -1 || \
+                               find "$DASHBOARD_DIST_PATH" -type f -exec stat -f %m {} \; 2>/dev/null | sort -n | tail -1)
+            if [ -n "$NEWEST_DIST_TIME" ] && [ "$NEWEST_DIST_TIME" -gt "$NEWEST_BINARY_TIME" ]; then
+                NEEDS_GO_BUILD=true
+                echo "Embedded dashboard dist changed, will rebuild"
             fi
-        elif [ -n "$NEWEST_GO_FILE" ]; then
-            # No binary exists, will need to build
-            SHOULD_KILL_PROCESSES=true
         fi
-    else
-        # No bin directory, will need to build
-        SHOULD_KILL_PROCESSES=true
     fi
+else
+    NEEDS_GO_BUILD=true
+    echo "No bin directory found, will build"
 fi
 
-if [ "$SHOULD_KILL_PROCESSES" = true ]; then
-    # Kill any running app processes to allow rebuilding
-    echo "Go files changed - stopping any running app processes..."
-    BINARY_NAME="app"
-    EXTENSION_ID_FOR_KILL="jongio.azd.app"
-    EXTENSION_BINARY_PREFIX="${EXTENSION_ID_FOR_KILL//./-}"
-
-    # Kill processes silently (ignore errors if not running)
-    pkill -f "$BINARY_NAME" 2>/dev/null || true
-    pkill -f "$EXTENSION_BINARY_PREFIX" 2>/dev/null || true
+# Only kill extension processes if we're actually going to rebuild the binary
+if [ "$NEEDS_GO_BUILD" = true ]; then
+    echo "Stopping extension processes before rebuild..."
+    stop_extension_processes
+else
+    # Nothing to rebuild - exit early to prevent azd x watch from trying to install
+    echo "  ✓ Binary up to date, skipping build"
+    exit 0
 fi
 
 echo "Building App Extension..."