kimaki 0.4.34 → 0.4.36

package/src/commands/abort.ts

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

package/src/commands/add-project.ts

@@ -11,10 +11,7 @@ import { abbreviatePath } from '../utils.js'
 
 const logger = createLogger('ADD-PROJECT')
 
-export async function handleAddProjectCommand({
-  command,
-  appId,
-}: CommandContext): Promise<void> {
+export async function handleAddProjectCommand({ command, appId }: CommandContext): Promise<void> {
   await command.deferReply({ ephemeral: false })
 
   const projectId = command.options.getString('project', true)
@@ -63,13 +60,12 @@ export async function handleAddProjectCommand({
       return
     }
 
-    const { textChannelId, voiceChannelId, channelName } =
-      await createProjectChannels({
-        guild,
-        projectDirectory: directory,
-        appId,
-        botName: command.client.user?.username,
-      })
+    const { textChannelId, voiceChannelId, channelName } = await createProjectChannels({
+      guild,
+      projectDirectory: directory,
+      appId,
+      botName: command.client.user?.username,
+    })
 
     await command.editReply(
       `✅ Created channels for project:\n📝 Text: <#${textChannelId}>\n🔊 Voice: <#${voiceChannelId}>\n📁 Directory: \`${directory}\``,
@@ -102,9 +98,7 @@ export async function handleAddProjectAutocomplete({
 
     const db = getDatabase()
     const existingDirs = db
-      .prepare(
-        'SELECT DISTINCT directory FROM channel_directories WHERE channel_type = ?',
-      )
+      .prepare('SELECT DISTINCT directory FROM channel_directories WHERE channel_type = ?')
       .all('text') as { directory: string }[]
     const existingDirSet = new Set(existingDirs.map((row) => row.directory))
 

package/src/commands/agent.ts

@@ -17,12 +17,15 @@ import { createLogger } from '../logger.js'
 
 const agentLogger = createLogger('AGENT')
 
-const pendingAgentContexts = new Map<string, {
-  dir: string
-  channelId: string
-  sessionId?: string
-  isThread: boolean
-}>()
+const pendingAgentContexts = new Map<
+  string,
+  {
+    dir: string
+    channelId: string
+    sessionId?: string
+    isThread: boolean
+  }
+>()
 
 export async function handleAgentCommand({
   interaction,
@@ -72,7 +75,9 @@ export async function handleAgentCommand({
     channelAppId = metadata.channelAppId
     targetChannelId = channel.id
   } else {
-    await interaction.editReply({ content: 'This command can only be used in text channels or threads' })
+    await interaction.editReply({
+      content: 'This command can only be used in text channels or threads',
+    })
     return
   }
 
@@ -82,7 +87,9 @@ export async function handleAgentCommand({
   }
 
   if (!projectDirectory) {
-    await interaction.editReply({ content: 'This channel is not configured with a project directory' })
+    await interaction.editReply({
+      content: 'This channel is not configured with a project directory',
+    })
     return
   }
 
@@ -141,7 +148,7 @@ export async function handleAgentCommand({
 }
 
 export async function handleAgentSelectMenu(
-  interaction: StringSelectMenuInteraction
+  interaction: StringSelectMenuInteraction,
 ): Promise<void> {
   const customId = interaction.customId
 

package/src/commands/ask-question.ts

@@ -95,9 +95,10 @@ export async function showAskUserQuestionDropdowns({
       },
     ]
 
+    const placeholder = options.find((x) => x.label)?.label || 'Select an option'
     const selectMenu = new StringSelectMenuBuilder()
       .setCustomId(`ask_question:${contextHash}:${i}`)
-      .setPlaceholder(`Select an option`)
+      .setPlaceholder(placeholder)
       .addOptions(options)
 
     // Enable multi-select if the question supports it
@@ -122,7 +123,7 @@ export async function showAskUserQuestionDropdowns({
  * Handle dropdown selection for AskUserQuestion.
  */
 export async function handleAskQuestionSelectMenu(
-  interaction: StringSelectMenuInteraction
+  interaction: StringSelectMenuInteraction,
 ): Promise<void> {
   const customId = interaction.customId
 
@@ -196,9 +197,7 @@ export async function handleAskQuestionSelectMenu(
  * Submit all collected answers back to the OpenCode session.
  * Uses the question.reply API to provide answers to the waiting tool.
  */
-async function submitQuestionAnswers(
-  context: PendingQuestionContext
-): Promise<void> {
+async function submitQuestionAnswers(context: PendingQuestionContext): Promise<void> {
   try {
     const clientV2 = getOpencodeClientV2(context.directory)
     if (!clientV2) {
@@ -215,12 +214,14 @@ async function submitQuestionAnswers(
       answers,
     })
 
-    logger.log(`Submitted answers for question ${context.requestId} in session ${context.sessionId}`)
+    logger.log(
+      `Submitted answers for question ${context.requestId} in session ${context.sessionId}`,
+    )
   } catch (error) {
     logger.error('Failed to submit answers:', error)
     await sendThreadMessage(
       context.thread,
-      `✗ Failed to submit answers: ${error instanceof Error ? error.message : 'Unknown error'}`
+      `✗ Failed to submit answers: ${error instanceof Error ? error.message : 'Unknown error'}`,
     )
   }
 }

package/src/commands/create-new-project.ts

@@ -54,9 +54,7 @@ export async function handleCreateNewProjectCommand({
     }
 
     if (fs.existsSync(projectDirectory)) {
-      await command.editReply(
-        `Project directory already exists: ${projectDirectory}`,
-      )
+      await command.editReply(`Project directory already exists: ${projectDirectory}`)
       return
     }
 
@@ -67,16 +65,13 @@ export async function handleCreateNewProjectCommand({
     execSync('git init', { cwd: projectDirectory, stdio: 'pipe' })
     logger.log(`Initialized git in: ${projectDirectory}`)
 
-    const { textChannelId, voiceChannelId, channelName } =
-      await createProjectChannels({
-        guild,
-        projectDirectory,
-        appId,
-      })
+    const { textChannelId, voiceChannelId, channelName } = await createProjectChannels({
+      guild,
+      projectDirectory,
+      appId,
+    })
 
-    const textChannel = (await guild.channels.fetch(
-      textChannelId,
-    )) as TextChannel
+    const textChannel = (await guild.channels.fetch(textChannelId)) as TextChannel
 
     await command.editReply(
       `✅ Created new project **${sanitizedName}**\n📁 Directory: \`${projectDirectory}\`\n📝 Text: <#${textChannelId}>\n🔊 Voice: <#${voiceChannelId}>\n\n_Starting session..._`,
@@ -94,8 +89,7 @@ export async function handleCreateNewProjectCommand({
     })
 
     await handleOpencodeSession({
-      prompt:
-        'The project was just initialized. Say hi and ask what the user wants to build.',
+      prompt: 'The project was just initialized. Say hi and ask what the user wants to build.',
       thread,
       projectDirectory,
       channelId: textChannel.id,

package/src/commands/fork.ts

@@ -85,9 +85,7 @@ export async function handleForkCommand(interaction: ChatInputCommandInteraction
       return
     }
 
-    const userMessages = messagesResponse.data.filter(
-      (m) => m.info.role === 'user'
-    )
+    const userMessages = messagesResponse.data.filter((m) => m.info.role === 'user')
 
     if (userMessages.length === 0) {
       await interaction.editReply({
@@ -99,7 +97,9 @@ export async function handleForkCommand(interaction: ChatInputCommandInteraction
     const recentMessages = userMessages.slice(-25)
 
     const options = recentMessages.map((m, index) => {
-      const textPart = m.parts.find((p) => p.type === 'text') as { type: 'text'; text: string } | undefined
+      const textPart = m.parts.find((p) => p.type === 'text') as
+        | { type: 'text'; text: string }
+        | undefined
       const preview = textPart?.text?.slice(0, 80) || '(no text)'
       const label = `${index + 1}. ${preview}${preview.length >= 80 ? '...' : ''}`
 
@@ -117,11 +117,11 @@ export async function handleForkCommand(interaction: ChatInputCommandInteraction
       .setPlaceholder('Select a message to fork from')
       .addOptions(options)
 
-    const actionRow = new ActionRowBuilder<StringSelectMenuBuilder>()
-      .addComponents(selectMenu)
+    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:',
+      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) {
@@ -132,7 +132,9 @@ export async function handleForkCommand(interaction: ChatInputCommandInteraction
   }
 }
 
-export async function handleForkSelectMenu(interaction: StringSelectMenuInteraction): Promise<void> {
+export async function handleForkSelectMenu(
+  interaction: StringSelectMenuInteraction,
+): Promise<void> {
   const customId = interaction.customId
 
   if (!customId.startsWith('fork_select:')) {
@@ -177,11 +179,14 @@ export async function handleForkSelectMenu(interaction: StringSelectMenuInteract
     const forkedSession = forkResponse.data
     const parentChannel = interaction.channel
 
-    if (!parentChannel || ![
-      ChannelType.PublicThread,
-      ChannelType.PrivateThread,
-      ChannelType.AnnouncementThread,
-    ].includes(parentChannel.type)) {
+    if (
+      !parentChannel ||
+      ![
+        ChannelType.PublicThread,
+        ChannelType.PrivateThread,
+        ChannelType.AnnouncementThread,
+      ].includes(parentChannel.type)
+    ) {
       await interaction.editReply('Could not access parent channel')
       return
     }
@@ -200,14 +205,10 @@ export async function handleForkSelectMenu(interaction: StringSelectMenuInteract
     })
 
     getDatabase()
-      .prepare(
-        'INSERT OR REPLACE INTO thread_sessions (thread_id, session_id) VALUES (?, ?)'
-      )
+      .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}`
-    )
+    sessionLogger.log(`Created forked session ${forkedSession.id} in thread ${thread.id}`)
 
     await sendThreadMessage(
       thread,
@@ -240,18 +241,13 @@ export async function handleForkSelectMenu(interaction: StringSelectMenuInteract
       }
     }
 
-    await sendThreadMessage(
-      thread,
-      `You can now continue the conversation from this point.`,
-    )
+    await sendThreadMessage(thread, `You can now continue the conversation from this point.`)
 
-    await interaction.editReply(
-      `Session forked! Continue in ${thread.toString()}`
-    )
+    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'}`
+      `Failed to fork session: ${error instanceof Error ? error.message : 'Unknown error'}`,
     )
   }
 }

package/src/commands/model.ts

@@ -19,15 +19,18 @@ import { createLogger } from '../logger.js'
 const modelLogger = createLogger('MODEL')
 
 // Store context by hash to avoid customId length limits (Discord max: 100 chars)
-const pendingModelContexts = new Map<string, {
-  dir: string
-  channelId: string
-  sessionId?: string
-  isThread: boolean
-  providerId?: string
-  providerName?: string
-  thread?: ThreadChannel
-}>()
+const pendingModelContexts = new Map<
+  string,
+  {
+    dir: string
+    channelId: string
+    sessionId?: string
+    isThread: boolean
+    providerId?: string
+    providerName?: string
+    thread?: ThreadChannel
+  }
+>()
 
 export type ProviderInfo = {
   id: string
@@ -196,7 +199,7 @@ export async function handleModelCommand({
  * Shows a second select menu with models for the chosen provider.
  */
 export async function handleProviderSelectMenu(
-  interaction: StringSelectMenuInteraction
+  interaction: StringSelectMenuInteraction,
 ): Promise<void> {
   const customId = interaction.customId
 
@@ -317,7 +320,7 @@ export async function handleProviderSelectMenu(
  * Stores the model preference in the database.
  */
 export async function handleModelSelectMenu(
-  interaction: StringSelectMenuInteraction
+  interaction: StringSelectMenuInteraction,
 ): Promise<void> {
   const customId = interaction.customId
 

package/src/commands/permissions.ts

@@ -96,7 +96,7 @@ export async function showPermissionDropdown({
  * Handle dropdown selection for permission.
  */
 export async function handlePermissionSelectMenu(
-  interaction: StringSelectMenuInteraction
+  interaction: StringSelectMenuInteraction,
 ): Promise<void> {
   const customId = interaction.customId
 

package/src/commands/queue.ts

@@ -20,9 +20,7 @@ import { createLogger } from '../logger.js'
 
 const logger = createLogger('QUEUE')
 
-export async function handleQueueCommand({
-  command,
-}: CommandContext): Promise<void> {
+export async function handleQueueCommand({ command }: CommandContext): Promise<void> {
   const message = command.options.getString('message', true)
   const channel = command.channel
 
@@ -85,9 +83,7 @@ export async function handleQueueCommand({
       flags: SILENT_MESSAGE_FLAGS,
     })
 
-    logger.log(
-      `[QUEUE] No active request, sending immediately in thread ${channel.id}`,
-    )
+    logger.log(`[QUEUE] No active request, sending immediately in thread ${channel.id}`)
 
     handleOpencodeSession({
       prompt: message,
@@ -97,10 +93,7 @@ export async function handleQueueCommand({
     }).catch(async (e) => {
       logger.error(`[QUEUE] Failed to send message:`, e)
       const errorMsg = e instanceof Error ? e.message : String(e)
-      await sendThreadMessage(
-        channel as ThreadChannel,
-        `✗ Failed: ${errorMsg.slice(0, 200)}`,
-      )
+      await sendThreadMessage(channel as ThreadChannel, `✗ Failed: ${errorMsg.slice(0, 200)}`)
     })
 
     return
@@ -123,14 +116,10 @@ export async function handleQueueCommand({
     flags: SILENT_MESSAGE_FLAGS,
   })
 
-  logger.log(
-    `[QUEUE] User ${command.user.displayName} queued message in thread ${channel.id}`,
-  )
+  logger.log(`[QUEUE] User ${command.user.displayName} queued message in thread ${channel.id}`)
 }
 
-export async function handleClearQueueCommand({
-  command,
-}: CommandContext): Promise<void> {
+export async function handleClearQueueCommand({ command }: CommandContext): Promise<void> {
   const channel = command.channel
 
   if (!channel) {
@@ -175,7 +164,5 @@ export async function handleClearQueueCommand({
     flags: SILENT_MESSAGE_FLAGS,
   })
 
-  logger.log(
-    `[QUEUE] User ${command.user.displayName} cleared queue in thread ${channel.id}`,
-  )
+  logger.log(`[QUEUE] User ${command.user.displayName} cleared queue in thread ${channel.id}`)
 }

package/src/commands/remove-project.ts

@@ -0,0 +1,136 @@
+// /remove-project command - Remove Discord channels for a project.
+
+import path from 'node:path'
+import type { CommandContext, AutocompleteContext } from './types.js'
+import { getDatabase } from '../database.js'
+import { createLogger } from '../logger.js'
+import { abbreviatePath } from '../utils.js'
+
+const logger = createLogger('REMOVE-PROJECT')
+
+export async function handleRemoveProjectCommand({ command, appId }: CommandContext): Promise<void> {
+  await command.deferReply({ ephemeral: false })
+
+  const directory = command.options.getString('project', true)
+  const guild = command.guild
+
+  if (!guild) {
+    await command.editReply('This command can only be used in a guild')
+    return
+  }
+
+  try {
+    const db = getDatabase()
+
+    // Get channel IDs for this directory
+    const channels = db
+      .prepare('SELECT channel_id, channel_type FROM channel_directories WHERE directory = ?')
+      .all(directory) as { channel_id: string; channel_type: string }[]
+
+    if (channels.length === 0) {
+      await command.editReply(`No channels found for directory: \`${directory}\``)
+      return
+    }
+
+    const deletedChannels: string[] = []
+    const failedChannels: string[] = []
+
+    for (const { channel_id, channel_type } of channels) {
+      try {
+        const channel = await guild.channels.fetch(channel_id).catch(() => null)
+
+        if (channel) {
+          await channel.delete(`Removed by /remove-project command`)
+          deletedChannels.push(`${channel_type}: ${channel_id}`)
+        } else {
+          // Channel doesn't exist in this guild or was already deleted
+          deletedChannels.push(`${channel_type}: ${channel_id} (already deleted)`)
+        }
+      } catch (error) {
+        logger.error(`Failed to delete channel ${channel_id}:`, error)
+        failedChannels.push(`${channel_type}: ${channel_id}`)
+      }
+    }
+
+    // Remove from database
+    db.prepare('DELETE FROM channel_directories WHERE directory = ?').run(directory)
+
+    const projectName = path.basename(directory)
+    let message = `Removed project **${projectName}**\n`
+    message += `Directory: \`${directory}\`\n\n`
+
+    if (deletedChannels.length > 0) {
+      message += `Deleted channels:\n${deletedChannels.map((c) => `- ${c}`).join('\n')}`
+    }
+
+    if (failedChannels.length > 0) {
+      message += `\n\nFailed to delete (may be in another server):\n${failedChannels.map((c) => `- ${c}`).join('\n')}`
+    }
+
+    await command.editReply(message)
+    logger.log(`Removed project ${projectName} at ${directory}`)
+  } catch (error) {
+    logger.error('[REMOVE-PROJECT] Error:', error)
+    await command.editReply(
+      `Failed to remove project: ${error instanceof Error ? error.message : 'Unknown error'}`,
+    )
+  }
+}
+
+export async function handleRemoveProjectAutocomplete({
+  interaction,
+  appId,
+}: AutocompleteContext): Promise<void> {
+  const focusedValue = interaction.options.getFocused()
+  const guild = interaction.guild
+
+  if (!guild) {
+    await interaction.respond([])
+    return
+  }
+
+  try {
+    const db = getDatabase()
+
+    // Get all directories with channels
+    const allChannels = db
+      .prepare(
+        'SELECT DISTINCT directory, channel_id FROM channel_directories WHERE channel_type = ?',
+      )
+      .all('text') as { directory: string; channel_id: string }[]
+
+    // Filter to only channels that exist in this guild
+    const projectsInGuild: { directory: string; channelId: string }[] = []
+
+    for (const { directory, channel_id } of allChannels) {
+      try {
+        const channel = await guild.channels.fetch(channel_id).catch(() => null)
+        if (channel) {
+          projectsInGuild.push({ directory, channelId: channel_id })
+        }
+      } catch {
+        // Channel not in this guild, skip
+      }
+    }
+
+    const projects = projectsInGuild
+      .filter(({ directory }) => {
+        const baseName = path.basename(directory)
+        const searchText = `${baseName} ${directory}`.toLowerCase()
+        return searchText.includes(focusedValue.toLowerCase())
+      })
+      .slice(0, 25)
+      .map(({ directory }) => {
+        const name = `${path.basename(directory)} (${abbreviatePath(directory)})`
+        return {
+          name: name.length > 100 ? name.slice(0, 99) + '...' : name,
+          value: directory,
+        }
+      })
+
+    await interaction.respond(projects)
+  } catch (error) {
+    logger.error('[AUTOCOMPLETE] Error fetching projects:', error)
+    await interaction.respond([])
+  }
+}

package/src/commands/resume.ts

@@ -10,21 +10,14 @@ import fs from 'node:fs'
 import type { CommandContext, AutocompleteContext } from './types.js'
 import { getDatabase } from '../database.js'
 import { initializeOpencodeForDirectory } from '../opencode.js'
-import {
-  sendThreadMessage,
-  resolveTextChannel,
-  getKimakiMetadata,
-} from '../discord-utils.js'
+import { sendThreadMessage, resolveTextChannel, getKimakiMetadata } from '../discord-utils.js'
 import { extractTagsArrays } from '../xml.js'
 import { collectLastAssistantParts } from '../message-formatting.js'
 import { createLogger } from '../logger.js'
 
 const logger = createLogger('RESUME')
 
-export async function handleResumeCommand({
-  command,
-  appId,
-}: CommandContext): Promise<void> {
+export async function handleResumeCommand({ command, appId }: CommandContext): Promise<void> {
   await command.deferReply({ ephemeral: false })
 
   const sessionId = command.options.getString('session', true)
@@ -56,9 +49,7 @@ export async function handleResumeCommand({
   }
 
   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
   }
 
@@ -88,9 +79,7 @@ export async function handleResumeCommand({
     })
 
     getDatabase()
-      .prepare(
-        'INSERT OR REPLACE INTO thread_sessions (thread_id, session_id) VALUES (?, ?)',
-      )
+      .prepare('INSERT OR REPLACE INTO thread_sessions (thread_id, session_id) VALUES (?, ?)')
       .run(thread.id, sessionId)
 
     logger.log(`[RESUME] Created thread ${thread.id} for session ${sessionId}`)
@@ -105,9 +94,7 @@ export async function handleResumeCommand({
 
     const messages = messagesResponse.data
 
-    await command.editReply(
-      `Resumed session "${sessionTitle}" in ${thread.toString()}`,
-    )
+    await command.editReply(`Resumed session "${sessionTitle}" in ${thread.toString()}`)
 
     await sendThreadMessage(
       thread,
@@ -119,10 +106,7 @@ export async function handleResumeCommand({
     })
 
     if (skippedCount > 0) {
-      await sendThreadMessage(
-        thread,
-        `*Skipped ${skippedCount} older assistant parts...*`,
-      )
+      await sendThreadMessage(thread, `*Skipped ${skippedCount} older assistant parts...*`)
     }
 
     if (content.trim()) {
@@ -168,8 +152,7 @@ export async function handleResumeAutocomplete({
       interaction.channel as TextChannel | ThreadChannel | null,
     )
     if (textChannel) {
-      const { projectDirectory: directory, channelAppId } =
-        getKimakiMetadata(textChannel)
+      const { projectDirectory: directory, channelAppId } = getKimakiMetadata(textChannel)
       if (channelAppId && channelAppId !== appId) {
         await interaction.respond([])
         return
@@ -194,17 +177,15 @@ export async function handleResumeAutocomplete({
 
     const existingSessionIds = new Set(
       (
-        getDatabase()
-          .prepare('SELECT session_id FROM thread_sessions')
-          .all() as { session_id: string }[]
+        getDatabase().prepare('SELECT session_id FROM thread_sessions').all() as {
+          session_id: string
+        }[]
       ).map((row) => row.session_id),
     )
 
     const sessions = sessionsResponse.data
       .filter((session) => !existingSessionIds.has(session.id))
-      .filter((session) =>
-        session.title.toLowerCase().includes(focusedValue.toLowerCase()),
-      )
+      .filter((session) => session.title.toLowerCase().includes(focusedValue.toLowerCase()))
       .slice(0, 25)
       .map((session) => {
         const dateStr = new Date(session.time.updated).toLocaleString()