@akanjs/cli 3.1.0-rc.2 → 3.1.0-rc.21

package/{index-20cebtth.js → index-h6czey01.js}

@@ -35,44 +35,47 @@ import {
   filesChangedSince,
   HmrWatcher,
   WatchRootResolver
-} from "./index-k9rrten6.js";
+} from "./index-5nd1wtkv.js";
 import {
   runner,
   script,
+  markCliErrorPrinted,
   assertPromptable
-} from "./index-31ce9vhg.js";
+} from "./index-vkb9m4z7.js";
 import {
+  AppInfo,
+  CommandExecutionError,
   WorkspaceExecutor,
   AppExecutor,
   LibExecutor,
   PkgExecutor
-} from "./index-2etqq75t.js";
+} from "./index-g6ax17x4.js";
 import {
   DesktopServerStage,
   UpdateUploader
-} from "./index-g0vwzy9m.js";
+} from "./index-4v43h00g.js";
+import {
+  resolveMobileTargets,
+  resolveAppId
+} from "./index-m9jj544v.js";
 import {
   NativePublicEnv,
   UpdatePackFolder,
   NativeApp
-} from "./index-0909wckt.js";
+} from "./index-35m6bzm7.js";
 import {
   LibraryScript
-} from "./index-bea2gwc6.js";
+} from "./index-9mt4smfy.js";
 import {
   stripAnsi
 } from "./index-7md2g9vw.js";
 import {
   SlicePlanner,
   formatSlicePlan
-} from "./index-58vvz603.js";
+} from "./index-xsd96yzw.js";
 import {
   openBrowser
 } from "./index-9dp031by.js";
-import {
-  resolveMobileTargets,
-  resolveAppId
-} from "./index-q958tqqg.js";
 
 // pkgs/@akanjs/cli/application/application.script.ts
 import { confirm } from "@inquirer/prompts";
