kimaki 0.4.19 → 0.4.21

package/dist/discordBot.js

@@ -43,6 +43,32 @@ The user cannot see bash tool outputs. If there is important information in bash
 
 Your current OpenCode session ID is: ${sessionId}
 
+## permissions
+
+Only users with these Discord permissions can send messages to the bot:
+- Server Owner
+- Administrator permission
+- Manage Server permission
+- "Kimaki" role (case-insensitive)
+
+## changing the model
+
+To change the model used by OpenCode, edit the project's \`opencode.json\` config file and set the \`model\` field:
+
+\`\`\`json
+{
+  "model": "anthropic/claude-sonnet-4-20250514"
+}
+\`\`\`
+
+Examples:
+- \`"anthropic/claude-sonnet-4-20250514"\` - Claude Sonnet 4
+- \`"anthropic/claude-opus-4-20250514"\` - Claude Opus 4
+- \`"openai/gpt-4o"\` - GPT-4o
+- \`"google/gemini-2.5-pro"\` - Gemini 2.5 Pro
+
+Format is \`provider/model-name\`. You can also set \`small_model\` for tasks like title generation.
+
 ## uploading files to discord
 
 To upload files to the Discord thread (images, screenshots, long files that would clutter the chat), run:
@@ -585,7 +611,6 @@ async function processVoiceAttachment({ message, thread, projectDirectory, isNew
     if (!audioAttachment)
         return null;
     voiceLogger.log(`Detected audio attachment: ${audioAttachment.name} (${audioAttachment.contentType})`);
-    await message.react('⏳');
     await sendThreadMessage(thread, '🎤 Transcribing voice message...');
     const audioResponse = await fetch(audioAttachment.url);
     const audioBuffer = Buffer.from(await audioResponse.arrayBuffer());
@@ -940,30 +965,45 @@ function getToolSummaryText(part) {
     if (part.type !== 'tool')
         return '';
     if (part.tool === 'edit') {
+        const filePath = part.state.input?.filePath || '';
         const newString = part.state.input?.newString || '';
         const oldString = part.state.input?.oldString || '';
         const added = newString.split('\n').length;
         const removed = oldString.split('\n').length;
-        return `(+${added}-${removed})`;
+        const fileName = filePath.split('/').pop() || '';
+        return fileName ? `*${fileName}* (+${added}-${removed})` : `(+${added}-${removed})`;
     }
     if (part.tool === 'write') {
+        const filePath = part.state.input?.filePath || '';
         const content = part.state.input?.content || '';
         const lines = content.split('\n').length;
-        return `(${lines} line${lines === 1 ? '' : 's'})`;
+        const fileName = filePath.split('/').pop() || '';
+        return fileName ? `*${fileName}* (${lines} line${lines === 1 ? '' : 's'})` : `(${lines} line${lines === 1 ? '' : 's'})`;
     }
     if (part.tool === 'webfetch') {
         const url = part.state.input?.url || '';
         const urlWithoutProtocol = url.replace(/^https?:\/\//, '');
-        return urlWithoutProtocol ? `(${urlWithoutProtocol})` : '';
+        return urlWithoutProtocol ? `*${urlWithoutProtocol}*` : '';
     }
-    if (part.tool === 'bash' ||
-        part.tool === 'read' ||
-        part.tool === 'list' ||
-        part.tool === 'glob' ||
-        part.tool === 'grep' ||
-        part.tool === 'task' ||
-        part.tool === 'todoread' ||
-        part.tool === 'todowrite') {
+    if (part.tool === 'read') {
+        const filePath = part.state.input?.filePath || '';
+        const fileName = filePath.split('/').pop() || '';
+        return fileName ? `*${fileName}*` : '';
+    }
+    if (part.tool === 'list') {
+        const path = part.state.input?.path || '';
+        const dirName = path.split('/').pop() || path;
+        return dirName ? `*${dirName}*` : '';
+    }
+    if (part.tool === 'glob') {
+        const pattern = part.state.input?.pattern || '';
+        return pattern ? `*${pattern}*` : '';
+    }
+    if (part.tool === 'grep') {
+        const pattern = part.state.input?.pattern || '';
+        return pattern ? `*${pattern}*` : '';
+    }
+    if (part.tool === 'bash' || part.tool === 'task' || part.tool === 'todoread' || part.tool === 'todowrite') {
         return '';
     }
     if (!part.state.input)
@@ -1036,17 +1076,21 @@ function formatPart(part) {
         }
         else if (part.tool === 'bash') {
             const command = part.state.input?.command || '';
+            const description = part.state.input?.description || '';
             const isSingleLine = !command.includes('\n');
             const hasBackticks = command.includes('`');
