kimaki 0.4.45 → 0.4.46

package/dist/commands/create-new-project.js

@@ -63,6 +63,8 @@ export async function handleCreateNewProjectCommand({ command, appId, }) {
             autoArchiveDuration: 1440,
             reason: 'New project session',
         });
+        // Add user to thread so it appears in their sidebar
+        await thread.members.add(command.user.id);
         await handleOpencodeSession({
             prompt: 'The project was just initialized. Say hi and ask what the user wants to build.',
             thread,

package/dist/commands/fork.js

@@ -162,6 +162,8 @@ export async function handleForkSelectMenu(interaction) {
             autoArchiveDuration: ThreadAutoArchiveDuration.OneDay,
             reason: `Forked from session ${sessionId}`,
         });
+        // Add user to thread so it appears in their sidebar
+        await thread.members.add(interaction.user.id);
         getDatabase()
             .prepare('INSERT OR REPLACE INTO thread_sessions (thread_id, session_id) VALUES (?, ?)')
             .run(thread.id, forkedSession.id);

package/dist/commands/resume.js

@@ -51,6 +51,8 @@ export async function handleResumeCommand({ command, appId }) {
             autoArchiveDuration: ThreadAutoArchiveDuration.OneDay,
             reason: `Resuming session ${sessionId}`,
         });
+        // Add user to thread so it appears in their sidebar
+        await thread.members.add(command.user.id);
         getDatabase()
             .prepare('INSERT OR REPLACE INTO thread_sessions (thread_id, session_id) VALUES (?, ?)')
             .run(thread.id, sessionId);

package/dist/commands/session.js

@@ -58,6 +58,8 @@ export async function handleSessionCommand({ command, appId }) {
             autoArchiveDuration: 1440,
             reason: 'OpenCode session',
         });
