@cmdop/bot 2026.2.26 → 2026.2.28

package/dist/index.js

@@ -3,6 +3,7 @@ import { Bot } from 'grammy';
 import { Client, GatewayIntentBits, Events, REST, Routes } from 'discord.js';
 import { App, Assistant } from '@slack/bolt';
 import { CMDOPClient } from '@cmdop/node';
+import { createConsola } from 'consola';
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -159,6 +160,95 @@ var init_errors = __esm({
   }
 });
 
+// src/models/command.ts
+var command_exports = {};
+__export(command_exports, {
+  ParsedCommandSchema: () => ParsedCommandSchema,
+  parseCommand: () => parseCommand
+});
+function parseCommand(text) {
+  const trimmed = text.trim();
+  const match = /^[/!](\w+)(?:\s+(.*))?$/s.exec(trimmed);
+  if (!match) return null;
+  const name = (match[1] ?? "").toLowerCase();
+  const rest = (match[2] ?? "").trim();
+  const args = rest ? rest.split(/\s+/) : [];
+  return ParsedCommandSchema.parse({ name, args, rawText: trimmed });
+}
+var ParsedCommandSchema;
+var init_command = __esm({
+  "src/models/command.ts"() {
+    ParsedCommandSchema = z.object({
+      name: z.string().min(1),
+      args: z.array(z.string()),
+      rawText: z.string()
+    });
+  }
+});
+
+// src/core/base-channel.ts
+var BaseChannel;
+var init_base_channel = __esm({
+  "src/core/base-channel.ts"() {
+    init_command();
+    init_errors();
+    BaseChannel = class {
+      constructor(id, name, permissions, dispatcher, logger) {
+        this.id = id;
+        this.name = name;
+        this.permissions = permissions;
+        this.dispatcher = dispatcher;
+        this.logger = logger;
+      }
+      /**
+       * Process an incoming message: parse command → check permission → dispatch → send result.
+       * Plain text (non-command) is routed to the agent handler automatically.
+       * Channels call this from their platform event handler.
+       */
+      async processMessage(msg) {
+        const parsed = parseCommand(msg.text);
+        const ctx = parsed ? {
+          userId: msg.userId,
+          command: parsed.name,
+          args: parsed.args,
+          channelId: msg.channelId,
+          message: msg
+        } : {
+          userId: msg.userId,
+          command: "agent",
+          args: [msg.text],
+          channelId: msg.channelId,
+          message: msg
+        };
+        let result;
+        try {
+          result = await this.dispatcher.dispatch(ctx);
+        } catch (err2) {
+          const botErr = err2 instanceof BotError ? err2 : new BotError("Unexpected error", { cause: err2 instanceof Error ? err2 : void 0 });
+          result = { ok: false, error: botErr };
+        }
+        if (result.ok) {
+          await this.send(msg.userId, result.value);
+        } else {
+          await this.send(msg.userId, {
+            type: "error",
+            message: this.formatErrorMessage(result.error)
+          });
+        }
+      }
+      formatErrorMessage(error) {
+        if (error instanceof CommandNotFoundError) {
+          return `Unknown command. Type /help for available commands.`;
+        }
+        return error.message;
+      }
+      logEvent(event, meta = {}) {
+        this.logger.info(`[${this.name}] ${event}`, { channel: this.id, ...meta });
+      }
+    };
+  }
+});
+
 // ../../node_modules/.pnpm/bottleneck@2.19.5/node_modules/bottleneck/lib/parser.js
 var require_parser = __commonJS({
   "../../node_modules/.pnpm/bottleneck@2.19.5/node_modules/bottleneck/lib/parser.js"(exports2) {
@@ -3009,9 +3099,9 @@ var require_lib = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@grammyjs+transformer-throttler@1.2.1_grammy@1.40.0/node_modules/@grammyjs/transformer-throttler/dist/deps.node.js
+// ../../node_modules/.pnpm/@grammyjs+transformer-throttler@1.2.1_grammy@1.40.1/node_modules/@grammyjs/transformer-throttler/dist/deps.node.js
 var require_deps_node = __commonJS({
-  "../../node_modules/.pnpm/@grammyjs+transformer-throttler@1.2.1_grammy@1.40.0/node_modules/@grammyjs/transformer-throttler/dist/deps.node.js"(exports2) {
+  "../../node_modules/.pnpm/@grammyjs+transformer-throttler@1.2.1_grammy@1.40.1/node_modules/@grammyjs/transformer-throttler/dist/deps.node.js"(exports2) {
     var __importDefault = exports2 && exports2.__importDefault || function(mod2) {
       return mod2 && mod2.__esModule ? mod2 : { "default": mod2 };
     };
@@ -3024,9 +3114,9 @@ var require_deps_node = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@grammyjs+transformer-throttler@1.2.1_grammy@1.40.0/node_modules/@grammyjs/transformer-throttler/dist/mod.js
+// ../../node_modules/.pnpm/@grammyjs+transformer-throttler@1.2.1_grammy@1.40.1/node_modules/@grammyjs/transformer-throttler/dist/mod.js
 var require_mod = __commonJS({
-  "../../node_modules/.pnpm/@grammyjs+transformer-throttler@1.2.1_grammy@1.40.0/node_modules/@grammyjs/transformer-throttler/dist/mod.js"(exports2) {
+  "../../node_modules/.pnpm/@grammyjs+transformer-throttler@1.2.1_grammy@1.40.1/node_modules/@grammyjs/transformer-throttler/dist/mod.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.bypassThrottler = exports2.apiThrottler = exports2.BottleneckStrategy = void 0;
     var deps_node_js_1 = require_deps_node();
@@ -3089,90 +3179,10 @@ var require_mod = __commonJS({
   }
 });
 
-// src/models/command.ts
-var command_exports = {};
-__export(command_exports, {
-  ParsedCommandSchema: () => ParsedCommandSchema,
-  parseCommand: () => parseCommand
-});
-function parseCommand(text) {
-  const trimmed = text.trim();
-  const match = /^[/!](\w+)(?:\s+(.*))?$/s.exec(trimmed);
-  if (!match) return null;
-  const name = (match[1] ?? "").toLowerCase();
-  const rest = (match[2] ?? "").trim();
-  const args = rest ? rest.split(/\s+/) : [];
-  return ParsedCommandSchema.parse({ name, args, rawText: trimmed });
-}
-var ParsedCommandSchema;
-var init_command = __esm({
-  "src/models/command.ts"() {
-    ParsedCommandSchema = z.object({
-      name: z.string().min(1),
-      args: z.array(z.string()),
-      rawText: z.string()
-    });
-  }
-});
-
-// src/core/base-channel.ts
-var BaseChannel;
-var init_base_channel = __esm({
-  "src/core/base-channel.ts"() {
-    init_command();
-    init_errors();
-    BaseChannel = class {
-      constructor(id, name, permissions, dispatcher, logger) {
-        this.id = id;
-        this.name = name;
-        this.permissions = permissions;
-        this.dispatcher = dispatcher;
-        this.logger = logger;
-      }
-      /**
-       * Process an incoming message: parse command → check permission → dispatch → send result.
-       * Channels call this from their platform event handler.
-       */
-      async processMessage(msg) {
-        const parsed = parseCommand(msg.text);
-        if (!parsed) return;
-        const ctx = {
-          userId: msg.userId,
-          command: parsed.name,
-          args: parsed.args,
-          channelId: msg.channelId,
-          message: msg
-        };
-        let result;
-        try {
-          result = await this.dispatcher.dispatch(ctx);
-        } catch (err2) {
-          const botErr = err2 instanceof BotError ? err2 : new BotError("Unexpected error", { cause: err2 instanceof Error ? err2 : void 0 });
-          result = { ok: false, error: botErr };
-        }
-        if (result.ok) {
-          await this.send(msg.userId, result.value);
-        } else {
-          await this.send(msg.userId, {
-            type: "error",
-            message: this.formatErrorMessage(result.error)
-          });
-        }
-      }
-      formatErrorMessage(error) {
-        if (error instanceof CommandNotFoundError) {
-          return `Unknown command. Type /help for available commands.`;
-        }
-        return error.message;
-      }
-      logEvent(event, meta = {}) {
-        this.logger.info(`[${this.name}] ${event}`, { channel: this.id, ...meta });
-      }
-    };
-  }
-});
-
 // src/channels/telegram/formatter.ts
+function escapeHtml(text) {
+  return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
 function formatBytes(bytes) {
   if (bytes < 1024) return `${bytes}B`;
   if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)}K`;
@@ -3242,6 +3252,51 @@ ${this.formatText(error.message)}`;
         const sizeStr = size !== void 0 && !isDir ? ` \\(${this.formatText(formatBytes(size))}\\)` : "";
         return `${icon} \`${this.escapeInline(name)}\`${sizeStr}`;
       }
+      // ─── HTML formatting (preferred — avoids MarkdownV2 escaping hell) ────────
+      /**
+       * Escape HTML special chars, then convert basic markdown to HTML tags.
+       * Handles: **bold**, `code`, ```code blocks```, _italic_
+       */
+      formatTextHtml(text) {
+        let html = escapeHtml(text);
+        html = html.replace(/```(\w*)\n([\s\S]*?)```/g, (_m, lang, code) => {
+          const cls = lang ? ` class="language-${lang}"` : "";
+          return `<pre><code${cls}>${code}</code></pre>`;
+        });
+        html = html.replace(/`([^`]+)`/g, "<code>$1</code>");
+        html = html.replace(/\*\*(.+?)\*\*/g, "<b>$1</b>");
+        html = html.replace(/__(.+?)__/g, "<b>$1</b>");
+        html = html.replace(/(?<!\w)\*([^*]+?)\*(?!\w)/g, "<i>$1</i>");
+        html = html.replace(/(?<!\w)_([^_]+?)_(?!\w)/g, "<i>$1</i>");
+        return html;
+      }
+      /**
+       * Format code block as HTML <pre>.
+       */
+      formatCodeHtml(code, language) {
+        const escaped = escapeHtml(code);
+        const cls = language ? ` class="language-${language}"` : "";
+        const wrapped = `<pre><code${cls}>${escaped}</code></pre>`;
+        if (wrapped.length <= TELEGRAM_MAX_MESSAGE_LENGTH) return wrapped;
+        const overhead = 40 + (language?.length ?? 0);
+        const maxCode = TELEGRAM_MAX_MESSAGE_LENGTH - overhead;
+        return `<pre><code${cls}>${escaped.slice(0, maxCode)}
+\u2026(truncated)</code></pre>`;
+      }
+      /**
+       * Format error message as HTML.
+       */
+      formatErrorHtml(message) {
+        return `\u274C <b>Error:</b> ${escapeHtml(message)}`;
+      }
+      /**
+       * Format file entry as HTML.
+       */
+      formatFileEntryHtml(name, isDir, size) {
+        const icon = isDir ? "\u{1F4C1}" : "\u{1F4C4}";
+        const sizeStr = size !== void 0 && !isDir ? ` (${formatBytes(size)})` : "";
+        return `${icon} <code>${escapeHtml(name)}</code>${sizeStr}`;
+      }
       // Escape text that appears inside inline code (backtick context)
       escapeInline(text) {
         return text.replace(/`/g, "'");
@@ -3280,8 +3335,18 @@ var init_channel = __esm({
         bot.on("message:text", async (ctx) => {
           const msg = this.normalizeContext(ctx);
           if (!msg) return;
-          for (const h3 of this.messageHandlers) await h3(msg);
-          await this.processMessage(msg);
+          const typingInterval = setInterval(() => {
+            ctx.api.sendChatAction(ctx.chat.id, "typing").catch(() => {
+            });
+          }, 4e3);
+          await ctx.api.sendChatAction(ctx.chat.id, "typing").catch(() => {
+          });
+          try {
+            for (const h3 of this.messageHandlers) await h3(msg);
+            await this.processMessage(msg);
+          } finally {
+            clearInterval(typingInterval);
+          }
         });
         bot.on("callback_query:data", async (ctx) => {
           await ctx.answerCallbackQuery();
@@ -3329,20 +3394,18 @@ var init_channel = __esm({
         try {
           switch (message.type) {
             case "text": {
-              const text = this.truncate(this.formatter.formatText(message.text));
-              await this.bot.api.sendMessage(chatId, text, { parse_mode: "MarkdownV2" });
+              const text = this.truncate(this.formatter.formatTextHtml(message.text));
+              await this.bot.api.sendMessage(chatId, text, { parse_mode: "HTML" });
               break;
             }
             case "code": {
-              const code = this.formatter.formatCode(message.code, message.language);
-              await this.bot.api.sendMessage(chatId, code, { parse_mode: "MarkdownV2" });
+              const code = this.formatter.formatCodeHtml(message.code, message.language);
+              await this.bot.api.sendMessage(chatId, code, { parse_mode: "HTML" });
               break;
             }
             case "error": {
-              const errText = this.formatter.formatError(
-                Object.assign(new Error(message.message), { code: "BOT_ERROR", context: {}, toLog: () => ({}) })
-              );
-              await this.bot.api.sendMessage(chatId, errText, { parse_mode: "MarkdownV2" });
+              const errText = this.formatter.formatErrorHtml(message.message);
+              await this.bot.api.sendMessage(chatId, errText, { parse_mode: "HTML" });
               break;
             }
           }
@@ -3369,7 +3432,7 @@ var init_channel = __esm({
       }
       truncate(text) {
         if (text.length <= this.maxLength) return text;
-        return text.slice(0, this.maxLength - 20) + "\n\\.\\.\\. *\\(truncated\\)*";
+        return text.slice(0, this.maxLength - 20) + "\n... <i>(truncated)</i>";
       }
     };
   }
@@ -16578,21 +16641,34 @@ var PermissionManager = class {
     return this.identityMap;
   }
 };
-
-// src/core/logger.ts
-var LEVELS = { debug: 0, info: 1, warn: 2, error: 3 };
+var CONSOLA_LEVELS = {
+  debug: 4,
+  info: 3,
+  warn: 2,
+  error: 1
+};
 function createLogger(level = "info") {
-  const minLevel = LEVELS[level];
-  function log(lvl, msg, meta = {}) {
-    if (LEVELS[lvl] < minLevel) return;
-    const entry = { ts: (/* @__PURE__ */ new Date()).toISOString(), level: lvl, msg, ...meta };
-    process.stderr.write(JSON.stringify(entry) + "\n");
-  }
+  const consola = createConsola({
+    level: CONSOLA_LEVELS[level],
+    formatOptions: {
+      date: true,
+      colors: true
+    }
+  }).withTag("bot");
   return {
-    debug: (msg, meta) => log("debug", msg, meta ?? {}),
-    info: (msg, meta) => log("info", msg, meta ?? {}),
-    warn: (msg, meta) => log("warn", msg, meta ?? {}),
-    error: (msg, meta) => log("error", msg, meta ?? {})
+    consola,
+    debug(msg, meta) {
+      meta ? consola.debug(msg, meta) : consola.debug(msg);
+    },
+    info(msg, meta) {
+      meta ? consola.info(msg, meta) : consola.info(msg);
+    },
+    warn(msg, meta) {
+      meta ? consola.warn(msg, meta) : consola.warn(msg);
+    },
+    error(msg, meta) {
+      meta ? consola.error(msg, meta) : consola.error(msg);
+    }
   };
 }
 
@@ -16699,7 +16775,21 @@ var AgentHandler = class extends BaseHandler {
       const text = result.text.length > this.maxOutput ? result.text.slice(0, this.maxOutput) + "\n...(truncated)" : result.text;
       return ok({ type: "text", text });
     } catch (e3) {
-      return err(new CMDOPError("Agent execution failed", e3 instanceof Error ? e3 : void 0));
+      const errMsg = e3 instanceof Error ? e3.message : String(e3);
+      this.logger.error("Agent execution failed", { error: errMsg });
+      if (errMsg.includes("session_id") || errMsg.includes("No active session")) {
+        return err(new CMDOPError("Machine is offline or CMDOP agent is not running.\nhttps://cmdop.com/downloads/"));
+      }
+      if (errMsg.includes("context canceled") || errMsg.includes("CANCELLED")) {
+        return err(new CMDOPError("Request was interrupted. Please try again."));
+      }
+      if (errMsg.includes("DEADLINE_EXCEEDED") || errMsg.includes("timeout")) {
+        return err(new CMDOPError("Request timed out. The task may be too complex \u2014 try a simpler prompt."));
+      }
+      if (errMsg.includes("UNAVAILABLE") || errMsg.includes("Connection refused")) {
+        return err(new CMDOPError("Server unavailable. Check your connection and try again."));
+      }
+      return err(new CMDOPError(`Agent error: ${errMsg}`, e3 instanceof Error ? e3 : void 0));
     }
   }
 };
@@ -16820,6 +16910,63 @@ function loadSettings(env = process.env) {
   return result.data;
 }
 
+// src/channels/demo/channel.ts
+init_base_channel();
+var DemoChannel = class extends BaseChannel {
+  messageHandlers = [];
+  onOutput;
+  constructor(permissions, dispatcher, logger, options2 = {}) {
+    super("demo", "Demo", permissions, dispatcher, logger);
+    this.onOutput = options2.onOutput ?? ((text) => process.stdout.write(text + "\n"));
+  }
+  async start() {
+    this.logEvent("started");
+  }
+  async stop() {
+    this.messageHandlers = [];
+    this.logEvent("stopped");
+  }
+  send(_userId, message) {
+    const text = formatOutgoing(message);
+    this.onOutput(text, message);
+    return Promise.resolve();
+  }
+  onMessage(handler) {
+    this.messageHandlers.push(handler);
+  }
+  /**
+   * Inject a message as if it came from a real platform user.
+   * Primarily used in tests and CLI demos.
+   */
+  async injectMessage(input) {
+    const msg = {
+      id: `demo-${Date.now()}`,
+      userId: input.userId ?? "demo-user",
+      channelId: this.id,
+      text: input.text,
+      timestamp: /* @__PURE__ */ new Date(),
+      attachments: []
+    };
+    for (const handler of this.messageHandlers) {
+      await handler(msg);
+    }
+    await this.processMessage(msg);
+  }
+};
+function formatOutgoing(message) {
+  switch (message.type) {
+    case "text":
+      return message.text;
+    case "code":
+      return `\`\`\`${message.language ?? ""}
+${message.code}
+\`\`\``;
+    case "error":
+      return `\u274C ${message.message}${message.hint ? `
+\u{1F4A1} ${message.hint}` : ""}`;
+  }
+}
+
 // src/hub.ts
 var IntegrationHub = class _IntegrationHub {
   constructor(_client, _logger, _settings, permissions, dispatcher, channelStartMode) {
@@ -16845,11 +16992,12 @@ var IntegrationHub = class _IntegrationHub {
     Object.assign(settings2, options2.settings ?? {});
     if (options2.defaultMachine) settings2.defaultMachine = options2.defaultMachine;
     const logger = options2.logger ?? createLogger(settings2.logLevel);
-    const client = options2.apiKey ? await CMDOPClient.remote(options2.apiKey) : await CMDOPClient.local();
+    const client = options2.apiKey ? CMDOPClient.remote(options2.apiKey) : CMDOPClient.local();
     const store = options2.permissionStore ?? new InMemoryPermissionStore();
     const identityMap = new IdentityMap();
     const permissions = new PermissionManager(store, {
       adminUsers: [...options2.adminUsers ?? [], ...settings2.allowedUsers],
+      defaultLevel: options2.defaultPermission,
       identityMap
     });
     const dispatcher = new MessageDispatcher(permissions, logger);
@@ -16896,6 +17044,15 @@ var IntegrationHub = class _IntegrationHub {
     const channel = new SlackChannel2(options2, this._permissions, this._dispatcher, this._logger);
     return this.registerChannel(channel);
   }
+  /**
+   * Create and register a DemoChannel for CLI testing.
+   * No external dependencies — messages are injected via the returned channel's `injectMessage()`.
+   */
+  addDemo(options2) {
+    const channel = new DemoChannel(this._permissions, this._dispatcher, this._logger, options2);
+    this.registerChannel(channel);
+    return channel;
+  }
   registerHandler(handler) {
     this._dispatcher.register(handler);
     return this;
@@ -16904,6 +17061,17 @@ var IntegrationHub = class _IntegrationHub {
   async start() {
     if (this.started) return;
     this.started = true;
+    if (this._settings.defaultMachine) {
+      try {
+        await this._client.setMachine(this._settings.defaultMachine);
+        this._logger.info("Machine routing initialized", { machine: this._settings.defaultMachine });
+      } catch (err2) {
+        this._logger.error("Failed to initialize machine routing", {
+          machine: this._settings.defaultMachine,
+          err: err2 instanceof Error ? err2.message : String(err2)
+        });
+      }
+    }
     if (this.channelStartMode === "strict") {
       await Promise.all([...this.channels.values()].map(async (ch) => {
         await ch.start();
@@ -17166,63 +17334,6 @@ var SlackStream = class _SlackStream {
   }
 };
 
-// src/channels/demo/channel.ts
-init_base_channel();
-var DemoChannel = class extends BaseChannel {
-  messageHandlers = [];
-  onOutput;
-  constructor(permissions, dispatcher, logger, options2 = {}) {
-    super("demo", "Demo", permissions, dispatcher, logger);
-    this.onOutput = options2.onOutput ?? ((text) => process.stdout.write(text + "\n"));
-  }
-  async start() {
-    this.logEvent("started");
-  }
-  async stop() {
-    this.messageHandlers = [];
-    this.logEvent("stopped");
-  }
-  send(_userId, message) {
-    const text = formatOutgoing(message);
-    this.onOutput(text, message);
-    return Promise.resolve();
-  }
-  onMessage(handler) {
-    this.messageHandlers.push(handler);
-  }
-  /**
-   * Inject a message as if it came from a real platform user.
-   * Primarily used in tests and CLI demos.
-   */
-  async injectMessage(input) {
-    const msg = {
-      id: `demo-${Date.now()}`,
-      userId: input.userId ?? "demo-user",
-      channelId: this.id,
-      text: input.text,
-      timestamp: /* @__PURE__ */ new Date(),
-      attachments: []
-    };
-    for (const handler of this.messageHandlers) {
-      await handler(msg);
-    }
-    await this.processMessage(msg);
-  }
-};
-function formatOutgoing(message) {
-  switch (message.type) {
-    case "text":
-      return message.text;
-    case "code":
-      return `\`\`\`${message.language ?? ""}
-${message.code}
-\`\`\``;
-    case "error":
-      return `\u274C ${message.message}${message.hint ? `
-\u{1F4A1} ${message.hint}` : ""}`;
-  }
-}
-
 // src/channels/telegram/index.ts
 init_channel();
 init_formatter();