kimaki 0.4.12 → 0.4.13

package/dist/discordBot.js

@@ -129,7 +129,7 @@ async function createUserAudioLogStream(guildId, channelId) {
     }
 }
 // Set up voice handling for a connection (called once per connection)
-async function setupVoiceHandling({ connection, guildId, channelId, appId, }) {
+async function setupVoiceHandling({ connection, guildId, channelId, appId, discordClient, }) {
     voiceLogger.log(`Setting up voice handling for guild ${guildId}, channel ${channelId}`);
     // Check if this voice channel has an associated directory
     const channelDirRow = getDatabase()
@@ -227,8 +227,24 @@ async function setupVoiceHandling({ connection, guildId, channelId, appId, }) {
                 : `<systemMessage>\nThe coding agent finished working on session ${params.sessionId}\n\nHere's what the assistant wrote:\n${params.markdown}\n</systemMessage>`;
             genAiWorker.sendTextInput(text);
         },
-        onError(error) {
+        async onError(error) {
             voiceLogger.error('GenAI worker error:', error);
+            const textChannelRow = getDatabase()
+                .prepare(`SELECT cd2.channel_id FROM channel_directories cd1
+           JOIN channel_directories cd2 ON cd1.directory = cd2.directory
+           WHERE cd1.channel_id = ? AND cd1.channel_type = 'voice' AND cd2.channel_type = 'text'`)
+                .get(channelId);
+            if (textChannelRow) {
+                try {
+                    const textChannel = await discordClient.channels.fetch(textChannelRow.channel_id);
+                    if (textChannel?.isTextBased() && 'send' in textChannel) {
+                        await textChannel.send(`⚠️ Voice session error: ${error}`);
+                    }
+                }
+                catch (e) {
+                    voiceLogger.error('Failed to send error to text channel:', e);
+                }
+            }
         },
     });
     // Stop any existing GenAI worker before storing new one
@@ -912,24 +928,27 @@ function getToolOutputToDisplay(part) {
     if (part.state.status === 'error') {
         return part.state.error || 'Unknown error';
     }
-    if (part.tool === 'todowrite') {
-        const todos = part.state.input?.todos || [];
-        return todos
-            .map((todo) => {
-            let statusIcon = '▢';
-            if (todo.status === 'in_progress') {
-                statusIcon = '●';
-            }
-            if (todo.status === 'completed' || todo.status === 'cancelled') {
-                statusIcon = '■';
-            }
-            return `\`${statusIcon}\` ${todo.content}`;
-        })
-            .filter(Boolean)
-            .join('\n');
-    }
     return '';
 }
+function formatTodoList(part) {
+    if (part.type !== 'tool' || part.tool !== 'todowrite')
+        return '';
+    const todos = part.state.input?.todos || [];
+    if (todos.length === 0)
+        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');
+}
 function formatPart(part) {
     if (part.type === 'text') {
         return part.text || '';
@@ -952,14 +971,31 @@ function formatPart(part) {
         return `◼︎ snapshot ${part.snapshot}`;
     }
     if (part.type === 'tool') {
+        if (part.tool === 'todowrite') {
+            return formatTodoList(part);
+        }
         if (part.state.status !== 'completed' && part.state.status !== 'error') {
             return '';
         }
         const summaryText = getToolSummaryText(part);
         const outputToDisplay = getToolOutputToDisplay(part);
-        let toolTitle = part.state.status === 'completed' ? part.state.title || '' : 'error';
-        if (toolTitle) {
-            toolTitle = `*${toolTitle}*`;
+        let toolTitle = '';
+        if (part.state.status === 'error') {
+            toolTitle = 'error';
+        }
+        else if (part.tool === 'bash') {
+            const command = part.state.input?.command || '';
+            const isSingleLine = !command.includes('\n');
+            const hasBackticks = command.includes('`');
+            if (isSingleLine && command.length <= 120 && !hasBackticks) {
+                toolTitle = `\`${command}\``;
+            }
+            else {
+                toolTitle = part.state.title ? `*${part.state.title}*` : '';
+            }
+        }
+        else if (part.state.title) {
+            toolTitle = `*${part.state.title}*`;
         }
         const icon = part.state.status === 'completed' ? '◼︎' : part.state.status === 'error' ? '⨯' : '';
         const title = `${icon} ${part.tool} ${toolTitle} ${summaryText}`;
@@ -1937,52 +1973,37 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                         await command.editReply(`Resumed session "${sessionTitle}" in ${thread.toString()}`);
                         // Send initial message to thread
                         await sendThreadMessage(thread, `📂 **Resumed session:** ${sessionTitle}\n📅 **Created:** ${new Date(sessionResponse.data.time.created).toLocaleString()}\n\n*Loading ${messages.length} messages...*`);
-                        // Render all existing messages
-                        let messageCount = 0;
+                        // Collect all assistant parts first, then only render the last 30
+                        const allAssistantParts = [];
                         for (const message of messages) {
-                            if (message.info.role === 'user') {
-                                // Render user messages
-                                const userParts = message.parts.filter((p) => p.type === 'text' && !p.synthetic);
-                                const userTexts = userParts
-                                    .map((p) => {
-                                    if (p.type === 'text') {
-                                        return p.text;
-                                    }
-                                    return '';
-                                })
-                                    .filter((t) => t.trim());
-                                const userText = userTexts.join('\n\n');
-                                if (userText) {
-                                    // Escape backticks in user messages to prevent formatting issues
-                                    const escapedText = escapeDiscordFormatting(userText);
-                                    await sendThreadMessage(thread, `**User:**\n${escapedText}`);
-                                }
-                            }
-                            else if (message.info.role === 'assistant') {
-                                // Render assistant parts
-                                const partsToRender = [];
+                            if (message.info.role === 'assistant') {
                                 for (const part of message.parts) {
                                     const content = formatPart(part);
                                     if (content.trim()) {
-                                        partsToRender.push({ id: part.id, content });
+                                        allAssistantParts.push({ id: part.id, content });
                                     }
                                 }
-                                if (partsToRender.length > 0) {
-                                    const combinedContent = partsToRender
-                                        .map((p) => p.content)
-                                        .join('\n\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) => {
-                                        for (const part of parts) {
-                                            stmt.run(part.id, discordMessage.id, thread.id);
-                                        }
-                                    });
-                                    transaction(partsToRender);
-                                }
                             }
-                            messageCount++;
                         }
+                        const partsToRender = allAssistantParts.slice(-30);
+                        const skippedCount = allAssistantParts.length - partsToRender.length;
+                        if (skippedCount > 0) {
+                            await sendThreadMessage(thread, `*Skipped ${skippedCount} older assistant parts...*`);
+                        }
+                        if (partsToRender.length > 0) {
+                            const combinedContent = partsToRender
+                                .map((p) => p.content)
+                                .join('\n\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) => {
+                                for (const part of parts) {
+                                    stmt.run(part.id, discordMessage.id, thread.id);
+                                }
+                            });
+                            transaction(partsToRender);
+                        }
+                        const messageCount = messages.length;
                         await sendThreadMessage(thread, `✅ **Session resumed!** Loaded ${messageCount} messages.\n\nYou can now continue the conversation by sending messages in this thread.`);
                     }
                     catch (error) {
@@ -2321,6 +2342,7 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                     guildId: newState.guild.id,
                     channelId: voiceChannel.id,
                     appId: currentAppId,
+                    discordClient,
                 });
                 // Handle connection state changes
                 connection.on(VoiceConnectionStatus.Disconnected, async () => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.12",
+  "version": "0.4.13",
   "scripts": {
     "dev": "tsx --env-file .env src/cli.ts",
     "prepublishOnly": "pnpm tsc",

package/src/discordBot.ts

@@ -213,11 +213,13 @@ async function setupVoiceHandling({
   guildId,
   channelId,
   appId,
+  discordClient,
 }: {
   connection: VoiceConnection
   guildId: string
   channelId: string
   appId: string
+  discordClient: Client
 }) {
   voiceLogger.log(
     `Setting up voice handling for guild ${guildId}, channel ${channelId}`,
@@ -330,8 +332,28 @@ async function setupVoiceHandling({
 
       genAiWorker.sendTextInput(text)
     },
-    onError(error) {
+    async onError(error) {
       voiceLogger.error('GenAI worker error:', error)
+      const textChannelRow = getDatabase()
+        .prepare(
+          `SELECT cd2.channel_id FROM channel_directories cd1
+           JOIN channel_directories cd2 ON cd1.directory = cd2.directory
+           WHERE cd1.channel_id = ? AND cd1.channel_type = 'voice' AND cd2.channel_type = 'text'`,
+        )
+        .get(channelId) as { channel_id: string } | undefined
+
+      if (textChannelRow) {
+        try {
+          const textChannel = await discordClient.channels.fetch(
+            textChannelRow.channel_id,
+          )
+          if (textChannel?.isTextBased() && 'send' in textChannel) {
+            await textChannel.send(`⚠️ Voice session error: ${error}`)
+          }
+        } catch (e) {
+          voiceLogger.error('Failed to send error to text channel:', e)
+        }
+      }
     },
   })
 
@@ -1212,30 +1234,31 @@ function getToolOutputToDisplay(part: Part): string {
     return part.state.error || 'Unknown error'
   }
 
-  if (part.tool === 'todowrite') {
-    const todos =
-      (part.state.input?.todos as {
-        content: string
-        status: 'pending' | 'in_progress' | 'completed' | 'cancelled'
-      }[]) || []
-    return todos
-      .map((todo) => {
-        let statusIcon = '▢'
-        if (todo.status === 'in_progress') {
-          statusIcon = '●'
-        }
-        if (todo.status === 'completed' || todo.status === 'cancelled') {
-          statusIcon = '■'
-        }
-        return `\`${statusIcon}\` ${todo.content}`
-      })
-      .filter(Boolean)
-      .join('\n')
-  }
-
   return ''
 }
 
+function formatTodoList(part: Part): string {
+  if (part.type !== 'tool' || part.tool !== 'todowrite') return ''
+  const todos =
+    (part.state.input?.todos as {
+      content: string
+      status: 'pending' | 'in_progress' | 'completed' | 'cancelled'
+    }[]) || []
+  if (todos.length === 0) 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')
+}
+
 function formatPart(part: Part): string {
   if (part.type === 'text') {
     return part.text || ''
@@ -1263,6 +1286,10 @@ function formatPart(part: Part): string {
   }
 
   if (part.type === 'tool') {
+    if (part.tool === 'todowrite') {
+      return formatTodoList(part)
+    }
+
     if (part.state.status !== 'completed' && part.state.status !== 'error') {
       return ''
     }
@@ -1270,9 +1297,20 @@ function formatPart(part: Part): string {
     const summaryText = getToolSummaryText(part)
     const outputToDisplay = getToolOutputToDisplay(part)
 
-    let toolTitle = part.state.status === 'completed' ? part.state.title || '' : 'error'
-    if (toolTitle) {
-      toolTitle = `*${toolTitle}*`
+    let toolTitle = ''
+    if (part.state.status === 'error') {
+      toolTitle = 'error'
+    } else if (part.tool === 'bash') {
+      const command = (part.state.input?.command as string) || ''
+      const isSingleLine = !command.includes('\n')
+      const hasBackticks = command.includes('`')
+      if (isSingleLine && command.length <= 120 && !hasBackticks) {
+        toolTitle = `\`${command}\``
+      } else {
+        toolTitle = part.state.title ? `*${part.state.title}*` : ''
+      }
+    } else if (part.state.title) {
+      toolTitle = `*${part.state.title}*`
     }
 
     const icon = part.state.status === 'completed' ? '◼︎' : part.state.status === 'error' ? '⨯' : ''
@@ -2600,68 +2638,56 @@ export async function startDiscordBot({
                 `📂 **Resumed session:** ${sessionTitle}\n📅 **Created:** ${new Date(sessionResponse.data.time.created).toLocaleString()}\n\n*Loading ${messages.length} messages...*`,
               )
 
-              // Render all existing messages
-              let messageCount = 0
+              // Collect all assistant parts first, then only render the last 30
+              const allAssistantParts: { id: string; content: string }[] = []
               for (const message of messages) {
-                if (message.info.role === 'user') {
-                  // Render user messages
-                  const userParts = message.parts.filter(
-                    (p) => p.type === 'text' && !p.synthetic,
-                  )
-                  const userTexts = userParts
-                    .map((p) => {
-                      if (p.type === 'text') {
-                        return p.text
-                      }
-                      return ''
-                    })
-                    .filter((t) => t.trim())
-
-                  const userText = userTexts.join('\n\n')
-                  if (userText) {
-                    // Escape backticks in user messages to prevent formatting issues
-                    const escapedText = escapeDiscordFormatting(userText)
-                    await sendThreadMessage(thread, `**User:**\n${escapedText}`)
-                  }
-                } else if (message.info.role === 'assistant') {
-                  // Render assistant parts
-                  const partsToRender: { id: string; content: string }[] = []
-
+                if (message.info.role === 'assistant') {
                   for (const part of message.parts) {
                     const content = formatPart(part)
                     if (content.trim()) {
-                      partsToRender.push({ id: part.id, content })
+                      allAssistantParts.push({ id: part.id, content })
                     }
                   }
+                }
+              }
 
-                  if (partsToRender.length > 0) {
-                    const combinedContent = partsToRender
-                      .map((p) => p.content)
-                      .join('\n\n')
+              const partsToRender = allAssistantParts.slice(-30)
+              const skippedCount = allAssistantParts.length - partsToRender.length
 
-                    const discordMessage = await sendThreadMessage(
-                      thread,
-                      combinedContent,
-                    )
+              if (skippedCount > 0) {
+                await sendThreadMessage(
+                  thread,
+                  `*Skipped ${skippedCount} older assistant parts...*`,
+                )
+              }
 
-                    const stmt = getDatabase().prepare(
-                      'INSERT OR REPLACE INTO part_messages (part_id, message_id, thread_id) VALUES (?, ?, ?)',
-                    )
+              if (partsToRender.length > 0) {
+                const combinedContent = partsToRender
+                  .map((p) => p.content)
+                  .join('\n\n')
 
-                    const transaction = getDatabase().transaction(
-                      (parts: { id: string }[]) => {
-                        for (const part of parts) {
-                          stmt.run(part.id, discordMessage.id, thread.id)
-                        }
-                      },
-                    )
+                const discordMessage = await sendThreadMessage(
+                  thread,
+                  combinedContent,
+                )
 
-                    transaction(partsToRender)
-                  }
-                }
-                messageCount++
+                const stmt = getDatabase().prepare(
+                  'INSERT OR REPLACE INTO part_messages (part_id, message_id, thread_id) VALUES (?, ?, ?)',
+                )
+
+                const transaction = getDatabase().transaction(
+                  (parts: { id: string }[]) => {
+                    for (const part of parts) {
+                      stmt.run(part.id, discordMessage.id, thread.id)
+                    }
+                  },
+                )
+
+                transaction(partsToRender)
               }
 
+              const messageCount = messages.length
+
               await sendThreadMessage(
                 thread,
                 `✅ **Session resumed!** Loaded ${messageCount} messages.\n\nYou can now continue the conversation by sending messages in this thread.`,
@@ -3101,6 +3127,7 @@ export async function startDiscordBot({
           guildId: newState.guild.id,
           channelId: voiceChannel.id,
           appId: currentAppId!,
+          discordClient,
         })
 
         // Handle connection state changes