@akanjs/cli 2.1.1-rc.2 → 2.1.2-rc.0

package/index.js

@@ -203,11 +203,13 @@ class HttpClient {
 class CloudApi {
   #api;
   #accessToken = null;
-  static async fromHost(host) {
+  #workspace;
+  static async fromHost(workspace, host) {
     const hostConfig = await GlobalConfig.getHostConfig(host);
-    return new CloudApi(hostConfig);
+    return new CloudApi(workspace, hostConfig);
   }
-  constructor(hostConfig) {
+  constructor(workspace, hostConfig) {
+    this.#workspace = workspace;
     const host = akanCloudHost;
     this.#api = new HttpClient(`${host}/api`);
     this.#accessToken = hostConfig.auth?.accessToken ?? null;
@@ -223,16 +225,17 @@ class CloudApi {
     const data = await this.#api.post(`/uploadEnv/${devProjectId}`, formData);
     return data;
   }
-  async downloadEnv(devProjectId, localPath) {
+  async downloadEnv(devProjectId) {
+    const localPath = `${this.#workspace.workspaceRoot}/local/env.tar`;
     await this.#api.getFile(`/downloadEnv/${devProjectId}`, localPath);
   }
   async getRemoteAuthToken(remoteId) {
     try {
       if (this.#accessToken) {
         if (GlobalConfig.needRefreshToken(this.#accessToken))
-          return await this.refreshAuthToken();
+          return await this.#refreshAuthToken();
         else
-          return await this.refreshAuthToken();
+          return await this.#refreshAuthToken();
       }
       const accessToken = await this.#api.get(`/getRemoteAuthToken/${remoteId}`);
       this.#accessToken = GlobalConfig.toAccessToken(accessToken);
@@ -244,10 +247,14 @@ class CloudApi {
       return null;
     }
   }
-  async refreshAuthToken() {
-    const response = await this.#api.post(`/refreshRemoteAuthToken`, {
-      refreshToken: this.#accessToken?.refreshToken
-    });
+  async#refreshAuthToken() {
+    const refreshToken = this.#accessToken?.refreshToken;
+    if (!refreshToken)
+      throw new Error("No refresh token");
+    return await this.refreshAuthToken(refreshToken);
+  }
+  async refreshAuthToken(refreshToken) {
+    const response = await this.#api.post(`/refreshRemoteAuthToken`, { refreshToken });
     this.#accessToken = GlobalConfig.toAccessToken(response);
     this.#api.setHeaders({ Authorization: `Bearer ${this.#accessToken.jwt}` });
     return this.#accessToken;
@@ -327,6 +334,31 @@ var supportedLlmModels = [
   "deepseek-chat",
   "deepseek-reasoner"
 ];
+var parseTypescriptFileBlocks = (text) => {
+  const fileBlocks = [];
+  const codeBlockRegex = /```(?:typescript|ts|tsx)\s*\n([\s\S]*?)```/gi;
+  const filePathRegex = /^\s*\/\/\s*File:\s*(.+?)\s*$/im;
+  for (const codeBlock of text.matchAll(codeBlockRegex)) {
+    const content = codeBlock[1]?.trim();
+    if (!content)
+      continue;
+    const filePath = filePathRegex.exec(content)?.[1]?.trim();
+    if (!filePath)
+      continue;
+    fileBlocks.push({
+      filePath,
+      content: content.replace(filePathRegex, "").trim()
+    });
+  }
+  return fileBlocks;
+};
+var preserveTypescriptResponseContent = (previousContent, nextContent) => {
+  const previousWrites = parseTypescriptFileBlocks(previousContent);
+  const nextWrites = parseTypescriptFileBlocks(nextContent);
+  if (previousWrites.length > 0 && nextWrites.length === 0)
+    return previousContent;
+  return nextContent;
+};
 
 class AiSession {
   static #cacheDir = "node_modules/.cache/akan/aiSession";
@@ -446,7 +478,7 @@ class AiSession {
       const humanMessage = new HumanMessage(question);
       this.messageHistory.push(humanMessage);
       const stream = await AiSession.#chat.stream(this.messageHistory);
-      let reasoningResponse = "", fullResponse = "", tokenIdx = 0;
+      let reasoningResponse = "", fullResponse = "";
       for await (const chunk of stream) {
         if (loader.isSpinning())
           loader.succeed(`${AiSession.#chat.model} responded`);
@@ -467,7 +499,6 @@ class AiSession {
           fullResponse += content;
           onChunk(content);
         }
-        tokenIdx++;
       }
       fullResponse += `
 `;
@@ -475,7 +506,7 @@ class AiSession {
 `);
       this.messageHistory.push(new AIMessage(fullResponse));
       return { content: fullResponse, messageHistory: this.messageHistory };
-    } catch (error) {
+    } catch {
       loader.fail(`${AiSession.#chat.model} failed to respond`);
       throw new Error("Failed to stream response");
     }
@@ -485,7 +516,8 @@ class AiSession {
     onReasoning,
     maxTry = MAX_ASK_TRY,
     validate,
-    approve
+    approve,
+    fallbackToPreviousTypescript
   } = {}) {
     for (let tryCount = 0;tryCount < maxTry; tryCount++) {
       let response = await this.ask(question, { onChunk, onReasoning });
@@ -493,7 +525,14 @@ class AiSession {
         const validateQuestion = `Double check if the response meets the requirements and conditions, and follow the instructions. If not, rewrite it.
 ${validate.map((v) => `- ${v}`).join(`
 `)}`;
-        response = await this.ask(validateQuestion, { onChunk, onReasoning });
+        const validateResponse = await this.ask(validateQuestion, {
+          onChunk,
+          onReasoning
+        });
+        response = {
+          ...validateResponse,
+          content: fallbackToPreviousTypescript ? preserveTypescriptResponseContent(response.content, validateResponse.content) : validateResponse.content
+        };
       }
       const isConfirmed = approve ? true : await select({
         message: "Do you want to edit the response?",
@@ -526,15 +565,28 @@ ${validate.map((v) => `- ${v}`).join(`
     return this;
   }
   async writeTypescripts(question, executor, options = {}) {
-    const content = await this.edit(question, options);
+    const content = await this.edit(question, {
+      ...options,
+      fallbackToPreviousTypescript: true
+    });
     const writes = this.#getTypescriptCodes(content);
+    if (!writes.length)
+      throw new Error("No parseable TypeScript file blocks were found in the AI response. Include `// File: <path>` in each code block.");
     for (const write of writes)
       await executor.writeFile(write.filePath, write.content);
     return await this.#tryFixTypescripts(writes, executor, options);
   }
-  async#editTypescripts(question, options = {}) {
-    const content = await this.edit(question, options);
-    return this.#getTypescriptCodes(content);
+  async#editTypescripts(question, options = {}, fallbackWrites) {
+    const content = await this.edit(question, {
+      ...options,
+      fallbackToPreviousTypescript: true
+    });
+    const writes = this.#getTypescriptCodes(content);
+    if (!writes.length && fallbackWrites?.length)
+      return fallbackWrites;
+    if (!writes.length)
+      throw new Error("No parseable TypeScript file blocks were found in the AI response. Include `// File: <path>` in each code block.");
+    return writes;
   }
   async#tryFixTypescripts(writes, executor, options = {}) {
     const MAX_EDIT_TRY = 5;
@@ -543,13 +595,15 @@ ${validate.map((v) => `- ${v}`).join(`
         prefix: `\uD83E\uDD16akan-editor`
       }).start();
       const fileChecks = await Promise.all(writes.map(async ({ filePath }) => {
-        const typeCheckResult = executor.typeCheck(filePath);
-        const lintResult = await executor.lint(filePath);
-        const needFix2 = !!typeCheckResult.fileErrors.length || !!lintResult.errors.length;
-        return { filePath, typeCheckResult, lintResult, needFix: needFix2 };
+        const lintResult = await executor.lint(filePath, { fix: true });
+        const typeCheckResult = await executor.typeCheckAsync(filePath);
+        const hasTypeErrors = typeCheckResult.fileErrors.length > 0;
+        const hasLintErrors = lintResult.errors.length > 0;
+        const needFix = hasTypeErrors || hasLintErrors;
+        return { filePath, typeCheckResult, lintResult, needFix };
       }));
-      const needFix = fileChecks.some((fileCheck) => fileCheck.needFix);
-      if (needFix) {
+      const hasAnyFix = fileChecks.some((fileCheck) => fileCheck.needFix);
+      if (hasAnyFix) {
         loader.fail("Type checking and linting has some errors, try to fix them");
         fileChecks.forEach((fileCheck) => {
           Logger2.rawLog(`TypeCheck Result 
@@ -565,7 +619,7 @@ ${fileCheck.lintResult.message}`);
           ...options,
           validate: undefined,
           approve: true
-        });
+        }, writes);
         for (const write of writes)
           await executor.writeFile(write.filePath, write.content);
       } else {
@@ -576,21 +630,7 @@ ${fileCheck.lintResult.message}`);
     throw new Error("Failed to create scalar");
   }
   #getTypescriptCodes(text) {
-    const codes = text.match(/```(typescript|tsx)([\s\S]*?)```/g);
-    if (!codes)
-      return [];
-    const result = codes.map((code) => {
-      const content = /```(typescript|tsx)([\s\S]*?)```/.exec(code)?.[2];
-      if (!content)
-        return null;
-      const filePath = /\/\/ File: (.*?)(?:\n|$)/.exec(content)?.[1]?.trim();
-      if (!filePath)
-        return null;
-      const contentWithoutFilepath = content.replace(`// File: ${filePath}
-`, "").trim();
-      return { filePath, content: contentWithoutFilepath };
-    });
-    return result.filter((code) => code !== null);
+    return parseTypescriptFileBlocks(text);
   }
   async editMarkdown(request, options = {}) {
     const content = await this.edit(request, options);
@@ -608,13 +648,13 @@ ${fileCheck.lintResult.message}`);
 }
 // pkgs/@akanjs/devkit/akanApp/akanApp.host.ts
 import path9 from "path";
-import { Logger as Logger6 } from "akanjs/common";
+import { Logger as Logger5 } from "akanjs/common";
 
 // pkgs/@akanjs/devkit/executors.ts
 import {
   exec,
   fork,
-  spawn
+  spawn as spawn2
 } from "child_process";
 import { readFileSync as readFileSync3 } from "fs";
 import { copyFile, mkdir as mkdir2, readdir as readDirEntries, stat as stat2 } from "fs/promises";
@@ -622,7 +662,7 @@ import path7 from "path";
 import {
   capitalize,
   isRouteSourceFile,
-  Logger as Logger4,
+  Logger as Logger3,
   parseRouteModuleKey,
   validatePageSourceFile,
   validateSubRoutePageKey
@@ -669,8 +709,18 @@ var DEFAULT_OPTIMIZE_IMPORTS = [
   "mui-core",
   "react-icons/*"
 ];
-var WORKSPACE_BARREL_FACETS = ["ui", "webkit", "common", "client", "server"];
-var SSR_RUNTIME_PACKAGES = ["react", "react-dom", "react-server-dom-webpack"];
+var WORKSPACE_BARREL_FACETS = [
+  "ui",
+  "webkit",
+  "common",
+  "client",
+  "server"
+];
+var SSR_RUNTIME_PACKAGES = [
+  "react",
+  "react-dom",
+  "react-server-dom-webpack"
+];
 var NATIVE_RUNTIME_PACKAGES = ["sharp"];
 var DEFAULT_BACKEND_RUNTIME_PACKAGES = ["croner"];
 var DATABASE_MODE_RUNTIME_PACKAGES = {
@@ -730,7 +780,12 @@ class AkanAppConfig {
       ...libs.flatMap((lib) => WORKSPACE_BARREL_FACETS.map((facet) => `@libs/${lib}/${facet}`)),
       ...config?.barrelImports ?? []
     ];
-    this.optimizeImports = [...new Set([...DEFAULT_OPTIMIZE_IMPORTS, ...config?.optimizeImports ?? []])];
+    this.optimizeImports = [
+      ...new Set([
+        ...DEFAULT_OPTIMIZE_IMPORTS,
+        ...config?.optimizeImports ?? []
+      ])
+    ];
     this.images = mergeImageConfig(config?.images);
     this.i18n = resolveAkanI18nConfig(config?.i18n);
     process.env.AKAN_PUBLIC_DEFAULT_LOCALE = this.i18n.defaultLocale;
@@ -841,7 +896,13 @@ class AkanAppConfig {
   }
   #makeDockerContent(docker) {
     if (docker.content)
-      return { content: docker.content, image: {}, preRuns: [], postRuns: [], command: [] };
+      return {
+        content: docker.content,
+        image: {},
+        preRuns: [],
+        postRuns: [],
+        command: []
+      };
     const preRunScripts = this.#getDockerRunScripts(docker.preRuns ?? []);
     const postRunScripts = this.#getDockerRunScripts(docker.postRuns ?? []);
     const imageScript = docker.image ? this.#getDockerImageScript(docker.image, "oven/bun:1-slim") : "FROM oven/bun:1-slim";
@@ -872,7 +933,13 @@ ENV AKAN_PUBLIC_LOCALES=${this.i18n.locales.join(",")}
 ENV AKAN_PUBLIC_OPERATION_MODE=cloud
 
 CMD [${command.map((c) => `"${c}"`).join(",")}]`;
-    return { content, image: imageScript, preRuns: docker.preRuns ?? [], postRuns: docker.postRuns ?? [], command };
+    return {
+      content,
+      image: imageScript,
+      preRuns: docker.preRuns ?? [],
+      postRuns: docker.postRuns ?? [],
+      command
+    };
   }
   static async from(app) {
     const [configImp, baseDevEnv, libs, rootPackageJson] = await Promise.all([
@@ -898,9 +965,24 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
       ...SSR_RUNTIME_PACKAGES,
       ...NATIVE_RUNTIME_PACKAGES,
       ...DEFAULT_BACKEND_RUNTIME_PACKAGES,
-      ...DATABASE_MODE_RUNTIME_PACKAGES[this.defaultDatabaseMode]
+      ...this.getDatabaseModeRuntimePackages()
     ];
   }
+  getDatabaseModeRuntimePackages(databaseMode = this.defaultDatabaseMode) {
+    return [...DATABASE_MODE_RUNTIME_PACKAGES[databaseMode]];
+  }
+  getMissingDatabaseModeDependencySpecs(databaseMode = this.defaultDatabaseMode) {
+    const rootDependencies = {
+      ...this.rootPackageJson.dependencies,
+      ...this.rootPackageJson.devDependencies
+    };
+    return this.getDatabaseModeRuntimePackages(databaseMode).filter((lib) => !rootDependencies[lib]).map((lib) => {
+      const version = this.#resolveProductionDependencyVersion(lib);
+      if (!version)
+        throw new Error(`Dependency ${lib} not found in package.json`);
+      return `${lib}@${version}`;
+    });
+  }
   getProductionPackageJson(data = {}) {
     return {
       name: this.app.name,
@@ -936,7 +1018,12 @@ function getAkanPackageJson() {
       return akanPackageJson;
     } catch {}
   }
-  akanPackageJson = { name: "akanjs", version: "0.0.0", description: "akanjs", dependencies: {} };
+  akanPackageJson = {
+    name: "akanjs",
+    version: "0.0.0",
+    description: "akanjs",
+    dependencies: {}
+  };
   return akanPackageJson;
 }
 function mergeImageConfig(config = {}) {
@@ -960,7 +1047,9 @@ class AkanLibConfig {
     this.externalLibs = config?.externalLibs ?? [];
   }
   static async from(lib) {
-    const [configImp] = await Promise.all([import(`${lib.cwdPath}/akan.config.ts`).then((mod) => mod.default)]);
+    const [configImp] = await Promise.all([
+      import(`${lib.cwdPath}/akan.config.ts`).then((mod) => mod.default)
+    ]);
     const config = typeof configImp === "function" ? configImp(lib) : configImp;
     return new AkanLibConfig(lib, config);
   }
@@ -985,23 +1074,146 @@ import path2 from "path";
 var getDirname = (url) => path2.dirname(new URL(url).pathname);
 
 // pkgs/@akanjs/devkit/linter.ts
+import { spawn } from "child_process";
 import { existsSync, readFileSync } from "fs";
-import * as path3 from "path";
-import { Logger as Logger3 } from "akanjs/common";
+import path3 from "path";
 import chalk2 from "chalk";
 
 class Linter {
-  #logger = new Logger3("Linter");
   lintRoot;
+  #biomeBin;
   constructor(cwdPath) {
-    this.lintRoot = this.#findEslintRootPath(cwdPath);
+    this.lintRoot = this.#findBiomeRootPath(cwdPath);
+    const localBiomeBin = path3.join(this.lintRoot, "node_modules/.bin/biome");
+    this.#biomeBin = existsSync(localBiomeBin) ? localBiomeBin : "biome";
   }
-  #findEslintRootPath(dir) {
-    const configPath2 = path3.join(dir, "eslint.config.ts");
+  #findBiomeRootPath(dir) {
+    const configPath2 = path3.join(dir, "biome.json");
     if (existsSync(configPath2))
       return dir;
     const parentDir = path3.dirname(dir);
-    return this.#findEslintRootPath(parentDir);
+    if (parentDir === dir)
+      throw new Error(`biome.json not found from ${dir}`);
+    return this.#findBiomeRootPath(parentDir);
+  }
+  #toBiomePath(filePath) {
+    const relativePath = path3.relative(this.lintRoot, filePath);
+    if (!relativePath.startsWith("..") && !path3.isAbsolute(relativePath))
+      return relativePath;
+    return filePath;
+  }
+  #resolveFilePath(filePath) {
+    return path3.isAbsolute(filePath) ? filePath : path3.join(this.lintRoot, filePath);
+  }
+  async#runBiome(args, input2) {
+    return await new Promise((resolve, reject) => {
+      const proc = spawn(this.#biomeBin, args, {
+        cwd: this.lintRoot,
+        stdio: ["pipe", "pipe", "pipe"]
+      });
+      let stdout = "";
+      let stderr = "";
+      proc.stdout.on("data", (data) => {
+        stdout += data.toString();
+      });
+      proc.stderr.on("data", (data) => {
+        stderr += data.toString();
+      });
+      proc.on("error", reject);
+      proc.on("close", (code) => resolve({ stdout, stderr, code }));
+      proc.stdin.end(input2);
+    });
+  }
+  #parseBiomeReport(output) {
+    const jsonStart = output.indexOf("{");
+    const jsonEnd = output.lastIndexOf("}");
+    if (jsonStart === -1 || jsonEnd === -1 || jsonEnd < jsonStart)
+      throw new Error(output.trim() || "No Biome JSON output");
+    return JSON.parse(output.slice(jsonStart, jsonEnd + 1));
+  }
+  #diagnosticFilePath(diagnostic, fallbackFilePath) {
+    const diagnosticPath = diagnostic.location?.path;
+    if (!diagnosticPath)
+      return fallbackFilePath;
+    return path3.isAbsolute(diagnosticPath) ? diagnosticPath : path3.join(this.lintRoot, diagnosticPath);
+  }
+  #createLintMessage(diagnostic) {
+    const start = diagnostic.location?.start;
+    const end = diagnostic.location?.end;
+    return {
+      line: Math.max(1, start?.line ?? 1),
+      column: Math.max(1, start?.column ?? 1),
+      endLine: end?.line,
+      endColumn: end?.column,
+      message: diagnostic.message,
+      ruleId: diagnostic.category ?? null,
+      severity: diagnostic.severity === "error" ? 2 : 1
+    };
+  }
+  #toLintResults(report, filePath) {
+    const resultsByPath = new Map;
+    for (const diagnostic of report.diagnostics ?? []) {
+      if (diagnostic.severity !== "error" && diagnostic.severity !== "warning")
+        continue;
+      const diagnosticFilePath = this.#diagnosticFilePath(diagnostic, filePath);
+      const result = resultsByPath.get(diagnosticFilePath) ?? {
+        filePath: diagnosticFilePath,
+        messages: [],
+        errorCount: 0,
+        warningCount: 0,
+        fixableErrorCount: 0,
+        fixableWarningCount: 0
+      };
+      const message = this.#createLintMessage(diagnostic);
+      result.messages.push(message);
+      if (message.severity === 2)
+        result.errorCount += 1;
+      else
+        result.warningCount += 1;
+      resultsByPath.set(diagnosticFilePath, result);
+    }
+    return [
+      resultsByPath.get(filePath) ?? {
+        filePath,
+        messages: [],
+        errorCount: 0,
+        warningCount: 0,
+        fixableErrorCount: 0,
+        fixableWarningCount: 0
+      },
+      ...[...resultsByPath.entries()].filter(([resultPath]) => resultPath !== filePath).map(([, result]) => result)
+    ];
+  }
+  #splitMessages(results) {
+    const messages = results.flatMap((result) => result.messages);
+    return {
+      errors: messages.filter((message) => message.severity === 2),
+      warnings: messages.filter((message) => message.severity === 1)
+    };
+  }
+  async#checkFile(filePath, { write = false } = {}) {
+    const originalContent = existsSync(filePath) ? readFileSync(filePath, "utf8") : "";
+    const { stdout, stderr } = await this.#runBiome([
+      "check",
+      ...write ? ["--write"] : [],
+      "--reporter=json",
+      "--max-diagnostics=none",
+      "--no-errors-on-unmatched",
+      "--config-path",
+      path3.join(this.lintRoot, "biome.json"),
+      this.#toBiomePath(filePath)
+    ]);
+    const report = this.#parseBiomeReport(stdout || stderr);
+    const results = this.#toLintResults(report, filePath);
+    const { errors, warnings } = this.#splitMessages(results);
+    const output = write && existsSync(filePath) ? readFileSync(filePath, "utf8") : undefined;
+    return {
+      fixed: write && output !== originalContent,
+      output,
+      results,
+      errors,
+      warnings
+    };
   }
   async lint(filePath, { fix = false, dryRun = false } = {}) {
     if (fix)
@@ -1009,9 +1221,10 @@ class Linter {
     return await this.lintFile(filePath);
   }
   async lintFile(filePath) {
-    if (!existsSync(filePath))
+    const resolvedFilePath = this.#resolveFilePath(filePath);
+    if (!existsSync(resolvedFilePath))
       throw new Error(`File not found: ${filePath}`);
-    return { fixed: false, results: [], errors: [], warnings: [] };
+    return await this.#checkFile(resolvedFilePath);
   }
   formatLintResults(results) {
     if (results.length === 0)
@@ -1031,12 +1244,12 @@ ${chalk2.cyan(result.filePath)}`);
             const sourceContent = readFileSync(result.filePath, "utf8");
             sourceLines = sourceContent.split(`
 `);
-          } catch (error) {}
+          } catch {}
         }
         result.messages.forEach((message) => {
           const type = message.severity === 2 ? "error" : "warning";
           const typeColor = message.severity === 2 ? chalk2.red : chalk2.yellow;
-          const icon = message.severity === 2 ? "\u274C" : "\u26A0\uFE0F";
+          const icon = message.severity === 2 ? "x" : "!";
           const ruleInfo = message.ruleId ? chalk2.dim(` (${message.ruleId})`) : "";
           output.push(`
   ${icon} ${typeColor(type)}: ${message.message}${ruleInfo}`);
@@ -1055,7 +1268,7 @@ ${chalk2.dim(`${lineNumber} |`)} ${sourceLine}`);
       }
     });
     if (totalErrors === 0 && totalWarnings === 0)
-      return chalk2.bold("\u2705 No ESLint errors or warnings found");
+      return chalk2.bold("No Biome errors or warnings found");
     const errorText = totalErrors > 0 ? chalk2.red(`${totalErrors} error(s)`) : "0 errors";
     const warningText = totalWarnings > 0 ? chalk2.yellow(`${totalWarnings} warning(s)`) : "0 warnings";
     const summary = [`
@@ -1070,23 +1283,26 @@ ${errorText}, ${warningText} found`];
       column: message.column,
       message: message.message,
       ruleId: message.ruleId,
-      severity: message.severity === 2 ? "error" : "warning",
-      fix: message.fix,
-      suggestions: message.suggestions
+      severity: message.severity === 2 ? "error" : "warning"
     })));
     const stats = results.reduce((acc, result) => ({
       errorCount: acc.errorCount + result.errorCount,
       warningCount: acc.warningCount + result.warningCount,
       fixableErrorCount: acc.fixableErrorCount + result.fixableErrorCount,
       fixableWarningCount: acc.fixableWarningCount + result.fixableWarningCount
-    }), { errorCount: 0, warningCount: 0, fixableErrorCount: 0, fixableWarningCount: 0 });
+    }), {
+      errorCount: 0,
+      warningCount: 0,
+      fixableErrorCount: 0,
+      fixableWarningCount: 0
+    });
     return { results, details, stats };
   }
   async hasNoLintErrors(filePath) {
     try {
       const { results } = await this.lintFile(filePath);
       return results.every((result) => result.errorCount === 0);
-    } catch (error) {
+    } catch {
       return false;
     }
   }
