@akanjs/cli 2.4.1-rc.2 → 2.4.1-rc.3

package/{index-77crfweb.js → index-rgfxj6qc.js}

@@ -209,6 +209,7 @@ var createTunnel = async (service, { app, environment, port = service === "postg
 // pkgs/@akanjs/devkit/incrementalBuilder/incrementalBuilder.host.ts
 import path from "path";
 import { Logger as Logger2 } from "akanjs/common";
+import { MemoryLimit } from "akanjs/server/memoryLimit";
 var builderMsgTypeSet = new Set([
   "build-route-res",
   "build-csr-res",
@@ -216,12 +217,15 @@ var builderMsgTypeSet = new Set([
   "invalidate",
   "css-updated",
   "pages-updated",
-  "build-status"
+  "build-status",
+  "builder-metrics"
 ]);
 
 class IncrementalBuilderHost {
   static #restartBaseDelayMs = 1000;
   static #restartMaxDelayMs = 30000;
+  static #recycleDrainTimeoutMs = 30000;
+  static #devMaxRssBytes = 1200 * 1024 * 1024;
   logger = new Logger2("IncrementalBuilderHost");
   entry;
   env;
@@ -232,6 +236,9 @@ class IncrementalBuilderHost {
   #status = "stopped";
   #restartAttempts = 0;
   #restartTimer = null;
+  #recycleTimer = null;
+  #recycleRequested = false;
+  #spawnAfterRecycle = false;
   #manualStop = false;
   #startOptions = {};
   constructor({ app, entry, env, onMessage }) {
@@ -254,10 +261,12 @@ class IncrementalBuilderHost {
   #spawn(isRestart) {
     this.#status = isRestart ? "restarting" : "starting";
     this.ready = false;
+    const afterRecycle = this.#spawnAfterRecycle;
+    this.#spawnAfterRecycle = false;
     let proc;
     proc = Bun.spawn(["bun", this.entry], {
       cwd: this.app.cwdPath,
-      env: { ...this.env, AKAN_WATCH: "1" },
+      env: { ...this.env, AKAN_WATCH: "1", ...afterRecycle ? { AKAN_BUILDER_RECYCLED: "1" } : {} },
       stdio: ["ignore", "inherit", "inherit"],
       ipc: (msg) => {
         if (this.#proc !== proc)
@@ -282,6 +291,8 @@ class IncrementalBuilderHost {
           return;
         this.#proc = null;
         const wasReady = this.ready;
+        const wasRecycle = this.#recycleRequested;
+        this.#clearRecycle();
         this.ready = false;
         if (this.#manualStop || this.#status === "stopped")
           return;
@@ -290,6 +301,12 @@ class IncrementalBuilderHost {
           this.#startOptions.onExit?.();
           return;
         }
+        if (wasRecycle) {
+          this.logger.verbose("builder exited for a recycle; spawning its replacement now");
+          this.#spawnAfterRecycle = true;
+          this.#spawn(true);
+          return;
+        }
         this.#scheduleRestart();
       }
     });
@@ -311,6 +328,40 @@ class IncrementalBuilderHost {
       this.#spawn(true);
     }, delay);
   }
+  recycle(reason) {
+    if (!this.#proc || this.#status !== "ready" || this.#recycleRequested)
+      return false;
+    const proc = this.#proc;
+    if (!this.send({ type: "builder-shutdown", reason }))
+      return false;
+    this.#recycleRequested = true;
+    this.logger.info(`recycling builder pid=${proc.pid} (${reason})`);
+    this.#recycleTimer = setTimeout(() => {
+      this.#recycleTimer = null;
+      if (this.#proc !== proc)
+        return;
+      this.logger.warn(`builder pid=${proc.pid} did not exit within ${IncrementalBuilderHost.#recycleDrainTimeoutMs}ms of the recycle request; killing it`);
+      proc.kill();
+    }, IncrementalBuilderHost.#recycleDrainTimeoutMs);
+    return true;
+  }
+  #clearRecycle() {
+    this.#recycleRequested = false;
+    if (!this.#recycleTimer)
+      return;
+    clearTimeout(this.#recycleTimer);
+    this.#recycleTimer = null;
+  }
+  static maxRssBytes() {
+    if (process.env.AKAN_BUILDER_MAX_RSS_MB === "0")
+      return null;
+    return MemoryLimit.resolveMaxRssBytes({
+      megabytesEnv: "AKAN_BUILDER_MAX_RSS_MB",
+      bytesEnv: "AKAN_BUILDER_MAX_RSS",
+      limitFraction: 0.35,
+      fallbackBytes: IncrementalBuilderHost.#devMaxRssBytes
+    });
+  }
   send(message) {
     if (!this.#proc || this.#status !== "ready") {
       this.logger.warn(`incrementalBuilderHost is ${this.#status}; cannot send ${message.type}`);
@@ -326,6 +377,7 @@ class IncrementalBuilderHost {
   }
   stop() {
     this.#manualStop = true;
+    this.#clearRecycle();
     if (this.#restartTimer) {
       clearTimeout(this.#restartTimer);
       this.#restartTimer = null;
@@ -359,6 +411,9 @@ 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 BUILDER_RSS_RECYCLE_QUIET_MS = 750;
+var BUILDER_MIN_RSS_RECYCLE_INTERVAL_MS = 30000;
+var BUILDER_INEFFECTIVE_RSS_RECYCLE_LIMIT = 2;
 var BUILDER_RECOVERY_BASE_DELAY_MS = 2000;
 var BUILDER_RECOVERY_MAX_DELAY_MS = 60000;
 var SOURCE_EXTS = new Set([".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"]);
@@ -446,6 +501,33 @@ var hasBuildFailureForGeneration = (statusByPhase, generation) => {
   }
   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 shouldAbandonBuilderRssCeiling = (ineffectiveRecycles, limit = BUILDER_INEFFECTIVE_RSS_RECYCLE_LIMIT) => ineffectiveRecycles >= limit;
+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;
@@ -606,6 +688,11 @@ class AkanAppHost {
   #backendBuildStatusGeneration = 0;
   #backendStderrTail = [];
   #lastGoodFrontend = {};
+  #rssRecycleTimer = null;
+  #rssRecycleReason = null;
+  #lastRssRecycleAtMono = null;
+  #rssCeilingIneffective = 0;
+  #rssCeilingAbandoned = false;
   #buildStatusByPhase = new Map;
   #pendingBuildStatusReplay = [];
   #builderMessageQueue = Promise.resolve();
@@ -901,18 +988,96 @@ ${this.#backendStderrTail.join(`
       this.#reviveBackendAfterGreenBuild(message.data);
       return;
     }
-    if (message.type === "pages-updated")
-      this.#recordLastGood(message);
-    if (message.type === "css-updated")
-      this.#recordLastGood(message);
+    if (message.type === "builder-metrics") {
+      this.#handleBuilderMetrics(message.data);
+      return;
+    }
+    if (message.type === "pages-updated" || message.type === "css-updated") {
+      const recycled = message.data.reason === "builder-recycle";
+      if (recycled && !this.#shouldRelayRecycledState(message))
+        return;
+      this.#recordLastGood(message, { supersede: recycled });
+    }
     if (message.type === "invalidate") {
       await this.#handleInvalidate(message);
       return;
     }
     this.#sendToBackend(message);
   }
+  #shouldRelayRecycledState(message) {
+    const current = message.type === "pages-updated" ? this.#lastGoodFrontend.pages : this.#lastGoodFrontend.css;
+    if (shouldRelayRecycledFrontendState(current, message)) {
+      this.logger.verbose(`[builder-recycle] ${message.type} moved during the recycle; pushing it to the backend`);
+      return true;
+    }
+    this.logger.verbose(`[builder-recycle] ${message.type} unchanged after the recycle; backend left as is`);
+    return false;
+  }
+  #handleBuilderMetrics(metrics) {
+    if (this.#rssCeilingAbandoned)
+      return;
+    const ceilingBytes = IncrementalBuilderHost.maxRssBytes();
+    const asMib = (bytes) => Math.round(bytes / 1024 / 1024);
+    const decision = decideBuilderRssRecycle({
+      rssBytes: metrics.rssBytes,
+      ceilingBytes,
+      buildFailed: hasBuildFailureForGeneration(this.#buildStatusByPhase, metrics.generation),
+      msSinceLastRecycle: this.#lastRssRecycleAtMono === null ? null : performance.now() - this.#lastRssRecycleAtMono
+    });
+    if (decision === "below-ceiling") {
+      this.#rssCeilingIneffective = 0;
+      return;
+    }
+    if (decision === "unbounded")
+      return;
+    if (decision === "build-failed") {
+      this.logger.verbose(`[builder-recycle] deferred: generation=${metrics.generation} has a failing build, so a replacement would hit the same error`);
+      return;
+    }
+    if (decision === "too-soon") {
+      this.#rssCeilingIneffective += 1;
+      if (!shouldAbandonBuilderRssCeiling(this.#rssCeilingIneffective))
+        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.`);
+      return;
+    }
+    this.#armRssRecycle(`rss=${asMib(metrics.rssBytes)}MiB>=${asMib(ceilingBytes ?? 0)}MiB after ${metrics.workCount} build(s)`);
+  }
+  #armRssRecycle(reason) {
+    if (this.#rssRecycleReason !== reason)
+      this.logger.verbose(`[builder-recycle] armed (${reason}); replacing the builder once it stays quiet`);
+    this.#rssRecycleReason = reason;
+    if (this.#rssRecycleTimer)
+      clearTimeout(this.#rssRecycleTimer);
+    this.#rssRecycleTimer = setTimeout(() => {
+      this.#rssRecycleTimer = null;
+      const pendingReason = this.#rssRecycleReason;
+      this.#rssRecycleReason = null;
+      if (pendingReason)
+        this.#recycleBuilderForRss(pendingReason);
+    }, BUILDER_RSS_RECYCLE_QUIET_MS);
+  }
+  #cancelRssRecycle() {
+    this.#rssRecycleReason = null;
+    if (!this.#rssRecycleTimer)
+      return;
+    clearTimeout(this.#rssRecycleTimer);
+    this.#rssRecycleTimer = null;
+  }
+  #recycleBuilderForRss(reason) {
+    if (this.#pendingRecycle || this.#restartTimer) {
+      this.logger.verbose(`[builder-recycle] skipped (${reason}); a dev restart is already pending`);
+      return;
+    }
+    if (!this.#builder?.recycle(reason))
+      return;
+    this.#lastRssRecycleAtMono = performance.now();
+  }
   async#handleInvalidate(message) {
     this.#logDevPlan(message);
+    if (this.#rssRecycleReason)
+      this.#armRssRecycle(this.#rssRecycleReason);
     const wantsDevHostRestart = shouldRestartDevHostByDevPlan(message);
     const pending = this.#pendingRecycle;
     if (wantsDevHostRestart || shouldRestartBuilderByDevPlan(message) || pending && message.kinds.includes("code")) {
@@ -1045,15 +1210,15 @@ ${this.#backendStderrTail.join(`
     await this.#startBuilder();
     this.#startBackend({ generation, files: message.files });
   }
-  #recordLastGood(message) {
+  #recordLastGood(message, { supersede = false } = {}) {
     if (message.type === "pages-updated") {
-      if (!shouldReplaceLastGoodMessage(this.#lastGoodFrontend.pages, message))
+      if (!supersede && !shouldReplaceLastGoodMessage(this.#lastGoodFrontend.pages, message))
         return;
       this.#lastGoodFrontend.pages = message;
       this.logger.verbose(`[last-good] pages generation=${message.data.generation ?? "(unknown)"} buildId=${message.data.buildId}`);
       return;
     }
-    if (!shouldReplaceLastGoodMessage(this.#lastGoodFrontend.css, message))
+    if (!supersede && !shouldReplaceLastGoodMessage(this.#lastGoodFrontend.css, message))
       return;
     this.#lastGoodFrontend.css = message;
     this.logger.verbose(`[last-good] css generation=${message.data.generation ?? "(unknown)"} assets=${Object.keys(message.data.cssAssets).length}`);
@@ -1212,6 +1377,7 @@ ${this.#backendStderrTail.join(`
     this.logger.warn("akanAppHost builder is not running");
   }
   #stopBuilder() {
+    this.#cancelRssRecycle();
     if (!this.#builder)
       return;
     this.#builder.stop();
@@ -1259,7 +1425,7 @@ function openBrowser(url) {
 }
 
 // pkgs/@akanjs/cli/application/application.runner.ts
-var loadBuildRunner = async () => (await import("./applicationBuildRunner-yz144508.js")).ApplicationBuildRunner;
+var loadBuildRunner = async () => (await import("./applicationBuildRunner-ny84tjhc.js")).ApplicationBuildRunner;
 var loadReleasePackager = async () => (await import("./applicationReleasePackager-brvth6rs.js")).ApplicationReleasePackager;
 var loadCapacitorApp = async () => (await import("./capacitorApp-y0h6cgft.js")).CapacitorApp;
 var loadPrompts = async () => await import("@inquirer/prompts");

package/index.js

@@ -17,22 +17,22 @@ import path from "path";
 
 // pkgs/@akanjs/cli/commandModules.ts
 var commandModules = {
-  workspace: async () => (await import("./workspace.command-875aj35r.js")).WorkspaceCommand,
+  workspace: async () => (await import("./workspace.command-pmfxxfew.js")).WorkspaceCommand,
   agent: async () => (await import("./agent.command-h4afc69n.js")).AgentCommand,
-  application: async () => (await import("./application.command-47mj9qsy.js")).ApplicationCommand,
+  application: async () => (await import("./application.command-jkmbsd1x.js")).ApplicationCommand,
   library: async () => (await import("./library.command-r15zdqvp.js")).LibraryCommand,
-  localRegistry: async () => (await import("./localRegistry.command-6z4s13mj.js")).LocalRegistryCommand,
+  localRegistry: async () => (await import("./localRegistry.command-25sv5hmt.js")).LocalRegistryCommand,
   package: async () => (await import("./package.command-5x5m0ej1.js")).PackageCommand,
-  module: async () => (await import("./module.command-qrj3kmyz.js")).ModuleCommand,
+  module: async () => (await import("./module.command-tnj2bzst.js")).ModuleCommand,
   page: async () => (await import("./page.command-c6xdx0xm.js")).PageCommand,
-  context: async () => (await import("./context.command-nqbtak4f.js")).ContextCommand,
-  cloud: async () => (await import("./cloud.command-hxcgsf80.js")).CloudCommand,
+  context: async () => (await import("./context.command-ds3mka9p.js")).ContextCommand,
+  cloud: async () => (await import("./cloud.command-53j76grx.js")).CloudCommand,
   guideline: async () => (await import("./guideline.command-ya0dh44f.js")).GuidelineCommand,
-  scalar: async () => (await import("./scalar.command-kabkd6wd.js")).ScalarCommand,
-  primitive: async () => (await import("./primitive.command-pv9ssmtf.js")).PrimitiveCommand,
+  scalar: async () => (await import("./scalar.command-bmrmp8n4.js")).ScalarCommand,
+  primitive: async () => (await import("./primitive.command-q1ycj5vr.js")).PrimitiveCommand,
   quality: async () => (await import("./quality.command-es67wvdp.js")).QualityCommand,
   repair: async () => (await import("./repair.command-677675vw.js")).RepairCommand,
-  workflow: async () => (await import("./workflow.command-64r6cw0w.js")).WorkflowCommand
+  workflow: async () => (await import("./workflow.command-64550hka.js")).WorkflowCommand
 };
 var commandModuleIds = Object.keys(commandModules);
 

package/{localRegistry.command-6z4s13mj.js → localRegistry.command-25sv5hmt.js}

@@ -2,16 +2,16 @@
 import {
   CloudRunner,
   getNpmRegistryUrl
-} from "./index-sgmas1fc.js";
+} from "./index-dynknvzd.js";
+import"./index-5vvwc0cz.js";
 import {
   ApplicationScript
-} from "./index-77crfweb.js";
+} from "./index-rgfxj6qc.js";
 import"./index-76rn3g2c.js";
 import"./index-pmm9e2jf.js";
 import {
   PackageScript
 } from "./index-n6h3482q.js";
-import"./index-5vvwc0cz.js";
 import {
   Workspace,
   command,

package/{module.command-qrj3kmyz.js → module.command-tnj2bzst.js}

@@ -1,13 +1,13 @@
 // @bun
 import {
   ModuleScript
-} from "./index-8pkbzj26.js";
+} from "./index-fmky5k3p.js";
 import"./index-swf4bmbg.js";
 import"./index-ss469dec.js";
-import"./index-qaq13qk3.js";
 import {
   renderPrimitiveReport
 } from "./index-h6ca6qg0.js";
+import"./index-qaq13qk3.js";
 import"./index-5vvwc0cz.js";
 import {
   Module,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/cli",
-  "version": "2.4.1-rc.2",
+  "version": "2.4.1-rc.3",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -34,7 +34,7 @@
     "@langchain/openai": "^1.4.6",
     "@tailwindcss/node": "^4.3.0",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "2.4.1-rc.2",
+    "akanjs": "2.4.1-rc.3",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "5.5.23",

package/{primitive.command-pv9ssmtf.js → primitive.command-q1ycj5vr.js}

@@ -1,14 +1,14 @@
 // @bun
 import {
   PrimitiveScript
-} from "./index-73pr2cmy.js";
-import"./index-8pkbzj26.js";
+} from "./index-m9pca6jv.js";
+import"./index-fmky5k3p.js";
 import"./index-swf4bmbg.js";
 import"./index-ss469dec.js";
-import"./index-qaq13qk3.js";
 import {
   renderPrimitiveReport
 } from "./index-h6ca6qg0.js";
+import"./index-qaq13qk3.js";
 import"./index-5vvwc0cz.js";
 import {
   Workspace,

package/{scalar.command-kabkd6wd.js → scalar.command-bmrmp8n4.js}

@@ -1,12 +1,12 @@
 // @bun
 import {
   ScalarScript
-} from "./index-y3hdhy4p.js";
+} from "./index-gb26e7z0.js";
 import"./index-ss469dec.js";
-import"./index-qaq13qk3.js";
 import {
   renderPrimitiveReport
 } from "./index-h6ca6qg0.js";
+import"./index-qaq13qk3.js";
 import"./index-5vvwc0cz.js";
 import {
   Sys,

package/{workflow.command-64r6cw0w.js → workflow.command-64550hka.js}

@@ -4,20 +4,20 @@ import {
 } from "./index-45aj5ry0.js";
 import {
   ScalarScript
-} from "./index-y3hdhy4p.js";
+} from "./index-gb26e7z0.js";
 import {
   PrimitiveScript
-} from "./index-73pr2cmy.js";
-import"./index-8rc0bm04.js";
+} from "./index-m9pca6jv.js";
 import {
   ModuleScript
-} from "./index-8pkbzj26.js";
+} from "./index-fmky5k3p.js";
 import"./index-swf4bmbg.js";
 import"./index-ss469dec.js";
-import"./index-qaq13qk3.js";
+import"./index-8rc0bm04.js";
 import {
   createWorkflowStepRegistry
 } from "./index-h6ca6qg0.js";
+import"./index-qaq13qk3.js";
 import"./index-5vvwc0cz.js";
 import {
   Workspace,

package/{workspace.command-875aj35r.js → workspace.command-pmfxxfew.js}

@@ -1,26 +1,34 @@
 // @bun
 import {
   ContextScript
-} from "./index-qhtr07v8.js";
+} from "./index-1fpjvqhs.js";
+import"./index-85msc0wg.js";
 import"./index-45aj5ry0.js";
 import {
   CloudScript
-} from "./index-mq6ns0f9.js";
-import"./index-y3hdhy4p.js";
-import"./index-73pr2cmy.js";
-import"./index-85msc0wg.js";
+} from "./index-0hjg9qs5.js";
+import"./index-gb26e7z0.js";
+import"./index-m9pca6jv.js";
+import"./index-fmky5k3p.js";
+import"./index-swf4bmbg.js";
+import"./index-ss469dec.js";
 import"./index-1xdrsbry.js";
 import {
   AgentScript
 } from "./index-hwzpw9c1.js";
 import"./index-8rc0bm04.js";
+import"./index-h6ca6qg0.js";
+import"./index-qaq13qk3.js";
 import {
   getLatestPackageVersion,
   getNpmRegistryUrl
-} from "./index-sgmas1fc.js";
+} from "./index-dynknvzd.js";
+import {
+  GlobalConfig
+} from "./index-5vvwc0cz.js";
 import {
   ApplicationScript
-} from "./index-77crfweb.js";
+} from "./index-rgfxj6qc.js";
 import"./index-76rn3g2c.js";
 import {
   LibraryScript
@@ -28,14 +36,6 @@ import {
 import {
   PackageScript
 } from "./index-n6h3482q.js";
-import"./index-8pkbzj26.js";
-import"./index-swf4bmbg.js";
-import"./index-ss469dec.js";
-import"./index-qaq13qk3.js";
-import"./index-h6ca6qg0.js";
-import {
-  GlobalConfig
-} from "./index-5vvwc0cz.js";
 import {
   Exec,
   Workspace,

package/{index-8pkbzj26.js → index-fmky5k3p.js}

@@ -5,9 +5,6 @@ import {
 import {
   pluralizeName
 } from "./index-ss469dec.js";
-import {
-  Prompter
-} from "./index-qaq13qk3.js";
 import {
   bilingualDescriptionForField,
   bilingualLabelForField,
@@ -16,6 +13,9 @@ import {
   moduleSourcePaths,
   sourceFile
 } from "./index-h6ca6qg0.js";
+import {
+  Prompter
+} from "./index-qaq13qk3.js";
 import {
   AiSession
 } from "./index-5vvwc0cz.js";

package/{index-y3hdhy4p.js → index-gb26e7z0.js}

@@ -2,14 +2,14 @@
 import {
   pluralizeName
 } from "./index-ss469dec.js";
-import {
-  Prompter
-} from "./index-qaq13qk3.js";
 import {
   createPassedPrimitiveReport,
   generatedFilesForSync,
   scalarChangedFiles
 } from "./index-h6ca6qg0.js";
+import {
+  Prompter
+} from "./index-qaq13qk3.js";
 import {
   AiSession
 } from "./index-5vvwc0cz.js";