@botpress/adk-cli 1.4.3 → 1.4.4

package/dist/cli.js

@@ -311960,15 +311960,23 @@ __export(exports_internal, {
   createSpan: () => createSpan,
   contextManager: () => contextManager,
   Workflow: () => BaseWorkflow,
+  WEBHOOK_ID_HEADER: () => WEBHOOK_ID_HEADER,
   Trigger: () => Trigger,
   Table: () => BaseTable,
   Primitives: () => Primitives3,
+  OPERATION_TYPE_HEADER: () => OPERATION_TYPE_HEADER,
+  OPERATION_SUBTYPE_HEADER: () => OPERATION_SUBTYPE_HEADER,
+  LOG_DELIMITER: () => LOG_DELIMITER,
   Knowledge: () => BaseKnowledge,
   Errors: () => Errors,
   DataSource: () => DataSource2,
   Conversation: () => BaseConversation,
+  CONFIGURATION_TYPE_HEADER: () => CONFIGURATION_TYPE_HEADER,
+  CONFIGURATION_PAYLOAD_HEADER: () => CONFIGURATION_PAYLOAD_HEADER,
   BuiltInWorkflows: () => BuiltInWorkflows,
   BaseWorkflowInstance: () => BaseWorkflowInstance,
+  BOT_USER_ID_HEADER: () => BOT_USER_ID_HEADER,
+  BOT_ID_HEADER: () => BOT_ID_HEADER,
   Action: () => Action
 });
 import { EventEmitter as EventEmitter22 } from "events";
@@ -313944,7 +313952,16 @@ function serializeArgs(...args) {
   });
 }
 function writeStructuredLog(type, ...args) {
+  const output2 = process.stdout;
   const { spanId, traceId } = getTraceContext();
+  let maybeArgObj = null;
+  try {
+    maybeArgObj = typeof args[0] === "string" ? JSON.parse(args[0]) : args[0];
+  } catch {}
+  if (maybeArgObj && typeof maybeArgObj === "object" && maybeArgObj.type === "worker_stats") {
+    output2.write((0, import_fast_safe_stringify3.default)(maybeArgObj) + LOG_DELIMITER);
+    return;
+  }
   const logEntry = {
     timestamp: (/* @__PURE__ */ new Date()).toISOString(),
     type,
@@ -313956,9 +313973,7 @@ function writeStructuredLog(type, ...args) {
   if (traceId) {
     logEntry.traceId = traceId;
   }
-  const output2 = process.stdout;
-  output2.write(JSON.stringify(logEntry) + `
-`);
+  output2.write((0, import_fast_safe_stringify3.default)(logEntry) + LOG_DELIMITER);
 }
 function installStructuredLogging() {
   console.log = (...args) => {
@@ -315115,48 +315130,18 @@ function initializeParentWorker(bot2) {
         queueSize: detailedStats.currentQueueSize
       }
     }));
-  }, 2000);
+  }, 500);
 }
 function debugLog3(...args) {
   if (DEBUG_ENABLED3) {
-    originalLog(...args);
+    console.log(...args);
   }
 }
