kimaki 0.4.24 → 0.4.25

package/src/logger.ts

@@ -1,3 +1,7 @@
+// Prefixed logging utility using @clack/prompts.
+// Creates loggers with consistent prefixes for different subsystems
+// (DISCORD, VOICE, SESSION, etc.) for easier debugging.
+
 import { log } from '@clack/prompts'
 
 export function createLogger(prefix: string) {

package/src/markdown.ts

@@ -1,3 +1,7 @@
+// Session-to-markdown renderer for sharing.
+// Generates shareable markdown from OpenCode sessions, formatting
+// user messages, assistant responses, tool calls, and reasoning blocks.
+
 import type { OpencodeClient } from '@opencode-ai/sdk'
 import * as yaml from 'js-yaml'
 import { formatDateTime } from './utils.js'

package/src/message-formatting.ts

@@ -1,9 +1,45 @@
-import type { Part, FilePartInput } from '@opencode-ai/sdk'
+// OpenCode message part formatting for Discord.
+// Converts SDK message parts (text, tools, reasoning) to Discord-friendly format,
+// handles file attachments, and provides tool summary generation.
+
+import type { Part, FilePartInput, SessionMessagesResponse } from '@opencode-ai/sdk'
 import type { Message } from 'discord.js'
 import { createLogger } from './logger.js'
 
 const logger = createLogger('FORMATTING')
 
+/**
+ * Collects and formats the last N assistant parts from session messages.
+ * Used by both /resume and /fork to show recent assistant context.
+ */
+export function collectLastAssistantParts({
+  messages,
+  limit = 30,
+}: {
+  messages: SessionMessagesResponse
+  limit?: number
+}): { partIds: string[]; content: string; skippedCount: number } {
+  const allAssistantParts: { id: string; content: string }[] = []
+
+  for (const message of messages) {
+    if (message.info.role === 'assistant') {
+      for (const part of message.parts) {
+        const content = formatPart(part)
+        if (content.trim()) {
+          allAssistantParts.push({ id: part.id, content: content.trimEnd() })
+        }
+      }
+    }
+  }
+
+  const partsToRender = allAssistantParts.slice(-limit)
+  const partIds = partsToRender.map((p) => p.id)
+  const content = partsToRender.map((p) => p.content).join('\n')
+  const skippedCount = allAssistantParts.length - partsToRender.length
+
+  return { partIds, content, skippedCount }
+}
+
 export const TEXT_MIME_TYPES = [
   'text/',
   'application/json',
@@ -136,7 +172,7 @@ export function getToolSummaryText(part: Part): string {
     .map(([key, value]) => {
       if (value === null || value === undefined) return null
       const stringValue = typeof value === 'string' ? value : JSON.stringify(value)
-      const truncatedValue = stringValue.length > 300 ? stringValue.slice(0, 300) + '…' : stringValue
+      const truncatedValue = stringValue.length > 50 ? stringValue.slice(0, 50) + '…' : stringValue
       return `${key}: ${truncatedValue}`
     })
     .filter(Boolean)
@@ -163,12 +199,13 @@ export function formatTodoList(part: Part): string {
 
 export function formatPart(part: Part): string {
   if (part.type === 'text') {
-    return part.text || ''
+    if (!part.text?.trim()) return ''
+    return `⬥ ${part.text}`
   }
 
   if (part.type === 'reasoning') {
     if (!part.text?.trim()) return ''
-    return `◼︎ thinking`
+    return `┣ thinking`
   }
 
   if (part.type === 'file') {
@@ -180,11 +217,11 @@ export function formatPart(part: Part): string {
   }
 
   if (part.type === 'agent') {
-    return `◼︎ agent ${part.id}`
+    return `┣ agent ${part.id}`
   }
 
   if (part.type === 'snapshot') {
-    return `◼︎ snapshot ${part.snapshot}`
+    return `┣ snapshot ${part.snapshot}`
   }
 
   if (part.type === 'tool') {
@@ -218,7 +255,15 @@ export function formatPart(part: Part): string {
       toolTitle = `_${stateTitle}_`
     }
 
-    const icon = part.state.status === 'error' ? '⨯' : '◼︎'
+    const icon = (() => {
+      if (part.state.status === 'error') {
+        return '⨯'
+      }
+      if (part.tool === 'edit' || part.tool === 'write') {
+        return '◼︎'
+      }
+      return '┣'
+    })()
     return `${icon} ${part.tool} ${toolTitle} ${summaryText}`
   }
 

package/src/opencode.ts

@@ -1,3 +1,7 @@
+// OpenCode server process manager.
+// Spawns and maintains OpenCode API servers per project directory,
+// handles automatic restarts on failure, and provides typed SDK clients.
+
 import { spawn, type ChildProcess } from 'node:child_process'
 import net from 'node:net'
 import {

package/src/session-handler.ts

@@ -1,9 +1,13 @@
+// OpenCode session lifecycle manager.
+// Creates, maintains, and sends prompts to OpenCode sessions from Discord threads.
+// Handles streaming events, permissions, abort signals, and message queuing.
+
 import type { Part, FilePartInput, Permission } from '@opencode-ai/sdk'
 import type { Message, ThreadChannel } from 'discord.js'
 import prettyMilliseconds from 'pretty-ms'
 import { getDatabase, getSessionModel, getChannelModel } from './database.js'
 import { initializeOpencodeForDirectory, getOpencodeServers } from './opencode.js'
-import { sendThreadMessage } from './discord-utils.js'
+import { sendThreadMessage, NOTIFY_MESSAGE_FLAGS } from './discord-utils.js'
 import { formatPart } from './message-formatting.js'
 import { getOpencodeSystemMessage } from './system-message.js'
 import { createLogger } from './logger.js'
@@ -42,6 +46,39 @@ export const pendingPermissions = new Map<
   { permission: Permission; messageId: string; directory: string }
 >()
 
+export type QueuedMessage = {
+  prompt: string
+  userId: string
+  username: string
+  queuedAt: number
+  images?: FilePartInput[]
+}
+
+// Queue of messages waiting to be sent after current response finishes
+// Key is threadId, value is array of queued messages
+export const messageQueue = new Map<string, QueuedMessage[]>()
+
+export function addToQueue({
+  threadId,
+  message,
+}: {
+  threadId: string
+  message: QueuedMessage
+}): number {
+  const queue = messageQueue.get(threadId) || []
+  queue.push(message)
+  messageQueue.set(threadId, queue)
+  return queue.length
+}
+
+export function getQueueLength(threadId: string): number {
+  return messageQueue.get(threadId)?.length || 0
+}
+
+export function clearQueue(threadId: string): void {
+  messageQueue.delete(threadId)
+}
+
 export async function handleOpencodeSession({
   prompt,
   thread,
@@ -296,7 +333,7 @@ export async function handleOpencodeSession({
                 const thresholdCrossed = Math.floor(currentPercentage / 10) * 10
                 if (thresholdCrossed > lastDisplayedContextPercentage && thresholdCrossed >= 10) {
                   lastDisplayedContextPercentage = thresholdCrossed
-                  await sendThreadMessage(thread, `◼︎ context usage ${currentPercentage}%`)
+                  await sendThreadMessage(thread, `⬥ context usage ${currentPercentage}%`)
                 }
               }
             }
@@ -467,8 +504,38 @@ export async function handleOpencodeSession({
           sessionLogger.error('Failed to fetch provider info for context percentage:', e)
         }
 
-        await sendThreadMessage(thread, `_Completed in ${sessionDuration}${contextInfo}_${attachCommand}${modelInfo}`)
+        await sendThreadMessage(thread, `_Completed in ${sessionDuration}${contextInfo}_${attachCommand}${modelInfo}`, { flags: NOTIFY_MESSAGE_FLAGS })
         sessionLogger.log(`DURATION: Session completed in ${sessionDuration}, port ${port}, model ${usedModel}, tokens ${tokensUsedInSession}`)
+
+        // Process queued messages after completion
+        const queue = messageQueue.get(thread.id)
+        if (queue && queue.length > 0) {
+          const nextMessage = queue.shift()!
+          if (queue.length === 0) {
+            messageQueue.delete(thread.id)
+          }
+
+          sessionLogger.log(`[QUEUE] Processing queued message from ${nextMessage.username}`)
+
+          // Show that queued message is being sent
+          await sendThreadMessage(thread, `» **${nextMessage.username}:** ${nextMessage.prompt.slice(0, 150)}${nextMessage.prompt.length > 150 ? '...' : ''}`)
+
+          // Send the queued message as a new prompt (recursive call)
+          // Use setImmediate to avoid blocking and allow this finally to complete
+          setImmediate(() => {
+            handleOpencodeSession({
+              prompt: nextMessage.prompt,
+              thread,
+              projectDirectory,
+              images: nextMessage.images,
+              channelId,
+            }).catch(async (e) => {
+              sessionLogger.error(`[QUEUE] Failed to process queued message:`, e)
+              const errorMsg = e instanceof Error ? e.message : String(e)
+              await sendThreadMessage(thread, `✗ Queued message failed: ${errorMsg.slice(0, 200)}`)
+            })
+          })
+        }
       } else {
         sessionLogger.log(
           `Session was aborted (reason: ${abortController.signal.reason}), skipping duration message`,

package/src/system-message.ts

@@ -1,3 +1,7 @@
+// OpenCode system prompt generator.
+// Creates the system message injected into every OpenCode session,
+// including Discord-specific formatting rules, diff commands, and permissions info.
+
 export function getOpencodeSystemMessage({ sessionId }: { sessionId: string }) {
   return `
 The user is reading your messages from inside Discord, via kimaki.xyz
@@ -66,6 +70,19 @@ the max heading level is 3, so do not use ####
 
 headings are discouraged anyway. instead try to use bold text for titles which renders more nicely in Discord
 
+## capitalization
+
+write casually like a discord user. never capitalize the initials of phrases or acronyms in your messages. use all lowercase instead.
+
+examples:
+- write "api" not "API"
+- write "url" not "URL"
+- write "json" not "JSON"
+- write "cli" not "CLI"
+- write "sdk" not "SDK"
+
+this makes your messages blend in naturally with how people actually type on discord.
+
 ## tables
 
 discord does NOT support markdown gfm tables.

package/src/tools.ts

@@ -1,3 +1,7 @@
+// Voice assistant tool definitions for the GenAI worker.
+// Provides tools for managing OpenCode sessions (create, submit, abort),
+// listing chats, searching files, and reading session messages.
+
 import { tool } from 'ai'
 import { z } from 'zod'
 import { spawn, type ChildProcess } from 'node:child_process'

package/src/utils.ts

@@ -1,3 +1,7 @@
+// General utility functions for the bot.
+// Includes Discord OAuth URL generation, array deduplication,
+// abort error detection, and date/time formatting helpers.
+
 import { PermissionsBitField } from 'discord.js'
 
 type GenerateInstallUrlOptions = {

package/src/voice-handler.ts

@@ -1,3 +1,7 @@
+// Discord voice channel connection and audio stream handler.
+// Manages joining/leaving voice channels, captures user audio, resamples to 16kHz,
+// and routes audio to the GenAI worker for real-time voice assistant interactions.
+
 import {
   VoiceConnectionStatus,
   EndBehaviorType,

package/src/voice.ts

@@ -1,3 +1,7 @@
+// Audio transcription service using Google Gemini.
+// Transcribes voice messages with code-aware context, using grep/glob tools
+// to verify technical terms, filenames, and function names in the codebase.
+
 import {
   GoogleGenAI,
   Type,

package/src/worker-types.ts

@@ -1,3 +1,7 @@
+// Type definitions for worker thread message passing.
+// Defines the protocol between main thread and GenAI worker for
+// audio streaming, tool calls, and session lifecycle management.
+
 import type { Tool as AITool } from 'ai'
 
 // Messages sent from main thread to worker

package/src/xml.ts

@@ -1,3 +1,7 @@
+// XML/HTML tag content extractor.
+// Parses XML-like tags from strings (e.g., channel topics) to extract
+// Kimaki configuration like directory paths and app IDs.
+
 import { DomHandler, Parser, ElementType } from 'htmlparser2'
 import type { ChildNode, Element, Text } from 'domhandler'
 import { createLogger } from './logger.js'

package/README.md

@@ -1,48 +0,0 @@
-# Kimaki Discord Bot
-
-A Discord bot that integrates OpenCode coding sessions with Discord channels and voice.
-
-## Installation
-
-```bash
-npm install -g kimaki
-```
-
-## Setup
-
-Run the interactive setup:
-
-```bash
-kimaki
-```
-
-This will guide you through:
-1. Creating a Discord application at https://discord.com/developers/applications
-2. Getting your bot token
-3. Installing the bot to your Discord server
-4. Creating channels for your OpenCode projects
-
-## Commands
-
-### Start the bot
-
-```bash
-kimaki
-```
-
-## Discord Slash Commands
-
-Once the bot is running, you can use these commands in Discord:
-
-- `/session <prompt>` - Start a new OpenCode session
-- `/resume <session>` - Resume an existing session
-- `/add-project <project>` - Add a new project to Discord
-- `/accept` - Accept a permission request
-- `/accept-always` - Accept and auto-approve similar requests
-- `/reject` - Reject a permission request
-
-## Voice Support
-
-Join a voice channel that has an associated project directory, and the bot will join with Jarvis-like voice interaction powered by Gemini.
-
-Requires a Gemini API key (prompted during setup).