@akanjs/cli 2.4.1 → 2.4.2-rc.1

package/.build-stamp

@@ -1 +1 @@
-5e0a0ede01c639bf84d5ddf31e5f930a0176e0748ad6935007789b9037687962
+267b35e31ad3c4b46042123b1a70ac6abdc6a296be7c297a037753bb89b81135

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

@@ -1,16 +1,16 @@
 // @bun
 import {
   AgentScript
-} from "./index-q4sc46ec.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-phj3ewxv.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-jv63vv7z.js → application.command-zm47j93m.js}

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

package/{applicationBuildRunner-vzjdgv1g.js → applicationBuildRunner-554a2vnk.js}

@@ -4,7 +4,7 @@ import {
   CsrArtifactBuilder,
   SsrBaseArtifactBuilder,
   precompressArtifacts
-} from "./index-m0vg9n8z.js";
+} from "./index-7k9sj7j5.js";
 import"./index-rh16j3c7.js";
 import"./index-bjpxzr6s.js";
 import {
@@ -202,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: {
@@ -215,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,15 +2,15 @@
 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-m0vg9n8z.js";
+} from "./index-7k9sj7j5.js";
 import"./index-rh16j3c7.js";
 import"./index-bjpxzr6s.js";
 import"./index-6pz1j0zj.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-8z2nc6b2.js → cloud.command-vwpzten0.js}

@@ -1,23 +1,23 @@
 // @bun
 import {
   CloudScript
-} from "./index-eja0sbm6.js";
-import"./index-zw4aqvwh.js";
+} from "./index-0wgpfp7t.js";
+import"./index-t5rn8q9f.js";
 import {
   GlobalConfig
-} from "./index-5vvwc0cz.js";
-import"./index-n2mp0f48.js";
+} from "./index-nsj2ftxj.js";
+import"./index-31183bxt.js";
 import"./index-76rn3g2c.js";
-import"./index-3a4vntr0.js";
-import"./index-p9f1rpbp.js";
+import"./index-n08vr4hh.js";
+import"./index-31e8cwjq.js";
 import {
   Workspace,
   command
-} from "./index-phj3ewxv.js";
+} from "./index-en4zpzdm.js";
 import"./index-fgc8r6dj.js";
-import"./index-0t7pwff2.js";
-import"./index-x53a5nya.js";
-import"./index-61keag0s.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-0m854xme.js → context.command-j0kq87xa.js}

@@ -1,26 +1,26 @@
 // @bun
 import {
   ContextScript
-} from "./index-e3b8ms64.js";
-import"./index-81epkybm.js";
-import"./index-1b9f27pm.js";
-import"./index-d2e2y85b.js";
-import"./index-m04as81s.js";
-import"./index-h6pevatb.js";
-import"./index-qacv44mm.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-phj3ewxv.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-dsdpae45.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-phj3ewxv.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,8 +5,8 @@ import {
 import {
   AppExecutor,
   WorkspaceExecutor
-} from "./index-0t7pwff2.js";
-import"./index-61keag0s.js";
+} from "./index-s6nk9815.js";
+import"./index-67546d0j.js";
 import {
   AutoImportSync,
   DevChangePlanner,
@@ -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-eja0sbm6.js → index-0wgpfp7t.js}

@@ -1,24 +1,24 @@
 // @bun
 import {
   CloudRunner
-} from "./index-zw4aqvwh.js";
+} from "./index-t5rn8q9f.js";
 import {
   AiSession,
   CloudApi,
   GlobalConfig
-} from "./index-5vvwc0cz.js";
+} from "./index-nsj2ftxj.js";
 import {
   ApplicationScript
-} from "./index-n2mp0f48.js";
+} from "./index-31183bxt.js";
 import {
   PackageScript
-} from "./index-p9f1rpbp.js";
+} from "./index-31e8cwjq.js";
 import {
   script
-} from "./index-phj3ewxv.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-1b9f27pm.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-phj3ewxv.js";
+} from "./index-en4zpzdm.js";
 
 // pkgs/@akanjs/cli/workflow/workflow.runner.ts
 import { mkdir, readFile, writeFile } from "fs/promises";

package/{index-n2mp0f48.js → index-31183bxt.js}

