kimaki 0.4.21 → 0.4.23

package/src/escape-backticks.test.ts

@@ -1,6 +1,6 @@
 import { test, expect } from 'vitest'
 import { Lexer } from 'marked'
-import { escapeBackticksInCodeBlocks, splitMarkdownForDiscord } from './discordBot.js'
+import { escapeBackticksInCodeBlocks, splitMarkdownForDiscord } from './discord-utils.js'
 
 
 

package/src/fork.ts

@@ -0,0 +1,224 @@
+import {
+  ChatInputCommandInteraction,
+  StringSelectMenuInteraction,
+  StringSelectMenuBuilder,
+  ActionRowBuilder,
+  ChannelType,
+  ThreadAutoArchiveDuration,
+  type ThreadChannel,
+} from 'discord.js'
+import type { TextPart } from '@opencode-ai/sdk'
+import { getDatabase } from './database.js'
+import { initializeOpencodeForDirectory } from './opencode.js'
+import { resolveTextChannel, getKimakiMetadata, sendThreadMessage } from './discord-utils.js'
+import { createLogger } from './logger.js'
+
+const sessionLogger = createLogger('SESSION')
+const forkLogger = createLogger('FORK')
+
+export async function handleForkCommand(interaction: ChatInputCommandInteraction): Promise<void> {
+  const channel = interaction.channel
+
+  if (!channel) {
+    await interaction.reply({
+      content: 'This command can only be used in a channel',
+      ephemeral: true,
+    })
+    return
+  }
+
+  const isThread = [
+    ChannelType.PublicThread,
+    ChannelType.PrivateThread,
+    ChannelType.AnnouncementThread,
+  ].includes(channel.type)
+
+  if (!isThread) {
+    await interaction.reply({
+      content: 'This command can only be used in a thread with an active session',
+      ephemeral: true,
+    })
+    return
+  }
+
+  const textChannel = await resolveTextChannel(channel as ThreadChannel)
+  const { projectDirectory: directory } = getKimakiMetadata(textChannel)
+
+  if (!directory) {
+    await interaction.reply({
+      content: 'Could not determine project directory for this channel',
+      ephemeral: true,
+    })
+    return
+  }
+
+  const row = getDatabase()
+    .prepare('SELECT session_id FROM thread_sessions WHERE thread_id = ?')
+    .get(channel.id) as { session_id: string } | undefined
+
+  if (!row?.session_id) {
+    await interaction.reply({
+      content: 'No active session in this thread',
+      ephemeral: true,
+    })
+    return
+  }
+
+  // Defer reply before API calls to avoid 3-second timeout
+  await interaction.deferReply({ ephemeral: true })
+
+  const sessionId = row.session_id
+
+  try {
+    const getClient = await initializeOpencodeForDirectory(directory)
+
+    const messagesResponse = await getClient().session.messages({
+      path: { id: sessionId },
+    })
+
+    if (!messagesResponse.data) {
+      await interaction.editReply({
+        content: 'Failed to fetch session messages',
+      })
+      return
+    }
+
+    const userMessages = messagesResponse.data.filter(
+      (m) => m.info.role === 'user'
+    )
+
+    if (userMessages.length === 0) {
+      await interaction.editReply({
+        content: 'No user messages found in this session',
+      })
+      return
+    }
+
+    const recentMessages = userMessages.slice(-25)
+
+    const options = recentMessages.map((m, index) => {
+      const textPart = m.parts.find((p) => p.type === 'text') as TextPart | undefined
+      const preview = textPart?.text?.slice(0, 80) || '(no text)'
+      const label = `${index + 1}. ${preview}${preview.length >= 80 ? '...' : ''}`
+
+      return {
+        label: label.slice(0, 100),
+        value: m.info.id,
+        description: new Date(m.info.time.created).toLocaleString().slice(0, 50),
+      }
+    })
+
+    const encodedDir = Buffer.from(directory).toString('base64')
+
+    const selectMenu = new StringSelectMenuBuilder()
+      .setCustomId(`fork_select:${sessionId}:${encodedDir}`)
+      .setPlaceholder('Select a message to fork from')
+      .addOptions(options)
+
+    const actionRow = new ActionRowBuilder<StringSelectMenuBuilder>()
+      .addComponents(selectMenu)
+
+    await interaction.editReply({
+      content: '**Fork Session**\nSelect the user message to fork from. The forked session will continue as if you had not sent that message:',
+      components: [actionRow],
+    })
+  } catch (error) {
+    forkLogger.error('Error loading messages:', error)
+    await interaction.editReply({
+      content: `Failed to load messages: ${error instanceof Error ? error.message : 'Unknown error'}`,
+    })
+  }
+}
+
+export async function handleForkSelectMenu(interaction: StringSelectMenuInteraction): Promise<void> {
+  const customId = interaction.customId
+
+  if (!customId.startsWith('fork_select:')) {
+    return
+  }
+
+  const [, sessionId, encodedDir] = customId.split(':')
+  if (!sessionId || !encodedDir) {
+    await interaction.reply({
+      content: 'Invalid selection data',
+      ephemeral: true,
+    })
+    return
+  }
+
+  const directory = Buffer.from(encodedDir, 'base64').toString('utf-8')
+  const selectedMessageId = interaction.values[0]
+
+  if (!selectedMessageId) {
+    await interaction.reply({
+      content: 'No message selected',
+      ephemeral: true,
+    })
+    return
+  }
+
+  await interaction.deferReply({ ephemeral: false })
+
+  try {
+    const getClient = await initializeOpencodeForDirectory(directory)
+
+    const forkResponse = await getClient().session.fork({
+      path: { id: sessionId },
+      body: { messageID: selectedMessageId },
+    })
+
+    if (!forkResponse.data) {
+      await interaction.editReply('Failed to fork session')
+      return
+    }
+
+    const forkedSession = forkResponse.data
+    const parentChannel = interaction.channel
+
+    if (!parentChannel || ![
+      ChannelType.PublicThread,
+      ChannelType.PrivateThread,
+      ChannelType.AnnouncementThread,
+    ].includes(parentChannel.type)) {
+      await interaction.editReply('Could not access parent channel')
+      return
+    }
+
+    const textChannel = await resolveTextChannel(parentChannel as ThreadChannel)
+
+    if (!textChannel) {
+      await interaction.editReply('Could not resolve parent text channel')
+      return
+    }
+
+    const thread = await textChannel.threads.create({
+      name: `Fork: ${forkedSession.title}`.slice(0, 100),
+      autoArchiveDuration: ThreadAutoArchiveDuration.OneDay,
+      reason: `Forked from session ${sessionId}`,
+    })
+
+    getDatabase()
+      .prepare(
+        'INSERT OR REPLACE INTO thread_sessions (thread_id, session_id) VALUES (?, ?)'
+      )
+      .run(thread.id, forkedSession.id)
+
+    sessionLogger.log(
+      `Created forked session ${forkedSession.id} in thread ${thread.id}`
+    )
+
+    await sendThreadMessage(
+      thread,
+      `**Forked session created!**\nFrom: \`${sessionId}\`\nNew session: \`${forkedSession.id}\`\n\nYou can now continue the conversation from this point.`
+    )
+
+    await interaction.editReply(
+      `Session forked! Continue in ${thread.toString()}`
+    )
+  } catch (error) {
+    forkLogger.error('Error forking session:', error)
+    await interaction.editReply(
+      `Failed to fork session: ${error instanceof Error ? error.message : 'Unknown error'}`
+    )
+  }
+}

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
+    \`\`\`
+    "
+  `)
+})