@akanjs/cli 2.1.0-rc.0 → 2.1.0-rc.10

package/index.js

@@ -1959,6 +1959,45 @@ var staticTemplateFileExtensions = new Set([
   ".woff2",
   ".xml"
 ]);
+var formatCommandArg = (value) => /^[\w@%+=:,./-]+$/.test(value) ? value : JSON.stringify(value);
+var formatCommandForDisplay = (command, args = []) => [command, ...args].map(formatCommandArg).join(" ");
+
+class CommandExecutionError extends Error {
+  command;
+  args;
+  cwd;
+  code;
+  signal;
+  stdout;
+  stderr;
+  constructor({
+    command,
+    args = [],
+    cwd,
+    code,
+    signal,
+    stdout = "",
+    stderr = "",
+    cause
+  }) {
+    const displayCommand = formatCommandForDisplay(command, args);
+    const status = signal ? `signal: ${signal}` : `exit code: ${code ?? "unknown"}`;
+    const output = (stderr || stdout).trim();
+    super([`Command failed: ${displayCommand}`, `cwd: ${cwd}`, status, output ? `
+${output}` : ""].join(`
+`), {
+      cause
+    });
+    this.name = "CommandExecutionError";
+    this.command = command;
+    this.args = args;
+    this.cwd = cwd;
+    this.code = code;
+    this.signal = signal;
+    this.stdout = stdout;
+    this.stderr = stderr;
+  }
+}
 var execEmoji = {
   workspace: "\uD83C\uDFE0",
   app: "\uD83D\uDE80",
@@ -2089,23 +2128,32 @@ class Executor {
     Logger4.raw(chalk4.red(data.toString()));
   }
   exec(command, options = {}) {
+    const cwd = options.cwd?.toString() ?? this.cwdPath;
     const proc = exec(command, { cwd: this.cwdPath, ...options });
+    let stdout = "";
+    let stderr = "";
     proc.stdout?.on("data", (data) => {
+      stdout += data.toString();
       this.#stdout(data);
     });
     proc.stderr?.on("data", (data) => {
+      stderr += data.toString();
       this.#stdout(data);
     });
     return new Promise((resolve, reject) => {
+      proc.on("error", (error) => {
+        reject(new CommandExecutionError({ command, cwd, code: null, signal: null, stdout, stderr, cause: error }));
+      });
       proc.on("exit", (code, signal) => {
         if (!!code || signal)
-          reject({ code, signal });
+          reject(new CommandExecutionError({ command, cwd, code, signal, stdout, stderr }));
         else
           resolve({ code, signal });
       });
     });
   }
   spawn(command, args = [], options = {}) {
+    const cwd = options.cwd?.toString() ?? this.cwdPath;
     const proc = spawn(command, args, {
       cwd: this.cwdPath,
       ...options
@@ -2123,9 +2171,12 @@ class Executor {
       this.#stdout(data);
     });
     return new Promise((resolve, reject) => {
+      proc.on("error", (error) => {
+        reject(new CommandExecutionError({ command, args, cwd, code: null, signal: null, stdout, stderr, cause: error }));
+      });
       proc.on("close", (code, signal) => {
         if (code !== 0 || signal)
-          reject(stderr || stdout);
+          reject(new CommandExecutionError({ command, args, cwd, code, signal, stdout, stderr }));
         else
           resolve(stdout);
       });
@@ -2139,20 +2190,37 @@ class Executor {
     return proc;
   }
   fork(modulePath, args = [], options = {}) {
+    const cwd = options.cwd?.toString() ?? this.cwdPath;
     const proc = fork(modulePath, args, {
       cwd: this.cwdPath,
       ...options
     });
+    let stdout = "";
+    let stderr = "";
     proc.stdout?.on("data", (data) => {
+      stdout += data.toString();
       this.#stdout(data);
     });
     proc.stderr?.on("data", (data) => {
+      stderr += data.toString();
       this.#stderr(data);
     });
     return new Promise((resolve, reject) => {
+      proc.on("error", (error) => {
+        reject(new CommandExecutionError({
+          command: modulePath,
+          args,
+          cwd,
+          code: null,
+          signal: null,
+          stdout,
+          stderr,
+          cause: error
+        }));
+      });
       proc.on("exit", (code, signal) => {
         if (!!code || signal)
-          reject({ code, signal });
+          reject(new CommandExecutionError({ command: modulePath, args, cwd, code, signal, stdout, stderr }));
         else
           resolve({ code, signal });
       });
@@ -3374,6 +3442,7 @@ class IncrementalBuilderHost {
     const candidates = [
       path8.join(app.workspace.workspaceRoot, "pkgs/@akanjs/devkit/incrementalBuilder/incrementalBuilder.proc.ts"),
       path8.join(app.workspace.workspaceRoot, "node_modules/@akanjs/devkit/incrementalBuilder/incrementalBuilder.proc.ts"),
+      path8.join(import.meta.dir, "incrementalBuilder.proc.js"),
       path8.join(import.meta.dir, "incrementalBuilder.proc.ts")
     ];
     for (const c of candidates)
@@ -5348,9 +5417,7 @@ ${defaultNames.map((name) => `export default ${name};`).join(`
   }
   static resolveSsrClientRuntimeAliases() {
     const serverEntry = RouteClientBuilder.resolveAkanServerEntry();
-    const aliases = Object.fromEntries(SSR_CLIENT_ALIAS_EXTERNALS.map((specifier) => [specifier, Bun.resolveSync(specifier, serverEntry)]));
-    aliases[Bun.resolveSync("akanjs/fetch", serverEntry)] = "akanjs/fetch";
-    return aliases;
+    return { [Bun.resolveSync("akanjs/fetch", serverEntry)]: "akanjs/fetch" };
   }
   static resolveSsrClientExternalOptions(command) {
     if (command === "start") {
@@ -5793,9 +5860,9 @@ class CssImportResolver {
   }
   async resolve(id, fromBase) {
     for (const resolve of [
+      () => this.#resolveWithTsconfig(id),
       () => this.#resolveWithBun(id, fromBase),
       () => this.#resolveWithRequire(id, fromBase),
-      () => this.#resolveWithTsconfig(id),
       () => this.#resolvePackageStyle(id, fromBase)
     ]) {
       const resolved = await resolve();
@@ -5805,20 +5872,24 @@ class CssImportResolver {
     return null;
   }
   #resolveWithBun(id, fromBase) {
-    try {
-      const resolved = Bun.resolveSync(id, fromBase);
-      return CssImportResolver.isCssFile(resolved) ? resolved : null;
-    } catch {
-      return null;
+    for (const base of this.#resolutionBases(fromBase)) {
+      try {
+        const resolved = Bun.resolveSync(id, base);
+        if (CssImportResolver.isCssFile(resolved))
+          return resolved;
+      } catch {}
     }
+    return null;
   }
   #resolveWithRequire(id, fromBase) {
-    try {
-      const resolved = __require.resolve(id, { paths: [fromBase] });
-      return CssImportResolver.isCssFile(resolved) ? resolved : null;
-    } catch {
-      return null;
+    for (const base of this.#resolutionBases(fromBase)) {
+      try {
+        const resolved = __require.resolve(id, { paths: [base] });
+        if (CssImportResolver.isCssFile(resolved))
+          return resolved;
+      } catch {}
     }
+    return null;
   }
   async#resolveWithTsconfig(id) {
     const exact = this.#paths[id];
@@ -5846,8 +5917,25 @@ class CssImportResolver {
     const pkgName = CssImportResolver.getPackageName(id);
     if (!pkgName)
       return null;
+    for (const base of this.#resolutionBases(fromBase)) {
+      try {
+        const pkgPath = __require.resolve(`${pkgName}/package.json`, { paths: [base] });
+        const resolved = await this.#resolvePackageStyleFromPackageJson(id, pkgName, pkgPath);
+        if (resolved)
+          return resolved;
+      } catch {}
+    }
+    for (const pkgPath of this.#packageJsonCandidates(pkgName)) {
+      const resolved = await this.#resolvePackageStyleFromPackageJson(id, pkgName, pkgPath);
+      if (resolved)
+        return resolved;
+    }
+    return null;
+  }
+  async#resolvePackageStyleFromPackageJson(id, pkgName, pkgPath) {
     try {
-      const pkgPath = __require.resolve(`${pkgName}/package.json`, { paths: [fromBase] });
+      if (!await Bun.file(pkgPath).exists())
+        return null;
       const pkgDir = path22.dirname(pkgPath);
       const pkg = await Bun.file(pkgPath).json();
       const subpath = id === pkgName ? "." : `.${id.slice(pkgName.length)}`;
@@ -5858,6 +5946,17 @@ class CssImportResolver {
       return null;
     }
   }
+  #resolutionBases(fromBase) {
+    return [fromBase, this.#workspaceRoot, path22.dirname(Bun.main), path22.resolve(path22.dirname(Bun.main), "../..")];
+  }
+  #packageJsonCandidates(pkgName) {
+    return [
+      path22.join(this.#workspaceRoot, "pkgs", pkgName, "package.json"),
+      path22.join(this.#workspaceRoot, "node_modules", pkgName, "package.json"),
+      path22.join(path22.dirname(Bun.main), "node_modules", pkgName, "package.json"),
+      path22.join(path22.dirname(Bun.main), "../../", pkgName, "package.json")
+    ];
+  }
   async#firstExisting(basePath2) {
     for (const suffix of CSS_IMPORT_EXTS) {
       const candidate = `${basePath2}${suffix}`;
@@ -6980,16 +7079,20 @@ class SsrBaseArtifactBuilder {
     return { rscClientUrl, vendorMap };
   }
   async#resolveAkanServerPath() {
-    const candidates = [
-      path30.join(this.#app.workspace.workspaceRoot, "pkgs/akanjs/server"),
-      path30.resolve(import.meta.dir, "../../server"),
-      path30.resolve(import.meta.dir, "../server")
-    ];
+    const candidates = [];
+    try {
+      candidates.push(path30.dirname(Bun.resolveSync("akanjs/server", this.#app.workspace.workspaceRoot)));
+    } catch {}
+    candidates.push(path30.join(this.#app.workspace.workspaceRoot, "pkgs/akanjs/server"), path30.join(this.#app.workspace.workspaceRoot, "node_modules/akanjs/server"));
+    try {
+      candidates.push(path30.dirname(Bun.resolveSync("akanjs/server", path30.dirname(Bun.main))));
+    } catch {}
+    candidates.push(path30.join(path30.dirname(Bun.main), "node_modules/akanjs/server"), path30.join(path30.dirname(Bun.main), "../../akanjs/server"), path30.resolve(import.meta.dir, "../../server"), path30.resolve(import.meta.dir, "../server"));
     for (const candidate of candidates) {
       if (await Bun.file(path30.join(candidate, "rscClient.tsx")).exists())
         return candidate;
     }
-    return candidates[0];
+    throw new Error(`[base-artifact] failed to locate akanjs/server; looked in: ${candidates.join(", ")}`);
   }
   async#buildStyleAssets() {
     const cssCompiler = new CssCompiler(this.#app);
@@ -7063,25 +7166,11 @@ var SSR_RENDER_EXTERNALS = [
   "react/jsx-dev-runtime",
   "react-dom",
   "react-dom/server.browser",
+  "react-server-dom-webpack",
+  "react-server-dom-webpack/server.node",
   "react-server-dom-webpack/client.node",
   "react-server-dom-webpack/client.browser"
 ];
-var TYPECHECK_WORKER_CODE = `
-import { TypeChecker } from "@akanjs/devkit";
-
-try {
-  const configPath = process.env.AKAN_TYPECHECK_TSCONFIG;
-  if (!configPath) throw new Error("AKAN_TYPECHECK_TSCONFIG is required");
-  const result = TypeChecker.checkProject(configPath);
-  if (result.errors.length > 0) {
-    console.error(result.message);
-    process.exit(1);
-  }
-} catch (error) {
-  console.error(error instanceof Error ? error.message : String(error));
-  process.exit(1);
-}
-`;
 
 class ApplicationBuildRunner {
   #app;
@@ -7172,7 +7261,7 @@ class ApplicationBuildRunner {
       naming: { entry: "[name].[ext]", chunk: "chunk-[hash].[ext]" },
       conditions: ["react-server"],
       define: { "process.env.NODE_ENV": JSON.stringify("production") },
-      plugins: akanConfig2.externalLibs.length > 0 ? [this.#createExternalSpecifiersPlugin(akanConfig2.externalLibs)] : []
+      plugins: backendExternals.length > 0 ? [this.#createExternalSpecifiersPlugin(backendExternals)] : []
     });
     return {
       entrypoints: backendEntryPoints.length + 1,
@@ -7225,7 +7314,8 @@ class ApplicationBuildRunner {
     return { typecheckDir, tsconfigPath };
   }
   async#checkProjectInChildProcess(tsconfigPath) {
-    const proc = Bun.spawn([process.execPath, "--eval", TYPECHECK_WORKER_CODE], {
+    const entry = await this.#resolveTypecheckWorkerEntry();
+    const proc = Bun.spawn([process.execPath, entry], {
       cwd: this.#app.workspace.workspaceRoot,
       env: this.#app.getCommandEnv({
         AKAN_COMMAND_TYPE: "typecheck",
@@ -7242,6 +7332,18 @@ class ApplicationBuildRunner {
     if (exitCode !== 0)
       throw new Error((stderr || stdout).trim() || `Typecheck failed with exit code ${exitCode}`);
   }
+  async#resolveTypecheckWorkerEntry() {
+    const candidates = [
+      path32.join(this.#app.workspace.workspaceRoot, "pkgs/@akanjs/devkit/typecheck/typecheck.proc.ts"),
+      path32.join(this.#app.workspace.workspaceRoot, "node_modules/@akanjs/devkit/typecheck/typecheck.proc.ts"),
+      path32.join(import.meta.dir, "typecheck.proc.js"),
+      path32.join(import.meta.dir, "typecheck.proc.ts")
+    ];
+    for (const candidate of candidates)
+      if (await Bun.file(candidate).exists())
+        return candidate;
+    throw new Error(`[cli] typecheck worker entry not found; looked in: ${candidates.join(", ")}`);
+  }
   async#buildOrThrow(label, config) {
     const result = await Bun.build(config);
     if (!result.success)
@@ -7507,10 +7609,31 @@ class ApplicationReleasePackager {
   `;
   }
 }
+// pkgs/@akanjs/devkit/applicationTestPreload.ts
+import path33 from "path";
+var SIGNAL_TEST_PRELOAD_PATH = "test/signalTest.preload.ts";
+async function resolveSignalTestPreloadPath(target) {
+  const candidates = [];
+  const addResolvedPackageCandidate = (basePath2) => {
+    try {
+      candidates.push(path33.join(path33.dirname(Bun.resolveSync("akanjs/package.json", basePath2)), SIGNAL_TEST_PRELOAD_PATH));
+    } catch {}
+  };
+  addResolvedPackageCandidate(target.cwdPath);
+  addResolvedPackageCandidate(process.cwd());
+  addResolvedPackageCandidate(path33.dirname(Bun.main));
+  addResolvedPackageCandidate(import.meta.dir);
+  candidates.push(path33.join(target.cwdPath, "../../node_modules/akanjs", SIGNAL_TEST_PRELOAD_PATH), path33.join(target.cwdPath, "../../pkgs/akanjs", SIGNAL_TEST_PRELOAD_PATH), path33.join(process.cwd(), "node_modules/akanjs", SIGNAL_TEST_PRELOAD_PATH), path33.join(process.cwd(), "pkgs/akanjs", SIGNAL_TEST_PRELOAD_PATH), path33.join(path33.dirname(Bun.main), "../../akanjs", SIGNAL_TEST_PRELOAD_PATH), path33.resolve(import.meta.dir, "../../akanjs", SIGNAL_TEST_PRELOAD_PATH));
+  for (const candidate of [...new Set(candidates)]) {
+    if (await Bun.file(candidate).exists())
+      return candidate;
+  }
+  throw new Error(`Failed to locate ${SIGNAL_TEST_PRELOAD_PATH} from ${target.cwdPath}`);
+}
 // pkgs/@akanjs/devkit/builder.ts
 import { existsSync as existsSync2 } from "fs";
 import { mkdir as mkdir9 } from "fs/promises";
-import path33 from "path";
+import path34 from "path";
 var SKIP_ENTRY_DIR_SET = new Set(["node_modules", "dist", "build", ".git", ".next"]);
 var assetExtensions = [".css", ".md", ".js", ".png", ".ico", ".svg", ".json", ".template"];
 var assetLoader = Object.fromEntries(assetExtensions.map((ext) => [ext, "file"]));
@@ -7527,14 +7650,14 @@ class Builder {
   #globEntrypoints(cwd, pattern) {
     const glob = new Bun.Glob(pattern);
     return Array.from(glob.scanSync({ cwd, onlyFiles: true })).filter((relativePath) => {
-      const segments = relativePath.split(path33.sep);
+      const segments = relativePath.split(path34.sep);
       return !segments.some((segment) => SKIP_ENTRY_DIR_SET.has(segment));
-    }).map((rel) => path33.join(cwd, rel));
+    }).map((rel) => path34.join(cwd, rel));
   }
   #globFiles(cwd, pattern = "**/*.*") {
     const glob = new Bun.Glob(pattern);
     return Array.from(glob.scanSync({ cwd, onlyFiles: true })).filter((relativePath) => {
-      const segments = relativePath.split(path33.sep);
+      const segments = relativePath.split(path34.sep);
       return !segments.some((segment) => SKIP_ENTRY_DIR_SET.has(segment));
     });
   }
@@ -7542,17 +7665,17 @@ class Builder {
     const out = [];
     for (const p of additionalEntryPoints) {
       if (p.includes("*")) {
-        const rel = p.startsWith(`${cwd}/`) || p.startsWith(`${cwd}${path33.sep}`) ? p.slice(cwd.length + 1) : p;
+        const rel = p.startsWith(`${cwd}/`) || p.startsWith(`${cwd}${path34.sep}`) ? p.slice(cwd.length + 1) : p;
         out.push(...this.#globEntrypoints(cwd, rel));
       } else
-        out.push(path33.isAbsolute(p) ? p : path33.join(cwd, p));
+        out.push(path34.isAbsolute(p) ? p : path34.join(cwd, p));
     }
     return out;
   }
   #getBuildOptions({ bundle = false, additionalEntryPoints = [] } = {}) {
     const cwd = this.#executor.cwdPath;
     const entrypoints = [
-      ...bundle ? [path33.join(cwd, "index.ts")] : this.#globEntrypoints(cwd, "**/*.{ts,tsx}"),
+      ...bundle ? [path34.join(cwd, "index.ts")] : this.#globEntrypoints(cwd, "**/*.{ts,tsx}"),
       ...this.#resolveAdditionalEntrypoints(cwd, additionalEntryPoints)
     ];
     return {
@@ -7573,9 +7696,9 @@ class Builder {
     for (const relativePath of this.#globFiles(cwd)) {
       if (relativePath === "package.json")
         continue;
-      const sourcePath = path33.join(cwd, relativePath);
-      const targetPath = path33.join(this.#distExecutor.cwdPath, relativePath);
-      await mkdir9(path33.dirname(targetPath), { recursive: true });
+      const sourcePath = path34.join(cwd, relativePath);
+      const targetPath = path34.join(this.#distExecutor.cwdPath, relativePath);
+      await mkdir9(path34.dirname(targetPath), { recursive: true });
       await Bun.write(targetPath, Bun.file(sourcePath));
     }
   }
@@ -7586,13 +7709,13 @@ class Builder {
       return withoutFormatDir;
     if (!hasDotSlash && withoutFormatDir === publishedPath)
       return publishedPath;
-    const parsed = path33.posix.parse(withoutFormatDir);
+    const parsed = path34.posix.parse(withoutFormatDir);
     if (![".js", ".mjs", ".cjs"].includes(parsed.ext))
       return withoutFormatDir;
-    const withoutExt = path33.posix.join(parsed.dir, parsed.name);
+    const withoutExt = path34.posix.join(parsed.dir, parsed.name);
     const sourcePath = withoutExt.startsWith("./") ? withoutExt.slice(2) : withoutExt;
     const sourceCandidates = [`${sourcePath}.ts`, `${sourcePath}.tsx`];
-    const matchedSource = sourceCandidates.find((candidate) => existsSync2(path33.join(this.#executor.cwdPath, candidate)));
+    const matchedSource = sourceCandidates.find((candidate) => existsSync2(path34.join(this.#executor.cwdPath, candidate)));
     if (!matchedSource)
       return withoutFormatDir;
     return hasDotSlash ? `./${matchedSource}` : matchedSource;
@@ -7642,7 +7765,7 @@ class Builder {
 }
 // pkgs/@akanjs/devkit/capacitorApp.ts
 import { cp as cp2, mkdir as mkdir10, rm as rm4 } from "fs/promises";
-import path34 from "path";
+import path35 from "path";
 import { MobileProject } from "@trapezedev/project";
 import { capitalize as capitalize2 } from "akanjs/common";
 
@@ -7836,10 +7959,10 @@ class CapacitorApp {
   constructor(app, target) {
     this.app = app;
     this.target = target;
-    this.targetRootPath = path34.posix.join("mobile", this.target.name);
-    this.targetRoot = path34.join(this.app.cwdPath, this.targetRootPath);
-    this.targetWebRoot = path34.join(this.targetRoot, "www");
-    this.targetAssetRoot = path34.join(this.targetRoot, "assets");
+    this.targetRootPath = path35.posix.join("mobile", this.target.name);
+    this.targetRoot = path35.join(this.app.cwdPath, this.targetRootPath);
+    this.targetWebRoot = path35.join(this.targetRoot, "www");
+    this.targetAssetRoot = path35.join(this.targetRoot, "assets");
     this.project = new MobileProject(this.app.cwdPath, {
       android: { path: this.androidRootPath },
       ios: { path: this.iosProjectPath }
@@ -7855,9 +7978,9 @@ class CapacitorApp {
     await this.#writeCapacitorConfig();
     if (regenerate) {
       if (!platform || platform === "ios")
-        await rm4(path34.join(this.app.cwdPath, this.iosRootPath), { recursive: true, force: true });
+        await rm4(path35.join(this.app.cwdPath, this.iosRootPath), { recursive: true, force: true });
       if (!platform || platform === "android")
-        await rm4(path34.join(this.app.cwdPath, this.androidRootPath), { recursive: true, force: true });
+        await rm4(path35.join(this.app.cwdPath, this.androidRootPath), { recursive: true, force: true });
     }
     const project = this.project;
     await this.project.load();
@@ -7919,7 +8042,7 @@ class CapacitorApp {
     await this.#spawnMobile("npx", ["cap", "sync", "android"], { operation, env });
   }
   async#updateAndroidBuildTypes() {
-    const appGradle = await FileEditor.create(path34.join(this.app.cwdPath, this.androidRootPath, "app/build.gradle"));
+    const appGradle = await FileEditor.create(path35.join(this.app.cwdPath, this.androidRootPath, "app/build.gradle"));
     const buildTypesBlock = `
       debug {
         applicationIdSuffix ".debug"
@@ -7962,7 +8085,7 @@ class CapacitorApp {
     const gradleCommand = isWindows ? "gradlew.bat" : "./gradlew";
     await this.app.spawn(gradleCommand, [assembleType === "apk" ? "assembleRelease" : "bundleRelease"], {
       stdio: "inherit",
-      cwd: path34.join(this.app.cwdPath, this.androidRootPath),
+      cwd: path35.join(this.app.cwdPath, this.androidRootPath),
       env: this.#commandEnv("release", env)
     });
   }
@@ -7991,12 +8114,12 @@ class CapacitorApp {
     await this.#prepareAndroid({ operation: "release", env: "main" });
   }
   async prepareWww() {
-    const htmlSource = path34.join(this.app.dist.cwdPath, "csr", targetHtmlFilename(this.target));
+    const htmlSource = path35.join(this.app.dist.cwdPath, "csr", targetHtmlFilename(this.target));
     if (!await Bun.file(htmlSource).exists())
       throw new Error(`CSR html for mobile target '${this.target.name}' not found: ${htmlSource}`);
     await rm4(this.targetWebRoot, { recursive: true, force: true });
     await mkdir10(this.targetWebRoot, { recursive: true });
-    await Bun.write(path34.join(this.targetWebRoot, "index.html"), this.#injectMobileTargetMeta(await Bun.file(htmlSource).text()));
+    await Bun.write(path35.join(this.targetWebRoot, "index.html"), this.#injectMobileTargetMeta(await Bun.file(htmlSource).text()));
   }
   #injectMobileTargetMeta(html) {
     const basePath2 = this.target.basePath?.replace(/^\/+|\/+$/g, "") ?? "";
@@ -8008,9 +8131,9 @@ class CapacitorApp {
   }
   async#writeCapacitorConfig() {
     await mkdir10(this.targetRoot, { recursive: true });
-    const appInfoPath = path34.relative(this.app.cwdPath, path34.join(this.app.cwdPath, "akan.app.json")).split(path34.sep).join("/");
+    const appInfoPath = path35.relative(this.app.cwdPath, path35.join(this.app.cwdPath, "akan.app.json")).split(path35.sep).join("/");
     const content = `import type { AppScanResult } from "akanjs";
-import { withBase } from "@akanjs/devkit/capacitor.base.config";
+import { withBase } from "akanjs/capacitor.base.config";
 import appInfo from "${appInfoPath.startsWith(".") ? appInfoPath : `./${appInfoPath}`}";
 
 export default withBase(
@@ -8029,18 +8152,18 @@ export default withBase(
   appInfo as AppScanResult,
 );
 `;
-    await Bun.write(path34.join(this.app.cwdPath, "capacitor.config.ts"), content);
+    await Bun.write(path35.join(this.app.cwdPath, "capacitor.config.ts"), content);
   }
   async#prepareTargetAssets() {
     if (!this.target.assets)
       return;
     await mkdir10(this.targetAssetRoot, { recursive: true });
     if (this.target.assets.icon)
-      await cp2(path34.join(this.app.cwdPath, this.target.assets.icon), path34.join(this.targetAssetRoot, "icon.png"), {
+      await cp2(path35.join(this.app.cwdPath, this.target.assets.icon), path35.join(this.targetAssetRoot, "icon.png"), {
         force: true
       });
     if (this.target.assets.splash)
-      await cp2(path34.join(this.app.cwdPath, this.target.assets.splash), path34.join(this.targetAssetRoot, "splash.png"), {
+      await cp2(path35.join(this.app.cwdPath, this.target.assets.splash), path35.join(this.targetAssetRoot, "splash.png"), {
         force: true
       });
   }
@@ -8048,11 +8171,11 @@ export default withBase(
     const files = this.target.files?.[platform];
     if (!files)
       return;
-    const platformRoot = path34.join(this.app.cwdPath, platform === "ios" ? this.iosRootPath : this.androidRootPath);
+    const platformRoot = path35.join(this.app.cwdPath, platform === "ios" ? this.iosRootPath : this.androidRootPath);
     await Promise.all(Object.entries(files).map(async ([to, from]) => {
-      const targetPath = path34.join(platformRoot, to);
-      await mkdir10(path34.dirname(targetPath), { recursive: true });
-      await cp2(path34.join(this.app.cwdPath, from), targetPath, { force: true });
+      const targetPath = path35.join(platformRoot, to);
+      await mkdir10(path35.dirname(targetPath), { recursive: true });
+      await cp2(path35.join(this.app.cwdPath, from), targetPath, { force: true });
     }));
   }
   async#generateAssets({ operation, env }) {
@@ -8062,7 +8185,7 @@ export default withBase(
       "@capacitor/assets",
       "generate",
       "--assetPath",
-      path34.posix.join(this.targetRootPath, "assets"),
+      path35.posix.join(this.targetRootPath, "assets"),
       "--iosProject",
       this.iosProjectPath,
       "--androidProject",
@@ -8247,6 +8370,7 @@ var Pkg = createInternalArgToken("Pkg");
 var Module = createInternalArgToken("Module");
 var Workspace = createInternalArgToken("Workspace");
 // pkgs/@akanjs/devkit/commandDecorators/command.ts
+import path36 from "path";
 import { confirm, input as input2, select as select2 } from "@inquirer/prompts";
 import { Logger as Logger11 } from "akanjs/common";
 import chalk6 from "chalk";
@@ -8505,6 +8629,37 @@ var formatCommandHelp = (command, key) => {
 
 // pkgs/@akanjs/devkit/commandDecorators/command.ts
 var camelToKebabCase2 = (str) => str.replace(/([A-Z])/g, "-$1").toLowerCase();
+var loggedCliErrorObjects = new WeakSet;
+var loggedCliErrorMessages = new Set;
+var formatCliError = (error) => {
+  if (error instanceof Error)
+    return error.message || error.name;
+  if (typeof error === "string")
+    return error.trim() || "Unknown error";
+  if (error === null || error === undefined)
+    return "Unknown error";
+  try {
+    const json = JSON.stringify(error);
+    if (json)
+      return json;
+  } catch {
+    return String(error);
+  }
+  return String(error) || "Unknown error";
+};
+var printCliError = (error) => {
+  if (typeof error === "object" && error !== null) {
+    if (loggedCliErrorObjects.has(error))
+      return;
+    loggedCliErrorObjects.add(error);
+  }
+  const message = formatCliError(error);
+  if (loggedCliErrorMessages.has(message))
+    return;
+  loggedCliErrorMessages.add(message);
+  Logger11.rawLog(`
+${chalk6.red(message)}`);
+};
 var handleOption = (programCommand, argMeta) => {
   const {
     type,
@@ -8711,11 +8866,22 @@ var getInternalArgumentValue = async (argMeta, value, workspace) => {
 };
 var runCommands = async (...commands) => {
   process.on("unhandledRejection", (error) => {
+    printCliError(error);
     process.exit(1);
   });
   const __dirname2 = getDirname(import.meta.url);
-  const hasPackageJson = await FileSys.fileExists(`${__dirname2}/../package.json`);
-  process.env.AKAN_VERSION = hasPackageJson ? (await FileSys.readJson(`${__dirname2}/../package.json`)).version : "0.0.1";
+  const packageJsonCandidates = [`${path36.dirname(Bun.main)}/package.json`, `${__dirname2}/../package.json`];
+  let cliPackageJson = null;
+  for (const packageJsonPath of packageJsonCandidates) {
+    if (!await FileSys.fileExists(packageJsonPath))
+      continue;
+    const packageJson = await FileSys.readJson(packageJsonPath);
+    if (packageJson.name === "@akanjs/cli" || packageJson.name === "@akanjs/devkit") {
+      cliPackageJson = packageJson;
+      break;
+    }
+  }
+  process.env.AKAN_VERSION = cliPackageJson?.version ?? "0.0.1";
   const hasHelpFlag = process.argv.includes("--help") || process.argv.includes("-h");
   const hasCommand = process.argv.length > 2 && !process.argv[2]?.startsWith("-");
   if (hasHelpFlag || !hasCommand) {
@@ -8791,9 +8957,7 @@ It may cause unexpected behavior. Run \`akan update\` to update latest akanjs.`)
             await targetMeta.handler.call(cmd, ...commandArgs);
             Logger11.rawLog();
           } catch (e) {
-            const errMsg = e instanceof Error ? e.message : typeof e === "string" ? e : JSON.stringify(e);
-            Logger11.rawLog(`
-${chalk6.red(errMsg)}`);
+            printCliError(e);
             throw e;
           }
         });
@@ -8982,8 +9146,8 @@ var scanModuleSpecifiers = (source, filePath, includeExports) => {
   return importSpecifiers;
 };
 var parseTsConfig = (tsConfigPath = "./tsconfig.json") => {
-  const configFile = ts6.readConfigFile(tsConfigPath, (path35) => {
-    return ts6.sys.readFile(path35);
+  const configFile = ts6.readConfigFile(tsConfigPath, (path37) => {
+    return ts6.sys.readFile(path37);
   });
   return ts6.parseJsonConfigFileContent(configFile.config, ts6.sys, realpathSync(tsConfigPath).replace(/[^/\\]+$/, ""));
 };
@@ -9328,7 +9492,6 @@ class LibraryScript extends script("library", [LibraryRunner]) {
 }
 
 // pkgs/@akanjs/cli/application/application.runner.ts
-import path35 from "path";
 import { confirm as confirm2, input as input4, select as select5 } from "@inquirer/prompts";
 import { StringOutputParser } from "@langchain/core/output_parsers";
 import { PromptTemplate as PromptTemplate2 } from "@langchain/core/prompts";
@@ -9394,14 +9557,14 @@ class ApplicationRunner extends runner("application") {
   }
   async test(exec2) {
     const isSignalTarget = exec2 instanceof AppExecutor || exec2 instanceof LibExecutor;
-    const preloadPath = path35.join(exec2.cwdPath, "../../pkgs/akanjs/test/signalTest.preload.ts");
+    const preloadPath = isSignalTarget ? await resolveSignalTestPreloadPath(exec2) : null;
     const env = isSignalTarget ? {
       AKAN_TEST_SIGNAL: "1",
       AKAN_TEST_TARGET_TYPE: exec2.type,
       AKAN_TEST_TARGET_NAME: exec2.name,
       AKAN_TEST_LIBS: exec2.getScanInfo({ allowEmpty: true })?.getLibs().join(",") ?? ""
     } : {};
-    const args = isSignalTarget ? ["test", "--isolate", "--preload", preloadPath] : ["test", "--isolate"];
+    const args = preloadPath ? ["test", "--isolate", "--preload", preloadPath] : ["test", "--isolate"];
     await exec2.spawn("bun", args, {
       ...isSignalTarget ? { env: { ...process.env, ...env } } : {},
       stdio: "inherit"
@@ -9571,8 +9734,15 @@ class ApplicationRunner extends runner("application") {
           cwd: `${workspace.workspaceRoot}/local`
         });
       return wasAlreadyUp;
-    } catch {
-      throw new Error(`Docker daemon is not running. Please install docker or start docker daemon and try again.`);
+    } catch (error) {
+      const detail = error instanceof Error ? error.message : typeof error === "string" ? error : JSON.stringify(error) || "Unknown error";
+      throw new Error([
+        "Docker daemon may not be running. Please install Docker or start the Docker daemon and try again.",
+        `Original error:
+${detail}`
+      ].join(`
+
+`));
     }
   }
   async dbdown(workspace) {
@@ -9693,12 +9863,17 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     }
   }
   async test(exec2, { write = true } = {}) {
+    if (exec2 instanceof LibExecutor) {
+      await this.libraryScript.syncLibrary(exec2);
+      const spinner3 = exec2.spinning(`Preparing ${exec2.name}...`);
+      spinner3.succeed(`${exec2.name} prepared`);
+      await this.applicationRunner.test(exec2);
+      return;
+    }
     const spinner2 = exec2.spinning(`Preparing ${exec2.name}...`);
     try {
       if (exec2 instanceof PkgExecutor)
         await exec2.scan({ refresh: true });
-      else if (exec2 instanceof LibExecutor)
-        await this.libraryScript.syncLibrary(exec2);
       else
         await exec2.scanSync({ write });
       spinner2.succeed(`${exec2.name} prepared`);
@@ -9950,18 +10125,35 @@ class ApplicationCommand extends command("application", [ApplicationScript], ({
 import { Logger as Logger16 } from "akanjs/common";
 
 // pkgs/@akanjs/cli/package/package.runner.ts
-import path36 from "path";
+import path37 from "path";
 import { Logger as Logger14 } from "akanjs/common";
 var {$: $2 } = globalThis.Bun;
 
 class PackageRunner extends runner("package") {
   async version(workspace, { log = true } = {}) {
-    const pkgJson = await FileSys.readJson(process.env.USE_AKANJS_PKGS === "true" ? `${workspace?.workspaceRoot ?? process.cwd()}/pkgs/akanjs/package.json` : `${path36.dirname(Bun.main)}/../package.json`);
-    const version = pkgJson.version;
+    const pkgJson = process.env.USE_AKANJS_PKGS === "true" ? await FileSys.readJson(`${workspace?.workspaceRoot ?? process.cwd()}/pkgs/akanjs/package.json`) : await this.#getInstalledPackageJson();
+    const version = pkgJson.name === "akanjs" ? pkgJson.version : pkgJson.dependencies?.akanjs ?? pkgJson.version;
     if (log)
-      Logger14.rawLog(`${pkgJson.name}@${version}`);
+      Logger14.rawLog(`akanjs@${version}`);
     return version;
   }
+  async#getInstalledPackageJson() {
+    const packageJsonCandidates = [
+      `${path37.dirname(Bun.main)}/package.json`,
+      `${process.cwd()}/node_modules/akanjs/package.json`
+    ];
+    try {
+      packageJsonCandidates.unshift(Bun.resolveSync("akanjs/package.json", path37.dirname(Bun.main)));
+    } catch {}
+    for (const packageJsonPath of packageJsonCandidates) {
+      if (!await Bun.file(packageJsonPath).exists())
+        continue;
+      const packageJson = await FileSys.readJson(packageJsonPath);
+      if (packageJson.name === "akanjs" || packageJson.name === "@akanjs/cli")
+        return packageJson;
+    }
+    throw new Error(`[package] failed to locate akanjs package.json from ${path37.dirname(Bun.main)}`);
+  }
   async createPackage(workspace, pkgName) {
     await workspace.applyTemplate({ basePath: `pkgs/${pkgName}`, template: "pkgRoot", dict: { pkgName } });
     await workspace.setPkgTsPaths(pkgName);
@@ -9979,11 +10171,17 @@ class PackageRunner extends runner("package") {
     await pkg.dist.mkdir(pkg.dist.cwdPath);
     const scanner = await TypeScriptDependencyScanner.from(pkg);
     const { npmDeps, npmDevDeps, missingDeps } = await scanner.getPackageBuildDependencies(pkg.name);
-    const packageRuntimeDependencies = {};
+    const packageRuntimeDependencies = {
+      "@akanjs/devkit": ["daisyui", "tailwind-scrollbar"]
+    };
     const packageRuntimeDevDependencies = { akanjs: ["@biomejs/biome", "@types/bun"] };
     if (pkg.name === "@akanjs/cli") {
       const devkitPackageJson = await pkg.workspace.readJson("pkgs/@akanjs/devkit/package.json");
-      packageRuntimeDependencies[pkg.name] = Object.keys(devkitPackageJson.dependencies ?? {}).filter((dep) => dep !== "akanjs" && dep !== "@akanjs/devkit");
+      packageRuntimeDependencies[pkg.name] = [
+        ...Object.keys(devkitPackageJson.dependencies ?? {}),
+        "daisyui",
+        "tailwind-scrollbar"
+      ].filter((dep) => dep !== "akanjs" && dep !== "@akanjs/devkit");
     }
     const bundledRuntimeDeps = new Set(pkg.name === "@akanjs/cli" ? ["@akanjs/devkit"] : []);
     const forcedRuntimeDeps = packageRuntimeDependencies[pkg.name] ?? [];
@@ -10199,10 +10397,10 @@ ${chalk7.green("\u27A4")} Authentication Required`));
   }
   async update(workspace, tag = "latest") {
     if (!await workspace.exists("package.json"))
-      await workspace.spawn("npm", ["update", "-g", "akanjs", "--latest", `--tag=${tag}`]);
+      await workspace.spawn("bun", ["update", "-g", "akanjs", "--latest", `--tag=${tag}`]);
     else
       await Promise.all([
-        workspace.spawn("npm", ["update", "-g", "akanjs", "--latest", `--tag=${tag}`]),
+        workspace.spawn("bun", ["update", "-g", "akanjs", "--latest", `--tag=${tag}`]),
         this.#updateAkanPkgs(workspace, tag)
       ]);
   }
@@ -10215,6 +10413,10 @@ ${chalk7.green("\u27A4")} Authentication Required`));
       rootPackageJson.dependencies.akanjs = latestPublishedVersion;
     if (rootPackageJson.devDependencies?.akanjs)
       rootPackageJson.devDependencies.akanjs = latestPublishedVersion;
+    if (rootPackageJson.dependencies["@akanjs/devkit"])
+      rootPackageJson.dependencies["@akanjs/devkit"] = latestPublishedVersion;
+    if (rootPackageJson.devDependencies?.["@akanjs/devkit"])
+      rootPackageJson.devDependencies["@akanjs/devkit"] = latestPublishedVersion;
     workspace.setPackageJson(rootPackageJson);
     await workspace.spawn("bun", ["install"]);
   }
@@ -10290,6 +10492,7 @@ class CloudCommand extends command("cloud", [CloudScript], ({ public: target })
 
 // pkgs/@akanjs/cli/guideline/guideline.prompt.ts
 import { randomPicks } from "akanjs/common";
+
 class GuidelinePrompt extends Prompter {
   workspace;
   name;
@@ -10308,14 +10511,14 @@ class GuidelinePrompt extends Prompter {
   async#getScanFilePaths(matchPattern, { avoidDirs = ["node_modules", ".next"], filterText } = {}) {
     const glob = new Bun.Glob(matchPattern);
     const paths = [];
-    for await (const path37 of glob.scan({ cwd: this.workspace.workspaceRoot, absolute: true })) {
-      if (avoidDirs.some((dir) => path37.includes(dir)))
+    for await (const path38 of glob.scan({ cwd: this.workspace.workspaceRoot, absolute: true })) {
+      if (avoidDirs.some((dir) => path38.includes(dir)))
         continue;
-      const fileContent = await FileSys.readText(path37);
+      const fileContent = await FileSys.readText(path38);
       const textFilter = filterText ? new RegExp(filterText) : null;
       if (filterText && !textFilter?.test(fileContent))
         continue;
-      paths.push(path37);
+      paths.push(path38);
     }
     return paths;
   }
@@ -11391,7 +11594,7 @@ class ScalarScript extends script("scalar", [ScalarRunner]) {
 
 // pkgs/@akanjs/cli/scalar/scalar.command.ts
 class ScalarCommand extends command("scalar", [ScalarScript], ({ public: target }) => ({
-  createScalar: target({ desc: "Create a new scalar type (simple data model without DB)" }).arg("scalarName", String, { desc: "name of scalar" }).option("ai", Boolean, { default: false, desc: "use ai to create scalar" }).with(Sys).exec(async function(scalarName, ai, sys3) {
+  createScalar: target({ desc: "Create a new scalar type (simple data model without DB)" }).arg("scalarName", String, { desc: "name of scalar" }).with(Sys).option("ai", Boolean, { default: false, desc: "use ai to create scalar" }).exec(async function(scalarName, sys3, ai) {
     const name = lowerlize2(scalarName.replace(/ /g, ""));
     if (ai)
       await this.scalarScript.createScalarWithAi(sys3, name);
@@ -11405,17 +11608,25 @@ class ScalarCommand extends command("scalar", [ScalarScript], ({ public: target
 }
 
 // pkgs/@akanjs/cli/workspace/workspace.script.ts
-import path38 from "path";
+import path39 from "path";
 import { Logger as Logger17 } from "akanjs/common";
 
 // pkgs/@akanjs/cli/workspace/workspace.runner.ts
-import path37 from "path";
+import path38 from "path";
 var defaultWorkspacePeerDependencies = new Set([
+  "@radix-ui/react-dialog",
+  "@react-spring/web",
+  "@use-gesture/react",
+  "croner",
+  "daisyui",
   "react",
   "react-dom",
+  "react-icons",
   "react-refresh",
   "react-server-dom-webpack",
+  "react-spring",
   "scheduler",
+  "tailwind-scrollbar",
   "tailwindcss",
   "typescript"
 ]);
@@ -11423,10 +11634,13 @@ var defaultWorkspacePeerDependencies = new Set([
 class WorkspaceRunner extends runner("workspace") {
   async createWorkspace(repoName, appName, { dirname: dirname3 = ".", init = true, akanVersion }) {
     const cwdPath = process.cwd();
-    const workspaceRoot = path37.join(cwdPath, dirname3, repoName);
+    const workspaceRoot = path38.join(cwdPath, dirname3, repoName);
     const workspace = WorkspaceExecutor.fromRoot({ workspaceRoot, repoName });
     const templateSpinner = workspace.spinning(`Creating workspace template files in ${dirname3}/${repoName}...`);
-    const latestTypesBunVersion = await getLatestPackageVersion("@types/bun");
+    const [latestBiomeVersion, latestTypesBunVersion] = await Promise.all([
+      getLatestPackageVersion("@biomejs/biome"),
+      getLatestPackageVersion("@types/bun")
+    ]);
     await workspace.applyTemplate({
       basePath: ".",
       template: "workspaceRoot",
@@ -11437,16 +11651,20 @@ class WorkspaceRunner extends runner("workspace") {
       workspace.getPackageJson(),
       this.#getAkanPeerDependencies()
     ]);
+    const { typescript, ...dependencies } = peerDependencies;
     const packageJson = {
       ...rootPackageJson,
       dependencies: {
         ...rootPackageJson.dependencies,
-        ...peerDependencies,
+        ...dependencies,
         akanjs: akanVersion
       },
       devDependencies: {
         ...rootPackageJson.devDependencies,
-        "@types/bun": latestTypesBunVersion
+        "@biomejs/biome": latestBiomeVersion,
+        "@types/bun": latestTypesBunVersion,
+        "@akanjs/devkit": akanVersion,
+        ...typescript ? { typescript } : {}
       }
     };
     await workspace.setPackageJson(packageJson);
@@ -11468,9 +11686,9 @@ class WorkspaceRunner extends runner("workspace") {
   }
   async#getCliPackageJson() {
     const packageJsonCandidates = [
-      path37.join(import.meta.dir, "../package.json"),
-      path37.join(import.meta.dir, "package.json"),
-      path37.join(path37.dirname(Bun.main), "package.json")
+      path38.join(import.meta.dir, "../package.json"),
+      path38.join(import.meta.dir, "package.json"),
+      path38.join(path38.dirname(Bun.main), "package.json")
     ];
     try {
       packageJsonCandidates.unshift(Bun.resolveSync("@akanjs/cli/package.json", import.meta.dir));
@@ -11486,9 +11704,9 @@ class WorkspaceRunner extends runner("workspace") {
   }
   async#getAkanPackageJson() {
     const packageJsonCandidates = [
-      path37.join(import.meta.dir, "../../../akanjs/package.json"),
-      path37.join(process.cwd(), "pkgs/akanjs/package.json"),
-      path37.join(path37.dirname(Bun.main), "node_modules/akanjs/package.json")
+      path38.join(import.meta.dir, "../../../akanjs/package.json"),
+      path38.join(process.cwd(), "pkgs/akanjs/package.json"),
+      path38.join(path38.dirname(Bun.main), "node_modules/akanjs/package.json")
     ];
     try {
       packageJsonCandidates.unshift(Bun.resolveSync("akanjs/package.json", import.meta.dir));
@@ -11502,13 +11720,13 @@ class WorkspaceRunner extends runner("workspace") {
     }
     let current = import.meta.dir;
     for (let depth = 0;depth < 6; depth++) {
-      const packageJsonPath = path37.join(current, "package.json");
+      const packageJsonPath = path38.join(current, "package.json");
       if (await Bun.file(packageJsonPath).exists()) {
         const packageJson = await FileSys.readJson(packageJsonPath);
         if (packageJson.name === "akanjs")
           return packageJson;
       }
-      const parent = path37.dirname(current);
+      const parent = path38.dirname(current);
       if (parent === current)
         break;
       current = parent;
@@ -11551,7 +11769,7 @@ class WorkspaceScript extends script("workspace", [
     } catch (_) {
       gitSpinner.fail("Git repository initialization failed. It's not fatal, you can commit manually");
     }
-    const workspacePath = path38.join(dirname3, repoName);
+    const workspacePath = path39.join(dirname3, repoName);
     Logger17.rawLog(`
 \uD83C\uDF89 Welcome aboard! Workspace created in ${dirname3}/${repoName}`);
     Logger17.rawLog(`\uD83D\uDE80 Run \`cd ${workspacePath} && akan start ${appName}\` to start the development server.`);