@akanjs/cli 3.0.0-beta.19 → 3.0.0-beta.20

package/{index-bftkz6cp.js → index-ww4z397j.js}

@@ -1,89 +1,74 @@
 // @bun
+import {
+  ApplicationBuildReporter,
+  BUILDER_MIN_RSS_RECYCLE_INTERVAL_MS,
+  SOURCE_EXTS,
+  shouldRestartBackendByDevPlan,
+  shouldRestartBuilderByDevPlan,
+  shouldAbandonBackendRecovery,
+  normalizeBackendReportedGeneration,
+  shouldRestartDevHostByDevPlan,
+  devHostStateOf,
+  isLegacyBackendFallbackFile,
+  shouldMarkBuildPhaseRecovered,
+  createBackendBuildStatus,
+  backendRestartReasonFromMessage,
+  mergeBackendRestartReasons,
+  shouldReplaceLastGoodMessage,
+  shouldQueueBuildStatusReplay,
+  hasBuildFailureForGeneration,
+  decideBuilderRssRecycle,
+  decideBuilderRssSettle,
+  decideIdleSuspend,
+  resolveIdleSuspendMs,
+  hasAnyBuildFailure,
+  shouldRefreshConfigOnIdleWake,
+  shouldHoldForReturningBuilder,
+  shouldWarnBuilderRssCeilingTight,
+  isRssCeilingUnreachable,
+  shouldRelayRecycledFrontendState,
+  mergeInvalidateMessages,
+  buildStatusReplaySequence,
+  filesChangedSince,
+  HmrWatcher,
+  WatchRootResolver
+} from "./index-khpfpcsd.js";
 import {
   runner,
   script
-} from "./index-qdgzsnhg.js";
+} from "./index-w2zdcw3k.js";
 import {
   WorkspaceExecutor,
   AppExecutor,
   LibExecutor,
   PkgExecutor
-} from "./index-crmeqnmf.js";
+} from "./index-9d9bgcx4.js";
 import {
   LibraryScript
-} from "./index-7ep8qtvp.js";
-import {
-  HmrWatcher,
-  WatchRootResolver
-} from "./index-hwkygn9s.js";
+} from "./index-5pc1qrbv.js";
 import {
   stripAnsi
 } from "./index-7md2g9vw.js";
 import {
   SlicePlanner,
   formatSlicePlan
-} from "./index-kwaq3n9n.js";
+} from "./index-xqjwd384.js";
 import {
   resolveMobileTargets
-} from "./index-47pj3aee.js";
+} from "./index-5e0n4hqx.js";
 import {
   openBrowser
 } from "./index-9dp031by.js";
 
-// pkgs/@akanjs/devkit/applicationBuildReporter.ts
-import { Logger } from "akanjs/common";
-
-class ApplicationBuildReporter {
-  static create() {
-    return {
-      phaseDone: (phase) => Logger.rawLog(ApplicationBuildReporter.formatPhaseLine(phase))
-    };
-  }
-  static printSummary(result) {
-    Logger.rawLog("");
-    Logger.rawLog(`Route artifacts: ${result.artifactDir}`);
-    Logger.rawLog(`Server output: ${result.outputDir}`);
-    Logger.rawLog(`Done in ${ApplicationBuildReporter.formatDuration(result.durationMs)}`);
-  }
-  static formatError(error) {
-    if (error instanceof AggregateError) {
-      const nestedMessages = error.errors.map((nestedError, index) => ApplicationBuildReporter.formatError(nestedError).trim() || `Unknown error ${index + 1}`).map((message) => message.replace(/^/gm, "  ")).join(`
-`);
-      return nestedMessages ? `${error.message}
-${nestedMessages}` : error.message;
-    }
-    if (error instanceof Error) {
-      const causeMessage = error.cause ? `
-Caused by: ${ApplicationBuildReporter.formatError(error.cause)}` : "";
-      return `${error.message}${causeMessage}`;
-    }
-    if (typeof error === "object" && error !== null && "message" in error)
-      return String(error.message);
-    return String(error);
-  }
-  static formatDuration(ms) {
-    if (ms < 1000)
-      return `${ms}ms`;
-    if (ms < 60000)
-      return `${Math.round(ms / 100) / 10}s`;
-    const seconds = Math.floor(ms / 1000);
-    return `${Math.floor(seconds / 60)}m ${seconds % 60}s`;
-  }
-  static formatPhaseLine(phase) {
-    const summary = phase.summary ? `: ${phase.summary}` : "";
-    return `\u2713 ${phase.label}${summary} (${ApplicationBuildReporter.formatDuration(phase.durationMs)})`;
-  }
-}
-
 // pkgs/@akanjs/cli/application/application.script.ts
 import { confirm } from "@inquirer/prompts";
-import { Logger as Logger7 } from "akanjs/common";
+import { Logger as Logger6 } from "akanjs/common";
 
 // pkgs/@akanjs/cli/application/application.runner.ts
-import path5 from "path";
+import path4 from "path";
 
 // pkgs/@akanjs/devkit/akanApp/akanApp.host.ts
-import { Logger as Logger3 } from "akanjs/common";
+import { Logger as Logger2 } from "akanjs/common";
 
 // pkgs/@akanjs/devkit/sshTunnel.ts
 import { Client } from "ssh2";
@@ -172,7 +157,7 @@ var createSshTunnel = async (options) => {
       for (const socket of sockets)
         closeSocket(socket, error);
       closeQuietly(() => client.end());
-      closeBunServer(server);
+      server.stop();
     };
     client.once("error", (error) => closeTunnel(error));
     client.once("close", () => closeTunnel());
@@ -192,22 +177,10 @@ var closeBunSocket = (socket, error) => {
     socket.data.stream?.end();
   closeQuietly(() => socket.end());
 };
-var closeBunServer = (server) => {
-  server.stop();
-};
 
 // pkgs/@akanjs/devkit/createTunnel.ts