+        // Add user to thread so it appears in their sidebar
+        await thread.members.add(command.user.id);
         await command.editReply(`Created new session in ${thread.toString()}`);
         await handleOpencodeSession({
             prompt: fullPrompt,

package/dist/commands/user-command.js

@@ -105,6 +105,8 @@ export const handleUserCommand = async ({ command, appId }) => {
                 autoArchiveDuration: 1440,
                 reason: `OpenCode command: ${commandName}`,
             });
+            // Add user to thread so it appears in their sidebar
+            await newThread.members.add(command.user.id);
             await command.editReply(`Started /${commandName} in ${newThread.toString()}`);
             await handleOpencodeSession({
                 prompt: '', // Not used when command is set

package/dist/commands/worktree.js

@@ -167,6 +167,8 @@ export async function handleNewWorktreeCommand({ command, appId, }) {
                 autoArchiveDuration: 1440,
                 reason: 'Worktree session',
             });
+            // Add user to thread so it appears in their sidebar
+            await thread.members.add(command.user.id);
             return { thread, starterMessage };
         },
         catch: (e) => new WorktreeError('Failed to create thread', { cause: e }),

package/dist/discord-bot.js

@@ -309,6 +309,8 @@ export async function startDiscordBot({ token, appId, discordClient, useWorktree
                     autoArchiveDuration: ThreadAutoArchiveDuration.OneDay,
                     reason: 'Start Claude session',
                 });
+                // Add user to thread so it appears in their sidebar
+                await thread.members.add(message.author.id);
                 discordLogger.log(`Created thread "${thread.name}" (${thread.id})`);
                 // Create worktree if worktrees are enabled (CLI flag OR channel setting)
                 let sessionDirectory = projectDirectory;

package/dist/session-handler.js

@@ -29,6 +29,7 @@ function buildPermissionDedupeKey({ permission, directory, }) {
 // 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();
+const activeEventHandlers = new Map();
 export function addToQueue({ threadId, message, }) {
     const queue = messageQueue.get(threadId) || [];
     queue.push(message);
@@ -176,6 +177,15 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
     if (existingController) {
         voiceLogger.log(`[ABORT] Cancelling existing request for session: ${session.id}`);
         existingController.abort(new Error('New request started'));
+        const abortResult = await errore.tryAsync(() => {
+            return getClient().session.abort({
+                path: { id: session.id },
+                query: { directory: sdkDirectory },
+            });
+        });
+        if (abortResult instanceof Error) {
+            sessionLogger.log(`[ABORT] Server abort failed (may be already done):`, abortResult);
+        }
     }
     // Auto-reject ALL pending permissions for this thread
     const threadPermissions = pendingPermissions.get(thread.id);
@@ -230,6 +240,16 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
         sessionLogger.log(`[DEBOUNCE] Aborted before subscribe, exiting`);
         return;
     }
+    const previousHandler = activeEventHandlers.get(thread.id);
+    if (previousHandler) {
+        sessionLogger.log(`[EVENT] Waiting for previous handler to finish`);
+        await Promise.race([
+            previousHandler,
+            new Promise((resolve) => {
+                setTimeout(resolve, 1000);
+            }),
+        ]);
+    }
     // Use v2 client for event subscription (has proper types for question.asked events)
     const clientV2 = getOpencodeClientV2(directory);
     if (!clientV2) {
@@ -254,6 +274,7 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
     let lastDisplayedContextPercentage = 0;
     let modelContextLimit;
     let assistantMessageId;
+    let handlerPromise = null;
     let typingInterval = null;
     function startTyping() {
         if (abortController.signal.aborted) {
@@ -509,6 +530,10 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
             }
         };
         const handleSubtaskPart = async (part, subtaskInfo) => {
+            // In text-only mode, skip all subtask output (they're tool-related)
+            if (verbosity === 'text-only') {
+                return;
+            }
             if (part.type === 'step-start' || part.type === 'step-finish') {
                 return;
             }
@@ -840,7 +865,13 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
         }
     };
     const promptResult = await errore.tryAsync(async () => {
-        const eventHandlerPromise = eventHandler();
+        const newHandlerPromise = eventHandler().finally(() => {
+            if (activeEventHandlers.get(thread.id) === newHandlerPromise) {
+                activeEventHandlers.delete(thread.id);
+            }
+        });
+        activeEventHandlers.set(thread.id, newHandlerPromise);
+        handlerPromise = newHandlerPromise;
         if (abortController.signal.aborted) {
             sessionLogger.log(`[DEBOUNCE] Aborted before prompt, exiting`);
             return;
@@ -940,6 +971,14 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
         }
         return { sessionID: session.id, result: response.data, port };
     });
+    if (handlerPromise) {
+        await Promise.race([
+            handlerPromise,
+            new Promise((resolve) => {
+                setTimeout(resolve, 1000);
+            }),
+        ]);
+    }
     if (!errore.isError(promptResult)) {
         return promptResult;
     }

package/package.json

@@ -2,7 +2,7 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.45",
+  "version": "0.4.46",
   "repository": "https://github.com/remorses/kimaki",
   "bin": "bin.js",
   "files": [

package/src/commands/create-new-project.ts

@@ -88,6 +88,9 @@ export async function handleCreateNewProjectCommand({
       reason: 'New project session',
     })
 
+    // Add user to thread so it appears in their sidebar
+    await thread.members.add(command.user.id)
+
     await handleOpencodeSession({
       prompt: 'The project was just initialized. Say hi and ask what the user wants to build.',
       thread,

package/src/commands/fork.ts

@@ -215,6 +215,9 @@ export async function handleForkSelectMenu(
       reason: `Forked from session ${sessionId}`,
     })
 
+    // Add user to thread so it appears in their sidebar
+    await thread.members.add(interaction.user.id)
+
     getDatabase()
       .prepare('INSERT OR REPLACE INTO thread_sessions (thread_id, session_id) VALUES (?, ?)')
       .run(thread.id, forkedSession.id)

package/src/commands/resume.ts

@@ -73,6 +73,9 @@ export async function handleResumeCommand({ command, appId }: CommandContext): P
       reason: `Resuming session ${sessionId}`,
     })
 
+    // Add user to thread so it appears in their sidebar
+    await thread.members.add(command.user.id)
+
     getDatabase()
       .prepare('INSERT OR REPLACE INTO thread_sessions (thread_id, session_id) VALUES (?, ?)')
       .run(thread.id, sessionId)

package/src/commands/session.ts

@@ -75,6 +75,9 @@ export async function handleSessionCommand({ command, appId }: CommandContext):
       reason: 'OpenCode session',
     })
 
