gyoshu 0.4.16 → 0.4.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gyoshu",
-  "version": "0.4.16",
+  "version": "0.4.18",
   "description": "Scientific research agent extension for OpenCode - turns research goals into reproducible Jupyter notebooks",
   "type": "module",
   "main": "./src/index.ts",

package/src/gyoshu-manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "gyoshu",
-  "version": "0.4.16",
+  "version": "0.4.18",
   "description": "Scientific research agent extension for OpenCode",
   "files": {
     "agent": [
@@ -59,6 +59,6 @@
     "bridge": [
       "gyoshu_bridge.py"
     ],
-    "plugin": []
+    "plugin": ["gyoshu-hooks.ts"]
   }
 }

package/src/index.ts

@@ -867,32 +867,46 @@ function autoInstall(): InstallResult {
 }
 
 export const GyoshuPlugin: Plugin = async (ctx) => {
-  const installResult = autoInstall();
+  // Always return a valid Hooks object, even on error
+  const emptyHooks = {};
+  
+  try {
+    const installResult = autoInstall();
 
-  if (installResult.fatal) {
-    console.error(`❌ Gyoshu: Fatal installation error`);
-    for (const error of installResult.errors) {
-      console.error(`   - ${error}`);
+    if (installResult.fatal) {
+      console.error(`❌ Gyoshu: Fatal installation error`);
+      for (const error of installResult.errors) {
+        console.error(`   - ${error}`);
+      }
     }
-    return GyoshuHooks(ctx);
-  }
 
-  if (installResult.installed > 0) {
-    console.log(`🎓 Gyoshu: Installed ${installResult.installed} files to ~/.config/opencode/`);
-  }
+    if (installResult.installed > 0) {
+      console.log(`🎓 Gyoshu: Installed ${installResult.installed} files to ~/.config/opencode/`);
+    }
 
-  if (installResult.updated > 0) {
-    console.log(`🎓 Gyoshu: Updated ${installResult.updated} files`);
-  }
+    if (installResult.updated > 0) {
+      console.log(`🎓 Gyoshu: Updated ${installResult.updated} files`);
+    }
 
-  if (installResult.errors.length > 0) {
-    console.warn(`⚠️  Gyoshu: Some issues occurred:`);
-    for (const error of installResult.errors) {
-      console.warn(`   - ${error}`);
+    if (installResult.errors.length > 0) {
+      console.warn(`⚠️  Gyoshu: Some issues occurred:`);
+      for (const error of installResult.errors) {
+        console.warn(`   - ${error}`);
+      }
     }
-  }
 
-  return GyoshuHooks(ctx);
+    // Try to initialize hooks, return empty hooks on failure
+    try {
+      const hooks = await GyoshuHooks(ctx);
+      return hooks || emptyHooks;
+    } catch (hooksError) {
+      console.error(`❌ Gyoshu: Failed to initialize hooks: ${hooksError instanceof Error ? hooksError.message : String(hooksError)}`);
+      return emptyHooks;
+    }
+  } catch (err) {
+    console.error(`❌ Gyoshu: Plugin initialization failed: ${err instanceof Error ? err.message : String(err)}`);
+    return emptyHooks;
+  }
 };
 
 export default GyoshuPlugin;

package/src/plugin/gyoshu-hooks.ts

@@ -473,8 +473,14 @@ export const GyoshuPlugin: Plugin = async ({ client }) => {
   idleCheckInterval = setInterval(killIdleBridges, IDLE_CHECK_INTERVAL_MS);
   
   return {
+    // NOTE: tool.execute.after receives:
+    //   input: { tool: string; sessionID: string; callID: string; }
+    //   output: { title: string; output: string; metadata: any; }
+    // The original tool args are in output.metadata (if the tool stored them there)
     "tool.execute.after": async (input, output) => {
-      const args = (input as { args?: Record<string, unknown> }).args;
+      // Extract args from output.metadata (where tools may store their call args)
+      const metadata = output?.metadata as Record<string, unknown> | undefined;
+      const args = metadata?.args as Record<string, unknown> | undefined;
       
       const toolReportTitle = extractReportTitleFromArgs(args);
       if (toolReportTitle && activeAutoLoops.has(toolReportTitle)) {
@@ -504,7 +510,7 @@ export const GyoshuPlugin: Plugin = async ({ client }) => {
       
       if (input.tool === "gyoshu-completion") {
         const reportTitle = args?.reportTitle as string | undefined;
-        const outputText = typeof output === "string" ? output : JSON.stringify(output);
+        const outputText = typeof output?.output === "string" ? output.output : JSON.stringify(output);
         if (reportTitle) {
           recentOutputBuffer.set(reportTitle, outputText);
         }
@@ -519,49 +525,27 @@ export const GyoshuPlugin: Plugin = async ({ client }) => {
       }
     },
     
-    "agent.after": async ({ output }) => {
-      const outputText = typeof output === "string" ? output : "";
-      
-      const extractedTags = extractPromiseTags(outputText);
-      for (const tag of extractedTags) {
-        if (TERMINAL_PROMISE_TAGS.includes(tag as typeof TERMINAL_PROMISE_TAGS[number])) {
-          const matchedReportTitles = findReportTitlesInOutput(outputText);
-          if (matchedReportTitles.length > 0) {
-            for (const reportTitle of matchedReportTitles) {
-              await deactivateAutoLoop(reportTitle);
-            }
-          }
-          return;
-        }
-      }
-      
-      for (const [reportTitle] of activeAutoLoops) {
-        const bufferedOutput = recentOutputBuffer.get(reportTitle) || "";
-        const combinedOutput = bufferedOutput + outputText;
-        
-        const result = await checkAutoLoopContinuation(reportTitle, combinedOutput, client);
-        
-        if (result.budgetExhaustedMessage) {
-          const sent = await trySendContinuationPrompt(client, result.budgetExhaustedMessage);
-          if (sent) {
-            await onSuccessfulContinuationSend(reportTitle);
-          }
-        } else if (result.prompt) {
-          const sent = await trySendContinuationPrompt(client, result.prompt);
-          if (sent) {
-            await onSuccessfulContinuationSend(reportTitle);
-          }
-        }
-        
-        recentOutputBuffer.delete(reportTitle);
-      }
-    },
+    // NOTE: OpenCode does not have an "agent.after" hook.
+    // Auto-loop continuation logic that was here has been disabled.
+    // When/if OpenCode adds an agent completion hook, the following would need to be restored:
+    // - Detect terminal promise tags (GYOSHU_AUTO_COMPLETE, GYOSHU_AUTO_BLOCKED, GYOSHU_AUTO_BUDGET_EXHAUSTED)
+    // - Call checkAutoLoopContinuation() and trySendContinuationPrompt() for active auto-loops
+    // The auto-loop state management code is preserved for when this becomes available.
     
     event: async ({ event }) => {
       const eventType = event.type as string;
       
+      // Handle session cleanup (merged from removed 'cleanup' hook)
       if (eventType === "session.end" || eventType === "session.disposed") {
+        // Stop idle check interval
+        if (idleCheckInterval) {
+          clearInterval(idleCheckInterval);
+          idleCheckInterval = null;
+        }
+        
+        // Clean up all bridges and session state
         cleanupAllBridges();
+        activeSessions.clear();
         activeAutoLoops.clear();
         recentOutputBuffer.clear();
         injectionInFlight.clear();
@@ -572,6 +556,9 @@ export const GyoshuPlugin: Plugin = async ({ client }) => {
         saveDebounceTimers.clear();
       }
       
+      // Auto-loop continuation on idle/message events
+      // NOTE: This is a partial replacement for the removed "agent.after" hook.
+      // It only triggers on explicit idle/message events, not on every agent turn completion.
       if (eventType === "agent.idle" || eventType === "message.completed") {
         for (const [reportTitle] of activeAutoLoops) {
           const bufferedOutput = recentOutputBuffer.get(reportTitle) || "";
@@ -593,23 +580,8 @@ export const GyoshuPlugin: Plugin = async ({ client }) => {
       }
     },
     
-    cleanup: async () => {
-      if (idleCheckInterval) {
-        clearInterval(idleCheckInterval);
-        idleCheckInterval = null;
-      }
-      
-      cleanupAllBridges();
-      activeSessions.clear();
-      activeAutoLoops.clear();
-      recentOutputBuffer.clear();
-      injectionInFlight.clear();
-      lastProcessedOutputHash.clear();
-      for (const timer of saveDebounceTimers.values()) {
-        clearTimeout(timer);
-      }
-      saveDebounceTimers.clear();
-    },
+    // NOTE: OpenCode does not have a 'cleanup' hook.
+    // Cleanup logic has been moved to the 'event' hook, listening for 'session.end' and 'session.disposed'.
   };
 };