kimaki 0.4.43 → 0.4.45

package/src/commands/permissions.ts

@@ -18,6 +18,7 @@ const logger = createLogger('PERMISSIONS')
 
 type PendingPermissionContext = {
   permission: PermissionRequest
+  requestIds: string[]
   directory: string
   thread: ThreadChannel
   contextHash: string
@@ -43,6 +44,7 @@ export async function showPermissionDropdown({
 
   const context: PendingPermissionContext = {
     permission,
+    requestIds: [permission.id],
     directory,
     thread,
     contextHash,
@@ -124,10 +126,15 @@ export async function handlePermissionSelectMenu(
     if (!clientV2) {
       throw new Error('OpenCode server not found for directory')
     }
-    await clientV2.permission.reply({
-      requestID: context.permission.id,
-      reply: response,
-    })
+    const requestIds = context.requestIds.length > 0 ? context.requestIds : [context.permission.id]
+    await Promise.all(
+      requestIds.map((requestId) => {
+        return clientV2.permission.reply({
+          requestID: requestId,
+          reply: response,
+        })
+      }),
+    )
 
     pendingPermissionContexts.delete(contextHash)
 
@@ -153,7 +160,7 @@ export async function handlePermissionSelectMenu(
       components: [], // Remove the dropdown
     })
 
-    logger.log(`Permission ${context.permission.id} ${response}`)
+    logger.log(`Permission ${context.permission.id} ${response} (${requestIds.length} request(s))`)
   } catch (error) {
     logger.error('Error handling permission:', error)
     await interaction.editReply({
@@ -163,6 +170,25 @@ export async function handlePermissionSelectMenu(
   }
 }
 
+export function addPermissionRequestToContext({
+  contextHash,
+  requestId,
+}: {
+  contextHash: string
+  requestId: string
+}): boolean {
+  const context = pendingPermissionContexts.get(contextHash)
+  if (!context) {
+    return false
+  }
+  if (context.requestIds.includes(requestId)) {
+    return false
+  }
+  context.requestIds = [...context.requestIds, requestId]
+  pendingPermissionContexts.set(contextHash, context)
+  return true
+}
+
 /**
  * Clean up a pending permission context (e.g., on auto-reject).
  */

package/src/commands/queue.ts

@@ -62,7 +62,11 @@ export async function handleQueueCommand({ command }: CommandContext): Promise<v
   }
 
   // Check if there's an active request running
-  const hasActiveRequest = abortControllers.has(row.session_id)
+  const existingController = abortControllers.get(row.session_id)
+  const hasActiveRequest = Boolean(existingController && !existingController.signal.aborted)
+  if (existingController && existingController.signal.aborted) {
+    abortControllers.delete(row.session_id)
+  }
 
   if (!hasActiveRequest) {
     // No active request, send immediately

package/src/commands/resume.ts

@@ -8,10 +8,9 @@ import {
 } from 'discord.js'
 import fs from 'node:fs'
 import type { CommandContext, AutocompleteContext } from './types.js'
-import { getDatabase } from '../database.js'
+import { getDatabase, getChannelDirectory } from '../database.js'
 import { initializeOpencodeForDirectory } from '../opencode.js'
-import { sendThreadMessage, resolveTextChannel, getKimakiMetadata } from '../discord-utils.js'
-import { extractTagsArrays } from '../xml.js'
+import { sendThreadMessage, resolveTextChannel } from '../discord-utils.js'
 import { collectLastAssistantParts } from '../message-formatting.js'
 import { createLogger } from '../logger.js'
 import * as errore from 'errore'
@@ -31,18 +30,9 @@ export async function handleResumeCommand({ command, appId }: CommandContext): P
 
   const textChannel = channel as TextChannel
 
-  let projectDirectory: string | undefined
-  let channelAppId: string | undefined
-
-  if (textChannel.topic) {
-    const extracted = extractTagsArrays({
-      xml: textChannel.topic,
-      tags: ['kimaki.directory', 'kimaki.app'],
-    })
-
-    projectDirectory = extracted['kimaki.directory']?.[0]?.trim()
-    channelAppId = extracted['kimaki.app']?.[0]?.trim()
-  }
+  const channelConfig = getChannelDirectory(textChannel.id)
+  const projectDirectory = channelConfig?.directory
+  const channelAppId = channelConfig?.appId || undefined
 
   if (channelAppId && channelAppId !== appId) {
     await command.editReply('This channel is not configured for this bot')
@@ -157,12 +147,12 @@ export async function handleResumeAutocomplete({
       interaction.channel as TextChannel | ThreadChannel | null,
     )
     if (textChannel) {
-      const { projectDirectory: directory, channelAppId } = getKimakiMetadata(textChannel)
-      if (channelAppId && channelAppId !== appId) {
+      const channelConfig = getChannelDirectory(textChannel.id)
+      if (channelConfig?.appId && channelConfig.appId !== appId) {
         await interaction.respond([])
         return
       }
-      projectDirectory = directory
+      projectDirectory = channelConfig?.directory
     }
   }
 

package/src/commands/session.ts

@@ -4,10 +4,9 @@ import { ChannelType, type TextChannel } from 'discord.js'
 import fs from 'node:fs'
 import path from 'node:path'
 import type { CommandContext, AutocompleteContext } from './types.js'
-import { getDatabase } from '../database.js'
+import { getDatabase, getChannelDirectory } from '../database.js'
 import { initializeOpencodeForDirectory } from '../opencode.js'
 import { SILENT_MESSAGE_FLAGS } from '../discord-utils.js'
-import { extractTagsArrays } from '../xml.js'
 import { handleOpencodeSession } from '../session-handler.js'
 import { createLogger } from '../logger.js'
 import * as errore from 'errore'
@@ -29,18 +28,9 @@ export async function handleSessionCommand({ command, appId }: CommandContext):
 
   const textChannel = channel as TextChannel
 
-  let projectDirectory: string | undefined
-  let channelAppId: string | undefined
-
-  if (textChannel.topic) {
-    const extracted = extractTagsArrays({
-      xml: textChannel.topic,
-      tags: ['kimaki.directory', 'kimaki.app'],
-    })
-
-    projectDirectory = extracted['kimaki.directory']?.[0]?.trim()
-    channelAppId = extracted['kimaki.app']?.[0]?.trim()
-  }
+  const channelConfig = getChannelDirectory(textChannel.id)
+  const projectDirectory = channelConfig?.directory
+  const channelAppId = channelConfig?.appId || undefined
 
   if (channelAppId && channelAppId !== appId) {
     await command.editReply('This channel is not configured for this bot')
@@ -107,22 +97,14 @@ async function handleAgentAutocomplete({ interaction, appId }: AutocompleteConte
 
   let projectDirectory: string | undefined
 
-  if (interaction.channel) {
-    const channel = interaction.channel
-    if (channel.type === ChannelType.GuildText) {
-      const textChannel = channel as TextChannel
-      if (textChannel.topic) {
-        const extracted = extractTagsArrays({
-          xml: textChannel.topic,
-          tags: ['kimaki.directory', 'kimaki.app'],
-        })
-        const channelAppId = extracted['kimaki.app']?.[0]?.trim()
-        if (channelAppId && channelAppId !== appId) {
-          await interaction.respond([])
-          return
-        }
-        projectDirectory = extracted['kimaki.directory']?.[0]?.trim()
+  if (interaction.channel && interaction.channel.type === ChannelType.GuildText) {
+    const channelConfig = getChannelDirectory(interaction.channel.id)
+    if (channelConfig) {
+      if (channelConfig.appId && channelConfig.appId !== appId) {
+        await interaction.respond([])
+        return
       }
+      projectDirectory = channelConfig.directory
     }
   }
 
@@ -190,22 +172,14 @@ export async function handleSessionAutocomplete({
 
   let projectDirectory: string | undefined
 
-  if (interaction.channel) {
-    const channel = interaction.channel
-    if (channel.type === ChannelType.GuildText) {
-      const textChannel = channel as TextChannel
-      if (textChannel.topic) {
-        const extracted = extractTagsArrays({
-          xml: textChannel.topic,
-          tags: ['kimaki.directory', 'kimaki.app'],
-        })
-        const channelAppId = extracted['kimaki.app']?.[0]?.trim()
-        if (channelAppId && channelAppId !== appId) {
-          await interaction.respond([])
-          return
-        }
-        projectDirectory = extracted['kimaki.directory']?.[0]?.trim()
+  if (interaction.channel && interaction.channel.type === ChannelType.GuildText) {
+    const channelConfig = getChannelDirectory(interaction.channel.id)
+    if (channelConfig) {
+      if (channelConfig.appId && channelConfig.appId !== appId) {
+        await interaction.respond([])
+        return
       }
+      projectDirectory = channelConfig.directory
     }
   }
 

package/src/commands/user-command.ts

@@ -3,11 +3,10 @@
 
 import type { CommandContext, CommandHandler } from './types.js'
 import { ChannelType, type TextChannel, type ThreadChannel } from 'discord.js'
-import { extractTagsArrays } from '../xml.js'
 import { handleOpencodeSession } from '../session-handler.js'
 import { SILENT_MESSAGE_FLAGS } from '../discord-utils.js'
 import { createLogger } from '../logger.js'
-import { getDatabase } from '../database.js'
+import { getDatabase, getChannelDirectory } from '../database.js'
 import fs from 'node:fs'
 
 const userCommandLogger = createLogger('USER_CMD')
@@ -68,28 +67,18 @@ export const handleUserCommand: CommandHandler = async ({ command, appId }: Comm
       return
     }
 
-    if (textChannel?.topic) {
-      const extracted = extractTagsArrays({
-        xml: textChannel.topic,
-        tags: ['kimaki.directory', 'kimaki.app'],
-      })
-
-      projectDirectory = extracted['kimaki.directory']?.[0]?.trim()
-      channelAppId = extracted['kimaki.app']?.[0]?.trim()
+    if (textChannel) {
+      const channelConfig = getChannelDirectory(textChannel.id)
+      projectDirectory = channelConfig?.directory
+      channelAppId = channelConfig?.appId || undefined
     }
   } else {
     // Running in a text channel - will create a new thread
     textChannel = channel as TextChannel
 
-    if (textChannel.topic) {
-      const extracted = extractTagsArrays({
-        xml: textChannel.topic,
-        tags: ['kimaki.directory', 'kimaki.app'],
-      })
-
-      projectDirectory = extracted['kimaki.directory']?.[0]?.trim()
-      channelAppId = extracted['kimaki.app']?.[0]?.trim()
-    }
+    const channelConfig = getChannelDirectory(textChannel.id)
+    projectDirectory = channelConfig?.directory
+    channelAppId = channelConfig?.appId || undefined
   }
 
   if (channelAppId && channelAppId !== appId) {

package/src/commands/verbosity.ts

@@ -0,0 +1,71 @@
+// /verbosity command.
+// Sets the output verbosity level for sessions in a channel.
+// 'tools-and-text' (default): shows all output including tool executions
+// 'text-only': only shows text responses (⬥ diamond parts)
+
+import { ChatInputCommandInteraction, ChannelType, type TextChannel, type ThreadChannel } from 'discord.js'
+import { getChannelVerbosity, setChannelVerbosity, type VerbosityLevel } from '../database.js'
+import { createLogger } from '../logger.js'
+
+const verbosityLogger = createLogger('VERBOSITY')
+
+/**
+ * Handle the /verbosity slash command.
+ * Sets output verbosity for the channel (applies to new sessions).
+ */
+export async function handleVerbosityCommand({
+  command,
+  appId,
+}: {
+  command: ChatInputCommandInteraction
+  appId: string
+}): Promise<void> {
+  verbosityLogger.log('[VERBOSITY] Command called')
+
+  const channel = command.channel
+  if (!channel) {
+    await command.reply({
+      content: 'Could not determine channel.',
+      ephemeral: true,
+    })
+    return
+  }
+
+  // Get the parent channel ID (for threads, use parent; for text channels, use self)
+  const channelId = (() => {
+    if (channel.type === ChannelType.GuildText) {
+      return channel.id
+    }
+    if (
+      channel.type === ChannelType.PublicThread ||
+      channel.type === ChannelType.PrivateThread ||
+      channel.type === ChannelType.AnnouncementThread
+    ) {
+      return (channel as ThreadChannel).parentId || channel.id
+    }
+    return channel.id
+  })()
+
+  const level = command.options.getString('level', true) as VerbosityLevel
+  const currentLevel = getChannelVerbosity(channelId)
+
+  if (currentLevel === level) {
+    await command.reply({
+      content: `Verbosity is already set to **${level}**.`,
+      ephemeral: true,
+    })
+    return
+  }
+
+  setChannelVerbosity(channelId, level)
+  verbosityLogger.log(`[VERBOSITY] Set channel ${channelId} to ${level}`)
+
+  const description = level === 'text-only'
+    ? 'Only text responses will be shown. Tool executions, status messages, and thinking will be hidden.'
+    : 'All output will be shown, including tool executions and status messages.'
+
+  await command.reply({
+    content: `Verbosity set to **${level}**.\n\n${description}\n\nThis applies to all new sessions in this channel.`,
+    ephemeral: true,
+  })
+}

package/src/commands/worktree-settings.ts

@@ -0,0 +1,122 @@
+// /enable-worktrees and /disable-worktrees commands.
+// Allows per-channel opt-in for automatic worktree creation,
+// as an alternative to the global --use-worktrees CLI flag.
+
+import { ChatInputCommandInteraction, ChannelType, type TextChannel } from 'discord.js'
+import { getChannelWorktreesEnabled, setChannelWorktreesEnabled } from '../database.js'
+import { getKimakiMetadata } from '../discord-utils.js'
+import { createLogger } from '../logger.js'
+
+const worktreeSettingsLogger = createLogger('WORKTREE_SETTINGS')
+
+/**
+ * Handle the /enable-worktrees slash command.
+ * Enables automatic worktree creation for new sessions in this channel.
+ */
+export async function handleEnableWorktreesCommand({
+  command,
+  appId,
+}: {
+  command: ChatInputCommandInteraction
+  appId: string
+}): Promise<void> {
+  worktreeSettingsLogger.log('[ENABLE_WORKTREES] Command called')
+
+  const channel = command.channel
+
+  if (!channel || channel.type !== ChannelType.GuildText) {
+    await command.reply({
+      content: 'This command can only be used in text channels (not threads).',
+      ephemeral: true,
+    })
+    return
+  }
+
+  const textChannel = channel as TextChannel
+  const metadata = getKimakiMetadata(textChannel)
+
+  if (metadata.channelAppId && metadata.channelAppId !== appId) {
+    await command.reply({
+      content: 'This channel is configured for a different bot.',
+      ephemeral: true,
+    })
+    return
+  }
+
+  if (!metadata.projectDirectory) {
+    await command.reply({
+      content:
+        'This channel is not configured with a project directory.\nUse `/add-project` to set up this channel.',
+      ephemeral: true,
+    })
+    return
+  }
+
+  const wasEnabled = getChannelWorktreesEnabled(textChannel.id)
+  setChannelWorktreesEnabled(textChannel.id, true)
+
+  worktreeSettingsLogger.log(`[ENABLE_WORKTREES] Enabled for channel ${textChannel.id}`)
+
+  await command.reply({
+    content: wasEnabled
+      ? `Worktrees are already enabled for this channel.\n\nNew sessions started from messages in **#${textChannel.name}** will automatically create git worktrees.`
+      : `Worktrees **enabled** for this channel.\n\nNew sessions started from messages in **#${textChannel.name}** will now automatically create git worktrees.\n\nUse \`/disable-worktrees\` to turn this off.`,
+    ephemeral: true,
+  })
+}
+
+/**
+ * Handle the /disable-worktrees slash command.
+ * Disables automatic worktree creation for new sessions in this channel.
+ */
+export async function handleDisableWorktreesCommand({
+  command,
+  appId,
+}: {
+  command: ChatInputCommandInteraction
+  appId: string
+}): Promise<void> {
+  worktreeSettingsLogger.log('[DISABLE_WORKTREES] Command called')
+
+  const channel = command.channel
+
+  if (!channel || channel.type !== ChannelType.GuildText) {
+    await command.reply({
+      content: 'This command can only be used in text channels (not threads).',
+      ephemeral: true,
+    })
+    return
+  }
+
+  const textChannel = channel as TextChannel
+  const metadata = getKimakiMetadata(textChannel)
+
+  if (metadata.channelAppId && metadata.channelAppId !== appId) {
+    await command.reply({
+      content: 'This channel is configured for a different bot.',
+      ephemeral: true,
+    })
+    return
+  }
+
+  if (!metadata.projectDirectory) {
+    await command.reply({
+      content:
+        'This channel is not configured with a project directory.\nUse `/add-project` to set up this channel.',
+      ephemeral: true,
+    })
+    return
+  }
+
+  const wasEnabled = getChannelWorktreesEnabled(textChannel.id)
+  setChannelWorktreesEnabled(textChannel.id, false)
+
+  worktreeSettingsLogger.log(`[DISABLE_WORKTREES] Disabled for channel ${textChannel.id}`)
+
+  await command.reply({
+    content: wasEnabled
+      ? `Worktrees **disabled** for this channel.\n\nNew sessions started from messages in **#${textChannel.name}** will use the main project directory.\n\nUse \`/enable-worktrees\` to turn this back on.`
+      : `Worktrees are already disabled for this channel.\n\nNew sessions will use the main project directory.`,
+    ephemeral: true,
+  })
+}