@@ -196,7 +199,9 @@ var closeBunSocket = (socket, error) => {
 
 // pkgs/@akanjs/devkit/createTunnel.ts
 var createTunnel = async (service, { app, environment, port = service === "postgres" ? 5432 : 6379 }) => {
-  const { serveDomain, repoName } = WorkspaceExecutor.getBaseDevEnv();
+  const baseDevEnv = WorkspaceExecutor.getBaseDevEnv();
+  WorkspaceExecutor.assertDeployableEnv(baseDevEnv, environment, `The ${service} tunnel`);
+  const { serveDomain, repoName } = baseDevEnv;
   const host = `${app.name}-${environment}.${serveDomain}`;
   const sshPort = process.env.SSH_TUNNEL_PORT ? parseInt(process.env.SSH_TUNNEL_PORT) : 32767;
   const dstHost = `${service}-0.${service}-svc.${app.name}-${environment}.svc.cluster.local`;
@@ -1894,7 +1899,7 @@ ${uniqueCandidates.map((candidate) => `  - ${candidate}`).join(`
 
 // pkgs/@akanjs/cli/application/application.runner.ts
 import { Logger as Logger3, toError } from "akanjs/common";
-var loadBuildRunner = async () => (await import("./applicationBuildRunner-by10r9gf.js")).ApplicationBuildRunner;
+var loadBuildRunner = async () => (await import("./applicationBuildRunner-wsszr305.js")).ApplicationBuildRunner;
 var loadPrompts = async () => await import("@inquirer/prompts");
 
 class ApplicationRunner extends runner("application") {
@@ -1936,8 +1941,12 @@ class ApplicationRunner extends runner("application") {
     const scriptPath = `script/${scriptName}.ts`;
     if (!await app.exists(scriptPath))
       throw new Error(`Script file not found: apps/${app.name}/${scriptPath}`);
-    await app.spawn("bun", [scriptPath], {
-      env: app.getCommandEnv({ AKAN_COMMAND_TYPE: "script", ...await app.getDatabaseModeEnv() }),
+    await this.#spawnFromRoot(app, "script", [`${app.cwdPath}/${scriptPath}`]);
+  }
+  async#spawnFromRoot(app, commandType, args) {
+    await app.spawn("bun", args, {
+      cwd: app.workspace.workspaceRoot,
+      env: app.getCommandEnv({ AKAN_COMMAND_TYPE: commandType, ...await app.getDatabaseModeEnv() }),
       stdio: "inherit"
     });
   }
@@ -2024,10 +2033,7 @@ try {
   await server.stop();
 }
 `;
-    await app.spawn("bun", ["-e", code], {
-      env: app.getCommandEnv({ AKAN_COMMAND_TYPE: "console", ...await app.getDatabaseModeEnv() }),
-      stdio: "inherit"
-    });
+    await this.#spawnFromRoot(app, "console", ["-e", code]);
   }
   async transferDatabase(app, direction, dir) {
     const serverPath = `${app.cwdPath}/server.ts`;
@@ -2046,16 +2052,55 @@ try {
   await server.stop();
 }
 `;
-    await app.spawn("bun", ["-e", code], {
-      env: app.getCommandEnv({ AKAN_COMMAND_TYPE: "script", ...await app.getDatabaseModeEnv() }),
-      stdio: "inherit"
+    await this.#spawnFromRoot(app, "script", ["-e", code]);
+  }
+  async migrate(app, argv) {
+    const serverPath = `${app.cwdPath}/server.ts`;
+    if (!await app.exists("server.ts"))
+      throw new Error(`Server file not found: apps/${app.name}/server.ts`);
+    const code = `
+const argv = ${JSON.stringify(argv)};
+let loaded;
+try {
+  loaded = await import(${JSON.stringify(serverPath)});
+} catch (error) {
+  console.error(error);
+  const { MigrationCommand } = await import("akanjs/server");
+  process.exitCode = await MigrationCommand.print(MigrationCommand.failure(null, error), MigrationCommand.jsonOf(argv));
+}
+if (loaded) process.exitCode = await loaded.migrations.command(loaded.server, argv, ${JSON.stringify(`akan migrate ${app.name}`)});
+`;
+    try {
+      await this.#spawnFromRoot(app, "script", ["-e", code]);
+    } catch (error) {
+      if (!(error instanceof CommandExecutionError) || error.code === null)
+        throw error;
+      process.exitCode = error.code;
+    }
+  }
+  async createMigration(app, migrationName, now = new Date) {
+    const words = migrationName.split(/[^A-Za-z0-9]+/).filter(Boolean);
+    const name = words.map((word, idx) => (idx ? word.charAt(0).toUpperCase() : word.charAt(0).toLowerCase()) + word.slice(1)).join("");
+    if (!/^[A-Za-z][A-Za-z0-9]*$/.test(name))
+      throw new Error(`"${migrationName}" is no migration name; name what it does in camelCase, e.g. bizLicenseOwnership`);
+    const migrationId = `${now.toISOString().replace(/\D/g, "").slice(0, 12)}_${name}`;
+    const filePath = `${AppInfo.migrationDir}/${migrationId}.ts`;
+    if (await app.exists(filePath))
+      throw new Error(`apps/${app.name}/${filePath} already exists`);
+    const title = name.replace(/([a-z0-9])([A-Z])/g, "$1 $2").toLowerCase();
+    await app.applyTemplate({
+      basePath: AppInfo.migrationDir,
+      template: "migration",
+      dict: { migrationId, title: title.charAt(0).toUpperCase() + title.slice(1) },
+      overwrite: false
     });
+    return migrationId;
   }
   async typecheck(app, options = {}) {
     await new (await loadBuildRunner())(app).typecheck(options);
   }
   async typecheckLibrary(lib, options = {}) {
-    const { ProjectTypecheck } = await import("./projectTypecheck-jamtx95x.js");
+    const { ProjectTypecheck } = await import("./projectTypecheck-fx8x7cat.js");
     const root = lib.workspace.workspaceRoot;
     await new ProjectTypecheck(lib.cwdPath, root, { ...process.env, AKAN_WORKSPACE_ROOT: root }).run([
       "../../server.ts",
@@ -3337,6 +3382,14 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     await app.scanSync();
     await this.applicationRunner.runConsole(app);
   }
+  async migrate(app, argv) {
+    await app.scanSync();
+    await this.applicationRunner.migrate(app, argv);
+  }
+  async createMigration(app, migrationName) {
+    const migrationId = await this.applicationRunner.createMigration(app, migrationName);
+    Logger6.rawLog(`Created apps/${app.name}/script/migration/${migrationId}.ts; plan it with \`akan migrate ${app.name} plan ${migrationId}\``);
+  }
   async logs(app, options) {
     await this.applicationRunner.runLogs(app, options);
   }
@@ -3357,6 +3410,7 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     } catch (error) {
       Logger6.rawLog(`${app.name} build failed in dist/apps/${app.name}`, undefined, "error");
       Logger6.rawLog(ApplicationBuildReporter.formatError(error), undefined, "error");
+      markCliErrorPrinted(error);
       throw error;
     }
   }
