@akanjs/cli 2.4.1-rc.7 → 2.4.2-rc.0

package/.build-stamp

@@ -1 +1 @@
-fe5aabbf16f2ea5ada84a8b559093007200be13ac1cae02c0cf70f80a1736b22
+662b40618a5997cc258bbcdff378d024ba3e5861396f7d73dbfa2a2eaf09d772

package/{agent.command-t4346579.js → agent.command-ash7wabs.js}

@@ -1,16 +1,16 @@
 // @bun
 import {
   AgentScript
-} from "./index-pya1h7wx.js";
-import"./index-eay4t1te.js";
-import"./index-2v10yr8g.js";
-import"./index-eqxmxan6.js";
+} from "./index-79v9jwqe.js";
+import"./index-xdf6rxyt.js";
+import"./index-ckywhpvp.js";
+import"./index-ehjhzg5y.js";
 import {
   Workspace,
   command
-} from "./index-qpz4csbs.js";
-import"./index-0t7pwff2.js";
-import"./index-61keag0s.js";
+} from "./index-en4zpzdm.js";
+import"./index-s6nk9815.js";
+import"./index-67546d0j.js";
 import"./index-6pz1j0zj.js";
 import"./index-r24hmh0q.js";
 

package/{application.command-zkmeemdt.js → application.command-zm47j93m.js}

@@ -1,22 +1,22 @@
 // @bun
 import {
   ApplicationScript
-} from "./index-n5y2gbf2.js";
+} from "./index-31183bxt.js";
 import {
   getMobileTargetChoices
 } from "./index-76rn3g2c.js";
-import"./index-fh990y67.js";
+import"./index-n08vr4hh.js";
 import {
   App,
   Exec,
   Sys,
   Workspace,
   command
-} from "./index-qpz4csbs.js";
+} from "./index-en4zpzdm.js";
 import"./index-fgc8r6dj.js";
-import"./index-0t7pwff2.js";
-import"./index-61keag0s.js";
-import"./index-0fn1r7gg.js";
+import"./index-s6nk9815.js";
+import"./index-67546d0j.js";
+import"./index-bjpxzr6s.js";
 import"./index-6pz1j0zj.js";
 import"./index-r24hmh0q.js";
 

package/{applicationBuildRunner-5w8j9yp7.js → applicationBuildRunner-554a2vnk.js}

@@ -4,8 +4,9 @@ import {
   CsrArtifactBuilder,
   SsrBaseArtifactBuilder,
   precompressArtifacts
-} from "./index-khzzttv1.js";
-import"./index-0fn1r7gg.js";
+} from "./index-7k9sj7j5.js";
+import"./index-rh16j3c7.js";
+import"./index-bjpxzr6s.js";
 import {
   Spinner
 } from "./index-6pz1j0zj.js";
