@akanjs/cli 2.4.0-rc.1 → 2.4.0-rc.2

package/incrementalBuilder.proc.js

@@ -986,9 +986,15 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
       command
     };
   }
-  static async from(app) {
+  static #importGeneration = 0;
+  static async importConfigModule(cwdPath, { bustImportCache = false } = {}) {
+    const configPath2 = `${cwdPath}/akan.config.ts`;
+    const importPath = bustImportCache ? `${configPath2}?akanConfigGeneration=${++AkanAppConfig.#importGeneration}` : configPath2;
+    return await import(importPath).then((mod) => mod.default);
+  }
+  static async from(app, { bustImportCache = false } = {}) {
     const [configImp, baseDevEnv, libs, rootPackageJson] = await Promise.all([
-      import(`${app.cwdPath}/akan.config.ts`).then((mod) => mod.default),
+      AkanAppConfig.importConfigModule(app.cwdPath, { bustImportCache }),
       WorkspaceExecutor.getBaseDevEnv(path.join(app.workspace.workspaceRoot, ".env")),
       app.workspace.getLibs(),
       app.workspace.getPackageJson()
@@ -1408,8 +1414,8 @@ ${errorText}, ${warningText} found`];
 }
 
 // pkgs/@akanjs/devkit/scanInfo.ts
-import path5 from "path";
 import { rm } from "fs/promises";
+import path5 from "path";
 
 // pkgs/@akanjs/devkit/dependencyScanner.ts
 import { builtinModules } from "module";
@@ -1746,7 +1752,8 @@ var appRootAllowedDirs = new Set([
   "ui",
   "srvkit",
   "webkit",
-  "common"
+  "common",
+  "secrets"
 ]);
 var libRootAllowedFiles = new Set([
   "cnst.ts",
@@ -3660,7 +3667,7 @@ class AppExecutor extends SysExecutor {
   async getConfig({ refresh } = {}) {
     if (this.#akanConfig && !refresh)
       return this.#akanConfig;
-    this.#akanConfig = await AkanAppConfig.from(this);
+    this.#akanConfig = await AkanAppConfig.from(this, { bustImportCache: refresh });
     return this.#akanConfig;
   }
   #pageKeys = null;
@@ -4798,16 +4805,20 @@ ${this.#backendStderrTail.join(`
   }
   async#handleInvalidate(message) {
     this.#logDevPlan(message);
-    if (shouldRestartBuilderByDevPlan(message)) {
+    if (shouldRestartDevHostByDevPlan(message)) {
       try {
-        await this.#restartDevChildren(message);
+        await this.#restartDevHost(message);
       } catch (err) {
-        this.#recordDevHostRestartFailure(message, err);
+        this.#recordDevHostRestartFailure(message, err, "Config");
       }
       return;
     }
-    if (shouldRestartDevHostByDevPlan(message)) {
-      this.#recordDevHostRestartRequired(message);
+    if (shouldRestartBuilderByDevPlan(message)) {
+      try {
+        await this.#restartDevChildren(message);
+      } catch (err) {
+        this.#recordDevHostRestartFailure(message, err, "Runtime metadata");
+      }
       return;
     }
     if (await this.#shouldRestartBackend(message)) {
@@ -4819,6 +4830,15 @@ ${this.#backendStderrTail.join(`
   async#restartDevChildren(message) {
     const generation = message.devPlan?.generation ?? message.generation;
     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) {
+    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 });
+  }
+  async#recycleDevChildren(message, { refreshConfig = false } = {}) {
+    const generation = message.devPlan?.generation ?? message.generation;
     if (this.#restartTimer) {
       clearTimeout(this.#restartTimer);
       this.#restartTimer = null;
@@ -4833,6 +4853,11 @@ ${this.#backendStderrTail.join(`
     this.#pendingBuildStatusReplay = [];
     await this.#stopBackend();
     this.#stopBuilder();
+    if (refreshConfig) {
+      await this.app.getConfig({ refresh: true });
+      const { env } = await this.app.prepareCommand("start");
+      Object.assign(this.env, env);
+    }
     await this.#backendGraph.refresh();
     await this.#startBuilder();
     this.#startBackend({ generation, files: message.files });
@@ -4850,32 +4875,16 @@ ${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}`);
   }
-  #recordDevHostRestartRequired(message) {
-    const generation = message.devPlan?.generation ?? message.generation;
-    const detail = `generation=${generation ?? "(unknown)"} files=${message.files.length}`;
-    this.logger.warn(`[dev-host] config change requires a manual restart until controlled dev-host restart is implemented (${detail})`);
-    if (typeof generation === "number") {
-      const status = {
-        generation,
-        phase: "scan",
-        ok: false,
-        files: message.files,
-        message: "Config change requires restarting `akan start` to apply."
-      };
-      this.#recordBuildStatus(status);
-      this.#sendOrQueueBuildStatus(status);
-    }
-  }
-  #recordDevHostRestartFailure(message, err) {
+  #recordDevHostRestartFailure(message, err, kind) {
     const generation = message.devPlan?.generation ?? message.generation ?? this.#nextBackendBuildStatusGeneration();
     const detail = err instanceof Error ? err.message : String(err);
-    this.logger.warn(`[dev-host] runtime metadata restart failed generation=${generation}: ${detail}`);
+    this.logger.warn(`[dev-host] ${kind.toLowerCase()} restart failed generation=${generation}: ${detail}`);
     const status = {
       generation,
       phase: "scan",
       ok: false,
       files: message.files,
-      message: `Runtime metadata change requires restarting \`akan start\` to apply: ${detail}`
+      message: `${kind} change requires restarting \`akan start\` to apply: ${detail}`
     };
     this.#recordBuildStatus(status);
     this.#sendOrQueueBuildStatus(status);
@@ -17342,7 +17351,7 @@ ${cssText}`).toString(36);
         this.#sendBuildStatus("pages", { generation, ok: false, files, message });
       }
     }
-    if (kinds.includes("code") || kinds.includes("css")) {
+    if (kinds.includes("css") || kinds.includes("code") && rebuildClient) {
       this.scheduleCssRebuild(artifactDir, { refresh: true, generation, changedFiles: files });
       this.#logger.verbose(`css-rebuild scheduled generation=${generation}`);
     }

package/index.js

@@ -984,9 +984,15 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
       command
     };
   }
-  static async from(app) {
+  static #importGeneration = 0;
+  static async importConfigModule(cwdPath, { bustImportCache = false } = {}) {
+    const configPath2 = `${cwdPath}/akan.config.ts`;
+    const importPath = bustImportCache ? `${configPath2}?akanConfigGeneration=${++AkanAppConfig.#importGeneration}` : configPath2;
+    return await import(importPath).then((mod) => mod.default);
+  }
+  static async from(app, { bustImportCache = false } = {}) {
     const [configImp, baseDevEnv, libs, rootPackageJson] = await Promise.all([
-      import(`${app.cwdPath}/akan.config.ts`).then((mod) => mod.default),
+      AkanAppConfig.importConfigModule(app.cwdPath, { bustImportCache }),
       WorkspaceExecutor.getBaseDevEnv(path.join(app.workspace.workspaceRoot, ".env")),
       app.workspace.getLibs(),
       app.workspace.getPackageJson()
@@ -1406,8 +1412,8 @@ ${errorText}, ${warningText} found`];
 }
 
 // pkgs/@akanjs/devkit/scanInfo.ts
-import path5 from "path";
 import { rm } from "fs/promises";
+import path5 from "path";
 
 // pkgs/@akanjs/devkit/dependencyScanner.ts
 import { builtinModules } from "module";
@@ -1744,7 +1750,8 @@ var appRootAllowedDirs = new Set([
   "ui",
   "srvkit",
   "webkit",
-  "common"
+  "common",
+  "secrets"
 ]);
 var libRootAllowedFiles = new Set([
   "cnst.ts",
@@ -3658,7 +3665,7 @@ class AppExecutor extends SysExecutor {
   async getConfig({ refresh } = {}) {
     if (this.#akanConfig && !refresh)
       return this.#akanConfig;
-    this.#akanConfig = await AkanAppConfig.from(this);
+    this.#akanConfig = await AkanAppConfig.from(this, { bustImportCache: refresh });
     return this.#akanConfig;
   }
   #pageKeys = null;
@@ -4796,16 +4803,20 @@ ${this.#backendStderrTail.join(`
   }
   async#handleInvalidate(message) {
     this.#logDevPlan(message);
-    if (shouldRestartBuilderByDevPlan(message)) {
+    if (shouldRestartDevHostByDevPlan(message)) {
       try {
-        await this.#restartDevChildren(message);
+        await this.#restartDevHost(message);
       } catch (err) {
-        this.#recordDevHostRestartFailure(message, err);
+        this.#recordDevHostRestartFailure(message, err, "Config");
       }
       return;
     }
-    if (shouldRestartDevHostByDevPlan(message)) {
-      this.#recordDevHostRestartRequired(message);
+    if (shouldRestartBuilderByDevPlan(message)) {
+      try {
+        await this.#restartDevChildren(message);
+      } catch (err) {
+        this.#recordDevHostRestartFailure(message, err, "Runtime metadata");
+      }
       return;
     }
     if (await this.#shouldRestartBackend(message)) {
@@ -4817,6 +4828,15 @@ ${this.#backendStderrTail.join(`
   async#restartDevChildren(message) {
     const generation = message.devPlan?.generation ?? message.generation;
     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) {
+    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 });
+  }
+  async#recycleDevChildren(message, { refreshConfig = false } = {}) {
+    const generation = message.devPlan?.generation ?? message.generation;
     if (this.#restartTimer) {
       clearTimeout(this.#restartTimer);
       this.#restartTimer = null;
@@ -4831,6 +4851,11 @@ ${this.#backendStderrTail.join(`
     this.#pendingBuildStatusReplay = [];
     await this.#stopBackend();
     this.#stopBuilder();
+    if (refreshConfig) {
+      await this.app.getConfig({ refresh: true });
+      const { env } = await this.app.prepareCommand("start");
+      Object.assign(this.env, env);
+    }
     await this.#backendGraph.refresh();
     await this.#startBuilder();
     this.#startBackend({ generation, files: message.files });
@@ -4848,32 +4873,16 @@ ${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}`);
   }
-  #recordDevHostRestartRequired(message) {
-    const generation = message.devPlan?.generation ?? message.generation;
-    const detail = `generation=${generation ?? "(unknown)"} files=${message.files.length}`;
-    this.logger.warn(`[dev-host] config change requires a manual restart until controlled dev-host restart is implemented (${detail})`);
-    if (typeof generation === "number") {
-      const status = {
-        generation,
-        phase: "scan",
-        ok: false,
-        files: message.files,
-        message: "Config change requires restarting `akan start` to apply."
-      };
-      this.#recordBuildStatus(status);
-      this.#sendOrQueueBuildStatus(status);
-    }
-  }
-  #recordDevHostRestartFailure(message, err) {
+  #recordDevHostRestartFailure(message, err, kind) {
     const generation = message.devPlan?.generation ?? message.generation ?? this.#nextBackendBuildStatusGeneration();
     const detail = err instanceof Error ? err.message : String(err);
-    this.logger.warn(`[dev-host] runtime metadata restart failed generation=${generation}: ${detail}`);
+    this.logger.warn(`[dev-host] ${kind.toLowerCase()} restart failed generation=${generation}: ${detail}`);
     const status = {
       generation,
       phase: "scan",
       ok: false,
       files: message.files,
-      message: `Runtime metadata change requires restarting \`akan start\` to apply: ${detail}`
+      message: `${kind} change requires restarting \`akan start\` to apply: ${detail}`
     };
     this.#recordBuildStatus(status);
     this.#sendOrQueueBuildStatus(status);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/cli",
-  "version": "2.4.0-rc.1",
+  "version": "2.4.0-rc.2",
   "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.0-rc.1",
+    "akanjs": "2.4.0-rc.2",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "5.5.23",

package/templates/workspaceRoot/.gitignore.template

@@ -102,6 +102,7 @@ apps/*/common/index.ts
 apps/*/plugin/index.ts
 apps/*/client.ts
 apps/*/server.ts
+apps/*/capacitor.config.json
 libs/*/lib/cnst.ts
 libs/*/lib/dict.ts
 libs/*/lib/db.ts