@@ -3379,6 +3433,7 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     } catch (error) {
       spinner.fail(`${exec.name} typecheck failed`);
       Logger6.rawLog(ApplicationBuildReporter.formatError(error), undefined, "error");
+      markCliErrorPrinted(error);
       throw error;
     }
   }
@@ -3633,7 +3688,7 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
       await Promise.all(shares.map(async (share) => await share.close()));
     }, "Abandoning the tunnel release; the shares expire on their own.");
     await Promise.all(apps.map(async (app) => {
-      const { TunnelShare } = await import("./TunnelShare-f1egrktx.js");
+      const { TunnelShare } = await import("./TunnelShare-tfrnftgr.js");
       const share = await TunnelShare.open(app, { workspace: app.workspace });
       shares.push(share);
       urls.set(app.name, share.url);

package/{index-6726qr1m.js → index-jrmzcp66.js}

@@ -2,23 +2,73 @@
 import {
   FileSys2
 } from "./index-52w0fvh8.js";
+import {
+  resolveMobileTargets
+} from "./index-m9jj544v.js";
 import {
   NativePublicEnv,
   UpdatePackFolder,
   NativeApp
-} from "./index-0909wckt.js";
-import {
-  resolveMobileTargets
-} from "./index-q958tqqg.js";
+} from "./index-35m6bzm7.js";
 import {
   ExitCodeError
-} from "./index-31ce9vhg.js";
+} from "./index-vkb9m4z7.js";
 import {
   ConfigLock
-} from "./index-3hx1z96c.js";
+} from "./index-bqbf654f.js";
+
+// pkgs/@akanjs/devkit/cloud/cloudHttpError.ts
+import { isRecord } from "akanjs/common";
+
+class CloudHttpError extends Error {
+  status;
+  statusText;
+  url;
+  body;
+  headers;
+  static #errKey = /^[\w$-]+\.error\.[\w$-]+$/;
+  name = "CloudHttpError";
+  constructor(status, statusText, url, body, headers = new Headers) {
+    super(`${status} ${statusText} from ${url}: ${body.slice(0, 200)}`);
+    this.status = status;
+    this.statusText = statusText;
+    this.url = url;
+    this.body = body;
+    this.headers = headers;
+  }
+  static async of(response, url) {
+    return new CloudHttpError(response.status, response.statusText, url, await response.text(), response.headers);
+  }
+  static statusOf(error) {
+    return error instanceof CloudHttpError ? error.status : null;
+  }
+  get error() {
+    try {
+      const parsed = JSON.parse(this.body);
+      return isRecord(parsed) && typeof parsed.error === "string" ? parsed.error : null;
+    } catch {
+      return null;
+    }
+  }
+  get errKey() {
+    const { error } = this;
+    return error && CloudHttpError.#errKey.test(error) ? error : null;
+  }
+  get retryAfterMs() {
+    return CloudHttpError.retryAfterMs(this.headers.get("retry-after"));
+  }
+  static retryAfterMs(header) {
+    const value = header?.trim() ?? "";
+    if (!value)
+      return null;
+    const ms = /^\d+$/.test(value) ? Number(value) * 1000 : Date.parse(value) - Date.now();
+    return Number.isFinite(ms) ? Math.max(0, ms) : null;
+  }
+}
 
 // pkgs/@akanjs/devkit/cloud/globalConfig.ts
 import { mkdir, rm, writeFile } from "fs/promises";
