moshi-opencode-hooks 1.0.1 → 1.0.9

package/index.ts

@@ -4,20 +4,19 @@ import type { Plugin } from "@opencode-ai/plugin"
 
 const TOKEN_PATH = `${homedir()}/.config/moshi/token`
 const API_URL = "https://api.getmoshi.app/api/v1/agent-events"
-const INTERESTING_TOOLS = new Set(["bash", "edit", "write", "read", "glob", "grep", "task"])
+const INTERESTING_TOOLS = new Set(["bash", "edit", "write", "read", "glob", "grep", "task", "question", "apply_patch"])
 
 interface HookState {
   model?: string
   lastToolName?: string
   lastStopTime?: number
-  sessionStartTime?: number
 }
 
 interface AgentEvent {
   source: "opencode"
-  eventType: "user_prompt" | "pre_tool" | "post_tool" | "notification" | "stop" | "agent_turn_complete"
+  eventType: "pre_tool" | "post_tool" | "notification" | "stop"
   sessionId: string
-  category: "approval_required" | "task_complete" | "tool_running" | "tool_finished" | "info" | "error"
+  category: "approval_required" | "task_complete" | "tool_running" | "tool_finished"
   title: string
   message: string
   eventId: string
@@ -55,7 +54,27 @@ async function loadToken(): Promise<string | null> {
   }
 }
 
-async function sendEvent(token: string, event: AgentEvent): Promise<void> {
+async function logPluginEvent(
+  client: Parameters<Plugin>[0]["client"],
+  level: "warn" | "error",
+  message: string,
+  extra?: Record<string, unknown>,
+): Promise<void> {
+  try {
+    await client.app.log({
+      body: {
+        service: "moshi-hooks",
+        level,
+        message,
+        extra,
+      },
+    })
+  } catch (err) {
+    console.error(`[moshi-hooks] ${message}`, err)
+  }
+}
+
+async function sendEvent(token: string, event: AgentEvent): Promise<Response> {
   const body = JSON.stringify(event)
   const headers = {
     "Content-Type": "application/json",
@@ -69,11 +88,32 @@ async function sendEvent(token: string, event: AgentEvent): Promise<void> {
       body,
       signal: AbortSignal.timeout(5000),
     })
+    return res
+  } catch (err) {
+    throw err
+  }
+}
+
+async function sendAgentEvent(
+  client: Parameters<Plugin>[0]["client"],
+  token: string,
+  event: AgentEvent,
+): Promise<void> {
+  try {
+    const res = await sendEvent(token, event)
     if (!res.ok && res.status >= 500) {
-      console.error(`[moshi-hooks] API error: ${res.status}`)
+      await logPluginEvent(client, "error", "Moshi API returned server error", {
+        status: res.status,
+        eventType: event.eventType,
+        sessionId: event.sessionId,
+      })
     }
   } catch (err) {
-    console.error(`[moshi-hooks] Failed to send event:`, err)
+    await logPluginEvent(client, "error", "Failed to send Moshi event", {
+      error: err instanceof Error ? err.message : String(err),
+      eventType: event.eventType,
+      sessionId: event.sessionId,
+    })
   }
 }
 
@@ -87,7 +127,7 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
       const events = await client.event.subscribe()
       for await (const event of events.stream) {
         const token = await loadToken()
-        if (!token) break
+        if (!token) continue
 
         const sessionId = (event as any).sessionId ?? "unknown"
         const projectName = directory ? basename(directory) : undefined
@@ -95,7 +135,6 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
 
         if (event.type === "session.created") {
           await writeState(sessionId, {
-            sessionStartTime: Date.now() / 1000,
             model: (event as any).properties?.model,
           })
           continue
@@ -119,29 +158,63 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
             modelName: state.model,
             toolName: state.lastToolName,
           }
-          await sendEvent(token, evt)
+          await sendAgentEvent(client, token, evt)
         }
       }
     } catch (err) {
-      console.error(`[moshi-hooks] Event subscription error:`, err)
+      await logPluginEvent(client, "error", "Event subscription error", {
+        error: err instanceof Error ? err.message : String(err),
+      })
     }
   }
 
   setupEventSubscription()
 
+  const isSubagentSession = async (sessionID: string): Promise<boolean> => {
+    try {
+      const res = await (client.session.get as any)({ sessionID })
+      return !!(res.data?.parentID)
+    } catch {
+      return false
+    }
+  }
+
   return {
-    "tool.execute.before": async (input, _output) => {
+    "tool.execute.before": async (input, output) => {
       const token = await loadToken()
       if (!token) return
 
       const { tool, sessionID } = input
       if (!tool || !INTERESTING_TOOLS.has(tool.toLowerCase())) return
+      if (await isSubagentSession(sessionID)) return
 
       await writeState(sessionID, { lastToolName: tool })
 
       const state = await readState(sessionID)
       const projectName = directory ? basename(directory) : undefined
 
+      if (tool === "question") {
+        const questions: any[] = output.args?.questions ?? []
+        const lines = questions.map((q) => {
+          const opts = q.options?.map((o: any) => `  - ${o.label}`).join("\n") ?? ""
+          return `${q.header}: ${q.question}\n${opts}`
+        })
+        const evt: AgentEvent = {
+          source: "opencode",
+          eventType: "notification",
+          sessionId: sessionID,
+          category: "approval_required",
+          title: "Question",
+          message: lines.join("\n---\n").slice(0, 512),
+          eventId: crypto.randomUUID(),
+          projectName,
+          modelName: state.model,
+          toolName: tool,
+        }
+        await sendAgentEvent(client, token, evt)
+        return
+      }
+
       const evt: AgentEvent = {
         source: "opencode",
         eventType: "pre_tool",
@@ -154,7 +227,7 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
         modelName: state.model,
         toolName: tool,
       }
-      await sendEvent(token, evt)
+      await sendAgentEvent(client, token, evt)
     },
 
     "tool.execute.after": async (input, output) => {
@@ -163,6 +236,9 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
 
       const { tool, sessionID } = input
       if (!tool || !INTERESTING_TOOLS.has(tool.toLowerCase())) return
+      if (await isSubagentSession(sessionID)) return
+
+      if (tool === "question") return
 
       const state = await readState(sessionID)
       const projectName = directory ? basename(directory) : undefined
@@ -179,10 +255,10 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
         modelName: state.model,
         toolName: tool,
       }
-      await sendEvent(token, evt)
+      await sendAgentEvent(client, token, evt)
     },
 
-    "permission.ask": async (input, output) => {
+    "permission.asked": async (input: any, _output: any) => {
       const token = await loadToken()
       if (!token) return
 
@@ -203,7 +279,7 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
         projectName,
         modelName: state.model,
       }
-      await sendEvent(token, evt)
+      await sendAgentEvent(client, token, evt)
     },
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moshi-opencode-hooks",
-  "version": "1.0.1",
+  "version": "1.0.9",
   "description": "OpenCode plugin for Moshi live activity integration",
   "repository": {
     "type": "git",