@friendlyrobot/discord-pi-agent 0.4.0 → 0.4.3

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import type { DiscordPiBridge, DiscordPiBridgeConfig } from "./types";
 export { buildTimeContextPrompt, type TimeContextPromptOptions, } from "./prompt-context";
-export { transformMarkdownTablesToCodeBlocks, transformMarkdownTablesSync, } from "./markdown-table-transformer";
+export { transformMarkdownTablesToCodeBlocks } from "./markdown-table-transformer";
 export { loadDiscordPiBridgeConfigFromEnv, resolveConfig } from "./config";
 export type { AgentStatus, DiscordPiBridge, DiscordPiBridgeConfig, PromptTransform, ResolvedDiscordPiBridgeConfig, } from "./types";
 export declare function startDiscordPiBridge(config: DiscordPiBridgeConfig): Promise<DiscordPiBridge>;

package/dist/index.js

@@ -14,82 +14,33 @@ import {
 } from "@mariozechner/pi-coding-agent";
 
 // src/markdown-table-transformer.ts
-var TABLE_BLOCK_REGEX = /(\|.+?(?:\|.*)+)(\n\|[-:]+(?:\|[-:]+)+\|?)(\n\|.+?(?:\|.*)+\|?)+/g;
+import { Lexer } from "marked";
 var CODE_BLOCK_WRAPPER = "```\n{TABLE}\n```";
 async function transformMarkdownTablesToCodeBlocks(text) {
-  const matches = [...text.matchAll(TABLE_BLOCK_REGEX)];
-  if (matches.length === 0) {
-    return text;
-  }
-  const formattedTables = await Promise.all(matches.map((match) => formatTableWithPrettier(match[0])));
-  let result = text;
-  for (let i = 0;i < matches.length; i++) {
-    const match = matches[i];
-    const originalTable = match[0];
-    const formattedTable = formattedTables[i];
-    const wrappedTable = CODE_BLOCK_WRAPPER.replace("{TABLE}", formattedTable);
-    result = result.replace(originalTable, wrappedTable);
+  const formatted = await formatWithPrettier(text);
+  const tokens = Lexer.lex(formatted);
+  const result = [];
+  for (const token of tokens) {
+    if (token.type === "table") {
+      result.push(CODE_BLOCK_WRAPPER.replace("{TABLE}", token.raw.trimEnd()));
+    } else {
+      result.push(token.raw);
+    }
   }
-  return result;
+  return formatWithPrettier(result.join(""));
 }
-function parseMarkdownTable(table) {
-  const lines = table.trim().split(`
-`);
-  return lines.map((line) => {
-    return line.split("|").filter((cell) => cell.trim() !== "").map((cell) => cell.trim());
-  });
-}
-async function formatTableWithPrettier(table) {
+async function formatWithPrettier(text) {
   const prettier = await import("prettier");
   try {
-    const formatted = await prettier.format(table, {
+    const formatted = await prettier.format(text, {
       parser: "markdown",
       printWidth: 80
     });
     return formatted.trim();
-  } catch {
-    return formatTableManually(table);
-  }
-}
-function formatTableManually(table) {
-  const rows = parseMarkdownTable(table);
-  if (rows.length === 0) {
-    return table;
-  }
-  const columnCount = Math.max(...rows.map((row) => row.length));
-  const columnWidths = Array(columnCount).fill(0);
-  for (const row of rows) {
-    for (let i = 0;i < row.length; i++) {
-      columnWidths[i] = Math.max(columnWidths[i], row[i].length);
-    }
-  }
-  const formattedRows = rows.map((row, rowIndex) => {
-    const paddedCells = row.map((cell, colIndex) => {
-      const width = columnWidths[colIndex];
-      return padCell(cell, width);
-    });
-    return "| " + paddedCells.join(" | ") + " |";
-  });
-  if (formattedRows.length > 1) {
-    const separatorCells = columnWidths.map((width) => {
-      return "-".repeat(width);
-    });
-    const separator = "| " + separatorCells.join(" | ") + " |";
-    formattedRows.splice(1, 0, separator);
-  }
-  return formattedRows.join(`
-`);
-}
-function padCell(value, width) {
-  if (value.length >= width) {
-    return value;
+  } catch (error) {
+    console.error("[markdown-table-transformer] Prettier formatting failed:", error);
+    return text;
   }
-  return value + " ".repeat(width - value.length);
-}
-function transformMarkdownTablesSync(text) {
-  return text.replace(TABLE_BLOCK_REGEX, (tableMatch) => {
-    return CODE_BLOCK_WRAPPER.replace("{TABLE}", tableMatch.trim());
-  });
 }
 
 // src/reply-buffer.ts
@@ -569,13 +520,16 @@ async function handleCommand(input, agentService, promptQueue) {
 }
 
 // src/message-chunker.ts
+import { Lexer as Lexer2 } from "marked";
 var DISCORD_MESSAGE_LIMIT = 2000;
 var SAFE_MESSAGE_LIMIT = 1900;
 function chunkMessage(text) {
   if (text.length <= SAFE_MESSAGE_LIMIT) {
     return [text];
   }
+  const codeBlockRanges = getCodeBlockRanges(text);
   const chunks = [];
+  let offset = 0;
   let remaining = text;
   while (remaining.length > SAFE_MESSAGE_LIMIT) {
     const candidate = remaining.slice(0, SAFE_MESSAGE_LIMIT);
@@ -583,15 +537,41 @@ function chunkMessage(text) {
 
 `), candidate.lastIndexOf(`
 `), candidate.lastIndexOf(" "));
-    const boundary = splitIndex > 0 ? splitIndex : SAFE_MESSAGE_LIMIT;
+    const relBoundary = splitIndex > 0 ? splitIndex : SAFE_MESSAGE_LIMIT;
+    const absBoundary = adjustBoundaryForCodeBlock(offset + relBoundary, codeBlockRanges);
+    const boundary = absBoundary - offset;
     chunks.push(remaining.slice(0, boundary).trim());
     remaining = remaining.slice(boundary).trim();
+    offset = absBoundary;
   }
   if (remaining.length > 0) {
     chunks.push(remaining);
   }
   return chunks.filter((chunk) => chunk.length > 0).map((chunk) => chunk.slice(0, DISCORD_MESSAGE_LIMIT));
 }
+function getCodeBlockRanges(text) {
+  const tokens = Lexer2.lex(text);
+  const ranges = [];
+  let pos = 0;
+  for (const token of tokens) {
+    if (token.type === "code") {
+      ranges.push({ start: pos, end: pos + token.raw.length });
+    }
+    pos += token.raw.length;
+  }
+  return ranges;
+}
+function adjustBoundaryForCodeBlock(absBoundary, codeBlockRanges) {
+  for (const range of codeBlockRanges) {
+    if (absBoundary > range.start && absBoundary < range.end) {
+      if (range.end <= DISCORD_MESSAGE_LIMIT) {
+        return range.end;
+      }
+      return absBoundary;
+    }
+  }
+  return absBoundary;
+}
 
 // src/discord-client.ts
 async function startDiscordClient(config, agentService, promptQueue) {
@@ -840,7 +820,6 @@ function registerSignalHandlers(stop) {
 }
 export {
   transformMarkdownTablesToCodeBlocks,
-  transformMarkdownTablesSync,
   startDiscordPiBridge,
   resolveConfig,
   loadDiscordPiBridgeConfigFromEnv,

package/dist/markdown-table-transformer.d.ts

@@ -1,18 +1,13 @@
 /**
  * Transforms markdown tables into Discord-friendly code blocks.
  * Discord doesn't support markdown tables natively, so we:
- * 1. Detect markdown tables in the text
- * 2. Wrap them in triple backticks
- * 3. Use Prettier to format the table with proper column alignment
+ * 1. Format the entire document with Prettier (tables get formatted)
+ * 2. Use marked Lexer to identify tables
+ * 3. Wrap tables in triple backticks
+ * 4. Run Prettier once more on the entire result (tables stay formatted in code blocks)
  */
 /**
  * Transforms markdown tables in the text to Discord-friendly code blocks.
- * Tables are detected by their markdown syntax and wrapped in triple backticks.
- * Table contents are formatted with Prettier for proper column alignment.
+ * Uses marked's Lexer to properly identify tables.
  */
 export declare function transformMarkdownTablesToCodeBlocks(text: string): Promise<string>;
-/**
- * Synchronous version that wraps tables in code blocks but skips Prettier formatting.
- * Useful when you want quick transformation without async overhead.
- */
-export declare function transformMarkdownTablesSync(text: string): string;

package/dist/message-chunker.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@friendlyrobot/discord-pi-agent",
-  "version": "0.4.0",
+  "version": "0.4.3",
   "description": "Reusable Discord gateway bridge for persistent pi agent sessions",
   "license": "MIT",
   "type": "module",
@@ -27,7 +27,7 @@
   "scripts": {
     "test:watch": "vitest",
     "test": "vitest run",
-    "update-deps": "bun add @mariozechner/pi-ai@latest @mariozechner/pi-coding-agent@latest discord.js@latest dotenv@latest prettier@latest; bun add -d @types/node@latest typescript@latest vitest@latest @vitest/ui@latest",
+    "update-deps": "bun add @mariozechner/pi-ai@latest @mariozechner/pi-coding-agent@latest marked@latest discord.js@latest dotenv@latest prettier@latest; bun add -d @types/node@latest typescript@latest vitest@latest @vitest/ui@latest",
     "format": "prettier --write .",
     "build": "rm -rf dist && bun build ./src/index.ts --outdir ./dist --target node --format esm --packages external && tsc -p tsconfig.json --emitDeclarationOnly --declaration --declarationMap false",
     "typecheck": "tsc --noEmit -p tsconfig.json"
@@ -37,6 +37,7 @@
     "@mariozechner/pi-coding-agent": "^0.70.0",
     "discord.js": "^14.26.3",
     "dotenv": "^17.4.2",
+    "marked": "^18.0.2",
     "prettier": "^3.8.3"
   },
   "devDependencies": {