kimaki 0.4.0 → 0.4.1

package/dist/discordBot.js

@@ -907,17 +907,14 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
     const existingController = abortControllers.get(session.id);
     if (existingController) {
         voiceLogger.log(`[ABORT] Cancelling existing request for session: ${session.id}`);
-        existingController.abort('New request started');
+        existingController.abort(new Error('New request started'));
     }
     if (abortControllers.has(session.id)) {
-        abortControllers.get(session.id)?.abort('new reply');
+        abortControllers.get(session.id)?.abort(new Error('new reply'));
     }
-    const abortController = new AbortController();
-    // Store this controller for this session
-    abortControllers.set(session.id, abortController);
-    const eventsResult = await getClient().event.subscribe({
-        signal: abortController.signal,
-    });
+    const promptAbortController = new AbortController();
+    abortControllers.set(session.id, promptAbortController);
+    const eventsResult = await getClient().event.subscribe({});
     const events = eventsResult.stream;
     sessionLogger.log(`Subscribed to OpenCode events`);
     // Load existing part-message mappings from database
@@ -969,7 +966,7 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
         // Outer-scoped interval for typing notifications. Only one at a time.
         let typingInterval = null;
         function startTyping(thread) {
-            if (abortController.signal.aborted) {
+            if (promptAbortController.signal.aborted) {
                 discordLogger.log(`Not starting typing, already aborted`);
                 return () => { };
             }
@@ -991,8 +988,8 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
                 });
             }, 8000);
             // Only add listener if not already aborted
-            if (!abortController.signal.aborted) {
-                abortController.signal.addEventListener('abort', () => {
+            if (!promptAbortController.signal.aborted) {
+                promptAbortController.signal.addEventListener('abort', () => {
                     if (typingInterval) {
                         clearInterval(typingInterval);
                         typingInterval = null;
@@ -1064,7 +1061,7 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
                         }
                         // 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)
+                            if (promptAbortController.signal.aborted)
                                 return;
                             stopTyping = startTyping(thread);
                         }, 300);
@@ -1103,10 +1100,6 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
             }
         }
         catch (e) {
-            if (isAbortError(e, abortController.signal)) {
-                sessionLogger.log('AbortController aborted event handling (normal exit)');
-                return;
-            }
             sessionLogger.error(`Unexpected error in event handling code`, e);
             throw e;
         }
@@ -1139,14 +1132,14 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
                 sessionLogger.log(`Stopped typing for session`);
             }
             // Only send duration message if request was not aborted or was aborted with 'finished' reason
-            if (!abortController.signal.aborted ||
-                abortController.signal.reason === 'finished') {
+            if (!promptAbortController.signal.aborted ||
+                promptAbortController.signal.reason === 'finished') {
                 const sessionDuration = prettyMilliseconds(Date.now() - sessionStartTime);
                 await sendThreadMessage(thread, `_Completed in ${sessionDuration}_`);
                 sessionLogger.log(`DURATION: Session completed in ${sessionDuration}`);
             }
             else {
-                sessionLogger.log(`Session was aborted (reason: ${abortController.signal.reason}), skipping duration message`);
+                sessionLogger.log(`Session was aborted (reason: ${promptAbortController.signal.reason}), skipping duration message`);
             }
         }
     };
@@ -1159,9 +1152,9 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
             body: {
                 parts: [{ type: 'text', text: prompt }],
             },
-            signal: abortController.signal,
+            signal: promptAbortController.signal,
         });
-        abortController.abort('finished');
+        promptAbortController.abort(new Error('finished'));
         sessionLogger.log(`Successfully sent prompt, got response`);
         abortControllers.delete(session.id);
         // Update reaction to success
