@akanjs/devkit 0.0.138 → 0.0.139

package/cjs/src/aiEditor.js

@@ -36,8 +36,8 @@ var import_prompts = require("@inquirer/prompts");
 var import_messages = require("@langchain/core/messages");
 var import_openai = require("@langchain/openai");
 var import_chalk = __toESM(require("chalk"));
-var import_ora = __toESM(require("ora"));
 var import_auth = require("./auth");
+var import_spinner = require("./spinner");
 const MAX_ASK_TRY = 300;
 const supportedLlmModels = ["deepseek-chat", "deepseek-reasoner"];
 class AiSession {
@@ -45,8 +45,11 @@ class AiSession {
   static async init({ temperature = 0.7, useExisting = true } = {}) {
     if (useExisting) {
       const llmConfig2 = this.getLlmConfig();
-      if (llmConfig2)
-        return this.#setChatModel(llmConfig2.model, llmConfig2.apiKey);
+      if (llmConfig2) {
+        this.#setChatModel(llmConfig2.model, llmConfig2.apiKey);
+        import_common.Logger.rawLog(import_chalk.default.dim(`\u{1F916}akan editor uses existing LLM config (${llmConfig2.model})`));
+        return this;
+      }
     }
     const llmConfig = await this.#requestLlmConfig();
     const { model, apiKey } = llmConfig;
@@ -78,6 +81,7 @@ class AiSession {
     return { model, apiKey };
   }
   static async #validateApiKey(modelName, apiKey) {
+    const spinner = new import_spinner.Spinner("Validating LLM API key...", { prefix: `\u{1F916}akan-editor` }).start();
     const chat = new import_openai.ChatOpenAI({
       modelName,
       temperature: 0,
@@ -85,9 +89,10 @@ class AiSession {
     });
     try {
       await chat.invoke("Hi, and just say 'ok'");
+      spinner.succeed("LLM API key is valid");
       return true;
     } catch (error) {
-      import_common.Logger.rawLog(
+      spinner.fail(
         import_chalk.default.red(
           `LLM API key is invalid. Please check your API key and try again. You can set it again by running "akan set-llm" or reset by running "akan reset-llm"`
         )
@@ -108,14 +113,16 @@ class AiSession {
       await AiSession.init();
     if (!AiSession.#chat)
       throw new Error("Failed to initialize the AI session");
-    const loader = (0, import_ora.default)(`${AiSession.#chat.model} is thinking...`).start();
+    const loader = new import_spinner.Spinner(`${AiSession.#chat.model} is thinking...`, {
+      prefix: `\u{1F916}akan-editor`
+    }).start();
     try {
       const humanMessage = new import_messages.HumanMessage(question);
       this.messageHistory.push(humanMessage);
       const stream = await AiSession.#chat.stream(this.messageHistory);
       let fullResponse = "", tokenIdx = 0;
       for await (const chunk of stream) {
-        if (loader.isSpinning)
+        if (loader.isSpinning())
           loader.succeed(`${AiSession.#chat.model} responded`);
         const content = chunk.content;
         if (typeof content === "string") {

package/cjs/src/commandDecorators/command.js

@@ -184,6 +184,7 @@ const runCommands = async (...commands) => {
             `${sysType} in this workspace ${sysType}s/<${sysType}Name>`
           );
         }
+        programCommand = programCommand.option(`-v, --verbose [boolean]`, `verbose output`);
         programCommand.action(async (...args) => {
           const cmdArgs = args.slice(0, args.length - 2);
           const opt = args[args.length - 2];
@@ -196,6 +197,8 @@ const runCommands = async (...commands) => {
               commandArgs[argMeta.idx] = await getArgumentValue(argMeta, cmdArgs[argMeta.idx], workspace);
             if (commandArgs[argMeta.idx] instanceof import_executors.AppExecutor)
               process.env.NEXT_PUBLIC_APP_NAME = commandArgs[argMeta.idx].name;
+            if (opt.verbose)
+              import_executors.Executor.setVerbose(true);
           }
           const cmd = new command();
           try {

package/cjs/src/executors.js

@@ -56,6 +56,10 @@ const execEmoji = {
   // for sys executor
 };
 class Executor {
+  static verbose = false;
+  static setVerbose(verbose) {
+    Executor.verbose = verbose;
+  }
   name;
   logger;
   cwdPath;
@@ -85,7 +89,11 @@ class Executor {
     });
   }
   spawn(command, args = [], options = {}) {
-    const proc = (0, import_child_process.spawn)(command, args, { cwd: this.cwdPath, stdio: "inherit", ...options });
+    const proc = (0, import_child_process.spawn)(command, args, {
+      cwd: this.cwdPath,
+      stdio: Executor.verbose ? "inherit" : "ignore",
+      ...options
+    });
     proc.stdout?.on("data", (data) => {
       import_common.Logger.raw(import_chalk.default.dim(data.toString()));
     });
@@ -104,7 +112,7 @@ class Executor {
   fork(modulePath, args = [], options = {}) {
     const proc = (0, import_child_process.fork)(modulePath, args, {
       cwd: this.cwdPath,
-      stdio: ["ignore", "inherit", "inherit", "ipc"],
+      stdio: Executor.verbose ? ["ignore", "inherit", "inherit", "ipc"] : ["ignore", "ignore", "ignore", "ipc"],
       ...options
     });
     proc.stdout?.on("data", (data) => {
@@ -186,8 +194,8 @@ class Executor {
     this.logger.verbose(msg);
     return this;
   }
-  spinning(msg, { prefix = `${this.emoji}${this.name} -`, indent = 0 } = {}) {
-    return new import_spinner.Spinner(msg, { prefix, indent }).start();
+  spinning(msg, { prefix = `${this.emoji}${this.name}`, indent = 0, enableSpin = !Executor.verbose } = {}) {
+    return new import_spinner.Spinner(msg, { prefix, indent, enableSpin }).start();
   }
   getTsConfig(pathname = "tsconfig.json") {
     const tsconfig = this.readJson(pathname);
@@ -669,6 +677,9 @@ class AppExecutor extends SysExecutor {
       return new AppExecutor({ workspace: executor, name });
     return new AppExecutor({ workspace: executor.workspace, name });
   }
+  getEnv() {
+    return this.workspace.getBaseDevEnv().env;
+  }
   async getConfig(command) {
     return await (0, import_config.getAppConfig)(this.cwdPath, {
       ...this.workspace.getBaseDevEnv(),

package/cjs/src/spinner.js

@@ -32,27 +32,49 @@ __export(spinner_exports, {
 module.exports = __toCommonJS(spinner_exports);
 var import_ora = __toESM(require("ora"));
 class Spinner {
+  static padding = 12;
   spinner;
   stopWatch;
   startAt;
+  prefix;
   message;
-  constructor(message, { prefix = "", indent = 0 } = {}) {
+  enableSpin;
+  constructor(message, { prefix = "", indent = 0, enableSpin = true } = {}) {
+    Spinner.padding = Math.max(Spinner.padding, prefix.length);
+    this.prefix = prefix;
     this.message = message;
     this.spinner = (0, import_ora.default)(message);
-    this.spinner.prefixText = prefix;
+    this.spinner.prefixText = prefix.padStart(Spinner.padding, " ");
     this.spinner.indent = indent;
+    this.enableSpin = enableSpin;
   }
   start() {
     this.startAt = /* @__PURE__ */ new Date();
-    const spinner = this.spinner.start();
-    this.stopWatch = setInterval(() => {
-      spinner.text = `${this.message} (${this.#getElapsedTimeStr()})`;
-    }, 1e3);
+    if (this.enableSpin) {
+      this.spinner.start();
+      this.stopWatch = setInterval(() => {
+        this.spinner.prefixText = this.prefix.padStart(Spinner.padding, " ");
+        this.spinner.text = `${this.message} (${this.#getElapsedTimeStr()})`;
+      }, 1e3);
+    } else
+      this.spinner.info();
     return this;
   }
   succeed(message) {
-    clearInterval(this.stopWatch);
     this.spinner.succeed(`${message} (${this.#getElapsedTimeStr()})`);
+    this.#reset();
+  }
+  fail(message) {
+    this.spinner.fail(`${message} (${this.#getElapsedTimeStr()})`);
+    this.#reset();
+  }
+  isSpinning() {
+    return this.spinner.isSpinning;
+  }
+  #reset() {
+    if (this.stopWatch)
+      clearInterval(this.stopWatch);
+    this.stopWatch = null;
   }
   #getElapsedTimeStr() {
     const ms = (/* @__PURE__ */ new Date()).getTime() - this.startAt.getTime();

package/esm/src/aiEditor.js

@@ -3,8 +3,8 @@ import { input, select } from "@inquirer/prompts";
 import { AIMessage, HumanMessage } from "@langchain/core/messages";
 import { ChatOpenAI } from "@langchain/openai";
 import chalk from "chalk";
-import ora from "ora";
 import { getAkanGlobalConfig, setAkanGlobalConfig } from "./auth";
+import { Spinner } from "./spinner";
 const MAX_ASK_TRY = 300;
 const supportedLlmModels = ["deepseek-chat", "deepseek-reasoner"];
 class AiSession {
@@ -12,8 +12,11 @@ class AiSession {
   static async init({ temperature = 0.7, useExisting = true } = {}) {
     if (useExisting) {
       const llmConfig2 = this.getLlmConfig();
-      if (llmConfig2)
-        return this.#setChatModel(llmConfig2.model, llmConfig2.apiKey);
+      if (llmConfig2) {
+        this.#setChatModel(llmConfig2.model, llmConfig2.apiKey);
+        Logger.rawLog(chalk.dim(`\u{1F916}akan editor uses existing LLM config (${llmConfig2.model})`));
+        return this;
+      }
     }
     const llmConfig = await this.#requestLlmConfig();
     const { model, apiKey } = llmConfig;
@@ -45,6 +48,7 @@ class AiSession {
     return { model, apiKey };
   }
   static async #validateApiKey(modelName, apiKey) {
+    const spinner = new Spinner("Validating LLM API key...", { prefix: `\u{1F916}akan-editor` }).start();
     const chat = new ChatOpenAI({
       modelName,
       temperature: 0,
@@ -52,9 +56,10 @@ class AiSession {
     });
     try {
       await chat.invoke("Hi, and just say 'ok'");
+      spinner.succeed("LLM API key is valid");
       return true;
     } catch (error) {
-      Logger.rawLog(
+      spinner.fail(
         chalk.red(
           `LLM API key is invalid. Please check your API key and try again. You can set it again by running "akan set-llm" or reset by running "akan reset-llm"`
         )
@@ -75,14 +80,16 @@ class AiSession {
       await AiSession.init();
     if (!AiSession.#chat)
       throw new Error("Failed to initialize the AI session");
-    const loader = ora(`${AiSession.#chat.model} is thinking...`).start();
+    const loader = new Spinner(`${AiSession.#chat.model} is thinking...`, {
+      prefix: `\u{1F916}akan-editor`
+    }).start();
     try {
       const humanMessage = new HumanMessage(question);
       this.messageHistory.push(humanMessage);
       const stream = await AiSession.#chat.stream(this.messageHistory);
       let fullResponse = "", tokenIdx = 0;
       for await (const chunk of stream) {
-        if (loader.isSpinning)
+        if (loader.isSpinning())
           loader.succeed(`${AiSession.#chat.model} responded`);
         const content = chunk.content;
         if (typeof content === "string") {

package/esm/src/commandDecorators/command.js

@@ -3,7 +3,7 @@ import { confirm, input, select } from "@inquirer/prompts";
 import chalk from "chalk";
 import { program } from "commander";
 import fs from "fs";
-import { AppExecutor, LibExecutor, PkgExecutor, WorkspaceExecutor } from "../executors";
+import { AppExecutor, Executor, LibExecutor, PkgExecutor, WorkspaceExecutor } from "../executors";
 import { getArgMetas } from "./argMeta";
 import { getTargetMetas } from "./targetMeta";
 const camelToKebabCase = (str) => str.replace(/([A-Z])/g, "-$1").toLowerCase();
@@ -152,6 +152,7 @@ const runCommands = async (...commands) => {
             `${sysType} in this workspace ${sysType}s/<${sysType}Name>`
           );
         }
+        programCommand = programCommand.option(`-v, --verbose [boolean]`, `verbose output`);
         programCommand.action(async (...args) => {
           const cmdArgs = args.slice(0, args.length - 2);
           const opt = args[args.length - 2];
@@ -164,6 +165,8 @@ const runCommands = async (...commands) => {
               commandArgs[argMeta.idx] = await getArgumentValue(argMeta, cmdArgs[argMeta.idx], workspace);
             if (commandArgs[argMeta.idx] instanceof AppExecutor)
               process.env.NEXT_PUBLIC_APP_NAME = commandArgs[argMeta.idx].name;
+            if (opt.verbose)
+              Executor.setVerbose(true);
           }
           const cmd = new command();
           try {

package/esm/src/executors.js

@@ -22,6 +22,10 @@ const execEmoji = {
   // for sys executor
 };
 class Executor {
+  static verbose = false;
+  static setVerbose(verbose) {
+    Executor.verbose = verbose;
+  }
   name;
   logger;
   cwdPath;
@@ -51,7 +55,11 @@ class Executor {
     });
   }
   spawn(command, args = [], options = {}) {
-    const proc = spawn(command, args, { cwd: this.cwdPath, stdio: "inherit", ...options });
+    const proc = spawn(command, args, {
+      cwd: this.cwdPath,
+      stdio: Executor.verbose ? "inherit" : "ignore",
+      ...options
+    });
     proc.stdout?.on("data", (data) => {
       Logger.raw(chalk.dim(data.toString()));
     });
@@ -70,7 +78,7 @@ class Executor {
   fork(modulePath, args = [], options = {}) {
     const proc = fork(modulePath, args, {
       cwd: this.cwdPath,
-      stdio: ["ignore", "inherit", "inherit", "ipc"],
+      stdio: Executor.verbose ? ["ignore", "inherit", "inherit", "ipc"] : ["ignore", "ignore", "ignore", "ipc"],
       ...options
     });
     proc.stdout?.on("data", (data) => {
@@ -152,8 +160,8 @@ class Executor {
     this.logger.verbose(msg);
     return this;
   }
-  spinning(msg, { prefix = `${this.emoji}${this.name} -`, indent = 0 } = {}) {
-    return new Spinner(msg, { prefix, indent }).start();
+  spinning(msg, { prefix = `${this.emoji}${this.name}`, indent = 0, enableSpin = !Executor.verbose } = {}) {
+    return new Spinner(msg, { prefix, indent, enableSpin }).start();
   }
   getTsConfig(pathname = "tsconfig.json") {
     const tsconfig = this.readJson(pathname);
@@ -635,6 +643,9 @@ class AppExecutor extends SysExecutor {
       return new AppExecutor({ workspace: executor, name });
     return new AppExecutor({ workspace: executor.workspace, name });
   }
+  getEnv() {
+    return this.workspace.getBaseDevEnv().env;
+  }
   async getConfig(command) {
     return await getAppConfig(this.cwdPath, {
       ...this.workspace.getBaseDevEnv(),

package/esm/src/spinner.js

@@ -1,26 +1,48 @@
 import ora from "ora";
 class Spinner {
+  static padding = 12;
   spinner;
   stopWatch;
   startAt;
+  prefix;
   message;
-  constructor(message, { prefix = "", indent = 0 } = {}) {
+  enableSpin;
+  constructor(message, { prefix = "", indent = 0, enableSpin = true } = {}) {
+    Spinner.padding = Math.max(Spinner.padding, prefix.length);
+    this.prefix = prefix;
     this.message = message;
     this.spinner = ora(message);
-    this.spinner.prefixText = prefix;
+    this.spinner.prefixText = prefix.padStart(Spinner.padding, " ");
     this.spinner.indent = indent;
+    this.enableSpin = enableSpin;
   }
   start() {
     this.startAt = /* @__PURE__ */ new Date();
-    const spinner = this.spinner.start();
-    this.stopWatch = setInterval(() => {
-      spinner.text = `${this.message} (${this.#getElapsedTimeStr()})`;
-    }, 1e3);
+    if (this.enableSpin) {
+      this.spinner.start();
+      this.stopWatch = setInterval(() => {
+        this.spinner.prefixText = this.prefix.padStart(Spinner.padding, " ");
+        this.spinner.text = `${this.message} (${this.#getElapsedTimeStr()})`;
+      }, 1e3);
+    } else
+      this.spinner.info();
     return this;
   }
   succeed(message) {
-    clearInterval(this.stopWatch);
     this.spinner.succeed(`${message} (${this.#getElapsedTimeStr()})`);
+    this.#reset();
+  }
+  fail(message) {
+    this.spinner.fail(`${message} (${this.#getElapsedTimeStr()})`);
+    this.#reset();
+  }
+  isSpinning() {
+    return this.spinner.isSpinning;
+  }
+  #reset() {
+    if (this.stopWatch)
+      clearInterval(this.stopWatch);
+    this.stopWatch = null;
   }
   #getElapsedTimeStr() {
     const ms = (/* @__PURE__ */ new Date()).getTime() - this.startAt.getTime();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "0.0.138",
+  "version": "0.0.139",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/executors.d.ts

@@ -13,6 +13,8 @@ export declare const execEmoji: {
 };
 export declare class Executor {
     #private;
+    static verbose: boolean;
+    static setVerbose(verbose: boolean): void;
     name: string;
     logger: Logger;
     cwdPath: string;
@@ -39,9 +41,10 @@ export declare class Executor {
     cp(srcPath: string, destPath: string): Promise<void>;
     log(msg: string): this;
     verbose(msg: string): this;
-    spinning(msg: string, { prefix, indent }?: {
+    spinning(msg: string, { prefix, indent, enableSpin }?: {
         prefix?: string | undefined;
         indent?: number | undefined;
+        enableSpin?: boolean | undefined;
     }): Spinner;
     getTsConfig(pathname?: string): TsConfigJson;
     applyTemplate({ basePath, template, scanResult, dict, overwrite, }: {
@@ -152,6 +155,7 @@ export declare class AppExecutor extends SysExecutor {
     emoji: string;
     constructor({ workspace, name }: AppExecutorOptions);
     static from(executor: SysExecutor | WorkspaceExecutor, name: string): AppExecutor;
+    getEnv(): "testing" | "local" | "debug" | "develop" | "main";
     getConfig(command?: string): Promise<AppConfigResult>;
     syncAssets(libDeps: string[]): Promise<void>;
 }

package/src/spinner.d.ts

@@ -1,14 +1,20 @@
 import ora from "ora";
 export declare class Spinner {
     #private;
+    static padding: number;
     spinner: ora.Ora;
-    stopWatch: NodeJS.Timeout;
+    stopWatch: NodeJS.Timeout | null;
     startAt: Date;
+    prefix: string;
     message: string;
-    constructor(message: string, { prefix, indent }?: {
+    enableSpin: boolean;
+    constructor(message: string, { prefix, indent, enableSpin }?: {
         prefix?: string | undefined;
         indent?: number | undefined;
+        enableSpin?: boolean | undefined;
     });
     start(): this;
     succeed(message: string): void;
+    fail(message: string): void;
+    isSpinning(): boolean;
 }