@chatbotkit/cli 1.21.3 → 1.21.5

package/dist/cjs/color.cjs

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatBlue = exports.RESET = exports.BLUE = void 0;
+exports.BLUE = '\u001b[34m';
+exports.RESET = '\u001b[0m';
+const formatBlue = (text) => {
+    return `${exports.BLUE}${text}${exports.RESET}`;
+};
+exports.formatBlue = formatBlue;

package/dist/cjs/color.d.ts

@@ -0,0 +1,3 @@
+export const BLUE: "\u001B[34m";
+export const RESET: "\u001B[0m";
+export function formatBlue(text: string): string;

package/dist/cjs/command/agent/index.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
+const color_js_1 = require("../../color.cjs");
 const env_js_1 = require("../../env.cjs");
 const output_js_1 = require("../../output.cjs");
 const spinner_js_1 = require("../../spinner.cjs");
@@ -10,6 +11,66 @@ const sdk_1 = require("@chatbotkit/sdk");
 const commander_1 = require("commander");
 const fs_1 = require("fs");
 const path_1 = require("path");
+class OutputManager {
+    constructor(spinner = null) {
+        this.lastOutputWasRaw = false;
+        this.lastOutputWasStructured = false;
+        this.hasRawOutput = false;
+        this.lastChar = '';
+        this.spinner = spinner;
+    }
+    ensureSpinnerStopped() {
+        if (this.spinner && this.spinner.isSpinning) {
+            this.spinner.stop(false);
+        }
+    }
+    writeRaw(text) {
+        this.ensureSpinnerStopped();
+        if (this.lastOutputWasStructured) {
+            process.stdout.write('\n');
+            this.lastOutputWasStructured = false;
+        }
+        process.stdout.write(text);
+        this.lastOutputWasRaw = true;
+        this.hasRawOutput = true;
+        if (text.length > 0) {
+            this.lastChar = text[text.length - 1];
+        }
+    }
+    addNewlinesIfNeeded() {
+        if (!this.lastOutputWasRaw) {
+            return;
+        }
+        if (this.lastChar === '\n') {
+            process.stdout.write('\n');
+        }
+        else {
+            process.stdout.write('\n\n');
+        }
+        this.lastOutputWasRaw = false;
+    }
+    printStructured(data) {
+        this.ensureSpinnerStopped();
+        this.addNewlinesIfNeeded();
+        (0, output_js_1.print)(data);
+        this.lastOutputWasStructured = true;
+    }
+    reset() {
+        this.lastOutputWasRaw = false;
+        this.lastOutputWasStructured = false;
+        this.hasRawOutput = false;
+        this.lastChar = '';
+    }
+    hadRawOutput() {
+        return this.hasRawOutput;
+    }
+    writeLine(text) {
+        this.ensureSpinnerStopped();
+        this.addNewlinesIfNeeded();
+        console.log(text);
+        this.lastOutputWasStructured = true;
+    }
+}
 function getClient() {
     return new sdk_1.ChatBotKit({
         secret: (0, env_js_1.getSECRET)(),
@@ -42,7 +103,8 @@ exports.command = new commander_1.Command()
         }
     }
     const isInteractive = process.stdout.isTTY;
-    const spinner = isInteractive ? new spinner_js_1.Spinner() : null;
+    const spinner = isInteractive ? new spinner_js_1.Spinner('') : null;
+    const output = new OutputManager(spinner);
     let exitResult = null;
     let hasOutput = false;
     for await (const { type, data } of (0, agent_1.execute)({
@@ -54,66 +116,73 @@ exports.command = new commander_1.Command()
         maxIterations: options.maxIterations,
     })) {
         if (type === 'iteration') {
-            if (spinner) {
-                if (spinner.isSpinning) {
-                    spinner.stop();
-                }
+            if (isInteractive) {
                 const iterationNum = data.iteration - 1;
-                console.log(`\n\n╭─ Iteration ${iterationNum} ─╮`);
-                spinner.start();
+                output.writeLine((0, color_js_1.formatBlue)(`\n╭─ Iteration ${iterationNum} ─╮`));
+                if (spinner) {
+                    spinner.start();
+                }
             }
             else {
-                (0, output_js_1.print)({ iteration: data.iteration - 1 });
+                output.printStructured({ iteration: data.iteration - 1 });
             }
+            output.reset();
             hasOutput = false;
         }
         else if (type === 'toolCallStart') {
-            if (spinner && spinner.isSpinning) {
-                spinner.stop();
-            }
-            (0, output_js_1.print)({ tool: data.name, status: 'running', args: data.args });
+            output.printStructured({
+                tool: data.name,
+                status: 'running',
+                args: data.args,
+            });
             if (spinner) {
                 spinner.start();
             }
         }
         else if (type === 'toolCallEnd') {
-            if (spinner && spinner.isSpinning) {
-                spinner.stop();
-            }
-            (0, output_js_1.print)({ tool: data.name, status: 'completed', result: data.result });
+            output.printStructured({
+                tool: data.name,
+                status: 'completed',
+                result: data.result,
+            });
             if (spinner) {
                 spinner.start();
             }
         }
         else if (type === 'toolCallError') {
-            if (spinner && spinner.isSpinning) {
-                spinner.stop();
-            }
-            (0, output_js_1.print)({ tool: data.name, status: 'error', error: data.error });
+            output.printStructured({
+                tool: data.name,
+                status: 'error',
+                error: data.error,
+            });
             if (spinner) {
                 spinner.start();
             }
         }
         else if (type === 'token') {
-            if (spinner && spinner.isSpinning) {
-                spinner.stop();
-            }
-            if (!hasOutput && isInteractive) {
-                process.stdout.write('> ');
-                hasOutput = true;
+            if (isInteractive) {
+                if (!hasOutput) {
+                    output.writeRaw('> ');
+                    hasOutput = true;
+                }
+                output.writeRaw(data.token.replace(/\n/gm, '\n> '));
             }
-            process.stdout.write(data.token);
         }
         else if (type === 'exit') {
             exitResult = data;
         }
+        else if (type === 'message') {
+            if (data.type === 'bot') {
+                if (!isInteractive) {
+                    output.printStructured({
+                        message: data,
+                    });
+                }
+            }
+        }
     }
-    if (spinner && spinner.isSpinning) {
-        spinner.stop();
-    }
-    process.stdout.write('\n\n');
     if (exitResult) {
-        (0, output_js_1.print)({
+        output.printStructured({
             status: exitResult.code === 0 ? 'success' : 'failed',
             exitCode: exitResult.code,
             ...(exitResult.message && { message: exitResult.message }),

package/dist/cjs/index.cjs

@@ -2,15 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = cbk;
 const tslib_1 = require("tslib");
+const color_js_1 = require("./color.cjs");
 const index_js_1 = tslib_1.__importDefault(require("./command/agent/index.cjs"));
 const index_js_2 = tslib_1.__importDefault(require("./command/api/index.cjs"));
 const index_js_3 = tslib_1.__importDefault(require("./command/chat/index.cjs"));
 const index_js_4 = tslib_1.__importDefault(require("./command/solution/index.cjs"));
 const commander_1 = require("commander");
 function printBanner() {
-    const blue = '\x1b[34m';
-    const reset = '\x1b[0m';
-    console.log(`${blue}
+    console.log((0, color_js_1.formatBlue)(`
  .d8888b.  888888b.   888    d8P
 d88P  Y88b 888  "88b  888   d8P
 888    888 888  .88P  888  d8P
@@ -18,7 +17,8 @@ d88P  Y88b 888  "88b  888   d8P
 888        888  "Y88b 8888888b
 888    888 888    888 888  Y88b
 Y88b  d88P 888   d88P 888   Y88b
- "Y8888P"  8888888P"  888    Y88b .ai${reset}`);
+ "Y8888P"  8888888P"  888    Y88b .ai
+`));
 }
 async function cbk(argv = process.argv) {
     const program = new commander_1.Command();

package/dist/esm/color.d.ts

@@ -0,0 +1,3 @@
+export const BLUE: "\u001B[34m";
+export const RESET: "\u001B[0m";
+export function formatBlue(text: string): string;

package/dist/esm/color.js

@@ -0,0 +1,5 @@
+export const BLUE = '\u001b[34m';
+export const RESET = '\u001b[0m';
+export const formatBlue = (text) => {
+    return `${BLUE}${text}${RESET}`;
+};

package/dist/esm/command/agent/index.js

@@ -1,3 +1,4 @@
+import { formatBlue } from '../../color.js';
 import { getRUNAS_USERID, getSECRET } from '../../env.js';
 import { print, printError } from '../../output.js';
 import { Spinner } from '../../spinner.js';
@@ -7,6 +8,66 @@ import { ChatBotKit } from '@chatbotkit/sdk';
 import { Command, Option } from 'commander';
 import { existsSync, readFileSync } from 'fs';
 import { resolve } from 'path';
+class OutputManager {
+    constructor(spinner = null) {
+        this.lastOutputWasRaw = false;
+        this.lastOutputWasStructured = false;
+        this.hasRawOutput = false;
+        this.lastChar = '';
+        this.spinner = spinner;
+    }
+    ensureSpinnerStopped() {
+        if (this.spinner && this.spinner.isSpinning) {
+            this.spinner.stop(false);
+        }
+    }
+    writeRaw(text) {
+        this.ensureSpinnerStopped();
+        if (this.lastOutputWasStructured) {
+            process.stdout.write('\n');
+            this.lastOutputWasStructured = false;
+        }
+        process.stdout.write(text);
+        this.lastOutputWasRaw = true;
+        this.hasRawOutput = true;
+        if (text.length > 0) {
+            this.lastChar = text[text.length - 1];
+        }
+    }
+    addNewlinesIfNeeded() {
+        if (!this.lastOutputWasRaw) {
+            return;
+        }
+        if (this.lastChar === '\n') {
+            process.stdout.write('\n');
+        }
+        else {
+            process.stdout.write('\n\n');
+        }
+        this.lastOutputWasRaw = false;
+    }
+    printStructured(data) {
+        this.ensureSpinnerStopped();
+        this.addNewlinesIfNeeded();
+        print(data);
+        this.lastOutputWasStructured = true;
+    }
+    reset() {
+        this.lastOutputWasRaw = false;
+        this.lastOutputWasStructured = false;
+        this.hasRawOutput = false;
+        this.lastChar = '';
+    }
+    hadRawOutput() {
+        return this.hasRawOutput;
+    }
+    writeLine(text) {
+        this.ensureSpinnerStopped();
+        this.addNewlinesIfNeeded();
+        console.log(text);
+        this.lastOutputWasStructured = true;
+    }
+}
 function getClient() {
     return new ChatBotKit({
         secret: getSECRET(),
@@ -39,7 +100,8 @@ export const command = new Command()
         }
     }
     const isInteractive = process.stdout.isTTY;
-    const spinner = isInteractive ? new Spinner() : null;
+    const spinner = isInteractive ? new Spinner('') : null;
+    const output = new OutputManager(spinner);
     let exitResult = null;
     let hasOutput = false;
     for await (const { type, data } of execute({
@@ -51,66 +113,73 @@ export const command = new Command()
         maxIterations: options.maxIterations,
     })) {
         if (type === 'iteration') {
-            if (spinner) {
-                if (spinner.isSpinning) {
-                    spinner.stop();
-                }
+            if (isInteractive) {
                 const iterationNum = data.iteration - 1;
-                console.log(`\n\n╭─ Iteration ${iterationNum} ─╮`);
-                spinner.start();
+                output.writeLine(formatBlue(`\n╭─ Iteration ${iterationNum} ─╮`));
+                if (spinner) {
+                    spinner.start();
+                }
             }
             else {
-                print({ iteration: data.iteration - 1 });
+                output.printStructured({ iteration: data.iteration - 1 });
             }
+            output.reset();
             hasOutput = false;
         }
         else if (type === 'toolCallStart') {
-            if (spinner && spinner.isSpinning) {
-                spinner.stop();
-            }
-            print({ tool: data.name, status: 'running', args: data.args });
+            output.printStructured({
+                tool: data.name,
+                status: 'running',
+                args: data.args,
+            });
             if (spinner) {
                 spinner.start();
             }
         }
         else if (type === 'toolCallEnd') {
-            if (spinner && spinner.isSpinning) {
-                spinner.stop();
-            }
-            print({ tool: data.name, status: 'completed', result: data.result });
+            output.printStructured({
+                tool: data.name,
+                status: 'completed',
+                result: data.result,
+            });
             if (spinner) {
                 spinner.start();
             }
         }
         else if (type === 'toolCallError') {
-            if (spinner && spinner.isSpinning) {
-                spinner.stop();
-            }
-            print({ tool: data.name, status: 'error', error: data.error });
+            output.printStructured({
+                tool: data.name,
+                status: 'error',
+                error: data.error,
+            });
             if (spinner) {
                 spinner.start();
             }
         }
         else if (type === 'token') {
-            if (spinner && spinner.isSpinning) {
-                spinner.stop();
-            }
-            if (!hasOutput && isInteractive) {
-                process.stdout.write('> ');
-                hasOutput = true;
+            if (isInteractive) {
+                if (!hasOutput) {
+                    output.writeRaw('> ');
+                    hasOutput = true;
+                }
+                output.writeRaw(data.token.replace(/\n/gm, '\n> '));
             }
-            process.stdout.write(data.token);
         }
         else if (type === 'exit') {
             exitResult = data;
         }
+        else if (type === 'message') {
+            if (data.type === 'bot') {
+                if (!isInteractive) {
+                    output.printStructured({
+                        message: data,
+                    });
+                }
+            }
+        }
     }
-    if (spinner && spinner.isSpinning) {
-        spinner.stop();
-    }
-    process.stdout.write('\n\n');
     if (exitResult) {
-        print({
+        output.printStructured({
             status: exitResult.code === 0 ? 'success' : 'failed',
             exitCode: exitResult.code,
             ...(exitResult.message && { message: exitResult.message }),

package/dist/esm/index.js

@@ -1,12 +1,11 @@
+import { formatBlue } from './color.js';
 import agent from './command/agent/index.js';
 import command from './command/api/index.js';
 import chat from './command/chat/index.js';
 import solution from './command/solution/index.js';
 import { Command } from 'commander';
 function printBanner() {
-    const blue = '\x1b[34m';
-    const reset = '\x1b[0m';
-    console.log(`${blue}
+    console.log(formatBlue(`
  .d8888b.  888888b.   888    d8P
 d88P  Y88b 888  "88b  888   d8P
 888    888 888  .88P  888  d8P
@@ -14,7 +13,8 @@ d88P  Y88b 888  "88b  888   d8P
 888        888  "Y88b 8888888b
 888    888 888    888 888  Y88b
 Y88b  d88P 888   d88P 888   Y88b
- "Y8888P"  8888888P"  888    Y88b .ai${reset}`);
+ "Y8888P"  8888888P"  888    Y88b .ai
+`));
 }
 export default async function cbk(argv = process.argv) {
     const program = new Command();