@@ -1179,8 +1172,8 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
     }
     catch (error) {
         sessionLogger.error(`ERROR: Failed to send prompt:`, error);
-        if (!isAbortError(error, abortController.signal)) {
-            abortController.abort('error');
+        if (!isAbortError(error, promptAbortController.signal)) {
+            promptAbortController.abort(new Error('error'));
             if (originalMessage) {
                 try {
                     await originalMessage.reactions.removeAll();

package/package.json

@@ -2,7 +2,18 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.0",
+  "version": "0.4.1",
+  "scripts": {
+    "dev": "pnpm tsc && tsx --env-file .env src/cli.ts",
+    "prepublishOnly": "pnpm tsc",
+    "dev:bun": "DEBUG=1 bun --env-file .env src/cli.ts",
+    "test": "tsx scripts/test-opencode.ts",
+    "watch": "tsx scripts/watch-session.ts",
+    "test:events": "tsx test-events.ts",
+    "pcm-to-mp3": "bun scripts/pcm-to-mp3",
+    "test:send": "tsx send-test-message.ts",
+    "register-commands": "tsx scripts/register-commands.ts"
+  },
   "repository": "https://github.com/remorses/kimaki",
   "bin": "bin.js",
   "files": [
@@ -43,15 +54,5 @@
     "string-dedent": "^3.0.2",
     "undici": "^7.16.0",
     "zod": "^4.0.17"
-  },
-  "scripts": {
-    "dev": "pnpm tsc && tsx --env-file .env src/cli.ts",
-    "dev:bun": "DEBUG=1 bun --env-file .env src/cli.ts",
-    "test": "tsx scripts/test-opencode.ts",
-    "watch": "tsx scripts/watch-session.ts",
-    "test:events": "tsx test-events.ts",
-    "pcm-to-mp3": "bun scripts/pcm-to-mp3",
-    "test:send": "tsx send-test-message.ts",
-    "register-commands": "tsx scripts/register-commands.ts"
   }
-}
+}

package/src/discordBot.ts

@@ -1169,19 +1169,16 @@ async function handleOpencodeSession(
     voiceLogger.log(
       `[ABORT] Cancelling existing request for session: ${session.id}`,
     )
-    existingController.abort('New request started')
+    existingController.abort(new Error('New request started'))
   }
 
   if (abortControllers.has(session.id)) {
-    abortControllers.get(session.id)?.abort('new reply')
+    abortControllers.get(session.id)?.abort(new Error('new reply'))
   }
-  const abortController = new AbortController()
-  // Store this controller for this session
-  abortControllers.set(session.id, abortController)
+  const promptAbortController = new AbortController()
+  abortControllers.set(session.id, promptAbortController)
 
-  const eventsResult = await getClient().event.subscribe({
-    signal: abortController.signal,
-  })
+  const eventsResult = await getClient().event.subscribe({})
   const events = eventsResult.stream
   sessionLogger.log(`Subscribed to OpenCode events`)
 
@@ -1253,7 +1250,7 @@ async function handleOpencodeSession(
     let typingInterval: NodeJS.Timeout | null = null
 
     function startTyping(thread: ThreadChannel): () => void {
-      if (abortController.signal.aborted) {
+      if (promptAbortController.signal.aborted) {
         discordLogger.log(`Not starting typing, already aborted`)
         return () => {}
       }
@@ -1279,8 +1276,8 @@ async function handleOpencodeSession(
       }, 8000)
 
       // Only add listener if not already aborted
-      if (!abortController.signal.aborted) {
-        abortController.signal.addEventListener(
+      if (!promptAbortController.signal.aborted) {
+        promptAbortController.signal.addEventListener(
           'abort',
           () => {
             if (typingInterval) {
@@ -1378,7 +1375,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
+              if (promptAbortController.signal.aborted) return
               stopTyping = startTyping(thread)
             }, 300)
           }
@@ -1418,12 +1415,6 @@ async function handleOpencodeSession(
         }
       }
     } catch (e) {
-      if (isAbortError(e, abortController.signal)) {
-        sessionLogger.log(
-          'AbortController aborted event handling (normal exit)',
-        )
-        return
-      }
       sessionLogger.error(`Unexpected error in event handling code`, e)
       throw e
     } finally {
@@ -1463,8 +1454,8 @@ async function handleOpencodeSession(
 
       // Only send duration message if request was not aborted or was aborted with 'finished' reason
       if (
-        !abortController.signal.aborted ||
-        abortController.signal.reason === 'finished'
+        !promptAbortController.signal.aborted ||
+        promptAbortController.signal.reason === 'finished'
       ) {
         const sessionDuration = prettyMilliseconds(
           Date.now() - sessionStartTime,
@@ -1473,7 +1464,7 @@ async function handleOpencodeSession(
         sessionLogger.log(`DURATION: Session completed in ${sessionDuration}`)
       } else {
         sessionLogger.log(
-          `Session was aborted (reason: ${abortController.signal.reason}), skipping duration message`,
+          `Session was aborted (reason: ${promptAbortController.signal.reason}), skipping duration message`,
         )
       }
     }
@@ -1492,9 +1483,9 @@ async function handleOpencodeSession(
       body: {
         parts: [{ type: 'text', text: prompt }],
       },
-      signal: abortController.signal,
+      signal: promptAbortController.signal,
     })
-    abortController.abort('finished')
+    promptAbortController.abort(new Error('finished'))
 
     sessionLogger.log(`Successfully sent prompt, got response`)
 
@@ -1515,8 +1506,8 @@ async function handleOpencodeSession(
   } catch (error) {
     sessionLogger.error(`ERROR: Failed to send prompt:`, error)
 
-    if (!isAbortError(error, abortController.signal)) {
-      abortController.abort('error')
+    if (!isAbortError(error, promptAbortController.signal)) {
+      promptAbortController.abort(new Error('error'))
 
       if (originalMessage) {
         try {