+    // Add user to thread so it appears in their sidebar
+    await thread.members.add(command.user.id)
+
     await command.editReply(`Created new session in ${thread.toString()}`)
 
     await handleOpencodeSession({

package/src/commands/user-command.ts

@@ -136,6 +136,9 @@ export const handleUserCommand: CommandHandler = async ({ command, appId }: Comm
         reason: `OpenCode command: ${commandName}`,
       })
 
+      // Add user to thread so it appears in their sidebar
+      await newThread.members.add(command.user.id)
+
       await command.editReply(`Started /${commandName} in ${newThread.toString()}`)
 
       await handleOpencodeSession({

package/src/commands/worktree.ts

@@ -228,6 +228,9 @@ export async function handleNewWorktreeCommand({
         reason: 'Worktree session',
       })
 
+      // Add user to thread so it appears in their sidebar
+      await thread.members.add(command.user.id)
+
       return { thread, starterMessage }
     },
     catch: (e) => new WorktreeError('Failed to create thread', { cause: e }),

package/src/discord-bot.ts

@@ -425,6 +425,9 @@ export async function startDiscordBot({
           reason: 'Start Claude session',
         })
 
+        // Add user to thread so it appears in their sidebar
+        await thread.members.add(message.author.id)
+
         discordLogger.log(`Created thread "${thread.name}" (${thread.id})`)
 
         // Create worktree if worktrees are enabled (CLI flag OR channel setting)

package/src/session-handler.ts

@@ -86,6 +86,8 @@ export type QueuedMessage = {
 // Key is threadId, value is array of queued messages
 export const messageQueue = new Map<string, QueuedMessage[]>()
 
+const activeEventHandlers = new Map<string, Promise<void>>()
+
 export function addToQueue({
   threadId,
   message,
@@ -301,6 +303,15 @@ export async function handleOpencodeSession({
   if (existingController) {
     voiceLogger.log(`[ABORT] Cancelling existing request for session: ${session.id}`)
     existingController.abort(new Error('New request started'))
+    const abortResult = await errore.tryAsync(() => {
+      return getClient().session.abort({
+        path: { id: session.id },
+        query: { directory: sdkDirectory },
+      })
+    })
+    if (abortResult instanceof Error) {
+      sessionLogger.log(`[ABORT] Server abort failed (may be already done):`, abortResult)
+    }
   }
 
   // Auto-reject ALL pending permissions for this thread
@@ -363,6 +374,17 @@ export async function handleOpencodeSession({
     return
   }
 
+  const previousHandler = activeEventHandlers.get(thread.id)
+  if (previousHandler) {
+    sessionLogger.log(`[EVENT] Waiting for previous handler to finish`)
+    await Promise.race([
+      previousHandler,
+      new Promise((resolve) => {
+        setTimeout(resolve, 1000)
+      }),
+    ])
+  }
+
   // Use v2 client for event subscription (has proper types for question.asked events)
   const clientV2 = getOpencodeClientV2(directory)
   if (!clientV2) {
@@ -398,6 +420,7 @@ export async function handleOpencodeSession({
   let lastDisplayedContextPercentage = 0
   let modelContextLimit: number | undefined
   let assistantMessageId: string | undefined
+  let handlerPromise: Promise<void> | null = null
 
   let typingInterval: NodeJS.Timeout | null = null
 
@@ -726,6 +749,10 @@ export async function handleOpencodeSession({
       part: Part,
       subtaskInfo: { label: string; assistantMessageId?: string },
     ) => {
+      // In text-only mode, skip all subtask output (they're tool-related)
+      if (verbosity === 'text-only') {
+        return
+      }
       if (part.type === 'step-start' || part.type === 'step-finish') {
         return
       }
@@ -1151,7 +1178,13 @@ export async function handleOpencodeSession({
 
   const promptResult: Error | { sessionID: string; result: any; port?: number } | undefined =
     await errore.tryAsync(async () => {
-      const eventHandlerPromise = eventHandler()
+      const newHandlerPromise = eventHandler().finally(() => {
+        if (activeEventHandlers.get(thread.id) === newHandlerPromise) {
+          activeEventHandlers.delete(thread.id)
+        }
+      })
+      activeEventHandlers.set(thread.id, newHandlerPromise)
+      handlerPromise = newHandlerPromise
 
     if (abortController.signal.aborted) {
       sessionLogger.log(`[DEBOUNCE] Aborted before prompt, exiting`)
@@ -1273,6 +1306,15 @@ export async function handleOpencodeSession({
     return { sessionID: session.id, result: response.data, port }
   })
 
+  if (handlerPromise) {
+    await Promise.race([
+      handlerPromise,
+      new Promise((resolve) => {
+        setTimeout(resolve, 1000)
+      }),
+    ])
+  }
+
   if (!errore.isError(promptResult)) {
     return promptResult
   }