kimaki 0.4.21 → 0.4.22

package/src/discordBot.ts

@@ -46,6 +46,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 type { Session } from '@google/genai'
 import { createLogger } from './logger.js'
@@ -756,6 +757,7 @@ async function sendThreadMessage(
 ): Promise<Message> {
   const MAX_LENGTH = 2000
 
+  content = formatMarkdownTables(content)
   content = escapeBackticksInCodeBlocks(content)
 
   const chunks = splitMarkdownForDiscord({ content, maxLength: MAX_LENGTH })
@@ -1092,9 +1094,9 @@ function escapeInlineCode(text: string): string {
     .replace(/\|\|/g, '\\|\\|') // Double pipes (spoiler syntax)
 }
 
-function resolveTextChannel(
+async function resolveTextChannel(
   channel: TextChannel | ThreadChannel | null | undefined,
-): TextChannel | null {
+): Promise<TextChannel | null> {
   if (!channel) {
     return null
   }
@@ -1108,9 +1110,12 @@ function resolveTextChannel(
     channel.type === ChannelType.PrivateThread ||
     channel.type === ChannelType.AnnouncementThread
   ) {
-    const parent = channel.parent
-    if (parent?.type === ChannelType.GuildText) {
-      return parent as TextChannel
+    const parentId = channel.parentId
+    if (parentId) {
+      const parent = await channel.guild.channels.fetch(parentId)
+      if (parent?.type === ChannelType.GuildText) {
+        return parent as TextChannel
+      }
     }
   }
 
@@ -1328,10 +1333,20 @@ function getToolSummaryText(part: Part): string {
     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 as string) || ''
+    return description ? `_${description}_` : ''
+  }
+
+  if (part.tool === 'skill') {
+    const name = (part.state.input?.name as string) || ''
+    return name ? `_${name}_` : ''
+  }
+
   if (!part.state.input) return ''
 
   const inputFields = Object.entries(part.state.input)
@@ -1355,19 +1370,12 @@ function formatTodoList(part: Part): string {
       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')
+  const activeIndex = todos.findIndex((todo) => {
+    return todo.status === 'in_progress'
+  })
+  const activeTodo = todos[activeIndex]
+  if (activeIndex === -1 || !activeTodo) return ''
+  return `${activeIndex + 1}. **${activeTodo.content}**`
 }
 
 function formatPart(part: Part): string {
@@ -1415,9 +1423,9 @@ function formatPart(part: Part): string {
       const command = (part.state.input?.command as string) || ''
       const description = (part.state.input?.description as string) || ''
       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}_`
       } else if (stateTitle) {
@@ -1581,6 +1589,8 @@ async function handleOpencodeSession({
   let usedModel: string | undefined
   let usedProviderID: string | undefined
   let tokensUsedInSession = 0
+  let lastDisplayedContextPercentage = 0
+  let modelContextLimit: number | undefined
 
   let typingInterval: NodeJS.Timeout | null = null
 
@@ -1676,6 +1686,30 @@ async function handleOpencodeSession({
             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') {
           const part = event.properties.part
@@ -2328,11 +2362,8 @@ export async function startDiscordBot({
 
             // Get the channel's project directory from its topic
             let projectDirectory: string | undefined
-            if (
-              interaction.channel &&
-              interaction.channel.type === ChannelType.GuildText
-            ) {
-              const textChannel = resolveTextChannel(
+            if (interaction.channel) {
+              const textChannel = await resolveTextChannel(
                 interaction.channel as TextChannel | ThreadChannel | null,
               )
               if (textChannel) {
@@ -2414,11 +2445,8 @@ export async function startDiscordBot({
 
               // Get the channel's project directory from its topic
               let projectDirectory: string | undefined
-              if (
-                interaction.channel &&
-                interaction.channel.type === ChannelType.GuildText
-              ) {
-                const textChannel = resolveTextChannel(
+              if (interaction.channel) {
+                const textChannel = await resolveTextChannel(
                   interaction.channel as TextChannel | ThreadChannel | null,
                 )
                 if (textChannel) {
@@ -2782,7 +2810,7 @@ export async function startDiscordBot({
               if (partsToRender.length > 0) {
                 const combinedContent = partsToRender
                   .map((p) => p.content)
-                  .join('\n\n')
+                  .join('\n')
 
                 const discordMessage = await sendThreadMessage(
                   thread,
@@ -2887,7 +2915,7 @@ export async function startDiscordBot({
                 `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)
@@ -3122,7 +3150,7 @@ export async function startDiscordBot({
               return
             }
 
-            const textChannel = resolveTextChannel(channel as ThreadChannel)
+            const textChannel = await resolveTextChannel(channel as ThreadChannel)
             const { projectDirectory: directory } = getKimakiMetadata(textChannel)
 
             if (!directory) {
@@ -3193,7 +3221,7 @@ export async function startDiscordBot({
               return
             }
 
-            const textChannel = resolveTextChannel(channel as ThreadChannel)
+            const textChannel = await resolveTextChannel(channel as ThreadChannel)
             const { projectDirectory: directory } = getKimakiMetadata(textChannel)
 
             if (!directory) {

package/src/format-tables.test.ts

@@ -0,0 +1,440 @@
+import { test, expect } from 'vitest'
+import { formatMarkdownTables } from './format-tables.js'
+
+test('formats simple table', () => {
+  const input = `| Name | Age |
+| --- | --- |
+| Alice | 30 |
+| Bob | 25 |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Name  Age
+    ----- ---
+    Alice 30 
+    Bob   25 
+    \`\`\`
+    "
+  `)
+})
+
+test('formats table with varying column widths', () => {
+  const input = `| Item | Quantity | Price |
+| --- | --- | --- |
+| Apples | 10 | $5 |
+| Oranges | 3 | $2 |
+| Bananas with long name | 100 | $15.99 |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Item                   Quantity Price 
+    ---------------------- -------- ------
+    Apples                 10       $5    
+    Oranges                3        $2    
+    Bananas with long name 100      $15.99
+    \`\`\`
+    "
+  `)
+})
+
+test('strips bold formatting from cells', () => {
+  const input = `| Header | Value |
+| --- | --- |
+| **Bold text** | Normal |
+| Mixed **bold** text | Another |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Header          Value  
+    --------------- -------
+    Bold text       Normal 
+    Mixed bold text Another
+    \`\`\`
+    "
+  `)
+})
+
+test('strips italic formatting from cells', () => {
+  const input = `| Header | Value |
+| --- | --- |
+| *Italic text* | Normal |
+| _Also italic_ | Another |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Header      Value  
+    ----------- -------
+    Italic text Normal 
+    Also italic Another
+    \`\`\`
+    "
+  `)
+})
+
+test('extracts URL from links', () => {
+  const input = `| Name | Link |
+| --- | --- |
+| Google | [Click here](https://google.com) |
+| GitHub | [GitHub Home](https://github.com) |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Name   Link              
+    ------ ------------------
+    Google https://google.com
+    GitHub https://github.com
+    \`\`\`
+    "
+  `)
+})
+
+test('handles inline code in cells', () => {
+  const input = `| Function | Description |
+| --- | --- |
+| \`console.log\` | Logs to console |
+| \`Array.map\` | Maps array items |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Function    Description     
+    ----------- ----------------
+    console.log Logs to console 
+    Array.map   Maps array items
+    \`\`\`
+    "
+  `)
+})
+
+test('handles mixed formatting in single cell', () => {
+  const input = `| Description |
+| --- |
+| This has **bold**, *italic*, and \`code\` |
+| Also [a link](https://example.com) here |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Description                    
+    -------------------------------
+    This has bold, italic, and code
+    Also https://example.com here  
+    \`\`\`
+    "
+  `)
+})
+
+test('handles strikethrough text', () => {
+  const input = `| Status | Item |
+| --- | --- |
+| Done | ~~Deleted item~~ |
+| Active | Normal item |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Status Item        
+    ------ ------------
+    Done   Deleted item
+    Active Normal item 
+    \`\`\`
+    "
+  `)
+})
+
+test('preserves content before table', () => {
+  const input = `Here is some text before the table.
+
+| Col A | Col B |
+| --- | --- |
+| 1 | 2 |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "Here is some text before the table.
+
+    \`\`\`
+    Col A Col B
+    ----- -----
+    1     2    
+    \`\`\`
+    "
+  `)
+})
+
+test('preserves content after table', () => {
+  const input = `| Col A | Col B |
+| --- | --- |
+| 1 | 2 |
+
+And here is text after.`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Col A Col B
+    ----- -----
+    1     2    
+    \`\`\`
+    And here is text after."
+  `)
+})
+
+test('preserves content before and after table', () => {
+  const input = `Some intro text.
+
+| Name | Value |
+| --- | --- |
+| Key | 123 |
+
+Some outro text.`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "Some intro text.
+
+    \`\`\`
+    Name Value
+    ---- -----
+    Key  123  
+    \`\`\`
+    Some outro text."
+  `)
+})
+
+test('handles multiple tables in same content', () => {
+  const input = `First table:
+
+| A | B |
+| --- | --- |
+| 1 | 2 |
+
+Some text between.
+
+Second table:
+
+| X | Y | Z |
+| --- | --- | --- |
+| a | b | c |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "First table:
+
+    \`\`\`
+    A B
+    - -
+    1 2
+    \`\`\`
+    Some text between.
+
+    Second table:
+
+    \`\`\`
+    X Y Z
+    - - -
+    a b c
+    \`\`\`
+    "
+  `)
+})
+
+test('handles empty cells', () => {
+  const input = `| Name | Optional |
+| --- | --- |
+| Alice | |
+| | Bob |
+| | |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Name  Optional
+    ----- --------
+    Alice         
+          Bob     
+                  
+    \`\`\`
+    "
+  `)
+})
+
+test('handles single column table', () => {
+  const input = `| Items |
+| --- |
+| Apple |
+| Banana |
+| Cherry |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Items 
+    ------
+    Apple 
+    Banana
+    Cherry
+    \`\`\`
+    "
+  `)
+})
+
+test('handles single row table', () => {
+  const input = `| A | B | C | D |
+| --- | --- | --- | --- |
+| 1 | 2 | 3 | 4 |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    A B C D
+    - - - -
+    1 2 3 4
+    \`\`\`
+    "
+  `)
+})
+
+test('handles nested formatting', () => {
+  const input = `| Description |
+| --- |
+| **Bold with *nested italic* inside** |
+| *Italic with **nested bold** inside* |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Description                   
+    ------------------------------
+    Bold with nested italic inside
+    Italic with nested bold inside
+    \`\`\`
+    "
+  `)
+})
+
+test('handles image references', () => {
+  const input = `| Icon | Name |
+| --- | --- |
+| ![alt](https://example.com/icon.png) | Item 1 |
+| ![](https://cdn.test.com/img.jpg) | Item 2 |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Icon                         Name  
+    ---------------------------- ------
+    https://example.com/icon.png Item 1
+    https://cdn.test.com/img.jpg Item 2
+    \`\`\`
+    "
+  `)
+})
+
+test('preserves code blocks alongside tables', () => {
+  const input = `Some code:
+
+\`\`\`js
+const x = 1
+\`\`\`
+
+A table:
+
+| Key | Value |
+| --- | --- |
+| a | 1 |
+
+More code:
+
+\`\`\`python
+print("hello")
+\`\`\``
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "Some code:
+
+    \`\`\`js
+    const x = 1
+    \`\`\`
+
+    A table:
+
+    \`\`\`
+    Key Value
+    --- -----
+    a   1    
+    \`\`\`
+    More code:
+
+    \`\`\`python
+    print("hello")
+    \`\`\`"
+  `)
+})
+
+test('handles content without tables', () => {
+  const input = `Just some regular markdown.
+
+- List item 1
+- List item 2
+
+**Bold text** and *italic*.`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "Just some regular markdown.
+
+    - List item 1
+    - List item 2
+
+    **Bold text** and *italic*."
+  `)
+})
+
+test('handles complex real-world table', () => {
+  const input = `## API Endpoints
+
+| Method | Endpoint | Description | Auth |
+| --- | --- | --- | --- |
+| GET | \`/api/users\` | List all users | [Bearer token](https://docs.example.com/auth) |
+| POST | \`/api/users\` | Create **new** user | Required |
+| DELETE | \`/api/users/:id\` | ~~Remove~~ *Deactivate* user | Admin only |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "## API Endpoints
+
+    \`\`\`
+    Method Endpoint       Description            Auth                         
+    ------ -------------- ---------------------- -----------------------------
+    GET    /api/users     List all users         https://docs.example.com/auth
+    POST   /api/users     Create new user        Required                     
+    DELETE /api/users/:id Remove Deactivate user Admin only                   
+    \`\`\`
+    "
+  `)
+})
+
+test('handles unicode content', () => {
+  const input = `| Emoji | Name | Country |
+| --- | --- | --- |
+| 🍎 | Apple | 日本 |
+| 🍊 | Orange | España |
+| 🍌 | Banana | Ελλάδα |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Emoji Name   Country
+    ----- ------ -------
+    🍎    Apple  日本     
+    🍊    Orange España 
+    🍌    Banana Ελλάδα 
+    \`\`\`
+    "
+  `)
+})
+
+test('handles numbers and special characters', () => {
+  const input = `| Price | Discount | Final |
+| --- | --- | --- |
+| $100.00 | -15% | $85.00 |
+| €50,00 | -10% | €45,00 |
+| £75.99 | N/A | £75.99 |`
+  const result = formatMarkdownTables(input)
+  expect(result).toMatchInlineSnapshot(`
+    "\`\`\`
+    Price   Discount Final 
+    ------- -------- ------
+    $100.00 -15%     $85.00
+    €50,00  -10%     €45,00
+    £75.99  N/A      £75.99
+    \`\`\`
+    "
+  `)
+})