+import { trimTrailingSlashes } from "akanjs/common";
 import dayjs from "dayjs";
 
 // pkgs/@akanjs/devkit/cloud/constants.ts
@@ -68,7 +118,7 @@ class GlobalConfig {
   }
   static #normalizeHost(host) {
     const url = URL.canParse(host) ? new URL(host) : null;
-    return url && (url.protocol === "https:" || url.protocol === "http:") ? `${url.origin}${url.pathname.replace(/\/+$/, "")}` : host.replace(/\/+$/, "");
+    return url && (url.protocol === "https:" || url.protocol === "http:") ? `${url.origin}${trimTrailingSlashes(url.pathname)}` : trimTrailingSlashes(host);
   }
   static async getHostConfig(host = GlobalConfig.akanCloudHost) {
     const akanConfig = await GlobalConfig.#getAkanGlobalConfig();
@@ -169,55 +219,6 @@ class GlobalConfig {
   }
 }
 
-// pkgs/@akanjs/devkit/cloud/cloudHttpError.ts
-import { isRecord } from "akanjs/common";
-
-class CloudHttpError extends Error {
-  status;
-  statusText;
-  url;
-  body;
-  headers;
-  static #errKey = /^[\w$-]+\.error\.[\w$-]+$/;
-  name = "CloudHttpError";
-  constructor(status, statusText, url, body, headers = new Headers) {
-    super(`${status} ${statusText} from ${url}: ${body.slice(0, 200)}`);
-    this.status = status;
-    this.statusText = statusText;
-    this.url = url;
-    this.body = body;
-    this.headers = headers;
-  }
-  static async of(response, url) {
-    return new CloudHttpError(response.status, response.statusText, url, await response.text(), response.headers);
-  }
-  static statusOf(error) {
-    return error instanceof CloudHttpError ? error.status : null;
-  }
-  get error() {
-    try {
-      const parsed = JSON.parse(this.body);
-      return isRecord(parsed) && typeof parsed.error === "string" ? parsed.error : null;
-    } catch {
-      return null;
-    }
-  }
-  get errKey() {
-    const { error } = this;
-    return error && CloudHttpError.#errKey.test(error) ? error : null;
-  }
-  get retryAfterMs() {
-    return CloudHttpError.retryAfterMs(this.headers.get("retry-after"));
-  }
-  static retryAfterMs(header) {
-    const value = header?.trim() ?? "";
-    if (!value)
-      return null;
-    const ms = /^\d+$/.test(value) ? Number(value) * 1000 : Date.parse(value) - Date.now();
-    return Number.isFinite(ms) ? Math.max(0, ms) : null;
-  }
-}
-
 // pkgs/@akanjs/devkit/cloud/cloudApi.ts
 class HttpClient {
   baseUrl;
@@ -370,7 +371,6 @@ class CloudApi {
     }
   }
 }
-
 // pkgs/@akanjs/devkit/cloud/cloudUpdates.ts
 import path2 from "path";
 import { Logger as Logger2 } from "akanjs/common";
