@akanjs/devkit 2.2.1 → 2.2.2

package/aiEditor.ts

@@ -19,11 +19,16 @@ import type { FileContent } from "./types";
 
 const MAX_ASK_TRY = 300;
 
-export const supportedLlmModels = [
-  "deepseek-chat",
-  "deepseek-reasoner",
-] as const;
+const deepSeekLlmModels = ["deepseek-chat", "deepseek-reasoner"] as const;
+
+const openAiLlmModels = ["gpt-5.5"] as const;
+
+export const supportedLlmModels = [...deepSeekLlmModels, ...openAiLlmModels] as const;
 export type SupportedLlmModel = (typeof supportedLlmModels)[number];
+type OpenAiLlmModel = (typeof openAiLlmModels)[number];
+
+const isOpenAiLlmModel = (model: SupportedLlmModel): model is OpenAiLlmModel =>
+  openAiLlmModels.includes(model as OpenAiLlmModel);
 
 interface EditOptions {
   onReasoning?: (reasoning: string) => void;
@@ -55,44 +60,25 @@ export const parseTypescriptFileBlocks = (text: string): FileContent[] => {
   return fileBlocks;
 };
 
-export const preserveTypescriptResponseContent = (
-  previousContent: string,
-  nextContent: string,
-) => {
+export const preserveTypescriptResponseContent = (previousContent: string, nextContent: string) => {
   const previousWrites = parseTypescriptFileBlocks(previousContent);
   const nextWrites = parseTypescriptFileBlocks(nextContent);
-  if (previousWrites.length > 0 && nextWrites.length === 0)
-    return previousContent;
+  if (previousWrites.length > 0 && nextWrites.length === 0) return previousContent;
   return nextContent;
 };
 
 export class AiSession {
   static #cacheDir = "node_modules/.cache/akan/aiSession";
   static #chat: ChatDeepSeek | ChatOpenAI | null = null;
-  static async init({
-    temperature = 0,
-    useExisting = true,
-  }: {
-    temperature?: number;
-    useExisting?: boolean;
-  } = {}) {
+  static async init({ temperature = 0, useExisting = true }: { temperature?: number; useExisting?: boolean } = {}) {
     if (useExisting) {
       const llmConfig = await AiSession.getLlmConfig();
       if (llmConfig) {
         AiSession.#setChatModel(llmConfig.model, llmConfig.apiKey);
-        Logger.rawLog(
-          chalk.dim(
-            `🤖akan editor uses existing LLM config (${llmConfig.model})`,
-          ),
-        );
+        Logger.rawLog(chalk.dim(`🤖akan editor uses existing LLM config (${llmConfig.model})`));
         return AiSession;
       }
-    } else
-      Logger.rawLog(
-        chalk.yellow(
-          "🤖akan-editor is not initialized. LLM configuration should be set first.",
-        ),
-      );
+    } else Logger.rawLog(chalk.yellow("🤖akan-editor is not initialized. LLM configuration should be set first."));
 
     const llmConfig = await AiSession.#requestLlmConfig();
     const { model, apiKey } = llmConfig;
@@ -102,26 +88,36 @@ export class AiSession {
     await session.setLlmConfig({ model, apiKey });
     return session;
   }
-  static #setChatModel(
+  static #setChatModel(model: SupportedLlmModel, apiKey: string, { temperature = 0 }: { temperature?: number } = {}) {
+    AiSession.#chat = AiSession.#createChatModel(model, apiKey, {
+      temperature,
+      streaming: true,
+    });
+    return AiSession;
+  }
+  static #createChatModel(
     model: SupportedLlmModel,
     apiKey: string,
-    { temperature = 0 }: { temperature?: number } = {},
+    { temperature = 0, streaming = false }: { temperature?: number; streaming?: boolean } = {},
   ) {
-    AiSession.#chat = new ChatDeepSeek({
+    if (isOpenAiLlmModel(model))
+      return new ChatOpenAI({
+        modelName: model,
+        temperature,
+        streaming,
+        openAIApiKey: apiKey,
+      });
+    return new ChatDeepSeek({
       modelName: model,
       temperature,
-      streaming: true,
+      streaming,
       apiKey,
-      // configuration: { baseURL: "https://api.deepseek.com/v1", apiKey },
     });
-    return AiSession;
   }
   static async getLlmConfig() {
     return await GlobalConfig.getLlmConfig();
   }