-var getSshTunnelOptions = (app, environment) => {
-  const { serveDomain, repoName } = WorkspaceExecutor.getBaseDevEnv();
-  return {
-    host: `${app.name}-${environment}.${serveDomain}`,
-    port: process.env.SSH_TUNNEL_PORT ? parseInt(process.env.SSH_TUNNEL_PORT) : 32767,
-    username: process.env.SSH_TUNNEL_USERNAME ?? "root",
-    password: process.env.SSH_TUNNEL_PASSWORD ?? repoName
-  };
-};
 var createTunnel = async (service, { app, environment, port = service === "postgres" ? 5432 : 6379 }) => {
-  const sshOptions = getSshTunnelOptions(app, environment);
+  const { serveDomain, repoName } = WorkspaceExecutor.getBaseDevEnv();
   await createSshTunnel({
     localHost: "0.0.0.0",
     localPort: port,
@@ -215,13 +188,18 @@ var createTunnel = async (service, { app, environment, port = service === "postg
     srcPort: port,
     dstHost: `${service}-0.${service}-svc.${app.name}-${environment}.svc.cluster.local`,
     dstPort: service === "postgres" ? 5432 : 6379,
-    sshOptions
+    sshOptions: {
+      host: `${app.name}-${environment}.${serveDomain}`,
+      port: process.env.SSH_TUNNEL_PORT ? parseInt(process.env.SSH_TUNNEL_PORT) : 32767,
+      username: process.env.SSH_TUNNEL_USERNAME ?? "root",
+      password: process.env.SSH_TUNNEL_PASSWORD ?? repoName
+    }
   });
   return `localhost:${port}`;
 };
 // pkgs/@akanjs/devkit/incrementalBuilder/incrementalBuilder.host.ts
 import path from "path";
-import { Logger as Logger2 } from "akanjs/common";
+import { Logger } from "akanjs/common";
 import { MemoryLimit } from "akanjs/server/memoryLimit";
 var builderMsgTypeSet = new Set([
   "build-route-res",
@@ -239,7 +217,7 @@ class IncrementalBuilderHost {
   static #restartMaxDelayMs = 30000;
   static #recycleDrainTimeoutMs = 30000;
   static #devMaxRssBytes = 1200 * 1024 * 1024;
-  logger = new Logger2("IncrementalBuilderHost");
+  logger = new Logger("IncrementalBuilderHost");
   entry;
   env;
   app;
@@ -429,12 +407,8 @@ class IncrementalBuilderHost {
     const lost = [...this.#inFlight];
     this.#inFlight.clear();
     this.logger.warn(`failing ${lost.length} unanswered builder request(s): ${reason}`);
-    for (const [id, type] of lost) {
-      if (type === "build-route")
-        this.#onMessage({ type: "build-route-res", id, ok: false, error: reason });
-      else
-        this.#onMessage({ type: "build-csr-res", id, ok: false, error: reason });
-    }
+    for (const [id, type] of lost)
+      this.#onMessage({ type: `${type}-res`, id, ok: false, error: reason });
   }
   stop() {
     this.#manualStop = true;
@@ -503,211 +477,7 @@ class BuilderRequestRouter {
 
 // pkgs/@akanjs/devkit/akanApp/BackendImportGraph.ts
 import { stat } from "fs/promises";
-import path3 from "path";
-
-// pkgs/@akanjs/devkit/akanApp/devHostPolicy.ts
 import path2 from "path";
-var BACKEND_RECOVERY_MAX_ATTEMPTS = 5;
-var HELD_BUILDER_REQUEST_LIMIT = 64;
-var BUILDER_MIN_RSS_RECYCLE_INTERVAL_MS = 30000;
-var BUILDER_TIGHT_RSS_REPORT_LIMIT = 2;
-var BUILDER_RSS_HARD_MULTIPLE = 1.5;
-var DEV_IDLE_SUSPEND_MS = 300000;
-var DEV_IDLE_MIN_UPTIME_MS = 30000;
-var SOURCE_EXTS = new Set([".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"]);
-var SERVER_SUFFIXES = [".service.ts", ".document.ts"];
-var SHARED_SUFFIXES = [".constant.ts", ".dictionary.ts", ".signal.ts"];
-var RUNTIME_METADATA_BASENAMES = new Set(["dict.ts", "sig.ts", "useClient.ts", "useServer.ts"]);
-var shouldRestartBackendByDevPlan = (message) => {
-  if (!message.devPlan)
-    return null;
-  if (message.devPlan.actions.includes("report-error"))
-    return false;
-  if (message.devPlan.actions.includes("restart-builder"))
-    return false;
-  return message.devPlan.actions.includes("restart-backend");
-};
-var shouldRestartBuilderByDevPlan = (message) => message.devPlan?.actions.includes("restart-builder") ?? false;
-var shouldAbandonBackendRecovery = (attempts, maxAttempts = BACKEND_RECOVERY_MAX_ATTEMPTS) => attempts >= maxAttempts;
-var normalizeBackendReportedGeneration = (generation) => generation >= 0 ? generation : undefined;
-var shouldRestartDevHostByDevPlan = (message) => message.devPlan?.actions.includes("restart-dev-host") ?? message.kinds.includes("config");
-var devHostStateByBackendState = {
-  starting: "starting",
-  ready: "ready",
-  "restart-pending": "restarting",
-  recovering: "recovering",
-  stopping: "stopped",
-  stopped: "stopped"
-};
-var devHostStateOf = (state, gaveUp) => state === "stopped" && gaveUp ? "failed" : devHostStateByBackendState[state];
-var RESTART_ROLE_ORDER = ["server", "shared", "barrel", "config"];
-var generationValue = (generation) => generation ?? -1;
-var isLegacyBackendFallbackFile = (file, workspaceRoot) => {
-  const abs = path2.resolve(file);
-  const ext = path2.extname(abs).toLowerCase();
-  if (!SOURCE_EXTS.has(ext))
-    return false;
-  const rel = path2.relative(path2.resolve(workspaceRoot), abs);
-  if (!rel || rel.startsWith("..") || path2.isAbsolute(rel))
-    return false;
-  const parts = rel.split(path2.sep).filter(Boolean);
-  const [scope] = parts;
-  if (scope !== "apps" && scope !== "libs" && scope !== "pkgs")
-    return false;
-  const base = path2.basename(abs);
-  return parts.includes("srvkit") || parts.includes("common") || SERVER_SUFFIXES.some((suffix) => base.endsWith(suffix)) || SHARED_SUFFIXES.some((suffix) => base.endsWith(suffix)) || RUNTIME_METADATA_BASENAMES.has(base) || base === "main.ts" || base === "server.ts";
-};
-var shouldMarkBuildPhaseRecovered = (previousByPhase, status) => {
-  const previous = previousByPhase.get(status.phase);
-  return Boolean(previous && status.ok && !previous.ok && generationValue(status.generation) >= previous.generation);
-};
-var createBackendBuildStatus = ({
-  generation,
-  ok,
-  files = [],
-  message
-}) => ({
-  generation,
-  phase: "backend",
-  ok,
-  files,
-  message
-});
-var backendRestartReasonFromMessage = (message) => {
-  const roleSet = new Set;
-  for (const role of message.devPlan?.roles ?? []) {
-    if (role === "server" || role === "shared" || role === "barrel" || role === "config")
-      roleSet.add(role);
-  }
-  return {
-    generation: message.devPlan?.generation ?? message.generation,
-    files: [...new Set(message.files)].sort(),
-    roles: RESTART_ROLE_ORDER.filter((role) => roleSet.has(role))
-  };
-};
-var mergeBackendRestartReasons = (current, next) => ({
-  generation: generationValue(next.generation) >= generationValue(current?.generation) ? next.generation : current?.generation,
-  files: [...new Set([...current?.files ?? [], ...next.files])].sort(),
-  roles: RESTART_ROLE_ORDER.filter((role) => current?.roles.includes(role) || next.roles.includes(role))
-});
-var shouldReplaceLastGoodMessage = (current, next) => !current || generationValue(next.data.generation) >= generationValue(current.data.generation);
-var shouldQueueBuildStatusReplay = (backendReady, pendingReplayCount) => !backendReady || pendingReplayCount > 0;
-var hasBuildFailureForGeneration = (statusByPhase, generation) => {
-  if (typeof generation !== "number")
-    return false;
-  for (const status of statusByPhase.values()) {
-    if (!status.ok && status.generation === generation)
-      return true;
-  }
-  return false;
-};
-var decideBuilderRssRecycle = ({
-  rssBytes,
-  ceilingBytes,
-  buildFailed,
-  msSinceLastRecycle,
-  minIntervalMs = BUILDER_MIN_RSS_RECYCLE_INTERVAL_MS
-}) => {
-  if (!ceilingBytes)
-    return "unbounded";
-  if (rssBytes < ceilingBytes)
-    return "below-ceiling";
-  if (buildFailed)
-    return "build-failed";
-  if (msSinceLastRecycle !== null && msSinceLastRecycle < minIntervalMs)
-    return "too-soon";
-  return "recycle";
-};
-var decideBuilderRssSettle = ({
-  rssBytes,
-  ceilingBytes,
-  hardMultiple = BUILDER_RSS_HARD_MULTIPLE
-}) => rssBytes >= ceilingBytes * hardMultiple ? "recycle-now" : "wait-and-recheck";
-var decideIdleSuspend = ({
-  enabled,
-  suspended,
-  builderReady,
-  backendReady,
-  buildFailed,
-  restartPending,
-  msSinceWake,
-  minUptimeMs = DEV_IDLE_MIN_UPTIME_MS
-}) => {
-  if (!enabled)
-    return "disabled";
-  if (suspended)
-    return "already-suspended";
-  if (!builderReady)
-    return "builder-not-ready";
-  if (!backendReady)
-    return "backend-not-ready";
-  if (buildFailed)
-    return "build-failed";
-  if (restartPending)
-    return "restart-pending";
-  if (msSinceWake !== null && msSinceWake < minUptimeMs)
-    return "too-soon";
-  return "suspend";
-};
-var resolveIdleSuspendMs = (raw) => {
-  if (raw === undefined || raw === "")
-    return DEV_IDLE_SUSPEND_MS;
-  const parsed = Number(raw);
-  if (!Number.isFinite(parsed) || parsed <= 0)
-    return null;
-  return Math.round(parsed);
-};
-var hasAnyBuildFailure = (statusByPhase) => [...statusByPhase.values()].some((status) => !status.ok);
-var shouldRefreshConfigOnIdleWake = (batch) => !!batch && batch.kinds.has("config");
-var RETURNING_BUILDER_STATUSES = new Set(["starting", "recycling", "restarting"]);
-var shouldHoldForReturningBuilder = ({
-  status,
-  heldCount,
-  limit = HELD_BUILDER_REQUEST_LIMIT
-}) => RETURNING_BUILDER_STATUSES.has(status) && heldCount < limit;
-var shouldWarnBuilderRssCeilingTight = (reportsSinceRecycle, limit = BUILDER_TIGHT_RSS_REPORT_LIMIT) => reportsSinceRecycle >= limit;
-var isRssCeilingUnreachable = (freshRssBytes, ceilingBytes) => freshRssBytes !== null && ceilingBytes !== null && freshRssBytes >= ceilingBytes;
-var shouldRelayRecycledFrontendState = (current, next) => {
-  if (!current || current.type !== next.type)
-    return true;
-  if (current.type === "pages-updated" && next.type === "pages-updated")
-    return current.data.bundlePath !== next.data.bundlePath;
-  if (current.type === "css-updated" && next.type === "css-updated")
-    return JSON.stringify(current.data.cssAssets) !== JSON.stringify(next.data.cssAssets);
-  return true;
-};
-var mergeDevPlans = (current, next) => {
-  if (!current)
-    return next;
-  if (!next)
-    return current;
-  const reasonByFile = { ...current.reasonByFile };
-  for (const [file, reasons] of Object.entries(next.reasonByFile)) {
-    reasonByFile[file] = [...new Set([...reasonByFile[file] ?? [], ...reasons])].sort();
-  }
-  return {
-    generation: Math.max(current.generation, next.generation),
-    files: [...new Set([...current.files, ...next.files])].sort(),
-    generatedFiles: [...new Set([...current.generatedFiles, ...next.generatedFiles])].sort(),
-    roles: [...new Set([...current.roles, ...next.roles])].sort(),
-    actions: [...new Set([...current.actions, ...next.actions])].sort(),
-    reasonByFile
-  };
-};
-var mergeInvalidateMessages = (current, next) => {
-  const generation = Math.max(generationValue(current.generation), generationValue(next.generation));
-  return {
-    type: "invalidate",
-    kinds: [...new Set([...current.kinds, ...next.kinds])].sort(),
-    files: [...new Set([...current.files, ...next.files])].sort(),
-    generation: generation >= 0 ? generation : undefined,
-    devPlan: mergeDevPlans(current.devPlan, next.devPlan)
-  };
-};
-var buildStatusReplaySequence = (pendingReplay, latestByPhase) => [...pendingReplay, ...latestByPhase.values()];
-var filesChangedSince = (before, after) => [...before].filter(([file, stamp]) => after.get(file) !== stamp).map(([file]) => file);
-
-// pkgs/@akanjs/devkit/akanApp/BackendImportGraph.ts
 var NON_SOURCE_EXT_RE = /\.(css|scss|sass|less|json|svg|png|jpe?g|webp|gif|avif|ico|woff2?|ttf|otf|mp3|mp4|wav|html)$/i;
 var GRAPH_IMPORT_KINDS = new Set([
   "import-statement",
@@ -738,7 +508,7 @@ class BackendImportGraph {
     return this.#lastRefreshSucceeded;
   }
   has(file) {
-    return this.#files.has(path3.resolve(file));
+    return this.#files.has(path2.resolve(file));
   }
   async fingerprint() {
     const stamps = await Promise.all([...this.#files].map(async (file) => {
@@ -766,9 +536,9 @@ class BackendImportGraph {
     const roots = await this.#entrypoints();
     const files = new Set;
     const queue = [...roots];
-    const workspaceRoot = path3.resolve(this.#app.workspace.workspaceRoot);
+    const workspaceRoot = path2.resolve(this.#app.workspace.workspaceRoot);
     while (queue.length > 0) {
-      const current = path3.resolve(queue.pop());
+      const current = path2.resolve(queue.pop());
       if (files.has(current))
         continue;
       if (!this.#isWorkspaceSource(current, workspaceRoot))
@@ -777,7 +547,7 @@ class BackendImportGraph {
       if (!imports)
         continue;
       files.add(current);
-      const importerDir = path3.dirname(current);
+      const importerDir = path2.dirname(current);
       for (const imp of imports) {
         if (!GRAPH_IMPORT_KINDS.has(imp.kind) || !imp.path || NON_SOURCE_EXT_RE.test(imp.path))
           continue;
@@ -808,7 +578,7 @@ class BackendImportGraph {
     const roots = [`${this.#app.cwdPath}/main.ts`, `${this.#app.cwdPath}/server.ts`];
     const existing = [];
     for (const root of roots) {
-      const abs = path3.resolve(root);
+      const abs = path2.resolve(root);
       if (await Bun.file(abs).exists())
         existing.push(abs);
     }
@@ -817,25 +587,25 @@ class BackendImportGraph {
   #resolve(specifier, importerDir) {
     try {
       const resolved = Bun.resolveSync(specifier, importerDir);
-      if (!path3.isAbsolute(resolved))
+      if (!path2.isAbsolute(resolved))
         return null;
-      if (!SOURCE_EXTS.has(path3.extname(resolved).toLowerCase()))
+      if (!SOURCE_EXTS.has(path2.extname(resolved).toLowerCase()))
         return null;
-      return path3.resolve(resolved);
+      return path2.resolve(resolved);
     } catch {
       return null;
     }
   }
   #isWorkspaceSource(file, workspaceRoot) {
-    const rel = path3.relative(workspaceRoot, file);
-    if (rel.startsWith("..") || path3.isAbsolute(rel))
+    const rel = path2.relative(workspaceRoot, file);
+    if (rel.startsWith("..") || path2.isAbsolute(rel))
       return false;
-    if (rel.includes(`${path3.sep}node_modules${path3.sep}`) || rel.includes(`${path3.sep}.akan${path3.sep}`))
+    if (rel.includes(`${path2.sep}node_modules${path2.sep}`) || rel.includes(`${path2.sep}.akan${path2.sep}`))
       return false;
-    return SOURCE_EXTS.has(path3.extname(file).toLowerCase());
+    return SOURCE_EXTS.has(path2.extname(file).toLowerCase());
   }
   #scanImports(file, source) {
-    const ext = path3.extname(file).toLowerCase();
+    const ext = path2.extname(file).toLowerCase();
     if (ext === ".tsx")
       return this.#tsxTranspiler.scanImports(source);
     if (ext === ".jsx")
@@ -848,6 +618,7 @@ class BackendImportGraph {
 
 // pkgs/@akanjs/devkit/akanApp/akanApp.host.ts
 var backendMsgTypeSet = new Set(["build-route", "build-csr"]);
+var asMib = (bytes) => Math.round(bytes / 1024 / 1024);
 var BACKEND_RESTART_DEBOUNCE_MS = 120;
 var BACKEND_GRACEFUL_TIMEOUT_MS = 8000;
 var BACKEND_RECOVERY_BASE_DELAY_MS = 1000;
@@ -863,7 +634,7 @@ var BUILDER_RECOVERY_MAX_DELAY_MS = 60000;
 
 class AkanAppHost {
   app;
-  logger = new Logger3("AkanAppHost");
+  logger = new Logger2("AkanAppHost");
   stdio;
   env;
   #onDevEvent;
@@ -941,23 +712,18 @@ class AkanAppHost {
   async stop() {
     this.#cancelIdleSuspend();
     this.#stopIdleWatcher();
-    if (this.#restartTimer) {
-      clearTimeout(this.#restartTimer);
-      this.#restartTimer = null;
-    }
-    if (this.#backendRecoveryTimer) {
-      clearTimeout(this.#backendRecoveryTimer);
-      this.#backendRecoveryTimer = null;
-    }
-    if (this.#builderRecoveryTimer) {
-      clearTimeout(this.#builderRecoveryTimer);
-      this.#builderRecoveryTimer = null;
-    }
+    this.#clearRestartTimers();
     this.#failPendingBuilderMessages("dev server is shutting down");
     await this.#stopBackend();
     this.#stopBuilder();
     return this;
   }
+  #clearRestartTimers() {
+    for (const timer of [this.#restartTimer, this.#backendRecoveryTimer, this.#builderRecoveryTimer])
+      if (timer)
+        clearTimeout(timer);
+    this.#restartTimer = this.#backendRecoveryTimer = this.#builderRecoveryTimer = null;
+  }
   kill() {
     this.stop();
   }
@@ -1253,7 +1019,6 @@ ${this.#backendStderrTail.join(`
     if (this.#rssCeilingAbandoned)
       return;
     const ceilingBytes = IncrementalBuilderHost.maxRssBytes();
-    const asMib = (bytes) => Math.round(bytes / 1024 / 1024);
     const decision = decideBuilderRssRecycle({
       rssBytes: metrics.rssBytes,
       ceilingBytes,
@@ -1291,7 +1056,6 @@ ${this.#backendStderrTail.join(`
     if (!isRssCeilingUnreachable(freshRssBytes, ceilingBytes))
       return;
     this.#rssCeilingAbandoned = true;
-    const asMib = (bytes) => Math.round(bytes / 1024 / 1024);
     this.logger.error(`[builder-recycle] a freshly recycled builder is already at ${asMib(freshRssBytes ?? 0)}MiB with nothing built on demand, so the ${asMib(ceilingBytes)}MiB ceiling cannot be met for this app; no longer enforcing it this session. Raise AKAN_BUILDER_MAX_RSS_MB, or set it to 0 to leave the builder unbounded.`);
   }
   #armRssRecycle(reason, over) {
@@ -1318,7 +1082,6 @@ ${this.#backendStderrTail.join(`
     }, BUILDER_RSS_RECYCLE_QUIET_MS);
   }
   async#recycleBuilderForRssWhenStillOver(reason, { rssBytes, ceilingBytes }) {
-    const asMib = (bytes) => Math.round(bytes / 1024 / 1024);
     if (decideBuilderRssSettle({ rssBytes, ceilingBytes }) === "recycle-now") {
       this.#recycleBuilderForRss(reason);
       return;
@@ -1510,7 +1273,7 @@ ${this.#backendStderrTail.join(`
       await this.#backendGraph.refresh();
     await this.#startBuilder({ announceBootState: true });
     const missed = await this.#takeBuilderGapChanges();
-    const backendFiles = [...new Set([...files.filter((file) => this.#isBackendFile(file)), ...missed])];
+    const backendFiles = [...new Set([...files.filter((file) => this.#backendGraph.has(file)), ...missed])];
     if (backendFiles.length === 0)
       return;
     this.logger.verbose(`[idle-suspend] ${backendFiles.length} backend file(s) changed while suspended`);
@@ -1565,10 +1328,6 @@ ${this.#backendStderrTail.join(`
     for (const message of pending)
       this.#sendToBuilder(message);
   }
-  #holdUntilBuilderReady(message) {
-    this.#pendingBuilderMessages.push(message);
-    this.logger.verbose(`[builder] holding ${message.type} until the builder is ready (${this.#pendingBuilderMessages.length} waiting)`);
-  }
   #discardPendingBuilderMessages(reason) {
     const held = this.#pendingBuilderMessages.splice(0);
     if (held.length === 0)
@@ -1580,12 +1339,17 @@ ${this.#backendStderrTail.join(`
     if (held.length === 0)
       return;
     this.logger.warn(`failing ${held.length} held builder request(s): ${reason}`);
-    for (const message of held) {
-      if (message.type === "build-route")
-        this.#sendToBackend({ type: "build-route-res", id: message.id, ok: false, error: reason });
-      else if (message.type === "build-csr")
-        this.#sendToBackend({ type: "build-csr-res", id: message.id, ok: false, error: reason });
-    }
+    for (const message of held)
+      this.#failBuilderRequest(message, reason);
+  }
+  #failBuilderRequest(message, error) {
+    if (message.type === "build-route")
+      this.#sendToBackend({ type: "build-route-res", id: message.id, ok: false, error });
+    else if (message.type === "build-csr")
+      this.#sendToBackend({ type: "build-csr-res", id: message.id, ok: false, error });
+    else
+      return false;
+    return true;
   }
   #recycleBuilderForRss(reason) {
     if (this.#pendingRecycle || this.#restartTimer) {
@@ -1706,18 +1470,7 @@ ${this.#backendStderrTail.join(`
   }
   async#recycleDevChildren(message, { refreshConfig = false } = {}) {
     const generation = message.devPlan?.generation ?? message.generation;
-    if (this.#restartTimer) {
-      clearTimeout(this.#restartTimer);
-      this.#restartTimer = null;
-    }
-    if (this.#backendRecoveryTimer) {
-      clearTimeout(this.#backendRecoveryTimer);
-      this.#backendRecoveryTimer = null;
-    }
-    if (this.#builderRecoveryTimer) {
-      clearTimeout(this.#builderRecoveryTimer);
-      this.#builderRecoveryTimer = null;
-    }
+    this.#clearRestartTimers();
     this.#builderRecoveryAttempts = 0;
     this.#pendingRestartReason = null;
     this.#lastGoodFrontend = {};
@@ -1807,7 +1560,7 @@ ${this.#backendStderrTail.join(`
     }
     if (message.kinds.includes("code"))
       await this.#backendGraph.refresh();
-    if (message.files.some((file) => this.#isBackendFile(file)))
+    if (message.files.some((file) => this.#backendGraph.has(file)))
       return true;
     if (!this.#backendGraph.lastRefreshSucceeded) {
       const fallbackFiles = message.files.filter((file) => isLegacyBackendFallbackFile(file, this.app.workspace.workspaceRoot));
@@ -1818,9 +1571,6 @@ ${this.#backendStderrTail.join(`
     }
     return false;
   }
-  #isBackendFile(file) {
-    return this.#backendGraph.has(file);
-  }
   async#startBuilder({
     announceBootState = false
   } = {}) {
@@ -1906,27 +1656,12 @@ ${this.#backendStderrTail.join(`
       return;
     const status = this.#builder?.status ?? "stopped";
     if (shouldHoldForReturningBuilder({ status, heldCount: this.#pendingBuilderMessages.length })) {
-      this.#holdUntilBuilderReady(message);
-      return;
-    }
-    if (message.type === "build-route") {
-      this.#sendToBackend({
-        type: "build-route-res",
-        id: message.id,
-        ok: false,
-        error: `builder is ${status}; reload after the builder is ready`
-      });
+      this.#pendingBuilderMessages.push(message);
+      this.logger.verbose(`[builder] holding ${message.type} until the builder is ready (${this.#pendingBuilderMessages.length} waiting)`);
       return;
     }
-    if (message.type === "build-csr") {
-      this.#sendToBackend({
-        type: "build-csr-res",
-        id: message.id,
-        ok: false,
-        error: `builder is ${status}; reload after the builder is ready`
-      });
+    if (this.#failBuilderRequest(message, `builder is ${status}; reload after the builder is ready`))
       return;
-    }
     this.logger.warn("akanAppHost builder is not running");
   }
   #stopBuilder() {
@@ -1938,25 +1673,20 @@ ${this.#backendStderrTail.join(`
   }
 }
 // pkgs/@akanjs/devkit/applicationTestPreload.ts
-import path4 from "path";
+import path3 from "path";
 var SIGNAL_TEST_PRELOAD_PATH = "test/signalTest.preload.ts";
 async function resolveSignalTestPreloadPath(target) {
   const candidates = [];
-  const addResolvedPackageCandidate = (basePath) => {
+  for (const basePath of [target.cwdPath, process.cwd(), path3.dirname(Bun.main), import.meta.dir]) {
     try {
-      candidates.push(path4.join(path4.dirname(Bun.resolveSync("akanjs/package.json", basePath)), SIGNAL_TEST_PRELOAD_PATH));
+      candidates.push(path3.join(path3.dirname(Bun.resolveSync("akanjs/package.json", basePath)), SIGNAL_TEST_PRELOAD_PATH));
     } catch {}
-  };
-  addResolvedPackageCandidate(target.cwdPath);
-  addResolvedPackageCandidate(process.cwd());
-  addResolvedPackageCandidate(path4.dirname(Bun.main));
-  addResolvedPackageCandidate(import.meta.dir);
-  candidates.push(path4.join(target.cwdPath, "../../node_modules/akanjs", SIGNAL_TEST_PRELOAD_PATH), path4.join(target.cwdPath, "../../pkgs/akanjs", SIGNAL_TEST_PRELOAD_PATH), path4.join(process.cwd(), "node_modules/akanjs", SIGNAL_TEST_PRELOAD_PATH), path4.join(process.cwd(), "pkgs/akanjs", SIGNAL_TEST_PRELOAD_PATH), path4.join(path4.dirname(Bun.main), "../../akanjs", SIGNAL_TEST_PRELOAD_PATH), path4.resolve(import.meta.dir, "../../akanjs", SIGNAL_TEST_PRELOAD_PATH));
+  }
+  candidates.push(path3.join(target.cwdPath, "../../node_modules/akanjs", SIGNAL_TEST_PRELOAD_PATH), path3.join(target.cwdPath, "../../pkgs/akanjs", SIGNAL_TEST_PRELOAD_PATH), path3.join(process.cwd(), "node_modules/akanjs", SIGNAL_TEST_PRELOAD_PATH), path3.join(process.cwd(), "pkgs/akanjs", SIGNAL_TEST_PRELOAD_PATH), path3.join(path3.dirname(Bun.main), "../../akanjs", SIGNAL_TEST_PRELOAD_PATH), path3.resolve(import.meta.dir, "../../akanjs", SIGNAL_TEST_PRELOAD_PATH));
   const uniqueCandidates = [...new Set(candidates)];
-  for (const candidate of uniqueCandidates) {
+  for (const candidate of uniqueCandidates)
     if (await Bun.file(candidate).exists())
       return candidate;
-  }
   throw new Error(`Failed to locate ${SIGNAL_TEST_PRELOAD_PATH} from ${target.cwdPath}.
 Probed paths:
 ${uniqueCandidates.map((candidate) => `  - ${candidate}`).join(`
@@ -1964,10 +1694,10 @@ ${uniqueCandidates.map((candidate) => `  - ${candidate}`).join(`
 }
 
 // pkgs/@akanjs/cli/application/application.runner.ts
-import { Logger as Logger4 } from "akanjs/common";
-var loadBuildRunner = async () => (await import("./applicationBuildRunner-n9gzaxd0.js")).ApplicationBuildRunner;
-var loadReleasePackager = async () => (await import("./applicationReleasePackager-vpggfqgq.js")).ApplicationReleasePackager;
-var loadCapacitorApp = async () => (await import("./capacitorApp-q3z0qht0.js")).CapacitorApp;
+import { Logger as Logger3 } from "akanjs/common";
+var loadBuildRunner = async () => (await import("./applicationBuildRunner-ybyp97pv.js")).ApplicationBuildRunner;
+var loadReleasePackager = async () => (await import("./applicationReleasePackager-esnrphw8.js")).ApplicationReleasePackager;
+var loadCapacitorApp = async () => (await import("./capacitorApp-1synz4en.js")).CapacitorApp;
 var loadPrompts = async () => await import("@inquirer/prompts");
 
 class ApplicationRunner extends runner("application") {
@@ -1986,9 +1716,6 @@ class ApplicationRunner extends runner("application") {
   async removeApplication(app) {
     await app.workspace.removeDir(`apps/${app.name}`);
   }
-  async getConfig(app) {
-    return await app.getConfig();
-  }
   async getScriptFilename(app) {
     if (!await app.exists("script")) {
       await app.mkdir("script");
@@ -2015,7 +1742,7 @@ class ApplicationRunner extends runner("application") {
     });
   }
   #runtimeDirOf(app, override) {
-    return path5.resolve(override ?? process.env.AKAN_RUNTIME_DIR ?? path5.join(app.workspace.workspaceRoot, "local", "apps", app.name, "runtime"));
+    return path4.resolve(override ?? process.env.AKAN_RUNTIME_DIR ?? path4.join(app.workspace.workspaceRoot, "local", "apps", app.name, "runtime"));
   }
   async runLogs(app, options) {
     const { LogControlUnavailableError, LogTailClient } = await import("akanjs/server/logging/logTailClient");
@@ -2025,13 +1752,10 @@ class ApplicationRunner extends runner("application") {
     const { level, grep, endpoint, trace, child, role, origin, since } = options;
     const query = Object.fromEntries(Object.entries({ level, grep, endpoint, trace, child, role, origin, since }).filter(([, value]) => value !== undefined && value !== null && value !== ""));
     const print = (record) => process.stdout.write(options.json ? `${JSON.stringify(record)}
-` : Logger4.render(record));
+` : Logger3.render(record));
     const note = (text) => process.stderr.write(`[akan logs] ${text}
 `);
-    let finish = null;
-    const closed = new Promise((resolve) => {
-      finish = resolve;
-    });
+    const { promise: closed, resolve: finish } = Promise.withResolvers();
     let client;
     try {
       client = await LogTailClient.connect(socketPath, {
@@ -2040,11 +1764,11 @@ class ApplicationRunner extends runner("application") {
           if (response.type === "dropped")
             note(`${response.count} records dropped (reader too slow)`);
         },
-        onClose: () => finish?.()
+        onClose: () => finish()
       });
     } catch (error) {
       if (error instanceof LogControlUnavailableError)
-        throw new Error(`${app.name} is not running (no ${path5.basename(socketPath)} in ${runtimeDir}). Start it with \`akan start ${app.name}\`, or pass --runtime-dir for a built app.`);
+        throw new Error(`${app.name} is not running (no ${path4.basename(socketPath)} in ${runtimeDir}). Start it with \`akan start ${app.name}\`, or pass --runtime-dir for a built app.`);
       throw error;
     }
     const sinceMs = since ? LogQueryMatcher.parseSince(since) : undefined;
@@ -2109,7 +1833,7 @@ try {
     const serverPath = `${app.cwdPath}/server.ts`;
     if (!await app.exists("server.ts"))
       throw new Error(`Server file not found: apps/${app.name}/server.ts`);
-    const target = path5.resolve(app.workspace.workspaceRoot, dir);
+    const target = path4.resolve(app.workspace.workspaceRoot, dir);
     const code = `
 const { server } = await import(${JSON.stringify(serverPath)});
 const { DatabaseAdaptorRole, DocumentTransfer } = await import("akanjs/service");
@@ -2205,13 +1929,7 @@ try {
       await new (await loadCapacitorApp())(app, mobileTarget.config).buildAndroid("apk", { env, regenerate });
     });
   }
-  async startAndroid(app, {
-    open = false,
-    operation = "local",
-    env = "local",
-    target,
-    regenerate = false
-  } = {}) {
+  async startAndroid(app, { open = false, operation = "local", env = "local", target, regenerate = false } = {}) {
     const targets = await resolveMobileTargets(app, target);
     if (operation === "release")
       await this.#buildMobileCsr(app, env);
@@ -2268,16 +1986,20 @@ try {
       return;
     for (const failure of failures) {
       const message = failure.error instanceof Error ? failure.error.message : String(failure.error);
-      Logger4.rawLog(`Mobile target ${failure.target} failed: ${message}`, undefined, "error");
+      Logger3.rawLog(`Mobile target ${failure.target} failed: ${message}`, undefined, "error");
     }
     throw new Error(`${failures.length}/${results.length} mobile targets failed`);
   }
-  async codepush(app, os) {
+  async codepush(app) {
+    throw new Error(`akan codepush is still in development and deploys nothing yet, so ${app.name} was not updated. To release the app's source with OTA update support, run \`akan release-source ${app.name}\`.`);
+  }
+  async#initCapacitorApp(app) {
     const [target] = await resolveMobileTargets(app, undefined);
     if (!target)
       throw new Error(`No mobile target configured for ${app.name}`);
     const capacitorApp = new (await loadCapacitorApp())(app, target.config);
     await capacitorApp.init();
+    return capacitorApp;
   }
   #getLocalDatabaseServices(mode) {
     if (mode === "single")
@@ -2335,11 +2057,7 @@ ${detail}`
     await workspace.spawn(`docker`, ["compose", "down"], { cwd: `${workspace.workspaceRoot}/local` });
   }
   async configureApp(app) {
-    const [target] = await resolveMobileTargets(app, undefined);
-    if (!target)
-      throw new Error(`No mobile target configured for ${app.name}`);
-    const capacitorApp = new (await loadCapacitorApp())(app, target.config);
-    await capacitorApp.init();
+    const capacitorApp = await this.#initCapacitorApp(app);
     if (await (await loadPrompts()).confirm({ message: "want to add camera permission?" }))
       await capacitorApp.addCamera();
     if (await (await loadPrompts()).confirm({ message: "want to add contact permission?" }))
@@ -2349,31 +2067,10 @@ ${detail}`
     await capacitorApp.save();
   }
   async releaseSource(app, { rebuild, buildNum = 0, environment = "debug", local = true } = {}) {
-    await new (await loadReleasePackager())(app, { build: () => this.build(app).then(() => {
+    const packager = new (await loadReleasePackager())(app, { build: () => this.build(app).then(() => {
       return;
-    }) }).releaseSource({
-      rebuild,
-      buildNum,
-      environment,
-      local
-    });
-    return;
-  }
-  async createApplicationTemplate(workspace, appName) {
-    await workspace.applyTemplate({ basePath: `apps/${appName}`, template: "appRoot", dict: { appName } });
-  }
-  async compressProjectFiles(app, { rebuild, buildNum = 0, environment = "debug", local = true } = {}) {
-    await new (await loadReleasePackager())(app, {
-      build: () => this.build(app).then(() => {
-        return;
-      })
-    }).compressProjectFiles({
-      rebuild,
-      buildNum,
-      environment,
-      local
-    });
-    return;
+    }) });
+    await packager.releaseSource({ rebuild, buildNum, environment, local });
   }
 }
 
@@ -2525,7 +2222,8 @@ class HostProcessProbe {
       if (!/^\d+$/.test(entry))
         continue;
       const holds = HostProcessProbe.#listDir(`/proc/${entry}/fd`).some((fd) => {
-        const inode = /^socket:\[(\d+)\]$/.exec(HostProcessProbe.#readLink(`/proc/${entry}/fd/${fd}`))?.[1];
+        const link = HostProcessProbe.#orElse(() => readlinkSync(`/proc/${entry}/fd/${fd}`), "");
+        const inode = /^socket:\[(\d+)\]$/.exec(link)?.[1];
         return !!inode && inodes.has(inode);
       });
       if (holds)
@@ -2534,24 +2232,16 @@ class HostProcessProbe {
     return pids;
   }
   static #readProc(pid, file) {
-    try {
-      return readFileSync(`/proc/${pid}/${file}`, "utf8");
-    } catch {
-      return null;
-    }
+    return HostProcessProbe.#orElse(() => readFileSync(`/proc/${pid}/${file}`, "utf8"), null);
   }
   static #listDir(dir) {
-    try {
-      return readdirSync(dir);
-    } catch {
-      return [];
-    }
+    return HostProcessProbe.#orElse(() => readdirSync(dir), []);
   }
-  static #readLink(link) {
+  static #orElse(read, fallback) {
     try {
-      return readlinkSync(link);
+      return read();
     } catch {
-      return "";
+      return fallback;
     }
   }
 }
@@ -2665,12 +2355,12 @@ class DevPortReclaimer {
 }
 
 // pkgs/@akanjs/cli/application/devStreamView.ts
-import { Logger as Logger5 } from "akanjs/common";
+import { Logger as Logger4 } from "akanjs/common";
 import chalk from "chalk";
 var appColors = ["cyan", "magenta", "yellow", "green", "blue", "red"];
 
 class DevStreamView {
-  #logger = new Logger5("akan start");
+  #logger = new Logger4("akan start");
   #partial = new Map;
   #lastState = new Map;
   #color = new Map;
@@ -2774,7 +2464,7 @@ class DevBootConcurrency {
 
 // pkgs/@akanjs/cli/application/devSessionLog.ts
 import { mkdir, rename } from "fs/promises";
-import path6 from "path";
+import path5 from "path";
 import dayjs from "dayjs";
 
 class DevSessionLog {
@@ -2798,19 +2488,19 @@ class DevSessionLog {
     return [...this.#appNames];
   }
   pathOf(app) {
-    return path6.join(this.#runtimeDirOf(app), DevSessionLog.fileName);
+    return path5.join(this.#runtimeDirOf(app), DevSessionLog.fileName);
   }
   previousPathOf(app) {
-    return path6.join(this.#runtimeDirOf(app), DevSessionLog.previousFileName);
+    return path5.join(this.#runtimeDirOf(app), DevSessionLog.previousFileName);
   }
   relativePathOf(app) {
-    return path6.relative(this.#workspaceRoot, this.pathOf(app));
+    return path5.relative(this.#workspaceRoot, this.pathOf(app));
   }
   async open() {
     const stamp = dayjs(this.#now()).format("YYYY-MM-DD HH:mm:ss");
     for (const app of this.#appNames) {
       const file = this.pathOf(app);
-      await mkdir(path6.dirname(file), { recursive: true });
+      await mkdir(path5.dirname(file), { recursive: true });
       await rename(file, this.previousPathOf(app)).catch(() => {
         return;
       });
@@ -2854,7 +2544,7 @@ class DevSessionLog {
     this.#writers.clear();
   }
   #runtimeDirOf(app) {
-    return path6.join(this.#workspaceRoot, "local", "apps", app, "runtime");
+    return path5.join(this.#workspaceRoot, "local", "apps", app, "runtime");
   }
   #writeLine(app, text) {
     const writer = this.#writers.get(app);
@@ -2877,6 +2567,16 @@ class DevSessionLog {
 
 // pkgs/@akanjs/cli/application/devSupervisor.ts
 class DevSupervisor {
+  static resolveDevUi(plain, {
+    isTty = !!process.stdout.isTTY,
+    columns = process.stdout.columns ?? 0
+  } = {}) {
+    if (plain)
+      return { mode: "stream", downgraded: false };
+    if (!isTty || columns <= 0)
+      return { mode: "stream", downgraded: true };
+    return { mode: "tui", downgraded: false };
+  }
   static supervisedEnvKey = "AKAN_DEV_SUPERVISED";
   static childHooks() {
     if (process.env[DevSupervisor.supervisedEnvKey] !== "1" || !process.send)
@@ -2940,10 +2640,7 @@ class DevSupervisor {
     return ports;
   }
   #makeChild(app, port) {
-    let markReady;
-    const ready = new Promise((resolve) => {
-      markReady = resolve;
-    });
+    const { promise: ready, resolve: markReady } = Promise.withResolvers();
     return {
       status: {
         app,
@@ -2980,16 +2677,18 @@ class DevSupervisor {
     }
   }
   async#waitForReady(child) {
-    let timer = null;
+    if (await DevSupervisor.timesOut(child.ready, DevSupervisor.readyTimeoutMs))
+      this.#note(`${child.status.name} has not reported ready after ${Math.round(DevSupervisor.readyTimeoutMs / 1000)}s; starting the next app anyway`, "warn");
+  }
+  static async timesOut(work, ms) {
+    let timer;
     const expired = new Promise((resolve) => {
-      timer = setTimeout(() => resolve("expired"), DevSupervisor.readyTimeoutMs);
+      timer = setTimeout(() => resolve(true), ms);
     });
     try {
-      if (await Promise.race([child.ready.then(() => "ready"), expired]) === "expired")
-        this.#note(`${child.status.name} has not reported ready after ${Math.round(DevSupervisor.readyTimeoutMs / 1000)}s; starting the next app anyway`, "warn");
+      return await Promise.race([work.then(() => false), expired]);
     } finally {
-      if (timer)
-        clearTimeout(timer);
+      clearTimeout(timer);
     }
   }
   static childArgs(name, { write = true } = {}) {
@@ -3111,37 +2810,19 @@ class DevSupervisor {
     for (const child of running)
       child.proc.kill("SIGTERM");
     const exited = Promise.all(running.map(async (child) => await child.proc.exited));
-    let timer = null;
-    const expired = new Promise((resolve) => {
-      timer = setTimeout(() => resolve("expired"), DevSupervisor.shutdownGraceMs);
-    });
-    try {
-      if (await Promise.race([exited.then(() => "exited"), expired]) === "expired") {
-        for (const child of running) {
-          if (!child.proc.killed) {
-            this.#note(`${child.status.name} did not exit in time; killing it`, "warn");
-            child.proc.kill("SIGKILL");
-          }
-        }
-      }
-    } finally {
-      if (timer)
-        clearTimeout(timer);
+    if (!await DevSupervisor.timesOut(exited, DevSupervisor.shutdownGraceMs))
+      return;
+    for (const child of running) {
+      if (child.proc.killed)
+        continue;
+      this.#note(`${child.status.name} did not exit in time; killing it`, "warn");
+      child.proc.kill("SIGKILL");
     }
   }
 }
 
-// pkgs/@akanjs/cli/application/devUiMode.ts
-var resolveDevUi = (plain, { isTty = !!process.stdout.isTTY, columns = process.stdout.columns ?? 0 } = {}) => {
-  if (plain)
-    return { mode: "stream", downgraded: false };
-  if (!isTty || columns <= 0)
-    return { mode: "stream", downgraded: true };
-  return { mode: "tui", downgraded: false };
-};
-
 // pkgs/@akanjs/cli/application/interruptTeardown.ts
-import { Logger as Logger6 } from "akanjs/common";
+import { Logger as Logger5 } from "akanjs/common";
 
 class InterruptTeardown {
   #teardowns = [];
@@ -3155,7 +2836,7 @@ class InterruptTeardown {
     this.#listen = listen ?? ((onSignal) => {
       process.on("SIGINT", onSignal);
     });
-    this.#report = report ?? ((message) => Logger6.rawLog(message, undefined, "error"));
+    this.#report = report ?? ((message) => Logger5.rawLog(message, undefined, "error"));
   }
   add(run, abandoned) {
     this.#teardowns.push({ run, abandoned, running: false });
@@ -3190,10 +2871,7 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
   #interrupt = new InterruptTeardown;
   async confirmDatabaseModeDependencyInstall(databaseMode, installSpecs) {
     return await confirm({
-      message: [
-        `Database mode '${databaseMode}' requires missing dependencies: ${installSpecs.join(", ")}.`,
-        "Install them now?"
-      ].join(" "),
+      message: `Database mode '${databaseMode}' requires missing dependencies: ${installSpecs.join(", ")}. Install them now?`,
       default: true
     });
   }
@@ -3204,21 +2882,11 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     const shouldInstall = await this.confirmDatabaseModeDependencyInstall(databaseMode, installSpecs);
     if (!shouldInstall)
       throw new Error(`Database mode '${databaseMode}' requires missing dependencies: ${installSpecs.join(", ")}.`);
-    const spinner = app.workspace.spinning(`Installing database dependencies for ${databaseMode} mode...`);
-    try {
-      await app.workspace.spawn("bun", ["add", ...installSpecs], {
-        stdio: "inherit"
-      });
-      await app.workspace.getPackageJson({ refresh: true });
-      spinner.succeed(`Installed database dependencies for ${databaseMode} mode`);
-    } catch (error) {
-      spinner.fail(`Failed to install database dependencies for ${databaseMode} mode`);
-      throw error;
-    }
+    await this.#addDependencies(app, installSpecs, `database dependencies for ${databaseMode} mode`);
   }
   async confirmMobileDependencyInstall(installSpecs) {
     return await confirm({
-      message: [`Mobile builds require missing dependencies: ${installSpecs.join(", ")}.`, "Install them now?"].join(" "),
+      message: `Mobile builds require missing dependencies: ${installSpecs.join(", ")}. Install them now?`,
       default: true
     });
   }
@@ -3229,15 +2897,16 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     const shouldInstall = await this.confirmMobileDependencyInstall(installSpecs);
     if (!shouldInstall)
       throw new Error(`Mobile builds require missing dependencies: ${installSpecs.join(", ")}.`);
-    const spinner = app.workspace.spinning("Installing mobile dependencies...");
+    await this.#addDependencies(app, installSpecs, "mobile dependencies");
+  }
+  async#addDependencies(app, installSpecs, what) {
+    const spinner = app.workspace.spinning(`Installing ${what}...`);
     try {
-      await app.workspace.spawn("bun", ["add", ...installSpecs], {
-        stdio: "inherit"
-      });
+      await app.workspace.spawn("bun", ["add", ...installSpecs], { stdio: "inherit" });
       await app.workspace.getPackageJson({ refresh: true });
-      spinner.succeed("Installed mobile dependencies");
+      spinner.succeed(`Installed ${what}`);
     } catch (error) {
-      spinner.fail("Failed to install mobile dependencies");
+      spinner.fail(`Failed to install ${what}`);
       throw error;
     }
   }
@@ -3279,7 +2948,7 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     const spinner = app.spinning("Planning distributable slice...");
     const plan = await this.applicationRunner.planSlice(app);
     spinner.succeed(`Slice planned (${plan.libs.length} libs, ${plan.warnings.length} warnings)`);
-    Logger7.rawLog(format === "json" ? JSON.stringify(plan, null, 2) : formatSlicePlan(plan));
+    Logger6.rawLog(format === "json" ? JSON.stringify(plan, null, 2) : formatSlicePlan(plan));
   }
   async sync(sys) {
     if (sys.type === "app")
@@ -3302,18 +2971,15 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
   async build(app, { write = true, fast = false, quiet = false } = {}) {
     await app.scanSync({ write });
     if (!quiet)
-      Logger7.rawLog(`Creating an optimized production build for ${app.name}...`);
+      Logger6.rawLog(`Creating an optimized production build for ${app.name}...`);
     try {
-      const result = await this.applicationRunner.build(app, {
-        fast,
-        spinner: !quiet
-      });
-      Logger7.rawLog(`${app.name} built in dist/apps/${app.name}`);
+      const result = await this.applicationRunner.build(app, { fast, spinner: !quiet });
+      Logger6.rawLog(`${app.name} built in dist/apps/${app.name}`);
       if (!quiet)
         ApplicationBuildReporter.printSummary(result);
     } catch (error) {
-      Logger7.rawLog(`${app.name} build failed in dist/apps/${app.name}`, undefined, "error");
-      Logger7.rawLog(ApplicationBuildReporter.formatError(error), undefined, "error");
+      Logger6.rawLog(`${app.name} build failed in dist/apps/${app.name}`, undefined, "error");
+      Logger6.rawLog(ApplicationBuildReporter.formatError(error), undefined, "error");
       throw error;
     }
   }
@@ -3325,15 +2991,14 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
       spinner.succeed(`${app.name} typechecked`);
     } catch (error) {
       spinner.fail(`${app.name} typecheck failed`);
-      Logger7.rawLog(ApplicationBuildReporter.formatError(error), undefined, "error");
+      Logger6.rawLog(ApplicationBuildReporter.formatError(error), undefined, "error");
       throw error;
     }
   }
   async test(exec, { write = true } = {}) {
     if (exec instanceof LibExecutor) {
       await this.libraryScript.syncLibrary(exec);
-      const spinner = exec.spinning(`Preparing ${exec.name}...`);
-      spinner.succeed(`${exec.name} prepared`);
+      exec.spinning(`Preparing ${exec.name}...`).succeed(`${exec.name} prepared`);
       await this.applicationRunner.test(exec);
       return;
     }
@@ -3362,7 +3027,7 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     const first = apps[0];
     if (!first)
       throw new Error("No app selected to start");
-    const { mode, downgraded } = resolveDevUi(plain);
+    const { mode, downgraded } = DevSupervisor.resolveDevUi(plain);
     if (downgraded)
       first.workspace.log("no sized terminal to draw on; printing prefixed lines instead");
     if (kill)
@@ -3384,15 +3049,12 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
         this.#stopDatabaseOnInterrupt(app.workspace);
     }
     const spinner = app.spinning("Preparing backend...");
-    const akanAppHost = await this.applicationRunner.start(app, {
+    return await this.applicationRunner.start(app, {
       open,
-      onStart: () => {
-        spinner.succeed(`${app.name} prepared, ready to start`);
-      },
+      onStart: () => spinner.succeed(`${app.name} prepared, ready to start`),
       onDevEvent,
       stdio
     });
-    return akanAppHost;
   }
   async reclaimDevPorts(apps) {
     const workspace = apps[0]?.workspace;
@@ -3403,7 +3065,7 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     for (const holder of killed)
       workspace.log(`freed port ${holder.port} \u2014 killed pid ${holder.pid} (${holder.command})`);
     for (const holder of foreign)
-      Logger7.rawLog(`port ${holder.port} is held by pid ${holder.pid} and was left alone: ${holder.command}`, undefined, "error");
+      Logger6.rawLog(`port ${holder.port} is held by pid ${holder.pid} and was left alone: ${holder.command}`, undefined, "error");
     if (killed.length === 0 && foreign.length === 0)
       workspace.log("dev ports are free; nothing to kill");
   }
@@ -3420,7 +3082,7 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
       throw new Error("No app selected to start");
     const startedDatabase = dbup ? await this.#prepareSharedDatabase(apps) : false;
     const supervisor = new DevSupervisor({ apps, mode, concurrency, open, write, shares });
-    const view = mode === "tui" ? await (await import("./devTuiView-1q1mdgrv.js")).createDevTuiView(supervisor) : new DevStreamView(apps.map((app) => app.name));
+    const view = mode === "tui" ? new (await import("./devTui-q7k7bakd.js")).DevTui(supervisor) : new DevStreamView(apps.map((app) => app.name));
     await supervisor.run(view);
     if (startedDatabase)
       await this.#stopDatabase(workspace);
@@ -3495,23 +3157,13 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     const akanConfig = await app.getConfig();
     await this.syncMobileDependencies(app, akanConfig);
     await this.syncMobileAppCapacitorPlugins(app, akanConfig);
-    await this.applicationRunner.startAndroid(app, {
-      open,
-      operation,
-      env,
-      target,
-      regenerate
-    });
+    await this.applicationRunner.startAndroid(app, { open, operation, env, target, regenerate });
   }
   async releaseAndroid(app, assembleType, { write = true, target, env = "main", regenerate = false, allowLocalRelease = false } = {}) {
     await app.scanSync({ write });
     if (env === "local" && !allowLocalRelease)
       throw new Error("releaseAndroid --env local is blocked. Pass allowLocalRelease only for explicit local release testing.");
-    await this.applicationRunner.releaseAndroid(app, assembleType, {
-      target,
-      env,
-      regenerate
-    });
+    await this.applicationRunner.releaseAndroid(app, assembleType, { target, env, regenerate });
   }
   async configureApp(app) {
     await this.applicationRunner.configureApp(app);
@@ -3519,8 +3171,8 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
   async releaseSource(app, options) {
     await this.applicationRunner.releaseSource(app, options);
   }
-  async codepush(app, os) {
-    await this.applicationRunner.codepush(app, os);
+  async codepush(app) {
+    await this.applicationRunner.codepush(app);
   }
   async transferDatabase(app, direction, dir) {
     await this.applicationRunner.transferDatabase(app, direction, dir);
@@ -3558,13 +3210,13 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
       await Promise.all(shares.map(async (share) => await share.close()));
     }, "Abandoning the tunnel release; the shares expire on their own.");
     await Promise.all(apps.map(async (app) => {
-      const { TunnelShare } = await import("./TunnelShare-2j6s511d.js");
+      const { TunnelShare } = await import("./TunnelShare-scf4e4pd.js");
       const share = await TunnelShare.open(app, { workspace: app.workspace });
       shares.push(share);
       urls.set(app.name, share.url);
-      Logger7.rawLog(`${app.name} is shared at ${share.url}`);
+      Logger6.rawLog(`${app.name} is shared at ${share.url}`);
     })).catch((error) => {
-      Logger7.rawLog(`Could not open the tunnel: ${error instanceof Error ? error.message : String(error)}`, undefined, "error");
+      Logger6.rawLog(`Could not open the tunnel: ${error instanceof Error ? error.message : String(error)}`, undefined, "error");
     });
     return urls;
   }
@@ -3574,21 +3226,12 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     }, "Abandoning the local database teardown; containers are left running.");
   }
   async#stopDatabase(workspace) {
-    let timer = null;
-    const timeout = new Promise((resolve) => {
-      timer = setTimeout(() => resolve("timeout"), ApplicationScript.dbShutdownTimeoutMs);
+    const stopped = this.dbdown(workspace).catch(() => {
+      return;
     });
-    try {
-      const result = await Promise.race([this.dbdown(workspace).catch(() => {
-        return;
-      }), timeout]);
-      if (result !== "timeout")
-        return;
-      Logger7.rawLog(`Local database did not stop within ${ApplicationScript.dbShutdownTimeoutMs}ms; run \`akan dbdown\` once Docker responds.`, undefined, "error");
-    } finally {
-      if (timer)
-        clearTimeout(timer);
-    }
+    if (!await DevSupervisor.timesOut(stopped, ApplicationScript.dbShutdownTimeoutMs))
+      return;
+    Logger6.rawLog(`Local database did not stop within ${ApplicationScript.dbShutdownTimeoutMs}ms; run \`akan dbdown\` once Docker responds.`, undefined, "error");
   }
 }