kimaki 0.4.44 → 0.4.45

package/dist/channel-management.js

@@ -3,8 +3,7 @@
 // extracts channel metadata from topic tags, and ensures category structure.
 import { ChannelType } 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, botName) {
     // Skip appending bot name if it's already "kimaki" to avoid "Kimaki kimaki"
     const isKimakiBot = botName?.toLowerCase() === 'kimaki';
@@ -53,7 +52,7 @@ export async function createProjectChannels({ guild, projectDirectory, appId, bo
         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({
         name: channelName,
@@ -79,22 +78,14 @@ export async function getChannelsWithDescriptions(guild) {
         .forEach((channel) => {
         const textChannel = channel;
         const description = textChannel.topic || null;
-        let kimakiDirectory;
-        let kimakiApp;
-        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,
         });
     });
     return channels;

package/dist/cli.js

@@ -5,7 +5,7 @@
 import { cac } from 'cac';
 import { intro, outro, text, password, note, cancel, isCancel, confirm, log, multiselect, spinner, } from '@clack/prompts';
 import { deduplicateByKey, generateBotInstallUrl, abbreviatePath } from './utils.js';
-import { getChannelsWithDescriptions, createDiscordClient, getDatabase, startDiscordBot, initializeOpencodeForDirectory, ensureKimakiCategory, createProjectChannels, } from './discord-bot.js';
+import { getChannelsWithDescriptions, createDiscordClient, getDatabase, getChannelDirectory, startDiscordBot, initializeOpencodeForDirectory, ensureKimakiCategory, createProjectChannels, } from './discord-bot.js';
 import { Events, ChannelType, REST, Routes, SlashCommandBuilder, AttachmentBuilder, } from 'discord.js';
 import path from 'node:path';
 import fs from 'node:fs';
@@ -15,7 +15,6 @@ import { uploadFilesToDiscord } from './discord-utils.js';
 import { spawn, spawnSync, execSync } 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');
 const cli = cac('kimaki');
@@ -161,12 +160,12 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
             .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;
         })
             .toJSON(),
@@ -258,6 +257,18 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
             .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
     for (const cmd of userCommands) {
@@ -1021,20 +1032,13 @@ cli
             throw new Error(`Discord API error: ${channelResponse.status} - ${error}`);
         }
         const channelData = (await channelResponse.json());
-        if (!channelData.topic) {
-            s.stop('Channel has no topic');
-            throw new Error(`Channel #${channelData.name} has no topic. It must have a <kimaki.directory> tag.`);
-        }
-        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 channelConfig = getChannelDirectory(channelData.id);
+        if (!channelConfig) {
+            s.stop('Channel not configured');
+            throw new Error(`Channel #${channelData.name} is not configured with a project directory. Run the bot first to sync channel data.`);
         }
+        const projectDirectory = channelConfig.directory;
+        const channelAppId = channelConfig.appId || undefined;
         // Verify app ID matches if both are present
         if (channelAppId && appId && channelAppId !== appId) {
             s.stop('Channel belongs to different bot');
@@ -1199,23 +1203,7 @@ cli
             process.exit(EXIT_NO_RESTART);
         }
         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);
-            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((resolve, reject) => {
             client.once(Events.ClientReady, () => {
@@ -1228,10 +1216,14 @@ cli
         // Find guild
         let 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);
             }
@@ -1276,6 +1268,31 @@ cli
                 guild = firstGuild;
             }
         }
+        // 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);
+            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({
             guild,

package/dist/commands/permissions.js

@@ -17,6 +17,7 @@ export async function showPermissionDropdown({ thread, permission, directory, })
     const contextHash = crypto.randomBytes(8).toString('hex');
     const context = {
         permission,
+        requestIds: [permission.id],
         directory,
         thread,
         contextHash,
@@ -80,10 +81,13 @@ export async function handlePermissionSelectMenu(interaction) {
         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);
         // Update message: show result and remove dropdown
         const resultText = (() => {
@@ -104,7 +108,7 @@ export async function handlePermissionSelectMenu(interaction) {
                 resultText,
             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);
@@ -114,6 +118,18 @@ export async function handlePermissionSelectMenu(interaction) {
         });
     }
 }
+export function addPermissionRequestToContext({ contextHash, requestId, }) {
+    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/dist/commands/queue.js

@@ -41,7 +41,11 @@ export async function handleQueueCommand({ command }) {
         return;
     }
     // 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
         const textChannel = await resolveTextChannel(channel);

package/dist/commands/resume.js

@@ -1,10 +1,9 @@
 // /resume command - Resume an existing OpenCode session.
 import { ChannelType, ThreadAutoArchiveDuration, } from 'discord.js';
 import fs from 'node:fs';
-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';
@@ -18,16 +17,9 @@ export async function handleResumeCommand({ command, appId }) {
         return;
     }
     const textChannel = channel;
-    let projectDirectory;
-    let channelAppId;
-    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');
         return;
@@ -102,12 +94,12 @@ export async function handleResumeAutocomplete({ interaction, appId, }) {
     if (interaction.channel) {
         const textChannel = await resolveTextChannel(interaction.channel);
         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;
         }
     }
     if (!projectDirectory) {

package/dist/commands/session.js

@@ -2,10 +2,9 @@
 import { ChannelType } from 'discord.js';
 import fs from 'node:fs';
 import path from 'node:path';
-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';
@@ -21,16 +20,9 @@ export async function handleSessionCommand({ command, appId }) {
         return;
     }
     const textChannel = channel;
-    let projectDirectory;
-    let channelAppId;
-    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');
         return;
@@ -83,22 +75,14 @@ export async function handleSessionCommand({ command, appId }) {
 async function handleAgentAutocomplete({ interaction, appId }) {
     const focusedValue = interaction.options.getFocused();
     let projectDirectory;
-    if (interaction.channel) {
-        const channel = interaction.channel;
-        if (channel.type === ChannelType.GuildText) {
-            const textChannel = channel;
-            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;
         }
     }
     if (!projectDirectory) {
@@ -150,22 +134,14 @@ export async function handleSessionAutocomplete({ interaction, appId, }) {
         .filter((f) => f);
     const currentQuery = (parts[parts.length - 1] || '').trim();
     let projectDirectory;
-    if (interaction.channel) {
-        const channel = interaction.channel;
-        if (channel.type === ChannelType.GuildText) {
-            const textChannel = channel;
-            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;
         }
     }
     if (!projectDirectory) {

package/dist/commands/user-command.js

@@ -1,11 +1,10 @@
 // User-defined OpenCode command handler.
 // Handles slash commands that map to user-configured commands in opencode.json.
 import { ChannelType } 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');
 export const handleUserCommand = async ({ command, appId }) => {
@@ -45,26 +44,18 @@ export const handleUserCommand = async ({ command, appId }) => {
             });
             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;
-        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) {
         await command.reply({

package/dist/commands/verbosity.js

@@ -0,0 +1,53 @@
+// /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 } from 'discord.js';
+import { getChannelVerbosity, setChannelVerbosity } 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, }) {
+    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.parentId || channel.id;
+        }
+        return channel.id;
+    })();
+    const level = command.options.getString('level', true);
+    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/dist/commands/worktree-settings.js

@@ -31,7 +31,7 @@ export async function handleEnableWorktreesCommand({ command, appId, }) {
     }
     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.',
+            content: 'This channel is not configured with a project directory.\nUse `/add-project` to set up this channel.',
             ephemeral: true,
         });
         return;
@@ -71,7 +71,7 @@ export async function handleDisableWorktreesCommand({ command, appId, }) {
     }
     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.',
+            content: 'This channel is not configured with a project directory.\nUse `/add-project` to set up this channel.',
             ephemeral: true,
         });
         return;