From 4287f223c645353e63d0240d093625a108551197 Mon Sep 17 00:00:00 2001 From: Blake Bauman Date: Mon, 20 Jul 2026 00:33:21 -0700 Subject: [PATCH] Add attach reconnect and polish Builds. Expose Docker reconnect in the sidecar with richer status errors, wire Retry CTAs on Dashboard/Settings/dock, keep probing the sidecar after boot, and quiet the Builds page when offline. Co-authored-by: Cursor --- app/src/App.tsx | 44 +++++++++++- app/src/components/StatusDock.tsx | 14 ++-- app/src/hooks/useDockerReconnect.ts | 48 +++++++++++++ app/src/lib/api.ts | 13 +++- app/src/routes/BuildsPage.tsx | 94 ++++++++++++++++++++----- app/src/routes/DashboardPage.tsx | 23 +++++- app/src/routes/SettingsPage.tsx | 73 +++++++++++++------ sidecar/internal/docker/client.go | 6 ++ sidecar/internal/server/handlers_ext.go | 18 +++++ sidecar/internal/server/server.go | 15 +++- 10 files changed, 297 insertions(+), 51 deletions(-) create mode 100644 app/src/hooks/useDockerReconnect.ts diff --git a/app/src/App.tsx b/app/src/App.tsx index 45f15ad..f0d0e43 100644 --- a/app/src/App.tsx +++ b/app/src/App.tsx @@ -47,8 +47,10 @@ export default function App() { useEffect(() => { let cancelled = false; + let url = BROWSER_SIDECAR; + (async () => { - let url = await resolveSidecarUrl(); + url = await resolveSidecarUrl(); setApiBaseUrl(url); for (let i = 0; i < 60 && !cancelled; i++) { try { @@ -56,7 +58,6 @@ export default function App() { if (!cancelled) setReady(true); return; } catch { - // Sidecar may still be binding, or Tauri may have moved to an ephemeral port. if (isTauriShell() && i > 0 && i % 4 === 0) { const next = await invokeSidecarUrl(); if (next && next !== url) { @@ -69,15 +70,52 @@ export default function App() { } } if (!cancelled) { - setMessage("Sidecar unavailable — UI will retry in background"); + setMessage("Sidecar unavailable — retrying in background"); setReady(true); } })(); + return () => { cancelled = true; }; }, []); + // After forced ready, keep probing so a late sidecar still attaches. + useEffect(() => { + if (!ready) return; + let cancelled = false; + let url = BROWSER_SIDECAR; + + const tick = async () => { + if (cancelled) return; + try { + if (isTauriShell()) { + const next = await invokeSidecarUrl(); + if (next && next !== url) { + url = next; + setApiBaseUrl(url); + } + } + await api.health(); + await queryClient.invalidateQueries({ queryKey: ["status"] }); + } catch { + /* keep looping */ + } + }; + + void (async () => { + url = await resolveSidecarUrl(); + setApiBaseUrl(url); + })(); + + const id = window.setInterval(() => void tick(), 8000); + void tick(); + return () => { + cancelled = true; + window.clearInterval(id); + }; + }, [ready]); + if (!ready) { return ( diff --git a/app/src/components/StatusDock.tsx b/app/src/components/StatusDock.tsx index 66903fb..7fe9ac7 100644 --- a/app/src/components/StatusDock.tsx +++ b/app/src/components/StatusDock.tsx @@ -163,9 +163,11 @@ export function StatusDock() { navigate({ to: "/containers" }); }; - const dockerTip = dockerOk - ? "Open Docker dashboard" - : status.data?.docker.error || "Docker unreachable — start the Docker engine"; + const dockerTip = statusDown + ? "Sidecar status unavailable" + : dockerOk + ? "Open Docker dashboard" + : status.data?.docker.error || "Docker unreachable — start the engine, then retry from Settings"; const k8sTip = k8sOk ? `Open Kubernetes · ${status.data?.kubernetes.version || "cluster"}` @@ -211,11 +213,13 @@ export function StatusDock() { { setMode("docker"); - navigate({ to: "/" }); + navigate({ to: statusDown || !dockerOk ? "/settings" : "/" }); }} /> { + setPending(true); + try { + const res = await api.reconnectDocker(); + await Promise.all([ + qc.invalidateQueries({ queryKey: ["status"] }), + qc.invalidateQueries({ queryKey: ["docker-dashboard"] }), + qc.invalidateQueries({ queryKey: ["docker-info"] }), + qc.invalidateQueries({ queryKey: ["docker-contexts"] }), + qc.invalidateQueries({ queryKey: ["containers"] }), + qc.invalidateQueries({ queryKey: ["images"] }), + qc.invalidateQueries({ queryKey: ["volumes"] }), + qc.invalidateQueries({ queryKey: ["networks"] }), + qc.invalidateQueries({ queryKey: ["compose-projects"] }), + qc.invalidateQueries({ queryKey: ["builders"] }), + qc.invalidateQueries({ queryKey: ["system-df"] }), + ]); + if (res.connected) { + toast.success("Docker connected", { + description: res.activeContext || res.host || "attach", + }); + } else { + toast.error("Still offline", { + description: res.error || "Start the Docker engine, then retry", + }); + } + return res; + } catch (e: any) { + toast.error("Reconnect failed", { description: e?.message || String(e) }); + await qc.invalidateQueries({ queryKey: ["status"] }); + return null; + } finally { + setPending(false); + } + }; + + return { reconnect, pending }; +} diff --git a/app/src/lib/api.ts b/app/src/lib/api.ts index 3f80d22..8ee73a6 100644 --- a/app/src/lib/api.ts +++ b/app/src/lib/api.ts @@ -35,6 +35,12 @@ async function request(path: string, init?: RequestInit): Promise { export const api = { health: () => request<{ ok: boolean }>("/health"), status: () => request("/api/status"), + /** Rebuild the Docker SDK client (attach recovery without context switch). */ + reconnectDocker: () => + request<{ ok: boolean; connected: boolean; error?: string; activeContext?: string; host?: string }>( + "/api/docker/reconnect", + { method: "POST" }, + ), dockerDashboard: () => request>("/api/docker/dashboard"), dockerInfo: () => request("/api/docker/info"), @@ -326,7 +332,12 @@ export const api = { }; export type StatusResponse = { - docker: { connected: boolean; error?: string }; + docker: { + connected: boolean; + error?: string; + activeContext?: string; + host?: string; + }; kubernetes: { connected: boolean; version?: string; error?: string }; firecracker: { available: boolean }; }; diff --git a/app/src/routes/BuildsPage.tsx b/app/src/routes/BuildsPage.tsx index 66f8b4e..d6fdbd5 100644 --- a/app/src/routes/BuildsPage.tsx +++ b/app/src/routes/BuildsPage.tsx @@ -9,13 +9,21 @@ import { Field } from "@/components/spectrum/Field"; import { StatusBadge } from "@/components/spectrum/StatusBadge"; import { Tip } from "@/components/spectrum/Tip"; import { toast } from "@/components/Toaster"; +import { useDockerReconnect } from "@/hooks/useDockerReconnect"; import { useUIStore } from "@/stores/uiStore"; export function BuildsPage() { const qc = useQueryClient(); const openRunSheet = useUIStore((s) => s.openRunSheet); + const { reconnect, pending: reconnecting } = useDockerReconnect(); - const builders = useQuery({ queryKey: ["builders"], queryFn: api.builders, retry: false }); + const status = useQuery({ queryKey: ["status"], queryFn: api.status }); + const builders = useQuery({ + queryKey: ["builders"], + queryFn: api.builders, + retry: false, + enabled: !!status.data?.docker.connected, + }); const [context, setContext] = useState("."); const [dockerfile, setDockerfile] = useState("Dockerfile"); @@ -28,6 +36,10 @@ export function BuildsPage() { const [searching, setSearching] = useState(false); const [results, setResults] = useState>>([]); const [pulling, setPulling] = useState(null); + const [pullLog, setPullLog] = useState(""); + const [pullSheetOpen, setPullSheetOpen] = useState(false); + + const dockerOk = !!status.data?.docker.connected; const runBuild = async () => { setBuilding(true); @@ -69,11 +81,17 @@ export function BuildsPage() { const pullRef = async (ref: string) => { setPulling(ref); + setPullLog(""); + setPullSheetOpen(true); try { - await api.pullImageStream(ref, () => {}); + await api.pullImageStream(ref, (chunk) => { + setPullLog((prev) => (prev + chunk).slice(-200_000)); + }); + setPullLog((p) => p + "\nPull complete.\n"); await qc.invalidateQueries({ queryKey: ["images"] }); toast.success("Pulled", { description: ref }); } catch (e: any) { + setPullLog((p) => p + `\n${e?.message || "pull failed"}\n`); toast.error("Pull failed", { description: e?.message }); } finally { setPulling(null); @@ -84,23 +102,48 @@ export function BuildsPage() { return ( + {!dockerOk && status.isSuccess ? ( +
+
+ Docker is offline + + {status.data?.docker.error || "Attach an engine to build or search."} + +
+ +
+ ) : null} +
Builders - {builders.isLoading ? ( + {!dockerOk ? ( + + Connect Docker to list buildx builders. + + ) : builders.isLoading ? ( Loading builders… ) : builderList.length === 0 ? ( - No builders — docker buildx ls returned nothing, or the engine is offline. + No builders — docker buildx ls returned nothing. ) : ( -
+
{builderList.map((b) => (
+ } + > + {pullLog || "Waiting for layers…"} + ); } diff --git a/app/src/routes/DashboardPage.tsx b/app/src/routes/DashboardPage.tsx index 5c789ed..05c9bbc 100644 --- a/app/src/routes/DashboardPage.tsx +++ b/app/src/routes/DashboardPage.tsx @@ -10,6 +10,7 @@ import { HelpHint } from "@/components/HelpHint"; import { EmptyState, PageShell } from "@/components/PageShell"; import { ChartPanel, RunningAreaChart } from "@/components/charts/SpectrumChartsPanel"; import { StatusBadge } from "@/components/spectrum/StatusBadge"; +import { useDockerReconnect } from "@/hooks/useDockerReconnect"; import { useMetricsStore } from "@/stores/metricsStore"; const jumpLinks = [ @@ -22,6 +23,7 @@ const jumpLinks = [ export function DashboardPage() { const navigate = useNavigate(); + const { reconnect, pending: reconnecting } = useDockerReconnect(); const dash = useQuery({ queryKey: ["docker-dashboard"], queryFn: api.dockerDashboard, @@ -35,6 +37,8 @@ export function DashboardPage() { const clearRunning = useMetricsStore((s) => s.clearRunning); const runningHistory = useMetricsStore((s) => s.runningHistory); const engineContext = contexts.data?.current; + const dockerOffline = status.isSuccess && !status.data?.docker.connected; + const statusLoading = status.isLoading || status.isPending; useEffect(() => { clearRunning(); @@ -66,10 +70,25 @@ export function DashboardPage() { title="Dashboard" description="What’s running on this engine — jump to resources when you need the lists." > - {!status.data?.docker.connected ? ( + {statusLoading ? ( + + ) : dockerOffline ? ( + + +
+ } /> ) : (
diff --git a/app/src/routes/SettingsPage.tsx b/app/src/routes/SettingsPage.tsx index dc2b59f..650caf4 100644 --- a/app/src/routes/SettingsPage.tsx +++ b/app/src/routes/SettingsPage.tsx @@ -20,6 +20,7 @@ import { PageShell } from "@/components/PageShell"; import { SettingRow, SettingSection } from "@/components/SettingRow"; import { StatusBadge } from "@/components/spectrum/StatusBadge"; import { toast } from "@/components/Toaster"; +import { useDockerReconnect } from "@/hooks/useDockerReconnect"; import { modKeyLabel } from "@/lib/hotkeys"; import { isTauriShell } from "@/lib/platform"; import { APP_VERSION } from "@/lib/version"; @@ -27,6 +28,7 @@ import { useUIStore } from "@/stores/uiStore"; export function SettingsPage() { const qc = useQueryClient(); + const { reconnect, pending: reconnecting } = useDockerReconnect(); const theme = useUIStore((s) => s.theme); const setTheme = useUIStore((s) => s.setTheme); const startAfterCreate = useUIStore((s) => s.startAfterCreate); @@ -298,22 +300,36 @@ export function SettingsPage() { title="Report" description={diagnose.data?.time || "Run a diagnose pass against the sidecar"} action={ - +
+ + +
} > {diagnose.data ? ( @@ -592,11 +608,26 @@ export function SettingsPage() { - - - {status.data?.docker.connected ? "Connected" : "Offline"} - - + + + {status.data?.docker.connected ? "Connected" : "Offline"} + + {!status.data?.docker.connected ? ( + + ) : null} +
+ } + /> {info.data?.OperatingSystem || ""} diff --git a/sidecar/internal/docker/client.go b/sidecar/internal/docker/client.go index bb95185..b803abc 100644 --- a/sidecar/internal/docker/client.go +++ b/sidecar/internal/docker/client.go @@ -54,6 +54,12 @@ func (c *Client) ReconnectWithHost(host string) error { return nil } +// Reconnect rebuilds the SDK client using the active host (or FromEnv). +// Use when the engine returns after a drop without a context switch. +func (c *Client) Reconnect() error { + return c.ReconnectWithHost(c.activeHost) +} + func (c *Client) SetActiveContext(name string) { c.activeContext = name } func (c *Client) ActiveContext() string { return c.activeContext } func (c *Client) ActiveHost() string { return c.activeHost } diff --git a/sidecar/internal/server/handlers_ext.go b/sidecar/internal/server/handlers_ext.go index 9899b0a..77c416d 100644 --- a/sidecar/internal/server/handlers_ext.go +++ b/sidecar/internal/server/handlers_ext.go @@ -51,6 +51,24 @@ func (s *Server) handleDockerDiagnose(w http.ResponseWriter, r *http.Request) { writeJSON(w, http.StatusOK, s.docker.Diagnose(r.Context())) } +func (s *Server) handleDockerReconnect(w http.ResponseWriter, r *http.Request) { + err := s.docker.Reconnect() + s.audit.Log("docker.reconnect", s.docker.ActiveHost(), s.docker.ActiveContext(), err) + if err != nil { + writeErr(w, http.StatusServiceUnavailable, err) + return + } + ctx := r.Context() + pingErr := s.docker.Ping(ctx) + writeJSON(w, http.StatusOK, map[string]any{ + "ok": pingErr == nil, + "connected": pingErr == nil, + "error": errString(pingErr), + "activeContext": s.docker.ActiveContext(), + "host": s.docker.ActiveHost(), + }) +} + func (s *Server) handleVolumeFiles(w http.ResponseWriter, r *http.Request) { name := r.PathValue("name") path := r.URL.Query().Get("path") diff --git a/sidecar/internal/server/server.go b/sidecar/internal/server/server.go index 92b7906..8befbd0 100644 --- a/sidecar/internal/server/server.go +++ b/sidecar/internal/server/server.go @@ -102,6 +102,7 @@ func (s *Server) routes() { s.mux.HandleFunc("POST /api/docker/system/prune", s.handleSystemPrune) s.mux.HandleFunc("GET /api/docker/contexts", s.handleDockerContexts) s.mux.HandleFunc("POST /api/docker/contexts", s.handleDockerUseContext) + s.mux.HandleFunc("POST /api/docker/reconnect", s.handleDockerReconnect) s.mux.HandleFunc("GET /api/docker/diagnose", s.handleDockerDiagnose) s.mux.HandleFunc("GET /api/docker/volumes/{name}/files", s.handleVolumeFiles) s.mux.HandleFunc("POST /api/docker/volumes/clone", s.handleVolumeClone) @@ -190,7 +191,12 @@ func (s *Server) handleHealth(w http.ResponseWriter, r *http.Request) { func (s *Server) handleStatus(w http.ResponseWriter, r *http.Request) { ctx, cancel := context.WithTimeout(r.Context(), 3*time.Second) defer cancel() - dockerOK := s.docker.Ping(ctx) == nil + pingErr := s.docker.Ping(ctx) + dockerOK := pingErr == nil + dockerErr := errString(s.docker.Err()) + if !dockerOK && pingErr != nil { + dockerErr = pingErr.Error() + } k8sVersion := "" k8sOK := false if v, err := s.k8s.Probe(ctx); err == nil { @@ -200,7 +206,12 @@ func (s *Server) handleStatus(w http.ResponseWriter, r *http.Request) { fc := s.runtimes.Get("firecracker") fcOK := fc != nil && fc.Available(ctx) writeJSON(w, http.StatusOK, map[string]any{ - "docker": map[string]any{"connected": dockerOK, "error": errString(s.docker.Err())}, + "docker": map[string]any{ + "connected": dockerOK, + "error": dockerErr, + "activeContext": s.docker.ActiveContext(), + "host": s.docker.ActiveHost(), + }, "kubernetes": map[string]any{"connected": k8sOK, "version": k8sVersion, "error": errString(s.k8s.Err())}, "firecracker": map[string]any{"available": fcOK}, })