@akanjs/cli 2.4.1-rc.7 → 2.4.1

package/{index-n5y2gbf2.js → index-n2mp0f48.js}

@@ -4,11 +4,11 @@ import {
 } from "./index-76rn3g2c.js";
 import {
   LibraryScript
-} from "./index-fh990y67.js";
+} from "./index-3a4vntr0.js";
 import {
   runner,
   script
-} from "./index-qpz4csbs.js";
+} from "./index-phj3ewxv.js";
 import {
   AppExecutor,
   LibExecutor,
@@ -18,7 +18,7 @@ import {
 import {
   HmrWatcher,
   WatchRootResolver
-} from "./index-0fn1r7gg.js";
+} from "./index-bjpxzr6s.js";
 import {
   __require
 } from "./index-r24hmh0q.js";
@@ -314,6 +314,7 @@ class IncrementalBuilderHost {
           this.#startOptions.onExit?.();
           return;
         }
+        this.#startOptions.onAway?.();
         if (wasRecycle) {
           this.logger.verbose("builder exited for a recycle; spawning its replacement now");
           this.#spawnAfterRecycle = true;
@@ -348,6 +349,7 @@ class IncrementalBuilderHost {
     if (!this.send({ type: "builder-shutdown", reason }))
       return false;
     this.#recycleRequested = true;
+    this.#status = "recycling";
     this.logger.info(`recycling builder pid=${proc.pid} (${reason})`);
     this.#recycleTimer = setTimeout(() => {
       this.#recycleTimer = null;
@@ -377,7 +379,10 @@ class IncrementalBuilderHost {
   }
   send(message) {
     if (!this.#proc || this.#status !== "ready") {
-      this.logger.warn(`incrementalBuilderHost is ${this.#status}; cannot send ${message.type}`);
+      if (this.#status === "recycling" || this.#status === "restarting")
+        this.logger.verbose(`incrementalBuilderHost is ${this.#status}; ${message.type} is for the replacement`);
+      else
+        this.logger.warn(`incrementalBuilderHost is ${this.#status}; cannot send ${message.type}`);
       return false;
     }
     try {
@@ -430,6 +435,41 @@ class IncrementalBuilderHost {
     throw new Error(`[cli] frontend builder entry not found; looked in: ${candidates.join(", ")}`);
   }
 }
+// pkgs/@akanjs/devkit/incrementalBuilder/builderRequestRouter.ts
+class BuilderRequestRouter {
+  #generation = 0;
+  #nextId = 1;
+  #inFlight = new Map;
+  get generation() {
+    return this.#generation;
+  }
+  get inFlightCount() {
+    return this.#inFlight.size;
+  }
+  startGeneration() {
+    this.#generation += 1;
+    this.#inFlight.clear();
+    return this.#generation;
+  }
+  issue(message) {
+    const id = this.#nextId++;
+    this.#inFlight.set(id, { backendId: message.id, generation: this.#generation });
+    return { ...message, id };
+  }
+  withdraw(id) {
+    this.#inFlight.delete(id);
+  }
+  settle(message) {
+    const request = this.#inFlight.get(message.id);
+    if (!request)
+      return null;
+    this.#inFlight.delete(message.id);
+    if (request.generation !== this.#generation)
+      return null;
+    return { ...message, id: request.backendId };
+  }
+}
+
 // pkgs/@akanjs/devkit/akanApp/akanApp.host.ts
 var backendMsgTypeSet = new Set(["build-route", "build-csr"]);
 var BACKEND_RESTART_DEBOUNCE_MS = 120;
@@ -440,10 +480,12 @@ var BACKEND_RECOVERY_MAX_ATTEMPTS = 5;
 var BACKEND_STDERR_TAIL_LIMIT = 40;
 var BUILDER_READY_TIMEOUT_MS = 150000;
 var BUILDER_START_MAX_ATTEMPTS = 3;
+var HELD_BUILDER_REQUEST_LIMIT = 64;
 var BUILDER_RSS_RECYCLE_QUIET_MS = 750;
 var BUILDER_MIN_RSS_RECYCLE_INTERVAL_MS = 30000;
-var BUILDER_INEFFECTIVE_RSS_RECYCLE_LIMIT = 2;
+var BUILDER_TIGHT_RSS_REPORT_LIMIT = 2;
 var BUILDER_RSS_SETTLE_MS = 20000;
+var PS_RSS_TIMEOUT_MS = 2000;
 var BUILDER_RSS_HARD_MULTIPLE = 1.5;
 var DEV_IDLE_SUSPEND_MS = 300000;
 var DEV_IDLE_MIN_UPTIME_MS = 30000;
@@ -592,7 +634,14 @@ var resolveIdleSuspendMs = (raw) => {
 };
 var hasAnyBuildFailure = (statusByPhase) => [...statusByPhase.values()].some((status) => !status.ok);
 var shouldRefreshConfigOnIdleWake = (batch) => !!batch && batch.kinds.has("config");
-var shouldAbandonBuilderRssCeiling = (ineffectiveRecycles, limit = BUILDER_INEFFECTIVE_RSS_RECYCLE_LIMIT) => ineffectiveRecycles >= limit;
+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;
@@ -631,6 +680,7 @@ var mergeInvalidateMessages = (current, next) => {
   };
 };
 var buildStatusReplaySequence = (pendingReplay, latestByPhase) => [...pendingReplay, ...latestByPhase.values()];
+var filesChangedSince = (before, after) => [...before].filter(([file, stamp]) => after.get(file) !== stamp).map(([file]) => file);
 
 class BackendImportGraph {
   #app;
@@ -656,6 +706,13 @@ class BackendImportGraph {
   has(file) {
     return this.#files.has(path2.resolve(file));
   }
+  async fingerprint() {
+    const stamps = await Promise.all([...this.#files].map(async (file) => {
+      const stats = await stat(file).catch(() => null);
+      return [file, stats ? `${Math.round(stats.mtimeMs)}:${stats.size}` : "(gone)"];
+    }));
+    return new Map(stamps);
+  }
   async refresh() {
     try {
       const files = await this.#build();
@@ -780,7 +837,8 @@ class AkanAppHost {
   #rssRecycleTimer = null;
   #rssRecycleReason = null;
   #lastRssRecycleAtMono = null;
-  #rssCeilingIneffective = 0;
+  #rssCeilingTightReports = 0;
+  #rssCeilingTightWarned = false;
   #rssSettleToken = 0;
   #rssRecycleOver = null;
   #rssCeilingAbandoned = false;
@@ -794,7 +852,9 @@ class AkanAppHost {
   #wokeAtMono = null;
   #idleWatcher = null;
   #suspendedChanges = null;
+  #builderGapStamp = null;
   #pendingBuilderMessages = [];
+  #builderRequests = new BuilderRequestRouter;
   constructor(app, { env, withInk = false }) {
     this.app = app;
     this.env = env;
@@ -831,6 +891,7 @@ class AkanAppHost {
       clearTimeout(this.#builderRecoveryTimer);
       this.#builderRecoveryTimer = null;
     }
+    this.#failPendingBuilderMessages("dev server is shutting down");
     await this.#stopBackend();
     this.#stopBuilder();
     return this;
@@ -845,6 +906,7 @@ class AkanAppHost {
     return await createTunnel(type, { app: this.app, environment });
   }
   #startBackend(startStatus = null) {
+    this.#builderRequests.startGeneration();
     this.#backendStartStatus = startStatus;
     this.#backendGaveUp = false;
     this.#setBackendLifecycleState("starting");
@@ -1104,6 +1166,15 @@ ${this.#backendStderrTail.join(`
       await this.#handleInvalidate(message);
       return;
     }
+    if (message.type === "build-route-res" || message.type === "build-csr-res") {
+      const answer = this.#builderRequests.settle(message);
+      if (!answer) {
+        this.logger.verbose(`[builder] dropped a ${message.type} no live backend is waiting for (id=${message.id})`);
+        return;
+      }
+      this.#sendToBackend(answer);
+      return;
+    }
     this.#sendToBackend(message);
   }
   #shouldRelayRecycledState(message) {
@@ -1127,7 +1198,7 @@ ${this.#backendStderrTail.join(`
       msSinceLastRecycle: this.#lastRssRecycleAtMono === null ? null : performance.now() - this.#lastRssRecycleAtMono
     });
     if (decision === "below-ceiling") {
-      this.#rssCeilingIneffective = 0;
+      this.#rssCeilingTightReports = 0;
       return;
     }
     if (decision === "unbounded")
@@ -1137,15 +1208,29 @@ ${this.#backendStderrTail.join(`
       return;
     }
     if (decision === "too-soon") {
-      this.#rssCeilingIneffective += 1;
-      if (!shouldAbandonBuilderRssCeiling(this.#rssCeilingIneffective))
+      this.#rssCeilingTightReports += 1;
+      if (this.#rssCeilingTightWarned || !shouldWarnBuilderRssCeilingTight(this.#rssCeilingTightReports))
         return;
-      this.#rssCeilingAbandoned = true;
-      this.logger.error(`[builder-recycle] the builder is still at ${asMib(metrics.rssBytes)}MiB right after being recycled, so the ${asMib(ceilingBytes ?? 0)}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.`);
+      this.#rssCeilingTightWarned = true;
+      this.logger.warn(`[builder-recycle] the builder is back at ${asMib(metrics.rssBytes)}MiB within ${Math.round(BUILDER_MIN_RSS_RECYCLE_INTERVAL_MS / 1000)}s of a recycle, so the ${asMib(ceilingBytes ?? 0)}MiB ceiling costs about one boot build per interval while you keep building. Raise AKAN_BUILDER_MAX_RSS_MB if that trade is wrong for this app, or set it to 0 to leave the builder unbounded.`);
       return;
     }
     this.#armRssRecycle(`rss=${asMib(metrics.rssBytes)}MiB>=${asMib(ceilingBytes ?? 0)}MiB after ${metrics.workCount} build(s)`, { rssBytes: metrics.rssBytes, ceilingBytes: ceilingBytes ?? 0 });
   }
+  async#checkRecycledBuilderFloor() {
+    if (this.#rssCeilingAbandoned || this.#lastRssRecycleAtMono === null)
+      return;
+    const ceilingBytes = IncrementalBuilderHost.maxRssBytes();
+    const pid = this.#builder?.pid;
+    if (!ceilingBytes || !pid)
+      return;
+    const freshRssBytes = await AkanAppHost.readProcessRssBytes(pid);
+    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) {
     if (this.#rssRecycleReason !== reason)
       this.logger.verbose(`[builder-recycle] armed (${reason}); replacing the builder once it stays quiet`);
@@ -1200,9 +1285,26 @@ ${this.#backendStderrTail.join(`
     const vmRssKb = status === null ? null : /VmRSS:\s+(\d+) kB/.exec(status)?.[1];
     if (vmRssKb)
       return Number(vmRssKb) * 1024;
-    const psOutput = await Bun.$`ps -o rss= -p ${pid}`.quiet().text().catch(() => "");
-    const rssKb = Number(psOutput.trim());
-    return Number.isFinite(rssKb) && rssKb > 0 ? rssKb * 1024 : null;
+    return await AkanAppHost.#readRssViaPs(pid);
+  }
+  static async#readRssViaPs(pid, timeoutMs = PS_RSS_TIMEOUT_MS) {
+    let proc;
+    try {
+      proc = Bun.spawn(["ps", "-o", "rss=", "-p", String(pid)], { stdio: ["ignore", "pipe", "ignore"] });
+    } catch {
+      return null;
+    }
+    const killer = setTimeout(() => proc.kill("SIGKILL"), timeoutMs);
+    try {
+      const output = await new Response(proc.stdout).text();
+      await proc.exited;
+      const rssKb = Number(output.trim());
+      return Number.isFinite(rssKb) && rssKb > 0 ? rssKb * 1024 : null;
+    } catch {
+      return null;
+    } finally {
+      clearTimeout(killer);
+    }
   }
   #cancelRssRecycle() {
     this.#rssRecycleReason = null;
@@ -1258,6 +1360,7 @@ ${this.#backendStderrTail.join(`
     }
     this.#suspended = true;
     this.#stopBuilder();
+    this.#openBuilderGap("idle suspend");
     this.logger.info(`[idle-suspend] no build activity for ${Math.round(idleMs / 1000)}s; released the builder \u2014 the next edit or route request brings it back`);
   }
   get #restartPending() {
@@ -1326,6 +1429,7 @@ ${this.#backendStderrTail.join(`
     const files = batch?.files ?? [];
     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
       });
@@ -1334,20 +1438,78 @@ ${this.#backendStderrTail.join(`
     if (files.length > 0)
       await this.#backendGraph.refresh();
     await this.#startBuilder({ announceBootState: true });
-    const backendFiles = files.filter((file) => this.#isBackendFile(file));
+    const missed = await this.#takeBuilderGapChanges();
+    const backendFiles = [...new Set([...files.filter((file) => this.#isBackendFile(file)), ...missed])];
     if (backendFiles.length === 0)
       return;
     this.logger.verbose(`[idle-suspend] ${backendFiles.length} backend file(s) changed while suspended`);
     this.#scheduleBackendRestart({ files: backendFiles, roles: [] });
   }
+  #openBuilderGap(reason) {
+    if (this.#builderGapStamp)
+      return;
+    if (!this.#backendGraph.ready) {
+      this.logger.verbose(`[builder-gap] no backend graph yet; a save during this ${reason} goes unnoticed`);
+      return;
+    }
+    this.#builderGapStamp = this.#backendGraph.fingerprint().then((stamps) => {
+      this.logger.verbose(`[builder-gap] stamped ${stamps.size} backend file(s) (${reason})`);
+      return stamps;
+    }).catch((err) => {
+      this.logger.warn(`[builder-gap] could not stamp the backend files: ${err instanceof Error ? err.message : String(err)}`);
+      return null;
+    });
+  }
+  async#takeBuilderGapChanges() {
+    const stamping = this.#builderGapStamp;
+    this.#builderGapStamp = null;
+    const before = stamping ? await stamping : null;
+    if (!before)
+      return [];
+    const moved = filesChangedSince(before, await this.#backendGraph.fingerprint());
+    if (moved.length === 0) {
+      this.logger.verbose(`[builder-gap] none of the ${before.size} stamped backend file(s) moved`);
+      return moved;
+    }
+    this.logger.info(`[builder-gap] ${moved.length} backend file(s) changed while the builder was away; the backend is running the old ones`);
+    return moved;
+  }
+  #discardBuilderGap(reason) {
+    if (!this.#builderGapStamp)
+      return;
+    this.#builderGapStamp = null;
+    this.logger.verbose(`[builder-gap] stamps dropped (${reason})`);
+  }
+  async#restartBackendForGapChanges() {
+    const moved = await this.#takeBuilderGapChanges();
+    if (moved.length === 0)
+      return;
+    this.#scheduleBackendRestart({ files: moved, roles: [] });
+  }
   #flushPendingBuilderMessages() {
     const pending = this.#pendingBuilderMessages.splice(0);
     if (pending.length === 0)
       return;
-    this.logger.verbose(`[idle-suspend] replaying ${pending.length} request(s) held during the wake`);
+    this.logger.verbose(`[builder] replaying ${pending.length} request(s) held while the builder was away`);
     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)`);
+  }
+  #failPendingBuilderMessages(reason) {
+    const held = this.#pendingBuilderMessages.splice(0);
+    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 });
+    }
+  }
   #recycleBuilderForRss(reason) {
     if (this.#pendingRecycle || this.#restartTimer) {
       this.logger.verbose(`[builder-recycle] skipped (${reason}); a dev restart is already pending`);
@@ -1356,6 +1518,7 @@ ${this.#backendStderrTail.join(`
     if (!this.#builder?.recycle(reason))
       return;
     this.#lastRssRecycleAtMono = performance.now();
+    this.#openBuilderGap("builder recycle");
   }
   async#handleInvalidate(message) {
     this.#logDevPlan(message);
@@ -1433,6 +1596,7 @@ ${this.#backendStderrTail.join(`
     }
     this.#builderRecoveryAttempts = 0;
     this.logger.info("[builder-recovery] builder recovered");
+    this.#restartBackendForGapChanges();
     const status = {
       generation: reason.generation ?? this.#nextBackendBuildStatusGeneration(),
       phase: "scan",
@@ -1602,6 +1766,7 @@ ${this.#backendStderrTail.join(`
         this.app.verbose(`[cli] builder failed before ready; retrying (${attempt + 1}/${BUILDER_START_MAX_ATTEMPTS})`);
       }
     }
+    this.#failPendingBuilderMessages("builder failed to start");
     throw lastError instanceof Error ? lastError : new Error(String(lastError));
   }
   #waitForBuilderReady(attempt, { announceBootState = false } = {}) {
@@ -1624,12 +1789,19 @@ ${this.#backendStderrTail.join(`
         onExit: () => {
           settle(() => reject(new Error(`[cli] builder exited before emitting builder-ready (attempt ${attempt})`)));
         },
+        onAway: () => {
+          this.#openBuilderGap("builder replacement");
+        },
         onReady: () => {
           settle(resolve);
+          this.#flushPendingBuilderMessages();
         },
         onRestartReady: () => {
           this.logger.verbose("[builder-recovery] builder ready after restart; replaying latest state");
           this.#replayBuilderState();
+          this.#flushPendingBuilderMessages();
+          this.#restartBackendForGapChanges();
+          this.#checkRecycledBuilderFloor();
         }
       });
     });
@@ -1645,9 +1817,18 @@ ${this.#backendStderrTail.join(`
       Object.assign(this.env, { AKAN_DEV_CSR_REBUILD: "1" });
       this.logger.verbose(`[csr] armed dev CSR rebuilds (${message.reason})`);
     }
-    if (this.#builder?.send(message))
+    if (message.type === "build-route" || message.type === "build-csr") {
+      const outgoing = this.#builderRequests.issue(message);
+      if (this.#builder?.send(outgoing))
+        return;
+      this.#builderRequests.withdraw(outgoing.id);
+    } else if (this.#builder?.send(message))
       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",
@@ -1717,7 +1898,7 @@ function openBrowser(url) {
 }
 
 // pkgs/@akanjs/cli/application/application.runner.ts
-var loadBuildRunner = async () => (await import("./applicationBuildRunner-5w8j9yp7.js")).ApplicationBuildRunner;
+var loadBuildRunner = async () => (await import("./applicationBuildRunner-vzjdgv1g.js")).ApplicationBuildRunner;
 var loadReleasePackager = async () => (await import("./applicationReleasePackager-brvth6rs.js")).ApplicationReleasePackager;
 var loadCapacitorApp = async () => (await import("./capacitorApp-wnxzrppx.js")).CapacitorApp;
 var loadPrompts = async () => await import("@inquirer/prompts");

package/{index-nv7et4t3.js → index-p9f1rpbp.js}

@@ -2,7 +2,7 @@
 import {
   runner,
   script
-} from "./index-qpz4csbs.js";
+} from "./index-phj3ewxv.js";
 import {
   PkgExecutor
 } from "./index-0t7pwff2.js";

package/{index-qpz4csbs.js → index-phj3ewxv.js}

@@ -11,6 +11,9 @@ import {
 import {
   FileSys
 } from "./index-61keag0s.js";
+import {
+  __require
+} from "./index-r24hmh0q.js";
 
 // pkgs/@akanjs/devkit/commandDecorators/targetMeta.ts
 var COMMAND_META = Symbol("akan.command.meta");
@@ -58,7 +61,6 @@ var Workspace = createInternalArgToken("Workspace");
 
 // pkgs/@akanjs/devkit/commandDecorators/command.ts
 import path from "path";
-import { confirm, input, select } from "@inquirer/prompts";
 import { Logger } from "akanjs/common";
 import chalk2 from "chalk";
 import { program } from "commander";
@@ -375,6 +377,10 @@ var convertArgValue = (value, type) => {
     return value === true || value === "true";
 };
 var normalizeEnumChoices = (enumChoices) => enumChoices.map((choice) => typeof choice === "object" ? { value: choice.value, name: choice.label } : { value: choice, name: choice.toString() });
+var prompts = async () => await import("@inquirer/prompts");
+var select = (config, context) => prompts().then((m) => m.select(config, context));
+var confirm = (config, context) => prompts().then((m) => m.confirm(config, context));
+var input = (config, context) => prompts().then((m) => m.input(config, context));
 var resolveEnumChoices = async (argMeta, context) => {
   const enumChoices = argMeta.argsOption.enum;
   if (!enumChoices)

package/{index-pya1h7wx.js → index-q4sc46ec.js}

@@ -8,7 +8,7 @@ import {
 import {
   runner,
   script
-} from "./index-qpz4csbs.js";
+} from "./index-phj3ewxv.js";
 
 // pkgs/@akanjs/cli/agent/agent.script.ts
 import { Logger } from "akanjs/common";

package/{index-y4kg682s.js → index-qacv44mm.js}

@@ -2,7 +2,7 @@
 import {
   runner,
   script
-} from "./index-qpz4csbs.js";
+} from "./index-phj3ewxv.js";
 
 // pkgs/@akanjs/cli/page/page.runner.ts
 class PageRunner extends runner("page") {