@@ -1099,12 +1315,28 @@ ${errorText}, ${warningText} found`];
     return results.flatMap((result) => result.messages.filter((message) => message.severity === 1));
   }
   async fixFile(filePath, dryRun = false) {
-    if (!existsSync(filePath))
+    const resolvedFilePath = this.#resolveFilePath(filePath);
+    if (!existsSync(resolvedFilePath))
       throw new Error(`File not found: ${filePath}`);
-    return { fixed: false, output: undefined, results: [], errors: [], warnings: [] };
+    if (!dryRun)
+      return await this.#checkFile(resolvedFilePath, { write: true });
+    const source = readFileSync(resolvedFilePath, "utf8");
+    const { stdout } = await this.#runBiome([
+      "check",
+      "--write",
+      "--config-path",
+      path3.join(this.lintRoot, "biome.json"),
+      "--stdin-file-path",
+      this.#toBiomePath(resolvedFilePath)
+    ], source);
+    const lintResult = await this.lintFile(resolvedFilePath);
+    return { ...lintResult, fixed: stdout !== source, output: stdout };
   }
   async getConfigForFile(filePath) {
-    return {};
+    const resolvedFilePath = this.#resolveFilePath(filePath);
+    if (!existsSync(resolvedFilePath))
+      throw new Error(`File not found: ${filePath}`);
+    return JSON.parse(readFileSync(path3.join(this.lintRoot, "biome.json"), "utf8"));
   }
   async getProblematicRules(filePath) {
     const { results } = await this.lintFile(filePath);
@@ -1494,23 +1726,23 @@ async function assertScanConvention(exec, libRoot) {
     files.filter((filename) => !appRootAllowedFiles.has(filename)).forEach((filename) => {
       addViolation(filename, "unsupported app root file");
     });
-    dirs.filter((dirname2) => !appRootAllowedDirs.has(dirname2)).forEach((dirname2) => {
-      addViolation(dirname2, "unsupported app root folder");
+    dirs.filter((dirname) => !appRootAllowedDirs.has(dirname)).forEach((dirname) => {
+      addViolation(dirname, "unsupported app root folder");
     });
   }
   libRoot.files.filter((filename) => !isAllowedLibRootFile(filename)).forEach((filename) => {
     addViolation(path5.join("lib", filename), "unsupported lib root file");
   });
-  libRoot.dirs.filter((dirname2) => dirname2.startsWith("__") && !internalLibDirs.has(dirname2)).forEach((dirname2) => {
-    addViolation(path5.join("lib", dirname2), "unsupported internal lib folder");
+  libRoot.dirs.filter((dirname) => dirname.startsWith("__") && !internalLibDirs.has(dirname)).forEach((dirname) => {
+    addViolation(path5.join("lib", dirname), "unsupported internal lib folder");
   });
-  const databaseDirs = libRoot.dirs.filter((dirname2) => !dirname2.startsWith("_"));
-  const serviceDirs = libRoot.dirs.filter((dirname2) => dirname2.startsWith("_") && !dirname2.startsWith("__"));
+  const databaseDirs = libRoot.dirs.filter((dirname) => !dirname.startsWith("_"));
+  const serviceDirs = libRoot.dirs.filter((dirname) => dirname.startsWith("_") && !dirname.startsWith("__"));
   const scalarDirs = await exec.readdir("lib/__scalar");
   await Promise.all([
-    ...databaseDirs.map((dirname2) => validateModuleFiles(exec, violations, "database", path5.join("lib", dirname2))),
-    ...serviceDirs.map((dirname2) => validateModuleFiles(exec, violations, "service", path5.join("lib", dirname2))),
-    ...scalarDirs.map((dirname2) => validateModuleFiles(exec, violations, "scalar", path5.join("lib/__scalar", dirname2)))
+    ...databaseDirs.map((dirname) => validateModuleFiles(exec, violations, "database", path5.join("lib", dirname))),
+    ...serviceDirs.map((dirname) => validateModuleFiles(exec, violations, "service", path5.join("lib", dirname))),
+    ...scalarDirs.map((dirname) => validateModuleFiles(exec, violations, "scalar", path5.join("lib/__scalar", dirname)))
   ]);
   if (violations.length > 0) {
     throw new Error(`[scan-convention]
