kimaki 0.4.44 → 0.4.45

package/src/channel-management.ts

@@ -4,8 +4,7 @@
 
 import { ChannelType, type CategoryChannel, type Guild, type TextChannel } from 'discord.js'
 import path from 'node:path'
-import { getDatabase } from './database.js'
-import { extractTagsArrays } from './xml.js'
+import { getDatabase, getChannelDirectory } from './database.js'
 
 export async function ensureKimakiCategory(
   guild: Guild,
@@ -83,7 +82,7 @@ export async function createProjectChannels({
     name: channelName,
     type: ChannelType.GuildText,
     parent: kimakiCategory,
-    topic: `<kimaki><directory>${projectDirectory}</directory><app>${appId}</app></kimaki>`,
+    // Channel configuration is stored in SQLite, not in the topic
   })
 
   const voiceChannel = await guild.channels.create({
@@ -128,25 +127,15 @@ export async function getChannelsWithDescriptions(guild: Guild): Promise<Channel
       const textChannel = channel as TextChannel
       const description = textChannel.topic || null
 
-      let kimakiDirectory: string | undefined
-      let kimakiApp: string | undefined
-
-      if (description) {
-        const extracted = extractTagsArrays({
-          xml: description,
-          tags: ['kimaki.directory', 'kimaki.app'],
-        })
-
-        kimakiDirectory = extracted['kimaki.directory']?.[0]?.trim()
-        kimakiApp = extracted['kimaki.app']?.[0]?.trim()
-      }
+      // Get channel config from database instead of parsing XML from topic
+      const channelConfig = getChannelDirectory(textChannel.id)
 
       channels.push({
         id: textChannel.id,
         name: textChannel.name,
         description,
-        kimakiDirectory,
-        kimakiApp,
+        kimakiDirectory: channelConfig?.directory,
+        kimakiApp: channelConfig?.appId || undefined,
       })
     })
 

package/src/cli.ts

@@ -21,6 +21,7 @@ import {
   getChannelsWithDescriptions,
   createDiscordClient,
   getDatabase,
+  getChannelDirectory,
   startDiscordBot,
   initializeOpencodeForDirectory,
   ensureKimakiCategory,
@@ -47,7 +48,6 @@ import { uploadFilesToDiscord } from './discord-utils.js'
 import { spawn, spawnSync, execSync, type ExecSyncOptions } from 'node:child_process'
 import http from 'node:http'
 import { setDataDir, getDataDir, getLockPort } from './config.js'
-import { extractTagsArrays } from './xml.js'
 import { sanitizeAgentName } from './commands/agent.js'
 
 const cliLogger = createLogger('CLI')
@@ -240,12 +240,12 @@ async function registerCommands({
       .toJSON(),
     new SlashCommandBuilder()
       .setName('new-worktree')
-      .setDescription('Create a new git worktree and start a session thread')
+      .setDescription('Create a new git worktree (in thread: uses thread name if no name given)')
       .addStringOption((option) => {
         option
           .setName('name')
-          .setDescription('Name for the worktree (will be formatted: lowercase, spaces to dashes)')
-          .setRequired(true)
+          .setDescription('Name for worktree (optional in threads - uses thread name)')
+          .setRequired(false)
 
         return option
       })
@@ -342,6 +342,21 @@ async function registerCommands({
       .setName('redo')
       .setDescription('Redo previously undone changes')
       .toJSON(),
+    new SlashCommandBuilder()
+      .setName('verbosity')
+      .setDescription('Set output verbosity for new sessions in this channel')
+      .addStringOption((option) => {
+        option
+          .setName('level')
+          .setDescription('Verbosity level')
+          .setRequired(true)
+          .addChoices(
+            { name: 'tools-and-text (default)', value: 'tools-and-text' },
+            { name: 'text-only', value: 'text-only' },
+          )
+        return option
+      })
+      .toJSON(),
   ]
 
   // Add user-defined commands with -cmd suffix
@@ -1367,25 +1382,17 @@ cli
         guild_id: string
       }
 
-      if (!channelData.topic) {
-        s.stop('Channel has no topic')
+      const channelConfig = getChannelDirectory(channelData.id)
+
+      if (!channelConfig) {
+        s.stop('Channel not configured')
         throw new Error(
-          `Channel #${channelData.name} has no topic. It must have a <kimaki.directory> tag.`,
+          `Channel #${channelData.name} is not configured with a project directory. Run the bot first to sync channel data.`,
         )
       }
 
-      const extracted = extractTagsArrays({
-        xml: channelData.topic,
-        tags: ['kimaki.directory', 'kimaki.app'],
-      })
-
-      const projectDirectory = extracted['kimaki.directory']?.[0]?.trim()
-      const channelAppId = extracted['kimaki.app']?.[0]?.trim()
-
-      if (!projectDirectory) {
-        s.stop('No kimaki.directory tag found')
-        throw new Error(`Channel #${channelData.name} has no <kimaki.directory> tag in topic.`)
-      }
+      const projectDirectory = channelConfig.directory
+      const channelAppId = channelConfig.appId || undefined
 
       // Verify app ID matches if both are present
       if (channelAppId && appId && channelAppId !== appId) {
@@ -1599,30 +1606,7 @@ cli
         }
 
         const s = spinner()
-        s.start('Checking for existing channel...')
-
-        // Check if channel already exists
-        try {
-          const db = getDatabase()
-          const existingChannel = db
-            .prepare(
-              'SELECT channel_id FROM channel_directories WHERE directory = ? AND channel_type = ? AND app_id = ?',
-            )
-            .get(absolutePath, 'text', appId) as { channel_id: string } | undefined
-
-          if (existingChannel) {
-            s.stop('Channel already exists')
-            note(
-              `Channel already exists for this directory.\n\nChannel: <#${existingChannel.channel_id}>\nDirectory: ${absolutePath}`,
-              '⚠️  Already Exists',
-            )
-            process.exit(0)
-          }
-        } catch {
-          // Database might not exist, continue to create
-        }
-
-        s.message('Connecting to Discord...')
+        s.start('Connecting to Discord...')
         const client = await createDiscordClient()
 
         await new Promise<void>((resolve, reject) => {
@@ -1638,10 +1622,14 @@ cli
         // Find guild
         let guild: Guild
         if (options.guild) {
-          const foundGuild = client.guilds.cache.get(options.guild)
+          // Get raw guild ID from argv to avoid cac's number coercion losing precision on large IDs
+          const guildArgIndex = process.argv.findIndex((arg) => arg === '-g' || arg === '--guild')
+          const rawGuildArg = guildArgIndex >= 0 ? process.argv[guildArgIndex + 1] : undefined
+          const guildId = rawGuildArg || String(options.guild)
+          const foundGuild = client.guilds.cache.get(guildId)
           if (!foundGuild) {
             s.stop('Guild not found')
-            cliLogger.error(`Guild not found: ${options.guild}`)
+            cliLogger.error(`Guild not found: ${guildId}`)
             client.destroy()
             process.exit(EXIT_NO_RESTART)
           }
@@ -1686,6 +1674,36 @@ cli
           }
         }
 
+        // Check if channel already exists in this guild
+        s.message('Checking for existing channel...')
+        try {
+          const db = getDatabase()
+          const existingChannels = db
+            .prepare(
+              'SELECT channel_id FROM channel_directories WHERE directory = ? AND channel_type = ? AND app_id = ?',
+            )
+            .all(absolutePath, 'text', appId) as { channel_id: string }[]
+
+          for (const existingChannel of existingChannels) {
+            try {
+              const ch = await client.channels.fetch(existingChannel.channel_id)
+              if (ch && 'guild' in ch && ch.guild?.id === guild.id) {
+                s.stop('Channel already exists')
+                note(
+                  `Channel already exists for this directory in ${guild.name}.\n\nChannel: <#${existingChannel.channel_id}>\nDirectory: ${absolutePath}`,
+                  '⚠️  Already Exists',
+                )
+                client.destroy()
+                process.exit(0)
+              }
+            } catch {
+              // Channel might be deleted, continue checking
+            }
+          }
+        } catch {
+          // Database might not exist, continue to create
+        }
+
         s.message(`Creating channels in ${guild.name}...`)
 
         const { textChannelId, voiceChannelId, channelName } = await createProjectChannels({

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

@@ -46,7 +46,7 @@ export async function handleEnableWorktreesCommand({
   if (!metadata.projectDirectory) {
     await command.reply({
       content:
-        'This channel is not configured with a project directory.\nAdd a `<kimaki.directory>/path/to/project</kimaki.directory>` tag to the channel description.',
+        'This channel is not configured with a project directory.\nUse `/add-project` to set up this channel.',
       ephemeral: true,
     })
     return
@@ -102,7 +102,7 @@ export async function handleDisableWorktreesCommand({
   if (!metadata.projectDirectory) {
     await command.reply({
       content:
-        'This channel is not configured with a project directory.\nAdd a `<kimaki.directory>/path/to/project</kimaki.directory>` tag to the channel description.',
+        'This channel is not configured with a project directory.\nUse `/add-project` to set up this channel.',
       ephemeral: true,
     })
     return