@akanjs/cli 3.0.0-beta.24 → 3.0.0-beta.26

package/{index-ymgtbmf1.js → index-cfj73ck1.js}

@@ -11,6 +11,7 @@ import {
   devHostStateOf,
   isLegacyBackendFallbackFile,
   shouldMarkBuildPhaseRecovered,
+  shouldKeepBuildFailure,
   createBackendBuildStatus,
   backendRestartReasonFromMessage,
   mergeBackendRestartReasons,
@@ -32,20 +33,20 @@ import {
   filesChangedSince,
   HmrWatcher,
   WatchRootResolver
-} from "./index-khpfpcsd.js";
+} from "./index-48k96p55.js";
 import {
   runner,
   script
-} from "./index-rmcw8yc8.js";
+} from "./index-58cyna2s.js";
 import {
   WorkspaceExecutor,
   AppExecutor,
   LibExecutor,
   PkgExecutor
-} from "./index-ga6hygxr.js";
+} from "./index-0n9q1f23.js";
 import {
   LibraryScript
-} from "./index-1db2cw0y.js";
+} from "./index-5mm3g24t.js";
 import {
   resolveMobileTargets,
   NativeApp
@@ -56,7 +57,7 @@ import {
 import {
   SlicePlanner,
   formatSlicePlan
-} from "./index-q44jbw48.js";
+} from "./index-860zjnr1.js";
 import {
   openBrowser
 } from "./index-9dp031by.js";
@@ -66,9 +67,10 @@ import { confirm } from "@inquirer/prompts";
 import { Logger as Logger6 } from "akanjs/common";
 
 // pkgs/@akanjs/cli/application/application.runner.ts
-import path4 from "path";
+import path5 from "path";
 
 // pkgs/@akanjs/devkit/akanApp/akanApp.host.ts
+import path3 from "path";
 import { Logger as Logger2 } from "akanjs/common";
 
 // pkgs/@akanjs/devkit/sshTunnel.ts
@@ -199,8 +201,10 @@ var createTunnel = async (service, { app, environment, port = service === "postg
   return `localhost:${port}`;
 };
 // pkgs/@akanjs/devkit/incrementalBuilder/incrementalBuilder.host.ts
+import fs from "fs";
 import path from "path";
 import { Logger } from "akanjs/common";
+import { CSR_DEV_DIRNAME, CSR_DEV_PATCHING_MARKER, SSR_DEV_DIRNAME } from "akanjs/server/hmr/csrDevManifest";
 import { MemoryLimit } from "akanjs/server/memoryLimit";
 var builderMsgTypeSet = new Set([
   "build-route-res",
@@ -210,15 +214,17 @@ var builderMsgTypeSet = new Set([
   "css-updated",
   "pages-updated",
   "csr-updated",
+  "ssr-updated",
   "build-status",
-  "builder-metrics"
+  "builder-metrics",
+  "boot-armed"
 ]);
 
 class IncrementalBuilderHost {
   static #restartBaseDelayMs = 1000;
   static #restartMaxDelayMs = 30000;
   static #recycleDrainTimeoutMs = 30000;
-  static #devMaxRssBytes = 1200 * 1024 * 1024;
+  static #devMaxRssBytes = 2048 * 1024 * 1024;
   logger = new Logger("IncrementalBuilderHost");
   entry;
   env;
@@ -234,20 +240,33 @@ class IncrementalBuilderHost {
   #recycleTimer = null;
   #recycleRequested = false;
   #spawnAfterRecycle = false;
+  #patcherOff = false;
   #manualStop = false;
   #inFlight = new Map;
   #startOptions = {};
-  constructor({ app, entry, env, stdio = "inherit", onMessage, onOutput }) {
+  constructor({
+    app,
+    entry,
+    env,
+    stdio = "inherit",
+    onMessage,
+    onOutput,
+    patcherOff = false
+  }) {
     this.app = app;
     this.entry = entry;
     this.env = env;
     this.#stdio = stdio;
     this.#onMessage = onMessage;
     this.#onOutput = onOutput ?? null;
+    this.#patcherOff = patcherOff;
   }
   get status() {
     return this.#status;
   }
+  get patcherOff() {
+    return this.#patcherOff;
+  }
   get pid() {
     return this.#proc?.pid ?? null;
   }
@@ -265,10 +284,16 @@ class IncrementalBuilderHost {
     this.ready = false;
     const afterRecycle = this.#spawnAfterRecycle;
     this.#spawnAfterRecycle = false;
+    this.#checkPatchingMarker(isRestart && !afterRecycle);
     let proc;
     proc = Bun.spawn(["bun", this.entry], {
       cwd: this.app.cwdPath,
-      env: { ...this.env, AKAN_WATCH: "1", ...afterRecycle ? { AKAN_BUILDER_ANNOUNCE_BOOT: "1" } : {} },
+      env: {
+        ...this.env,
+        AKAN_WATCH: "1",
+        ...afterRecycle ? { AKAN_BUILDER_ANNOUNCE_BOOT: "1" } : {},
+        ...this.#patcherOff ? { AKAN_DEV_CSR_PATCHER: "off" } : {}
+      },
       stdio: ["ignore", this.#stdio, this.#stdio],
       ipc: (msg) => {
         if (this.#proc !== proc)
@@ -323,6 +348,17 @@ class IncrementalBuilderHost {
     }
     this.logger.verbose(`builder spawned pid=${proc.pid} entry=${this.entry}${isRestart ? " restart=1" : ""}`);
   }
+  #checkPatchingMarker(afterCrash) {
+    const markers = [CSR_DEV_DIRNAME, SSR_DEV_DIRNAME].map((dirName) => path.join(this.app.cwdPath, ".akan/artifact", dirName, CSR_DEV_PATCHING_MARKER)).filter((marker) => fs.existsSync(marker));
+    if (markers.length === 0)
+      return;
+    if (afterCrash && !this.#patcherOff) {
+      this.#patcherOff = true;
+      this.logger.warn("the builder died while patching a dev module registry; registry saves go to a build worker until the next config or metadata restart (AKAN_DEV_CSR_PATCHER=off)");
+    }
+    for (const marker of markers)
+      fs.rmSync(marker, { force: true });
+  }
   async#drain(stream, kind) {
     if (!stream)
       return;
@@ -428,7 +464,8 @@ class IncrementalBuilderHost {
   }
   static async create(app, env, onMessage, {
     stdio = "inherit",
-    onOutput
+    onOutput,
+    patcherOff = false
   } = {}) {
     const candidates = [
       path.join(app.workspace.workspaceRoot, "pkgs/@akanjs/devkit/incrementalBuilder/incrementalBuilder.proc.ts"),
@@ -438,7 +475,7 @@ class IncrementalBuilderHost {
     ];
     for (const c of candidates)
       if (await Bun.file(c).exists())
-        return new IncrementalBuilderHost({ app, entry: c, env, stdio, onMessage, onOutput });
+        return new IncrementalBuilderHost({ app, entry: c, env, stdio, onMessage, onOutput, patcherOff });
     throw new Error(`[cli] frontend builder entry not found; looked in: ${candidates.join(", ")}`);
   }
 }
@@ -618,6 +655,41 @@ class BackendImportGraph {
   }
 }
 
+// pkgs/@akanjs/devkit/akanApp/devBootLatch.ts
+class DevBootLatch {
+  #onBooted;
+  #waitMs;
+  #ready = false;
+  #armed = false;
+  #booted = false;
+  #timer = null;
+  constructor(onBooted, { waitMs = 30000 } = {}) {
+    this.#onBooted = onBooted;
+    this.#waitMs = waitMs;
+  }
+  ready() {
+    this.#ready = true;
+    if (!this.#armed && !this.#timer) {
+      this.#timer = setTimeout(() => this.armed(), this.#waitMs);
+      this.#timer.unref?.();
+    }
+    this.#release();
+  }
+  armed() {
+    this.#armed = true;
+    this.#release();
+  }
+  #release() {
+    if (this.#booted || !this.#ready || !this.#armed)
+      return;
+    this.#booted = true;
+    if (this.#timer)
+      clearTimeout(this.#timer);
+    this.#timer = null;
+    this.#onBooted();
+  }
+}
+
 // pkgs/@akanjs/devkit/akanApp/akanApp.host.ts
 var backendMsgTypeSet = new Set(["build-route", "build-csr"]);
 var asMib = (bytes) => Math.round(bytes / 1024 / 1024);
@@ -641,8 +713,10 @@ class AkanAppHost {
   env;
   #onDevEvent;
   #lastDevState = null;
+  #bootLatch = new DevBootLatch(() => this.#onDevEvent?.({ app: this.app.name, booted: true }));
   #backend = null;
   #builder = null;
+  #patcherOff = false;
   #backendReady = false;
   #plannedBackendStops = new WeakSet;
   #restartTimer = null;
@@ -652,6 +726,8 @@ class AkanAppHost {
   #backendLifecycleState = "stopped";
   #pendingRestartReason = null;
   #pendingRecycle = null;
+  #restartFailedAfterApply = null;
+  #stopping = false;
   #builderRecoveryTimer = null;
   #builderRecoveryAttempts = 0;
   #backendStartStatus = null;
@@ -679,6 +755,7 @@ class AkanAppHost {
   #builderGapStamp = null;
   #pendingBuilderMessages = [];
   #builderRequests = new BuilderRequestRouter;
+  #builderGeneration = 0;
   constructor(app, {
     env,
     stdio = "inherit",
@@ -695,6 +772,8 @@ class AkanAppHost {
       return;
     this.#lastDevState = state;
     this.#onDevEvent({ app: this.app.name, state, ...detail ? { detail } : {} });
+    if (state === "ready")
+      this.#bootLatch.ready();
   }
   async start() {
     if (this.#backend)
@@ -712,6 +791,8 @@ class AkanAppHost {
     return this;
   }
   async stop() {
+    this.#stopping = true;
+    this.#pendingRecycle = null;
     this.#cancelIdleSuspend();
     this.#stopIdleWatcher();
     this.#clearRestartTimers();
@@ -756,6 +837,7 @@ class AkanAppHost {
           this.#setBackendLifecycleState("ready", `pid=${msg.pid}`);
           this.#recordBackendReadyStatus();
           this.logger.verbose(`backend ready pid=${msg.pid}`);
+          this.#forgetRouteBuildStatus();
           this.#replayBuilderState();
           return;
         }
@@ -976,17 +1058,26 @@ ${this.#backendStderrTail.join(`
     });
   }
   async#handleBuilderMessage(message) {
+    if (this.#stopping)
+      return;
     this.#markDevActivity();
+    this.#trackBuilderGeneration(message);
     if (message.type === "build-status") {
       this.#recordBuildStatus(message.data);
       this.#sendOrQueueBuildStatus(message.data);
       this.#reviveBackendAfterGreenBuild(message.data);
+      await this.#resumeFailedRecycle(message.data);
       return;
     }
     if (message.type === "builder-metrics") {
       this.#handleBuilderMetrics(message.data);
       return;
     }
+    if (message.type === "boot-armed") {
+      this.logger.verbose("[builder] boot builds settled");
+      this.#bootLatch.armed();
+      return;
+    }
     if (message.type === "pages-updated" || message.type === "css-updated") {
       const recycled = message.data.reason === "builder-recycle";
       if (recycled && !this.#shouldRelayRecycledState(message))
@@ -1008,6 +1099,22 @@ ${this.#backendStderrTail.join(`
     }
     this.#sendToBackend(message);
   }
+  #trackBuilderGeneration(message) {
+    const generation = AkanAppHost.#builderGenerationOf(message);
+    if (generation === undefined || generation <= this.#builderGeneration)
+      return;
+    this.#builderGeneration = generation;
+    Object.assign(this.env, { AKAN_BUILDER_INITIAL_GENERATION: String(generation) });
+  }
+  static #builderGenerationOf(message) {
+    if (message.type === "invalidate")
+      return message.generation;
+    if (message.type === "build-status" || message.type === "builder-metrics")
+      return message.data.generation;
+    if (message.type === "pages-updated" || message.type === "css-updated")
+      return message.data.generation;
+    return;
+  }
   #shouldRelayRecycledState(message) {
     const current = message.type === "pages-updated" ? this.#lastGoodFrontend.pages : this.#lastGoodFrontend.css;
     if (shouldRelayRecycledFrontendState(current, message)) {
@@ -1266,9 +1373,7 @@ ${this.#backendStderrTail.join(`
     if (shouldRefreshConfigOnIdleWake(batch)) {
       this.logger.verbose("[idle-suspend] config changed while suspended; restarting the dev host");
       this.#discardBuilderGap("config change replaces the backend anyway");
-      await this.#recycleDevChildren({ type: "invalidate", kinds: [...batch?.kinds ?? []], files }, {
-        refreshConfig: true
-      });
+      await this.#applyRecycle({ type: "invalidate", kinds: [...batch?.kinds ?? []], files }, true);
       return;
     }
     if (files.length > 0)
@@ -1369,7 +1474,8 @@ ${this.#backendStderrTail.join(`
       this.#armRssRecycle(this.#rssRecycleReason);
     const wantsDevHostRestart = shouldRestartDevHostByDevPlan(message);
     const pending = this.#pendingRecycle;
-    if (wantsDevHostRestart || shouldRestartBuilderByDevPlan(message) || pending && message.kinds.includes("code")) {
+    const resumes = !!pending && message.kinds.includes("code") && this.#touchesFailedRecycle(message.files);
+    if (wantsDevHostRestart || shouldRestartBuilderByDevPlan(message) || resumes) {
       const refreshConfig = wantsDevHostRestart || (pending?.refreshConfig ?? false);
       const merged = pending ? mergeInvalidateMessages(pending.message, message) : message;
       const generation = message.devPlan?.generation ?? message.generation;
@@ -1377,16 +1483,7 @@ ${this.#backendStderrTail.join(`
         this.#deferRecycle(merged, { refreshConfig, generation });
         return;
       }
-      this.#pendingRecycle = null;
-      try {
-        if (refreshConfig)
-          await this.#restartDevHost(merged);
-        else
-          await this.#restartDevChildren(merged);
-      } catch (err) {
-        this.#recordDevHostRestartFailure(merged, err, refreshConfig ? "Config" : "Runtime metadata");
-        this.#resurrectDevChildren(merged);
-      }
+      await this.#applyRecycle(merged, refreshConfig);
       return;
     }
     if (await this.#shouldRestartBackend(message)) {
@@ -1395,6 +1492,41 @@ ${this.#backendStderrTail.join(`
     }
     this.#sendToBackend(message);
   }
+  async#applyRecycle(message, refreshConfig) {
+    if (this.#stopping)
+      return;
+    this.#pendingRecycle = null;
+    const progress = { applied: !refreshConfig };
+    try {
+      if (refreshConfig)
+        await this.#restartDevHost(message, progress);
+      else
+        await this.#restartDevChildren(message);
+    } catch (err) {
+      const kind = refreshConfig ? "Config" : "Runtime metadata";
+      const generation = this.#recordDevHostRestartFailure(message, err, kind, { applied: progress.applied });
+      if (progress.applied)
+        this.#restartFailedAfterApply = generation;
+      else
+        this.#pendingRecycle = { message, refreshConfig, failed: true, failedGeneration: generation };
+      this.#resurrectDevChildren(message);
+    }
+  }
+  async#resumeFailedRecycle(status) {
+    const pending = this.#pendingRecycle;
+    if (!pending?.failed || !status.ok || status.phase !== "pages" || !this.#touchesFailedRecycle(status.files))
+      return;
+    if (status.generation <= (pending.failedGeneration ?? -1))
+      return;
+    await this.#applyRecycle(pending.message, pending.refreshConfig);
+  }
+  #touchesFailedRecycle(files) {
+    const pending = this.#pendingRecycle;
+    if (!pending?.failed)
+      return true;
+    const changed = new Set(pending.message.files);
+    return files.some((file) => changed.has(file));
+  }
   #deferRecycle(message, { refreshConfig, generation }) {
     this.#pendingRecycle = { message, refreshConfig };
     const kind = refreshConfig ? "Config" : "Runtime metadata";
@@ -1440,8 +1572,10 @@ ${this.#backendStderrTail.join(`
     this.#builderRecoveryAttempts = 0;
     this.logger.info("[builder-recovery] builder recovered");
     this.#restartBackendForGapChanges();
+    const failedAfterApply = this.#restartFailedAfterApply;
+    this.#restartFailedAfterApply = null;
     const status = {
-      generation: reason.generation ?? this.#nextBackendBuildStatusGeneration(),
+      generation: failedAfterApply !== null ? this.#nextBackendBuildStatusGeneration(failedAfterApply + 1) : reason.generation ?? this.#nextBackendBuildStatusGeneration(),
       phase: "scan",
       ok: true,
       files: reason.files,
@@ -1465,12 +1599,12 @@ ${this.#backendStderrTail.join(`
     this.logger.warn(`[dev-host] recycling builder/backend for runtime metadata generation=${generation ?? "(unknown)"} files=${message.files.length}`);
     await this.#recycleDevChildren(message);
   }
-  async#restartDevHost(message) {
+  async#restartDevHost(message, progress) {
     const generation = message.devPlan?.generation ?? message.generation;
     this.logger.warn(`[dev-host] config change detected; restarting dev host generation=${generation ?? "(unknown)"} files=${message.files.length}`);
-    await this.#recycleDevChildren(message, { refreshConfig: true });
+    await this.#recycleDevChildren(message, { refreshConfig: true, progress });
   }
-  async#recycleDevChildren(message, { refreshConfig = false } = {}) {
+  async#recycleDevChildren(message, { refreshConfig = false, progress } = {}) {
     const generation = message.devPlan?.generation ?? message.generation;
     this.#clearRestartTimers();
     this.#builderRecoveryAttempts = 0;
@@ -1480,10 +1614,13 @@ ${this.#backendStderrTail.join(`
     this.#pendingBuildStatusReplay = [];
     await this.#stopBackend();
     this.#stopBuilder();
+    this.#patcherOff = false;
     if (refreshConfig) {
       await this.app.getConfig({ refresh: true });
       const { env } = await this.app.prepareCommand("start");
       Object.assign(this.env, env);
+      if (progress)
+        progress.applied = true;
     }
     await this.#backendGraph.refresh();
     await this.#startBuilder();
@@ -1502,22 +1639,27 @@ ${this.#backendStderrTail.join(`
     this.#lastGoodFrontend.css = message;
     this.logger.verbose(`[last-good] css generation=${message.data.generation ?? "(unknown)"} assets=${Object.keys(message.data.cssAssets).length}`);
   }
-  #recordDevHostRestartFailure(message, err, kind) {
+  #recordDevHostRestartFailure(message, err, kind, { applied }) {
     const generation = message.devPlan?.generation ?? message.generation ?? this.#nextBackendBuildStatusGeneration();
     const detail = err instanceof Error ? err.message : String(err);
     this.logger.warn(`[dev-host] ${kind.toLowerCase()} restart failed generation=${generation}: ${detail}`);
+    const names = message.files.slice(0, 3).map((file) => path3.basename(file));
+    const saved = names.length > 0 ? names.join(", ") : "the changed file";
     const status = {
       generation,
       phase: "scan",
       ok: false,
       files: message.files,
-      message: `${kind} change failed to apply; recovering the dev server automatically: ${detail}`
+      message: applied ? `${kind} change applied, but the dev server failed to restart: ${detail}. It is recovering on its own.` : `${kind} change failed to apply: ${detail}. The dev server keeps running on the previous ${kind.toLowerCase()}; once it is fixed, save ${saved} again or restart the dev server to apply it.`
     };
     this.#recordBuildStatus(status);
     this.#sendOrQueueBuildStatus(status);
+    return generation;
   }
   #recordBuildStatus(status) {
     const recovered = shouldMarkBuildPhaseRecovered(this.#buildStatusByPhase, status);
+    if (shouldKeepBuildFailure(this.#buildStatusByPhase, status))
+      return;
     this.#buildStatusByPhase.set(status.phase, status);
     const label = `[build-status] generation=${status.generation} phase=${status.phase} ok=${status.ok} files=${status.files.length}`;
     if (status.ok)
@@ -1533,6 +1675,10 @@ ${this.#backendStderrTail.join(`
     }
     this.#sendToBackend({ type: "build-status", data: status });
   }
+  #forgetRouteBuildStatus() {
+    this.#buildStatusByPhase.delete("route");
+    this.#pendingBuildStatusReplay = this.#pendingBuildStatusReplay.filter((status) => status.phase !== "route");
+  }
   #replayBuilderState() {
     if (!this.#backendReady)
       return;
@@ -1584,7 +1730,8 @@ ${this.#backendStderrTail.join(`
         this.#enqueueBuilderMessage(msg);
       }, {
         stdio: this.stdio,
-        onOutput: (kind, text) => void (kind === "stderr" ? process.stderr : process.stdout).write(text)
+        onOutput: (kind, text) => void (kind === "stderr" ? process.stderr : process.stdout).write(text),
+        patcherOff: this.#patcherOff
       });
       try {
         await this.#waitForBuilderReady(attempt, { announceBootState });
@@ -1670,21 +1817,23 @@ ${this.#backendStderrTail.join(`
     this.#cancelRssRecycle();
     if (!this.#builder)
       return;
+    if (this.#builder.patcherOff)
+      this.#patcherOff = true;
     this.#builder.stop();
     this.#builder = null;
   }
 }
 // pkgs/@akanjs/devkit/applicationTestPreload.ts
-import path3 from "path";
+import path4 from "path";
 var SIGNAL_TEST_PRELOAD_PATH = "test/signalTest.preload.ts";
 async function resolveSignalTestPreloadPath(target) {
   const candidates = [];
-  for (const basePath of [target.cwdPath, process.cwd(), path3.dirname(Bun.main), import.meta.dir]) {
+  for (const basePath of [target.cwdPath, process.cwd(), path4.dirname(Bun.main), import.meta.dir]) {
     try {
-      candidates.push(path3.join(path3.dirname(Bun.resolveSync("akanjs/package.json", basePath)), SIGNAL_TEST_PRELOAD_PATH));
+      candidates.push(path4.join(path4.dirname(Bun.resolveSync("akanjs/package.json", basePath)), SIGNAL_TEST_PRELOAD_PATH));
     } catch {}
   }
-  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));
+  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));
   const uniqueCandidates = [...new Set(candidates)];
   for (const candidate of uniqueCandidates)
     if (await Bun.file(candidate).exists())
@@ -1697,7 +1846,7 @@ ${uniqueCandidates.map((candidate) => `  - ${candidate}`).join(`
 
 // pkgs/@akanjs/cli/application/application.runner.ts
 import { Logger as Logger3 } from "akanjs/common";
-var loadBuildRunner = async () => (await import("./applicationBuildRunner-n6xfexaa.js")).ApplicationBuildRunner;
+var loadBuildRunner = async () => (await import("./applicationBuildRunner-412y0345.js")).ApplicationBuildRunner;
 var loadPrompts = async () => await import("@inquirer/prompts");
 
 class ApplicationRunner extends runner("application") {
@@ -1742,7 +1891,7 @@ class ApplicationRunner extends runner("application") {
     });
   }
   #runtimeDirOf(app, override) {
-    return path4.resolve(override ?? process.env.AKAN_RUNTIME_DIR ?? path4.join(app.workspace.workspaceRoot, "local", "apps", app.name, "runtime"));
+    return path5.resolve(override ?? process.env.AKAN_RUNTIME_DIR ?? path5.join(app.workspace.workspaceRoot, "local", "apps", app.name, "runtime"));
   }
   async runLogs(app, options) {
     const { LogControlUnavailableError, LogTailClient } = await import("akanjs/server/logging/logTailClient");
@@ -1768,7 +1917,7 @@ class ApplicationRunner extends runner("application") {
       });
     } catch (error) {
       if (error instanceof LogControlUnavailableError)
-        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 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 error;
     }
     const sinceMs = since ? LogQueryMatcher.parseSince(since) : undefined;
@@ -1833,7 +1982,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 = path4.resolve(app.workspace.workspaceRoot, dir);
+    const target = path5.resolve(app.workspace.workspaceRoot, dir);
     const code = `
 const { server } = await import(${JSON.stringify(serverPath)});
 const { DatabaseAdaptorRole, DocumentTransfer } = await import("akanjs/service");
@@ -2406,7 +2555,7 @@ import os from "os";
 import { MemoryLimit as MemoryLimit2 } from "akanjs/server/memoryLimit";
 
 class DevBootConcurrency {
-  static perAppBytes = 900 * 1024 * 1024;
+  static perAppBytes = 1800 * 1024 * 1024;
   static memoryShare = 0.5;
   static coresPerApp = 4;
   static budget() {
@@ -2440,7 +2589,7 @@ class DevBootConcurrency {
 
 // pkgs/@akanjs/cli/application/devSessionLog.ts
 import { mkdir, rename } from "fs/promises";
-import path5 from "path";
+import path6 from "path";
 import dayjs from "dayjs";
 
 class DevSessionLog {
@@ -2464,19 +2613,19 @@ class DevSessionLog {
     return [...this.#appNames];
   }
   pathOf(app) {
-    return path5.join(this.#runtimeDirOf(app), DevSessionLog.fileName);
+    return path6.join(this.#runtimeDirOf(app), DevSessionLog.fileName);
   }
   previousPathOf(app) {
-    return path5.join(this.#runtimeDirOf(app), DevSessionLog.previousFileName);
+    return path6.join(this.#runtimeDirOf(app), DevSessionLog.previousFileName);
   }
   relativePathOf(app) {
-    return path5.relative(this.#workspaceRoot, this.pathOf(app));
+    return path6.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(path5.dirname(file), { recursive: true });
+      await mkdir(path6.dirname(file), { recursive: true });
       await rename(file, this.previousPathOf(app)).catch(() => {
         return;
       });
@@ -2520,7 +2669,7 @@ class DevSessionLog {
     this.#writers.clear();
   }
   #runtimeDirOf(app) {
-    return path5.join(this.#workspaceRoot, "local", "apps", app, "runtime");
+    return path6.join(this.#workspaceRoot, "local", "apps", app, "runtime");
   }
   #writeLine(app, text) {
     const writer = this.#writers.get(app);
@@ -2567,7 +2716,7 @@ class DevSupervisor {
       }
     };
   }
-  static readyTimeoutMs = 180000;
+  static bootTimeoutMs = 180000;
   static shutdownGraceMs = 12000;
   #options;
   #children = new Map;
@@ -2616,7 +2765,7 @@ class DevSupervisor {
     return ports;
   }
   #makeChild(app, port) {
-    const { promise: ready, resolve: markReady } = Promise.withResolvers();
+    const { promise: booted, resolve: markBooted } = Promise.withResolvers();
     return {
       status: {
         app,
@@ -2629,8 +2778,8 @@ class DevSupervisor {
         exitCode: null
       },
       proc: null,
-      ready,
-      markReady,
+      booted,
+      markBooted,
       opened: false
     };
   }
@@ -2649,12 +2798,12 @@ class DevSupervisor {
       for (const child of wave)
         this.#spawnChild(child);
       this.#publishStatus();
-      await Promise.all(wave.map(async (child) => await this.#waitForReady(child)));
+      await Promise.all(wave.map(async (child) => await this.#waitForBoot(child)));
     }
   }
-  async#waitForReady(child) {
-    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");
+  async#waitForBoot(child) {
+    if (await DevSupervisor.timesOut(child.booted, DevSupervisor.bootTimeoutMs))
+      this.#note(`${child.status.name} has not finished booting after ${Math.round(DevSupervisor.bootTimeoutMs / 1000)}s; starting the next app anyway`, "warn");
   }
   static async timesOut(work, ms) {
     let timer;
@@ -2691,9 +2840,12 @@ class DevSupervisor {
       },
       stdio: ["ignore", "pipe", "pipe"],
       ipc: (message) => {
-        if (!message || typeof message !== "object" || typeof message.state !== "string")
+        if (!message || typeof message !== "object")
           return;
-        this.#applyChildEvent(child, message);
+        if ("booted" in message)
+          child.markBooted();
+        else if (typeof message.state === "string")
+          this.#applyChildEvent(child, message);
       },
       serialization: "advanced",
       onExit: (_proc, exitCode, signalCode) => {
@@ -2703,7 +2855,7 @@ class DevSupervisor {
           return;
         child.status.state = "stopped";
         child.status.detail = signalCode ? `killed by ${signalCode}` : `exited with ${exitCode}`;
-        child.markReady();
+        child.markBooted();
         this.#publishStatus();
       }
     });
@@ -2717,14 +2869,13 @@ class DevSupervisor {
     child.status.state = event.state;
     child.status.detail = event.detail ?? "";
     if (event.state === "ready") {
-      child.markReady();
       if (this.#options.open && !child.opened) {
         child.opened = true;
         openBrowser(child.status.url);
       }
     }
     if (event.state === "failed")
-      child.markReady();
+      child.markBooted();
     this.#publishStatus();
   }
   async#drain(stream, name, kind) {
@@ -3125,7 +3276,7 @@ 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-pemaknmd.js");
+      const { TunnelShare } = await import("./TunnelShare-cwh9ezsm.js");
       const share = await TunnelShare.open(app, { workspace: app.workspace });
       shares.push(share);
       urls.set(app.name, share.url);