@@ -1520,8 +1752,8 @@ ${violations.sort().map((violation) => `- ${violation}`).join(`
 }
 async function validateModuleFiles(exec, violations, kind, modulePath) {
   const { files, dirs } = await exec.getFilesAndDirs(modulePath);
-  dirs.forEach((dirname2) => {
-    violations.push(`${getScanPath(exec, path5.join(modulePath, dirname2))}: unsupported module folder`);
+  dirs.forEach((dirname) => {
+    violations.push(`${getScanPath(exec, path5.join(modulePath, dirname))}: unsupported module folder`);
   });
   files.forEach((filename) => {
     const filePath = path5.join(modulePath, filename);
@@ -1620,9 +1852,9 @@ class ScanInfo {
             files.zone.databases.push(name);
         });
       }),
-      ...serviceDirs.map(async (dirname2) => {
-        const name = dirname2.slice(1);
-        const filenames = await exec.readdir(path5.join("lib", dirname2));
+      ...serviceDirs.map(async (dirname) => {
+        const name = dirname.slice(1);
+        const filenames = await exec.readdir(path5.join("lib", dirname));
         filenames.forEach((filename) => {
           if (filename.endsWith(".dictionary.ts"))
             files.dictionary.services.push(name);
@@ -2252,9 +2484,11 @@ var ROOT_LAYOUT_EXPORTS = new Set([
   "reconnect",
   "layoutStyle",
   "gaTrackingId",
-  "Loading"
+  "Loading",
+  "NotFound",
+  "Error"
 ]);
-var LAYOUT_ROUTE_EXPORTS = new Set(["default", "head", "generateHead", "Loading"]);
+var LAYOUT_ROUTE_EXPORTS = new Set(["default", "head", "generateHead", "Loading", "NotFound", "Error"]);
 function validateRouteSourceExports(source, filePath, kind, options = {}) {
   const sourceFile = ts3.createSourceFile(filePath, source, ts3.ScriptTarget.Latest, true, ts3.ScriptKind.TSX);
   const allowed = kind === "page" ? PAGE_ROUTE_EXPORTS : options.rootLayout ? ROOT_LAYOUT_EXPORTS : LAYOUT_ROUTE_EXPORTS;
@@ -2323,16 +2557,16 @@ class Executor {
   linter = null;
   constructor(name, cwdPath) {
     this.name = name;
-    this.logger = new Logger4(name);
+    this.logger = new Logger3(name);
     this.logs = [];
     this.cwdPath = cwdPath;
   }
   #stdout(data) {
     if (Executor.verbose)
-      Logger4.raw(chalk4.dim(data.toString()));
+      Logger3.raw(chalk4.dim(data.toString()));
   }
   #stderr(data) {
-    Logger4.raw(chalk4.red(data.toString()));
+    Logger3.raw(chalk4.red(data.toString()));
   }
   exec(command, options = {}) {
     const cwd = options.cwd?.toString() ?? this.cwdPath;
@@ -2376,7 +2610,7 @@ class Executor {
   }
   spawn(command, args = [], options = {}) {
     const cwd = options.cwd?.toString() ?? this.cwdPath;
-    const proc = spawn(command, args, {
+    const proc = spawn2(command, args, {
       cwd: this.cwdPath,
       ...options
     });
@@ -2422,7 +2656,7 @@ class Executor {
     });
   }
   spawnSync(command, args = [], options = {}) {
-    const proc = spawn(command, args, {
+    const proc = spawn2(command, args, {
       cwd: this.cwdPath,
       ...options
     });
@@ -2554,7 +2788,7 @@ class Executor {
         contentStr = currentContent;
       } else {
         await FileSys.writeText(writePath, contentStr);
-        if (Logger4.isVerbose())
+        if (Logger3.isVerbose())
           this.logger.rawLog(chalk4.yellow(`File Update: ${filePath}`));
       }
     } else {
@@ -2663,8 +2897,8 @@ class Executor {
         return null;
       const filename = typeof result === "object" ? result.filename : path7.basename(targetPath).replace(".js", ".ts");
       const content = typeof result === "object" ? result.content : result;
-      const dirname3 = path7.dirname(targetPath);
-      const convertedTargetPath = Object.entries(dict).reduce((path8, [key, value]) => path8.replace(new RegExp(`__${key}__`, "g"), value), `${dirname3}/${filename}`);
+      const dirname2 = path7.dirname(targetPath);
+      const convertedTargetPath = Object.entries(dict).reduce((path8, [key, value]) => path8.replace(new RegExp(`__${key}__`, "g"), value), `${dirname2}/${filename}`);
       this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
       return this.writeFile(convertedTargetPath, content, { overwrite });
     } else if (targetPath.endsWith(".template")) {
@@ -2678,9 +2912,9 @@ class Executor {
     } else if (staticTemplateFileExtensions.has(path7.extname(targetPath).toLowerCase())) {
       const convertedTargetPath = Object.entries(dict).reduce((path8, [key, value]) => path8.replace(new RegExp(`__${key}__`, "g"), value), targetPath);
       const writePath = this.getPath(convertedTargetPath);
-      const dirname3 = path7.dirname(writePath);
-      if (!await FileSys.dirExists(dirname3))
-        await mkdir2(dirname3, { recursive: true });
+      const dirname2 = path7.dirname(writePath);
+      if (!await FileSys.dirExists(dirname2))
+        await mkdir2(dirname2, { recursive: true });
       await copyFile(templatePath, writePath);
       this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
       return { filePath: writePath, content: "" };
@@ -2761,6 +2995,48 @@ class Executor {
     const message = typeChecker.formatDiagnostics(fileDiagnostics);
     return { fileDiagnostics, fileErrors, fileWarnings, message };
   }
+  async typeCheckAsync(filePath) {
+    const path8 = this.getPath(filePath);
+    const entry = await this.#resolveTypecheckWorkerEntry();
+    const proc = Bun.spawn([process.execPath, entry], {
+      cwd: this.cwdPath,
+      env: {
+        ...process.env,
+        AKAN_TYPECHECK_CWD: this.cwdPath,
+        AKAN_TYPECHECK_FILE: path8
+      },
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    const [stdout, stderr, exitCode] = await Promise.all([
+      new Response(proc.stdout).text(),
+      new Response(proc.stderr).text(),
+      proc.exited
+    ]);
+    if (exitCode !== 0)
+      throw new Error((stderr || stdout).trim() || `Typecheck failed with exit code ${exitCode}`);
+    const result = JSON.parse(stdout);
+    return {
+      fileDiagnostics: Array.from({ length: result.fileDiagnosticsCount }),
+      fileErrors: Array.from({ length: result.fileErrorsCount }),
+      fileWarnings: Array.from({ length: result.fileWarningsCount }),
+      message: result.message
+    };
+  }
+  async#resolveTypecheckWorkerEntry() {
+    const dirname2 = getDirname(import.meta.url);
+    const candidates = [
+      path7.join(process.cwd(), "pkgs/@akanjs/devkit/typecheck/typecheck.proc.ts"),
+      path7.join(process.cwd(), "node_modules/@akanjs/devkit/typecheck/typecheck.proc.ts"),
+      path7.join(dirname2, "typecheck/typecheck.proc.ts"),
+      path7.join(dirname2, "typecheck.proc.js"),
+      path7.join(dirname2, "typecheck.proc.ts")
+    ];
+    for (const candidate of candidates)
+      if (await Bun.file(candidate).exists())
+        return candidate;
+    throw new Error(`[devkit] typecheck worker entry not found; looked in: ${candidates.join(", ")}`);
+  }
   getLinter() {
     this.linter ??= new Linter(this.cwdPath);
     return this.linter;
@@ -2808,7 +3084,15 @@ class WorkspaceExecutor extends Executor {
     const env = sourceEnv.AKAN_PUBLIC_ENV ?? "debug";
     if (!env)
       throw new Error("AKAN_PUBLIC_ENV is not set");
-    return { ...appName ? { appName } : {}, workspaceRoot, repoName, serveDomain, env, portOffset, workspaceId };
+    return {
+      ...appName ? { appName } : {},
+      workspaceRoot,
+      repoName,
+      serveDomain,
+      env,
+      portOffset,
+      workspaceId
+    };
   }
   getWorkspaceId({
     allowEmpty
@@ -2868,12 +3152,12 @@ class WorkspaceExecutor extends Executor {
   }
   async getDirInModule(basePath2, name) {
     const AVOID_DIRS = ["__lib", "__scalar", `_`, `_${name}`];
-    const getDirs = async (dirname3, maxDepth = 3, results = [], prefix = "") => {
-      const dirs = await this.readdir(dirname3);
+    const getDirs = async (dirname2, maxDepth = 3, results = [], prefix = "") => {
+      const dirs = await this.readdir(dirname2);
       await Promise.all(dirs.map(async (dir) => {
         if (dir.includes("_") || AVOID_DIRS.includes(dir))
           return;
-        const dirPath = path7.join(dirname3, dir);
+        const dirPath = path7.join(dirname2, dir);
         if ((await stat2(dirPath)).isDirectory()) {
           results.push(`${prefix}${dir}`);
           if (maxDepth > 0)
@@ -2893,12 +3177,12 @@ class WorkspaceExecutor extends Executor {
   }
   async#getDirHasFile(basePath2, targetFilename) {
     const AVOID_DIRS = ["node_modules", "dist", "public", "webkit"];
-    const getDirs = async (dirname3, maxDepth = 3, results = [], prefix = "") => {
-      const dirs = await this.readdir(dirname3);
+    const getDirs = async (dirname2, maxDepth = 3, results = [], prefix = "") => {
+      const dirs = await this.readdir(dirname2);
       await Promise.all(dirs.map(async (dir) => {
         if (AVOID_DIRS.includes(dir))
           return;
-        const dirPath = path7.join(dirname3, dir);
+        const dirPath = path7.join(dirname2, dir);
         if ((await stat2(dirPath)).isDirectory()) {
           const hasTargetFile = await FileSys.fileExists(path7.join(dirPath, targetFilename));
           if (hasTargetFile)
@@ -3163,6 +3447,13 @@ class AppExecutor extends SysExecutor {
   getEnv() {
     return WorkspaceExecutor.getBaseDevEnv().env;
   }
+  async getDevPort() {
+    const basePort = 8282;
+    const appNames = (await this.workspace.getApps()).sort((a, b) => a.localeCompare(b));
+    const appIndex = Math.max(appNames.indexOf(this.name), 0);
+    const portOffset = WorkspaceExecutor.getBaseDevEnv().portOffset;
+    return basePort + appIndex + portOffset;
+  }
   getCommandEnv(env = {}) {
     const basePort = 8282;
     const portOffset = WorkspaceExecutor.getBaseDevEnv().portOffset;
@@ -3196,7 +3487,12 @@ class AppExecutor extends SysExecutor {
       ]);
     } else
       await this.removeDir(".akan");
-    const env = this.getCommandEnv({ AKAN_COMMAND_TYPE: type, ...routeEnv });
+    const devPort = type === "start" ? (await this.getDevPort()).toString() : undefined;
+    const env = this.getCommandEnv({
+      AKAN_COMMAND_TYPE: type,
+      ...routeEnv,
+      ...devPort ? { PORT: devPort, AKAN_PUBLIC_CLIENT_PORT: devPort, AKAN_PUBLIC_SERVER_PORT: devPort } : {}
+    });
     return { env };
   }
   #publicEnv = null;
@@ -3615,7 +3911,7 @@ var createTunnel = async (service, { app, environment, port = service === "postg
 
 // pkgs/@akanjs/devkit/incrementalBuilder/incrementalBuilder.host.ts
 import path8 from "path";
-import { Logger as Logger5 } from "akanjs/common";
+import { Logger as Logger4 } from "akanjs/common";
 var builderMsgTypeSet = new Set([
   "build-route-res",
   "builder-ready",
@@ -3627,7 +3923,7 @@ var builderMsgTypeSet = new Set([
 class IncrementalBuilderHost {
   static #restartBaseDelayMs = 1000;
   static #restartMaxDelayMs = 30000;
-  logger = new Logger5("IncrementalBuilderHost");
+  logger = new Logger4("IncrementalBuilderHost");
   entry;
   env;
   app;
@@ -3875,7 +4171,7 @@ class BackendImportGraph {
 
 class AkanAppHost {
   app;
-  logger = new Logger6("AkanAppHost");
+  logger = new Logger5("AkanAppHost");
   withInk;
   env;
   #backend = null;
@@ -4158,19 +4454,19 @@ class AkanAppHost {
   }
 }
 // pkgs/@akanjs/devkit/applicationBuildReporter.ts
-import { Logger as Logger7 } from "akanjs/common";
+import { Logger as Logger6 } from "akanjs/common";
 
 class ApplicationBuildReporter {
   static create() {
     return {
-      phaseDone: (phase) => Logger7.rawLog(ApplicationBuildReporter.formatPhaseLine(phase))
+      phaseDone: (phase) => Logger6.rawLog(ApplicationBuildReporter.formatPhaseLine(phase))
     };
   }
   static printSummary(result) {
-    Logger7.rawLog("");
-    Logger7.rawLog(`Route artifacts: ${result.artifactDir}`);
-    Logger7.rawLog(`Server output: ${result.outputDir}`);
-    Logger7.rawLog(`Done in ${ApplicationBuildReporter.formatDuration(result.durationMs)}`);
+    Logger6.rawLog("");
+    Logger6.rawLog(`Route artifacts: ${result.artifactDir}`);
+    Logger6.rawLog(`Server output: ${result.outputDir}`);
+    Logger6.rawLog(`Done in ${ApplicationBuildReporter.formatDuration(result.durationMs)}`);
   }
   static formatError(error) {
     if (error instanceof AggregateError) {
@@ -4322,6 +4618,9 @@ export async function generateHead(props: PageProps) {
   return inheritedLayout.head;
 }
 
+export const NotFound = userLayout.NotFound ?? inheritedLayout.NotFound;
+export const Error = userLayout.Error ?? inheritedLayout.Error;
+
 export default function GeneratedLayout({ children, params, searchParams }: LayoutProps) {
   return (
     <System.Provider
@@ -4351,6 +4650,9 @@ export async function generateHead(props: PageProps) {
   return inheritedLayout.head;
 }
 
+export const NotFound = userLayout.NotFound ?? inheritedLayout.NotFound;
+export const Error = userLayout.Error ?? inheritedLayout.Error;
+
 export default function GeneratedLayout({ children, params, searchParams }: LayoutProps) {
   return <UserLayout params={params} searchParams={searchParams}>{children}</UserLayout>;
 }
@@ -4469,13 +4771,13 @@ import path14 from "path";
 
 // pkgs/@akanjs/devkit/transforms/barrelAnalyzer.ts
 import path12 from "path";
-import { Logger as Logger8 } from "akanjs/common";
+import { Logger as Logger7 } from "akanjs/common";
 var REEXPORT_RE = /(?:^|\n)\s*export\s+(?:type\s+)?(?:(\*)(?:\s+as\s+(\w+))?|\{\s*([^}]*?)\s*\})\s+from\s+(["'])([^"']+)\4;?/g;
 var LOCAL_NAMED_RE = /(?:^|\n)\s*export\s+\{\s*([^}]*?)\s*\}(?!\s*from)/g;
 var CANDIDATE_EXTS = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"];
 
 class BarrelAnalyzer {
-  #logger = new Logger8("BarrelAnalyzer");
+  #logger = new Logger7("BarrelAnalyzer");
   #opts;
   #cache = new Map;
   #tsTranspiler = new Bun.Transpiler({ loader: "ts" });
@@ -6175,7 +6477,7 @@ ${CsrArtifactBuilder.escapeInlineScript(await loadScript(src))}
 }
 // pkgs/@akanjs/devkit/frontendBuild/cssCompiler.ts
 import path23 from "path";
-import { Logger as Logger9 } from "akanjs/common";
+import { Logger as Logger8 } from "akanjs/common";
 import { compile } from "tailwindcss";
 
 // pkgs/@akanjs/devkit/frontendBuild/cssImportResolver.ts
@@ -6320,7 +6622,7 @@ var NODE_MODULES_RE3 = /[\\/]node_modules[\\/]/;
 var AKANJS_NODE_MODULE_RE3 = /[\\/]node_modules[\\/]akanjs[\\/]/;
 
 class CssCompiler {
-  #logger = new Logger9("CssCompiler");
+  #logger = new Logger8("CssCompiler");
   #transpiler = new Bun.Transpiler({ loader: "tsx" });
   #app;
   #cssImportResolver = null;
@@ -7728,7 +8030,7 @@ class ApplicationBuildRunner {
 import { cp, mkdir as mkdir8, rm as rm3 } from "fs/promises";
 
 // pkgs/@akanjs/devkit/uploadRelease.ts
-import { HttpClient as HttpClient2, Logger as Logger10 } from "akanjs/common";
+import { HttpClient as HttpClient2, Logger as Logger9 } from "akanjs/common";
 var spinning = (message) => {
   const spinner = new Spinner(message, { prefix: message, enableSpin: true }).start();
   return spinner;
@@ -7741,7 +8043,7 @@ var uploadRelease = async (appName, {
   os,
   local
 }) => {
-  const logger = new Logger10("uploadRelease");
+  const logger = new Logger9("uploadRelease");
   const basePath2 = local ? "http://localhost:8282/backend" : "https://cloud.akanjs.com/backend";
   const httpClient = new HttpClient2(basePath2);
   const buildPath = `${workspaceRoot}/releases/builds/${appName}-release.tar.gz`;
@@ -8727,7 +9029,7 @@ 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 { Logger as Logger10 } from "akanjs/common";
 import chalk6 from "chalk";
 import { program } from "commander";
 
@@ -9012,7 +9314,7 @@ var printCliError = (error) => {
   if (loggedCliErrorMessages.has(message))
     return;
   loggedCliErrorMessages.add(message);
-  Logger11.rawLog(`
+  Logger10.rawLog(`
 ${chalk6.red(message)}`);
 };
 var handleOption = (programCommand, argMeta) => {
@@ -9241,7 +9543,7 @@ var runCommands = async (...commands) => {
   const hasCommand = process.argv.length > 2 && !process.argv[2]?.startsWith("-");
   if (hasHelpFlag || !hasCommand) {
     if (process.argv.length === 2 || process.argv.length === 3 && hasHelpFlag) {
-      Logger11.rawLog(formatHelp(commands, process.env.AKAN_VERSION));
+      Logger10.rawLog(formatHelp(commands, process.env.AKAN_VERSION));
       process.exit(0);
     }
   }
@@ -9250,7 +9552,7 @@ var runCommands = async (...commands) => {
   });
   const installedAkanPackageJson = await FileSys.fileExists("./node_modules/akanjs/package.json") ? await FileSys.readJson("./node_modules/akanjs/package.json") : null;
   if (installedAkanPackageJson && installedAkanPackageJson.version !== process.env.AKAN_VERSION) {
-    Logger11.rawLog(chalk6.yellow(`
+    Logger10.rawLog(chalk6.yellow(`
 Akan CLI version is mismatch with installed package. ${process.env.AKAN_VERSION} (global) vs ${installedAkanPackageJson.version} (akanjs)
 It may cause unexpected behavior. Run \`akan update\` to update latest akanjs.`));
   }
@@ -9286,7 +9588,7 @@ It may cause unexpected behavior. Run \`akan update\` to update latest akanjs.`)
           return formatCommandHelp(command, targetMeta.key);
         };
         programCommand.action(async (...args) => {
-          Logger11.rawLog();
+          Logger10.rawLog();
           const cmdArgs = args.slice(0, args.length - 2);
           const opt = args[args.length - 2];
           const commandArgs = [];
@@ -9310,7 +9612,7 @@ It may cause unexpected behavior. Run \`akan update\` to update latest akanjs.`)
           const cmd = CommandContainer.get(command);
           try {
             await targetMeta.handler.call(cmd, ...commandArgs);
-            Logger11.rawLog();
+            Logger10.rawLog();
           } catch (e) {
             printCliError(e);
             throw e;
@@ -9650,8 +9952,11 @@ import fsPromise from "fs/promises";
 import { input as input3, select as select3 } from "@inquirer/prompts";
 class Prompter {
   static async#getGuidelineRoot() {
-    const dirname3 = getDirname(import.meta.url);
-    const candidates = [`${dirname3}/guidelines`, `${dirname3}/../cli/guidelines`];
+    const dirname2 = getDirname(import.meta.url);
+    const candidates = [
+      `${dirname2}/guidelines`,
+      `${dirname2}/../cli/guidelines`
+    ];
     for (const candidate of candidates) {
       try {
         await fsPromise.access(candidate);
@@ -9663,7 +9968,10 @@ class Prompter {
   static async selectGuideline() {
     const guidelineRoot = await Prompter.#getGuidelineRoot();
     const guideNames = (await fsPromise.readdir(guidelineRoot)).filter((name) => !name.startsWith("_"));
-    return await select3({ message: "Select a guideline", choices: guideNames.map((name) => ({ name, value: name })) });
+    return await select3({
+      message: "Select a guideline",
+      choices: guideNames.map((name) => ({ name, value: name }))
+    });
   }
   static async getGuideJson(guideName) {
     const guidelineRoot = await Prompter.#getGuidelineRoot();
@@ -9678,13 +9986,18 @@ class Prompter {
     return content;
   }
   static async getUpdateRequest(guideName) {
-    return await input3({ message: `What do you want to update in ${guideName}?` });
+    return await input3({
+      message: `What do you want to update in ${guideName}?`
+    });
   }
   async makeTsFileUpdatePrompt({ context, request }) {
     return `You are a senior developer writing TypeScript-based programs using Akan.js, an in-house framework. Here's an overview of the Akan.js framework:
 ${await this.getDocumentation("framework")}
 Please understand the following background information, write code that meets the requirements, verify that it satisfies the validation conditions, and return the result.
 
+# Code Style
+- Use double quotes for all string literals in TypeScript/TSX code. Do not use single quotes.
+
 # Background Information
 \`\`\`markdown
 ${context}
@@ -9734,7 +10047,8 @@ import { jsxDEV as jsxDEV2, Fragment as Fragment2 } from "react/jsx-dev-runtime"
 import { select as select6 } from "@inquirer/prompts";
 
 // pkgs/@akanjs/cli/application/application.script.ts
-import { Logger as Logger13 } from "akanjs/common";
+import { confirm as confirm3 } from "@inquirer/prompts";
+import { Logger as Logger12 } from "akanjs/common";
 
 // pkgs/@akanjs/cli/semver.ts
 function parseVersion(version) {
@@ -9852,14 +10166,14 @@ import { StringOutputParser } from "@langchain/core/output_parsers";
 import { PromptTemplate as PromptTemplate2 } from "@langchain/core/prompts";
 import { RunnableSequence as RunnableSequence2 } from "@langchain/core/runnables";
 import { ChatOpenAI as ChatOpenAI3 } from "@langchain/openai";
-import { Logger as Logger12 } from "akanjs/common";
+import { Logger as Logger11 } from "akanjs/common";
 import ora3 from "ora";
 
 // pkgs/@akanjs/cli/openBrowser.ts
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 function openBrowser(url) {
   const command3 = process.platform === "darwin" ? ["open", url] : process.platform === "win32" ? ["cmd", "/c", "start", "", url] : ["xdg-open", url];
-  const child = spawn2(command3[0], command3.slice(1), { detached: true, stdio: "ignore" });
+  const child = spawn3(command3[0], command3.slice(1), { detached: true, stdio: "ignore" });
   child.on("error", () => {});
   child.unref();
   return Promise.resolve();
@@ -9937,7 +10251,7 @@ class ApplicationRunner extends runner("application") {
     const appHost = await new AkanAppHost(app, { env, withInk }).start();
     onStart?.();
     if (open)
-      setTimeout(() => openBrowser("http://localhost:8282"), 3000);
+      setTimeout(() => openBrowser(`http://localhost:${env.AKAN_PUBLIC_CLIENT_PORT ?? env.PORT ?? "8282"}`), 3000);
     return appHost;
   }
   async buildIos(app, { target, env = "debug", regenerate = false } = {}) {
@@ -10045,7 +10359,7 @@ class ApplicationRunner extends runner("application") {
       return;
     for (const failure of failures) {
       const message = failure.error instanceof Error ? failure.error.message : String(failure.error);
-      Logger12.rawLog(`Mobile target ${failure.target} failed: ${message}`, undefined, "error");
+      Logger11.rawLog(`Mobile target ${failure.target} failed: ${message}`, undefined, "error");
     }
     throw new Error(`${failures.length}/${results.length} mobile targets failed`);
   }
@@ -10162,7 +10476,38 @@ ${detail}`
 }
 
 // pkgs/@akanjs/cli/application/application.script.ts
-class ApplicationScript extends script("application", [ApplicationRunner, LibraryScript]) {
+class ApplicationScript extends script("application", [
+  ApplicationRunner,
+  LibraryScript
+]) {
+  async confirmDatabaseModeDependencyInstall(databaseMode, installSpecs) {
+    return await confirm3({
+      message: [
+        `Database mode '${databaseMode}' requires missing dependencies: ${installSpecs.join(", ")}.`,
+        "Install them now?"
+      ].join(" "),
+      default: true
+    });
+  }
+  async syncDatabaseModeDependencies(app, akanConfig3, databaseMode) {
+    const installSpecs = akanConfig3.getMissingDatabaseModeDependencySpecs(databaseMode);
+    if (installSpecs.length === 0)
+      return;
+    const shouldInstall = await this.confirmDatabaseModeDependencyInstall(databaseMode, installSpecs);
+    if (!shouldInstall)
+      throw new Error(`Database mode '${databaseMode}' requires missing dependencies: ${installSpecs.join(", ")}.`);
+    const spinner2 = app.workspace.spinning(`Installing database dependencies for ${databaseMode} mode...`);
+    try {
+      await app.workspace.spawn("bun", ["add", ...installSpecs], {
+        stdio: "inherit"
+      });
+      await app.workspace.getPackageJson({ refresh: true });
+      spinner2.succeed(`Installed database dependencies for ${databaseMode} mode`);
+    } catch (error) {
+      spinner2.fail(`Failed to install database dependencies for ${databaseMode} mode`);
+      throw error;
+    }
+  }
   async createApplication(appName, workspace, { start = false, libs = [] } = {}) {
     const spinner2 = workspace.spinning("Creating application...");
     const app = await this.applicationRunner.createApplication(appName, workspace, libs);
@@ -10187,25 +10532,33 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     await app.scanSync();
     await this.applicationRunner.runScript(app, scriptFilename);
   }
-  async build(app, { write = true, fast = false, quiet = false } = {}) {
+  async build(app, {
+    write = true,
+    fast = false,
+    quiet = false
+  } = {}) {
     await app.scanSync({ write });
     if (!quiet)
-      Logger13.rawLog(`Creating an optimized production build for ${app.name}...`);
+      Logger12.rawLog(`Creating an optimized production build for ${app.name}...`);
     try {
       const result = await this.applicationRunner.build(app, {
         fast,
         spinner: !quiet
       });
-      Logger13.rawLog(`${app.name} built in dist/apps/${app.name}`);
+      Logger12.rawLog(`${app.name} built in dist/apps/${app.name}`);
       if (!quiet)
         ApplicationBuildReporter.printSummary(result);
     } catch (error) {
-      Logger13.rawLog(`${app.name} build failed in dist/apps/${app.name}`, undefined, "error");
-      Logger13.rawLog(ApplicationBuildReporter.formatError(error), undefined, "error");
+      Logger12.rawLog(`${app.name} build failed in dist/apps/${app.name}`, undefined, "error");
+      Logger12.rawLog(ApplicationBuildReporter.formatError(error), undefined, "error");
       throw error;
     }
   }
-  async typecheck(app, { write = true, clean = false, incremental = true } = {}) {
+  async typecheck(app, {
+    write = true,
+    clean = false,
+    incremental = true
+  } = {}) {
     await app.scanSync({ write });
     const spinner2 = app.spinning(`Typechecking ${app.name}...`);
     try {
@@ -10213,7 +10566,7 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
       spinner2.succeed(`${app.name} typechecked`);
     } catch (error) {
       spinner2.fail(`${app.name} typecheck failed`);
-      Logger13.rawLog(ApplicationBuildReporter.formatError(error), undefined, "error");
+      Logger12.rawLog(ApplicationBuildReporter.formatError(error), undefined, "error");
       throw error;
     }
   }
@@ -10247,6 +10600,7 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     await app.scanSync({ write });
     const akanConfig3 = await app.getConfig();
     const databaseMode = process.env.AKAN_DATABASE_MODE ?? akanConfig3.defaultDatabaseMode ?? "single";
+    await this.syncDatabaseModeDependencies(app, akanConfig3, databaseMode);
     if (app.getEnv() === "local" && dbup && databaseMode !== "single") {
       const wasDbAlreadyUp = await this.dbup(app.workspace, databaseMode);
       if (!wasDbAlreadyUp)
@@ -10265,7 +10619,12 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     });
     return akanAppHost;
   }
-  async buildIos(app, { write = true, target, env = "debug", regenerate = false } = {}) {
+  async buildIos(app, {
+    write = true,
+    target,
+    env = "debug",
+    regenerate = false
+  } = {}) {
     await app.scanSync({ write });
     await this.applicationRunner.buildIos(app, { target, env, regenerate });
   }
@@ -10278,15 +10637,32 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     regenerate = false
   } = {}) {
     await app.scanSync({ write });
-    await this.applicationRunner.startIos(app, { open, operation, env, target, regenerate });
+    await this.applicationRunner.startIos(app, {
+      open,
+      operation,
+      env,
+      target,
+      regenerate
+    });
   }
-  async releaseIos(app, { write = true, target, env = "main", regenerate = false, allowLocalRelease = false } = {}) {
+  async releaseIos(app, {
+    write = true,
+    target,
+    env = "main",
+    regenerate = false,
+    allowLocalRelease = false
+  } = {}) {
     await app.scanSync({ write });
     if (env === "local" && !allowLocalRelease)
       throw new Error("releaseIos --env local is blocked. Pass allowLocalRelease only for explicit local release testing.");
     await this.applicationRunner.releaseIos(app, { target, env, regenerate });
   }
-  async buildAndroid(app, { write = true, target, env = "debug", regenerate = false } = {}) {
+  async buildAndroid(app, {
+    write = true,
+    target,
+    env = "debug",
+    regenerate = false
+  } = {}) {
     await app.scanSync({ write });
     await this.applicationRunner.buildAndroid(app, { target, env, regenerate });
   }
@@ -10299,13 +10675,29 @@ class ApplicationScript extends script("application", [ApplicationRunner, Librar
     regenerate = false
   } = {}) {
     await app.scanSync({ write });
-    await this.applicationRunner.startAndroid(app, { open, operation, env, target, regenerate });
+    await this.applicationRunner.startAndroid(app, {
+      open,
+      operation,
+      env,
+      target,
+      regenerate
+    });
   }
-  async releaseAndroid(app, assembleType, { write = true, target, env = "main", regenerate = false, allowLocalRelease = false } = {}) {
+  async releaseAndroid(app, assembleType, {
+    write = true,
+    target,
+    env = "main",
+    regenerate = false,
+    allowLocalRelease = false
+  } = {}) {
     await app.scanSync({ write });
     if (env === "local" && !allowLocalRelease)
       throw new Error("releaseAndroid --env local is blocked. Pass allowLocalRelease only for explicit local release testing.");
-    await this.applicationRunner.releaseAndroid(app, assembleType, { target, env, regenerate });
+    await this.applicationRunner.releaseAndroid(app, assembleType, {
+      target,
+      env,
+      regenerate
+    });
   }
   async configureApp(app) {
     await this.applicationRunner.configureApp(app);
@@ -10477,11 +10869,11 @@ class ApplicationCommand extends command("application", [ApplicationScript], ({
 }
 
 // pkgs/@akanjs/cli/cloud/cloud.script.ts
-import { Logger as Logger16 } from "akanjs/common";
+import { Logger as Logger15 } from "akanjs/common";
 
 // pkgs/@akanjs/cli/package/package.runner.ts
 import path37 from "path";
-import { Logger as Logger14 } from "akanjs/common";
+import { Logger as Logger13 } from "akanjs/common";
 var {$: $2 } = globalThis.Bun;
 
 class PackageRunner extends runner("package") {
@@ -10489,7 +10881,7 @@ class PackageRunner extends runner("package") {
     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(`akanjs@${version}`);
+      Logger13.rawLog(`akanjs@${version}`);
     return version;
   }
   async#getInstalledPackageJson() {
@@ -10616,8 +11008,8 @@ class PackageScript extends script("package", [PackageRunner]) {
 
 // pkgs/@akanjs/cli/cloud/cloud.runner.ts
 import path38 from "path";
-import { confirm as confirm3, input as input5, select as select7 } from "@inquirer/prompts";
-import { Logger as Logger15, sleep } from "akanjs/common";
+import { confirm as confirm4, input as input5, select as select7 } from "@inquirer/prompts";
+import { Logger as Logger14, sleep } from "akanjs/common";
 import chalk7 from "chalk";
 import * as QRcode from "qrcode";
 
@@ -10642,12 +11034,7 @@ var addRemoteEnvServerValue = "__addRemoteEnvServer";
 var removeRemoteEnvServerValue = "__removeRemoteEnvServer";
 
 class CloudRunner extends runner("cloud") {
-  #akanFrameworkPackages = new Set([
-    "akanjs",
-    "@akanjs/devkit",
-    "@akanjs/cli",
-    "create-akan-workspace"
-  ]);
+  #akanFrameworkPackages = new Set(["akanjs", "@akanjs/devkit", "@akanjs/cli", "create-akan-workspace"]);
   #getRegistryArgs(registryUrl) {
     return registryUrl ? ["--registry", getNpmRegistryUrl(registryUrl)] : [];
   }
@@ -10697,7 +11084,7 @@ class CloudRunner extends runner("cloud") {
     const servers = await GlobalConfig.getRemoteEnvServers();
     const serverEntries = Object.entries(servers).sort(([nameA], [nameB]) => nameA.localeCompare(nameB));
     if (serverEntries.length === 0) {
-      Logger15.info("No remote env servers configured. Add the first remote server for SCP mode.");
+      Logger14.info("No remote env servers configured. Add the first remote server for SCP mode.");
       return await this.#addRemoteEnvServer();
     }
     const selectedName = await select7({
@@ -10730,14 +11117,14 @@ class CloudRunner extends runner("cloud") {
         value: name
       }))
     });
-    const shouldRemove = await confirm3({
+    const shouldRemove = await confirm4({
       message: `Remove remote env server "${selectedName}"?`,
       default: false
     });
     if (!shouldRemove)
       return;
     await GlobalConfig.removeRemoteEnvServer(selectedName);
-    Logger15.info(`Removed remote env server "${selectedName}"`);
+    Logger14.info(`Removed remote env server "${selectedName}"`);
   }
   async#getRemoteEnvServerWithUsername() {
     const remoteServer = await this.#selectRemoteEnvServer();
@@ -10768,35 +11155,27 @@ class CloudRunner extends runner("cloud") {
     return `${config.username ? `${config.username}@` : ""}${config.host}`;
   }
   #getScpArgs(config, source, target) {
-    return [
-      ...config.port ? ["-P", config.port.toString()] : [],
-      source,
-      target
-    ];
+    return [...config.port ? ["-P", config.port.toString()] : [], source, target];
   }
   #getSshArgs(config, command3) {
-    return [
-      ...config.port ? ["-p", config.port.toString()] : [],
-      this.#getSshTarget(config),
-      command3
-    ];
+    return [...config.port ? ["-p", config.port.toString()] : [], this.#getSshTarget(config), command3];
   }
-  async login() {
+  async login(workspace) {
     const config = await GlobalConfig.getHostConfig();
-    const cloudApi2 = new CloudApi(config);
+    const cloudApi2 = new CloudApi(workspace, config);
     const self = config.auth ? await cloudApi2.getRemoteSelf() : null;
     if (self) {
-      Logger15.rawLog(chalk7.green(`
+      Logger14.rawLog(chalk7.green(`
 \u2713 Already logged in akan cloud as ${self.nickname}
 `));
       return true;
     }
     const remoteId = crypto.randomUUID();
     const signinUrl = `${akanCloudUrl}/signin?remoteId=${remoteId}`;
-    Logger15.rawLog(chalk7.bold(`
+    Logger14.rawLog(chalk7.bold(`
 ${chalk7.green("\u27A4")} Authentication Required`));
-    Logger15.rawLog(chalk7.dim("Please visit or click the following URL:"));
-    Logger15.rawLog(`${chalk7.cyan.underline(signinUrl)}
+    Logger14.rawLog(chalk7.dim("Please visit or click the following URL:"));
+    Logger14.rawLog(`${chalk7.cyan.underline(signinUrl)}
 `);
     try {
       const qrcode = await new Promise((resolve, reject) => {
@@ -10806,13 +11185,13 @@ ${chalk7.green("\u27A4")} Authentication Required`));
           resolve(data);
         });
       });
-      Logger15.rawLog(qrcode);
+      Logger14.rawLog(qrcode);
       await openBrowser(signinUrl);
-      Logger15.rawLog(chalk7.dim("Opening browser..."));
+      Logger14.rawLog(chalk7.dim("Opening browser..."));
     } catch {
-      Logger15.rawLog(chalk7.yellow("Could not open browser. Please visit the URL manually."));
+      Logger14.rawLog(chalk7.yellow("Could not open browser. Please visit the URL manually."));
     }
-    Logger15.rawLog(chalk7.dim("Waiting for authentication..."));
+    Logger14.rawLog(chalk7.dim("Waiting for authentication..."));
     const MAX_RETRY = 300;
     for (let i = 0;i < MAX_RETRY; i++) {
       const accessToken = await cloudApi2.getRemoteAuthToken(remoteId);
@@ -10821,10 +11200,10 @@ ${chalk7.green("\u27A4")} Authentication Required`));
         await GlobalConfig.setHostConfig(akanCloudHost, {
           auth: { accessToken, self: self2 }
         });
-        Logger15.rawLog(chalk7.green(`\r\u2713 Authentication successful!`));
-        Logger15.rawLog(chalk7.green.bold(`
+        Logger14.rawLog(chalk7.green(`\r\u2713 Authentication successful!`));
+        Logger14.rawLog(chalk7.green.bold(`
 \u2728 Welcome aboard, ${self2.nickname}!`));
-        Logger15.rawLog(chalk7.dim(`You're now ready to use Akan CLI!
+        Logger14.rawLog(chalk7.dim(`You're now ready to use Akan CLI!
 `));
         return true;
       }
@@ -10836,17 +11215,17 @@ ${chalk7.green("\u27A4")} Authentication Required`));
     const config = await GlobalConfig.getHostConfig();
     if (config.auth?.self) {
       await GlobalConfig.setHostConfig(akanCloudHost, {});
-      Logger15.rawLog(chalk7.magenta.bold(`
+      Logger14.rawLog(chalk7.magenta.bold(`
 \uD83D\uDC4B Goodbye, ${config.auth.self.nickname}!`));
-      Logger15.rawLog(chalk7.dim(`\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+      Logger14.rawLog(chalk7.dim(`\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 `));
-      Logger15.rawLog(chalk7.cyan("You have been successfully logged out."));
-      Logger15.rawLog(chalk7.dim(`Thank you for using Akan CLI. Come back soon! \uD83C\uDF1F
+      Logger14.rawLog(chalk7.cyan("You have been successfully logged out."));
+      Logger14.rawLog(chalk7.dim(`Thank you for using Akan CLI. Come back soon! \uD83C\uDF1F
 `));
     } else {
-      Logger15.rawLog(chalk7.yellow.bold(`
+      Logger14.rawLog(chalk7.yellow.bold(`
 \u26A0\uFE0F  No active session found`));
-      Logger15.rawLog(chalk7.dim(`You were not logged in to begin with
+      Logger14.rawLog(chalk7.dim(`You were not logged in to begin with
 `));
     }
   }
@@ -10855,7 +11234,7 @@ ${chalk7.green("\u27A4")} Authentication Required`));
   }
   resetLlm() {
     AiSession.setLlmConfig(null);
-    Logger15.rawLog(chalk7.green("\u2611\uFE0F LLM model config is cleared. Please run `akan set-llm` to set a new LLM model."));
+    Logger14.rawLog(chalk7.green("\u2611\uFE0F LLM model config is cleared. Please run `akan set-llm` to set a new LLM model."));
   }
   async getAkanPkgs(workspace) {
     const pkgs = await workspace.getPkgs();
@@ -10879,8 +11258,8 @@ ${chalk7.green("\u27A4")} Authentication Required`));
       }
     };
     const { nextVersion, latestPublishedVersion } = await getNextVersion(targetVersionPrefix, tag);
-    Logger15.info(`Latest published version of akanjs: ${latestPublishedVersion ?? "none"}`);
-    Logger15.info(`Next version of akanjs: ${nextVersion}`);
+    Logger14.info(`Latest published version of akanjs: ${latestPublishedVersion ?? "none"}`);
+    Logger14.info(`Next version of akanjs: ${nextVersion}`);
     for (const library of akanPkgs) {
       const packageJson = await workspace.readJson(`pkgs/${library}/package.json`);
       const newPackageJsonStr = JSON.stringify(this.#normalizeAkanPackageJson(packageJson, library, nextVersion), null, 2);
@@ -10890,30 +11269,24 @@ ${chalk7.green("\u27A4")} Authentication Required`));
       await workspace.writeJson(`dist/pkgs/${library}/package.json`, newDistPackageJson);
     }
     if (confirmPublish) {
-      const isDeployConfirmed = await confirm3({
+      const isDeployConfirmed = await confirm4({
         message: "Are you sure you want to deploy the libraries?"
       });
       if (!isDeployConfirmed) {
-        Logger15.error("Deployment cancelled");
+        Logger14.error("Deployment cancelled");
         return;
       }
     }
     await Promise.all(akanPkgs.map(async (library) => {
-      Logger15.info(`Publishing ${library}@${nextVersion} to ${registry ?? "npm"}...`);
-      await workspace.spawn("npm", [
-        "publish",
-        "--tag",
-        tag,
-        ...this.#getRegistryArgs(registry),
-        ...this.#getLocalRegistryAuthArgs(registry)
-      ], {
+      Logger14.info(`Publishing ${library}@${nextVersion} to ${registry ?? "npm"}...`);
+      await workspace.spawn("npm", ["publish", "--tag", tag, ...this.#getRegistryArgs(registry), ...this.#getLocalRegistryAuthArgs(registry)], {
         cwd: path38.join(workspace.workspaceRoot, "dist/pkgs", library),
         env: this.#getRegistryEnv(registry),
         stdio: "inherit"
       });
-      Logger15.info(`${library}@${nextVersion} is published to ${registry ?? "npm"}`);
+      Logger14.info(`${library}@${nextVersion} is published to ${registry ?? "npm"}`);
     }));
-    Logger15.info(`All libraries are published to ${registry ?? "npm"}`);
+    Logger14.info(`All libraries are published to ${registry ?? "npm"}`);
   }
   async update(workspace, tag = "latest", { registryUrl } = {}) {
     const registry = registryUrl ? getNpmRegistryUrl(registryUrl) : undefined;
@@ -10923,14 +11296,7 @@ ${chalk7.green("\u27A4")} Authentication Required`));
       await workspace.spawn("bun", ["update", "-g", "akanjs", "--latest", `--tag=${tag}`, ...registryArgs], { env });
     else
       await Promise.all([
-        workspace.spawn("bun", [
-          "update",
-          "-g",
-          "akanjs",
-          "--latest",
-          `--tag=${tag}`,
-          ...registryArgs
-        ], { env }),
+        workspace.spawn("bun", ["update", "-g", "akanjs", "--latest", `--tag=${tag}`, ...registryArgs], { env }),
         this.#updateAkanPkgs(workspace, tag, registry)
       ]);
   }
@@ -10954,12 +11320,7 @@ ${chalk7.green("\u27A4")} Authentication Required`));
   }
   #normalizeAkanPackageJson(packageJson, packageName, version) {
     const normalized = { ...packageJson, version };
-    for (const field of [
-      "dependencies",
-      "devDependencies",
-      "peerDependencies",
-      "optionalDependencies"
-    ]) {
+    for (const field of ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"]) {
       const dependencies = normalized[field];
       if (!dependencies)
         continue;
@@ -10974,7 +11335,7 @@ ${chalk7.green("\u27A4")} Authentication Required`));
     const envArchivePath = "local/env.tar";
     await workspace.mkdir("local");
     await workspace.remove(envArchivePath);
-    await cloudApi2.downloadEnv(workspaceId, path38.join(workspace.workspaceRoot, envArchivePath));
+    await cloudApi2.downloadEnv(workspaceId);
     await workspace.spawn("tar", ["-xf", envArchivePath], {
       cwd: workspace.workspaceRoot
     });
@@ -10992,7 +11353,7 @@ ${chalk7.green("\u27A4")} Authentication Required`));
     await workspace.mkdir("local");
     await workspace.remove(envArchivePath);
     try {
-      Logger15.info(`Downloading env archive from remote server "${remoteServer.name}"...`);
+      Logger14.info(`Downloading env archive from remote server "${remoteServer.name}"...`);
       await workspace.spawn("scp", this.#getScpArgs(remoteServer.config, remoteTarget, envArchivePath), {
         cwd: workspace.workspaceRoot,
         stdio: "inherit"
@@ -11015,7 +11376,7 @@ ${chalk7.green("\u27A4")} Authentication Required`));
         cwd: workspace.workspaceRoot,
         stdio: "inherit"
       });
-      Logger15.info(`Uploading env archive to remote server "${remoteServer.name}"...`);
+      Logger14.info(`Uploading env archive to remote server "${remoteServer.name}"...`);
       await workspace.spawn("scp", this.#getScpArgs(remoteServer.config, filePath, remoteTarget), {
         cwd: workspace.workspaceRoot,
         stdio: "inherit"
@@ -11039,19 +11400,15 @@ ${chalk7.green("\u27A4")} Authentication Required`));
     await workspace.spawn("tar", ["-cf", "local/env.tar", ...envFilePaths], {
       cwd: workspace.workspaceRoot
     });
-    Logger15.info(`Archived ${envFilePaths.length} environment files to local/env.tar`);
+    Logger14.info(`Archived ${envFilePaths.length} environment files to local/env.tar`);
     return { files: envFilePaths, path: "local/env.tar" };
   }
 }
 
 // pkgs/@akanjs/cli/cloud/cloud.script.ts
-class CloudScript extends script("cloud", [
-  CloudRunner,
-  ApplicationScript,
-  PackageScript
-]) {
+class CloudScript extends script("cloud", [CloudRunner, ApplicationScript, PackageScript]) {
   async login(workspace) {
-    await this.cloudRunner.login();
+    await this.cloudRunner.login(workspace);
   }
   async logout(workspace) {
     await this.cloudRunner.logout();
@@ -11069,7 +11426,7 @@ class CloudScript extends script("cloud", [
   async downloadEnv(workspace) {
     const workspaceId = workspace.getWorkspaceId({ allowEmpty: true });
     if (workspaceId) {
-      const cloudApi2 = await CloudApi.fromHost();
+      const cloudApi2 = await CloudApi.fromHost(workspace);
       await this.cloudRunner.downloadEnv(cloudApi2, workspace, workspaceId);
       return;
     }
@@ -11079,7 +11436,7 @@ class CloudScript extends script("cloud", [
     const workspaceId = workspace.getWorkspaceId({ allowEmpty: true });
     const { path: path39 } = await this.cloudRunner.gatherEnvFiles(workspace);
     if (workspaceId) {
-      const cloudApi2 = await CloudApi.fromHost();
+      const cloudApi2 = await CloudApi.fromHost(workspace);
       await this.cloudRunner.uploadEnv(cloudApi2, workspaceId, path39);
       return;
     }
@@ -11100,7 +11457,7 @@ class CloudScript extends script("cloud", [
     const spinner2 = workspace.spinning("Updating Akan.js packages and CLI...");
     await this.cloudRunner.update(workspace, tag, { registryUrl });
     spinner2.succeed("Akan.js packages and CLI updated, global version is below");
-    Logger16.raw("> Akan version: ");
+    Logger15.raw("> Akan version: ");
     await workspace.spawn("akan", ["--version"], { stdio: "inherit" });
   }
 }
@@ -11154,7 +11511,8 @@ class CloudCommand extends command("cloud", [CloudScript], ({ public: target })
     enum: [
       { label: "npm", value: "npm" },
       { label: "local", value: "local" }
-    ]
+    ],
+    default: process.env.USE_AKANJS_PKGS === "true" ? undefined : "npm"
   }).exec(async function(workspace, tag, registry) {
     await this.cloudScript.update(workspace, tag, {
       registryUrl: resolveRegistryUrl(registry)
@@ -11499,7 +11857,7 @@ class LibraryCommand extends command("library", [LibraryScript], ({ public: targ
 // pkgs/@akanjs/cli/localRegistry/localRegistry.runner.ts
 import { mkdir as mkdir11, rm as rm5 } from "fs/promises";
 import path39 from "path";
-import { Logger as Logger17 } from "akanjs/common";
+import { Logger as Logger16 } from "akanjs/common";
 var defaultLocalRegistryUrl = "http://127.0.0.1:4873";
 var containerName = "akan-verdaccio";
 var smokeRepoName = "akan-local-smoke";
@@ -11513,7 +11871,7 @@ class LocalRegistryRunner extends runner("localRegistry") {
     const registry = this.getRegistryUrl(registryUrl);
     try {
       await workspace.spawn("docker", ["inspect", containerName]);
-      Logger17.info(`Local registry is already running at ${registry}`);
+      Logger16.info(`Local registry is already running at ${registry}`);
       return registry;
     } catch {}
     const configPath2 = path39.join(workspace.workspaceRoot, "pkgs/@akanjs/cli/localRegistry/verdaccio.yaml");
@@ -11533,7 +11891,7 @@ class LocalRegistryRunner extends runner("localRegistry") {
       `${storagePath}:/verdaccio/storage`,
       "verdaccio/verdaccio:6"
     ], { stdio: "inherit" });
-    Logger17.info(`Local registry is running at ${registry}`);
+    Logger16.info(`Local registry is running at ${registry}`);
     return registry;
   }
   async reset(workspace) {
@@ -11541,7 +11899,7 @@ class LocalRegistryRunner extends runner("localRegistry") {
       await workspace.spawn("docker", ["rm", "-f", containerName], { stdio: "inherit" });
     } catch {}
     await rm5(path39.join(workspace.workspaceRoot, ".akan/verdaccio"), { recursive: true, force: true });
-    Logger17.info("Local registry storage has been reset");
+    Logger16.info("Local registry storage has been reset");
   }
   async smoke(workspace, { registryUrl } = {}) {
     const registry = this.getRegistryUrl(registryUrl);
@@ -11567,7 +11925,7 @@ class LocalRegistryRunner extends runner("localRegistry") {
       env: { ...process.env, AKAN_NPM_REGISTRY: registry, NPM_CONFIG_REGISTRY: registry },
       stdio: "inherit"
     });
-    Logger17.info(`Local registry smoke test completed for ${smokeRepoName}/${smokeAppName}`);
+    Logger16.info(`Local registry smoke test completed for ${smokeRepoName}/${smokeAppName}`);
   }
 }
 
@@ -12433,7 +12791,7 @@ class ScalarCommand extends command("scalar", [ScalarScript], ({ public: target
 
 // pkgs/@akanjs/cli/workspace/workspace.script.ts
 import path41 from "path";
-import { Logger as Logger18 } from "akanjs/common";
+import { Logger as Logger17 } from "akanjs/common";
 
 // pkgs/@akanjs/cli/workspace/workspace.runner.ts
 import path40 from "path";
@@ -12457,16 +12815,16 @@ var defaultWorkspacePeerDependencies = new Set([
 
 class WorkspaceRunner extends runner("workspace") {
   async createWorkspace(repoName, appName, {
-    dirname: dirname3 = ".",
+    dirname: dirname2 = ".",
     init = true,
     akanVersion,
     registryUrl
   }) {
     const cwdPath = process.cwd();
-    const workspaceRoot = path40.join(cwdPath, dirname3, repoName);
+    const workspaceRoot = path40.join(cwdPath, dirname2, repoName);
     const normalizedRegistryUrl = registryUrl ? getNpmRegistryUrl(registryUrl) : undefined;
     const workspace = WorkspaceExecutor.fromRoot({ workspaceRoot, repoName });
-    const templateSpinner = workspace.spinning(`Creating workspace template files in ${dirname3}/${repoName}...`);
+    const templateSpinner = workspace.spinning(`Creating workspace template files in ${dirname2}/${repoName}...`);
     const [latestBiomeVersion, latestTypesBunVersion] = await Promise.all([
       getLatestPackageVersion("@biomejs/biome", "latest", normalizedRegistryUrl),
       getLatestPackageVersion("@types/bun", "latest", normalizedRegistryUrl)
@@ -12479,7 +12837,7 @@ class WorkspaceRunner extends runner("workspace") {
     if (normalizedRegistryUrl)
       await workspace.writeFile(".npmrc", `registry=${normalizedRegistryUrl}/
 `);
-    templateSpinner.succeed(`Workspace files created in ${dirname3}/${repoName}`);
+    templateSpinner.succeed(`Workspace files created in ${dirname2}/${repoName}`);
     const [rootPackageJson, peerDependencies] = await Promise.all([
       workspace.getPackageJson(),
       this.#getAkanPeerDependencies()
@@ -12584,14 +12942,14 @@ class WorkspaceScript extends script("workspace", [
   PackageScript
 ]) {
   async createWorkspace(repoName, appName, {
-    dirname: dirname3 = ".",
+    dirname: dirname2 = ".",
     installLibs = false,
     init = true,
     registryUrl
   }) {
     const akanVersion = await this.packageScript.version(null, { log: false });
     const workspace = await this.workspaceRunner.createWorkspace(repoName, appName, {
-      dirname: dirname3,
+      dirname: dirname2,
       init,
       akanVersion,
       ...registryUrl ? { registryUrl } : {}
@@ -12608,11 +12966,11 @@ class WorkspaceScript extends script("workspace", [
     } catch (_) {
       gitSpinner.fail("Git repository initialization failed. It's not fatal, you can commit manually");
     }
-    const workspacePath = path41.join(dirname3, repoName);
-    Logger18.rawLog(`
-\uD83C\uDF89 Welcome aboard! Workspace created in ${dirname3}/${repoName}`);
-    Logger18.rawLog(`\uD83D\uDE80 Run \`cd ${workspacePath} && akan start ${appName}\` to start the development server.`);
-    Logger18.rawLog(`
+    const workspacePath = path41.join(dirname2, repoName);
+    Logger17.rawLog(`
+\uD83C\uDF89 Welcome aboard! Workspace created in ${dirname2}/${repoName}`);
+    Logger17.rawLog(`\uD83D\uDE80 Run \`cd ${workspacePath} && akan start ${appName}\` to start the development server.`);
+    Logger17.rawLog(`
 \uD83D\uDC4B Happy coding!`);
   }
   async lint(exec2, workspace, { fix = true } = {}) {