@@ -201,6 +202,10 @@ void run().catch((error) => {
   async#writeTypecheckTsconfig({ incremental = true } = {}) {
     const typecheckDir = path.join(this.#app.cwdPath, ".akan", "typecheck");
     await mkdir(typecheckDir, { recursive: true });
+    const libPageIncludes = (await this.#app.getPageRoots()).filter((root) => root.keyPrefix).flatMap((root) => {
+      const rel = path.relative(typecheckDir, root.realDir).split(path.sep).join("/");
+      return [`${rel}/**/*.ts`, `${rel}/**/*.tsx`];
+    });
     const tsconfig = {
       extends: "../../tsconfig.json",
       compilerOptions: {
@@ -214,6 +219,7 @@ void run().catch((error) => {
         "../../client.ts",
         "../../page/**/*.ts",
         "../../page/**/*.tsx",
+        ...libPageIncludes,
         "../../../../pkgs/akanjs/*/types/**/*.d.ts"
       ],
       references: []

package/{applicationReleasePackager-brvth6rs.js → applicationReleasePackager-pjbxc793.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   FileSys
-} from "./index-61keag0s.js";
+} from "./index-67546d0j.js";
 import {
   Spinner
 } from "./index-6pz1j0zj.js";

package/buildBatch.proc.js

@@ -2,16 +2,17 @@
 import {
   AppExecutor,
   WorkspaceExecutor
-} from "./index-0t7pwff2.js";
-import"./index-61keag0s.js";
+} from "./index-s6nk9815.js";
+import"./index-67546d0j.js";
 import {
   CsrArtifactBuilder,
   CssCompiler,
   FontOptimizer,
   PagesBundleBuilder,
   SsrBaseArtifactBuilder
-} from "./index-khzzttv1.js";
-import"./index-0fn1r7gg.js";
+} from "./index-7k9sj7j5.js";
+import"./index-rh16j3c7.js";
+import"./index-bjpxzr6s.js";
 import"./index-6pz1j0zj.js";
 import"./index-r24hmh0q.js";
 

package/{capacitorApp-wnxzrppx.js → capacitorApp-wc75rvfm.js}

@@ -24,10 +24,10 @@ import {
   selectLocalDevHost,
   sortIosRunTargets,
   writeRootCapacitorConfig
-} from "./index-hk58kr1m.js";
+} from "./index-smt4re0s.js";
 import"./index-76rn3g2c.js";
-import"./index-0t7pwff2.js";
-import"./index-61keag0s.js";
+import"./index-s6nk9815.js";
+import"./index-67546d0j.js";
 import"./index-6pz1j0zj.js";
 import"./index-r24hmh0q.js";
 export {

package/{cloud.command-5ztqxppm.js → cloud.command-vwpzten0.js}

@@ -1,24 +1,24 @@
 // @bun
 import {
   CloudScript
-} from "./index-s9yajzkj.js";
-import"./index-gr4cjv99.js";
+} from "./index-0wgpfp7t.js";
+import"./index-t5rn8q9f.js";
 import {
   GlobalConfig
-} from "./index-5vvwc0cz.js";
-import"./index-n5y2gbf2.js";
+} from "./index-nsj2ftxj.js";
+import"./index-31183bxt.js";
 import"./index-76rn3g2c.js";
-import"./index-fh990y67.js";
-import"./index-nv7et4t3.js";
+import"./index-n08vr4hh.js";
+import"./index-31e8cwjq.js";
 import {
   Workspace,
   command
-} from "./index-qpz4csbs.js";
+} from "./index-en4zpzdm.js";
 import"./index-fgc8r6dj.js";
-import"./index-0t7pwff2.js";
-import"./index-x53a5nya.js";
-import"./index-61keag0s.js";
-import"./index-0fn1r7gg.js";
+import"./index-s6nk9815.js";
+import"./index-46tjzh6s.js";
+import"./index-67546d0j.js";
+import"./index-bjpxzr6s.js";
 import"./index-6pz1j0zj.js";
 import"./index-r24hmh0q.js";
 

package/{context.command-smwxwgwf.js → context.command-j0kq87xa.js}

@@ -1,26 +1,26 @@
 // @bun
 import {
   ContextScript
-} from "./index-0jwvs8vp.js";
-import"./index-jbtn8h1y.js";
-import"./index-3sd2vape.js";
-import"./index-ahpcr9ss.js";
-import"./index-2v6a4wd5.js";
-import"./index-wh201a76.js";
-import"./index-y4kg682s.js";
+} from "./index-8dsjmcbp.js";
+import"./index-xjkjcbhd.js";
+import"./index-2nb022xv.js";
+import"./index-cp26p7qd.js";
+import"./index-mpj63mbw.js";
+import"./index-tnngmzgf.js";
+import"./index-f1x6fe2e.js";
 import"./index-ss469dec.js";
-import"./index-hk58kr1m.js";
-import"./index-eay4t1te.js";
-import"./index-2v10yr8g.js";
-import"./index-eqxmxan6.js";
-import"./index-5vvwc0cz.js";
+import"./index-smt4re0s.js";
+import"./index-xdf6rxyt.js";
+import"./index-ckywhpvp.js";
+import"./index-ehjhzg5y.js";
+import"./index-nsj2ftxj.js";
 import"./index-76rn3g2c.js";
 import {
   Workspace,
   command
-} from "./index-qpz4csbs.js";
-import"./index-0t7pwff2.js";
-import"./index-61keag0s.js";
+} from "./index-en4zpzdm.js";
+import"./index-s6nk9815.js";
+import"./index-67546d0j.js";
 import"./index-6pz1j0zj.js";
 import"./index-r24hmh0q.js";
 

package/{dependencyScanner-m4x5maek.js → dependencyScanner-f6grrep3.js}

