moshi-opencode-hooks 1.0.8 → 1.0.10

package/index.ts

@@ -4,7 +4,7 @@ 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
@@ -170,19 +170,51 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
 
   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",
@@ -204,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

package/package.json

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