kimaki 0.4.1 → 0.4.2

package/dist/discordBot.js

@@ -912,9 +912,12 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
     if (abortControllers.has(session.id)) {
         abortControllers.get(session.id)?.abort(new Error('new reply'));
     }
-    const promptAbortController = new AbortController();
-    abortControllers.set(session.id, promptAbortController);
-    const eventsResult = await getClient().event.subscribe({});
+    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 events = eventsResult.stream;
     sessionLogger.log(`Subscribed to OpenCode events`);
     // Load existing part-message mappings from database
@@ -966,7 +969,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 (promptAbortController.signal.aborted) {
+            if (abortController.signal.aborted) {
                 discordLogger.log(`Not starting typing, already aborted`);
                 return () => { };
             }
@@ -988,8 +991,8 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
                 });
             }, 8000);
             // Only add listener if not already aborted
-            if (!promptAbortController.signal.aborted) {
-                promptAbortController.signal.addEventListener('abort', () => {
+            if (!abortController.signal.aborted) {
+                abortController.signal.addEventListener('abort', () => {
                     if (typingInterval) {
                         clearInterval(typingInterval);
                         typingInterval = null;
@@ -1061,7 +1064,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 (promptAbortController.signal.aborted)
+                            if (abortController.signal.aborted)
                                 return;
                             stopTyping = startTyping(thread);
                         }, 300);
@@ -1100,6 +1103,10 @@ 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;
         }
@@ -1132,14 +1139,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 (!promptAbortController.signal.aborted ||
-                promptAbortController.signal.reason === 'finished') {
+            if (!abortController.signal.aborted ||
+                abortController.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: ${promptAbortController.signal.reason}), skipping duration message`);
+                sessionLogger.log(`Session was aborted (reason: ${abortController.signal.reason}), skipping duration message`);
             }
         }
     };
@@ -1152,9 +1159,9 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
             body: {
                 parts: [{ type: 'text', text: prompt }],
             },
-            signal: promptAbortController.signal,
+            signal: abortController.signal,
         });
-        promptAbortController.abort(new Error('finished'));
+        abortController.abort(new Error('finished'));
         sessionLogger.log(`Successfully sent prompt, got response`);
         abortControllers.delete(session.id);
         // Update reaction to success
@@ -1172,8 +1179,8 @@ async function handleOpencodeSession(prompt, thread, projectDirectory, originalM
     }
     catch (error) {
         sessionLogger.error(`ERROR: Failed to send prompt:`, error);
-        if (!isAbortError(error, promptAbortController.signal)) {
-            promptAbortController.abort(new Error('error'));
+        if (!isAbortError(error, abortController.signal)) {
+            abortController.abort(new Error('error'));
             if (originalMessage) {
                 try {
                     await originalMessage.reactions.removeAll();

package/package.json

@@ -2,7 +2,7 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "scripts": {
     "dev": "pnpm tsc && tsx --env-file .env src/cli.ts",
     "prepublishOnly": "pnpm tsc",

package/src/discordBot.ts

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