technicalpickles
diff --git a/‎cmd/generate-types/main.go‎
Lines changed: 73 additions & 1 deletion b/‎cmd/generate-types/main.go‎
Lines changed: 73 additions & 1 deletion
diff --git a/‎cmd/mcpproxy-tray/internal/api/adapter.go‎
Lines changed: 40 additions & 6 deletions b/‎cmd/mcpproxy-tray/internal/api/adapter.go‎
Lines changed: 40 additions & 6 deletions
@@ -14,7 +14,7 @@ func main() {
 	typeDefinitions := generateTypeDefinitions()
 
 	// Create output directory if it doesn't exist
-	outputDir := "web/frontend/src/types"
+	outputDir := "frontend/src/types"
 	if err := os.MkdirAll(outputDir, 0755); err != nil {
 		fmt.Printf("Error creating output directory: %v\n", err)
 		os.Exit(1)
@@ -46,6 +46,50 @@ func generateTypeDefinitions() string {
   error?: string;
 }
 
+`)
+
+	// Health constants - generated from internal/health/constants.go
+	// These must stay in sync with the Go constants
+	sb.WriteString(`// Health constants - generated from internal/health/constants.go
+// Health levels
+export const HealthLevelHealthy = 'healthy' as const;
+export const HealthLevelDegraded = 'degraded' as const;
+export const HealthLevelUnhealthy = 'unhealthy' as const;
+export type HealthLevel = typeof HealthLevelHealthy | typeof HealthLevelDegraded | typeof HealthLevelUnhealthy;
+
+// Admin states
+export const AdminStateEnabled = 'enabled' as const;
+export const AdminStateDisabled = 'disabled' as const;
+export const AdminStateQuarantined = 'quarantined' as const;
+export type AdminState = typeof AdminStateEnabled | typeof AdminStateDisabled | typeof AdminStateQuarantined;
+
+// Health actions - suggested remediation for health issues
+export const HealthActionNone = '' as const;
+export const HealthActionLogin = 'login' as const;
+export const HealthActionRestart = 'restart' as const;
+export const HealthActionEnable = 'enable' as const;
+export const HealthActionApprove = 'approve' as const;
+export const HealthActionViewLogs = 'view_logs' as const;
+export const HealthActionSetSecret = 'set_secret' as const;
+export const HealthActionConfigure = 'configure' as const;
+export type HealthAction =
+  | typeof HealthActionNone
+  | typeof HealthActionLogin
+  | typeof HealthActionRestart
+  | typeof HealthActionEnable
+  | typeof HealthActionApprove
+  | typeof HealthActionViewLogs
+  | typeof HealthActionSetSecret
+  | typeof HealthActionConfigure;
+
+export interface HealthStatus {
+  level: HealthLevel;
+  admin_state: AdminState;
+  summary: string;
+  detail?: string;
+  action?: HealthAction;
+}
+
 `)
 
 	// Server types
@@ -63,15 +107,22 @@ func generateTypeDefinitions() string {
   enabled: boolean;
   quarantined: boolean;
   connected: boolean;
+  connecting?: boolean; // Connection attempt in progress
+  authenticated?: boolean; // Has stored OAuth token (regardless of validity)
   status: string;
   last_error?: string;
   connected_at?: string; // ISO date string
   last_reconnect_at?: string; // ISO date string
   reconnect_count: number;
   tool_count: number;
+  tool_list_token_size?: number; // Token size for this server's tools
   created: string; // ISO date string
   updated: string; // ISO date string
   isolation?: IsolationConfig;
+  oauth_status?: 'authenticated' | 'expired' | 'error' | 'none'; // OAuth authentication status
+  token_expires_at?: string; // ISO date string when OAuth token expires
+  user_logged_out?: boolean; // True if user explicitly logged out (prevents auto-reconnection)
+  health?: HealthStatus; // Unified health status calculated by the backend
 }
 
 export interface OAuthConfig {
@@ -307,6 +358,27 @@ export function isAPIError(response: APIResponse): response is APIError {
 export function isAPISuccess<T>(response: APIResponse<T>): response is APISuccess<T> {
   return response.success;
 }
+
+// Update check types (from internal/updatecheck/types.go)
+export interface UpdateInfo {
+  available: boolean;
+  latest_version?: string;
+  release_url?: string;
+  checked_at?: string; // ISO date string
+  is_prerelease?: boolean;
+  check_error?: string;
+}
+
+export interface InfoResponse {
+  version: string;
+  web_ui_url: string;
+  listen_addr: string;
+  endpoints: {
+    http: string;
+    socket: string;
+  };
+  update?: UpdateInfo;
+}
 `)
 
 	return sb.String()
 
@@ -10,13 +10,34 @@ import (
 	internalRuntime "mcpproxy-go/internal/runtime"
 )
 
+// ClientInterface defines the methods required by ServerAdapter from the API client.
+// This interface allows for testing with mock implementations.
+type ClientInterface interface {
+	GetServers() ([]Server, error)
+	GetInfo() (map[string]interface{}, error)
+	EnableServer(serverName string, enabled bool) error
+	TriggerOAuthLogin(serverName string) error
+	StatusChannel() <-chan StatusUpdate
+}
+
+// isServerHealthy returns true if the server is considered healthy.
+// It uses health.level as the source of truth, with a fallback to the legacy
+// connected field for backward compatibility when health is nil.
+func isServerHealthy(health *HealthStatus, legacyConnected bool) bool {
+	if health != nil {
+		return health.Level == "healthy"
+	}
+	// Fallback to legacy connected field if health is not available
+	return legacyConnected
+}
+
 // ServerAdapter adapts the API client to the ServerInterface expected by the tray
 type ServerAdapter struct {
-	client *Client
+	client ClientInterface
 }
 
 // NewServerAdapter creates a new server adapter
-func NewServerAdapter(client *Client) *ServerAdapter {
+func NewServerAdapter(client ClientInterface) *ServerAdapter {
 	return &ServerAdapter{
 		client: client,
 	}
@@ -61,7 +82,7 @@ func (a *ServerAdapter) GetUpstreamStats() map[string]interface{} {
 	connectedCount := 0
 	totalTools := 0
 	for _, server := range servers {
-		if server.Connected {
+		if isServerHealthy(server.Health, server.Connected) {
 			connectedCount++
 		}
 		totalTools += server.ToolCount
@@ -114,7 +135,7 @@ func (a *ServerAdapter) GetStatus() interface{} {
 
 	connectedCount := 0
 	for _, server := range servers {
-		if server.Connected {
+		if isServerHealthy(server.Health, server.Connected) {
 			connectedCount++
 		}
 	}
@@ -215,7 +236,7 @@ func (a *ServerAdapter) GetAllServers() ([]map[string]interface{}, error) {
 
 	var result []map[string]interface{}
 	for _, server := range servers {
-		result = append(result, map[string]interface{}{
+		serverMap := map[string]interface{}{
 			"name":            server.Name,
 			"url":             server.URL,
 			"command":         server.Command,
@@ -230,7 +251,20 @@ func (a *ServerAdapter) GetAllServers() ([]map[string]interface{}, error) {
 			"should_retry":    server.ShouldRetry,
 			"retry_count":     server.RetryCount,
 			"last_retry_time": server.LastRetry,
-		})
+		}
+
+		// Spec 013: Include health status as source of truth for connected count
+		if server.Health != nil {
+			serverMap["health"] = map[string]interface{}{
+				"level":       server.Health.Level,
+				"admin_state": server.Health.AdminState,
+				"summary":     server.Health.Summary,
+				"detail":      server.Health.Detail,
+				"action":      server.Health.Action,
+			}
+		}
+
+		result = append(result, serverMap)
 	}
 
 	return result, nil