kimaki 0.4.35 → 0.4.37

package/src/commands/session.ts

@@ -13,10 +13,7 @@ import { createLogger } from '../logger.js'
 
 const logger = createLogger('SESSION')
 
-export async function handleSessionCommand({
-  command,
-  appId,
-}: CommandContext): Promise<void> {
+export async function handleSessionCommand({ command, appId }: CommandContext): Promise<void> {
   await command.deferReply({ ephemeral: false })
 
   const prompt = command.options.getString('prompt', true)
@@ -50,9 +47,7 @@ export async function handleSessionCommand({
   }
 
   if (!projectDirectory) {
-    await command.editReply(
-      'This channel is not configured with a project directory',
-    )
+    await command.editReply('This channel is not configured with a project directory')
     return
   }
 
@@ -102,10 +97,7 @@ export async function handleSessionCommand({
   }
 }
 
-async function handleAgentAutocomplete({
-  interaction,
-  appId,
-}: AutocompleteContext): Promise<void> {
+async function handleAgentAutocomplete({ interaction, appId }: AutocompleteContext): Promise<void> {
   const focusedValue = interaction.options.getFocused()
 
   let projectDirectory: string | undefined
@@ -224,8 +216,7 @@ export async function handleSessionAutocomplete({
 
     const files = response.data || []
 
-    const prefix =
-      previousFiles.length > 0 ? previousFiles.join(', ') + ', ' : ''
+    const prefix = previousFiles.length > 0 ? previousFiles.join(', ') + ', ' : ''
 
     const choices = files
       .map((file: string) => {

package/src/commands/share.ts

@@ -9,9 +9,7 @@ import { createLogger } from '../logger.js'
 
 const logger = createLogger('SHARE')
 
-export async function handleShareCommand({
-  command,
-}: CommandContext): Promise<void> {
+export async function handleShareCommand({ command }: CommandContext): Promise<void> {
   const channel = command.channel
 
   if (!channel) {

package/src/commands/types.ts

@@ -20,6 +20,4 @@ export type AutocompleteContext = {
 
 export type AutocompleteHandler = (ctx: AutocompleteContext) => Promise<void>
 
-export type SelectMenuHandler = (
-  interaction: StringSelectMenuInteraction,
-) => Promise<void>
+export type SelectMenuHandler = (interaction: StringSelectMenuInteraction) => Promise<void>

package/src/commands/undo-redo.ts

@@ -9,9 +9,7 @@ import { createLogger } from '../logger.js'
 
 const logger = createLogger('UNDO-REDO')
 
-export async function handleUndoCommand({
-  command,
-}: CommandContext): Promise<void> {
+export async function handleUndoCommand({ command }: CommandContext): Promise<void> {
   const channel = command.channel
 
   if (!channel) {
@@ -96,9 +94,7 @@ export async function handleUndoCommand({
     })
 
     if (response.error) {
-      await command.editReply(
-        `Failed to undo: ${JSON.stringify(response.error)}`,
-      )
+      await command.editReply(`Failed to undo: ${JSON.stringify(response.error)}`)
       return
     }
 
@@ -106,12 +102,8 @@ export async function handleUndoCommand({
       ? `\n\`\`\`diff\n${response.data.revert.diff.slice(0, 1500)}\n\`\`\``
       : ''
 
-    await command.editReply(
-      `⏪ **Undone** - reverted last assistant message${diffInfo}`,
-    )
-    logger.log(
-      `Session ${sessionId} reverted message ${lastAssistantMessage.info.id}`,
-    )
+    await command.editReply(`⏪ **Undone** - reverted last assistant message${diffInfo}`)
+    logger.log(`Session ${sessionId} reverted message ${lastAssistantMessage.info.id}`)
   } catch (error) {
     logger.error('[UNDO] Error:', error)
     await command.editReply(
@@ -120,9 +112,7 @@ export async function handleUndoCommand({
   }
 }
 
-export async function handleRedoCommand({
-  command,
-}: CommandContext): Promise<void> {
+export async function handleRedoCommand({ command }: CommandContext): Promise<void> {
   const channel = command.channel
 
   if (!channel) {
@@ -196,9 +186,7 @@ export async function handleRedoCommand({
     })
 
     if (response.error) {
-      await command.editReply(
-        `Failed to redo: ${JSON.stringify(response.error)}`,
-      )
+      await command.editReply(`Failed to redo: ${JSON.stringify(response.error)}`)
       return
     }
 

package/src/commands/user-command.ts

@@ -12,10 +12,7 @@ import fs from 'node:fs'
 
 const userCommandLogger = createLogger('USER_CMD')
 
-export const handleUserCommand: CommandHandler = async ({
-  command,
-  appId,
-}: CommandContext) => {
+export const handleUserCommand: CommandHandler = async ({ command, appId }: CommandContext) => {
   const discordCommandName = command.commandName
   // Strip the -cmd suffix to get the actual OpenCode command name
   const commandName = discordCommandName.replace(/-cmd$/, '')
@@ -31,11 +28,11 @@ export const handleUserCommand: CommandHandler = async ({
     `Channel info: type=${channel?.type}, id=${channel?.id}, isNull=${channel === null}`,
   )
 
-  const isThread = channel && [
-    ChannelType.PublicThread,
-    ChannelType.PrivateThread,
-    ChannelType.AnnouncementThread,
-  ].includes(channel.type)
+  const isThread =
+    channel &&
+    [ChannelType.PublicThread, ChannelType.PrivateThread, ChannelType.AnnouncementThread].includes(
+      channel.type,
+    )
 
   const isTextChannel = channel?.type === ChannelType.GuildText
 
@@ -64,7 +61,8 @@ export const handleUserCommand: CommandHandler = async ({
 
     if (!row) {
       await command.reply({
-        content: 'This thread does not have an active session. Use this command in a project channel to create a new thread.',
+        content:
+          'This thread does not have an active session. Use this command in a project channel to create a new thread.',
         ephemeral: true,
       })
       return

package/src/config.ts

@@ -28,11 +28,11 @@ export function getDataDir(): string {
  */
 export function setDataDir(dir: string): void {
   const resolvedDir = path.resolve(dir)
-  
+
   if (!fs.existsSync(resolvedDir)) {
     fs.mkdirSync(resolvedDir, { recursive: true })
   }
-  
+
   dataDir = resolvedDir
 }
 
@@ -53,17 +53,17 @@ const DEFAULT_LOCK_PORT = 29988
  */
 export function getLockPort(): number {
   const dir = getDataDir()
-  
+
   // Use original port for default data dir (backwards compatible)
   if (dir === DEFAULT_DATA_DIR) {
     return DEFAULT_LOCK_PORT
   }
-  
+
   // Hash-based port for custom data dirs
   let hash = 0
   for (let i = 0; i < dir.length; i++) {
     const char = dir.charCodeAt(i)
-    hash = ((hash << 5) - hash) + char
+    hash = (hash << 5) - hash + char
     hash = hash & hash // Convert to 32bit integer
   }
   // Map to port range 30000-39999

package/src/database.ts

@@ -61,6 +61,13 @@ export function getDatabase(): Database.Database {
       )
     `)
 
+    // Migration: add app_id column to channel_directories for multi-bot support
+    try {
+      db.exec(`ALTER TABLE channel_directories ADD COLUMN app_id TEXT`)
+    } catch {
+      // Column already exists, ignore
+    }
+
     db.exec(`
       CREATE TABLE IF NOT EXISTS bot_api_keys (
         app_id TEXT PRIMARY KEY,
@@ -141,7 +148,7 @@ export function setChannelModel(channelId: string, modelId: string): void {
   db.prepare(
     `INSERT INTO channel_models (channel_id, model_id, updated_at) 
      VALUES (?, ?, CURRENT_TIMESTAMP)
-     ON CONFLICT(channel_id) DO UPDATE SET model_id = ?, updated_at = CURRENT_TIMESTAMP`
+     ON CONFLICT(channel_id) DO UPDATE SET model_id = ?, updated_at = CURRENT_TIMESTAMP`,
   ).run(channelId, modelId, modelId)
 }
 
@@ -163,9 +170,10 @@ export function getSessionModel(sessionId: string): string | undefined {
  */
 export function setSessionModel(sessionId: string, modelId: string): void {
   const db = getDatabase()
-  db.prepare(
-    `INSERT OR REPLACE INTO session_models (session_id, model_id) VALUES (?, ?)`
-  ).run(sessionId, modelId)
+  db.prepare(`INSERT OR REPLACE INTO session_models (session_id, model_id) VALUES (?, ?)`).run(
+    sessionId,
+    modelId,
+  )
 }
 
 /**
@@ -187,7 +195,7 @@ export function setChannelAgent(channelId: string, agentName: string): void {
   db.prepare(
     `INSERT INTO channel_agents (channel_id, agent_name, updated_at) 
      VALUES (?, ?, CURRENT_TIMESTAMP)
-     ON CONFLICT(channel_id) DO UPDATE SET agent_name = ?, updated_at = CURRENT_TIMESTAMP`
+     ON CONFLICT(channel_id) DO UPDATE SET agent_name = ?, updated_at = CURRENT_TIMESTAMP`,
   ).run(channelId, agentName, agentName)
 }
 
@@ -207,9 +215,10 @@ export function getSessionAgent(sessionId: string): string | undefined {
  */
 export function setSessionAgent(sessionId: string, agentName: string): void {
   const db = getDatabase()
-  db.prepare(
-    `INSERT OR REPLACE INTO session_agents (session_id, agent_name) VALUES (?, ?)`
-  ).run(sessionId, agentName)
+  db.prepare(`INSERT OR REPLACE INTO session_agents (session_id, agent_name) VALUES (?, ?)`).run(
+    sessionId,
+    agentName,
+  )
 }
 
 export function closeDatabase(): void {

package/src/discord-bot.ts

@@ -24,10 +24,7 @@ import {
   processVoiceAttachment,
   registerVoiceStateHandler,
 } from './voice-handler.js'
-import {
-  getCompactSessionContext,
-  getLastSessionId,
-} from './markdown.js'
+import { getCompactSessionContext, getLastSessionId } from './markdown.js'
 import { handleOpencodeSession } from './session-handler.js'
 import { registerInteractionHandler } from './interaction-handler.js'
 
@@ -35,7 +32,12 @@ export { getDatabase, closeDatabase } from './database.js'
 export { initializeOpencodeForDirectory } from './opencode.js'
 export { escapeBackticksInCodeBlocks, splitMarkdownForDiscord } from './discord-utils.js'
 export { getOpencodeSystemMessage } from './system-message.js'
-export { ensureKimakiCategory, ensureKimakiAudioCategory, createProjectChannels, getChannelsWithDescriptions } from './channel-management.js'
+export {
+  ensureKimakiCategory,
+  ensureKimakiAudioCategory,
+  createProjectChannels,
+  getChannelsWithDescriptions,
+} from './channel-management.js'
 export type { ChannelWithTags } from './channel-management.js'
 
 import {
@@ -73,12 +75,7 @@ export async function createDiscordClient() {
       GatewayIntentBits.MessageContent,
       GatewayIntentBits.GuildVoiceStates,
     ],
-    partials: [
-      Partials.Channel,
-      Partials.Message,
-      Partials.User,
-      Partials.ThreadMember,
-    ],
+    partials: [Partials.Channel, Partials.Message, Partials.User, Partials.ThreadMember],
   })
 }
 
@@ -116,15 +113,11 @@ export async function startDiscordBot({
 
       const channels = await getChannelsWithDescriptions(guild)
       const kimakiChannels = channels.filter(
-        (ch) =>
-          ch.kimakiDirectory &&
-          (!ch.kimakiApp || ch.kimakiApp === currentAppId),
+        (ch) => ch.kimakiDirectory && (!ch.kimakiApp || ch.kimakiApp === currentAppId),
       )
 
       if (kimakiChannels.length > 0) {
-        discordLogger.log(
-          `  Found ${kimakiChannels.length} channel(s) for this bot:`,
-        )
+        discordLogger.log(`  Found ${kimakiChannels.length} channel(s) for this bot:`)
         for (const channel of kimakiChannels) {
           discordLogger.log(`  - #${channel.name}: ${channel.kimakiDirectory}`)
         }
@@ -159,19 +152,14 @@ export async function startDiscordBot({
         try {
           await message.fetch()
         } catch (error) {
-          discordLogger.log(
-            `Failed to fetch partial message ${message.id}:`,
-            error,
-          )
+          discordLogger.log(`Failed to fetch partial message ${message.id}:`, error)
           return
         }
       }
 
       if (message.guild && message.member) {
         const isOwner = message.member.id === message.guild.ownerId
-        const isAdmin = message.member.permissions.has(
-          PermissionsBitField.Flags.Administrator,
-        )
+        const isAdmin = message.member.permissions.has(PermissionsBitField.Flags.Administrator)
         const canManageServer = message.member.permissions.has(
           PermissionsBitField.Flags.ManageGuild,
         )
@@ -199,19 +187,6 @@ export async function startDiscordBot({
         const thread = channel as ThreadChannel
         discordLogger.log(`Message in thread ${thread.name} (${thread.id})`)
 
-        const row = getDatabase()
-          .prepare('SELECT session_id FROM thread_sessions WHERE thread_id = ?')
-          .get(thread.id) as { session_id: string } | undefined
-
-        if (!row) {
-          discordLogger.log(`No session found for thread ${thread.id}`)
-          return
-        }
-
-        voiceLogger.log(
-          `[SESSION] Found session ${row.session_id} for thread ${thread.id}`,
-        )
-
         const parent = thread.parent as TextChannel | null
         let projectDirectory: string | undefined
         let channelAppId: string | undefined
@@ -242,6 +217,43 @@ export async function startDiscordBot({
           return
         }
 
+        const row = getDatabase()
+          .prepare('SELECT session_id FROM thread_sessions WHERE thread_id = ?')
+          .get(thread.id) as { session_id: string } | undefined
+
+        // No existing session - start a new one (e.g., replying to a notification thread)
+        if (!row) {
+          discordLogger.log(`No session for thread ${thread.id}, starting new session`)
+          
+          if (!projectDirectory) {
+            discordLogger.log(`Cannot start session: no project directory for thread ${thread.id}`)
+            return
+          }
+
+          // Include starter message (notification) as context for the session
+          let prompt = message.content
+          const starterMessage = await thread.fetchStarterMessage().catch(() => null)
+          if (starterMessage?.content) {
+            // Strip notification prefix if present
+            const notificationContent = starterMessage.content
+              .replace(/^📢 \*\*Notification\*\*\n?/, '')
+              .trim()
+            if (notificationContent) {
+              prompt = `Context from notification:\n${notificationContent}\n\nUser request:\n${message.content}`
+            }
+          }
+
+          await handleOpencodeSession({
+            prompt,
+            thread,
+            projectDirectory,
+            channelId: parent?.id || '',
+          })
+          return
+        }
+
+        voiceLogger.log(`[SESSION] Found session ${row.session_id} for thread ${thread.id}`)
+
         let messageContent = message.content || ''
 
         let currentSessionContext: string | undefined
@@ -315,9 +327,7 @@ export async function startDiscordBot({
         )
 
         if (!textChannel.topic) {
-          voiceLogger.log(
-            `[IGNORED] Channel #${textChannel.name} has no description`,
-          )
+          voiceLogger.log(`[IGNORED] Channel #${textChannel.name} has no description`)
           return
         }
 
@@ -330,9 +340,7 @@ export async function startDiscordBot({
         const channelAppId = extracted['kimaki.app']?.[0]?.trim()
 
         if (!projectDirectory) {
-          voiceLogger.log(
-            `[IGNORED] Channel #${textChannel.name} has no kimaki.directory tag`,
-          )
+          voiceLogger.log(`[IGNORED] Channel #${textChannel.name} has no kimaki.directory tag`)
           return
         }
 
@@ -343,9 +351,7 @@ export async function startDiscordBot({
           return
         }
 
-        discordLogger.log(
-          `DIRECTORY: Found kimaki.directory: ${projectDirectory}`,
-        )
+        discordLogger.log(`DIRECTORY: Found kimaki.directory: ${projectDirectory}`)
         if (channelAppId) {
           discordLogger.log(`APP: Channel app ID: ${channelAppId}`)
         }
@@ -359,9 +365,7 @@ export async function startDiscordBot({
           return
         }
 
-        const hasVoice = message.attachments.some((a) =>
-          a.contentType?.startsWith('audio/'),
-        )
+        const hasVoice = message.attachments.some((a) => a.contentType?.startsWith('audio/'))
 
         const threadName = hasVoice
           ? 'Voice Message'
@@ -415,10 +419,10 @@ export async function startDiscordBot({
     }
   })
 
-  // Magic prefix used by `kimaki start-session` CLI command to initiate sessions
+  // Magic prefix used by `kimaki send` CLI command to initiate sessions
   const BOT_SESSION_PREFIX = '🤖 **Bot-initiated session**'
 
-  // Handle bot-initiated threads created by `kimaki start-session`
+  // Handle bot-initiated threads created by `kimaki send`
   discordClient.on(Events.ThreadCreate, async (thread, newlyCreated) => {
     try {
       if (!newlyCreated) {
@@ -489,7 +493,9 @@ export async function startDiscordBot({
         return
       }
 
-      discordLogger.log(`[BOT_SESSION] Starting session for thread ${thread.id} with prompt: "${prompt.slice(0, 50)}..."`)
+      discordLogger.log(
+        `[BOT_SESSION] Starting session for thread ${thread.id} with prompt: "${prompt.slice(0, 50)}..."`,
+      )
 
       await handleOpencodeSession({
         prompt,
@@ -522,9 +528,7 @@ export async function startDiscordBot({
     try {
       const cleanupPromises: Promise<void>[] = []
       for (const [guildId] of voiceConnections) {
-        voiceLogger.log(
-          `[SHUTDOWN] Cleaning up voice connection for guild ${guildId}`,
-        )
+        voiceLogger.log(`[SHUTDOWN] Cleaning up voice connection for guild ${guildId}`)
         cleanupPromises.push(cleanupVoiceConnection(guildId))
       }
 
@@ -538,9 +542,7 @@ export async function startDiscordBot({
 
       for (const [dir, server] of getOpencodeServers()) {
         if (!server.process.killed) {
-          voiceLogger.log(
-            `[SHUTDOWN] Stopping OpenCode server on port ${server.port} for ${dir}`,
-          )
+          voiceLogger.log(`[SHUTDOWN] Stopping OpenCode server on port ${server.port} for ${dir}`)
           server.process.kill('SIGTERM')
         }
       }

package/src/discord-utils.ts

@@ -2,12 +2,7 @@
 // Handles markdown splitting for Discord's 2000-char limit, code block escaping,
 // thread message sending, and channel metadata extraction from topic tags.
 
-import {
-  ChannelType,
-  type Message,
-  type TextChannel,
-  type ThreadChannel,
-} from 'discord.js'
+import { ChannelType, type Message, type TextChannel, type ThreadChannel } from 'discord.js'
 import { Lexer } from 'marked'
 import { extractTagsArrays } from './xml.js'
 import { formatMarkdownTables } from './format-tables.js'
@@ -65,19 +60,43 @@ export function splitMarkdownForDiscord({
   for (const token of tokens) {
     if (token.type === 'code') {
       const lang = token.lang || ''
-      lines.push({ text: '```' + lang + '\n', inCodeBlock: false, lang, isOpeningFence: true, isClosingFence: false })
+      lines.push({
+        text: '```' + lang + '\n',
+        inCodeBlock: false,
+        lang,
+        isOpeningFence: true,
+        isClosingFence: false,
+      })
       const codeLines = token.text.split('\n')
       for (const codeLine of codeLines) {
-        lines.push({ text: codeLine + '\n', inCodeBlock: true, lang, isOpeningFence: false, isClosingFence: false })
+        lines.push({
+          text: codeLine + '\n',
+          inCodeBlock: true,
+          lang,
+          isOpeningFence: false,
+          isClosingFence: false,
+        })
       }
-      lines.push({ text: '```\n', inCodeBlock: false, lang: '', isOpeningFence: false, isClosingFence: true })
+      lines.push({
+        text: '```\n',
+        inCodeBlock: false,
+        lang: '',
+        isOpeningFence: false,
+        isClosingFence: true,
+      })
     } else {
       const rawLines = token.raw.split('\n')
       for (let i = 0; i < rawLines.length; i++) {
         const isLast = i === rawLines.length - 1
         const text = isLast ? rawLines[i]! : rawLines[i]! + '\n'
         if (text) {
-          lines.push({ text, inCodeBlock: false, lang: '', isOpeningFence: false, isClosingFence: false })
+          lines.push({
+            text,
+            inCodeBlock: false,
+            lang: '',
+            isOpeningFence: false,
+            isClosingFence: false,
+          })
         }
       }
     }
@@ -126,7 +145,9 @@ export function splitMarkdownForDiscord({
         }
 
         // calculate overhead for code block markers
-        const codeBlockOverhead = line.inCodeBlock ? ('```' + line.lang + '\n').length + '```\n'.length : 0
+        const codeBlockOverhead = line.inCodeBlock
+          ? ('```' + line.lang + '\n').length + '```\n'.length
+          : 0
         // ensure at least 10 chars available, even if maxLength is very small
         const availablePerChunk = Math.max(10, maxLength - codeBlockOverhead - 50)
 
@@ -196,7 +217,7 @@ export function splitMarkdownForDiscord({
 export async function sendThreadMessage(
   thread: ThreadChannel,
   content: string,
-  options?: { flags?: number }
+  options?: { flags?: number },
 ): Promise<Message> {
   const MAX_LENGTH = 2000
 
@@ -213,9 +234,7 @@ export async function sendThreadMessage(
   const chunks = splitMarkdownForDiscord({ content, maxLength: MAX_LENGTH })
 
   if (chunks.length > 1) {
-    discordLogger.log(
-      `MESSAGE: Splitting ${content.length} chars into ${chunks.length} messages`,
-    )
+    discordLogger.log(`MESSAGE: Splitting ${content.length} chars into ${chunks.length} messages`)
   }
 
   let firstMessage: Message | undefined
@@ -262,9 +281,7 @@ export async function resolveTextChannel(
 }
 
 export function escapeDiscordFormatting(text: string): string {
-  return text
-    .replace(/```/g, '\\`\\`\\`')
-    .replace(/````/g, '\\`\\`\\`\\`')
+  return text.replace(/```/g, '\\`\\`\\`').replace(/````/g, '\\`\\`\\`\\`')
 }
 
 export function getKimakiMetadata(textChannel: TextChannel | null): {

package/src/escape-backticks.test.ts

@@ -2,8 +2,6 @@ import { test, expect } from 'vitest'
 import { Lexer } from 'marked'
 import { escapeBackticksInCodeBlocks, splitMarkdownForDiscord } from './discord-utils.js'
 
-
-
 test('escapes single backticks in code blocks', () => {
   const input = '```js\nconst x = `hello`\n```'
   const result = escapeBackticksInCodeBlocks(input)

package/src/format-tables.ts

@@ -78,10 +78,7 @@ function extractTokenText(token: Token): string {
   }
 }
 
-function calculateColumnWidths(
-  headers: string[],
-  rows: string[][],
-): number[] {
+function calculateColumnWidths(headers: string[], rows: string[][]): number[] {
   const widths = headers.map((h) => {
     return h.length
   })

package/src/genai-worker-wrapper.ts

@@ -41,13 +41,9 @@ export interface GenAIWorker {
   stop(): Promise<void>
 }
 
-export function createGenAIWorker(
-  options: GenAIWorkerOptions,
-): Promise<GenAIWorker> {
+export function createGenAIWorker(options: GenAIWorkerOptions): Promise<GenAIWorker> {
   return new Promise((resolve, reject) => {
-    const worker = new Worker(
-      new URL('../dist/genai-worker.js', import.meta.url),
-    )
+    const worker = new Worker(new URL('../dist/genai-worker.js', import.meta.url))
 
     // Handle messages from worker
     worker.on('message', (message: WorkerOutMessage) => {
@@ -106,9 +102,7 @@ export function createGenAIWorker(
                 worker.once('exit', (code) => {
                   if (!resolved) {
                     resolved = true
-                    genaiWrapperLogger.log(
-                      `[GENAI WORKER WRAPPER] Worker exited with code ${code}`,
-                    )
+                    genaiWrapperLogger.log(`[GENAI WORKER WRAPPER] Worker exited with code ${code}`)
                     resolve()
                   }
                 })