kimaki 0.4.21 → 0.4.22

package/dist/cli.js

@@ -87,7 +87,7 @@ async function registerCommands(token, appId) {
         })
             .toJSON(),
         new SlashCommandBuilder()
-            .setName('add-new-project')
+            .setName('create-new-project')
             .setDescription('Create a new project folder, initialize git, and start a session')
             .addStringOption((option) => {
             option

package/dist/discordBot.js

@@ -16,6 +16,7 @@ import * as prism from 'prism-media';
 import dedent from 'string-dedent';
 import { transcribeAudio } from './voice.js';
 import { extractTagsArrays, extractNonXmlContent } from './xml.js';
+import { formatMarkdownTables } from './format-tables.js';
 import prettyMilliseconds from 'pretty-ms';
 import { createLogger } from './logger.js';
 import { isAbortError } from './utils.js';
@@ -564,6 +565,7 @@ async function getOpenPort() {
  */
 async function sendThreadMessage(thread, content) {
     const MAX_LENGTH = 2000;
+    content = formatMarkdownTables(content);
     content = escapeBackticksInCodeBlocks(content);
     const chunks = splitMarkdownForDiscord({ content, maxLength: MAX_LENGTH });
     if (chunks.length > 1) {
@@ -818,7 +820,7 @@ function escapeInlineCode(text) {
         .replace(/(?<!\\)`(?!`)/g, '\\`') // Single backticks (not already escaped or part of double/triple)
         .replace(/\|\|/g, '\\|\\|'); // Double pipes (spoiler syntax)
 }
-function resolveTextChannel(channel) {
+async function resolveTextChannel(channel) {
     if (!channel) {
         return null;
     }
@@ -828,9 +830,12 @@ function resolveTextChannel(channel) {
     if (channel.type === ChannelType.PublicThread ||
         channel.type === ChannelType.PrivateThread ||
         channel.type === ChannelType.AnnouncementThread) {
-        const parent = channel.parent;
-        if (parent?.type === ChannelType.GuildText) {
-            return parent;
+        const parentId = channel.parentId;
+        if (parentId) {
+            const parent = await channel.guild.channels.fetch(parentId);
+            if (parent?.type === ChannelType.GuildText) {
+                return parent;
+            }
         }
     }
     return null;
@@ -1003,9 +1008,17 @@ function getToolSummaryText(part) {
         const pattern = part.state.input?.pattern || '';
         return pattern ? `*${pattern}*` : '';
     }
-    if (part.tool === 'bash' || part.tool === 'task' || part.tool === 'todoread' || part.tool === 'todowrite') {
+    if (part.tool === 'bash' || part.tool === 'todoread' || part.tool === 'todowrite') {
         return '';
     }
+    if (part.tool === 'task') {
+        const description = part.state.input?.description || '';
+        return description ? `_${description}_` : '';
+    }
+    if (part.tool === 'skill') {
+        const name = part.state.input?.name || '';
+        return name ? `_${name}_` : '';
+    }
     if (!part.state.input)
         return '';
     const inputFields = Object.entries(part.state.input)
@@ -1025,20 +1038,13 @@ function formatTodoList(part) {
     if (part.type !== 'tool' || part.tool !== 'todowrite')
         return '';
     const todos = part.state.input?.todos || [];
-    if (todos.length === 0)
+    const activeIndex = todos.findIndex((todo) => {
+        return todo.status === 'in_progress';
+    });
+    const activeTodo = todos[activeIndex];
+    if (activeIndex === -1 || !activeTodo)
         return '';
-    return todos
-        .map((todo, i) => {
-        const num = `${i + 1}.`;
-        if (todo.status === 'in_progress') {
-            return `${num} **${todo.content}**`;
-        }
-        if (todo.status === 'completed' || todo.status === 'cancelled') {
-            return `${num} ~~${todo.content}~~`;
-        }
-        return `${num} ${todo.content}`;
-    })
-        .join('\n');
+    return `${activeIndex + 1}. **${activeTodo.content}**`;
 }
 function formatPart(part) {
     if (part.type === 'text') {
@@ -1078,9 +1084,9 @@ function formatPart(part) {
             const command = part.state.input?.command || '';
             const description = part.state.input?.description || '';
             const isSingleLine = !command.includes('\n');
-            const hasBackticks = command.includes('`');
-            if (isSingleLine && !hasBackticks && command.length <= 50) {
-                toolTitle = `\`${command}\``;
+            const hasUnderscores = command.includes('_');
+            if (isSingleLine && !hasUnderscores && command.length <= 50) {
+                toolTitle = `_${command}_`;
             }
             else if (description) {
                 toolTitle = `_${description}_`;
@@ -1199,6 +1205,8 @@ async function handleOpencodeSession({ prompt, thread, projectDirectory, origina
     let usedModel;
     let usedProviderID;
     let tokensUsedInSession = 0;
+    let lastDisplayedContextPercentage = 0;
+    let modelContextLimit;
     let typingInterval = null;
     function startTyping() {
         if (abortController.signal.aborted) {
@@ -1272,6 +1280,29 @@ async function handleOpencodeSession({ prompt, thread, projectDirectory, origina
                         assistantMessageId = msg.id;
                         usedModel = msg.modelID;
                         usedProviderID = msg.providerID;
+                        if (tokensUsedInSession > 0 && usedProviderID && usedModel) {
+                            if (!modelContextLimit) {
+                                try {
+                                    const providersResponse = await getClient().provider.list({ query: { directory } });
+                                    const provider = providersResponse.data?.all?.find((p) => p.id === usedProviderID);
+                                    const model = provider?.models?.[usedModel];
+                                    if (model?.limit?.context) {
+                                        modelContextLimit = model.limit.context;
+                                    }
+                                }
+                                catch (e) {
+                                    sessionLogger.error('Failed to fetch provider info for context limit:', e);
+                                }
+                            }
+                            if (modelContextLimit) {
+                                const currentPercentage = Math.floor((tokensUsedInSession / modelContextLimit) * 100);
+                                const thresholdCrossed = Math.floor(currentPercentage / 10) * 10;
+                                if (thresholdCrossed > lastDisplayedContextPercentage && thresholdCrossed >= 10) {
+                                    lastDisplayedContextPercentage = thresholdCrossed;
+                                    await sendThreadMessage(thread, `◼︎ context usage ${currentPercentage}%`);
+                                }
+                            }
+                        }
                     }
                 }
                 else if (event.type === 'message.part.updated') {
@@ -1774,9 +1805,8 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                     const focusedValue = interaction.options.getFocused();
                     // Get the channel's project directory from its topic
                     let projectDirectory;
-                    if (interaction.channel &&
-                        interaction.channel.type === ChannelType.GuildText) {
-                        const textChannel = resolveTextChannel(interaction.channel);
+                    if (interaction.channel) {
+                        const textChannel = await resolveTextChannel(interaction.channel);
                         if (textChannel) {
                             const { projectDirectory: directory, channelAppId } = getKimakiMetadata(textChannel);
                             if (channelAppId && channelAppId !== currentAppId) {
@@ -1839,9 +1869,8 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                         const currentQuery = (parts[parts.length - 1] || '').trim();
                         // Get the channel's project directory from its topic
                         let projectDirectory;
-                        if (interaction.channel &&
-                            interaction.channel.type === ChannelType.GuildText) {
-                            const textChannel = resolveTextChannel(interaction.channel);
+                        if (interaction.channel) {
+                            const textChannel = await resolveTextChannel(interaction.channel);
                             if (textChannel) {
                                 const { projectDirectory: directory, channelAppId } = getKimakiMetadata(textChannel);
                                 if (channelAppId && channelAppId !== currentAppId) {
@@ -2103,7 +2132,7 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                         if (partsToRender.length > 0) {
                             const combinedContent = partsToRender
                                 .map((p) => p.content)
-                                .join('\n\n');
+                                .join('\n');
                             const discordMessage = await sendThreadMessage(thread, combinedContent);
                             const stmt = getDatabase().prepare('INSERT OR REPLACE INTO part_messages (part_id, message_id, thread_id) VALUES (?, ?, ?)');
                             const transaction = getDatabase().transaction((parts) => {
@@ -2168,7 +2197,7 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                         await command.editReply(`Failed to create channels: ${error instanceof Error ? error.message : 'Unknown error'}`);
                     }
                 }
-                else if (command.commandName === 'add-new-project') {
+                else if (command.commandName === 'create-new-project') {
                     await command.deferReply({ ephemeral: false });
                     const projectName = command.options.getString('name', true);
                     const guild = command.guild;
@@ -2364,7 +2393,7 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                         });
                         return;
                     }
-                    const textChannel = resolveTextChannel(channel);
+                    const textChannel = await resolveTextChannel(channel);
                     const { projectDirectory: directory } = getKimakiMetadata(textChannel);
                     if (!directory) {
                         await command.reply({
@@ -2426,7 +2455,7 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                         });
                         return;
                     }
-                    const textChannel = resolveTextChannel(channel);
+                    const textChannel = await resolveTextChannel(channel);
                     const { projectDirectory: directory } = getKimakiMetadata(textChannel);
                     if (!directory) {
                         await command.reply({

package/dist/format-tables.js

@@ -0,0 +1,93 @@
+import { Lexer } from 'marked';
+export function formatMarkdownTables(markdown) {
+    const lexer = new Lexer();
+    const tokens = lexer.lex(markdown);
+    let result = '';
+    for (const token of tokens) {
+        if (token.type === 'table') {
+            result += formatTableToken(token);
+        }
+        else {
+            result += token.raw;
+        }
+    }
+    return result;
+}
+function formatTableToken(table) {
+    const headers = table.header.map((cell) => {
+        return extractCellText(cell.tokens);
+    });
+    const rows = table.rows.map((row) => {
+        return row.map((cell) => {
+            return extractCellText(cell.tokens);
+        });
+    });
+    const columnWidths = calculateColumnWidths(headers, rows);
+    const lines = [];
+    lines.push(formatRow(headers, columnWidths));
+    lines.push(formatSeparator(columnWidths));
+    for (const row of rows) {
+        lines.push(formatRow(row, columnWidths));
+    }
+    return '```\n' + lines.join('\n') + '\n```\n';
+}
+function extractCellText(tokens) {
+    const parts = [];
+    for (const token of tokens) {
+        parts.push(extractTokenText(token));
+    }
+    return parts.join('').trim();
+}
+function extractTokenText(token) {
+    switch (token.type) {
+        case 'text':
+        case 'codespan':
+        case 'escape':
+            return token.text;
+        case 'link':
+            return token.href;
+        case 'image':
+            return token.href;
+        case 'strong':
+        case 'em':
+        case 'del':
+            return token.tokens ? extractCellText(token.tokens) : token.text;
+        case 'br':
+            return ' ';
+        default: {
+            const tokenAny = token;
+            if (tokenAny.tokens && Array.isArray(tokenAny.tokens)) {
+                return extractCellText(tokenAny.tokens);
+            }
+            if (typeof tokenAny.text === 'string') {
+                return tokenAny.text;
+            }
+            return '';
+        }
+    }
+}
+function calculateColumnWidths(headers, rows) {
+    const widths = headers.map((h) => {
+        return h.length;
+    });
+    for (const row of rows) {
+        for (let i = 0; i < row.length; i++) {
+            const cell = row[i] ?? '';
+            widths[i] = Math.max(widths[i] ?? 0, cell.length);
+        }
+    }
+    return widths;
+}
+function formatRow(cells, widths) {
+    const paddedCells = cells.map((cell, i) => {
+        return cell.padEnd(widths[i] ?? 0);
+    });
+    return paddedCells.join(' ');
+}
+function formatSeparator(widths) {
+    return widths
+        .map((w) => {
+        return '-'.repeat(w);
+    })
+        .join(' ');
+}