@@ -585,7 +585,6 @@ ${(release.problems ?? []).map((problem) => `  - ${problem}`).join(`
     });
   }
 }
-
 // pkgs/@akanjs/devkit/cloud/pipelineSecrets.ts
 import { capitalize, Logger as Logger3, PipelineNames } from "akanjs/common";
 class PipelineSecrets {

package/{index-q958tqqg.js → index-m9jj544v.js}

@@ -1,6 +1,6 @@
 // @bun
 // pkgs/@akanjs/devkit/mobile/mobileTarget.ts
-var trimSlashes = (value) => value.replace(/^\/+|\/+$/g, "");
+import { trimSlashes } from "akanjs/common";
 var getMobileTargets = async (app) => {
   const config = await app.getConfig();
   return Object.entries(config.native.targets).map(([name, target]) => ({ name, config: target }));

package/{index-8935h3n1.js → index-mdjc93e1.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   getMobileTargetChoices
-} from "./index-q958tqqg.js";
+} from "./index-m9jj544v.js";
 
 // pkgs/@akanjs/cli/application/commandOptions.ts
 var targetChoices = async ({ app }) => await getMobileTargetChoices(app);

package/{index-rk9sdys3.js → index-nv79n88g.js}

@@ -10,7 +10,7 @@ import {
   isScannedRootEntry,
   AppExecutor,
   LibExecutor
-} from "./index-2etqq75t.js";
+} from "./index-g6ax17x4.js";
 import {
   FileSys2
 } from "./index-52w0fvh8.js";
@@ -23,7 +23,7 @@ import {
   workflowPathsForPlan,
   workflowRunArtifactPath,
   workflowSyncDir
-} from "./index-rhbabmja.js";
+} from "./index-033wne2j.js";
 
 // pkgs/@akanjs/devkit/akanContext.ts
 import { readdir } from "fs/promises";
@@ -79,7 +79,7 @@ var upsertCodexMcpServerBlock = (existing, block, { force = false } = {}) => {
   if (!match) {
     if (!existing.trim())
       return nextBlock;
-    return `${existing.replace(/\s*$/, "")}
+    return `${existing.trimEnd()}
 
 ${nextBlock}`;
   }
@@ -532,14 +532,14 @@ class AkanContextAnalyzer {
     if (frameworkDeclared.size > 0) {
       const agentsMd = await Bun.file(path.join(workspace.workspaceRoot, "AGENTS.md")).text().catch(() => "");
       const listed = listedByImport(sectionOf(agentsMd, "## Recipes")).get("akanjs/ui") ?? new Set;
-      pushIndexDiagnostic("AGENTS.md", [...frameworkDeclared].filter((name) => !listed.has(name)).sort(), [...listed].filter((name) => !frameworkDeclared.has(name)).sort(), "akan agent install agents-md");
+      pushIndexDiagnostic("AGENTS.md", [...frameworkDeclared].filter((name) => !listed.has(name)).sort((a, b) => a < b ? -1 : a > b ? 1 : 0), [...listed].filter((name) => !frameworkDeclared.has(name)).sort((a, b) => a < b ? -1 : a > b ? 1 : 0), "akan agent install agents-md");
     }
     for (const sys of [...context.apps, ...context.libs]) {
       const own = declaredByImport.get(`@${sys.path}/ui`) ?? new Set;
       const scopeMd = await Bun.file(path.join(workspace.workspaceRoot, sys.path, "AGENTS.md")).text().catch(() => "");
       const groups = listedByImport(sectionOf(scopeMd, "## Recipes In Scope"));
       const ownListed = groups.get(`@${sys.path}/ui`) ?? new Set;
-      const missing = [...own].filter((name) => !ownListed.has(name)).sort();
+      const missing = [...own].filter((name) => !ownListed.has(name)).sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
       const stale = [...groups.entries()].flatMap(([importFrom, names]) => [...names].filter((name) => !(declaredByImport.get(importFrom) ?? new Set).has(name))).sort();
       pushIndexDiagnostic(`${sys.path}/AGENTS.md`, missing, stale, `akan sync ${sys.name}`);
     }

package/{index-kc8z134d.js → index-nx64dz92.js}

@@ -1,17 +1,40 @@
 // @bun
 import {
   resolveSsrPageEntriesForApp
-} from "./index-2etqq75t.js";
+} from "./index-g6ax17x4.js";
 import {
   bundleDefine,
   CsrEntryFiles,
   PagesEntrySourceGenerator,
   PagesBundleBuilder
-} from "./index-nq045px5.js";
+} from "./index-h3r3nr9y.js";
 
 // pkgs/@akanjs/devkit/frontendBuild/csrArtifactBuilder.ts
 import { mkdir, rm, unlink } from "fs/promises";
+import path2 from "path";
+
+// pkgs/@akanjs/devkit/transforms/browserDirnamePlugin.ts
 import path from "path";