@@ -1,8 +1,8 @@
 // @bun
 import {
   TypeScriptDependencyScanner
-} from "./index-x53a5nya.js";
-import"./index-61keag0s.js";
+} from "./index-46tjzh6s.js";
+import"./index-67546d0j.js";
 import"./index-r24hmh0q.js";
 export {
   TypeScriptDependencyScanner

package/{guideline.command-1r0esdjs.js → guideline.command-1m4jwhv0.js}

@@ -1,22 +1,22 @@
 // @bun
 import {
   Prompter
-} from "./index-eqxmxan6.js";
+} from "./index-ehjhzg5y.js";
 import {
   AiSession
-} from "./index-5vvwc0cz.js";
+} from "./index-nsj2ftxj.js";
 import {
   Workspace,
   command,
   runner,
   script
-} from "./index-qpz4csbs.js";
+} from "./index-en4zpzdm.js";
 import {
   getDirname
-} from "./index-0t7pwff2.js";
+} from "./index-s6nk9815.js";
 import {
   FileSys
-} from "./index-61keag0s.js";
+} from "./index-67546d0j.js";
 import"./index-6pz1j0zj.js";
 import"./index-r24hmh0q.js";
 

package/incrementalBuilder.proc.js

@@ -5,19 +5,19 @@ import {
 import {
   AppExecutor,
   WorkspaceExecutor
-} from "./index-0t7pwff2.js";
-import"./index-61keag0s.js";
+} from "./index-s6nk9815.js";
+import"./index-67546d0j.js";
 import {
   AutoImportSync,
   DevChangePlanner,
   DevGeneratedIndexSync,
   GraphClientEntryDiscovery,
   RouteClientBuilder
-} from "./index-khzzttv1.js";
+} from "./index-rh16j3c7.js";
 import {
   HmrWatcher,
   WatchRootResolver
-} from "./index-0fn1r7gg.js";
+} from "./index-bjpxzr6s.js";
 import"./index-6pz1j0zj.js";
 import"./index-r24hmh0q.js";
 
@@ -81,7 +81,7 @@ class BuildBatchRunner {
       this.#logger.verbose(`[build-batch] generation=${request.generation} needs=${request.needs.join(",")} done in ${Date.now() - started}ms`);
       return result;
     }