@@ -4,17 +4,17 @@ import {
 } from "./index-76rn3g2c.js";
 import {
   LibraryScript
-} from "./index-3a4vntr0.js";
+} from "./index-n08vr4hh.js";
 import {
   runner,
   script
-} from "./index-phj3ewxv.js";
+} from "./index-en4zpzdm.js";
 import {
   AppExecutor,
   LibExecutor,
   PkgExecutor,
   WorkspaceExecutor
-} from "./index-0t7pwff2.js";
+} from "./index-s6nk9815.js";
 import {
   HmrWatcher,
   WatchRootResolver
@@ -1898,9 +1898,9 @@ function openBrowser(url) {
 }
 
 // pkgs/@akanjs/cli/application/application.runner.ts
-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 loadBuildRunner = async () => (await import("./applicationBuildRunner-554a2vnk.js")).ApplicationBuildRunner;
+var loadReleasePackager = async () => (await import("./applicationReleasePackager-pjbxc793.js")).ApplicationReleasePackager;
+var loadCapacitorApp = async () => (await import("./capacitorApp-wc75rvfm.js")).CapacitorApp;
 var loadPrompts = async () => await import("@inquirer/prompts");
 
 class ApplicationRunner extends runner("application") {

package/{index-p9f1rpbp.js → index-31e8cwjq.js}

@@ -2,16 +2,16 @@
 import {
   runner,
   script
-} from "./index-phj3ewxv.js";
+} from "./index-en4zpzdm.js";
 import {
   PkgExecutor
-} from "./index-0t7pwff2.js";
+} from "./index-s6nk9815.js";
 import {
   TypeScriptDependencyScanner
-} from "./index-x53a5nya.js";
+} from "./index-46tjzh6s.js";
 import {
   FileSys
-} from "./index-61keag0s.js";
+} from "./index-67546d0j.js";
 
 // pkgs/@akanjs/cli/package/package.runner.ts
 import path2 from "path";
@@ -78,7 +78,7 @@ class PackageExportsMap {
         continue;
       if (subpath.length < prefix.length + suffix.length)
         continue;
-      return target.replace("*", subpath.slice(prefix.length, subpath.length - suffix.length));
+      return target.replace(/\*/g, subpath.slice(prefix.length, subpath.length - suffix.length));
     }
     return null;
   }

package/{index-x53a5nya.js → index-46tjzh6s.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   FileSys
-} from "./index-61keag0s.js";
+} from "./index-67546d0j.js";
 
 // pkgs/@akanjs/devkit/dependencyScanner.ts
 import { builtinModules } from "module";

package/{index-61keag0s.js → index-67546d0j.js}

@@ -1,6 +1,6 @@
 // @bun
 // pkgs/@akanjs/devkit/fileSys.ts
-import { stat } from "fs/promises";
+import { lstat, stat } from "fs/promises";
 import { Logger } from "akanjs/common";
 
 class FileSys {
@@ -14,6 +14,9 @@ class FileSys {
   static async exists(path) {
     return await stat(path).then(() => true).catch(() => false);
   }
+  static async entryExists(path) {
+    return await lstat(path).then(() => true).catch(() => false);
+  }
   static async readText(path) {
     return await Bun.file(path).text();
   }

package/{index-q4sc46ec.js → index-79v9jwqe.js}

@@ -1,14 +1,14 @@
 // @bun
 import {
   AkanContextAnalyzer
-} from "./index-eay4t1te.js";
+} from "./index-xdf6rxyt.js";
 import {
   Prompter
-} from "./index-eqxmxan6.js";
+} from "./index-ehjhzg5y.js";
 import {
   runner,
   script
-} from "./index-phj3ewxv.js";
+} from "./index-en4zpzdm.js";
 
 // pkgs/@akanjs/cli/agent/agent.script.ts
 import { Logger } from "akanjs/common";

package/{index-m0vg9n8z.js → index-7k9sj7j5.js}

@@ -1620,11 +1620,12 @@ class FontOptimizer {
     return "";
   }
   async#collectAutoSubsetText() {