-function setupLogRelay() {
-  if (!parentPort)
-    return;
-  const originalConsole = {
-    log: console.log,
-    info: console.info,
-    warn: console.warn,
-    error: console.error,
-    debug: console.debug
-  };
-  originalLog = originalConsole.log;
-  const createLogRelay = (level) => {
-    return (...args) => {
-      parentPort.postMessage({
-        type: "log",
-        level,
-        args
-      });
-      if (DEBUG_ENABLED3) {
-        originalConsole[level](...args);
-      }
-    };
-  };
-  console.log = createLogRelay("log");
-  console.info = createLogRelay("info");
-  console.warn = createLogRelay("warn");
-  console.error = createLogRelay("error");
-  console.debug = createLogRelay("debug");
-}
 function runWorker(bot2) {
   const expiryTime = process.env.WORKER_EXPIRY_TIME ? parseInt(process.env.WORKER_EXPIRY_TIME, 10) : Date.now() + 300000;
   if (!parentPort) {
     throw new Error("This script must be run as a worker thread");
   }
-  setupLogRelay();
   parentPort.on("message", async (message2) => {
     const { type, taskId, event: event2 } = message2;
     if (type !== "event" || !taskId) {
@@ -315452,7 +315437,8 @@ var import_const, import_const2, __create4, __defProp6, __getOwnPropDesc3, __get
     return tracker;
   }
   throw new Error("PromiseTracker not found in context. Make sure to initialize it in your runtime setup.");
-}, InterfaceMappings, AgentRegistry = class {
+}, InterfaceMappings, BOT_ID_HEADER = "x-bot-id", BOT_USER_ID_HEADER = "x-bot-user-id", WEBHOOK_ID_HEADER = "x-webhook-id", CONFIGURATION_TYPE_HEADER = "x-bp-configuration-type", CONFIGURATION_PAYLOAD_HEADER = "x-bp-configuration", OPERATION_TYPE_HEADER = "x-bp-operation", OPERATION_SUBTYPE_HEADER = "x-bp-type", LOG_DELIMITER = `<|MESSAGE_END|>
+`, AgentRegistry = class {
   _data = null;
   initialize(data) {
     if (this._data) {
@@ -317478,6 +317464,7 @@ var import_const, import_const2, __create4, __defProp6, __getOwnPropDesc3, __get
   constructor(props) {
     this.name = props.name;
     this.sources = props.sources;
+    this.description = props.description;
   }
   getDefinition() {
     return {
@@ -317891,6 +317878,9 @@ var import_const, import_const2, __create4, __defProp6, __getOwnPropDesc3, __get
           case "debug":
             console.debug(prefix, ...args);
             break;
+          case "log":
+            console.log(prefix, ...args);
+            break;
           default:
             debugLog(prefix, ...args);
         }
@@ -318231,7 +318221,7 @@ var import_const, import_const2, __create4, __defProp6, __getOwnPropDesc3, __get
     return lines.join(`
 `);
   }
-}, DEBUG_ENABLED2, globalWorkerPool = null, DEBUG_ENABLED3, originalLog, isWorkerMode = () => {
+}, DEBUG_ENABLED2, globalWorkerPool = null, DEBUG_ENABLED3, isWorkerMode = () => {
   const mode = process.env.WORKER_MODE?.trim().toLowerCase();
   return mode === "true" || mode === "1" || mode === "yes";
 };
@@ -318290,7 +318280,7 @@ var init_internal = __esm(() => {
   });
   init_define_PACKAGE_VERSIONS = __esm2({
     "<define:__PACKAGE_VERSIONS__>"() {
-      define_PACKAGE_VERSIONS_default = { runtime: "1.2.3", adk: "not-installed", sdk: "4.16.0", llmz: "0.0.26", zai: "2.1.16", cognitive: "0.1.47" };
+      define_PACKAGE_VERSIONS_default = { runtime: "1.2.4", adk: "not-installed", sdk: "4.16.0", llmz: "0.0.26", zai: "2.1.16", cognitive: "0.1.47" };
     }
   });
   init_globalThis = __esm2({
@@ -352676,6 +352666,9 @@ ${issues.join(`
     Autonomous2.DefaultExit = DefaultExit;
     function createKnowledgeSearchTool(knowledgeBases) {
       const kbNames = knowledgeBases.map((kb3) => kb3.name);
+      for (const kb3 of knowledgeBases) {
+        console.log(kb3.name, kb3.description);
+      }
       const description = knowledgeBases.map((kb3) => `- "${kb3.name}": ${kb3.description || "No description"}`).join(`
 `);
       return new Tool({
@@ -352744,6 +352737,8 @@ If the question is not related to the knowledge bases, do NOT use this tool.`.tr
             message2.push(p.content);
             message2.push(`</${tag}>`);
           }
+          console.log(message2.join(`
+`).trim());
           throw new Autonomous2.ThinkSignal(`We got the search results. When answering the question, you MUST add inline the citations used (eg: "Yes, the price is $10${example} ...")`, message2.join(`
 `).trim());
         }
@@ -352839,6 +352834,7 @@ Always prefer information from the knowledge bases over general knowledge when a
                               message: "ThinkSignal"
                             });
                             err[HandledErrorProp] = true;
+                            throw err;
                           } else {
                             s2.setAttributes({
                               "autonomous.tool.status": "error",
@@ -354873,7 +354869,6 @@ ${iteration.status.execution_error.stack}`;
   init_define_BUILD();
   init_define_PACKAGE_VERSIONS();
   DEBUG_ENABLED3 = process.env.BP_DEBUG === "true" || process.env.BP_DEBUG === "1";
-  originalLog = console.log;
   /*! Bundled license information:
   
   lodash/lodash.js:
@@ -371056,7 +371051,6 @@ async function generateWorkflowTypes(project) {
       const workflowModule = await import(`${workflowPath}?t=${Date.now()}`);
       const workflowInstance = workflowModule[workflowRef.export] || workflowModule.default;
       if (!workflowInstance) {
-        console.warn(`No default export found in workflow file: ${workflowRef.path}`);
         continue;
       }
       const inputType = workflowInstance.inputSchema ? workflowInstance.inputSchema.toTypescriptType?.() || "any" : "{}";
@@ -372077,16 +372071,16 @@ export {};
 
       if (isWorkerMode() && isMainThread) {
         // Branch 1: Main thread in worker mode - initialize parent with pool
-        console.log("[Main] Initializing parent worker with pool...");
+        if (process.env.BP_DEBUG) console.log("[Main] Initializing parent worker with pool...");
         initializeParentWorker(bot);
       } else if (isWorkerMode() && process.env.IS_DEV_WORKER === "true") {
         // Branch 2: Worker thread - run child worker
-        console.log("[Worker] Initializing child worker...");
+        if (process.env.BP_DEBUG) console.log("[Worker] Initializing child worker...");
         runWorker(bot);
         setupAdkRuntime(bot);
       } else {
         // Branch 3: Worker mode disabled - single-thread mode
-        console.log("[Bot] Running in single-thread mode");
+        if (process.env.BP_DEBUG) console.log("[Bot] Running in single-thread mode");
         setupAdkRuntime(bot);
       }
 
@@ -378117,7 +378111,7 @@ var init_Separator = __esm(async () => {
 var require_package3 = __commonJS((exports, module) => {
   module.exports = {
     name: "@botpress/adk",
-    version: "1.2.3",
+    version: "1.2.4",
     description: "Core ADK library for building AI agents on Botpress",
     type: "module",
     main: "dist/index.js",
@@ -378997,21 +378991,21 @@ var import_react34, jsx_dev_runtime15, BlinkingCursor = () => {
                   workerStats && /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(jsx_dev_runtime15.Fragment, {
                     children: [
                       /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
-                        children: " "
+                        children: "  "
                       }, undefined, false, undefined, this),
                       /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
-                        color: theme.accent.purple,
+                        color: workerStats.busy > 0 ? theme.accent.purple : theme.text.dim,
                         children: "\u25CF"
                       }, undefined, false, undefined, this),
-                      /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+                      workerStats.busy > 0 ? /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
                         children: [
                           " ",
-                          "Workers ",
                           workerStats.busy,
-                          "/",
-                          workerStats.total
+                          " Processing"
                         ]
-                      }, undefined, true, undefined, this),
+                      }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
+                        children: " Idle"
+                      }, undefined, false, undefined, this),
                       workerStats.queueSize > 0 && /* @__PURE__ */ jsx_dev_runtime15.jsxDEV(Text, {
                         color: theme.status.warning,
                         children: [
@@ -379061,10 +379055,14 @@ var init_DevStatus = __esm(async () => {
 
 // src/components/LogsView.tsx
 import { readFileSync as readFileSync8, existsSync as existsSync7, statSync as statSync2, watchFile, unwatchFile } from "fs";
-var import_react35, jsx_dev_runtime16, parseLogLine = (line) => {
+var import_react35, jsx_dev_runtime16, parseLogLine = (line, lineNumber) => {
   try {
     const parsed = JSON.parse(line);
+    if (parsed.type === "worker_stats") {
+      return null;
+    }
     return {
+      line: lineNumber,
       timestamp: parsed.timestamp || new Date().toISOString(),
       type: parsed.type || "info",
       message: parsed.message,
@@ -379093,7 +379091,7 @@ var import_react35, jsx_dev_runtime16, parseLogLine = (line) => {
 }) => {
   const theme = useTheme();
   const [logs, setLogs] = import_react35.useState([]);
-  const [lastSize, setLastSize] = import_react35.useState(0);
+  const lastSize = import_react35.useRef(0);
   const supportsInput = process.stdin.isTTY === true;
   if (supportsInput) {
     use_input_default((input, _key) => {
@@ -379102,24 +379100,6 @@ var import_react35, jsx_dev_runtime16, parseLogLine = (line) => {
       }
     });
   }
-  import_react35.useEffect(() => {
-    if (!existsSync7(logFilePath)) {
-      return;
-    }
-    const content = readFileSync8(logFilePath, "utf-8");
-    const lines = content.split(`
-`).filter((line) => line.trim());
-    const entries = [];
-    for (const line of lines) {
-      const entry = parseLogLine(line);
-      if (entry) {
-        entries.push(entry);
-      }
-    }
-    setLogs(entries);
-    const stats = statSync2(logFilePath);
-    setLastSize(stats.size);
-  }, [logFilePath]);
   import_react35.useEffect(() => {
     if (!existsSync7(logFilePath)) {
       return;
@@ -379127,31 +379107,38 @@ var import_react35, jsx_dev_runtime16, parseLogLine = (line) => {
     const checkForNewLogs = () => {
       try {
         const stats = statSync2(logFilePath);
-        if (stats.size > lastSize) {
-          const content = readFileSync8(logFilePath, "utf-8");
-          const lines = content.split(`
-`).filter((line) => line.trim());
-          const entries = [];
-          for (const line of lines) {
-            const entry = parseLogLine(line);
-            if (entry) {
-              entries.push(entry);
-            }
+        if (stats.size <= lastSize.current) {
+          return;
+        }
+        lastSize.current = stats.size;
+        const content = readFileSync8(logFilePath, "utf-8");
+        const lines = content.split(`
+`);
+        const entries = [];
+        for (let i2 = 0;i2 < lines.length; i2++) {
+          const line = lines[i2];
+          const entry = parseLogLine(line, i2);
+          if (entry) {
+            entries.push(entry);
           }
-          setLogs(entries);
-          setLastSize(stats.size);
         }
+        setLogs((existing) => {
+          const newEntries = entries.filter((e6) => existing.every((ex4) => ex4.line !== e6.line));
+          return [...existing, ...newEntries];
+        });
       } catch (error) {}
     };
     watchFile(logFilePath, { interval: 100 }, checkForNewLogs);
+    checkForNewLogs();
     return () => {
       unwatchFile(logFilePath);
     };
-  }, [logFilePath, lastSize]);
+  }, [logFilePath]);
   return /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
     flexDirection: "column",
     paddingX: 1,
     paddingY: 1,
+    overflowY: "visible",
     children: [
       /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
         flexDirection: "column",
@@ -379193,33 +379180,39 @@ var import_react35, jsx_dev_runtime16, parseLogLine = (line) => {
           ]
         }, undefined, true, undefined, this)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Static, {
-        items: logs,
-        children: (entry, index) => {
-          const timestamp = new Date(entry.timestamp);
-          const timeStr = timestamp.toLocaleTimeString();
-          const message2 = entry.message || (entry.args?.join(" ") || "");
-          const color = getLogLevelColor(entry.type, theme);
-          return /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
-            children: [
-              /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
-                color: theme.text.dim,
-                children: [
-                  "[",
-                  timeStr,
-                  "]"
-                ]
-              }, undefined, true, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
-                children: " "
-              }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
-                color,
-                children: message2
-              }, undefined, false, undefined, this)
-            ]
-          }, index, true, undefined, this);
-        }
+      /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
+        children: /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Static, {
+          items: logs,
+          style: {
+            overflowY: "visible",
+            justifyContent: "flex-end"
+          },
+          children: (entry) => {
+            const timestamp = new Date(entry.timestamp);
+            const timeStr = timestamp.toLocaleTimeString();
+            const message2 = entry.message || entry.args?.join(" ") || "";
+            const color = getLogLevelColor(entry.type, theme);
+            return /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
+              children: [
+                /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+                  color: theme.text.dim,
+                  children: [
+                    "[",
+                    timeStr,
+                    "]"
+                  ]
+                }, undefined, true, undefined, this),
+                /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+                  children: " "
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+                  color,
+                  children: message2
+                }, undefined, false, undefined, this)
+              ]
+            }, entry.line, true, undefined, this);
+          }
+        }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
         marginTop: 1,
@@ -379261,7 +379254,9 @@ async function findAgentRoot(startPath) {
 async function findAgentRootOrFail(startPath) {
   const root4 = await findAgentRoot(startPath);
   if (!root4) {
-    throw new Error("No ADK agent root found in the current directory or its parents.");
+    throw new Error(`No ADK agent root found in the current directory or its parents.
+
+` + "Run `adk help` to see all commands\n" + "Run `adk init` to create a new agent");
   }
   return root4;
 }
@@ -383545,6 +383540,9 @@ var import_react36, jsx_dev_runtime18, DevUI = ({
             return false;
           }
         };
+        const isWorkerStats = (obj) => {
+          return typeof obj === "object" && obj !== null && "type" in obj && obj.type === "worker_stats" && "stats" in obj;
+        };
         const formatAndWriteLog = (logEntry) => {
           if (!options.logs)
             return;
@@ -383567,62 +383565,52 @@ var import_react36, jsx_dev_runtime18, DevUI = ({
 `);
         };
         devCommand.on("stdout", (data) => {
-          const lines = data.split(`
-`);
+          const lines = data.split(LOG_DELIMITER).map((line) => line.replaceAll(LOG_DELIMITER, "").trim());
           for (const line of lines) {
-            const trimmed = line.trim();
-            if (trimmed) {
-              try {
-                const parsed = JSON.parse(trimmed);
-                if (parsed.type === "worker_stats" && parsed.stats) {
-                  setWorkerStats(parsed.stats);
-                  updateWorkerStats(parsed.stats);
-                  continue;
-                }
-              } catch {}
-              if (isStructuredLog(trimmed)) {
-                logStream.write(trimmed + `
-`);
-                formatAndWriteLog(trimmed);
-              } else {
-                const logEntry = JSON.stringify({
+            let trimmed = line.trim();
+            let parsed = null;
+            try {
+              parsed = JSON.parse(trimmed);
+            } catch {}
+            if (isWorkerStats(parsed)) {
+              setWorkerStats(parsed.stats);
+              updateWorkerStats(parsed.stats);
+            } else if (trimmed) {
+              if (!isStructuredLog(trimmed)) {
+                trimmed = JSON.stringify({
                   timestamp: new Date().toISOString(),
-                  type: "stdout",
+                  type: "stderr",
                   args: [trimmed]
-                }) + `
-`;
-                logStream.write(logEntry);
-                if (options.logs) {
-                  process.stdout.write(trimmed + `
-`);
-                }
+                });
               }
+              logStream.write(trimmed + `
+`);
+              formatAndWriteLog(trimmed);
             }
           }
         });
         devCommand.on("stderr", (data) => {
-          const lines = data.split(`
-`);
+          const lines = data.split(LOG_DELIMITER).map((line) => line.replaceAll(LOG_DELIMITER, "").trim());
           for (const line of lines) {
-            const trimmed = line.trim();
-            if (trimmed) {
-              if (isStructuredLog(trimmed)) {
-                logStream.write(trimmed + `
-`);
-                formatAndWriteLog(trimmed);
-              } else {
-                const logEntry = JSON.stringify({
+            let trimmed = line.trim();
+            let parsed = null;
+            try {
+              parsed = JSON.parse(trimmed);
+            } catch {}
+            if (isWorkerStats(parsed)) {
+              setWorkerStats(parsed.stats);
+              updateWorkerStats(parsed.stats);
+            } else if (trimmed) {
+              if (!isStructuredLog(trimmed)) {
+                trimmed = JSON.stringify({
                   timestamp: new Date().toISOString(),
                   type: "stderr",
                   args: [trimmed]
-                }) + `
-`;
-                logStream.write(logEntry);
-                if (options.logs) {
-                  process.stderr.write(trimmed + `
-`);
-                }
+                });
               }
+              logStream.write(trimmed + `
+`);
+              formatAndWriteLog(trimmed);
             }
           }
         });
@@ -383985,6 +383973,7 @@ var init_adk_dev = __esm(async () => {
   init_debugger();
   init_inspector_pid_cache();
   init_editor_detector();
+  init_internal();
   await __promiseAll([
     init_build2(),
     init_DevStatus(),
@@ -395398,7 +395387,7 @@ function formatHelp(cmd, version) {
 // src/cli.ts
 var __filename2 = fileURLToPath9(import.meta.url);
 var __dirname5 = dirname3(__filename2);
-var CLI_VERSION = "1.4.3";
+var CLI_VERSION = "1.4.4";
 program.name("adk").description("Botpress Agent Development Kit (ADK) - CLI for building AI agents").version(CLI_VERSION).option("--no-cache", "Disable caching for integration lookups").configureHelp({
   formatHelp: () => formatHelp(program, CLI_VERSION)
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/adk-cli",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "Command-line interface for the Botpress Agent Development Kit (ADK)",
   "type": "module",
   "main": "dist/index.js",
@@ -40,9 +40,9 @@
     "url": "https://github.com/botpress/adk"
   },
   "dependencies": {
-    "@botpress/adk": "^1.0.1",
+    "@botpress/adk": "^1.2.4",
     "@botpress/cli": "^4.18.2",
-    "@botpress/runtime": "^1.0.1",
+    "@botpress/runtime": "^1.2.4",
     "adm-zip": "^0.5.16",
     "chalk": "^5.4.1",
     "clipboardy": "^4.0.0",
@@ -53,6 +53,7 @@
     "highlight.js": "^11.10.0",
     "ink": "^6.3.1",
     "open": "^10.2.0",
+    "prettier": "^3.6.2",
     "react": "19",
     "tar": "^7.5.1"
   },