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

package/index.js

@@ -15,10 +15,7 @@ import { ChatOpenAI } from "@langchain/openai";
 import { Logger as Logger2 } from "akanjs/common";
 import chalk from "chalk";
 
-// pkgs/@akanjs/devkit/auth.ts
-import { mkdir } from "fs/promises";
-
-// pkgs/@akanjs/devkit/constants.ts
+// pkgs/@akanjs/devkit/cloud/constants.ts
 var basePath = `${Bun.env.HOME ?? Bun.env.USERPROFILE}/.akan`;
 var configPath = `${basePath}/config.json`;
 var akanCloudHost = process.env.AKAN_PUBLIC_OPERATION_MODE === "local" ? "http://localhost" : "https://cloud.akanjs.com";
@@ -26,9 +23,14 @@ var akanCloudUrl = `${akanCloudHost}${process.env.AKAN_PUBLIC_OPERATION_MODE ===
 var defaultHostConfig = {};
 var defaultAkanGlobalConfig = {
   cloudHost: {},
+  remoteEnvServers: {},
   llm: null
 };
 
+// pkgs/@akanjs/devkit/cloud/globalConfig.ts
+import { mkdir } from "fs/promises";
+import dayjs from "dayjs";
+
 // pkgs/@akanjs/devkit/fileSys.ts
 import { stat } from "fs/promises";
 import { Logger } from "akanjs/common";
@@ -67,35 +69,198 @@ class FileSys {
   }
 }
 
-// pkgs/@akanjs/devkit/auth.ts
-var getAkanGlobalConfig = async () => {
-  const exists = await FileSys.fileExists(configPath);
-  const akanConfig = exists ? await FileSys.readJson(configPath) : defaultAkanGlobalConfig;
-  return akanConfig;
-};
-var setAkanGlobalConfig = async (akanConfig) => {
-  await mkdir(basePath, { recursive: true });
-  await Bun.write(configPath, JSON.stringify(akanConfig, null, 2));
-};
-var getHostConfig = async (host = akanCloudHost) => {
-  const akanConfig = await getAkanGlobalConfig();
-  return akanConfig.cloudHost[host] ?? defaultHostConfig;
-};
-var setHostConfig = async (host = akanCloudHost, config = {}) => {
-  const akanConfig = await getAkanGlobalConfig();
-  akanConfig.cloudHost[host] = config;
-  await setAkanGlobalConfig(akanConfig);
-};
-var getSelf = async (token) => {
-  try {
-    const res = await fetch(`${akanCloudUrl}/user/getSelf`, { headers: { Authorization: `Bearer ${token}` } });
-    const user = await res.json();
-    return user;
-  } catch (e) {
-    return null;
+// pkgs/@akanjs/devkit/cloud/globalConfig.ts
+class GlobalConfig {
+  static async#getAkanGlobalConfig() {
+    const exists = await FileSys.fileExists(configPath);
+    const akanConfig = exists ? await FileSys.readJson(configPath) : {};
+    return {
+      ...defaultAkanGlobalConfig,
+      ...akanConfig,
+      cloudHost: akanConfig.cloudHost ?? defaultAkanGlobalConfig.cloudHost,
+      remoteEnvServers: akanConfig.remoteEnvServers ?? defaultAkanGlobalConfig.remoteEnvServers
+    };
   }
-};
+  static async#setAkanGlobalConfig(akanConfig) {
+    await mkdir(basePath, { recursive: true });
+    await Bun.write(configPath, JSON.stringify(akanConfig, null, 2));
+  }
+  static async getHostConfig(host = akanCloudHost) {
+    const akanConfig = await GlobalConfig.#getAkanGlobalConfig();
+    return GlobalConfig.toHostConfig(akanConfig.cloudHost[host] ?? defaultHostConfig);
+  }
+  static async setHostConfig(host = akanCloudHost, config = {}) {
+    const akanConfig = await GlobalConfig.#getAkanGlobalConfig();
+    akanConfig.cloudHost[host] = GlobalConfig.toHostConfigDto(config);
+    await GlobalConfig.#setAkanGlobalConfig(akanConfig);
+  }
+  static async getLlmConfig() {
+    const akanConfig = await GlobalConfig.#getAkanGlobalConfig();
+    return akanConfig.llm ?? null;
+  }
+  static async setLlmConfig(llmConfig) {
+    const akanConfig = await GlobalConfig.#getAkanGlobalConfig();
+    await GlobalConfig.#setAkanGlobalConfig({ ...akanConfig, llm: llmConfig });
+  }
+  static async getRemoteEnvServers() {
+    const akanConfig = await GlobalConfig.#getAkanGlobalConfig();
+    return akanConfig.remoteEnvServers;
+  }
+  static async setRemoteEnvServer(name, config) {
+    const akanConfig = await GlobalConfig.#getAkanGlobalConfig();
+    await GlobalConfig.#setAkanGlobalConfig({
+      ...akanConfig,
+      remoteEnvServers: {
+        ...akanConfig.remoteEnvServers,
+        [name]: config
+      }
+    });
+  }
+  static async removeRemoteEnvServer(name) {
+    const akanConfig = await GlobalConfig.#getAkanGlobalConfig();
+    const { [name]: _, ...remoteEnvServers } = akanConfig.remoteEnvServers;
+    await GlobalConfig.#setAkanGlobalConfig({
+      ...akanConfig,
+      remoteEnvServers
+    });
+  }
+  static needRefreshToken(accessToken) {
+    return !!accessToken?.expiresAt?.isBefore(dayjs().add(1, "hour"));
+  }
+  static toAccessToken(accessToken) {
+    return {
+      jwt: accessToken.jwt,
+      refreshToken: accessToken.refreshToken ?? null,
+      expiresAt: accessToken.expiresAt ? dayjs(accessToken.expiresAt) : null
+    };
+  }
+  static toAccessTokenDto(accessToken) {
+    return {
+      jwt: accessToken.jwt,
+      refreshToken: accessToken.refreshToken ?? null,
+      expiresAt: accessToken.expiresAt?.toString() ?? null
+    };
+  }
+  static toHostConfigDto(hostConfig) {
+    return {
+      auth: {
+        accessToken: hostConfig.auth?.accessToken ? GlobalConfig.toAccessTokenDto(hostConfig.auth.accessToken) : undefined,
+        self: hostConfig.auth?.self
+      }
+    };
+  }
+  static toHostConfig(hostConfigDto) {
+    return {
+      auth: {
+        accessToken: hostConfigDto.auth?.accessToken ? GlobalConfig.toAccessToken(hostConfigDto.auth.accessToken) : undefined,
+        self: hostConfigDto.auth?.self
+      }
+    };
+  }
+}
+
+// pkgs/@akanjs/devkit/cloud/cloudApi.ts
+class HttpClient {
+  baseUrl;
+  headers = {};
+  constructor(baseUrl, headers = {}) {
+    this.baseUrl = baseUrl;
+    this.headers = headers;
+  }
+  async get(url, { headers } = {}) {
+    const response = await fetch(`${this.baseUrl}${url}`, {
+      headers: {
+        "Content-Type": "application/json",
+        ...this.headers,
+        ...headers
+      }
+    });
+    return response.json();
+  }
+  async getFile(url, localPath, headers) {
+    const response = await fetch(`${this.baseUrl}${url}`, {
+      headers: { ...this.headers, ...headers }
+    });
+    if (!response.ok)
+      throw new Error(`Failed to download file: ${response.status} ${response.statusText}`);
+    await Bun.write(localPath, response);
+  }
+  async post(url, data, { headers } = {}) {
+    const isFormData = data instanceof FormData;
+    const response = await fetch(`${this.baseUrl}${url}`, {
+      method: "POST",
+      body: isFormData ? data : JSON.stringify(data),
+      headers: isFormData ? { ...this.headers, ...headers } : { "Content-Type": "application/json", ...this.headers, ...headers }
+    });
+    return response.json();
+  }
+  setHeaders(headers) {
+    Object.assign(this.headers, headers);
+    return this;
+  }
+}
 
+class CloudApi {
+  #api;
+  #accessToken = null;
+  static async fromHost(host) {
+    const hostConfig = await GlobalConfig.getHostConfig(host);
+    return new CloudApi(hostConfig);
+  }
+  constructor(hostConfig) {
+    const host = akanCloudHost;
+    this.#api = new HttpClient(`${host}/api`);
+    this.#accessToken = hostConfig.auth?.accessToken ?? null;
+    if (this.#accessToken && !GlobalConfig.needRefreshToken(this.#accessToken))
+      this.#api.setHeaders({
+        Authorization: `Bearer ${this.#accessToken.jwt}`
+      });
+  }
+  async uploadEnv(devProjectId, file) {
+    const formData = new FormData;
+    formData.append("devProjectId", devProjectId);
+    formData.append("file", file);
+    const data = await this.#api.post(`/uploadEnv/${devProjectId}`, formData);
+    return data;
+  }
+  async downloadEnv(devProjectId, localPath) {
+    await this.#api.getFile(`/downloadEnv/${devProjectId}`, localPath);
+  }
+  async getRemoteAuthToken(remoteId) {
+    try {
+      if (this.#accessToken) {
+        if (GlobalConfig.needRefreshToken(this.#accessToken))
+          return await this.refreshAuthToken();
+        else
+          return await this.refreshAuthToken();
+      }
+      const accessToken = await this.#api.get(`/getRemoteAuthToken/${remoteId}`);
+      this.#accessToken = GlobalConfig.toAccessToken(accessToken);
+      this.#api.setHeaders({
+        Authorization: `Bearer ${this.#accessToken.jwt}`
+      });
+      return this.#accessToken;
+    } catch (_) {
+      return null;
+    }
+  }
+  async refreshAuthToken() {
+    const response = await this.#api.post(`/refreshRemoteAuthToken`, {
+      refreshToken: this.#accessToken?.refreshToken
+    });
+    this.#accessToken = GlobalConfig.toAccessToken(response);
+    this.#api.setHeaders({ Authorization: `Bearer ${this.#accessToken.jwt}` });
+    return this.#accessToken;
+  }
+  async getRemoteSelf() {
+    try {
+      const data = await this.#api.get(`/getRemoteSelf`);
+      return data;
+    } catch {
+      return null;
+    }
+  }
+}
 // pkgs/@akanjs/devkit/spinner.ts
 import ora from "ora";
 