-    const roots = ["page", "ui"].map((dir) => path9.join(this.#app.cwdPath, dir));
+    const libPageRoots = (await this.#app.getPageRoots()).filter((root) => root.keyPrefix).map((root) => root.dir);
+    const roots = [...["page", "ui"].map((dir) => path9.join(this.#app.cwdPath, dir)), ...libPageRoots];
     const glob = new Bun.Glob("**/*.{ts,tsx,js,jsx,html,md}");
     const parts = [];
     await Promise.all(roots.map(async (root) => {
-      if (!await Bun.file(root).exists())
+      if (!await stat2(root).then((entry) => entry.isDirectory(), () => false))
         return;
       for await (const filePath of glob.scan({ cwd: root, absolute: true })) {
         parts.push(await Bun.file(filePath).text());

package/{index-e3b8ms64.js → index-8dsjmcbp.js}

@@ -1,22 +1,22 @@
 // @bun
 import {
   RepairRunner
-} from "./index-81epkybm.js";
+} from "./index-xjkjcbhd.js";
 import {
   WorkflowRunner
-} from "./index-1b9f27pm.js";
+} from "./index-2nb022xv.js";
 import {
   ScalarScript
-} from "./index-d2e2y85b.js";
+} from "./index-cp26p7qd.js";
 import {
   PrimitiveScript
-} from "./index-m04as81s.js";
+} from "./index-mpj63mbw.js";
 import {
   ModuleScript
-} from "./index-h6pevatb.js";
+} from "./index-tnngmzgf.js";
 import {
   isPlaceholderAppId
-} from "./index-hk58kr1m.js";
+} from "./index-smt4re0s.js";
 import {
   AkanContextAnalyzer,
   akanMcpInstallConfigPaths,
@@ -27,17 +27,17 @@ import {
   renderDoctorText,
   resourceList,
   upsertCodexMcpServerBlock
-} from "./index-eay4t1te.js";
+} from "./index-xdf6rxyt.js";
 import {
   buildAkanModuleContextIndex,
   createWorkflowBaselineSummary,
   createWorkflowStepRegistry,
   jsonText,
   toolingRolloutGate
-} from "./index-2v10yr8g.js";
+} from "./index-ckywhpvp.js";
 import {
   Prompter
-} from "./index-eqxmxan6.js";
+} from "./index-ehjhzg5y.js";
 import {
   getMobileTargets
 } from "./index-76rn3g2c.js";
@@ -45,10 +45,10 @@ import {
   CommandContainer,
   runner,
   script
-} from "./index-phj3ewxv.js";
+} from "./index-en4zpzdm.js";
 import {
   AppExecutor
-} from "./index-0t7pwff2.js";
+} from "./index-s6nk9815.js";
 
 // pkgs/@akanjs/cli/context/context.script.ts
 import { Logger } from "akanjs/common";

package/{index-2v10yr8g.js → index-ckywhpvp.js}

@@ -2,7 +2,7 @@
 import {
   AppExecutor,
   LibExecutor
-} from "./index-0t7pwff2.js";
+} from "./index-s6nk9815.js";
 
 // pkgs/@akanjs/devkit/workflow/utils.ts
 var jsonText = (value, { trailingNewline = true } = {}) => `${JSON.stringify(value, null, 2)}${trailingNewline ? `

package/{index-d2e2y85b.js → index-cp26p7qd.js}

@@ -6,17 +6,17 @@ import {
   createPassedPrimitiveReport,
   generatedFilesForSync,
   scalarChangedFiles
-} from "./index-2v10yr8g.js";
+} from "./index-ckywhpvp.js";
 import {
   Prompter
-} from "./index-eqxmxan6.js";
+} from "./index-ehjhzg5y.js";
 import {
   AiSession
-} from "./index-5vvwc0cz.js";
+} from "./index-nsj2ftxj.js";
 import {
   runner,
   script
-} from "./index-phj3ewxv.js";
+} from "./index-en4zpzdm.js";
 
 // pkgs/@akanjs/cli/scalar/scalar.prompt.ts
 import { input } from "@inquirer/prompts";

package/{index-eqxmxan6.js → index-ehjhzg5y.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   getDirname
-} from "./index-0t7pwff2.js";
+} from "./index-s6nk9815.js";
 
 // pkgs/@akanjs/devkit/prompter.ts
 import fsPromise from "fs/promises";

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

@@ -7,10 +7,10 @@ import {
   PkgExecutor,
   WorkspaceExecutor,
   getDirname
-} from "./index-0t7pwff2.js";
+} from "./index-s6nk9815.js";
 import {
   FileSys
-} from "./index-61keag0s.js";
+} from "./index-67546d0j.js";
 import {
   __require
 } from "./index-r24hmh0q.js";

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

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