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

package/incrementalBuilder.proc.js

@@ -17,10 +17,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";
@@ -28,9 +25,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";
@@ -69,35 +71,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";
 
@@ -160,12 +325,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) {
@@ -192,22 +363,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,
@@ -230,7 +403,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)
@@ -305,7 +482,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) {
@@ -358,7 +541,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);
@@ -2166,11 +2351,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 });
       });
@@ -2196,11 +2396,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);
       });
@@ -2244,7 +2461,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 });
       });
@@ -2391,7 +2616,10 @@ class Executor {
       const result = {
         ...extendsTsconfig,
         ...tsconfig,
-        compilerOptions: { ...extendsTsconfig.compilerOptions, ...tsconfig.compilerOptions }
+        compilerOptions: {
+          ...extendsTsconfig.compilerOptions,
+          ...tsconfig.compilerOptions
+        }
       };
       this.#tsconfig = result;
       return result;
@@ -2446,7 +2674,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);
@@ -2472,14 +2702,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({
@@ -2530,7 +2770,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 };
   }
@@ -2556,6 +2799,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");
@@ -2566,7 +2810,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);
@@ -2770,7 +3022,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());
@@ -2879,7 +3135,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;
   }
@@ -2985,7 +3245,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;
@@ -2995,7 +3259,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}`);
@@ -3035,7 +3302,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;
@@ -3099,7 +3370,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;
@@ -3155,7 +3429,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
     };
@@ -7449,7 +7730,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;
@@ -7464,7 +7745,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`;
@@ -9451,75 +9732,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/devkit/incrementalBuilder/incrementalBuilder.proc.ts
 import { Logger as Logger12 } from "akanjs/common";