+var vendorScript = /[\\/]node_modules[\\/].+\.[cm]?js$/;
+var createBrowserDirnamePlugin = () => ({
+  name: "akan-browser-dirname",
+  setup(build) {
+    build.onLoad({ filter: vendorScript }, async (args) => {
+      const source = await Bun.file(args.path).text();
+      if (!source.includes("__dirname") && !source.includes("__filename"))
+        return;
+      const posixPath = args.path.replaceAll("\\", "/");
+      const filename = posixPath.slice(posixPath.indexOf("/node_modules/"));
+      const define = { __dirname: JSON.stringify(path.posix.dirname(filename)), __filename: JSON.stringify(filename) };
+      return {
+        loader: "js",
+        contents: new Bun.Transpiler({ loader: "js", target: "browser", define }).transformSync(source)
+      };
+    });
+  }
+});
+
+// pkgs/@akanjs/devkit/frontendBuild/csrArtifactBuilder.ts
 class CsrArtifactBuilder {
   #app;
   #command;
@@ -67,11 +90,11 @@ ${logs}` : ""}`);
       minify: true,
       define: bundleDefine(app, command, "csr"),
       optimizeImports,
-      plugins: [PagesBundleBuilder.createCssStubPlugin()]
+      plugins: [PagesBundleBuilder.createCssStubPlugin(), createBrowserDirnamePlugin()]
     };
   }
   static publicEnvPath(app) {
-    return path.join(app.dist.cwdPath, ".akan", "artifact", "csr-public-env.json");
+    return path2.join(app.dist.cwdPath, ".akan", "artifact", "csr-public-env.json");
   }
   static async writePublicEnv(app, define) {
     const prefix = "process.env.";
@@ -89,20 +112,20 @@ ${logs}` : ""}`);
     return CsrEntryFiles.entryFilename(basePath);
   }
   static basePathOfHtml(htmlPath) {
-    const name = path.basename(htmlPath, ".html");
+    const name = path2.basename(htmlPath, ".html");
     return name === "index" ? "" : name;
   }
   get #outputDir() {
