@tridha643/hestia 1.1.0 → 1.3.0

package/dist/cli.js

@@ -8244,7 +8244,7 @@ async function composeUp(ctx, services) {
 async function composeDown(ctx, destroy) {
   const rest = ["down", "--remove-orphans"];
   if (destroy)
-    rest.push("-v");
+    rest.push("-v", "--rmi", "local");
   await docker(ctx, rest);
 }
 async function composePs(ctx) {
@@ -11249,6 +11249,87 @@ var init_ingress = __esm(() => {
   init_local_http_router();
 });
 
+// packages/engine/src/tunnel/orphans.ts
+import { execFileSync as execFileSync4 } from "child_process";
+import { join as join21 } from "path";
+function hestiaTunnelMarker(uuid) {
+  return join21(hestiaHome(), "tunnel", uuid);
+}
+function parseLocalHestiaConnectors(psOutput, marker) {
+  const rows = [];
+  for (const line of psOutput.split(`
+`)) {
+    const trimmed = line.trim();
+    if (trimmed === "")
+      continue;
+    const m = trimmed.match(/^(\d+)\s+(\d+)\s+(.*)$/);
+    if (m === null)
+      continue;
+    const command = m[3];
+    if (!command.includes(marker))
+      continue;
+    if (!/(^|[\/\s])cloudflared(\s|$)/.test(command))
+      continue;
+    rows.push({ pid: Number(m[1]), pgid: Number(m[2]), command });
+  }
+  return rows;
+}
+function listLocalHestiaConnectors(uuid) {
+  let out;
+  try {
+    out = execFileSync4("ps", ["-Ao", "pid=,pgid=,command="], {
+      encoding: "utf8",
+      maxBuffer: 16 * 1024 * 1024,
+      env: { ...process.env, LC_ALL: "C", LANG: "C" }
+    });
+  } catch {
+    return [];
+  }
+  return parseLocalHestiaConnectors(out, hestiaTunnelMarker(uuid));
+}
+async function reapOrphanConnectors(uuid, keep) {
+  const procs = listLocalHestiaConnectors(uuid).filter((p) => {
+    if (keep === undefined)
+      return true;
+    return p.pgid !== keep.pgid && p.pid !== keep.pid;
+  });
+  if (procs.length === 0)
+    return { reapedGroups: 0, pids: [] };
+  const groups = new Set(procs.map((p) => p.pgid));
+  const pids = procs.map((p) => p.pid);
+  for (const pgid of groups) {
+    try {
+      process.kill(-pgid, "SIGTERM");
+    } catch {}
+  }
+  const deadline = Date.now() + REAP_GRACE_MS;
+  while (Date.now() < deadline) {
+    const still = listLocalHestiaConnectors(uuid).filter((p) => {
+      if (keep === undefined)
+        return true;
+      return p.pgid !== keep.pgid && p.pid !== keep.pid;
+    });
+    if (still.length === 0)
+      return { reapedGroups: groups.size, pids };
+    await new Promise((r) => setTimeout(r, REAP_POLL_MS));
+  }
+  for (const p of listLocalHestiaConnectors(uuid)) {
+    if (keep !== undefined && (p.pgid === keep.pgid || p.pid === keep.pid))
+      continue;
+    try {
+      process.kill(-p.pgid, "SIGKILL");
+    } catch {}
+    try {
+      process.kill(p.pid, "SIGKILL");
+    } catch {}
+  }
+  return { reapedGroups: groups.size, pids };
+}
+var REAP_GRACE_MS = 5000, REAP_POLL_MS = 100;
+var init_orphans = __esm(() => {
+  init_state();
+});
+
 // packages/engine/src/tunnel/verify.ts
 async function get2(port, path) {
   try {
@@ -11298,15 +11379,15 @@ import {
   readFileSync as readFileSync17,
   readdirSync as readdirSync7
 } from "fs";
-import { join as join21 } from "path";
+import { join as join22 } from "path";
 function tunnelDir(uuid) {
-  return join21(hestiaHome(), "tunnel", uuid);
+  return join22(hestiaHome(), "tunnel", uuid);
 }
 function configPath(uuid) {
-  return join21(tunnelDir(uuid), "config.yml");
+  return join22(tunnelDir(uuid), "config.yml");
 }
 function adoptedMarker(uuid) {
-  return join21(tunnelDir(uuid), "adopted.json");
+  return join22(tunnelDir(uuid), "adopted.json");
 }
 function isAdopted(uuid) {
   return existsSync19(adoptedMarker(uuid));
@@ -11325,10 +11406,10 @@ function readAdopted(uuid) {
     return { uuid, name: marker.name, credFile: marker.credFile, reconstructed: false };
   }
   let name;
-  const stacksDir = join21(hestiaHome(), "stacks");
+  const stacksDir = join22(hestiaHome(), "stacks");
   if (existsSync19(stacksDir)) {
     for (const project of readdirSync7(stacksDir)) {
-      const sp = join21(stacksDir, project, "stack.json");
+      const sp = join22(stacksDir, project, "stack.json");
       if (!existsSync19(sp))
         continue;
       try {
@@ -11348,19 +11429,19 @@ function readAdopted(uuid) {
   };
 }
 function listAdopted() {
-  const root = join21(hestiaHome(), "tunnel");
+  const root = join22(hestiaHome(), "tunnel");
   if (!existsSync19(root))
     return [];
   return readdirSync7(root).filter((uuid) => isAdopted(uuid));
 }
 function collectDynamicRules(uuid) {
-  const stacksDir = join21(hestiaHome(), "stacks");
+  const stacksDir = join22(hestiaHome(), "stacks");
   const rules = [];
   const dropped = [];
   if (!existsSync19(stacksDir))
     return { rules, dropped };
   for (const project of readdirSync7(stacksDir)) {
-    const p = join21(stacksDir, project, "stack.json");
+    const p = join22(stacksDir, project, "stack.json");
     if (!existsSync19(p))
       continue;
     let record;
@@ -11405,6 +11486,10 @@ async function reconcileTunnel(ref, opts) {
     });
     const pf = readPidfile(dir, CONNECTOR);
     const live = pf !== null && isLive(pf);
+    const { reapedGroups } = await reapOrphanConnectors(ref.uuid, live ? pf : undefined);
+    if (reapedGroups > 0) {
+      warnings.push(`reaped ${reapedGroups} orphan hestia connector process group(s) for this tunnel`);
+    }
     const currentConfig = existsSync19(cfgPath) ? readFileSync17(cfgPath, "utf8") : null;
     if (live && currentConfig === nextConfig) {
       return { restarted: false, metricsPort: pf.port, ready: true, warnings };
@@ -11481,6 +11566,7 @@ var init_registry = __esm(() => {
   init_shutdown();
   init_ingress();
   init_shared();
+  init_orphans();
   init_atomic_json_file();
 });
 
@@ -12142,7 +12228,7 @@ var init_shared_arbiter = __esm(() => {
 // packages/engine/src/doctor.ts
 import { existsSync as existsSync20, readFileSync as readFileSync18, readdirSync as readdirSync8 } from "fs";
 import { execFile as execFile9 } from "child_process";
-import { dirname as dirname6, join as join22 } from "path";
+import { dirname as dirname6, join as join23 } from "path";
 function row(check, level, detail) {
   return { check, level, detail };
 }
@@ -12183,8 +12269,8 @@ async function envChecks(ctx) {
   }
   if (ctx !== null) {
     const ignored = await exec("git", ["-C", ctx.worktreeRoot, "check-ignore", "-q", ".hestia/"]);
-    rows.push(ignored.ok ? row("state-ignore", "ok", ".hestia/ is ignored") : row("state-ignore", "error", `add the exact line ".hestia/" to ${join22(ctx.worktreeRoot, ".gitignore")}`));
-    const schema = existsSync20(join22(ctx.worktreeRoot, ".env.schema"));
+    rows.push(ignored.ok ? row("state-ignore", "ok", ".hestia/ is ignored") : row("state-ignore", "error", `add the exact line ".hestia/" to ${join23(ctx.worktreeRoot, ".gitignore")}`));
+    const schema = existsSync20(join23(ctx.worktreeRoot, ".env.schema"));
     if (schema) {
       rows.push(detectVarlock(ctx.worktreeRoot) !== null ? row("varlock", "ok", "local varlock found \u2014 worker env composition active") : row("varlock", "warn", ".env.schema present but no local varlock (bun install?)"));
     }
@@ -12193,7 +12279,7 @@ async function envChecks(ctx) {
       const missing = workers.filter((w) => {
         let dir = dirname6(w.configPath);
         for (;; ) {
-          if (existsSync20(join22(dir, "node_modules", ".bin", "wrangler")))
+          if (existsSync20(join23(dir, "node_modules", ".bin", "wrangler")))
             return false;
           if (dir === ctx.worktreeRoot || dirname6(dir) === dir)
             return true;
@@ -12252,7 +12338,7 @@ async function stateChecks(ctx) {
       rows.push(row(`exposure:${exp.service}`, "error", `ingress rule points at port ${exp.originPort} but the service owns ` + `${publishedPort} \u2014 a recycled port serves ANOTHER worktree; ` + `run any hestia command to resync, this should not persist`));
     }
   }
-  const lockPath2 = join22(hestiaDir(worktreeRoot), "lock");
+  const lockPath2 = join23(hestiaDir(worktreeRoot), "lock");
   if (existsSync20(lockPath2)) {
     try {
       const holder = JSON.parse(readFileSync18(lockPath2, "utf8"));
@@ -12263,7 +12349,7 @@ async function stateChecks(ctx) {
       rows.push(row("lock", "warn", "unreadable worktree lock file"));
     }
   }
-  const mirror = join22(hestiaHome(), "stacks", record.project, "stack.json");
+  const mirror = join23(hestiaHome(), "stacks", record.project, "stack.json");
   if (!existsSync20(mirror)) {
     rows.push(row("mirror", "warn", "no ~/.hestia mirror \u2014 `down --project` would not work after worktree deletion"));
   }
@@ -12271,11 +12357,11 @@ async function stateChecks(ctx) {
 }
 async function machineChecks() {
   const rows = [];
-  const stacksDir = join22(hestiaHome(), "stacks");
+  const stacksDir = join23(hestiaHome(), "stacks");
   const mirrored = new Set;
   if (existsSync20(stacksDir)) {
     for (const project of readdirSync8(stacksDir)) {
-      const p = join22(stacksDir, project, "stack.json");
+      const p = join23(stacksDir, project, "stack.json");
       if (!existsSync20(p))
         continue;
       mirrored.add(project);
@@ -12328,12 +12414,18 @@ async function tunnelChecks() {
     } catch {
       connectors = null;
     }
+    const local = listLocalHestiaConnectors(uuid);
+    const localOrphans = live && pf !== null ? local.filter((p) => p.pgid !== pf.pgid && p.pid !== pf.pid) : local;
+    if (localOrphans.length > 0) {
+      rows.push(row(`${label}:local-orphans`, "error", `${localOrphans.length} untracked hestia connector(s) still running ` + `(pids ${localOrphans.map((p) => p.pid).join(", ")}) \u2014 the daemon sweep ` + `or next hestia command reaps them; do not start another cloudflared`));
+    }
     if (connectors === null) {
       rows.push(row(`${label}:connectors`, "unknown", "cloudflare unreachable \u2014 cannot count connectors"));
     } else {
       const expected = live ? 1 : 0;
       if (connectors > expected) {
-        rows.push(row(`${label}:connectors`, "error", `${connectors} connector(s) registered but hestia runs ${expected} \u2014 a foreign ` + `replica cross-wires worktrees; stop the other cloudflared`));
+        const detail = localOrphans.length > 0 ? `${connectors} connector(s) registered but hestia runs ${expected} \u2014 ` + `${localOrphans.length} are local hestia-owned orphans (auto-reaped on next sweep); ` + `any remainder is a foreign replica` : `${connectors} connector(s) registered but hestia runs ${expected} \u2014 a foreign ` + `replica cross-wires worktrees; stop the other cloudflared (only processes whose ` + `argv lacks ~/.hestia/tunnel/<uuid>/ are truly foreign)`;
+        rows.push(row(`${label}:connectors`, "error", detail));
       }
     }
   }
@@ -12435,6 +12527,7 @@ var init_doctor = __esm(() => {
   init_discover();
   init_registry();
   init_cloudflared();
+  init_orphans();
   init_client();
   init_routes();
   init_launchd();
@@ -12447,7 +12540,7 @@ var init_doctor = __esm(() => {
 import { execFile as execFile10 } from "child_process";
 import { promisify as promisify8 } from "util";
 import { existsSync as existsSync21, readFileSync as readFileSync19, readdirSync as readdirSync9 } from "fs";
-import { join as join23 } from "path";
+import { join as join24 } from "path";
 
 class LatestFleetChannel {
   #pending;
@@ -12490,11 +12583,11 @@ class LatestFleetChannel {
 function readManagedMirrors() {
   const records = [];
   const warnings = [];
-  const stacksDirectory = join23(hestiaHome(), "stacks");
+  const stacksDirectory = join24(hestiaHome(), "stacks");
   if (!existsSync21(stacksDirectory))
     return { records, warnings };
   for (const project of readdirSync9(stacksDirectory).sort()) {
-    const path = join23(stacksDirectory, project, "stack.json");
+    const path = join24(stacksDirectory, project, "stack.json");
     try {
       const source = readFileSync19(path);
       if (source.byteLength > MAX_MIRROR_BYTES2) {
@@ -12982,7 +13075,7 @@ var init_init_config = __esm(() => {
 import { existsSync as existsSync22, rmSync as rmSync10 } from "fs";
 import { execFile as execFile11 } from "child_process";
 import { promisify as promisify9 } from "util";
-import { join as join24, resolve as resolve2 } from "path";
+import { join as join25, resolve as resolve2 } from "path";
 import { createHash as createHash7 } from "crypto";
 import { resolve4, resolve6, resolveCname } from "dns/promises";
 function composeUnsupported(message) {
@@ -13092,7 +13185,7 @@ async function assertHestiaStateIgnored(worktreeRoot) {
   try {
     await pexec9("git", ["-C", worktreeRoot, "check-ignore", "-q", ".hestia/"], { timeout: 5000 });
   } catch {
-    throw new HestiaError("state-not-ignored", `.hestia is not ignored in ${worktreeRoot}; add the line ".hestia/" to ${join24(worktreeRoot, ".gitignore")}`, { remedy: `.hestia/`, path: join24(worktreeRoot, ".gitignore") });
+    throw new HestiaError("state-not-ignored", `.hestia is not ignored in ${worktreeRoot}; add the line ".hestia/" to ${join25(worktreeRoot, ".gitignore")}`, { remedy: `.hestia/`, path: join25(worktreeRoot, ".gitignore") });
   }
 }
 async function prepareCompose(worktreeRoot, project, repo, branch, opts, configuredBaseFile) {
@@ -13109,7 +13202,7 @@ async function prepareCompose(worktreeRoot, project, repo, branch, opts, configu
     services
   });
   ensureDir(hestiaDir(worktreeRoot));
-  const overridePath = join24(hestiaDir(worktreeRoot), OVERRIDE_FILE);
+  const overridePath = join25(hestiaDir(worktreeRoot), OVERRIDE_FILE);
   writeAtomicTextFile(overridePath, yaml);
   return {
     ctx: {
@@ -13142,7 +13235,7 @@ function writeDockerfileComposeModel(worktreeRoot, workloads, conventionalCompos
     ...conventionalComposeFile === undefined ? {} : { include: [{ path: conventionalComposeFile }] },
     services
   };
-  const path = join24(hestiaDir(worktreeRoot), DOCKERFILE_COMPOSE_FILE);
+  const path = join25(hestiaDir(worktreeRoot), DOCKERFILE_COMPOSE_FILE);
   writeAtomicTextFile(path, $stringify(model));
   return path;
 }
@@ -13162,7 +13255,7 @@ function freshRecord(project, repoId, repo, branch, worktree) {
   };
 }
 function assertCurrentStackIdentity(record, current) {
-  const path = join24(hestiaDir(current.worktreeRoot), "stack.json");
+  const path = join25(hestiaDir(current.worktreeRoot), "stack.json");
   assertMutableStackRecord(record, path);
   const matches = record.repoId === current.repoId && record.repo === current.repo && record.branch === current.branch && resolve2(record.worktree) === resolve2(current.worktreeRoot) && record.project === projectName(current.repoId, current.repo, current.branch, current.worktreeRoot);
   if (!matches) {
@@ -13341,7 +13434,7 @@ function matchesExpectedStack(record, expected) {
   return record !== null && (record.repoId === undefined || record.repoId === expected.repoId) && record.worktree === expected.worktree && record.createdAt === expected.createdAt;
 }
 function projectMutationRoot(project) {
-  return join24(hestiaHome(), "project-locks", project);
+  return join25(hestiaHome(), "project-locks", project);
 }
 async function assertNamedTunnelDns(hostname, tunnelUuid) {
   const expected = `${tunnelUuid}.cfargotunnel.com`;
@@ -13948,13 +14041,13 @@ class ComposeEngine {
       const composeFile = record?.composeFile ?? tryLoadConfig(worktreeRoot)?.composeFile;
       if (composeFile !== undefined) {
         const project2 = record?.project ?? projectName(repoId, repo, branch, worktreeRoot);
-        const overrideFile = record?.overrideFile ?? join24(hestiaDir(worktreeRoot), OVERRIDE_FILE);
+        const overrideFile = record?.overrideFile ?? join25(hestiaDir(worktreeRoot), OVERRIDE_FILE);
         if (existsSync22(overrideFile)) {
           await composeDown({ project: project2, baseFile: composeFile, overrideFile, cwd: worktreeRoot }, opts?.destroy ?? false);
         } else if (record?.composeFile !== undefined) {
           const rest = ["compose", "-p", project2, "down", "--remove-orphans"];
           if (opts?.destroy)
-            rest.push("-v");
+            rest.push("-v", "--rmi", "local");
           await pexec9("docker", rest, { timeout: 180000 });
         }
       }
@@ -14011,7 +14104,7 @@ class ComposeEngine {
       try {
         const rest = ["compose", "-p", project, "down", "--remove-orphans"];
         if (opts?.destroy)
-          rest.push("-v");
+          rest.push("-v", "--rmi", "local");
         await pexec9("docker", rest, { timeout: 180000 });
       } catch (err) {
         if (fresh?.composeFile !== undefined) {
@@ -14181,7 +14274,7 @@ class ComposeEngine {
         const alias = selection.endpoint.alias ?? selection.endpoint.name;
         const authority = internalEndpointAuthority(record.project, alias);
         const name = `aux-quick-${createHash7("sha256").update(alias).digest("hex").slice(0, 10)}`;
-        const quickCfg = join24(hestiaDir(worktreeRoot), `quick-${name}.yml`);
+        const quickCfg = join25(hestiaDir(worktreeRoot), `quick-${name}.yml`);
         writeAtomicTextFile(quickCfg, `ingress:
   - service: ${JSON.stringify(`unix:${publicGatewaySocketPath()}`)}
 ` + `    originRequest:
@@ -14786,7 +14879,7 @@ class DaemonFleetSource {
       return Promise.reject(new Error(`stack ${stack.project} has no stable incarnation timestamp`));
     }
     return engine.downProject(stack.project, {
-      destroy: false,
+      destroy: true,
       expectedStack: {
         repoId: stack.repoId,
         worktree: stack.worktree,
@@ -14802,6 +14895,14 @@ var init_fleet_source = __esm(() => {
   init_src2();
 });
 
+// packages/tui/src/fleet-endpoints.ts
+function serviceEndpoints(service) {
+  return service.endpoints ?? (service.endpoint === undefined ? [] : [service.endpoint]);
+}
+function endpointReach(endpoint) {
+  return endpoint.localUrl ?? endpoint.publicUrl ?? endpoint.url ?? `${endpoint.host}:${endpoint.port}`;
+}
+
 // packages/tui/src/fleet-controller.ts
 function createFleetUiState() {
   return {
@@ -14839,7 +14940,7 @@ function reconcileFleetSelection(previous, snapshot, preferredProject) {
   const previousIndex = snapshot.stacks.findIndex((stack2) => stack2.project === previous.project);
   const stack = snapshot.stacks.find((candidate) => candidate.project === previous.project) ?? snapshot.stacks.find((candidate) => candidate.project === preferredProject) ?? nearestItem(snapshot.stacks, previousIndex < 0 ? 0 : previousIndex) ?? snapshot.stacks[0];
   const service = stack.services.find((candidate) => candidate.name === previous.service) ?? stack.services[0];
-  const endpoints = service?.endpoints ?? (service?.endpoint === undefined ? [] : [service.endpoint]);
+  const endpoints = service === undefined ? [] : serviceEndpoints(service);
   const endpoint = endpoints.find((candidate) => candidate.name === previous.endpoint);
   return { project: stack.project, service: service?.name, endpoint: endpoint?.name };
 }
@@ -14927,7 +15028,7 @@ function reduceFleetUiState(state, action) {
     case "select-endpoint": {
       const stack = action.snapshot.stacks.find((candidate) => candidate.project === state.selection.project);
       const service = stack?.services.find((candidate) => candidate.name === action.service);
-      if (!service?.endpoints?.some((endpoint) => endpoint.name === action.endpoint))
+      if (service === undefined || !serviceEndpoints(service).some((endpoint) => endpoint.name === action.endpoint))
         return state;
       return {
         ...state,
@@ -14959,12 +15060,10 @@ function reduceFleetUiState(state, action) {
         logOffset: action.follow ? 0 : state.logOffset,
         unseenLines: action.follow ? 0 : state.unseenLines
       };
-    case "scroll-logs":
-      return {
-        ...state,
-        follow: action.delta > 0 ? state.follow : false,
-        logOffset: Math.max(0, state.logOffset - action.delta)
-      };
+    case "scroll-logs": {
+      const offset = Math.min(action.maxOffset ?? Number.MAX_SAFE_INTEGER, Math.max(0, state.logOffset - action.delta));
+      return action.delta > 0 && offset === 0 ? { ...state, follow: true, logOffset: 0, unseenLines: 0 } : { ...state, follow: action.delta > 0 ? state.follow : false, logOffset: offset };
+    }
     case "new-lines":
       return state.follow ? state : {
         ...state,
@@ -14992,11 +15091,24 @@ function reduceFleetUiState(state, action) {
       return { ...state, downPending: action.pending };
   }
 }
+var init_fleet_controller = () => {};
 
 // packages/tui/src/terminal-text.ts
+function collapseCarriageReturns(text) {
+  if (!text.includes("\r"))
+    return text;
+  return text.split(`
+`).map((line) => {
+    const parts = line.replace(/\r+$/, "").split("\r");
+    return parts[parts.length - 1] ?? "";
+  }).join(`
+`);
+}
 function sanitizeFleetTerminalText(text, preserveNewlines = false) {
+  const withoutEscapes = text.replace(ESCAPE_CONTROL_SEQUENCE, "").replace(C1_CONTROL_SEQUENCE, "");
+  const collapsed = collapseCarriageReturns(withoutEscapes);
   const controls = preserveNewlines ? /[\x00-\x08\x0b-\x1f\x7f-\x9f]/g : /[\x00-\x1f\x7f-\x9f]/g;
-  return text.replace(ESCAPE_CONTROL_SEQUENCE, "").replace(C1_CONTROL_SEQUENCE, "").replace(controls, "");
+  return collapsed.replace(controls, "");
 }
 var ESCAPE_CONTROL_SEQUENCE, C1_CONTROL_SEQUENCE;
 var init_terminal_text = __esm(() => {
@@ -15004,24 +15116,6 @@ var init_terminal_text = __esm(() => {
   C1_CONTROL_SEQUENCE = /(?:[\x90\x98\x9d\x9e\x9f][\s\S]*?(?:\x07|\x9c)|\x9b[0-?]*[ -/]*[@-~])/g;
 });
 
-// packages/tui/src/fleet-theme.ts
-var fleetTheme;
-var init_fleet_theme = __esm(() => {
-  fleetTheme = {
-    background: "#0d1117",
-    panel: "#161b22",
-    panelAlt: "#21262d",
-    border: "#30363d",
-    text: "#c9d1d9",
-    muted: "#8b949e",
-    accent: "#58a6ff",
-    healthy: "#3fb950",
-    warning: "#d29922",
-    danger: "#f85149",
-    selected: "#1f6feb"
-  };
-});
-
 // node_modules/.bun/ansi-regex@6.2.2/node_modules/ansi-regex/index.js
 function ansiRegex({ onlyFirst = false } = {}) {
   const ST = "(?:\\u0007|\\u001B\\u005C|\\u009C)";
@@ -15204,229 +15298,623 @@ function padFleetText(text, width) {
   const fitted = fitFleetText(text, width);
   return fitted + " ".repeat(Math.max(0, width - stringWidth(fitted)));
 }
+function wrapFleetText(text, width, maxLines = 3) {
+  if (width <= 0)
+    return [];
+  if (text === "")
+    return [""];
+  if (stringWidth(text) <= width)
+    return [text];
+  const characters = Array.from(text);
+  const lines = [];
+  let index = 0;
+  while (index < characters.length && lines.length < maxLines) {
+    const last = lines.length === maxLines - 1;
+    if (last) {
+      lines.push(fitFleetText(characters.slice(index).join(""), width));
+      break;
+    }
+    let line = "";
+    let taken = 0;
+    while (index + taken < characters.length) {
+      const next = characters[index + taken];
+      if (stringWidth(line + next) > width)
+        break;
+      line += next;
+      taken += 1;
+    }
+    if (taken === 0) {
+      lines.push(characters[index]);
+      index += 1;
+      continue;
+    }
+    lines.push(line);
+    index += taken;
+  }
+  return lines;
+}
 var init_fleet_text = __esm(() => {
   init_string_width();
 });
 
-// packages/tui/src/components/StackSidebar.tsx
-import { jsxDEV } from "@opentui/react/jsx-dev-runtime";
-function phaseColor(phase) {
+// packages/tui/src/fleet-theme.ts
+function blendHex(fg, bg, amount) {
+  const parse = (hex2) => [
+    Number.parseInt(hex2.slice(1, 3), 16),
+    Number.parseInt(hex2.slice(3, 5), 16),
+    Number.parseInt(hex2.slice(5, 7), 16)
+  ];
+  const [fr, fg2, fb] = parse(fg);
+  const [br, bg2, bb] = parse(bg);
+  const channel = (f, b) => Math.round(b + (f - b) * amount);
+  const hex = (value) => value.toString(16).padStart(2, "0");
+  return `#${hex(channel(fr, br))}${hex(channel(fg2, bg2))}${hex(channel(fb, bb))}`;
+}
+function backendColor(backend) {
+  if (backend === "docker")
+    return fleetTheme.backendDocker;
+  if (backend === "tunnel")
+    return fleetTheme.backendTunnel;
+  if (backend === "wrangler" || backend === "proc")
+    return fleetTheme.backendProc;
+  return fleetTheme.muted;
+}
+function serviceStateColor(state) {
+  if (state === "healthy")
+    return fleetTheme.healthy;
+  if (state === "unknown" || state === "unhealthy" || state === "starting")
+    return fleetTheme.warning;
+  return fleetTheme.danger;
+}
+function serviceStateGlyph(state) {
+  if (state === "healthy")
+    return "\u25CF";
+  if (state === "unhealthy")
+    return "\u25C6";
+  if (state === "starting")
+    return "\u25CC";
+  return "\u25CB";
+}
+function stackPhaseColor(phase) {
   if (phase === "up")
     return fleetTheme.healthy;
-  if (phase === "degraded" || phase === "unknown")
+  if (phase === "degraded" || phase === "unknown" || phase === "starting")
     return fleetTheme.warning;
+  if (phase === "queued" || phase === "reserved")
+    return fleetTheme.queued;
   if (phase === "stopped")
-    return fleetTheme.danger;
+    return fleetTheme.faint;
   return fleetTheme.accent;
 }
-function StackSidebar({
-  stacks,
-  selectedProject,
-  width,
-  onSelectProject
-}) {
-  return /* @__PURE__ */ jsxDEV("box", {
-    style: { width, height: "100%", flexDirection: "column", border: true, borderColor: fleetTheme.border },
-    children: [
-      /* @__PURE__ */ jsxDEV("box", {
-        style: { height: 1, paddingLeft: 1, backgroundColor: fleetTheme.panelAlt },
-        children: /* @__PURE__ */ jsxDEV("text", {
-          fg: fleetTheme.text,
-          children: "Fleet"
-        }, undefined, false, undefined, this)
-      }, undefined, false, undefined, this),
-      stacks.length === 0 ? /* @__PURE__ */ jsxDEV("box", {
-        style: { paddingLeft: 1, paddingTop: 1 },
-        children: /* @__PURE__ */ jsxDEV("text", {
-          fg: fleetTheme.muted,
-          children: "No managed stacks"
-        }, undefined, false, undefined, this)
-      }, undefined, false, undefined, this) : stacks.map((stack) => {
-        const selected = stack.project === selectedProject;
-        const branch = sanitizeFleetTerminalText(stack.branch);
-        return /* @__PURE__ */ jsxDEV("box", {
-          onMouseDown: (event) => {
-            if (event.button !== 0)
-              return;
-            event.preventDefault();
-            event.stopPropagation();
-            onSelectProject?.(stack.project);
-          },
-          style: {
-            height: 1,
-            paddingLeft: 1,
-            paddingRight: 1,
-            flexDirection: "row",
-            backgroundColor: selected ? fleetTheme.selected : fleetTheme.background
-          },
-          children: [
-            /* @__PURE__ */ jsxDEV("text", {
-              fg: selected ? "#ffffff" : phaseColor(stack.phase),
-              children: selected ? "\u25B8 " : "  "
-            }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV("text", {
-              fg: selected ? "#ffffff" : fleetTheme.text,
-              children: padFleetText(branch, Math.max(4, width - 13))
-            }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV("text", {
-              fg: selected ? "#ffffff" : phaseColor(stack.phase),
-              children: padFleetText(stack.phase, 9)
-            }, undefined, false, undefined, this)
-          ]
-        }, stack.project, true, undefined, this);
-      })
-    ]
-  }, undefined, true, undefined, this);
+function stackPhaseGlyph(phase, spinnerFrame = 0) {
+  if (phase === "up")
+    return "\u25CF";
+  if (phase === "degraded")
+    return "\u25C6";
+  if (phase === "starting")
+    return SPINNER_FRAMES[spinnerFrame % SPINNER_FRAMES.length];
+  if (phase === "queued" || phase === "reserved")
+    return "\u25CC";
+  if (phase === "stopped")
+    return "\u25CB";
+  return "\u25CB";
 }
-var init_StackSidebar = __esm(() => {
-  init_fleet_text();
-  init_fleet_theme();
-  init_terminal_text();
+var background = "#0d1117", text = "#c9d1d9", accent = "#58a6ff", fleetTheme, SPINNER_FRAMES;
+var init_fleet_theme = __esm(() => {
+  fleetTheme = {
+    background,
+    panel: blendHex(text, background, 0.04),
+    panelAlt: blendHex(text, background, 0.1),
+    border: blendHex(text, background, 0.18),
+    text,
+    bright: "#e6edf3",
+    muted: "#8b949e",
+    faint: "#6e7681",
+    accent,
+    selectedBg: blendHex(accent, background, 0.16),
+    stripe: accent,
+    keycapBg: blendHex(text, background, 0.22),
+    healthy: "#3fb950",
+    warning: "#d29922",
+    danger: "#f85149",
+    queued: "#bc8cff",
+    backendDocker: "#58a6ff",
+    backendProc: "#bc8cff",
+    backendWrangler: "#bc8cff",
+    backendTunnel: "#ffa657",
+    publicBadge: "#ffa657"
+  };
+  SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 });
 
-// packages/tui/src/components/ServicePane.tsx
-import { jsxDEV as jsxDEV2 } from "@opentui/react/jsx-dev-runtime";
-function serviceColor(service) {
-  if (service.state === "healthy")
-    return fleetTheme.healthy;
-  if (service.state === "unknown" || service.state === "unhealthy")
-    return fleetTheme.warning;
-  return fleetTheme.danger;
+// packages/tui/src/fleet-keys.ts
+function isEscapeKey(key) {
+  const name = key.name.toLowerCase();
+  return name === "escape" || name === "esc" || key.sequence === "\x1B";
 }
-function endpointReach(endpoint) {
-  return endpoint.localUrl ?? endpoint.publicUrl ?? endpoint.url ?? `${endpoint.host}:${endpoint.port}`;
+function isEnterKey(key) {
+  return key.name === "return" || key.name === "enter";
 }
-function ServicePane({
-  stack,
-  selectedService,
-  selectedEndpoint,
-  onSelectService,
-  onSelectEndpoint
-}) {
-  return /* @__PURE__ */ jsxDEV2("box", {
-    style: { height: "100%", width: "100%", flexDirection: "column", border: true, borderColor: fleetTheme.border },
-    children: [
-      /* @__PURE__ */ jsxDEV2("box", {
-        style: { height: 1, paddingLeft: 1, backgroundColor: fleetTheme.panelAlt },
-        children: /* @__PURE__ */ jsxDEV2("text", {
-          fg: fleetTheme.text,
-          children: stack === undefined ? "Workloads" : `Workloads \u2014 ${sanitizeFleetTerminalText(stack.branch)}`
-        }, undefined, false, undefined, this)
-      }, undefined, false, undefined, this),
-      stack?.services.length ? stack.services.flatMap((service) => {
-        const workloadSelected = service.name === selectedService && selectedEndpoint === undefined;
-        const endpoints = service.endpoints ?? (service.endpoint === undefined ? [] : [service.endpoint]);
-        const workloadRow = /* @__PURE__ */ jsxDEV2("box", {
-          onMouseDown: (event) => {
-            if (event.button !== 0)
-              return;
-            event.preventDefault();
-            event.stopPropagation();
-            onSelectService?.(service.name);
-          },
-          style: {
-            height: 1,
-            paddingLeft: 1,
-            paddingRight: 1,
-            flexDirection: "row",
-            backgroundColor: workloadSelected ? fleetTheme.selected : fleetTheme.background
-          },
+function isPlainKey(key, value) {
+  return !key.ctrl && !key.meta && !key.option && !key.super && !key.hyper && (key.name === value || key.sequence === value);
+}
+function isUpKey(key) {
+  return key.name === "up" || isPlainKey(key, "k");
+}
+function isDownKey(key) {
+  return key.name === "down" || isPlainKey(key, "j");
+}
+function isShiftedKey(key, lower) {
+  return key.sequence === lower.toUpperCase() || isPlainKey(key, lower) && key.shift === true;
+}
+function isFollowBottomKey(key) {
+  return isShiftedKey(key, "g");
+}
+function isScrollTopKey(key) {
+  return !isShiftedKey(key, "g") && (key.sequence === "g" || isPlainKey(key, "g"));
+}
+function isDoctorKey(key) {
+  return isShiftedKey(key, "d");
+}
+
+// packages/tui/src/fleet-layout.ts
+function resolveFleetLayout(mode, terminalWidth) {
+  if (mode === "auto")
+    return terminalWidth >= SPLIT_MIN_WIDTH ? "split" : "stack";
+  return mode;
+}
+function fleetPaneWidths(layout, terminalWidth) {
+  if (layout === "stack")
+    return { sidebar: terminalWidth, main: terminalWidth };
+  const sidebar = Math.min(SIDEBAR_MAX_WIDTH, Math.max(SIDEBAR_MIN_WIDTH, Math.floor(terminalWidth * 0.26)));
+  return { sidebar, main: Math.max(20, terminalWidth - sidebar) };
+}
+function servicePaneHeight(rows, maxHeight) {
+  const content = Math.max(2, rows + 1);
+  return Math.min(maxHeight, content + 3);
+}
+function stackSidebarHeight(stackCount) {
+  return Math.min(9, Math.max(4, stackCount + 3));
+}
+var SPLIT_MIN_WIDTH = 110, SIDEBAR_MIN_WIDTH = 28, SIDEBAR_MAX_WIDTH = 44;
+
+// packages/tui/src/fleet-log-rows.ts
+function lineId(line) {
+  let id = lineIds.get(line);
+  if (id === undefined) {
+    id = nextLineId++;
+    lineIds.set(line, id);
+  }
+  return id;
+}
+function wrappedBody(line, bodyWidth) {
+  const cached = wrapCache.get(line);
+  if (cached !== undefined && cached.width === bodyWidth)
+    return cached.wrapped;
+  const wrapped = wrapFleetText(line.text, bodyWidth, 3);
+  wrapCache.set(line, { width: bodyWidth, wrapped });
+  return wrapped;
+}
+function buildFleetLogRows(lines, contentWidth) {
+  const rows = [];
+  for (const line of lines) {
+    const meta = line.meta === true;
+    const bodyWidth = meta ? Math.max(1, contentWidth - META_TAG.length) : contentWidth;
+    const wrapped = wrappedBody(line, bodyWidth);
+    const id = lineId(line);
+    for (let part = 0;part < wrapped.length; part += 1) {
+      rows.push({
+        key: `${id}:${part}`,
+        text: wrapped[part],
+        meta,
+        tag: !meta ? undefined : part === 0 ? META_TAG : " ".repeat(META_TAG.length)
+      });
+    }
+  }
+  return rows;
+}
+var META_TAG = "hestia \u2502 ", nextLineId = 0, lineIds, wrapCache;
+var init_fleet_log_rows = __esm(() => {
+  init_fleet_text();
+  lineIds = new WeakMap;
+  wrapCache = new WeakMap;
+});
+
+// packages/tui/src/fleet-format.ts
+function formatUptime(createdAt, now) {
+  const born = Date.parse(createdAt);
+  if (!Number.isFinite(born))
+    return;
+  const seconds = Math.max(0, Math.floor((now - born) / 1000));
+  if (seconds < 60)
+    return `${seconds}s`;
+  const minutes = Math.floor(seconds / 60);
+  if (minutes < 60)
+    return `${minutes}m`;
+  const hours = Math.floor(minutes / 60);
+  if (hours < 24)
+    return `${hours}h${minutes % 60 === 0 ? "" : `${minutes % 60}m`}`;
+  const days = Math.floor(hours / 24);
+  return `${days}d${hours % 24 === 0 ? "" : `${hours % 24}h`}`;
+}
+function buildEnvBlock(stack) {
+  const lines = [];
+  for (const service of stack.services) {
+    if (service.backend === "tunnel")
+      continue;
+    if (service.publishedPort !== undefined) {
+      lines.push(`HESTIA_${envKey(service.name)}_PORT=${service.publishedPort}`);
+      if (service.backend === "docker") {
+        lines.push(`HESTIA_${envKey(service.name)}_MAIN_TCP_PORT=${service.publishedPort}`);
+      }
+    }
+    for (const endpoint of serviceEndpoints(service)) {
+      const alias = envKey(endpoint.name);
+      lines.push(`HESTIA_${alias}_PORT=${endpoint.port}`);
+      if (endpoint.publicUrl !== undefined)
+        lines.push(`HESTIA_${alias}_URL=${endpoint.publicUrl}`);
+      if (endpoint.localUrl !== undefined)
+        lines.push(`HESTIA_${alias}_LOCAL_URL=${endpoint.localUrl}`);
+      if (endpoint.url !== undefined)
+        lines.push(`HESTIA_${alias}_DIRECT_URL=${endpoint.url}`);
+    }
+  }
+  return [...new Set(lines)].join(`
+`);
+}
+var init_fleet_format = __esm(() => {
+  init_src2();
+});
+
+// packages/tui/src/fleet-status.ts
+function fleetCapacitySummary(capacity, connected) {
+  if (!connected)
+    return "daemon unreachable";
+  const parts = [`${capacity.live}/${capacity.maxStacks}`];
+  if (capacity.reserved > 0)
+    parts.push(`${capacity.reserved} reserved`);
+  if (capacity.queued > 0)
+    parts.push(`${capacity.queued} queued`);
+  parts.push("daemon ok");
+  return parts.join(" \xB7 ");
+}
+function resolveStatusNotice(connectionNotice, toast) {
+  return toast ?? connectionNotice;
+}
+var FLEET_KEY_HINTS;
+var init_fleet_status = __esm(() => {
+  FLEET_KEY_HINTS = [
+    { keys: ", .", label: "stack" },
+    { keys: "[ ]", label: "svc" },
+    { keys: "o", label: "open" },
+    { keys: "y", label: "yank" },
+    { keys: "?", label: "help" }
+  ];
+});
+
+// packages/tui/src/components/StackSidebar.tsx
+import { memo } from "react";
+import { jsxDEV } from "@opentui/react/jsx-dev-runtime";
+var StackSidebar;
+var init_StackSidebar = __esm(() => {
+  init_string_width();
+  init_fleet_text();
+  init_fleet_theme();
+  init_terminal_text();
+  StackSidebar = memo(function StackSidebar2({
+    stacks,
+    capacity,
+    selectedProject,
+    width,
+    focused = false,
+    spinnerFrame = 0,
+    onSelectProject
+  }) {
+    const branchWidth = Math.max(6, width - 17);
+    const slots = capacity.maxStacks > 0 ? ` \xB7 ${capacity.live}/${capacity.maxStacks} slots` : "";
+    return /* @__PURE__ */ jsxDEV("box", {
+      style: {
+        width,
+        height: "100%",
+        flexDirection: "column",
+        border: true,
+        borderColor: focused ? fleetTheme.accent : fleetTheme.border,
+        backgroundColor: fleetTheme.background
+      },
+      children: [
+        /* @__PURE__ */ jsxDEV("box", {
+          style: { height: 1, paddingLeft: 1, paddingRight: 1, flexDirection: "row", backgroundColor: fleetTheme.panelAlt },
           children: [
-            /* @__PURE__ */ jsxDEV2("text", {
-              fg: workloadSelected ? "#ffffff" : serviceColor(service),
-              children: workloadSelected ? "\u25B8 " : "  "
-            }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV2("text", {
-              fg: workloadSelected ? "#ffffff" : fleetTheme.text,
-              children: padFleetText(sanitizeFleetTerminalText(service.name), 20)
+            /* @__PURE__ */ jsxDEV("text", {
+              fg: focused ? fleetTheme.accent : fleetTheme.text,
+              children: "Stacks"
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV2("text", {
-              fg: workloadSelected ? "#ffffff" : fleetTheme.muted,
-              children: padFleetText(service.backend, 10)
+            /* @__PURE__ */ jsxDEV("text", {
+              fg: fleetTheme.faint,
+              children: slots
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this),
+        stacks.length === 0 ? /* @__PURE__ */ jsxDEV("box", {
+          style: { paddingLeft: 1, paddingTop: 1, flexDirection: "column" },
+          children: [
+            /* @__PURE__ */ jsxDEV("text", {
+              fg: fleetTheme.muted,
+              children: "No managed stacks."
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV2("text", {
-              fg: workloadSelected ? "#ffffff" : serviceColor(service),
-              children: service.state
+            /* @__PURE__ */ jsxDEV("text", {
+              fg: fleetTheme.faint,
+              children: "`hestia up` starts one here."
             }, undefined, false, undefined, this)
           ]
-        }, `workload:${service.name}`, true, undefined, this);
-        const endpointRows = endpoints.map((endpoint, index) => {
-          const endpointSelected = service.name === selectedService && endpoint.name === selectedEndpoint;
-          const connector = index === endpoints.length - 1 ? "\u2514\u2500" : "\u251C\u2500";
-          const kind = (endpoint.kind ?? "http").toUpperCase();
-          const selector = `${endpoint.workload ?? service.name}:${endpoint.binding ?? endpoint.port}`;
-          return /* @__PURE__ */ jsxDEV2("box", {
+        }, undefined, true, undefined, this) : stacks.map((stack) => {
+          const selected = stack.project === selectedProject;
+          const branch = sanitizeFleetTerminalText(stack.branch);
+          const phase = sanitizeFleetTerminalText(stack.phase);
+          const glyph = stackPhaseGlyph(stack.phase, spinnerFrame);
+          const meta = stack.services.length > 0 ? ` \xB7${stack.services.length}` : "";
+          const warn = stack.warning === undefined ? "" : " \u26A0";
+          const available = Math.max(4, branchWidth - stringWidth(meta) - stringWidth(warn));
+          const rowBg = selected ? fleetTheme.selectedBg : fleetTheme.background;
+          return /* @__PURE__ */ jsxDEV("box", {
             onMouseDown: (event) => {
               if (event.button !== 0)
                 return;
               event.preventDefault();
               event.stopPropagation();
-              onSelectEndpoint?.(service.name, endpoint.name);
-            },
-            style: {
-              height: 1,
-              paddingLeft: 2,
-              paddingRight: 1,
-              flexDirection: "row",
-              backgroundColor: endpointSelected ? fleetTheme.selected : fleetTheme.background
+              onSelectProject?.(stack.project);
             },
+            style: { height: 1, paddingRight: 1, flexDirection: "row", backgroundColor: rowBg },
             children: [
-              /* @__PURE__ */ jsxDEV2("text", {
-                fg: endpointSelected ? "#ffffff" : fleetTheme.muted,
-                children: endpointSelected ? "\u25B8 " : `${connector} `
+              /* @__PURE__ */ jsxDEV("text", {
+                fg: fleetTheme.stripe,
+                children: selected ? "\u258E" : " "
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV2("text", {
-                fg: endpointSelected ? "#ffffff" : fleetTheme.accent,
-                children: padFleetText(sanitizeFleetTerminalText(endpoint.name), 18)
+              /* @__PURE__ */ jsxDEV("text", {
+                fg: stackPhaseColor(stack.phase),
+                children: [
+                  glyph,
+                  " "
+                ]
+              }, undefined, true, undefined, this),
+              /* @__PURE__ */ jsxDEV("text", {
+                fg: selected ? fleetTheme.bright : fleetTheme.text,
+                children: padFleetText(fitFleetText(branch, available), available)
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV2("text", {
-                fg: endpointSelected ? "#ffffff" : fleetTheme.muted,
-                children: padFleetText(kind, 8)
+              /* @__PURE__ */ jsxDEV("text", {
+                fg: fleetTheme.warning,
+                children: warn
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV2("text", {
-                fg: endpointSelected ? "#ffffff" : fleetTheme.muted,
-                children: padFleetText(sanitizeFleetTerminalText(selector), 20)
+              /* @__PURE__ */ jsxDEV("text", {
+                fg: fleetTheme.faint,
+                children: meta
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV2("text", {
-                fg: endpointSelected ? "#ffffff" : fleetTheme.text,
-                children: sanitizeFleetTerminalText(endpointReach(endpoint))
+              /* @__PURE__ */ jsxDEV("text", {
+                fg: stackPhaseColor(stack.phase),
+                children: ` ${padFleetText(phase, 8)}`
               }, undefined, false, undefined, this)
             ]
-          }, `endpoint:${service.name}:${endpoint.name}`, true, undefined, this);
-        });
-        return [workloadRow, ...endpointRows];
-      }) : /* @__PURE__ */ jsxDEV2("box", {
-        style: { paddingLeft: 1, paddingTop: 1 },
-        children: /* @__PURE__ */ jsxDEV2("text", {
-          fg: fleetTheme.muted,
-          children: "No workloads recorded"
-        }, undefined, false, undefined, this)
-      }, undefined, false, undefined, this)
-    ]
-  }, undefined, true, undefined, this);
-}
+          }, stack.project, true, undefined, this);
+        })
+      ]
+    }, undefined, true, undefined, this);
+  });
+});
+
+// packages/tui/src/components/ServicePane.tsx
+import { memo as memo2 } from "react";
+import { jsxDEV as jsxDEV2, Fragment } from "@opentui/react/jsx-dev-runtime";
+function portLabel(service) {
+  if (service.publishedPort === undefined)
+    return "\u2014";
+  return `:${service.publishedPort}`;
+}
+var ServicePane;
 var init_ServicePane = __esm(() => {
   init_fleet_text();
   init_fleet_theme();
   init_terminal_text();
+  ServicePane = memo2(function ServicePane2({
+    stack,
+    uptime,
+    selectedService,
+    selectedEndpoint,
+    width = 80,
+    focused = false,
+    onSelectService,
+    onSelectEndpoint
+  }) {
+    const nameWidth = Math.min(24, Math.max(12, Math.floor(width * 0.28)));
+    const backendWidth = 10;
+    const stateWidth = 10;
+    const portWidth = 7;
+    const title = stack === undefined ? "Workloads" : `Workloads \u2014 ${sanitizeFleetTerminalText(stack.branch)}`;
+    const warning = stack?.warning === undefined ? undefined : sanitizeFleetTerminalText(stack.warning);
+    return /* @__PURE__ */ jsxDEV2("box", {
+      style: {
+        height: "100%",
+        width: "100%",
+        flexDirection: "column",
+        border: true,
+        borderColor: focused ? fleetTheme.accent : fleetTheme.border,
+        backgroundColor: fleetTheme.background
+      },
+      children: [
+        /* @__PURE__ */ jsxDEV2("box", {
+          style: { height: 1, paddingLeft: 1, paddingRight: 1, flexDirection: "row", backgroundColor: fleetTheme.panelAlt },
+          children: [
+            /* @__PURE__ */ jsxDEV2("text", {
+              fg: focused ? fleetTheme.accent : fleetTheme.text,
+              children: fitFleetText(title, Math.max(8, width - 14))
+            }, undefined, false, undefined, this),
+            uptime === undefined ? null : /* @__PURE__ */ jsxDEV2("text", {
+              fg: fleetTheme.faint,
+              children: [
+                " \xB7 up ",
+                uptime
+              ]
+            }, undefined, true, undefined, this)
+          ]
+        }, undefined, true, undefined, this),
+        warning === undefined ? null : /* @__PURE__ */ jsxDEV2("box", {
+          style: { height: 1, paddingLeft: 1, paddingRight: 1 },
+          children: /* @__PURE__ */ jsxDEV2("text", {
+            fg: fleetTheme.warning,
+            children: fitFleetText(`\u26A0 ${warning}`, Math.max(8, width - 4))
+          }, undefined, false, undefined, this)
+        }, undefined, false, undefined, this),
+        stack?.services.length ? /* @__PURE__ */ jsxDEV2(Fragment, {
+          children: [
+            /* @__PURE__ */ jsxDEV2("box", {
+              style: { height: 1, paddingLeft: 1, paddingRight: 1, flexDirection: "row" },
+              children: [
+                /* @__PURE__ */ jsxDEV2("text", {
+                  fg: fleetTheme.faint,
+                  children: padFleetText("", 4)
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ jsxDEV2("text", {
+                  fg: fleetTheme.faint,
+                  children: padFleetText("NAME", nameWidth)
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ jsxDEV2("text", {
+                  fg: fleetTheme.faint,
+                  children: padFleetText("BACKEND", backendWidth)
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ jsxDEV2("text", {
+                  fg: fleetTheme.faint,
+                  children: padFleetText("STATE", stateWidth)
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ jsxDEV2("text", {
+                  fg: fleetTheme.faint,
+                  children: padFleetText("PORT", portWidth)
+                }, undefined, false, undefined, this)
+              ]
+            }, undefined, true, undefined, this),
+            stack.services.flatMap((service) => {
+              const workloadSelected = service.name === selectedService && selectedEndpoint === undefined;
+              const endpoints = serviceEndpoints(service);
+              const state = sanitizeFleetTerminalText(service.state);
+              const workloadBg = workloadSelected ? fleetTheme.selectedBg : fleetTheme.background;
+              const workloadRow = /* @__PURE__ */ jsxDEV2("box", {
+                onMouseDown: (event) => {
+                  if (event.button !== 0)
+                    return;
+                  event.preventDefault();
+                  event.stopPropagation();
+                  onSelectService?.(service.name);
+                },
+                style: { height: 1, paddingRight: 1, flexDirection: "row", backgroundColor: workloadBg },
+                children: [
+                  /* @__PURE__ */ jsxDEV2("text", {
+                    fg: fleetTheme.stripe,
+                    children: workloadSelected ? "\u258E" : " "
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsxDEV2("text", {
+                    fg: serviceStateColor(service.state),
+                    children: [
+                      " ",
+                      serviceStateGlyph(service.state),
+                      " "
+                    ]
+                  }, undefined, true, undefined, this),
+                  /* @__PURE__ */ jsxDEV2("text", {
+                    fg: workloadSelected ? fleetTheme.bright : fleetTheme.text,
+                    children: padFleetText(sanitizeFleetTerminalText(service.name), nameWidth)
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsxDEV2("text", {
+                    fg: backendColor(service.backend),
+                    children: padFleetText(service.backend, backendWidth)
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsxDEV2("text", {
+                    fg: serviceStateColor(service.state),
+                    children: padFleetText(state, stateWidth)
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsxDEV2("text", {
+                    fg: fleetTheme.muted,
+                    children: padFleetText(portLabel(service), portWidth)
+                  }, undefined, false, undefined, this)
+                ]
+              }, `workload:${service.name}`, true, undefined, this);
+              const endpointRows = endpoints.map((endpoint, index) => {
+                const endpointSelected = service.name === selectedService && endpoint.name === selectedEndpoint;
+                const connector = index === endpoints.length - 1 ? "\u2514\u2500" : "\u251C\u2500";
+                const kind = (endpoint.kind ?? "http").toUpperCase();
+                const reach = sanitizeFleetTerminalText(endpointReach(endpoint));
+                const aliasWidth = Math.min(18, Math.max(10, Math.floor(width * 0.22)));
+                const pub = endpoint.publicUrl === undefined ? "" : " pub";
+                const endpointBg = endpointSelected ? fleetTheme.selectedBg : fleetTheme.background;
+                return /* @__PURE__ */ jsxDEV2("box", {
+                  onMouseDown: (event) => {
+                    if (event.button !== 0)
+                      return;
+                    event.preventDefault();
+                    event.stopPropagation();
+                    onSelectEndpoint?.(service.name, endpoint.name);
+                  },
+                  style: { height: 1, paddingRight: 1, flexDirection: "row", backgroundColor: endpointBg },
+                  children: [
+                    /* @__PURE__ */ jsxDEV2("text", {
+                      fg: fleetTheme.stripe,
+                      children: endpointSelected ? "\u258E" : " "
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsxDEV2("text", {
+                      fg: fleetTheme.faint,
+                      children: `  ${connector} `
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsxDEV2("text", {
+                      fg: endpointSelected ? fleetTheme.bright : fleetTheme.accent,
+                      children: padFleetText(sanitizeFleetTerminalText(endpoint.name), aliasWidth)
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsxDEV2("text", {
+                      fg: fleetTheme.muted,
+                      children: padFleetText(kind, 6)
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsxDEV2("text", {
+                      fg: fleetTheme.text,
+                      children: fitFleetText(reach, Math.max(12, width - aliasWidth - 19 - pub.length))
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ jsxDEV2("text", {
+                      fg: fleetTheme.publicBadge,
+                      children: pub
+                    }, undefined, false, undefined, this)
+                  ]
+                }, `endpoint:${service.name}:${endpoint.name}`, true, undefined, this);
+              });
+              return [workloadRow, ...endpointRows];
+            })
+          ]
+        }, undefined, true, undefined, this) : /* @__PURE__ */ jsxDEV2("box", {
+          style: { paddingLeft: 1, paddingTop: 1 },
+          children: /* @__PURE__ */ jsxDEV2("text", {
+            fg: fleetTheme.muted,
+            children: stack?.phase === "queued" || stack?.phase === "reserved" ? "Waiting for a machine slot \u2014 services appear once startup begins." : "No workloads recorded"
+          }, undefined, false, undefined, this)
+        }, undefined, false, undefined, this)
+      ]
+    }, undefined, true, undefined, this);
+  });
 });
 
 // packages/tui/src/components/LogPane.tsx
 import { jsxDEV as jsxDEV3 } from "@opentui/react/jsx-dev-runtime";
 function LogPane({
-  lines,
+  rows,
   height,
   width,
   offset,
   follow,
   unseen,
   label,
+  focused = false,
   onScroll
 }) {
   const viewportRows = Math.max(1, height - 3);
-  const end = Math.max(0, lines.length - offset);
-  const start = Math.max(0, end - viewportRows - 2);
-  const visible = lines.slice(start, end).slice(-viewportRows);
+  const maxOffset = Math.max(0, rows.length - viewportRows);
+  const clamped = Math.min(offset, maxOffset);
+  const end = Math.max(0, rows.length - clamped);
+  const start = Math.max(0, end - viewportRows);
+  const visible = rows.slice(start, end);
+  const title = fitFleetText(`Logs \u2014 ${label}`, Math.max(8, width - 28));
   return /* @__PURE__ */ jsxDEV3("box", {
     onMouseScroll: (event) => {
       if (event.button !== 4 && event.button !== 5)
@@ -15435,14 +15923,21 @@ function LogPane({
       event.stopPropagation();
       onScroll?.(event.button === 4 ? -3 : 3);
     },
-    style: { height: "100%", width: "100%", flexDirection: "column", border: true, borderColor: fleetTheme.border },
+    style: {
+      height: "100%",
+      width: "100%",
+      flexDirection: "column",
+      border: true,
+      borderColor: focused ? fleetTheme.accent : fleetTheme.border,
+      backgroundColor: fleetTheme.background
+    },
     children: [
       /* @__PURE__ */ jsxDEV3("box", {
         style: { height: 1, paddingLeft: 1, paddingRight: 1, flexDirection: "row", backgroundColor: fleetTheme.panelAlt },
         children: [
           /* @__PURE__ */ jsxDEV3("text", {
-            fg: fleetTheme.text,
-            children: padFleetText(`Logs \u2014 ${label}`, Math.max(1, width - 24))
+            fg: focused ? fleetTheme.accent : fleetTheme.text,
+            children: padFleetText(title, Math.max(1, width - 24))
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsxDEV3("text", {
             fg: follow ? fleetTheme.healthy : fleetTheme.warning,
@@ -15454,15 +15949,21 @@ function LogPane({
         style: { paddingLeft: 1, paddingTop: 1 },
         children: /* @__PURE__ */ jsxDEV3("text", {
           fg: fleetTheme.muted,
-          children: "No log output yet \u2014 service is still being followed."
+          children: "No log output yet \u2014 waiting for this workload."
         }, undefined, false, undefined, this)
-      }, undefined, false, undefined, this) : visible.map((line, index) => /* @__PURE__ */ jsxDEV3("box", {
-        style: { height: 1, paddingLeft: 1 },
-        children: /* @__PURE__ */ jsxDEV3("text", {
-          fg: line.meta ? fleetTheme.warning : fleetTheme.text,
-          children: fitFleetText(line.meta ? `[hestia] ${line.text}` : line.text, Math.max(1, width - 4))
-        }, undefined, false, undefined, this)
-      }, `${start + index}-${line.text}`, false, undefined, this))
+      }, undefined, false, undefined, this) : visible.map((row2) => /* @__PURE__ */ jsxDEV3("box", {
+        style: { height: 1, paddingLeft: 1, flexDirection: "row" },
+        children: [
+          row2.tag === undefined ? null : /* @__PURE__ */ jsxDEV3("text", {
+            fg: fleetTheme.accent,
+            children: row2.tag
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV3("text", {
+            fg: row2.meta ? fleetTheme.warning : fleetTheme.text,
+            children: row2.text
+          }, undefined, false, undefined, this)
+        ]
+      }, row2.key, true, undefined, this))
     ]
   }, undefined, true, undefined, this);
 }
@@ -15472,16 +15973,16 @@ var init_LogPane = __esm(() => {
 });
 
 // packages/tui/src/components/FleetModal.tsx
-import { jsxDEV as jsxDEV4, Fragment } from "@opentui/react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV4, Fragment as Fragment2 } from "@opentui/react/jsx-dev-runtime";
 function FleetModal({
   title,
   terminalWidth,
   terminalHeight,
   children
 }) {
-  const width = Math.min(72, Math.max(30, terminalWidth - 4));
-  const height = Math.min(18, Math.max(7, terminalHeight - 4));
-  return /* @__PURE__ */ jsxDEV4(Fragment, {
+  const width = Math.min(78, Math.max(36, terminalWidth - 4));
+  const height = Math.min(22, Math.max(8, terminalHeight - 4));
+  return /* @__PURE__ */ jsxDEV4(Fragment2, {
     children: [
       /* @__PURE__ */ jsxDEV4("box", {
         style: { position: "absolute", top: 0, left: 0, width: terminalWidth, height: terminalHeight, zIndex: 50 }
@@ -15503,10 +16004,22 @@ function FleetModal({
           paddingTop: 1
         },
         children: [
-          /* @__PURE__ */ jsxDEV4("text", {
-            fg: fleetTheme.accent,
-            children: title
-          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV4("box", {
+            style: { height: 1, flexDirection: "row" },
+            children: [
+              /* @__PURE__ */ jsxDEV4("box", {
+                style: { flexGrow: 1 },
+                children: /* @__PURE__ */ jsxDEV4("text", {
+                  fg: fleetTheme.accent,
+                  children: title
+                }, undefined, false, undefined, this)
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV4("text", {
+                fg: fleetTheme.faint,
+                children: "Esc closes"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this),
           /* @__PURE__ */ jsxDEV4("box", {
             style: { height: 1 }
           }, undefined, false, undefined, this),
@@ -15521,10 +16034,10 @@ var init_FleetModal = __esm(() => {
 });
 
 // packages/tui/src/FleetApp.tsx
-import { useEffect, useMemo, useReducer, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useReducer, useRef, useState } from "react";
 import { existsSync as existsSync23 } from "fs";
 import { useKeyboard, useRenderer, useTerminalDimensions } from "@opentui/react";
-import { jsxDEV as jsxDEV5, Fragment as Fragment2 } from "@opentui/react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV5, Fragment as Fragment3 } from "@opentui/react/jsx-dev-runtime";
 function middleTruncateWorktreePath(path, width) {
   if (path.length <= width)
     return path;
@@ -15542,32 +16055,24 @@ function middleTruncateWorktreePath(path, width) {
 function emptySnapshot(repoId) {
   return { repoId, observedAt: new Date(0).toISOString(), capacity: EMPTY_CAPACITY, stacks: [], shared: [], warnings: [] };
 }
-function isEscape(key) {
-  const name = key.name.toLowerCase();
-  return name === "escape" || name === "esc" || key.sequence === "\x1B";
-}
-function isFleetKey(key, value) {
-  return !key.ctrl && !key.meta && !key.option && !key.super && !key.hyper && (key.name === value || key.sequence === value);
-}
 function selectedStack(snapshot, project) {
   return snapshot.stacks.find((stack) => stack.project === project);
 }
 function fleetServiceRowCount(stack) {
-  return stack?.services.reduce((count, service) => count + 1 + (service.endpoints?.length ?? (service.endpoint === undefined ? 0 : 1)), 0) ?? 0;
+  return stack?.services.reduce((count, service) => count + 1 + serviceEndpoints(service).length, 0) ?? 0;
 }
 function selectedFleetEndpoint(stack, serviceName, endpointName) {
   const service = stack?.services.find((candidate) => candidate.name === serviceName);
-  const endpoints = service?.endpoints ?? (service?.endpoint === undefined ? [] : [service.endpoint]);
+  const endpoints = service === undefined ? [] : serviceEndpoints(service);
   return endpoints.find((endpoint) => endpoint.name === endpointName) ?? endpoints[0];
 }
 function usableEndpoint(stack, serviceName, endpointName) {
   const endpoint = selectedFleetEndpoint(stack, serviceName, endpointName);
-  if (endpoint === undefined)
-    return;
-  return endpoint.localUrl ?? endpoint.publicUrl ?? endpoint.url ?? `${endpoint.host}:${endpoint.port}`;
+  return endpoint === undefined ? undefined : endpointReach(endpoint);
 }
-function copyableEndpoint(stack, serviceName, endpointName) {
-  return selectedFleetEndpoint(stack, serviceName, endpointName);
+function downTargetChanged(confirmed, snapshot) {
+  const current = snapshot.stacks.find((candidate) => candidate.project === confirmed.project);
+  return current?.repoId !== confirmed.repoId || current.worktree !== confirmed.worktree || current.createdAt !== confirmed.createdAt;
 }
 function fleetLogSelectionKey(stack, serviceName) {
   if (stack === undefined || serviceName === undefined)
@@ -15593,6 +16098,20 @@ function doctorOmissionSummary(rows, visibleRows = 10) {
   const warnings = omitted.filter((row2) => row2.level === "warn").length;
   return `\u2026 ${omitted.length} more (${errors2} errors, ${warnings} warnings)`;
 }
+function budgetDoctorReport(rows, width, lineBudget) {
+  const entries = [];
+  let used = 0;
+  for (const row2 of rows) {
+    const detail = sanitizeFleetTerminalText(row2.detail);
+    const detailLines = detail === "" ? [] : wrapFleetText(detail, Math.max(8, width - 6), 2);
+    const cost = 1 + detailLines.length;
+    if (used + cost > lineBudget)
+      break;
+    entries.push({ row: row2, detailLines });
+    used += cost;
+  }
+  return { entries, shown: entries.length };
+}
 function FleetApp({
   source,
   preferredProject,
@@ -15605,13 +16124,29 @@ function FleetApp({
   const [state, dispatch] = useReducer(reduceFleetUiState, undefined, createFleetUiState);
   const [logs, setLogs] = useState([]);
   const [connected, setConnected] = useState(false);
-  const [notice, setNotice] = useState("connecting to hestiad\u2026");
+  const [connectionNotice, setConnectionNotice] = useState("connecting to hestiad\u2026");
+  const [toast, setToast] = useState(undefined);
   const [doctorRows, setDoctorRows] = useState([]);
   const [doctorRunning, setDoctorRunning] = useState(false);
   const [sharedBusy, setSharedBusy] = useState(false);
+  const [spinnerFrame, setSpinnerFrame] = useState(0);
+  const [now, setNow] = useState(() => Date.now());
   const lastFrameAt = useRef(Date.now());
+  const toastTimer = useRef(undefined);
   const stateRef = useRef(state);
   stateRef.current = state;
+  const showToast = (text2, ttl = TOAST_TTL_MS) => {
+    if (toastTimer.current !== undefined)
+      clearTimeout(toastTimer.current);
+    setToast(text2);
+    toastTimer.current = setTimeout(() => {
+      setToast((current) => current === text2 ? undefined : current);
+    }, ttl);
+  };
+  useEffect(() => () => {
+    if (toastTimer.current !== undefined)
+      clearTimeout(toastTimer.current);
+  }, []);
   useEffect(() => {
     const controller = new AbortController;
     (async () => {
@@ -15619,23 +16154,24 @@ function FleetApp({
         lastFrameAt.current = Date.now();
         if (frame.type === "snapshot") {
           setConnected(true);
-          setNotice((current) => current === "connecting to hestiad\u2026" || current.startsWith("disconnected:") || current.startsWith("hestiad heartbeat") ? "" : current);
+          setConnectionNotice(undefined);
           setSnapshot(frame.snapshot);
           dispatch({ type: "reconcile", snapshot: frame.snapshot, preferredProject });
         } else if (frame.sequence === -1) {
           setConnected(false);
-          setNotice(frame.at);
+          setConnectionNotice(frame.at);
         } else {
           setConnected(true);
+          setConnectionNotice(undefined);
         }
       }
     })();
     const staleTimer = setInterval(() => {
       if (Date.now() - lastFrameAt.current > 20000) {
         setConnected(false);
-        setNotice("hestiad heartbeat is stale; reconnecting\u2026");
+        setConnectionNotice("hestiad heartbeat is stale; reconnecting\u2026");
       }
-    }, 1000);
+    }, 5000);
     return () => {
       clearInterval(staleTimer);
       controller.abort();
@@ -15643,8 +16179,12 @@ function FleetApp({
   }, [preferredProject, source]);
   const selectedLogStack = selectedStack(snapshot, state.selection.project);
   const selectionKey = fleetLogSelectionKey(selectedLogStack, state.selection.service);
+  const appendedLines = useRef(0);
+  const seenAppendedLines = useRef(0);
   useEffect(() => {
     setLogs([]);
+    appendedLines.current = 0;
+    seenAppendedLines.current = 0;
     if (selectionKey === undefined)
       return;
     const [project, service] = selectionKey.split("\x00");
@@ -15657,57 +16197,90 @@ function FleetApp({
           service: sanitizeFleetTerminalText(line.service),
           text: sanitizeFleetTerminalText(line.text)
         };
+        appendedLines.current += 1;
         setLogs((current) => [...current, sanitized].slice(-LOG_RING_CAPACITY));
-        dispatch({ type: "new-lines", count: 1, maxOffset: LOG_RING_CAPACITY - 1 });
       }
     })();
     return () => controller.abort();
   }, [selectionKey, source]);
   const stacks = useMemo(() => visibleFleetStacks(snapshot, state.filter), [snapshot, state.filter]);
   const stack = selectedStack(snapshot, state.selection.project);
-  const context = {
+  const context = useMemo(() => ({
     repo: sanitizeFleetTerminalText(stack?.repo ?? invokingRepository.repo),
     branch: sanitizeFleetTerminalText(stack?.branch ?? invokingRepository.branch),
     worktree: sanitizeFleetTerminalText(stack?.worktree ?? invokingRepository.worktree),
     project: sanitizeFleetTerminalText(stack?.project ?? "\u2014")
-  };
-  const endpointView = copyableEndpoint(stack, state.selection.service, state.selection.endpoint);
+  }), [stack, invokingRepository]);
+  const endpointView = selectedFleetEndpoint(stack, state.selection.service, state.selection.endpoint);
   const endpoint = usableEndpoint(stack, state.selection.service, state.selection.endpoint);
-  const effectiveLayout = state.layout === "auto" ? terminal.width >= 110 ? "split" : "stack" : state.layout;
-  const focusOrder = ["stacks", "services", "logs"];
+  const effectiveLayout = resolveFleetLayout(state.layout, terminal.width);
+  const paneWidths = fleetPaneWidths(effectiveLayout, terminal.width);
+  const headerRows = 1;
+  const contextRows = 2;
+  const footerRows = 1;
+  const warningRows = stack?.warning === undefined ? 0 : 1;
+  const svcRows = fleetServiceRowCount(stack) + warningRows;
+  const stackedSidebarHeight = stackSidebarHeight(stacks.length);
+  const svcPaneH = servicePaneHeight(svcRows, effectiveLayout === "split" ? 14 : 12);
+  const logHeight = Math.max(5, terminal.height - headerRows - contextRows - footerRows - svcPaneH - (effectiveLayout === "stack" ? stackedSidebarHeight : 0));
+  const logWidth = effectiveLayout === "split" ? paneWidths.main : terminal.width;
+  const logViewportRows = Math.max(1, logHeight - 3);
+  const logRows = useMemo(() => buildFleetLogRows(logs, Math.max(1, logWidth - 4)), [logs, logWidth]);
+  const maxLogOffset = Math.max(0, logRows.length - logViewportRows);
+  useEffect(() => {
+    const appended = appendedLines.current - seenAppendedLines.current;
+    seenAppendedLines.current = appendedLines.current;
+    if (appended > 0 && !stateRef.current.follow) {
+      const fresh = buildFleetLogRows(logs.slice(-Math.min(appended, logs.length)), Math.max(1, logWidth - 4)).length;
+      dispatch({ type: "new-lines", count: fresh, maxOffset: maxLogOffset });
+    }
+  }, [logs, logWidth, maxLogOffset]);
+  const anyStarting = snapshot.stacks.some((candidate) => candidate.phase === "starting");
+  useEffect(() => {
+    if (!anyStarting)
+      return;
+    const timer = setInterval(() => setSpinnerFrame((frame) => (frame + 1) % SPINNER_FRAMES.length), 120);
+    return () => clearInterval(timer);
+  }, [anyStarting]);
+  useEffect(() => {
+    const timer = setInterval(() => setNow(Date.now()), 30000);
+    return () => clearInterval(timer);
+  }, []);
   useEffect(() => {
     const confirmed = state.confirmDown;
-    const currentIncarnation = snapshot.stacks.find((candidate) => candidate.project === confirmed?.project);
-    if (confirmed !== undefined && !state.downPending && (currentIncarnation?.repoId !== confirmed.repoId || currentIncarnation.worktree !== confirmed.worktree || currentIncarnation.createdAt !== confirmed.createdAt)) {
+    if (confirmed !== undefined && !state.downPending && downTargetChanged(confirmed, snapshot)) {
       dispatch({ type: "confirm-down" });
-      setNotice(`${confirmed.project} changed; down cancelled`);
+      showToast(`${confirmed.project} changed; down cancelled`);
     }
   }, [snapshot, state.confirmDown, state.downPending]);
+  const copyToClipboard = (value, label) => {
+    const copied = renderer.copyToClipboardOSC52(value);
+    showToast(copied ? `copied ${label ?? value}` : `copy unavailable: ${label ?? value}`);
+  };
   useKeyboard((key) => {
     const current = stateRef.current;
     if (current.confirmDown !== undefined) {
       key.preventDefault();
       key.stopPropagation();
-      if (isEscape(key) && !current.downPending) {
+      if (isEscapeKey(key) && !current.downPending) {
         dispatch({ type: "confirm-down" });
-      } else if (!current.downPending && (isFleetKey(key, "d") || key.name === "return" || key.name === "enter")) {
+      } else if (!current.downPending && (isPlainKey(key, "d") || isEnterKey(key))) {
         const confirmed = current.confirmDown;
-        const currentIncarnation = snapshot.stacks.find((candidate) => candidate.project === confirmed.project);
-        if (currentIncarnation?.repoId !== confirmed.repoId || currentIncarnation.worktree !== confirmed.worktree || currentIncarnation.createdAt !== confirmed.createdAt) {
+        if (downTargetChanged(confirmed, snapshot)) {
           dispatch({ type: "confirm-down" });
-          setNotice(`${confirmed.project} changed; down cancelled`);
+          showToast(`${confirmed.project} changed; down cancelled`);
           return;
         }
         const project = confirmed.project;
         dispatch({ type: "down-pending", pending: true });
-        setNotice(`tearing down ${project}\u2026`);
+        showToast(`tearing down ${project}\u2026`);
         source.down(confirmed).then(() => {
           dispatch({ type: "down-pending", pending: false });
           dispatch({ type: "confirm-down" });
-          setNotice(`${project} is down; named volumes retained`);
+          showToast(`${project} is down; volumes and project images removed`);
         }).catch((error) => {
           dispatch({ type: "down-pending", pending: false });
-          setNotice(`down failed: ${error.message}`);
+          showToast(`down failed: ${error.message}`);
         });
       }
       return;
@@ -15715,7 +16288,7 @@ function FleetApp({
     if (current.helpOpen || current.doctorOpen) {
       key.preventDefault();
       key.stopPropagation();
-      if (isEscape(key) || isFleetKey(key, "?")) {
+      if (isEscapeKey(key) || isPlainKey(key, "?")) {
         dispatch({ type: current.helpOpen ? "help" : "doctor", open: false });
       }
       return;
@@ -15723,45 +16296,45 @@ function FleetApp({
     if (current.sharedOpen) {
       key.preventDefault();
       key.stopPropagation();
-      if (isEscape(key) || isFleetKey(key, "s"))
+      if (isEscapeKey(key) || isPlainKey(key, "s"))
         return dispatch({ type: "shared", open: false });
       const list = snapshot.shared;
       if (list.length === 0)
         return;
-      if (key.name === "down" || isFleetKey(key, "j"))
+      if (isDownKey(key))
         return dispatch({ type: "move-shared", delta: 1, count: list.length });
-      if (key.name === "up" || isFleetKey(key, "k"))
+      if (isUpKey(key))
         return dispatch({ type: "move-shared", delta: -1, count: list.length });
       const selected = list[Math.min(current.sharedSelection, list.length - 1)];
       if (selected === undefined || sharedBusy)
         return;
       const runShared = (label, action) => {
         setSharedBusy(true);
-        setNotice(`${label} ${selected.name}\u2026`);
-        action.then(() => setNotice(`${label} ${selected.name}: done`)).catch((error) => setNotice(`${label} ${selected.name} failed: ${error.message}`)).finally(() => setSharedBusy(false));
+        showToast(`${label} ${selected.name}\u2026`);
+        action.then(() => showToast(`${label} ${selected.name}: done`)).catch((error) => showToast(`${label} ${selected.name} failed: ${error.message}`)).finally(() => setSharedBusy(false));
       };
-      if (isFleetKey(key, "a") || isFleetKey(key, "x") || isFleetKey(key, "r")) {
+      if (isPlainKey(key, "a") || isPlainKey(key, "x") || isPlainKey(key, "r")) {
         if (selected.holder?.mine !== true) {
-          setNotice(`this worktree does not hold ${selected.name}`);
+          showToast(`this worktree does not hold ${selected.name}`);
           return;
         }
         const worktree = selected.holder.worktree;
-        if (isFleetKey(key, "a"))
+        if (isPlainKey(key, "a"))
           runShared("allowing", source.allowShared(worktree, selected.name));
-        else if (isFleetKey(key, "x"))
+        else if (isPlainKey(key, "x"))
           runShared("denying", source.denyShared(worktree, selected.name));
         else
           runShared("releasing", source.releaseShared(worktree, selected.name));
         return;
       }
-      if (isFleetKey(key, "c")) {
+      if (isPlainKey(key, "c")) {
         const acting = selectedStack(snapshot, current.selection.project);
         if (acting === undefined) {
-          setNotice("select a stack (in the fleet list) to claim as");
+          showToast("select a stack (in the fleet list) to claim as");
           return;
         }
         if (selected.holder?.project === acting.project) {
-          setNotice(`${acting.project} already holds ${selected.name}`);
+          showToast(`${acting.project} already holds ${selected.name}`);
           return;
         }
         runShared(`claiming as ${acting.project},`, source.claimShared(acting.worktree, selected.name));
@@ -15770,41 +16343,59 @@ function FleetApp({
       return;
     }
     if (current.focus === "filter") {
-      if (isEscape(key) || key.name === "return" || key.name === "enter") {
+      if (isEscapeKey(key)) {
+        key.preventDefault();
+        key.stopPropagation();
+        if (current.filter !== "")
+          dispatch({ type: "filter", filter: "", snapshot });
+        else
+          dispatch({ type: "focus", focus: "stacks" });
+        return;
+      }
+      if (isEnterKey(key)) {
         key.preventDefault();
         key.stopPropagation();
         dispatch({ type: "focus", focus: "stacks" });
       }
       return;
     }
-    if (isFleetKey(key, "q"))
+    if (isPlainKey(key, "q"))
       return onQuit();
-    if (isFleetKey(key, "?"))
+    if (isPlainKey(key, "?"))
       return dispatch({ type: "help", open: true });
-    if (isFleetKey(key, "s"))
+    if (isPlainKey(key, "s"))
       return dispatch({ type: "shared", open: true });
-    if (isFleetKey(key, "/"))
+    if (isPlainKey(key, "/"))
       return dispatch({ type: "focus", focus: "filter" });
-    if (isFleetKey(key, "0"))
+    if (isPlainKey(key, "0"))
       return dispatch({ type: "layout", layout: "auto" });
-    if (isFleetKey(key, "1"))
+    if (isPlainKey(key, "1"))
       return dispatch({ type: "layout", layout: "split" });
-    if (isFleetKey(key, "2"))
+    if (isPlainKey(key, "2"))
       return dispatch({ type: "layout", layout: "stack" });
     if (key.name === "tab") {
+      const focusOrder = ["stacks", "services", "logs"];
       const index = focusOrder.indexOf(current.focus);
       const delta2 = key.shift ? -1 : 1;
       const next = (index + delta2 + focusOrder.length) % focusOrder.length;
       return dispatch({ type: "focus", focus: focusOrder[next] });
     }
-    if (isFleetKey(key, "["))
+    if (isPlainKey(key, ","))
+      return dispatch({ type: "move-stack", delta: -1, snapshot });
+    if (isPlainKey(key, "."))
+      return dispatch({ type: "move-stack", delta: 1, snapshot });
+    if (isPlainKey(key, "["))
       return dispatch({ type: "move-service", delta: -1, snapshot });
-    if (isFleetKey(key, "]"))
+    if (isPlainKey(key, "]"))
       return dispatch({ type: "move-service", delta: 1, snapshot });
-    if (isFleetKey(key, "g") && key.shift || key.sequence === "G") {
+    if (isPlainKey(key, "f"))
+      return dispatch({ type: "follow", follow: !current.follow });
+    if (isFollowBottomKey(key))
       return dispatch({ type: "follow", follow: true });
+    if (isScrollTopKey(key)) {
+      return dispatch({ type: "scroll-logs", delta: -logRows.length, maxOffset: maxLogOffset });
     }
-    if (key.sequence === "D" || isFleetKey(key, "d") && key.shift) {
+    if (isDoctorKey(key)) {
       if (doctorRunning)
         return;
       dispatch({ type: "doctor", open: true });
@@ -15812,40 +16403,52 @@ function FleetApp({
       setDoctorRows([]);
       const worktree = stack !== undefined && existsSync23(stack.worktree) ? stack.worktree : process.cwd();
       source.diagnose(worktree).then(setDoctorRows).catch((error) => {
-        setNotice(`doctor failed: ${error.message}`);
+        showToast(`doctor failed: ${error.message}`);
       }).finally(() => setDoctorRunning(false));
       return;
     }
-    if (isFleetKey(key, "d")) {
+    if (isPlainKey(key, "d")) {
       if (stack?.phase === "queued" || stack?.phase === "reserved") {
-        setNotice(`${stack.project} is ${stack.phase}; down is available after startup begins`);
+        showToast(`${stack.project} is ${stack.phase}; down is available after startup begins`);
       } else if (stack !== undefined) {
         dispatch({ type: "confirm-down", stack });
       }
       return;
     }
-    if (isFleetKey(key, "o") && endpoint !== undefined) {
+    if (isPlainKey(key, "o") && endpoint !== undefined) {
       openFleetUrl(endpoint);
-      setNotice(endpoint);
+      showToast(endpoint);
       return;
     }
-    if (isFleetKey(key, "y") && endpoint !== undefined) {
-      const copied = renderer.copyToClipboardOSC52(endpoint);
-      setNotice(copied ? `copied ${endpoint}` : `copy unavailable: ${endpoint}`);
+    if (isShiftedKey(key, "y")) {
+      if (stack === undefined)
+        return;
+      const env = buildEnvBlock(stack);
+      if (env === "")
+        showToast(`no env surface recorded for ${stack.project}`);
+      else
+        copyToClipboard(env, `env block (${env.split(`
+`).length} keys)`);
       return;
     }
-    const copySurfaceRequested = ["c", "l", "p"].some((name) => isFleetKey(key, name));
-    const surface = isFleetKey(key, "c") ? endpointView?.url : isFleetKey(key, "l") ? endpointView?.localUrl : isFleetKey(key, "p") ? endpointView?.publicUrl : undefined;
-    if (surface !== undefined) {
-      const copied = renderer.copyToClipboardOSC52(surface);
-      setNotice(copied ? `copied ${surface}` : `copy unavailable: ${surface}`);
+    if (isPlainKey(key, "y") && endpoint !== undefined) {
+      copyToClipboard(endpoint);
       return;
     }
-    if (copySurfaceRequested) {
-      setNotice("selected URL surface is unavailable");
+    const copySurfaces = [
+      ["c", endpointView?.url],
+      ["l", endpointView?.localUrl],
+      ["p", endpointView?.publicUrl]
+    ];
+    const copySurface = copySurfaces.find(([name]) => isPlainKey(key, name));
+    if (copySurface !== undefined) {
+      if (copySurface[1] !== undefined)
+        copyToClipboard(copySurface[1]);
+      else
+        showToast("selected URL surface is unavailable");
       return;
     }
-    const delta = key.name === "down" || isFleetKey(key, "j") ? 1 : key.name === "up" || isFleetKey(key, "k") ? -1 : 0;
+    const delta = isDownKey(key) ? 1 : isUpKey(key) ? -1 : 0;
     if (delta === 0)
       return;
     if (current.focus === "stacks")
@@ -15853,11 +16456,46 @@ function FleetApp({
     else if (current.focus === "services")
       dispatch({ type: "move-service", delta, snapshot });
     else
-      dispatch({ type: "scroll-logs", delta });
+      dispatch({ type: "scroll-logs", delta, maxOffset: maxLogOffset });
   });
-  const capacity = snapshot.capacity;
-  const status = connected ? `${capacity.live}/${capacity.maxStacks} live \xB7 ${capacity.reserved} reserved \xB7 ${capacity.queued} queued` : "disconnected";
+  const uptime = stack?.createdAt !== undefined && (stack.phase === "up" || stack.phase === "degraded" || stack.phase === "starting") ? formatUptime(stack.createdAt, now) : undefined;
   const logLabel = state.selection.service ?? "select a service";
+  const statusNotice = resolveStatusNotice(connectionNotice, toast);
+  const doctorWidth = Math.min(72, Math.max(30, terminal.width - 6));
+  const wideFooter = terminal.width >= 100;
+  const onSelectProject = useCallback((project) => dispatch({ type: "select-stack", project, snapshot }), [snapshot]);
+  const onSelectService = useCallback((service) => dispatch({ type: "select-service", service, snapshot }), [snapshot]);
+  const onSelectEndpoint = useCallback((service, endpointName) => dispatch({ type: "select-endpoint", service, endpoint: endpointName, snapshot }), [snapshot]);
+  const servicePane = /* @__PURE__ */ jsxDEV5(ServicePane, {
+    stack,
+    uptime,
+    selectedService: state.selection.service,
+    selectedEndpoint: state.selection.endpoint,
+    width: logWidth,
+    focused: state.focus === "services",
+    onSelectService,
+    onSelectEndpoint
+  }, undefined, false, undefined, this);
+  const sidebar = (width) => /* @__PURE__ */ jsxDEV5(StackSidebar, {
+    stacks,
+    capacity: snapshot.capacity,
+    selectedProject: state.selection.project,
+    width,
+    focused: state.focus === "stacks",
+    spinnerFrame,
+    onSelectProject
+  }, undefined, false, undefined, this);
+  const logPane = /* @__PURE__ */ jsxDEV5(LogPane, {
+    rows: logRows,
+    height: logHeight,
+    width: logWidth,
+    offset: state.logOffset,
+    follow: state.follow,
+    unseen: state.unseenLines,
+    label: logLabel,
+    focused: state.focus === "logs",
+    onScroll: (delta) => dispatch({ type: "scroll-logs", delta, maxOffset: maxLogOffset })
+  }, undefined, false, undefined, this);
   return /* @__PURE__ */ jsxDEV5("box", {
     style: { width: "100%", height: "100%", flexDirection: "column", backgroundColor: fleetTheme.background },
     children: [
@@ -15866,70 +16504,64 @@ function FleetApp({
         children: [
           /* @__PURE__ */ jsxDEV5("text", {
             fg: fleetTheme.accent,
-            children: [
-              "Hestia Fleet \u2014 ",
-              context.repo
-            ]
-          }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.muted,
-            children: [
-              "  ",
-              status
-            ]
-          }, undefined, true, undefined, this)
-        ]
-      }, undefined, true, undefined, this),
-      terminal.width >= 90 ? /* @__PURE__ */ jsxDEV5("box", {
-        style: { height: 4, paddingLeft: 1, flexDirection: "column", backgroundColor: fleetTheme.background },
-        children: [
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.text,
-            children: [
-              "Repository  ",
-              context.repo
-            ]
-          }, undefined, true, undefined, this),
+            children: "Hestia Fleet"
+          }, undefined, false, undefined, this),
           /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.text,
-            children: [
-              "Branch      ",
-              context.branch
-            ]
-          }, undefined, true, undefined, this),
+            fg: fleetTheme.faint,
+            children: " \xB7 "
+          }, undefined, false, undefined, this),
           /* @__PURE__ */ jsxDEV5("text", {
             fg: fleetTheme.text,
-            children: [
-              "Worktree    ",
-              middleTruncateWorktreePath(context.worktree, Math.max(16, terminal.width - 13))
-            ]
-          }, undefined, true, undefined, this),
+            children: fitFleetText(context.repo, Math.max(8, terminal.width - 30))
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV5("box", {
+            style: { flexGrow: 1 }
+          }, undefined, false, undefined, this),
           /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.muted,
-            children: [
-              "Project     ",
-              context.project
-            ]
-          }, undefined, true, undefined, this)
+            fg: connected ? fleetTheme.healthy : fleetTheme.warning,
+            children: connected ? "\u25CF connected" : "\u25CB reconnecting"
+          }, undefined, false, undefined, this)
         ]
-      }, undefined, true, undefined, this) : /* @__PURE__ */ jsxDEV5("box", {
+      }, undefined, true, undefined, this),
+      /* @__PURE__ */ jsxDEV5("box", {
         style: { height: 2, paddingLeft: 1, flexDirection: "column", backgroundColor: fleetTheme.background },
         children: [
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.text,
+          /* @__PURE__ */ jsxDEV5("box", {
+            style: { height: 1, flexDirection: "row" },
             children: [
-              context.repo,
-              " \xB7 ",
-              context.branch,
-              " \xB7 ",
-              context.project
+              /* @__PURE__ */ jsxDEV5("text", {
+                fg: fleetTheme.muted,
+                children: fitFleetText(context.repo, 24)
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV5("text", {
+                fg: fleetTheme.faint,
+                children: " / "
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV5("text", {
+                fg: fleetTheme.text,
+                children: context.branch
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV5("text", {
+                fg: fleetTheme.faint,
+                children: " \xB7 "
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV5("text", {
+                fg: fleetTheme.muted,
+                children: context.project
+              }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.muted,
+          /* @__PURE__ */ jsxDEV5("box", {
+            style: { height: 1, flexDirection: "row" },
             children: [
-              "worktree ",
-              middleTruncateWorktreePath(context.worktree, Math.max(12, terminal.width - 10))
+              /* @__PURE__ */ jsxDEV5("text", {
+                fg: fleetTheme.faint,
+                children: "worktree "
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV5("text", {
+                fg: fleetTheme.muted,
+                children: middleTruncateWorktreePath(context.worktree, Math.max(16, terminal.width - 11))
+              }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this)
         ]
@@ -15937,37 +16569,17 @@ function FleetApp({
       effectiveLayout === "split" ? /* @__PURE__ */ jsxDEV5("box", {
         style: { flexGrow: 1, flexDirection: "row" },
         children: [
-          /* @__PURE__ */ jsxDEV5(StackSidebar, {
-            stacks,
-            selectedProject: state.selection.project,
-            width: Math.max(28, Math.floor(terminal.width * 0.28)),
-            onSelectProject: (project) => dispatch({ type: "select-stack", project, snapshot })
-          }, undefined, false, undefined, this),
+          sidebar(paneWidths.sidebar),
           /* @__PURE__ */ jsxDEV5("box", {
             style: { flexGrow: 1, flexDirection: "column" },
             children: [
               /* @__PURE__ */ jsxDEV5("box", {
-                style: { height: Math.min(12, Math.max(5, fleetServiceRowCount(stack) + 2)) },
-                children: /* @__PURE__ */ jsxDEV5(ServicePane, {
-                  stack,
-                  selectedService: state.selection.service,
-                  selectedEndpoint: state.selection.endpoint,
-                  onSelectService: (service) => dispatch({ type: "select-service", service, snapshot }),
-                  onSelectEndpoint: (service, endpoint2) => dispatch({ type: "select-endpoint", service, endpoint: endpoint2, snapshot })
-                }, undefined, false, undefined, this)
+                style: { height: svcPaneH },
+                children: servicePane
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsxDEV5("box", {
                 style: { flexGrow: 1 },
-                children: /* @__PURE__ */ jsxDEV5(LogPane, {
-                  lines: logs,
-                  height: Math.max(5, terminal.height - 13),
-                  width: Math.max(20, Math.floor(terminal.width * 0.72)),
-                  offset: state.logOffset,
-                  follow: state.follow,
-                  unseen: state.unseenLines,
-                  label: logLabel,
-                  onScroll: (delta) => dispatch({ type: "scroll-logs", delta })
-                }, undefined, false, undefined, this)
+                children: logPane
               }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this)
@@ -15976,42 +16588,22 @@ function FleetApp({
         style: { flexGrow: 1, flexDirection: "column" },
         children: [
           /* @__PURE__ */ jsxDEV5("box", {
-            style: { height: Math.min(7, Math.max(4, stacks.length + 2)) },
-            children: /* @__PURE__ */ jsxDEV5(StackSidebar, {
-              stacks,
-              selectedProject: state.selection.project,
-              width: terminal.width,
-              onSelectProject: (project) => dispatch({ type: "select-stack", project, snapshot })
-            }, undefined, false, undefined, this)
+            style: { height: stackedSidebarHeight },
+            children: sidebar(terminal.width)
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsxDEV5("box", {
-            style: { height: Math.min(10, Math.max(4, fleetServiceRowCount(stack) + 2)) },
-            children: /* @__PURE__ */ jsxDEV5(ServicePane, {
-              stack,
-              selectedService: state.selection.service,
-              selectedEndpoint: state.selection.endpoint,
-              onSelectService: (service) => dispatch({ type: "select-service", service, snapshot }),
-              onSelectEndpoint: (service, endpoint2) => dispatch({ type: "select-endpoint", service, endpoint: endpoint2, snapshot })
-            }, undefined, false, undefined, this)
+            style: { height: svcPaneH },
+            children: servicePane
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsxDEV5("box", {
             style: { flexGrow: 1 },
-            children: /* @__PURE__ */ jsxDEV5(LogPane, {
-              lines: logs,
-              height: Math.max(5, terminal.height - 17),
-              width: terminal.width,
-              offset: state.logOffset,
-              follow: state.follow,
-              unseen: state.unseenLines,
-              label: logLabel,
-              onScroll: (delta) => dispatch({ type: "scroll-logs", delta })
-            }, undefined, false, undefined, this)
+            children: logPane
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
       /* @__PURE__ */ jsxDEV5("box", {
         style: { height: 1, paddingLeft: 1, paddingRight: 1, flexDirection: "row", backgroundColor: fleetTheme.panelAlt },
-        children: state.focus === "filter" ? /* @__PURE__ */ jsxDEV5(Fragment2, {
+        children: state.focus === "filter" ? /* @__PURE__ */ jsxDEV5(Fragment3, {
           children: [
             /* @__PURE__ */ jsxDEV5("text", {
               fg: fleetTheme.accent,
@@ -16026,76 +16618,106 @@ function FleetApp({
               onSubmit: () => dispatch({ type: "focus", focus: "stacks" })
             }, undefined, false, undefined, this)
           ]
-        }, undefined, true, undefined, this) : /* @__PURE__ */ jsxDEV5("text", {
-          fg: notice ? fleetTheme.warning : fleetTheme.muted,
-          children: notice || "click rows \xB7 wheel logs \xB7 j/k navigate \xB7 [/] service \xB7 / filter \xB7 d down \xB7 ? help \xB7 q quit"
-        }, undefined, false, undefined, this)
+        }, undefined, true, undefined, this) : statusNotice !== undefined ? /* @__PURE__ */ jsxDEV5(Fragment3, {
+          children: [
+            /* @__PURE__ */ jsxDEV5("text", {
+              fg: connectionNotice !== undefined ? fleetTheme.warning : fleetTheme.text,
+              children: fitFleetText(statusNotice, Math.max(8, terminal.width - 20))
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsxDEV5("box", {
+              style: { flexGrow: 1 }
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsxDEV5("text", {
+              fg: connected ? fleetTheme.muted : fleetTheme.warning,
+              children: fleetCapacitySummary(snapshot.capacity, connected)
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this) : /* @__PURE__ */ jsxDEV5(Fragment3, {
+          children: [
+            wideFooter ? /* @__PURE__ */ jsxDEV5("text", {
+              children: FLEET_KEY_HINTS.map((hint) => /* @__PURE__ */ jsxDEV5("span", {
+                children: [
+                  /* @__PURE__ */ jsxDEV5("span", {
+                    fg: fleetTheme.bright,
+                    bg: fleetTheme.keycapBg,
+                    children: ` ${hint.keys} `
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsxDEV5("span", {
+                    fg: fleetTheme.muted,
+                    children: ` ${hint.label}  `
+                  }, undefined, false, undefined, this)
+                ]
+              }, hint.keys, true, undefined, this))
+            }, undefined, false, undefined, this) : /* @__PURE__ */ jsxDEV5("text", {
+              fg: fleetTheme.muted,
+              children: "? help \xB7 q quit"
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsxDEV5("box", {
+              style: { flexGrow: 1 }
+            }, undefined, false, undefined, this),
+            state.filter !== "" ? /* @__PURE__ */ jsxDEV5("text", {
+              fg: fleetTheme.accent,
+              children: `filter=${fitFleetText(state.filter, 16)} `
+            }, undefined, false, undefined, this) : null,
+            /* @__PURE__ */ jsxDEV5("text", {
+              fg: connected ? fleetTheme.muted : fleetTheme.warning,
+              children: fleetCapacitySummary(snapshot.capacity, connected)
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this)
       }, undefined, false, undefined, this),
       state.helpOpen ? /* @__PURE__ */ jsxDEV5(FleetModal, {
         title: "Fleet help",
         terminalWidth: terminal.width,
         terminalHeight: terminal.height,
-        children: [
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.text,
-            children: "j/k or arrows  navigate focused pane"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.text,
-            children: "mouse  click stacks/services \xB7 wheel scroll logs"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.text,
-            children: "Tab / Shift-Tab  change pane"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.text,
-            children: "[ / ]  previous / next service"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.text,
-            children: "/ filter \xB7 G follow logs \xB7 0/1/2 layout"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.text,
-            children: "o open \xB7 y primary \xB7 c direct \xB7 l local \xB7 p public"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.text,
-            children: "D doctor \xB7 s shared hostnames (claim / allow / deny / release)"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.danger,
-            children: "d confirmed down (named volumes retained)"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.muted,
-            children: "Esc closes this dialog"
-          }, undefined, false, undefined, this)
-        ]
-      }, undefined, true, undefined, this) : null,
+        children: HELP_ROWS.map(([keys, action]) => /* @__PURE__ */ jsxDEV5("box", {
+          style: { height: 1, flexDirection: "row" },
+          children: [
+            /* @__PURE__ */ jsxDEV5("text", {
+              fg: fleetTheme.accent,
+              children: padFleetText(keys, 9)
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsxDEV5("text", {
+              fg: fleetTheme.muted,
+              children: action
+            }, undefined, false, undefined, this)
+          ]
+        }, keys, true, undefined, this))
+      }, undefined, false, undefined, this) : null,
       state.doctorOpen ? /* @__PURE__ */ jsxDEV5(FleetModal, {
         title: "hestia doctor",
         terminalWidth: terminal.width,
         terminalHeight: terminal.height,
-        children: [
-          doctorRunning ? /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.muted,
-            children: "Running diagnostics\u2026"
-          }, undefined, false, undefined, this) : doctorRows.slice(0, 10).map((row2) => /* @__PURE__ */ jsxDEV5("text", {
-            fg: row2.level === "error" ? fleetTheme.danger : row2.level === "warn" ? fleetTheme.warning : fleetTheme.text,
-            children: `${row2.level === "ok" ? "\u2713" : row2.level === "error" ? "\u2717" : "!"} ${sanitizeFleetTerminalText(row2.check)} \u2014 ${sanitizeFleetTerminalText(row2.detail)}`
-          }, row2.check, false, undefined, this)),
-          !doctorRunning && doctorOmissionSummary(doctorRows) !== undefined ? /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.warning,
-            children: doctorOmissionSummary(doctorRows)
-          }, undefined, false, undefined, this) : null,
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.muted,
-            children: "Esc closes this report"
-          }, undefined, false, undefined, this)
-        ]
-      }, undefined, true, undefined, this) : null,
+        children: doctorRunning ? /* @__PURE__ */ jsxDEV5("text", {
+          fg: fleetTheme.muted,
+          children: "Running diagnostics\u2026"
+        }, undefined, false, undefined, this) : (() => {
+          const modalHeight = Math.min(22, Math.max(8, terminal.height - 4));
+          const report = budgetDoctorReport(doctorRows, doctorWidth, Math.max(3, modalHeight - 6));
+          const summary = doctorOmissionSummary(doctorRows, report.shown);
+          return [
+            ...report.entries.flatMap(({ row: row2, detailLines }) => {
+              const mark = row2.level === "ok" ? "\u2713" : row2.level === "error" ? "\u2717" : row2.level === "warn" ? "!" : "?";
+              const color = row2.level === "error" ? fleetTheme.danger : row2.level === "warn" ? fleetTheme.warning : row2.level === "ok" ? fleetTheme.healthy : fleetTheme.muted;
+              const head = `${mark} ${sanitizeFleetTerminalText(row2.check)}`;
+              return [
+                /* @__PURE__ */ jsxDEV5("text", {
+                  fg: color,
+                  children: fitFleetText(head, doctorWidth - 4)
+                }, `${row2.check}:head`, false, undefined, this),
+                ...detailLines.map((part, index) => /* @__PURE__ */ jsxDEV5("text", {
+                  fg: fleetTheme.muted,
+                  children: `  ${part}`
+                }, `${row2.check}:detail:${index}`, false, undefined, this))
+              ];
+            }),
+            summary === undefined ? null : /* @__PURE__ */ jsxDEV5("text", {
+              fg: fleetTheme.warning,
+              children: summary
+            }, "doctor:omitted", false, undefined, this)
+          ];
+        })()
+      }, undefined, false, undefined, this) : null,
       state.sharedOpen ? /* @__PURE__ */ jsxDEV5(FleetModal, {
         title: "Shared hostnames",
         terminalWidth: terminal.width,
@@ -16112,7 +16734,7 @@ function FleetApp({
               children: [
                 /* @__PURE__ */ jsxDEV5("text", {
                   fg: active ? fleetTheme.accent : fleetTheme.text,
-                  children: `${active ? "\u25B8 " : "  "}${sanitizeFleetTerminalText(entry.name)}  ${sanitizeFleetTerminalText(entry.url)}  ${holder}`
+                  children: `${active ? "\u258E" : " "} ${sanitizeFleetTerminalText(entry.name)}  ${sanitizeFleetTerminalText(entry.url)}  ${holder}`
                 }, undefined, false, undefined, this),
                 entry.queue.map((waiter, position) => /* @__PURE__ */ jsxDEV5("text", {
                   fg: fleetTheme.muted,
@@ -16135,32 +16757,56 @@ function FleetApp({
         terminalWidth: terminal.width,
         terminalHeight: terminal.height,
         children: [
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.text,
+          /* @__PURE__ */ jsxDEV5("box", {
+            style: { height: 1, flexDirection: "row" },
             children: [
-              "Branch: ",
-              sanitizeFleetTerminalText(state.confirmDown.branch)
+              /* @__PURE__ */ jsxDEV5("text", {
+                fg: fleetTheme.faint,
+                children: padFleetText("Branch", 12)
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV5("text", {
+                fg: fleetTheme.bright,
+                children: sanitizeFleetTerminalText(state.confirmDown.branch)
+              }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.text,
+          /* @__PURE__ */ jsxDEV5("box", {
+            style: { height: 1, flexDirection: "row" },
             children: [
-              "Repository: ",
-              sanitizeFleetTerminalText(state.confirmDown.repo)
+              /* @__PURE__ */ jsxDEV5("text", {
+                fg: fleetTheme.faint,
+                children: padFleetText("Repository", 12)
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV5("text", {
+                fg: fleetTheme.text,
+                children: sanitizeFleetTerminalText(state.confirmDown.repo)
+              }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.text,
+          /* @__PURE__ */ jsxDEV5("box", {
+            style: { height: 1, flexDirection: "row" },
             children: [
-              "Worktree: ",
-              sanitizeFleetTerminalText(state.confirmDown.worktree)
+              /* @__PURE__ */ jsxDEV5("text", {
+                fg: fleetTheme.faint,
+                children: padFleetText("Worktree", 12)
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV5("text", {
+                fg: fleetTheme.text,
+                children: sanitizeFleetTerminalText(state.confirmDown.worktree)
+              }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsxDEV5("text", {
-            fg: fleetTheme.text,
+          /* @__PURE__ */ jsxDEV5("box", {
+            style: { height: 1, flexDirection: "row" },
             children: [
-              "Project: ",
-              sanitizeFleetTerminalText(state.confirmDown.project)
+              /* @__PURE__ */ jsxDEV5("text", {
+                fg: fleetTheme.faint,
+                children: padFleetText("Project", 12)
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV5("text", {
+                fg: fleetTheme.text,
+                children: sanitizeFleetTerminalText(state.confirmDown.project)
+              }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
           /* @__PURE__ */ jsxDEV5("box", {
@@ -16168,7 +16814,7 @@ function FleetApp({
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsxDEV5("text", {
             fg: fleetTheme.warning,
-            children: "Named volumes are retained."
+            children: "Removes named volumes and project-built images (data loss)."
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsxDEV5("text", {
             fg: fleetTheme.danger,
@@ -16179,15 +16825,33 @@ function FleetApp({
     ]
   }, undefined, true, undefined, this);
 }
-var LOG_RING_CAPACITY = 2000, EMPTY_CAPACITY;
+var LOG_RING_CAPACITY = 2000, TOAST_TTL_MS = 3500, EMPTY_CAPACITY, HELP_ROWS;
 var init_FleetApp = __esm(() => {
+  init_fleet_controller();
   init_terminal_text();
+  init_fleet_text();
   init_fleet_theme();
+  init_fleet_log_rows();
+  init_fleet_format();
+  init_fleet_status();
   init_StackSidebar();
   init_ServicePane();
   init_LogPane();
   init_FleetModal();
   EMPTY_CAPACITY = { maxStacks: 0, live: 0, reserved: 0, queued: 0 };
+  HELP_ROWS = [
+    ["j k \u2191\u2193", "move in focused pane \xB7 Tab cycles panes"],
+    [", . [ ]", "previous / next stack \xB7 service"],
+    ["/", "filter stacks (Esc clears, then exits)"],
+    ["f \xB7 g G", "pause/resume follow \xB7 top / bottom of logs"],
+    ["o", "open selected endpoint in browser"],
+    ["y \xB7 Y", "yank endpoint URL \xB7 stack env block"],
+    ["c l p", "yank direct / local / public URL"],
+    ["s", "shared hostnames (claim, allow, deny, release)"],
+    ["D \xB7 d", "doctor report \xB7 down stack (removes volumes + images)"],
+    ["1 2 0", "split / stacked / auto layout"],
+    ["q", "quit \xB7 mouse click and wheel work everywhere"]
+  ];
 });
 
 // packages/tui/src/job-control.ts
@@ -16338,17 +17002,18 @@ __export(exports_src, {
 var init_src3 = __esm(() => {
   init_runtime();
   init_fleet_source();
+  init_fleet_controller();
   init_terminal_text();
 });
 
 // packages/cli/src/index.ts
 init_src2();
 init_src();
-import { execFileSync as execFileSync4 } from "child_process";
+import { execFileSync as execFileSync5 } from "child_process";
 import { existsSync as existsSync24 } from "fs";
-import { dirname as dirname8, join as join25 } from "path";
+import { dirname as dirname8, join as join26 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
-var CLI_VERSION = "1.1.0";
+var CLI_VERSION = "1.3.0";
 var PACKAGE_NAME = "@tridha643/hestia";
 function compareVersions(a, b) {
   const parse = (value) => {
@@ -16755,7 +17420,8 @@ usage:
         health. Exit 1 only on error-level rows; never mutates anything
   hestia stop <name> [--json]             stop one supervised proc (idempotent)
   hestia down [--destroy] [--project <name>] [--json]
-        tear down procs + containers (--destroy also removes volumes);
+        tear down procs + containers (--destroy also removes volumes
+        and project-built images);
         --project works from the mirror after the worktree is deleted
   hestia status [--json]                  show this worktree's stack
   hestia env  [--json]                    print the injected env (export lines)
@@ -16825,7 +17491,7 @@ async function main() {
 `);
         }
         try {
-          execFileSync4("bun", installArgs, { stdio: flags.json ? "ignore" : "inherit" });
+          execFileSync5("bun", installArgs, { stdio: flags.json ? "ignore" : "inherit" });
         } catch (error) {
           fail("upgrade-failed", `\`bun ${installArgs.join(" ")}\` failed: ${error.message}`, flags.json);
         }
@@ -16842,8 +17508,8 @@ async function main() {
           fail("usage", "usage: hestia skill path", flags.json);
         const packageRoot = dirname8(dirname8(fileURLToPath3(import.meta.url)));
         const candidates = [
-          join25(packageRoot, "skills", "hestia", "SKILL.md"),
-          join25(process.cwd(), "skills", "hestia", "SKILL.md")
+          join26(packageRoot, "skills", "hestia", "SKILL.md"),
+          join26(process.cwd(), "skills", "hestia", "SKILL.md")
         ];
         const path = candidates.find(existsSync24);
         if (path === undefined)
@@ -17378,8 +18044,8 @@ ${JSON.stringify(result.config, null, 2)}
             process.stdout.write(JSON.stringify(line) + `
 `);
           } else {
-            const text = line.meta ? `[hestia] ${line.text}` : line.text;
-            process.stdout.write(`${line.service.padEnd(nameWidth)} \u2502 ${text}
+            const text2 = line.meta ? `[hestia] ${line.text}` : line.text;
+            process.stdout.write(`${line.service.padEnd(nameWidth)} \u2502 ${text2}
 `);
           }
         }
@@ -17444,7 +18110,7 @@ ${JSON.stringify(result.config, null, 2)}
         } else if (sub === "stop") {
           if (launchdManagesThisHome()) {
             const uid = process.getuid?.() ?? 501;
-            execFileSync4("launchctl", ["bootout", `gui/${uid}/dev.hestia.daemon`]);
+            execFileSync5("launchctl", ["bootout", `gui/${uid}/dev.hestia.daemon`]);
             process.stderr.write("warning: launchd agent booted out \u2014 `hestia daemon install` re-enables reboot revival\n");
           } else {
             await stopDaemonProcess();
@@ -17516,4 +18182,4 @@ export {
   compareVersions
 };
 
-//# debugId=D1A8C01922C41BA164756E2164756E21
+//# debugId=3CDA6D645FAEF7DC64756E2164756E21