@mohak34/opencode-notifier 0.1.21 → 0.1.22-beta.0

package/dist/index.js

@@ -3756,28 +3756,32 @@ var DEFAULT_CONFIG = {
     complete: { ...DEFAULT_EVENT_CONFIG },
     subagent_complete: { sound: false, notification: false },
     error: { ...DEFAULT_EVENT_CONFIG },
-    question: { ...DEFAULT_EVENT_CONFIG }
+    question: { ...DEFAULT_EVENT_CONFIG },
+    interrupted: { ...DEFAULT_EVENT_CONFIG }
   },
   messages: {
     permission: "Session needs permission: {sessionTitle}",
     complete: "Session has finished: {sessionTitle}",
     subagent_complete: "Subagent task completed: {sessionTitle}",
     error: "Session encountered an error: {sessionTitle}",
-    question: "Session has a question: {sessionTitle}"
+    question: "Session has a question: {sessionTitle}",
+    interrupted: "Session was interrupted: {sessionTitle}"
   },
   sounds: {
     permission: null,
     complete: null,
     subagent_complete: null,
     error: null,
-    question: null
+    question: null,
+    interrupted: null
   },
   volumes: {
     permission: 1,
     complete: 1,
     subagent_complete: 1,
     error: 1,
-    question: 1
+    question: 1,
+    interrupted: 1
   }
 };
 function getConfigPath() {
@@ -3846,28 +3850,32 @@ function loadConfig() {
         complete: parseEventConfig(userConfig.events?.complete ?? userConfig.complete, defaultWithGlobal),
         subagent_complete: parseEventConfig(userConfig.events?.subagent_complete ?? userConfig.subagent_complete, { sound: false, notification: false }),
         error: parseEventConfig(userConfig.events?.error ?? userConfig.error, defaultWithGlobal),
-        question: parseEventConfig(userConfig.events?.question ?? userConfig.question, defaultWithGlobal)
+        question: parseEventConfig(userConfig.events?.question ?? userConfig.question, defaultWithGlobal),
+        interrupted: parseEventConfig(userConfig.events?.interrupted ?? userConfig.interrupted, defaultWithGlobal)
       },
       messages: {
         permission: userConfig.messages?.permission ?? DEFAULT_CONFIG.messages.permission,
         complete: userConfig.messages?.complete ?? DEFAULT_CONFIG.messages.complete,
         subagent_complete: userConfig.messages?.subagent_complete ?? DEFAULT_CONFIG.messages.subagent_complete,
         error: userConfig.messages?.error ?? DEFAULT_CONFIG.messages.error,
-        question: userConfig.messages?.question ?? DEFAULT_CONFIG.messages.question
+        question: userConfig.messages?.question ?? DEFAULT_CONFIG.messages.question,
+        interrupted: userConfig.messages?.interrupted ?? DEFAULT_CONFIG.messages.interrupted
       },
       sounds: {
         permission: userConfig.sounds?.permission ?? DEFAULT_CONFIG.sounds.permission,
         complete: userConfig.sounds?.complete ?? DEFAULT_CONFIG.sounds.complete,
         subagent_complete: userConfig.sounds?.subagent_complete ?? DEFAULT_CONFIG.sounds.subagent_complete,
         error: userConfig.sounds?.error ?? DEFAULT_CONFIG.sounds.error,
-        question: userConfig.sounds?.question ?? DEFAULT_CONFIG.sounds.question
+        question: userConfig.sounds?.question ?? DEFAULT_CONFIG.sounds.question,
+        interrupted: userConfig.sounds?.interrupted ?? DEFAULT_CONFIG.sounds.interrupted
       },
       volumes: {
         permission: parseVolume(userConfig.volumes?.permission, DEFAULT_CONFIG.volumes.permission),
         complete: parseVolume(userConfig.volumes?.complete, DEFAULT_CONFIG.volumes.complete),
         subagent_complete: parseVolume(userConfig.volumes?.subagent_complete, DEFAULT_CONFIG.volumes.subagent_complete),
         error: parseVolume(userConfig.volumes?.error, DEFAULT_CONFIG.volumes.error),
-        question: parseVolume(userConfig.volumes?.question, DEFAULT_CONFIG.volumes.question)
+        question: parseVolume(userConfig.volumes?.question, DEFAULT_CONFIG.volumes.question),
+        interrupted: parseVolume(userConfig.volumes?.interrupted, DEFAULT_CONFIG.volumes.interrupted)
       }
     };
   } catch {
@@ -4119,6 +4127,15 @@ function runCommand2(config, event, message, sessionTitle, projectName) {
 }
 
 // src/index.ts
+var recentErrors = new Map;
+setInterval(() => {
+  const cutoff = Date.now() - 5 * 60 * 1000;
+  for (const [sessionID, timestamp] of recentErrors) {
+    if (timestamp < cutoff) {
+      recentErrors.delete(sessionID);
+    }
+  }
+}, 5 * 60 * 1000);
 function getNotificationTitle(config, projectName) {
   if (config.showProjectName && projectName) {
     return `OpenCode (${projectName})`;
@@ -4156,7 +4173,7 @@ function getSessionIDFromEvent(event) {
   }
   return null;
 }
-async function getElapsedSinceLastPrompt(client, sessionID) {
+async function getElapsedSinceLastPrompt(client, sessionID, nowMs = Date.now()) {
   try {
     const response = await client.session.messages({ path: { id: sessionID } });
     const messages = response.data ?? [];
@@ -4170,7 +4187,7 @@ async function getElapsedSinceLastPrompt(client, sessionID) {
       }
     }
     if (lastUserMessageTime !== null) {
-      return (Date.now() - lastUserMessageTime) / 1000;
+      return (nowMs - lastUserMessageTime) / 1000;
     }
   } catch {}
   return null;
@@ -4217,11 +4234,18 @@ var NotifierPlugin = async ({ client, directory }) => {
       if (event.type === "session.idle") {
         const sessionID = getSessionIDFromEvent(event);
         if (sessionID) {
-          const sessionInfo = await getSessionInfo(client, sessionID);
-          if (!sessionInfo.isChild) {
-            await handleEventWithElapsedTime(client, config, "complete", projectName, event, sessionInfo.title);
+          const errorTime = recentErrors.get(sessionID);
+          if (errorTime && Date.now() - errorTime < 500) {
+            recentErrors.delete(sessionID);
+            const sessionInfo = await getSessionInfo(client, sessionID);
+            await handleEventWithElapsedTime(client, config, "interrupted", projectName, event, sessionInfo.title);
           } else {
-            await handleEventWithElapsedTime(client, config, "subagent_complete", projectName, event, sessionInfo.title);
+            const sessionInfo = await getSessionInfo(client, sessionID);
+            if (!sessionInfo.isChild) {
+              await handleEventWithElapsedTime(client, config, "complete", projectName, event, sessionInfo.title);
+            } else {
+              await handleEventWithElapsedTime(client, config, "subagent_complete", projectName, event, sessionInfo.title);
+            }
           }
         } else {
           await handleEventWithElapsedTime(client, config, "complete", projectName, event);
@@ -4229,12 +4253,22 @@ var NotifierPlugin = async ({ client, directory }) => {
       }
       if (event.type === "session.error") {
         const sessionID = getSessionIDFromEvent(event);
-        let sessionTitle = null;
-        if (sessionID && config.showSessionTitle) {
-          const info = await getSessionInfo(client, sessionID);
-          sessionTitle = info.title;
+        if (sessionID) {
+          recentErrors.set(sessionID, Date.now());
+          let sessionTitle = null;
+          if (config.showSessionTitle) {
+            const info = await getSessionInfo(client, sessionID);
+            sessionTitle = info.title;
+          }
+          setTimeout(() => {
+            if (recentErrors.has(sessionID)) {
+              recentErrors.delete(sessionID);
+              handleEventWithElapsedTime(client, config, "error", projectName, event, sessionTitle);
+            }
+          }, 100);
+        } else {
+          await handleEventWithElapsedTime(client, config, "error", projectName, event);
         }
-        await handleEventWithElapsedTime(client, config, "error", projectName, event, sessionTitle);
       }
     },
     "permission.ask": async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mohak34/opencode-notifier",
-  "version": "0.1.21",
+  "version": "0.1.22-beta.0",
   "description": "OpenCode plugin that sends system notifications and plays sounds when permission is needed, generation completes, or errors occur",
   "author": "mohak34",
   "license": "MIT",