-    return path.join(this.#command === "build" ? this.#app.dist.cwdPath : this.#app.cwdPath, this.#command === "build" ? "csr" : ".akan/artifact/csr");
+    return path2.join(this.#command === "build" ? this.#app.dist.cwdPath : this.#app.cwdPath, this.#command === "build" ? "csr" : ".akan/artifact/csr");
   }
   get #generatedDir() {
-    return path.join(this.#app.cwdPath, ".akan/generated/csr");
+    return path2.join(this.#app.cwdPath, ".akan/generated/csr");
   }
   get #artifactDir() {
-    return path.join(this.#command === "build" ? this.#app.dist.cwdPath : this.#app.cwdPath, ".akan/artifact");
+    return path2.join(this.#command === "build" ? this.#app.dist.cwdPath : this.#app.cwdPath, ".akan/artifact");
   }
   #generatedPath(filename) {
-    return path.join(this.#generatedDir, filename);
+    return path2.join(this.#generatedDir, filename);
   }
   async#createEntryFile(basePath, pageEntries) {
     return [
@@ -135,7 +158,7 @@ void bootCsr(pages);
   async#loadCssAssets() {
     if (this.#cssAssets)
       return this.#cssAssets;
-    const artifactFile = Bun.file(path.join(this.#artifactDir, "base-artifact.json"));
+    const artifactFile = Bun.file(path2.join(this.#artifactDir, "base-artifact.json"));
     if (!await artifactFile.exists())
       return {};
     const artifact = await artifactFile.json();
@@ -150,7 +173,7 @@ void bootCsr(pages);
       const basePath = CsrArtifactBuilder.basePathOfHtml(htmlPath);
       const cssAsset = cssAssets[basePath];
       if (!cssAsset) {
-        this.#app.logger.warn(`[csr-build] base-artifact.json has no compiled stylesheet for ${basePath || "root"}; ${path.basename(htmlPath)} ships without CSS`);
+        this.#app.logger.warn(`[csr-build] base-artifact.json has no compiled stylesheet for ${basePath || "root"}; ${path2.basename(htmlPath)} ships without CSS`);
       }
       const inlined = await this.#inlineHtmlAssets(await htmlFile.text(), htmlPath, cssAsset);
       for (const filePath of inlined.jsFiles)
@@ -171,7 +194,7 @@ ${remainingAssets.join(`
   async#inlineHtmlAssets(html, htmlPath, cssAsset) {
     let next = html;
     if (cssAsset) {
-      const css = await Bun.file(path.join(this.#artifactDir, cssAsset.cssRelPath)).text();
+      const css = await Bun.file(path2.join(this.#artifactDir, cssAsset.cssRelPath)).text();
       next = CsrArtifactBuilder.injectBeforeHeadEnd(next, CsrArtifactBuilder.createInlineStyle(css));
     }
     const jsFiles = [];
@@ -189,7 +212,7 @@ ${remainingAssets.join(`
       if (predicate(filePath))
         files.push(filePath);
     }
-    return files.sort();
+    return files.sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
   }
   static injectBeforeHeadEnd(html, snippet) {
     const scannable = CsrArtifactBuilder.blankEmbeddedContent(html);
@@ -205,7 +228,7 @@ ${html.slice(bodyStart)}`;
 ${snippet}`;
   }
   static blankEmbeddedContent(html) {
-    return html.replace(/<script\b[^>]*>[\s\S]*?<\/script\s*>|<style\b[^>]*>[\s\S]*?<\/style\s*>|<!--[\s\S]*?-->/gi, (match) => " ".repeat(match.length));
+    return html.replace(/<script\b[^>]*>[\s\S]*?(?:<\/script(?:[\s/][^<>]*)?>|$)|<style\b[^>]*>[\s\S]*?(?:<\/style(?:[\s/][^<>]*)?>|$)|<!--[\s\S]*?(?:--!?>|$)/gi, (match) => " ".repeat(match.length));
   }
   static createInlineStyle(css) {
     return `<style data-akan-css="active">
@@ -241,7 +264,7 @@ ${CsrArtifactBuilder.escapeInlineScript(await loadScript(src))}
       throw new Error(`[csr-build] cannot inline external script: ${src}`);
     }
     const normalized = src.startsWith("/") ? src.slice(1) : src;
-    return path.resolve(path.dirname(htmlPath), normalized);
+    return path2.resolve(path2.dirname(htmlPath), normalized);
   }
 }
 

package/{index-z507nzhg.js → index-p2r64bpa.js}

@@ -2,10 +2,10 @@
 import {
   runner,
   script
-} from "./index-31ce9vhg.js";
+} from "./index-vkb9m4z7.js";
 import {
   ModuleExecutor
-} from "./index-2etqq75t.js";
+} from "./index-g6ax17x4.js";
 import {
   sourceFile,
   moduleSourcePaths,
@@ -13,10 +13,10 @@ import {
   createPassedPrimitiveReport,
   bilingualLabelForField,
   bilingualDescriptionForField
-} from "./index-rhbabmja.js";
+} from "./index-033wne2j.js";
 import {
   PageScript
-} from "./index-jwqtchha.js";
+} from "./index-27y8t17p.js";
 import {
   pluralizeName
 } from "./index-nz8prx9g.js";

package/{index-nq2ja5e0.js → index-pg1t468s.js}

@@ -5,13 +5,13 @@ import {
   writeGeneratedSyncState,
   createRepairReport,
   renderRepairReport
-} from "./index-rhbabmja.js";
+} from "./index-033wne2j.js";
 import {
   AkanContextAnalyzer
-} from "./index-rk9sdys3.js";
+} from "./index-nv79n88g.js";
 import {
   runner
-} from "./index-31ce9vhg.js";
+} from "./index-vkb9m4z7.js";
 
 // pkgs/@akanjs/cli/repair/repair.runner.ts
 var spawnShell = async (workspace, command) => await workspace.spawn("bash", ["-lc", command.startsWith("akan ") ? `bun run ${command}` : command], {