-            if (isSingleLine && command.length <= 120 && !hasBackticks) {
+            if (isSingleLine && !hasBackticks && command.length <= 50) {
                 toolTitle = `\`${command}\``;
             }
-            else {
-                toolTitle = stateTitle ? `*${stateTitle}*` : '';
+            else if (description) {
+                toolTitle = `_${description}_`;
+            }
+            else if (stateTitle) {
+                toolTitle = `_${stateTitle}_`;
             }
         }
         else if (stateTitle) {
-            toolTitle = `*${stateTitle}*`;
+            toolTitle = `_${stateTitle}_`;
         }
         const icon = part.state.status === 'error' ? '⨯' : '◼︎';
         return `${icon} ${part.tool} ${toolTitle} ${summaryText}`;
@@ -1074,16 +1118,6 @@ async function handleOpencodeSession({ prompt, thread, projectDirectory, origina
     voiceLogger.log(`[OPENCODE SESSION] Starting for thread ${thread.id} with prompt: "${prompt.slice(0, 50)}${prompt.length > 50 ? '...' : ''}"`);
     // Track session start time
     const sessionStartTime = Date.now();
-    // Add processing reaction to original message
-    if (originalMessage) {
-        try {
-            await originalMessage.react('⏳');
-            discordLogger.log(`Added processing reaction to message`);
-        }
-        catch (e) {
-            discordLogger.log(`Could not add processing reaction:`, e);
-        }
-    }
     // Use default directory if not specified
     const directory = projectDirectory || process.cwd();
     sessionLogger.log(`Using directory: ${directory}`);
@@ -1134,39 +1168,70 @@ async function handleOpencodeSession({ prompt, thread, projectDirectory, origina
         voiceLogger.log(`[ABORT] Cancelling existing request for session: ${session.id}`);
         existingController.abort(new Error('New request started'));
     }
-    if (abortControllers.has(session.id)) {
-        abortControllers.get(session.id)?.abort(new Error('new reply'));
-    }
     const abortController = new AbortController();
-    // Store this controller for this session
     abortControllers.set(session.id, abortController);
+    if (existingController) {
+        await new Promise((resolve) => { setTimeout(resolve, 200); });
+        if (abortController.signal.aborted) {
+            sessionLogger.log(`[DEBOUNCE] Request was superseded during wait, exiting`);
+            return;
+        }
+    }
+    if (abortController.signal.aborted) {
+        sessionLogger.log(`[DEBOUNCE] Aborted before subscribe, exiting`);
+        return;
+    }
     const eventsResult = await getClient().event.subscribe({
         signal: abortController.signal,
     });
+    if (abortController.signal.aborted) {
+        sessionLogger.log(`[DEBOUNCE] Aborted during subscribe, exiting`);
+        return;
+    }
     const events = eventsResult.stream;
     sessionLogger.log(`Subscribed to OpenCode events`);
-    // Load existing part-message mappings from database
-    const partIdToMessage = new Map();
-    const existingParts = getDatabase()
-        .prepare('SELECT part_id, message_id FROM part_messages WHERE thread_id = ?')
-        .all(thread.id);
-    // Pre-populate map with existing messages
-    for (const row of existingParts) {
-        try {
-            const message = await thread.messages.fetch(row.message_id);
-            if (message) {
-                partIdToMessage.set(row.part_id, message);
-            }
-        }
-        catch (error) {
-            voiceLogger.log(`Could not fetch message ${row.message_id} for part ${row.part_id}`);
-        }
-    }
+    const sentPartIds = new Set(getDatabase()
+        .prepare('SELECT part_id FROM part_messages WHERE thread_id = ?')
+        .all(thread.id)
+        .map((row) => row.part_id));
     let currentParts = [];
     let stopTyping = null;
     let usedModel;
     let usedProviderID;
     let tokensUsedInSession = 0;
+    let typingInterval = null;
+    function startTyping() {
+        if (abortController.signal.aborted) {
+            discordLogger.log(`Not starting typing, already aborted`);
+            return () => { };
+        }
+        if (typingInterval) {
+            clearInterval(typingInterval);
+            typingInterval = null;
+        }
+        thread.sendTyping().catch((e) => {
+            discordLogger.log(`Failed to send initial typing: ${e}`);
+        });
+        typingInterval = setInterval(() => {
+            thread.sendTyping().catch((e) => {
+                discordLogger.log(`Failed to send periodic typing: ${e}`);
+            });
+        }, 8000);
+        if (!abortController.signal.aborted) {
+            abortController.signal.addEventListener('abort', () => {
+                if (typingInterval) {
+                    clearInterval(typingInterval);
+                    typingInterval = null;
+                }
+            }, { once: true });
+        }
+        return () => {
+            if (typingInterval) {
+                clearInterval(typingInterval);
+                typingInterval = null;
+            }
+        };
+    }
     const sendPartMessage = async (part) => {
         const content = formatPart(part) + '\n\n';
         if (!content.trim() || content.length === 0) {
@@ -1174,12 +1239,12 @@ async function handleOpencodeSession({ prompt, thread, projectDirectory, origina
             return;
         }
         // Skip if already sent
-        if (partIdToMessage.has(part.id)) {
+        if (sentPartIds.has(part.id)) {
             return;
         }
         try {
             const firstMessage = await sendThreadMessage(thread, content);
-            partIdToMessage.set(part.id, firstMessage);
+            sentPartIds.add(part.id);
             // Store part-message mapping in database
             getDatabase()
                 .prepare('INSERT OR REPLACE INTO part_messages (part_id, message_id, thread_id) VALUES (?, ?, ?)')
@@ -1190,48 +1255,6 @@ async function handleOpencodeSession({ prompt, thread, projectDirectory, origina
         }
     };
     const eventHandler = async () => {
-        // Local typing function for this session
-        // Outer-scoped interval for typing notifications. Only one at a time.
-        let typingInterval = null;
-        function startTyping(thread) {
-            if (abortController.signal.aborted) {
-                discordLogger.log(`Not starting typing, already aborted`);
-                return () => { };
-            }
-            // Clear any previous typing interval
-            if (typingInterval) {
-                clearInterval(typingInterval);
-                typingInterval = null;
-            }
-            // Send initial typing
-            thread.sendTyping().catch((e) => {
-                discordLogger.log(`Failed to send initial typing: ${e}`);
-            });
-            // Set up interval to send typing every 8 seconds
-            typingInterval = setInterval(() => {
-                thread.sendTyping().catch((e) => {
-                    discordLogger.log(`Failed to send periodic typing: ${e}`);
-                });
-            }, 8000);
-            // Only add listener if not already aborted
-            if (!abortController.signal.aborted) {
-                abortController.signal.addEventListener('abort', () => {
-                    if (typingInterval) {
-                        clearInterval(typingInterval);
-                        typingInterval = null;
-                    }
-                }, {
-                    once: true,
-                });
-            }
-            // Return stop function
-            return () => {
-                if (typingInterval) {
-                    clearInterval(typingInterval);
-                    typingInterval = null;
-                }
-            };
-        }
         try {
             let assistantMessageId;
             for await (const event of events) {
@@ -1269,12 +1292,16 @@ async function handleOpencodeSession({ prompt, thread, projectDirectory, origina
                     }
                     // Start typing on step-start
                     if (part.type === 'step-start') {
-                        stopTyping = startTyping(thread);
+                        stopTyping = startTyping();
                     }
                     // Send tool parts immediately when they start running
                     if (part.type === 'tool' && part.state.status === 'running') {
                         await sendPartMessage(part);
                     }
+                    // Send reasoning parts immediately (shows "◼︎ thinking" indicator early)
+                    if (part.type === 'reasoning') {
+                        await sendPartMessage(part);
+                    }
                     // Check if this is a step-finish part
                     if (part.type === 'step-finish') {
                         // Send all parts accumulated so far to Discord
@@ -1288,7 +1315,7 @@ async function handleOpencodeSession({ prompt, thread, projectDirectory, origina
                         setTimeout(() => {
                             if (abortController.signal.aborted)
                                 return;
-                            stopTyping = startTyping(thread);
+                            stopTyping = startTyping();
                         }, 300);
                     }
                 }
@@ -1361,7 +1388,7 @@ async function handleOpencodeSession({ prompt, thread, projectDirectory, origina
         finally {
             // Send any remaining parts that weren't sent
             for (const part of currentParts) {
-                if (!partIdToMessage.has(part.id)) {
+                if (!sentPartIds.has(part.id)) {
                     try {
                         await sendPartMessage(part);
                     }
@@ -1403,8 +1430,12 @@ async function handleOpencodeSession({ prompt, thread, projectDirectory, origina
         }
     };
     try {
-        // Start the event handler
         const eventHandlerPromise = eventHandler();
+        if (abortController.signal.aborted) {
+            sessionLogger.log(`[DEBOUNCE] Aborted before prompt, exiting`);
+            return;
+        }
+        stopTyping = startTyping();
         let response;
         if (parsedCommand?.isCommand) {
             sessionLogger.log(`[COMMAND] Sending command /${parsedCommand.command} to session ${session.id} with args: "${parsedCommand.arguments.slice(0, 100)}${parsedCommand.arguments.length > 100 ? '...' : ''}"`);
@@ -1571,11 +1602,13 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                     return;
                 }
             }
-            // Check if user is authoritative (server owner or has admin permissions)
+            // Check if user is authoritative (server owner, admin, manage server, or has Kimaki role)
             if (message.guild && message.member) {
                 const isOwner = message.member.id === message.guild.ownerId;
                 const isAdmin = message.member.permissions.has(PermissionsBitField.Flags.Administrator);
-                if (!isOwner && !isAdmin) {
+                const canManageServer = message.member.permissions.has(PermissionsBitField.Flags.ManageGuild);
+                const hasKimakiRole = message.member.roles.cache.some((role) => role.name.toLowerCase() === 'kimaki');
+                if (!isOwner && !isAdmin && !canManageServer && !hasKimakiRole) {
                     return;
                 }
             }
@@ -2488,12 +2521,13 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
             const member = newState.member || oldState.member;
             if (!member)
                 return;
-            // Check if user is admin or server owner
+            // Check if user is admin, server owner, can manage server, or has Kimaki role
             const guild = newState.guild || oldState.guild;
             const isOwner = member.id === guild.ownerId;
             const isAdmin = member.permissions.has(PermissionsBitField.Flags.Administrator);
-            if (!isOwner && !isAdmin) {
-                // Not an admin user, ignore
+            const canManageServer = member.permissions.has(PermissionsBitField.Flags.ManageGuild);
+            const hasKimakiRole = member.roles.cache.some((role) => role.name.toLowerCase() === 'kimaki');
+            if (!isOwner && !isAdmin && !canManageServer && !hasKimakiRole) {
                 return;
             }
             // Handle admin leaving voice channel
@@ -2512,7 +2546,9 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                         if (m.id === member.id || m.user.bot)
                             return false;
                         return (m.id === guild.ownerId ||
-                            m.permissions.has(PermissionsBitField.Flags.Administrator));
+                            m.permissions.has(PermissionsBitField.Flags.Administrator) ||
+                            m.permissions.has(PermissionsBitField.Flags.ManageGuild) ||
+                            m.roles.cache.some((role) => role.name.toLowerCase() === 'kimaki'));
                     });
                     if (!hasOtherAdmins) {
                         voiceLogger.log(`No other admins in channel, bot leaving voice channel in guild: ${guild.name}`);
@@ -2542,7 +2578,9 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                             if (m.id === member.id || m.user.bot)
                                 return false;
                             return (m.id === guild.ownerId ||
-                                m.permissions.has(PermissionsBitField.Flags.Administrator));
+                                m.permissions.has(PermissionsBitField.Flags.Administrator) ||
+                                m.permissions.has(PermissionsBitField.Flags.ManageGuild) ||
+                                m.roles.cache.some((role) => role.name.toLowerCase() === 'kimaki'));
                         });
                         if (!hasOtherAdmins) {
                             voiceLogger.log(`Following admin to new channel: ${newState.channel?.name}`);

package/package.json

@@ -2,7 +2,7 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.19",
+  "version": "0.4.21",
   "scripts": {
     "dev": "tsx --env-file .env src/cli.ts",
     "prepublishOnly": "pnpm tsc",
@@ -21,7 +21,7 @@
     "bin.js"
   ],
   "devDependencies": {
-    "@opencode-ai/plugin": "^1.0.169",
+    "@opencode-ai/plugin": "^1.0.193",
     "@types/better-sqlite3": "^7.6.13",
     "@types/bun": "latest",
     "@types/js-yaml": "^4.0.9",
@@ -35,7 +35,7 @@
     "@discordjs/opus": "^0.10.0",
     "@discordjs/voice": "^0.19.0",
     "@google/genai": "^1.34.0",
-    "@opencode-ai/sdk": "^1.0.169",
+    "@opencode-ai/sdk": "^1.0.193",
     "@purinton/resampler": "^1.0.4",
     "@snazzah/davey": "^0.1.6",
     "ai": "^5.0.114",

package/src/discordBot.ts

@@ -61,7 +61,6 @@ type ParsedCommand = {
 } | {
   isCommand: false
 }
-
 function parseSlashCommand(text: string): ParsedCommand {
   const trimmed = text.trim()
   if (!trimmed.startsWith('/')) {
@@ -84,6 +83,32 @@ The user cannot see bash tool outputs. If there is important information in bash
 
 Your current OpenCode session ID is: ${sessionId}
 
+## permissions
+
+Only users with these Discord permissions can send messages to the bot:
+- Server Owner
+- Administrator permission
+- Manage Server permission
+- "Kimaki" role (case-insensitive)
+
+## changing the model
+
+To change the model used by OpenCode, edit the project's \`opencode.json\` config file and set the \`model\` field:
+
+\`\`\`json
+{
+  "model": "anthropic/claude-sonnet-4-20250514"
+}
+\`\`\`
+
+Examples:
+- \`"anthropic/claude-sonnet-4-20250514"\` - Claude Sonnet 4
+- \`"anthropic/claude-opus-4-20250514"\` - Claude Opus 4
+- \`"openai/gpt-4o"\` - GPT-4o
+- \`"google/gemini-2.5-pro"\` - Gemini 2.5 Pro
+
+Format is \`provider/model-name\`. You can also set \`small_model\` for tasks like title generation.
+
 ## uploading files to discord
 
 To upload files to the Discord thread (images, screenshots, long files that would clutter the chat), run:
@@ -805,7 +830,6 @@ async function processVoiceAttachment({
     `Detected audio attachment: ${audioAttachment.name} (${audioAttachment.contentType})`,
   )
 
-  await message.react('⏳')
   await sendThreadMessage(thread, '🎤 Transcribing voice message...')
 
   const audioResponse = await fetch(audioAttachment.url)
@@ -1259,35 +1283,52 @@ function getToolSummaryText(part: Part): string {
   if (part.type !== 'tool') return ''
 
   if (part.tool === 'edit') {
+    const filePath = (part.state.input?.filePath as string) || ''
     const newString = (part.state.input?.newString as string) || ''
     const oldString = (part.state.input?.oldString as string) || ''
     const added = newString.split('\n').length
     const removed = oldString.split('\n').length
-    return `(+${added}-${removed})`
+    const fileName = filePath.split('/').pop() || ''
+    return fileName ? `*${fileName}* (+${added}-${removed})` : `(+${added}-${removed})`
   }
 
   if (part.tool === 'write') {
+    const filePath = (part.state.input?.filePath as string) || ''
     const content = (part.state.input?.content as string) || ''
     const lines = content.split('\n').length
-    return `(${lines} line${lines === 1 ? '' : 's'})`
+    const fileName = filePath.split('/').pop() || ''
+    return fileName ? `*${fileName}* (${lines} line${lines === 1 ? '' : 's'})` : `(${lines} line${lines === 1 ? '' : 's'})`
   }
 
   if (part.tool === 'webfetch') {
     const url = (part.state.input?.url as string) || ''
     const urlWithoutProtocol = url.replace(/^https?:\/\//, '')
-    return urlWithoutProtocol ? `(${urlWithoutProtocol})` : ''
+    return urlWithoutProtocol ? `*${urlWithoutProtocol}*` : ''
   }
 
-  if (
-    part.tool === 'bash' ||
-    part.tool === 'read' ||
-    part.tool === 'list' ||
-    part.tool === 'glob' ||
-    part.tool === 'grep' ||
-    part.tool === 'task' ||
-    part.tool === 'todoread' ||
-    part.tool === 'todowrite'
-  ) {
+  if (part.tool === 'read') {
+    const filePath = (part.state.input?.filePath as string) || ''
+    const fileName = filePath.split('/').pop() || ''
+    return fileName ? `*${fileName}*` : ''
+  }
+
+  if (part.tool === 'list') {
+    const path = (part.state.input?.path as string) || ''
+    const dirName = path.split('/').pop() || path
+    return dirName ? `*${dirName}*` : ''
+  }
+
+  if (part.tool === 'glob') {
+    const pattern = (part.state.input?.pattern as string) || ''
+    return pattern ? `*${pattern}*` : ''
+  }
+
+  if (part.tool === 'grep') {
+    const pattern = (part.state.input?.pattern as string) || ''
+    return pattern ? `*${pattern}*` : ''
+  }
+
+  if (part.tool === 'bash' || part.tool === 'task' || part.tool === 'todoread' || part.tool === 'todowrite') {
     return ''
   }
 
@@ -1372,15 +1413,18 @@ function formatPart(part: Part): string {
       toolTitle = part.state.error || 'error'
     } else if (part.tool === 'bash') {
       const command = (part.state.input?.command as string) || ''
+      const description = (part.state.input?.description as string) || ''
       const isSingleLine = !command.includes('\n')
       const hasBackticks = command.includes('`')
-      if (isSingleLine && command.length <= 120 && !hasBackticks) {
+      if (isSingleLine && !hasBackticks && command.length <= 50) {
         toolTitle = `\`${command}\``
-      } else {
-        toolTitle = stateTitle ? `*${stateTitle}*` : ''
+      } else if (description) {
+        toolTitle = `_${description}_`
+      } else if (stateTitle) {
+        toolTitle = `_${stateTitle}_`
       }
     } else if (stateTitle) {
-      toolTitle = `*${stateTitle}*`
+      toolTitle = `_${stateTitle}_`
     }
 
     const icon = part.state.status === 'error' ? '⨯' : '◼︎'
@@ -1430,16 +1474,6 @@ async function handleOpencodeSession({
   // Track session start time
   const sessionStartTime = Date.now()
 
-  // Add processing reaction to original message
-  if (originalMessage) {
-    try {
-      await originalMessage.react('⏳')
-      discordLogger.log(`Added processing reaction to message`)
-    } catch (e) {
-      discordLogger.log(`Could not add processing reaction:`, e)
-    }
-  }
-
   // Use default directory if not specified
   const directory = projectDirectory || process.cwd()
   sessionLogger.log(`Using directory: ${directory}`)
@@ -1507,40 +1541,40 @@ async function handleOpencodeSession({
     existingController.abort(new Error('New request started'))
   }
 
-  if (abortControllers.has(session.id)) {
-    abortControllers.get(session.id)?.abort(new Error('new reply'))
-  }
   const abortController = new AbortController()
-  // Store this controller for this session
   abortControllers.set(session.id, abortController)
 
+  if (existingController) {
+    await new Promise((resolve) => { setTimeout(resolve, 200) })
+    if (abortController.signal.aborted) {
+      sessionLogger.log(`[DEBOUNCE] Request was superseded during wait, exiting`)
+      return
+    }
+  }
+
+  if (abortController.signal.aborted) {
+    sessionLogger.log(`[DEBOUNCE] Aborted before subscribe, exiting`)
+    return
+  }
+
   const eventsResult = await getClient().event.subscribe({
     signal: abortController.signal,
   })
+
+  if (abortController.signal.aborted) {
+    sessionLogger.log(`[DEBOUNCE] Aborted during subscribe, exiting`)
+    return
+  }
+
   const events = eventsResult.stream
   sessionLogger.log(`Subscribed to OpenCode events`)
 
-  // Load existing part-message mappings from database
-  const partIdToMessage = new Map<string, Message>()
-  const existingParts = getDatabase()
-    .prepare(
-      'SELECT part_id, message_id FROM part_messages WHERE thread_id = ?',
-    )
-    .all(thread.id) as { part_id: string; message_id: string }[]
-
-  // Pre-populate map with existing messages
-  for (const row of existingParts) {
-    try {
-      const message = await thread.messages.fetch(row.message_id)
-      if (message) {
-        partIdToMessage.set(row.part_id, message)
-      }
-    } catch (error) {
-      voiceLogger.log(
-        `Could not fetch message ${row.message_id} for part ${row.part_id}`,
-      )
-    }
-  }
+  const sentPartIds = new Set<string>(
+    (getDatabase()
+      .prepare('SELECT part_id FROM part_messages WHERE thread_id = ?')
+      .all(thread.id) as { part_id: string }[])
+      .map((row) => row.part_id)
+  )
 
   let currentParts: Part[] = []
   let stopTyping: (() => void) | null = null
@@ -1548,6 +1582,49 @@ async function handleOpencodeSession({
   let usedProviderID: string | undefined
   let tokensUsedInSession = 0
 
+  let typingInterval: NodeJS.Timeout | null = null
+
+  function startTyping(): () => void {
+    if (abortController.signal.aborted) {
+      discordLogger.log(`Not starting typing, already aborted`)
+      return () => {}
+    }
+    if (typingInterval) {
+      clearInterval(typingInterval)
+      typingInterval = null
+    }
+
+    thread.sendTyping().catch((e) => {
+      discordLogger.log(`Failed to send initial typing: ${e}`)
+    })
+
+    typingInterval = setInterval(() => {
+      thread.sendTyping().catch((e) => {
+        discordLogger.log(`Failed to send periodic typing: ${e}`)
+      })
+    }, 8000)
+
+    if (!abortController.signal.aborted) {
+      abortController.signal.addEventListener(
+        'abort',
+        () => {
+          if (typingInterval) {
+            clearInterval(typingInterval)
+            typingInterval = null
+          }
+        },
+        { once: true },
+      )
+    }
+
+    return () => {
+      if (typingInterval) {
+        clearInterval(typingInterval)
+        typingInterval = null
+      }
+    }
+  }
+
   const sendPartMessage = async (part: Part) => {
     const content = formatPart(part) + '\n\n'
     if (!content.trim() || content.length === 0) {
@@ -1556,13 +1633,13 @@ async function handleOpencodeSession({
     }
 
     // Skip if already sent
-    if (partIdToMessage.has(part.id)) {
+    if (sentPartIds.has(part.id)) {
       return
     }
 
     try {
       const firstMessage = await sendThreadMessage(thread, content)
-      partIdToMessage.set(part.id, firstMessage)
+      sentPartIds.add(part.id)
 
       // Store part-message mapping in database
       getDatabase()
@@ -1576,58 +1653,6 @@ async function handleOpencodeSession({
   }
 
   const eventHandler = async () => {
-    // Local typing function for this session
-    // Outer-scoped interval for typing notifications. Only one at a time.
-    let typingInterval: NodeJS.Timeout | null = null
-
-    function startTyping(thread: ThreadChannel): () => void {
-      if (abortController.signal.aborted) {
-        discordLogger.log(`Not starting typing, already aborted`)
-        return () => {}
-      }
-      // Clear any previous typing interval
-      if (typingInterval) {
-        clearInterval(typingInterval)
-        typingInterval = null
-      }
-
-      // Send initial typing
-      thread.sendTyping().catch((e) => {
-        discordLogger.log(`Failed to send initial typing: ${e}`)
-      })
-
-      // Set up interval to send typing every 8 seconds
-      typingInterval = setInterval(() => {
-        thread.sendTyping().catch((e) => {
-          discordLogger.log(`Failed to send periodic typing: ${e}`)
-        })
-      }, 8000)
-
-      // Only add listener if not already aborted
-      if (!abortController.signal.aborted) {
-        abortController.signal.addEventListener(
-          'abort',
-          () => {
-            if (typingInterval) {
-              clearInterval(typingInterval)
-              typingInterval = null
-            }
-          },
-          {
-            once: true,
-          },
-        )
-      }
-
-      // Return stop function
-      return () => {
-        if (typingInterval) {
-          clearInterval(typingInterval)
-          typingInterval = null
-        }
-      }
-    }
-
     try {
       let assistantMessageId: string | undefined
 
@@ -1678,7 +1703,7 @@ async function handleOpencodeSession({
 
           // Start typing on step-start
           if (part.type === 'step-start') {
-            stopTyping = startTyping(thread)
+            stopTyping = startTyping()
           }
 
           // Send tool parts immediately when they start running
@@ -1686,6 +1711,11 @@ async function handleOpencodeSession({
             await sendPartMessage(part)
           }
 
+          // Send reasoning parts immediately (shows "◼︎ thinking" indicator early)
+          if (part.type === 'reasoning') {
+            await sendPartMessage(part)
+          }
+
           // Check if this is a step-finish part
           if (part.type === 'step-finish') {
 
@@ -1699,7 +1729,7 @@ async function handleOpencodeSession({
             // start typing in a moment, so that if the session finished, because step-finish is at the end of the message, we do not show typing status
             setTimeout(() => {
               if (abortController.signal.aborted) return
-              stopTyping = startTyping(thread)
+              stopTyping = startTyping()
             }, 300)
           }
         } else if (event.type === 'session.error') {
@@ -1790,7 +1820,7 @@ async function handleOpencodeSession({
     } finally {
       // Send any remaining parts that weren't sent
       for (const part of currentParts) {
-        if (!partIdToMessage.has(part.id)) {
+        if (!sentPartIds.has(part.id)) {
           try {
             await sendPartMessage(part)
           } catch (error) {
@@ -1841,9 +1871,15 @@ async function handleOpencodeSession({
   }
 
   try {
-    // Start the event handler
     const eventHandlerPromise = eventHandler()
 
+    if (abortController.signal.aborted) {
+      sessionLogger.log(`[DEBOUNCE] Aborted before prompt, exiting`)
+      return
+    }
+
+    stopTyping = startTyping()
+
     let response: { data?: unknown; error?: unknown; response: Response }
     if (parsedCommand?.isCommand) {
       sessionLogger.log(
@@ -2063,14 +2099,20 @@ export async function startDiscordBot({
         }
       }
 
-      // Check if user is authoritative (server owner or has admin permissions)
+      // Check if user is authoritative (server owner, admin, manage server, or has Kimaki role)
       if (message.guild && message.member) {
         const isOwner = message.member.id === message.guild.ownerId
         const isAdmin = message.member.permissions.has(
           PermissionsBitField.Flags.Administrator,
         )
+        const canManageServer = message.member.permissions.has(
+          PermissionsBitField.Flags.ManageGuild,
+        )
+        const hasKimakiRole = message.member.roles.cache.some(
+          (role) => role.name.toLowerCase() === 'kimaki',
+        )
 
-        if (!isOwner && !isAdmin) {
+        if (!isOwner && !isAdmin && !canManageServer && !hasKimakiRole) {
           return
         }
       }
@@ -3259,15 +3301,20 @@ export async function startDiscordBot({
       const member = newState.member || oldState.member
       if (!member) return
 
-      // Check if user is admin or server owner
+      // Check if user is admin, server owner, can manage server, or has Kimaki role
       const guild = newState.guild || oldState.guild
       const isOwner = member.id === guild.ownerId
       const isAdmin = member.permissions.has(
         PermissionsBitField.Flags.Administrator,
       )
+      const canManageServer = member.permissions.has(
+        PermissionsBitField.Flags.ManageGuild,
+      )
+      const hasKimakiRole = member.roles.cache.some(
+        (role) => role.name.toLowerCase() === 'kimaki',
+      )
 
-      if (!isOwner && !isAdmin) {
-        // Not an admin user, ignore
+      if (!isOwner && !isAdmin && !canManageServer && !hasKimakiRole) {
         return
       }
 
@@ -3293,7 +3340,9 @@ export async function startDiscordBot({
             if (m.id === member.id || m.user.bot) return false
             return (
               m.id === guild.ownerId ||
-              m.permissions.has(PermissionsBitField.Flags.Administrator)
+              m.permissions.has(PermissionsBitField.Flags.Administrator) ||
+              m.permissions.has(PermissionsBitField.Flags.ManageGuild) ||
+              m.roles.cache.some((role) => role.name.toLowerCase() === 'kimaki')
             )
           })
 
@@ -3338,7 +3387,9 @@ export async function startDiscordBot({
               if (m.id === member.id || m.user.bot) return false
               return (
                 m.id === guild.ownerId ||
-                m.permissions.has(PermissionsBitField.Flags.Administrator)
+                m.permissions.has(PermissionsBitField.Flags.Administrator) ||
+                m.permissions.has(PermissionsBitField.Flags.ManageGuild) ||
+                m.roles.cache.some((role) => role.name.toLowerCase() === 'kimaki')
               )
             })