-  static async setLlmConfig(
-    llmConfig: { model: SupportedLlmModel; apiKey: string } | null,
-  ) {
+  static async setLlmConfig(llmConfig: { model: SupportedLlmModel; apiKey: string } | null) {
     await GlobalConfig.setLlmConfig(llmConfig);
     return AiSession;
   }
@@ -137,11 +133,7 @@ export class AiSession {
     const spinner = new Spinner("Validating LLM API key...", {
       prefix: `🤖akan-editor`,
     }).start();
-    const chat = new ChatOpenAI({
-      modelName,
-      temperature: 0,
-      configuration: { baseURL: "https://api.deepseek.com/v1", apiKey },
-    });
+    const chat = AiSession.#createChatModel(modelName, apiKey);
     try {
       await chat.invoke("Hi, and just say 'ok'");
       spinner.succeed("LLM API key is valid");
@@ -193,10 +185,7 @@ export class AiSession {
   }
   async #saveCache() {
     const cacheFilePath = `${AiSession.#cacheDir}/${this.sessionKey}.json`;
-    await this.workspace.writeJson(
-      cacheFilePath,
-      mapChatMessagesToStoredMessages(this.messageHistory),
-    );
+    await this.workspace.writeJson(cacheFilePath, mapChatMessagesToStoredMessages(this.messageHistory));
   }
   async ask(
     question: string,
@@ -212,8 +201,7 @@ export class AiSession {
     if (!AiSession.#chat) await AiSession.init();
     if (this.#cacheLoadPromise) await this.#cacheLoadPromise;
 
-    if (!AiSession.#chat)
-      throw new Error("Failed to initialize the AI session");
+    if (!AiSession.#chat) throw new Error("Failed to initialize the AI session");
     const loader = new Spinner(`${AiSession.#chat.model} is thinking...`, {
       prefix: `🤖akan-editor`,
     }).start();
@@ -224,13 +212,10 @@ export class AiSession {
       let reasoningResponse = "",
         fullResponse = "";
       for await (const chunk of stream) {
-        if (loader.isSpinning())
-          loader.succeed(`${AiSession.#chat.model} responded`);
+        if (loader.isSpinning()) loader.succeed(`${AiSession.#chat.model} responded`);
 
         if (!fullResponse.length) {
-          const reasoningContent =
-            (chunk.additional_kwargs as { reasoning_content?: string })
-              .reasoning_content ?? "";
+          const reasoningContent = (chunk.additional_kwargs as { reasoning_content?: string }).reasoning_content ?? "";
           if (reasoningContent.length) {
             reasoningResponse += reasoningContent;
             onReasoning(reasoningContent);
@@ -258,14 +243,7 @@ export class AiSession {
   }
   async edit(
     question: string,
-    {
-      onChunk,
-      onReasoning,
-      maxTry = MAX_ASK_TRY,
-      validate,
-      approve,
-      fallbackToPreviousTypescript,
-    }: EditOptions = {},
+    { onChunk, onReasoning, maxTry = MAX_ASK_TRY, validate, approve, fallbackToPreviousTypescript }: EditOptions = {},
   ) {
     for (let tryCount = 0; tryCount < maxTry; tryCount++) {
       let response = await this.ask(question, { onChunk, onReasoning });
@@ -279,10 +257,7 @@ ${validate.map((v) => `- ${v}`).join("\n")}`;
         response = {
           ...validateResponse,
           content: fallbackToPreviousTypescript
-            ? preserveTypescriptResponseContent(
-                response.content,
-                validateResponse.content,
-              )
+            ? preserveTypescriptResponseContent(response.content, validateResponse.content)
             : validateResponse.content,
         };
       }
@@ -320,17 +295,11 @@ ${validate.map((v) => `- ${v}`).join("\n")}`;
     // const toolMessages = messages.map(
     //   (message) => new ToolMessage({ content: message.content, tool_call_id: message.type })
     // );
-    const toolMessages = messages.map(
-      (message) => new HumanMessage(message.content),
-    );
+    const toolMessages = messages.map((message) => new HumanMessage(message.content));
     this.messageHistory.push(...toolMessages);
     return this;
   }
-  async writeTypescripts(
-    question: string,
-    executor: Executor,
-    options: EditOptions = {},
-  ) {
+  async writeTypescripts(question: string, executor: Executor, options: EditOptions = {}) {
     const content = await this.edit(question, {
       ...options,
       fallbackToPreviousTypescript: true,
@@ -340,15 +309,10 @@ ${validate.map((v) => `- ${v}`).join("\n")}`;
       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);
+    for (const write of writes) await executor.writeFile(write.filePath, write.content);
     return await this.#tryFixTypescripts(writes, executor, options);
   }
-  async #editTypescripts(
-    question: string,
-    options: EditOptions = {},
-    fallbackWrites?: FileContent[],
-  ) {
+  async #editTypescripts(question: string, options: EditOptions = {}, fallbackWrites?: FileContent[]) {
     const content = await this.edit(question, {
       ...options,
       fallbackToPreviousTypescript: true,
@@ -361,11 +325,7 @@ ${validate.map((v) => `- ${v}`).join("\n")}`;
       );
     return writes;
   }
-  async #tryFixTypescripts(
-    writes: FileContent[],
-    executor: Executor,
-    options: EditOptions = {},
-  ) {
+  async #tryFixTypescripts(writes: FileContent[], executor: Executor, options: EditOptions = {}) {
     const MAX_EDIT_TRY = 5;
     for (let tryCount = 0; tryCount < MAX_EDIT_TRY; tryCount++) {
       const loader = new Spinner(`Type checking and linting...`, {
@@ -383,9 +343,7 @@ ${validate.map((v) => `- ${v}`).join("\n")}`;
       );
       const hasAnyFix = fileChecks.some((fileCheck) => fileCheck.needFix);
       if (hasAnyFix) {
-        loader.fail(
-          "Type checking and linting has some errors, try to fix them",
-        );
+        loader.fail("Type checking and linting has some errors, try to fix them");
         fileChecks.forEach((fileCheck) => {
           Logger.rawLog(
             `TypeCheck Result \n${fileCheck.typeCheckResult.message}\nLint Result \n${fileCheck.lintResult.message}`,
@@ -404,8 +362,7 @@ ${validate.map((v) => `- ${v}`).join("\n")}`;
           },
           writes,
         );
-        for (const write of writes)
-          await executor.writeFile(write.filePath, write.content);
+        for (const write of writes) await executor.writeFile(write.filePath, write.content);
       } else {
         loader.succeed("Type checking and linting has no errors");
         return writes;

package/cloud/cloudApi.ts

@@ -1,5 +1,5 @@
 import type { Workspace } from "../commandDecorators";
-import { type AccessToken, type AccessTokenDto, akanCloudHost, type HostConfig } from "./constants";
+import type { AccessToken, AccessTokenDto, HostConfig } from "./constants";
 import { GlobalConfig } from "./globalConfig";
 
 class HttpClient {
@@ -17,7 +17,7 @@ class HttpClient {
         ...headers,
       },
     });
-    return response.json();
+    return await response.json();
   }
   async getFile(url: string, localPath: string, headers?: Record<string, string>): Promise<void> {
     const response = await fetch(`${this.baseUrl}${url}`, {
@@ -35,7 +35,7 @@ class HttpClient {
         ? { ...this.headers, ...headers }
         : { "Content-Type": "application/json", ...this.headers, ...headers },
     });
-    return response.json();
+    return await response.json();
   }
   setHeaders(headers: Record<string, string>) {
     Object.assign(this.headers, headers);
@@ -47,6 +47,8 @@ export class CloudApi {
   readonly #api: HttpClient;
   #accessToken: AccessToken | null = null;
   #workspace: Workspace;
+  host: string;
+  url: string;
 
   static async fromHost(workspace: Workspace, host?: string) {
     const hostConfig = await GlobalConfig.getHostConfig(host);
@@ -54,9 +56,10 @@ export class CloudApi {
   }
   constructor(workspace: Workspace, hostConfig: HostConfig) {
     this.#workspace = workspace;
-    const host = akanCloudHost;
-    this.#api = new HttpClient(`${host}/api`);
     this.#accessToken = hostConfig.auth?.accessToken ?? null;
+    this.host = hostConfig.host;
+    this.url = `${this.host}/api`;
+    this.#api = new HttpClient(this.url);
     if (this.#accessToken && !GlobalConfig.needRefreshToken(this.#accessToken))
       this.#api.setHeaders({
         Authorization: `Bearer ${this.#accessToken.jwt}`,
@@ -64,6 +67,7 @@ export class CloudApi {
   }
 
   async uploadEnv(devProjectId: string, file: File): Promise<boolean> {
+    await this.#ensureAccessTokenLive();
     const formData = new FormData();
     formData.append("devProjectId", devProjectId);
     formData.append("file", file);
@@ -71,16 +75,13 @@ export class CloudApi {
     return data;
   }
   async downloadEnv(devProjectId: string): Promise<unknown> {
+    await this.#ensureAccessTokenLive();
     const localPath = `${this.#workspace.workspaceRoot}/local/env.tar`;
     await this.#api.getFile(`/downloadEnv/${devProjectId}`, localPath);
     return localPath;
   }
   async getRemoteAuthToken(remoteId: string): Promise<AccessToken | null> {
     try {
-      if (this.#accessToken) {
-        if (GlobalConfig.needRefreshToken(this.#accessToken)) return await this.#refreshAuthToken();
-        else return await this.#refreshAuthToken();
-      }
       const accessToken = await this.#api.get<AccessTokenDto>(`/getRemoteAuthToken/${remoteId}`);
       this.#accessToken = GlobalConfig.toAccessToken(accessToken);
       this.#api.setHeaders({
@@ -91,13 +92,20 @@ export class CloudApi {
       return null;
     }
   }
-  async #refreshAuthToken(): Promise<AccessToken> {
+  async #ensureAccessTokenLive({
+    allowUnauthorized = false,
+  }: {
+    allowUnauthorized?: boolean;
+  } = {}): Promise<AccessToken> {
+    if (!this.#accessToken) throw new Error("No access token");
+    const needRefresh = GlobalConfig.needRefreshToken(this.#accessToken);
+    if (!needRefresh) return this.#accessToken;
     const refreshToken = this.#accessToken?.refreshToken;
     if (!refreshToken) throw new Error("No refresh token");
     return await this.refreshAuthToken(refreshToken);
   }
   async refreshAuthToken(refreshToken: string): Promise<AccessToken> {
-    const response = await this.#api.post<AccessTokenDto>(`/refreshRemoteAuthToken`, { refreshToken });
+    const response = await this.#api.post<AccessTokenDto>(`/refreshAuthToken`, { refreshToken });
     this.#accessToken = GlobalConfig.toAccessToken(response);
     this.#api.setHeaders({ Authorization: `Bearer ${this.#accessToken.jwt}` });
     return this.#accessToken;

package/cloud/constants.ts

@@ -1,24 +1,25 @@
 import type { Dayjs } from "dayjs";
+import { GlobalConfig } from "..";
 import type { SupportedLlmModel } from "../aiEditor";
 
 export const basePath = `${Bun.env.HOME ?? Bun.env.USERPROFILE}/.akan`;
 export const configPath = `${basePath}/config.json`;
-export const akanCloudHost = process.env.USE_AKANJS_PKGS === "true" ? "http://localhost" : "https://cloud.akanjs.com";
-export const akanCloudUrl = `${akanCloudHost}${process.env.USE_AKANJS_PKGS === "true" ? ":8282" : ""}/api`;
 
 export interface HostConfig {
+  host: string;
   auth?: {
     accessToken?: AccessToken;
     self?: { id: string; nickname: string };
   };
 }
 export interface HostConfigDto {
+  host: string;
   auth?: {
     accessToken?: AccessTokenDto;
     self?: { id: string; nickname: string };
   };
 }
-export const defaultHostConfig: HostConfig = {};
+export const getDefaultHostConfig = (host = GlobalConfig.akanCloudHost): HostConfig => ({ host });
 export interface RemoteEnvServerConfig {
   host: string;
   username?: string;

package/cloud/globalConfig.ts

@@ -5,17 +5,20 @@ import {
   type AccessToken,
   type AccessTokenDto,
   type AkanGlobalConfig,
-  akanCloudHost,
   basePath,
   configPath,
   defaultAkanGlobalConfig,
-  defaultHostConfig,
+  getDefaultHostConfig,
   type HostConfig,
   type HostConfigDto,
   type RemoteEnvServerConfig,
 } from "./constants";
 
 export class GlobalConfig {
+  static akanCloudHost =
+    process.env.USE_AKANJS_PKGS === "true"
+      ? `http://localhost:${process.env.CLOUD_HOST_PORT ?? 8283}`
+      : "https://cloud.akanjs.com";
   static async #getAkanGlobalConfig(): Promise<AkanGlobalConfig> {
     const exists = await FileSys.fileExists(configPath);
     const akanConfig = exists ? await FileSys.readJson<Partial<AkanGlobalConfig>>(configPath) : {};
@@ -30,13 +33,13 @@ export class GlobalConfig {
     await mkdir(basePath, { recursive: true });
     await Bun.write(configPath, JSON.stringify(akanConfig, null, 2));
   }
-  static async getHostConfig(host = akanCloudHost): Promise<HostConfig> {
+  static async getHostConfig(host = GlobalConfig.akanCloudHost): Promise<HostConfig> {
     const akanConfig = await GlobalConfig.#getAkanGlobalConfig();
-    return GlobalConfig.toHostConfig(akanConfig.cloudHost[host] ?? defaultHostConfig);
+    return GlobalConfig.toHostConfig(akanConfig.cloudHost[host] ?? getDefaultHostConfig(host));
   }
-  static async setHostConfig(host = akanCloudHost, config: HostConfig = {}) {
+  static async setHostConfig(config: HostConfig = getDefaultHostConfig()) {
     const akanConfig = await GlobalConfig.#getAkanGlobalConfig();
-    akanConfig.cloudHost[host] = GlobalConfig.toHostConfigDto(config);
+    akanConfig.cloudHost[config.host] = GlobalConfig.toHostConfigDto(config);
     await GlobalConfig.#setAkanGlobalConfig(akanConfig);
   }
   static async getLlmConfig(): Promise<AkanGlobalConfig["llm"]> {
@@ -88,6 +91,7 @@ export class GlobalConfig {
   }
   static toHostConfigDto(hostConfig: HostConfig): HostConfigDto {
     return {
+      host: hostConfig.host,
       auth: {
         accessToken: hostConfig.auth?.accessToken
           ? GlobalConfig.toAccessTokenDto(hostConfig.auth.accessToken)
@@ -98,6 +102,7 @@ export class GlobalConfig {
   }
   static toHostConfig(hostConfigDto: HostConfigDto): HostConfig {
     return {
+      host: hostConfigDto.host,
       auth: {
         accessToken: hostConfigDto.auth?.accessToken
           ? GlobalConfig.toAccessToken(hostConfigDto.auth.accessToken)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -32,7 +32,7 @@
     "@langchain/openai": "^1.4.6",
     "@tailwindcss/node": "^4.3.0",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "2.2.1",
+    "akanjs": "2.2.2",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "^5.5.20",