-    const message = `build worker exited with code ${exitCode} before reporting a result`;
+    const message = proc.signalCode ? `build worker was killed by ${proc.signalCode} before reporting a result${proc.signalCode === "SIGKILL" ? " \u2014 most often the kernel OOM killer; check the sandbox's memory limit" : ""}` : `build worker exited with code ${exitCode} before reporting a result`;
     this.#logger.error(`[build-batch] generation=${request.generation} ${message}`);
     return {
       generation: request.generation,
@@ -268,27 +268,34 @@ class IncrementalBuilder {
   get shuttingDown() {
     return this.#shuttingDown;
   }
-  batchTouchesPagesTree(appDir, batch) {
-    const absAppDir = path2.resolve(appDir);
+  static #matchPageRoot(roots, abs) {
+    for (const root of roots) {
+      const absRoot = path2.resolve(root.realDir);
+      if (abs === absRoot || abs.startsWith(`${absRoot}${path2.sep}`))
+        return root;
+    }
+    return null;
+  }
+  batchTouchesPagesTree(roots, batch) {
     for (const f of batch.files) {
       const abs = path2.resolve(f);
-      if (!abs.startsWith(`${absAppDir}${path2.sep}`) && abs !== absAppDir)
+      if (!IncrementalBuilder.#matchPageRoot(roots, abs))
         continue;
       if (/\.(tsx|ts|jsx|js)$/.test(abs))
         return true;
     }
     return false;
   }
-  async batchMayChangePageKeys(appDir, batch) {
-    const absAppDir = path2.resolve(appDir);
+  async batchMayChangePageKeys(roots, batch) {
     const pageKeys = new Set((await this.#app.getPageKeys()).map((key) => path2.normalize(key)));
     for (const f of batch.files) {
       const abs = path2.resolve(f);
-      if (!abs.startsWith(`${absAppDir}${path2.sep}`) && abs !== absAppDir)
+      const root = IncrementalBuilder.#matchPageRoot(roots, abs);
+      if (!root)
         continue;
       if (!/\.(tsx|ts|jsx|js)$/.test(abs))
         continue;
-      const rel = path2.normalize(path2.relative(absAppDir, abs));
+      const rel = path2.normalize(`${root.keyPrefix}${path2.relative(path2.resolve(root.realDir), abs)}`);
       if (!await Bun.file(abs).exists() || !pageKeys.has(rel))
         return true;
     }
@@ -327,20 +334,20 @@ class IncrementalBuilder {
     }, 150);
   }
   async installWatcher() {
-    const [appDir, artifactDir] = [`${this.#app.cwdPath}/page`, this.#artifactDir];
+    const artifactDir = this.#artifactDir;
     const roots = await new WatchRootResolver(this.#app).resolve();
     const watcher = new HmrWatcher({
       roots,
       logger: this.#logger,
       onBatch: async (batch) => {
-        await this.#enqueueWork("hmr-batch", async () => this.#handleWatchBatch(appDir, artifactDir, batch));
+        await this.#enqueueWork("hmr-batch", async () => this.#handleWatchBatch(artifactDir, batch));
       }
     });
     await watcher.start();
     this.#watcher = watcher;
     this.#logger.verbose(`watching ${roots.length} roots`);
   }
-  async#handleWatchBatch(appDir, artifactDir, batch) {
+  async#handleWatchBatch(artifactDir, batch) {
     const rawKinds = new Set(batch.kinds);
     if (rawKinds.size === 0)
       return;
@@ -382,11 +389,12 @@ class IncrementalBuilder {
     if (kinds.includes("code") && !rebuildClient) {
       this.#logger.verbose(`client rebuild skipped; devPlan actions=${devPlan.actions.join(",") || "(none)"}`);
     }
-    if (kinds.includes("code") && rebuildClient && await this.batchMayChangePageKeys(appDir, expandedBatch)) {
+    const pageRoots = await this.#app.getPageRoots();
+    if (kinds.includes("code") && rebuildClient && await this.batchMayChangePageKeys(pageRoots, expandedBatch)) {
       const started = Date.now();
       await this.#app.getPageKeys({ refresh: true });
       this.#logger.verbose(`pageKeys updated, app pageKeys are refreshed (${Date.now() - started}ms)`);
-    } else if (kinds.includes("code") && rebuildClient && this.batchTouchesPagesTree(appDir, expandedBatch)) {
+    } else if (kinds.includes("code") && rebuildClient && this.batchTouchesPagesTree(pageRoots, expandedBatch)) {
       this.#logger.verbose("pageKeys refresh skipped; changed page source cannot add/remove a route key");
     }
     const needs = [];

package/{index-s9yajzkj.js → index-0wgpfp7t.js}

@@ -1,24 +1,24 @@
 // @bun
 import {
   CloudRunner
-} from "./index-gr4cjv99.js";
+} from "./index-t5rn8q9f.js";
 import {
   AiSession,
   CloudApi,
   GlobalConfig
-} from "./index-5vvwc0cz.js";
+} from "./index-nsj2ftxj.js";
 import {
   ApplicationScript
-} from "./index-n5y2gbf2.js";
+} from "./index-31183bxt.js";
 import {
   PackageScript
-} from "./index-nv7et4t3.js";
+} from "./index-31e8cwjq.js";
 import {
   script
-} from "./index-qpz4csbs.js";
+} from "./index-en4zpzdm.js";
 import {
   PkgExecutor
-} from "./index-0t7pwff2.js";
+} from "./index-s6nk9815.js";
 
 // pkgs/@akanjs/cli/cloud/cloud.script.ts
 import { Logger } from "akanjs/common";

package/{index-3sd2vape.js → index-2nb022xv.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   AkanContextAnalyzer
-} from "./index-eay4t1te.js";
+} from "./index-xdf6rxyt.js";
 import {
   WorkflowExecutor,
   compactWorkflowInputs,
@@ -23,10 +23,10 @@ import {
   workflowCommandsForPlan,
   workflowPlanApproval,
   writeWorkflowRunArtifact
-} from "./index-2v10yr8g.js";
+} from "./index-ckywhpvp.js";
 import {
   runner
-} from "./index-qpz4csbs.js";
+} from "./index-en4zpzdm.js";
 
 // pkgs/@akanjs/cli/workflow/workflow.runner.ts
 import { mkdir, readFile, writeFile } from "fs/promises";