@@ -158,12 +323,18 @@ class Spinner {
 
 // pkgs/@akanjs/devkit/aiEditor.ts
 var MAX_ASK_TRY = 300;
-var supportedLlmModels = ["deepseek-chat", "deepseek-reasoner"];
+var supportedLlmModels = [
+  "deepseek-chat",
+  "deepseek-reasoner"
+];
 
 class AiSession {
   static #cacheDir = "node_modules/.cache/akan/aiSession";
   static #chat = null;
-  static async init({ temperature = 0, useExisting = true } = {}) {
+  static async init({
+    temperature = 0,
+    useExisting = true
+  } = {}) {
     if (useExisting) {
       const llmConfig2 = await AiSession.getLlmConfig();
       if (llmConfig2) {
@@ -190,22 +361,24 @@ class AiSession {
     return AiSession;
   }
   static async getLlmConfig() {
-    const akanConfig = await getAkanGlobalConfig();
-    return akanConfig.llm ?? null;
+    return await GlobalConfig.getLlmConfig();
   }
   static async setLlmConfig(llmConfig) {
-    const akanConfig = await getAkanGlobalConfig();
-    akanConfig.llm = llmConfig;
-    await setAkanGlobalConfig(akanConfig);
+    await GlobalConfig.setLlmConfig(llmConfig);
     return AiSession;
   }
   static async#requestLlmConfig() {
-    const model = await select({ message: "Select a LLM model", choices: supportedLlmModels });
+    const model = await select({
+      message: "Select a LLM model",
+      choices: supportedLlmModels
+    });
     const apiKey = await input({ message: "Enter your API key" });
     return { model, apiKey };
   }
   static async#validateApiKey(modelName, apiKey) {
-    const spinner = new Spinner("Validating LLM API key...", { prefix: `\uD83E\uDD16akan-editor` }).start();
+    const spinner = new Spinner("Validating LLM API key...", {
+      prefix: `\uD83E\uDD16akan-editor`
+    }).start();
     const chat = new ChatOpenAI({
       modelName,
       temperature: 0,
@@ -228,7 +401,11 @@ class AiSession {
   sessionKey;
   isCacheLoaded = false;
   workspace;
-  constructor(type, { workspace, cacheKey, isContinued }) {
+  constructor(type, {
+    workspace,
+    cacheKey,
+    isContinued
+  }) {
     this.workspace = workspace;
     this.sessionKey = `${type}${cacheKey ? `-${cacheKey}` : ""}`;
     if (isContinued)
@@ -303,7 +480,13 @@ class AiSession {
       throw new Error("Failed to stream response");
     }
   }
-  async edit(question, { onChunk, onReasoning, maxTry = MAX_ASK_TRY, validate, approve } = {}) {
+  async edit(question, {
+    onChunk,
+    onReasoning,
+    maxTry = MAX_ASK_TRY,
+    validate,
+    approve
+  } = {}) {
     for (let tryCount = 0;tryCount < maxTry; tryCount++) {
       let response = await this.ask(question, { onChunk, onReasoning });
       if (validate?.length && tryCount === 0) {
@@ -356,7 +539,9 @@ ${validate.map((v) => `- ${v}`).join(`
   async#tryFixTypescripts(writes, executor, options = {}) {
     const MAX_EDIT_TRY = 5;
     for (let tryCount = 0;tryCount < MAX_EDIT_TRY; tryCount++) {
-      const loader = new Spinner(`Type checking and linting...`, { prefix: `\uD83E\uDD16akan-editor` }).start();
+      const loader = new Spinner(`Type checking and linting...`, {
+        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);
@@ -2164,11 +2349,26 @@ class Executor {
     });
     return new Promise((resolve, reject) => {
       proc.on("error", (error) => {
-        reject(new CommandExecutionError({ command, cwd, code: null, signal: null, stdout, stderr, cause: error }));
+        reject(new CommandExecutionError({
+          command,
+          cwd,
+          code: null,
+          signal: null,
+          stdout,
+          stderr,
+          cause: error
+        }));
       });
       proc.on("exit", (code, signal) => {
         if (!!code || signal)
-          reject(new CommandExecutionError({ command, cwd, code, signal, stdout, stderr }));
+          reject(new CommandExecutionError({
+            command,
+            cwd,
+            code,
+            signal,
+            stdout,
+            stderr
+          }));
         else
           resolve({ code, signal });
       });
@@ -2194,11 +2394,28 @@ class Executor {
     });
     return new Promise((resolve, reject) => {
       proc.on("error", (error) => {
-        reject(new CommandExecutionError({ command, args, cwd, code: null, signal: null, stdout, stderr, cause: 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(new CommandExecutionError({ command, args, cwd, code, signal, stdout, stderr }));
+          reject(new CommandExecutionError({
+            command,
+            args,
+            cwd,
+            code,
+            signal,
+            stdout,
+            stderr
+          }));
         else
           resolve(stdout);
       });
@@ -2242,7 +2459,15 @@ class Executor {
       });
       proc.on("exit", (code, signal) => {
         if (!!code || signal)
-          reject(new CommandExecutionError({ command: modulePath, args, cwd, code, signal, stdout, stderr }));
+          reject(new CommandExecutionError({
+            command: modulePath,
+            args,
+            cwd,
+            code,
+            signal,
+            stdout,
+            stderr
+          }));
         else
           resolve({ code, signal });
       });
@@ -2389,7 +2614,10 @@ class Executor {
       const result = {
         ...extendsTsconfig,
         ...tsconfig,
-        compilerOptions: { ...extendsTsconfig.compilerOptions, ...tsconfig.compilerOptions }
+        compilerOptions: {
+          ...extendsTsconfig.compilerOptions,
+          ...tsconfig.compilerOptions
+        }
       };
       this.#tsconfig = result;
       return result;
@@ -2444,7 +2672,9 @@ class Executor {
       const convertedTargetPath = Object.entries(dict).reduce((path8, [key, value]) => path8.replace(new RegExp(`__${key}__`, "g"), value), targetPath.slice(0, -9));
       const convertedContent = Object.entries(dict).reduce((data, [key, value]) => data.replace(new RegExp(`<%= ${key} %>`, "g"), value), content);
       this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
-      return this.writeFile(convertedTargetPath, convertedContent, { overwrite });
+      return this.writeFile(convertedTargetPath, convertedContent, {
+        overwrite
+      });
     } 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);
@@ -2470,14 +2700,24 @@ class Executor {
     const prefixTemplatePath = templatePath;
     if ((await stat2(prefixTemplatePath)).isFile()) {
       const filename = path7.basename(prefixTemplatePath);
-      const fileContent = await this.#applyTemplateFile({ templatePath: prefixTemplatePath, targetPath: path7.join(basePath2, filename), scanInfo, overwrite }, dict, options);
+      const fileContent = await this.#applyTemplateFile({
+        templatePath: prefixTemplatePath,
+        targetPath: path7.join(basePath2, filename),
+        scanInfo,
+        overwrite
+      }, dict, options);
       return fileContent ? [fileContent] : [];
     } else {
       const subdirs = await readDirEntries(templatePath);
       const fileContents = (await Promise.all(subdirs.map(async (subdir) => {
         const subpath = path7.join(templatePath, subdir);
         if ((await stat2(subpath)).isFile()) {
-          const fileContent = await this.#applyTemplateFile({ templatePath: subpath, targetPath: path7.join(basePath2, subdir), scanInfo, overwrite }, dict, options);
+          const fileContent = await this.#applyTemplateFile({
+            templatePath: subpath,
+            targetPath: path7.join(basePath2, subdir),
+            scanInfo,
+            overwrite
+          }, dict, options);
           return fileContent ? [fileContent] : [];
         } else
           return await this._applyTemplate({
@@ -2528,7 +2768,10 @@ class Executor {
   async lint(filePath, { fix = false, dryRun = false } = {}) {
     const path8 = this.getPath(filePath);
     const linter = this.getLinter();
-    const { results, errors, warnings } = await linter.lint(path8, { fix, dryRun });
+    const { results, errors, warnings } = await linter.lint(path8, {
+      fix,
+      dryRun
+    });
     const message = linter.formatLintResults(results);
     return { results, message, errors, warnings };
   }
@@ -2554,6 +2797,7 @@ class WorkspaceExecutor extends Executor {
     const sourceEnv = envPath ? { ...process.env, ...parseEnvFile(envPath) } : process.env;
     const appName = sourceEnv.AKAN_PUBLIC_APP_NAME;
     const workspaceRoot = sourceEnv.AKAN_WORKSPACE_ROOT;
+    const workspaceId = sourceEnv.AKAN_WORKSPACE_ID;
     const repoName = sourceEnv.AKAN_PUBLIC_REPO_NAME;
     if (!repoName)
       throw new Error("AKAN_PUBLIC_REPO_NAME is not set");
@@ -2564,7 +2808,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 };
+    return { ...appName ? { appName } : {}, workspaceRoot, repoName, serveDomain, env, portOffset, workspaceId };
+  }
+  getWorkspaceId({
+    allowEmpty
+  } = {}) {
+    const { workspaceId } = WorkspaceExecutor.getBaseDevEnv();
+    if (!workspaceId && !allowEmpty)
+      throw new Error("Workspace ID is not found");
+    return workspaceId;
   }
   async scan() {
     return await WorkspaceInfo.fromExecutor(this);
@@ -2768,7 +3020,11 @@ class SysExecutor extends Executor {
   } = {}) {
     if (this.#scanInfo && !refresh)
       return this.#scanInfo;
-    const scanInfo = this.type === "app" ? await AppInfo.fromExecutor(this, { refresh }) : await LibInfo.fromExecutor(this, { refresh });
+    const scanInfo = this.type === "app" ? await AppInfo.fromExecutor(this, {
+      refresh
+    }) : await LibInfo.fromExecutor(this, {
+      refresh
+    });
     if (write) {
       await Promise.all(this.#getScanTemplateTasks(scanInfo));
       await this.writeJson(`akan.${this.type}.json`, scanInfo.getScanResult());
@@ -2877,7 +3133,11 @@ class SysExecutor extends Executor {
       ...Object.fromEntries(Object.entries(options.dict ?? {}).map(([key, value]) => [capitalize(key), capitalize(value)]))
     };
     const scanInfo = await this.scan();
-    const fileContents = await this._applyTemplate({ ...options, scanInfo, dict });
+    const fileContents = await this._applyTemplate({
+      ...options,
+      scanInfo,
+      dict
+    });
     await this.scan();
     return fileContents;
   }
@@ -2983,7 +3243,11 @@ class AppExecutor extends SysExecutor {
       this.#pageKeys = [];
       return this.#pageKeys;
     }
-    for await (const rel of glob.scan({ cwd: pageDir, absolute: false, onlyFiles: true })) {
+    for await (const rel of glob.scan({
+      cwd: pageDir,
+      absolute: false,
+      onlyFiles: true
+    })) {
       const segments = rel.split(path7.sep);
       if (segments.some((s) => s === "node_modules"))
         continue;
@@ -2993,7 +3257,10 @@ class AppExecutor extends SysExecutor {
       if (!isRouteSourceFile(posix))
         continue;
       const key = `./${posix}`;
-      validateSubRoutePageKey(key, akanConfig2.basePaths, { appName: this.name, filePath: absPath });
+      validateSubRoutePageKey(key, akanConfig2.basePaths, {
+        appName: this.name,
+        filePath: absPath
+      });
       const parsed = parseRouteModuleKey(key);
       if (parsed.isInternalRootLayout) {
         throw new Error(`[route-convention] __root_layout is reserved for Akan.js generated root layout: ${absPath}`);
@@ -3033,7 +3300,11 @@ class AppExecutor extends SysExecutor {
     ]);
   }
   async scanSync({ refresh = false, write = true } = {}) {
-    const scanInfo = await this.scan({ refresh, write, writeLib: write });
+    const scanInfo = await this.scan({
+      refresh,
+      write,
+      writeLib: write
+    });
     if (write)
       await this.syncAssets(scanInfo.getScanResult().libDeps);
     return scanInfo;
@@ -3097,7 +3368,10 @@ class PkgExecutor extends Executor {
     return scanInfo;
   }
   async#getDependencyVersion(rootPackageJson, dep) {
-    const rootDeps = { ...rootPackageJson.dependencies, ...rootPackageJson.devDependencies };
+    const rootDeps = {
+      ...rootPackageJson.dependencies,
+      ...rootPackageJson.devDependencies
+    };
     const rootVersion = rootDeps[dep];
     if (rootVersion)
       return rootVersion;
@@ -3153,7 +3427,14 @@ class PkgExecutor extends Executor {
     const distPkgJson = {
       ...pkgJson,
       type: "module",
-      exports: { ...pkgJson.exports, ".": { import: "./index.ts", types: "./index.ts", default: "./index.ts" } },
+      exports: {
+        ...pkgJson.exports,
+        ".": {
+          import: "./index.ts",
+          types: "./index.ts",
+          default: "./index.ts"
+        }
+      },
       engines: { bun: ">=1.3.13" },
       ...dependencyMaps
     };
@@ -7447,7 +7728,7 @@ class ApplicationBuildRunner {
 import { cp, mkdir as mkdir8, rm as rm3 } from "fs/promises";
 
 // pkgs/@akanjs/devkit/uploadRelease.ts
-import { HttpClient, Logger as Logger10 } from "akanjs/common";
+import { HttpClient as HttpClient2, Logger as Logger10 } from "akanjs/common";
 var spinning = (message) => {
   const spinner = new Spinner(message, { prefix: message, enableSpin: true }).start();
   return spinner;
@@ -7462,7 +7743,7 @@ var uploadRelease = async (appName, {
 }) => {
   const logger = new Logger10("uploadRelease");
   const basePath2 = local ? "http://localhost:8282/backend" : "https://cloud.akanjs.com/backend";
-  const httpClient = new HttpClient(basePath2);
+  const httpClient = new HttpClient2(basePath2);
   const buildPath = `${workspaceRoot}/releases/builds/${appName}-release.tar.gz`;
   const appBuildPath = `${workspaceRoot}/releases/builds/${appName}-appBuild.zip`;
   const sourcePath = `${workspaceRoot}/releases/sources/${appName}-source.tar.gz`;
@@ -9449,75 +9730,6 @@ import { Box as Box2, Newline, Text as Text2, useInput as useInput2 } from "ink"
 import { useEffect as useEffect3, useState as useState3 } from "react";
 import { jsxDEV as jsxDEV2, Fragment as Fragment2 } from "react/jsx-dev-runtime";
 "use client";
-// pkgs/@akanjs/devkit/cloud/cloudApi.ts
-class HttpClient2 {
-  baseUrl;
-  constructor(baseUrl) {
-    this.baseUrl = baseUrl;
-  }
-  async get(url, { headers } = {}) {
-    const response = await fetch(`${this.baseUrl}${url}`, {
-      headers: { "Content-Type": "application/json", ...headers }
-    });
-    return response.json();
-  }
-  async post(url, data, { headers } = {}) {
-    const isFormData = data instanceof FormData;
-    const response = await fetch(`${this.baseUrl}${url}`, {
-      method: "POST",
-      body: isFormData ? data : JSON.stringify(data),
-      headers: isFormData ? headers : { "Content-Type": "application/json", ...headers }
-    });
-    return response.json();
-  }
-}
-
-class CloudApi {
-  api;
-  #accessToken = null;
-  constructor(host, { accessToken } = {}) {
-    this.api = new HttpClient2(`${host}/api`);
-    this.#accessToken = accessToken ?? null;
-  }
-  async uploadEnv(devProjectId, fileStream) {
-    const formData = new FormData;
-    formData.append("devProjectId", devProjectId);
-    formData.append("fileStream", await new Response(fileStream).blob());
-    const response = await this.api.post(`/uploadEnv/${devProjectId}`, formData);
-    return response.success;
-  }
-  async downloadEnv(devProjectId) {
-    const response = await this.api.get(`/downloadEnv/${devProjectId}`);
-    return response.success;
-  }
-  async getRemoteAuthToken(remoteId) {
-    if (this.#needRefreshToken())
-      return await this.refreshAuthToken();
-    else if (this.#accessToken)
-      return this.#accessToken;
-    const accessToken = await this.api.get(`/getRemoteAuthToken/${remoteId}`);
-    this.#accessToken = {
-      jwt: accessToken.jwt,
-      refreshToken: accessToken.refreshToken,
-      expiresAt: new Date(accessToken.expiresAt)
-    };
-    return accessToken;
-  }
-  async refreshAuthToken() {
-    const response = await this.api.post(`/refreshRemoteAuthToken`, {
-      refreshToken: this.#accessToken?.refreshToken
-    });
-    this.#accessToken = {
-      jwt: response.jwt,
-      refreshToken: response.refreshToken,
-      expiresAt: new Date(response.expiresAt)
-    };
-    return response;
-  }
-  #needRefreshToken() {
-    return !!(this.#accessToken?.expiresAt && this.#accessToken.expiresAt.getTime() < Date.now() - 1000 * 60 * 60);
-  }
-}
 // pkgs/@akanjs/cli/application/application.command.ts
 import { select as select6 } from "@inquirer/prompts";
 
@@ -10404,7 +10616,7 @@ class PackageScript extends script("package", [PackageRunner]) {
 
 // pkgs/@akanjs/cli/cloud/cloud.runner.ts
 import path38 from "path";
-import { confirm as confirm3 } from "@inquirer/prompts";
+import { confirm as confirm3, input as input5, select as select7 } from "@inquirer/prompts";
 import { Logger as Logger15, sleep } from "akanjs/common";
 import chalk7 from "chalk";
 import * as QRcode from "qrcode";
@@ -10426,6 +10638,9 @@ async function getLatestPackageVersion(packageName, tag = "latest", registryUrl)
 }
 
 // pkgs/@akanjs/cli/cloud/cloud.runner.ts
+var addRemoteEnvServerValue = "__addRemoteEnvServer";
+var removeRemoteEnvServerValue = "__removeRemoteEnvServer";
+
 class CloudRunner extends runner("cloud") {
   #akanFrameworkPackages = new Set([
     "akanjs",
@@ -10450,9 +10665,126 @@ class CloudRunner extends runner("cloud") {
       NPM_CONFIG_REGISTRY: getNpmRegistryUrl(registryUrl)
     } : process.env;
   }
+  async#addRemoteEnvServer() {
+    const name = (await input5({
+      message: "Remote server name: ",
+      validate: (value) => value.trim() ? true : "Remote server name is required"
+    })).trim();
+    const host = (await input5({
+      message: "Remote server host: ",
+      validate: (value) => value.trim() ? true : "Remote server host is required"
+    })).trim();
+    const username = (await input5({ message: "Remote server username (optional): " })).trim() || undefined;
+    const portInput = (await input5({
+      message: "Remote server SSH port (optional): ",
+      validate: (value) => {
+        const trimmed = value.trim();
+        if (!trimmed)
+          return true;
+        const port = Number(trimmed);
+        return Number.isInteger(port) && port > 0 ? true : "SSH port must be a positive integer";
+      }
+    })).trim();
+    const config = {
+      host,
+      ...username ? { username } : {},
+      ...portInput ? { port: Number(portInput) } : {}
+    };
+    await GlobalConfig.setRemoteEnvServer(name, config);
+    return { name, config };
+  }
+  async#selectRemoteEnvServer() {
+    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.");
+      return await this.#addRemoteEnvServer();
+    }
+    const selectedName = await select7({
+      message: "Select the remote env server",
+      choices: [
+        ...serverEntries.map(([name, config2]) => ({
+          name: `${name} (${config2.username ? `${config2.username}@` : ""}${config2.host}${config2.port ? `:${config2.port}` : ""})`,
+          value: name
+        })),
+        { name: "Add new remote server", value: addRemoteEnvServerValue },
+        { name: "Remove remote server", value: removeRemoteEnvServerValue }
+      ]
+    });
+    if (selectedName === addRemoteEnvServerValue)
+      return await this.#addRemoteEnvServer();
+    if (selectedName === removeRemoteEnvServerValue) {
+      await this.#removeRemoteEnvServer(serverEntries);
+      return await this.#selectRemoteEnvServer();
+    }
+    const config = servers[selectedName];
+    if (!config)
+      throw new Error(`Remote env server is not found: ${selectedName}`);
+    return { name: selectedName, config };
+  }
+  async#removeRemoteEnvServer(serverEntries) {
+    const selectedName = await select7({
+      message: "Select the remote env server to remove",
+      choices: serverEntries.map(([name, config]) => ({
+        name: `${name} (${config.username ? `${config.username}@` : ""}${config.host}${config.port ? `:${config.port}` : ""})`,
+        value: name
+      }))
+    });
+    const shouldRemove = await confirm3({
+      message: `Remove remote env server "${selectedName}"?`,
+      default: false
+    });
+    if (!shouldRemove)
+      return;
+    await GlobalConfig.removeRemoteEnvServer(selectedName);
+    Logger15.info(`Removed remote env server "${selectedName}"`);
+  }
+  async#getRemoteEnvServerWithUsername() {
+    const remoteServer = await this.#selectRemoteEnvServer();
+    if (remoteServer.config.username)
+      return remoteServer;
+    const username = (await input5({
+      message: `SSH username for ${remoteServer.config.host} (optional): `
+    })).trim();
+    return {
+      ...remoteServer,
+      config: {
+        ...remoteServer.config,
+        ...username ? { username } : {}
+      }
+    };
+  }
+  #getRemoteEnvArchivePath() {
+    return `${this.#getRemoteEnvArchiveDir()}/env.tar`;
+  }
+  #getRemoteEnvArchiveDir() {
+    const { repoName } = WorkspaceExecutor.getBaseDevEnv();
+    return `~/secrets/${repoName}`;
+  }
+  #getScpTarget(config, remotePath) {
+    return `${config.username ? `${config.username}@` : ""}${config.host}:${remotePath}`;
+  }
+  #getSshTarget(config) {
+    return `${config.username ? `${config.username}@` : ""}${config.host}`;
+  }
+  #getScpArgs(config, 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
+    ];
+  }
   async login() {
-    const config = await getHostConfig();
-    const self = config.auth ? await getSelf(config.auth.token) : null;
+    const config = await GlobalConfig.getHostConfig();
+    const cloudApi2 = new CloudApi(config);
+    const self = config.auth ? await cloudApi2.getRemoteSelf() : null;
     if (self) {
       Logger15.rawLog(chalk7.green(`
 \u2713 Already logged in akan cloud as ${self.nickname}
@@ -10483,11 +10815,12 @@ ${chalk7.green("\u27A4")} Authentication Required`));
     Logger15.rawLog(chalk7.dim("Waiting for authentication..."));
     const MAX_RETRY = 300;
     for (let i = 0;i < MAX_RETRY; i++) {
-      const res = await fetch(`${akanCloudUrl}/user/getRemoteAuthToken/${remoteId}`);
-      const { jwt } = await res.json();
-      const self2 = jwt ? await getSelf(jwt) : null;
-      if (jwt && self2) {
-        setHostConfig(akanCloudHost, { auth: { token: jwt, self: self2 } });
+      const accessToken = await cloudApi2.getRemoteAuthToken(remoteId);
+      const self2 = await cloudApi2.getRemoteSelf();
+      if (accessToken && self2) {
+        await GlobalConfig.setHostConfig(akanCloudHost, {
+          auth: { accessToken, self: self2 }
+        });
         Logger15.rawLog(chalk7.green(`\r\u2713 Authentication successful!`));
         Logger15.rawLog(chalk7.green.bold(`
 \u2728 Welcome aboard, ${self2.nickname}!`));
@@ -10500,9 +10833,9 @@ ${chalk7.green("\u27A4")} Authentication Required`));
     throw new Error(chalk7.red("\u2716 Authentication timed out after 10 minutes. Please try again."));
   }
   async logout() {
-    const config = await getHostConfig();
-    if (config.auth) {
-      setHostConfig(akanCloudHost, {});
+    const config = await GlobalConfig.getHostConfig();
+    if (config.auth?.self) {
+      await GlobalConfig.setHostConfig(akanCloudHost, {});
       Logger15.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
@@ -10637,20 +10970,78 @@ ${chalk7.green("\u27A4")} Authentication Required`));
     }
     return normalized;
   }
-  async downloadEnv(workspace) {
-    const repoName = workspace.repoName;
-    const config = await getHostConfig();
-    const self = config.auth ? await getSelf(config.auth.token) : null;
-    if (!self)
-      throw new Error("Not logged in");
-    const res = await fetch(`${akanCloudUrl}/api/akasys/akasys/${repoName}`, {
-      headers: { Authorization: `Bearer ${config.auth?.token}` }
+  async downloadEnv(cloudApi2, workspace, workspaceId) {
+    const envArchivePath = "local/env.tar";
+    await workspace.mkdir("local");
+    await workspace.remove(envArchivePath);
+    await cloudApi2.downloadEnv(workspaceId, path38.join(workspace.workspaceRoot, envArchivePath));
+    await workspace.spawn("tar", ["-xf", envArchivePath], {
+      cwd: workspace.workspaceRoot
+    });
+    await workspace.remove(envArchivePath);
+  }
+  async uploadEnv(cloudApi2, workspaceId, filePath) {
+    const file = new File([Bun.file(filePath)], path38.basename(filePath));
+    await cloudApi2.uploadEnv(workspaceId, file);
+  }
+  async downloadEnvByScp(workspace) {
+    const envArchivePath = "local/env.tar";
+    const remoteServer = await this.#getRemoteEnvServerWithUsername();
+    const remoteArchivePath = this.#getRemoteEnvArchivePath();
+    const remoteTarget = this.#getScpTarget(remoteServer.config, remoteArchivePath);
+    await workspace.mkdir("local");
+    await workspace.remove(envArchivePath);
+    try {
+      Logger15.info(`Downloading env archive from remote server "${remoteServer.name}"...`);
+      await workspace.spawn("scp", this.#getScpArgs(remoteServer.config, remoteTarget, envArchivePath), {
+        cwd: workspace.workspaceRoot,
+        stdio: "inherit"
+      });
+      await workspace.spawn("tar", ["-xf", envArchivePath], {
+        cwd: workspace.workspaceRoot
+      });
+      await workspace.remove(envArchivePath);
+    } catch (error) {
+      throw new Error(`Failed to download env archive from remote server "${remoteServer.name}"`, { cause: error });
+    }
+  }
+  async uploadEnvByScp(workspace, filePath) {
+    const remoteServer = await this.#getRemoteEnvServerWithUsername();
+    const remoteArchiveDir = this.#getRemoteEnvArchiveDir();
+    const remoteArchivePath = this.#getRemoteEnvArchivePath();
+    const remoteTarget = this.#getScpTarget(remoteServer.config, remoteArchivePath);
+    try {
+      await workspace.spawn("ssh", this.#getSshArgs(remoteServer.config, `mkdir -p ${remoteArchiveDir}`), {
+        cwd: workspace.workspaceRoot,
+        stdio: "inherit"
+      });
+      Logger15.info(`Uploading env archive to remote server "${remoteServer.name}"...`);
+      await workspace.spawn("scp", this.#getScpArgs(remoteServer.config, filePath, remoteTarget), {
+        cwd: workspace.workspaceRoot,
+        stdio: "inherit"
+      });
+    } catch (error) {
+      throw new Error(`Failed to upload env archive to remote server "${remoteServer.name}"`, { cause: error });
+    }
+  }
+  async gatherEnvFiles(workspace) {
+    const envFilePattern = /^env\.(client|server)\.(?!(type|example)\.ts$).+\.ts$/;
+    const [appNames, libNames] = await workspace.getExecs();
+    const envDirs = [
+      ...appNames.map((appName) => `apps/${appName}/env`),
+      ...libNames.map((libName) => `libs/${libName}/env`)
+    ];
+    const envFilePaths = (await Promise.all(envDirs.map(async (envDir) => (await workspace.readdir(envDir)).filter((fileName) => envFilePattern.test(fileName)).map((fileName) => `${envDir}/${fileName}`)))).flat().sort();
+    await workspace.mkdir("local");
+    await workspace.remove("local/env.tar");
+    if (envFilePaths.length === 0)
+      throw new Error("No environment files found to archive");
+    await workspace.spawn("tar", ["-cf", "local/env.tar", ...envFilePaths], {
+      cwd: workspace.workspaceRoot
     });
-    const env = await res.json();
-    Logger15.info(`Downloading environment variables from cloud...`);
-    Logger15.info(`Environment variables: ${JSON.stringify(env.env, null, 2)}`);
+    Logger15.info(`Archived ${envFilePaths.length} environment files to local/env.tar`);
+    return { files: envFilePaths, path: "local/env.tar" };
   }
-  async uploadEnv(workspace) {}
 }
 
 // pkgs/@akanjs/cli/cloud/cloud.script.ts
@@ -10676,10 +11067,23 @@ class CloudScript extends script("cloud", [
     await session.ask(question);
   }
   async downloadEnv(workspace) {
-    await this.cloudRunner.downloadEnv(workspace);
+    const workspaceId = workspace.getWorkspaceId({ allowEmpty: true });
+    if (workspaceId) {
+      const cloudApi2 = await CloudApi.fromHost();
+      await this.cloudRunner.downloadEnv(cloudApi2, workspace, workspaceId);
+      return;
+    }
+    await this.cloudRunner.downloadEnvByScp(workspace);
   }
   async uploadEnv(workspace) {
-    await this.cloudRunner.uploadEnv(workspace);
+    const workspaceId = workspace.getWorkspaceId({ allowEmpty: true });
+    const { path: path39 } = await this.cloudRunner.gatherEnvFiles(workspace);
+    if (workspaceId) {
+      const cloudApi2 = await CloudApi.fromHost();
+      await this.cloudRunner.uploadEnv(cloudApi2, workspaceId, path39);
+      return;
+    }
+    await this.cloudRunner.uploadEnvByScp(workspace, path39);
   }
   async deployAkan(workspace, { test = true, registryUrl } = {}) {
     const akanPkgs = await this.cloudRunner.getAkanPkgs(workspace);
@@ -10718,7 +11122,10 @@ class CloudCommand extends command("cloud", [CloudScript], ({ public: target })
   resetLlm: target({ desc: "Reset LLM configuration to default" }).with(Workspace).exec(function(workspace) {
     this.cloudScript.resetLlm(workspace);
   }),
-  ask: target({ desc: "Ask AI assistant a question about your project" }).option("question", String, { ask: "question to ask" }).with(Workspace).exec(async function(question, workspace) {
+  ask: target({
+    devOnly: true,
+    desc: "Ask AI assistant a question about your project"
+  }).option("question", String, { ask: "question to ask" }).with(Workspace).exec(async function(question, workspace) {
     await this.cloudScript.ask(question, workspace);
   }),
   deployAkan: target({
@@ -10753,10 +11160,14 @@ class CloudCommand extends command("cloud", [CloudScript], ({ public: target })
       registryUrl: resolveRegistryUrl(registry)
     });
   }),
-  downloadEnv: target({ desc: "Download environment variables from cloud" }).with(Workspace).exec(async function(workspace) {
+  downloadEnv: target({
+    desc: "Download environment variables from cloud or SCP server"
+  }).with(Workspace).exec(async function(workspace) {
     await this.cloudScript.downloadEnv(workspace);
   }),
-  uploadEnv: target({ desc: "Upload environment variables to cloud" }).with(Workspace).exec(async function(workspace) {
+  uploadEnv: target({
+    desc: "Upload environment variables to cloud or SCP server"
+  }).with(Workspace).exec(async function(workspace) {
     await this.cloudScript.uploadEnv(workspace);
   })
 })) {
@@ -11230,7 +11641,7 @@ class LocalRegistryCommand extends command("local-registry", [LocalRegistryScrip
 import { lowerlize } from "akanjs/common";
 
 // pkgs/@akanjs/cli/module/module.script.ts
-import { input as input5 } from "@inquirer/prompts";
+import { input as input6 } from "@inquirer/prompts";
 import { capitalize as capitalize6, randomPicks as randomPicks2 } from "akanjs/common";
 
 // pkgs/@akanjs/cli/page/page.runner.ts
@@ -11657,8 +12068,8 @@ class ModuleScript extends script("module", [ModuleRunner, PageScript]) {
     const { constant, dictionary } = await this.moduleRunner.createModuleTemplate(executor);
     if (page && sys3.type === "app")
       await this.pageScript.createCrudPage(executor, { app: sys3, basePath: null, single: false });
-    const modelDesc = description ?? await input5({ message: "description of module" });
-    const modelSchemaDesign = schemaDescription ?? await input5({ message: "schema description of module" });
+    const modelDesc = description ?? await input6({ message: "description of module" });
+    const modelSchemaDesign = schemaDescription ?? await input6({ message: "schema description of module" });
     const config = await sys3.getConfig();
     const moduleRequest = new ModuleRequest({ sysType: sys3.type, sysName: sys3.name, modelName: name, config });
     const constantRequestPrompt = await moduleRequest.requestModelConstant({
@@ -11829,7 +12240,7 @@ class PageCommand extends command("page", [PageScript], ({ public: target }) =>
 import { lowerlize as lowerlize2 } from "akanjs/common";
 
 // pkgs/@akanjs/cli/scalar/scalar.prompt.ts
-import { input as input6 } from "@inquirer/prompts";
+import { input as input7 } from "@inquirer/prompts";
 class ScalarPrompt extends Prompter {
   sys;
   name;
@@ -11839,13 +12250,13 @@ class ScalarPrompt extends Prompter {
     this.name = name;
   }
   async requestUpdateConstant() {
-    const request = await input6({ message: `What do you want to change?` });
+    const request = await input7({ message: `What do you want to change?` });
     return { request, validate: undefined };
   }
   async requestCreateConstant() {
     const constantFiles = await this.sys.getConstantFilesWithLibs();
-    const description = await input6({ message: "description of scalar" });
-    const schemaDescription = await input6({ message: "schema description of scalar" });
+    const description = await input7({ message: "description of scalar" });
+    const schemaDescription = await input7({ message: "schema description of scalar" });
     await this.sys.applyTemplate({
       basePath: "./lib/__scalar",
       template: "__scalar",