feat: deployment stability, nssm validation, and frontend ux improvements (#7)

Author: fanboykun

internal/agent/deploy.go

@@ -247,7 +247,19 @@ func (d *Deployer) ensureServiceByType(svc ServiceConfig, currentDir string) err
 		d.l("static service -- no NSSM registration needed", "name", svc.WindowsServiceName)
 		return nil
 	default: // "nssm"
+		if svc.BinaryName == "" {
+			return fmt.Errorf("binary_name is empty for service %s — cannot register with NSSM", svc.WindowsServiceName)
+		}
 		newBin := filepath.Join(currentDir, svc.BinaryName)
+		if _, err := os.Stat(newBin); os.IsNotExist(err) {
+			// List what's actually in the directory to help debug
+			entries, _ := os.ReadDir(currentDir)
+			var names []string
+			for _, e := range entries {
+				names = append(names, e.Name())
+			}
+			return fmt.Errorf("binary %q not found in %s (available: %v)", svc.BinaryName, currentDir, names)
+		}
 		return d.ensureService(svc, newBin)
 	}
 }
@@ -284,7 +296,7 @@ func (d *Deployer) ensureService(svc ServiceConfig, binPath string) error {
 			{"AppRestartDelay", "5000"},
 		}
 		if svc.EnvFile != "" {
-			settings = append(settings, []string{"AppEnvExtra", "ENV_FILE=" + svc.EnvFile})
+			settings = append(settings, []string{"AppEnvironmentExtra", "ENV_FILE=" + svc.EnvFile})
 		}
 
 		for _, kv := range settings {

internal/agent/state.go

@@ -181,4 +181,14 @@ func (s *StateManager) RecordPollEvent(status, remoteVersion, errMsg string) {
 			ORDER BY id DESC 
 			LIMIT 50
 		)`, s.watcherID, s.watcherID)
+}
+
+// ConsecutiveFailuresForVersion returns the number of consecutive failed deploys
+// for a specific version. Used to prevent infinite deploy retries.
+func (s *StateManager) ConsecutiveFailuresForVersion(version string) int {
+	var count int64
+	s.db.Model(&database.DeployLog{}).
+		Where("watcher_id = ? AND version = ? AND status = ?", s.watcherID, version, string(StatusFailed)).
+		Count(&count)
+	return int(count)
 }

internal/agent/watcher.go

@@ -120,7 +120,9 @@ func (r *RepoWatcher) Run(ctx context.Context) error {
 
 	meta, err := r.github.FetchMetadata(ctx, r.wcfg.MetadataURL)
 	if err != nil {
-		r.state.RecordPollEvent("error", "", err.Error())
+		if !errors.Is(err, context.Canceled) {
+			r.state.RecordPollEvent("error", "", err.Error())
+		}
 		return fmt.Errorf("fetch metadata: %w", err)
 	}
 
@@ -136,7 +138,9 @@ func (r *RepoWatcher) Run(ctx context.Context) error {
 
 	localVersion, err := r.state.ReadVersion()
 	if err != nil {
-		r.state.RecordPollEvent("error", targetVersion, "read local version: "+err.Error())
+		if !errors.Is(err, context.Canceled) {
+			r.state.RecordPollEvent("error", targetVersion, "read local version: "+err.Error())
+		}
 		return fmt.Errorf("read local version: %w", err)
 	}
 	r.log.Info("local version", "current", localVersion)
@@ -150,8 +154,21 @@ func (r *RepoWatcher) Run(ctx context.Context) error {
 	r.state.RecordPollEvent("new_release", targetVersion, "")
 	r.log.Info("version mismatch, deploying", "from", localVersion, "to", targetVersion)
 
+	// Prevent infinite deploy retries — cap at 3 consecutive failures for the same version.
+	// A manual redeploy from the dashboard resets this by clearing current_version.
+	const maxDeployRetries = 3
+	failures := r.state.ConsecutiveFailuresForVersion(targetVersion)
+	if failures >= maxDeployRetries {
+		msg := fmt.Sprintf("deploy suspended for %s after %d consecutive failures — use dashboard to redeploy", targetVersion, failures)
+		r.log.Warn(msg)
+		r.state.RecordPollEvent("deploy_suspended", targetVersion, msg)
+		return nil
+	}
+
 	if err := r.deploy(ctx, svcMeta, targetVersion, localVersion); err != nil {
-		_ = r.state.SetFailed(err.Error())
+		if !errors.Is(err, context.Canceled) {
+			_ = r.state.SetFailed(err.Error())
+		}
 		return fmt.Errorf("deploy: %w", err)
 	}
 

web/src/routes/services/[id]/+page.svelte

@@ -6,7 +6,21 @@
 	import * as Table from '$lib/components/ui/table';
 	import * as Tabs from '$lib/components/ui/tabs';
 	import * as Button from '$lib/components/ui/button';
-	import { ArrowLeft, Play, Square, RefreshCw, Heart, AlertCircle, CheckCircle2, XCircle, Activity, FileText, ExternalLink, TerminalSquare, Save } from '@lucide/svelte';
+	import {
+		ArrowLeft,
+		Play,
+		Square,
+		RefreshCw,
+		Heart,
+		AlertCircle,
+		CheckCircle2,
+		XCircle,
+		Activity,
+		FileText,
+		ExternalLink,
+		TerminalSquare,
+		Save
+	} from '@lucide/svelte';
 	import { goto } from '$app/navigation';
 
 	let service = $state<Service | null>(null);
@@ -19,10 +33,10 @@
 	let logError = $state('');
 	let logType = $state<'out' | 'err'>('out');
 	let logCount = $state(100);
-	
+
 	let envContent = $state('');
 	let savingEnv = $state(false);
-	
+
 	let activeTab = $state(page.url.searchParams.get('tab') || 'health');
 
 	const id = Number(page.params.id);
@@ -231,8 +245,14 @@
 					<p class="mt-1 font-mono text-sm">
 						{#if service.public_url}
 							<!-- eslint-disable-next-line svelte/no-navigation-without-resolve -->
-							<a href={service.public_url} target="_blank" rel="noopener noreferrer" class="inline-flex items-center gap-1.5 hover:underline text-blue-400">
-								{service.public_url} <ExternalLink class="h-3 w-3" />
+							<a
+								href={service.public_url}
+								target="_blank"
+								rel="noopener noreferrer"
+								class="inline-flex items-center gap-1.5 text-blue-400 hover:underline"
+							>
+								{service.public_url}
+								<ExternalLink class="h-3 w-3" />
 							</a>
 						{:else}
 							—
@@ -244,18 +264,24 @@
 
 		{#if service.service_type === 'static'}
 			<div class="rounded-lg border border-blue-500/30 bg-blue-500/5 p-4">
-				<div class="flex items-center gap-2 mb-2 text-blue-400 font-medium">
+				<div class="mb-2 flex items-center gap-2 font-medium text-blue-400">
 					<TerminalSquare class="h-5 w-5" />
 					IIS Configuration Required
 				</div>
-				<p class="text-sm text-foreground/80 mb-4">
-					The Watcher automatically manages extracting releases and updating target junctions for static sites, but it does <strong>not</strong> create the IIS website itself. Run these commands once in an Administrator PowerShell to link IIS to this deployment:
+				<p class="mb-4 text-sm text-foreground/80">
+					The Watcher automatically manages extracting releases and updating target junctions for
+					static sites, but it does <strong>not</strong> create the IIS website itself. Run these commands
+					once in an Administrator PowerShell to link IIS to this deployment:
 				</p>
-				<div class="bg-black/50 p-3 rounded-md overflow-x-auto border border-border">
-					<pre class="font-mono text-xs text-blue-300 leading-relaxed max-w-full"><span class="text-muted-foreground"># 1. Create the application pool</span>
+				<div class="overflow-x-auto rounded-md border border-border bg-black/50 p-3">
+					<pre class="max-w-full font-mono text-xs leading-relaxed text-blue-300"><span
+							class="text-muted-foreground"># 1. Create the application pool</span
+						>
 appcmd.exe add apppool /name:"{service.iis_app_pool}"
 
-<span class="text-muted-foreground"># 2. Create the site (change the port/host binding as needed)</span>
+<span class="text-muted-foreground"
+							># 2. Create the site (change the port/host binding as needed)</span
+						>
 appcmd.exe add site /name:"{service.iis_site_name}" /bindings:http/*:8080: /physicalPath:"{watcher?.install_dir}\current"
 
 <span class="text-muted-foreground"># 3. Assign the site to the application pool</span>
@@ -265,7 +291,12 @@ appcmd.exe set app "{service.iis_site_name}/" /applicationPool:"{service.iis_app
 		{/if}
 
 		<!-- eslint-disable-next-line svelte/no-navigation-without-resolve -->
-		<Tabs.Root bind:value={activeTab} onValueChange={(v) => { if (v) goto(`?tab=${v}`, { replaceState: true, keepFocus: true, noScroll: true }); }}>
+		<Tabs.Root
+			bind:value={activeTab}
+			onValueChange={(v) => {
+				if (v) goto(`?tab=${v}`, { replaceState: true, keepFocus: true, noScroll: true });
+			}}
+		>
 			<Tabs.List>
 				<Tabs.Trigger value="health">Health History ({healthHistory.length})</Tabs.Trigger>
 				<Tabs.Trigger value="logs">Logs</Tabs.Trigger>
@@ -376,29 +407,33 @@ appcmd.exe set app "{service.iis_site_name}/" /applicationPool:"{service.iis_app
 					</Card.Content>
 				</Card.Root>
 			</Tabs.Content>
-|
+
 			<!-- Environment -->
 			<Tabs.Content value="env" class="mt-4">
 				<Card.Root class="border-border bg-card">
 					<Card.Header class="pb-3">
 						<div class="flex items-center justify-between">
 							<div class="space-y-1">
 								<Card.Title class="text-lg">Environment Variables</Card.Title>
-								<Card.Description>Edit the <code>{service.env_file || '.env'}</code> file for this service.</Card.Description>
+								<Card.Description
+									>Edit the <code>{service.env_file || '.env'}</code> file for this service.</Card.Description
+								>
 							</div>
 							<div class="flex items-center gap-2">
 								<Button.Root variant="outline" size="sm" onclick={saveEnv} disabled={savingEnv}>
-									{#if savingEnv}<RefreshCw class="mr-2 h-4 w-4 animate-spin" />{:else}<Save class="mr-2 h-4 w-4" />{/if}
+									{#if savingEnv}<RefreshCw class="mr-2 h-4 w-4 animate-spin" />{:else}<Save
+											class="mr-2 h-4 w-4"
+										/>{/if}
 									Save
 								</Button.Root>
-								<Button.Root 
-									variant="default" 
-									size="sm" 
-									onclick={() => { 
+								<Button.Root
+									variant="default"
+									size="sm"
+									onclick={() => {
 										saveEnv().then(() => runAction(() => api.restartService(id)));
-									}} 
+									}}
 									disabled={savingEnv}
-									class="bg-amber-600 hover:bg-amber-700 text-white"
+									class="bg-amber-600 text-white hover:bg-amber-700"
 								>
 									<RefreshCw class="mr-2 h-4 w-4" /> Save & Restart
 								</Button.Root>
@@ -408,16 +443,17 @@ appcmd.exe set app "{service.iis_site_name}/" /applicationPool:"{service.iis_app
 					<Card.Content>
 						<textarea
 							bind:value={envContent}
-							class="min-h-[400px] w-full rounded-md border border-border bg-black/50 p-4 font-mono text-sm text-blue-300 focus:outline-none focus:ring-1 focus:ring-blue-500/50"
+							class="min-h-[400px] w-full rounded-md border border-border bg-black/50 p-4 font-mono text-sm text-blue-300 focus:ring-1 focus:ring-blue-500/50 focus:outline-none"
 							placeholder="KEY=VALUE"
 						></textarea>
 						<p class="mt-2 text-xs text-muted-foreground italic">
-							Note: Environment variables are written to <code>{service.env_file}</code> in the service's installation directory.
+							Note: Environment variables are written to <code>{service.env_file}</code> in the service's
+							installation directory.
 						</p>
 					</Card.Content>
 				</Card.Root>
 			</Tabs.Content>
-|
+
 			<!-- Deploys -->
 			<Tabs.Content value="deploys" class="mt-4">
 				{#if deploys.length > 0}

web/src/routes/watchers/+page.svelte

@@ -71,7 +71,7 @@
 			formServices = [{
 				service_type: 'nssm',
 				windows_service_name: formServiceName,
-				binary_name: inspectResult?.assets[0] || 'app.exe',
+				binary_name: formServiceName ? `${formServiceName}.exe` : 'app.exe',
 				env_file: '.env',
 				health_check_url: formHcURL,
 			}];
@@ -124,7 +124,7 @@
 		formServices = [...formServices, {
 			service_type: 'nssm',
 			windows_service_name: `${formServiceName}-extra`,
-			binary_name: inspectResult?.assets[0] || '',
+			binary_name: formServiceName ? `${formServiceName}-extra.exe` : 'app.exe',
 			env_file: '.env',
 		}];
 	}
@@ -386,7 +386,7 @@
 				</Dialog.Footer>
 			{:else if createStep === 3}
 				<div class="space-y-4">
-					{#each formServices as svc, i}
+					{#each formServices as svc, i (i)}
 						<div class="border rounded-md p-3 space-y-3 relative bg-card">
 							<Button.Root variant="ghost" size="icon" class="absolute top-2 right-2 h-6 w-6 text-red-400" type="button" onclick={() => removeServiceDraft(i)}>
 								<Trash2 class="h-3 w-3" />
@@ -406,17 +406,8 @@
 									<Input class="h-8 text-xs" bind:value={svc.windows_service_name} placeholder="myapp-web" />
 								</div>
 								<div class="space-y-1">
-									<Label class="text-xs">Asset Name (Exact in release)</Label>
-									{#if inspectResult?.assets && inspectResult.assets.length > 0}
-										<select bind:value={svc.binary_name} class="w-full text-xs rounded border bg-transparent p-2">
-											<option value="">Select asset...</option>
-											{#each inspectResult.assets as asset}
-												<option value={asset}>{asset}</option>
-											{/each}
-										</select>
-									{:else}
-										<Input class="h-8 text-xs" bind:value={svc.binary_name} placeholder="myapp.exe" />
-									{/if}
+									<Label class="text-xs">Executable Name</Label>
+									<Input class="h-8 text-xs" bind:value={svc.binary_name} placeholder="myapp.exe" />
 								</div>
 								<div class="space-y-1">
 									<Label class="text-xs">Env file relative path</Label>

workflows/deploy.yml

@@ -299,7 +299,7 @@ jobs:
               Write-Host "Installing service: $($svc.Name)"
               & $NSSM install $svc.Name $svc.Exe
               & $NSSM set $svc.Name AppDirectory    $BaseDir
-              & $NSSM set $svc.Name AppEnvExtra     "ENV_FILE=$($svc.EnvFile)"
+              & $NSSM set $svc.Name AppEnvironmentExtra     "ENV_FILE=$($svc.EnvFile)"
               & $NSSM set $svc.Name Start           SERVICE_AUTO_START
               & $NSSM set $svc.Name AppStdout       "$BaseDir\logs\$($svc.Name).out.log"
               & $NSSM set $svc.Name AppStderr       "$BaseDir\logs\$($svc.Name).err.log"