moshi-opencode-hooks 1.0.16 → 1.0.18

package/index.ts

@@ -6,13 +6,6 @@ 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", "question", "apply_patch", "webfetch", "websearch"])
 
-interface HookState {
-  model?: string
-  lastToolName?: string
-  lastStopTime?: number
-  isSubagent?: boolean
-}
-
 interface AgentEvent {
   source: "opencode"
   eventType: "pre_tool" | "post_tool" | "notification" | "stop"
@@ -27,25 +20,6 @@ interface AgentEvent {
   contextPercent?: number
 }
 
-function statePath(sessionId: string): string {
-  return `/tmp/moshi-opencode-hook-${sessionId}.json`
-}
-
-async function readState(sessionId: string): Promise<HookState> {
-  try {
-    const file = Bun.file(statePath(sessionId))
-    if (!file.size) return {}
-    return await file.json()
-  } catch {
-    return {}
-  }
-}
-
-async function writeState(sessionId: string, patch: Partial<HookState>): Promise<void> {
-  const existing = await readState(sessionId)
-  await Bun.write(statePath(sessionId), JSON.stringify({ ...existing, ...patch }))
-}
-
 async function loadToken(): Promise<string | null> {
   try {
     const text = await Bun.file(TOKEN_PATH).text()
@@ -95,6 +69,22 @@ async function sendEvent(token: string, event: AgentEvent): Promise<Response> {
   }
 }
 
+async function getModel(client: Parameters<Plugin>[0]["client"], sessionId: string): Promise<string | undefined> {
+  try {
+    const res = await (client.session.get as any)({ sessionID: sessionId })
+    return res.data?.model
+  } catch {
+    return undefined
+  }
+}
+
+async function getOrLoadModel(
+  client: Parameters<Plugin>[0]["client"],
+  sessionId: string,
+): Promise<string | undefined> {
+  return await getModel(client, sessionId)
+}
+
 async function sendAgentEvent(
   client: Parameters<Plugin>[0]["client"],
   token: string,
@@ -122,9 +112,58 @@ function formatToolName(toolName: string): string {
   return toolName.charAt(0).toUpperCase() + toolName.slice(1)
 }
 
+function formatToolDescription(tool: string, args: any): string {
+  switch (tool) {
+    case "bash":
+      return args?.description?.slice(0, 200) ?? ""
+    case "edit":
+      return args?.filePath ?? ""
+    case "write":
+      return args?.filePath ?? ""
+    case "read":
+      return args?.filePath ?? ""
+    case "glob":
+      return args?.pattern ?? ""
+    case "grep":
+      return args?.pattern ?? ""
+    case "task":
+      return args?.description?.slice(0, 100) ?? ""
+    case "apply_patch":
+      return args?.description?.slice(0, 200) ?? ""
+    case "webfetch":
+    case "websearch":
+      return args?.url ?? ""
+    default:
+      return ""
+  }
+}
+
 function formatModelName(model: string | undefined): string | undefined {
   if (!model) return undefined
-  return model.replace(/^claude-/, "")
+  return model.split("/").pop()
+}
+
+async function getContextPercent(sessionId: string, client: Parameters<Plugin>[0]["client"]): Promise<number | undefined> {
+  try {
+    const sessionRes = await (client.session.get as any)({ sessionID: sessionId })
+    const sessionData = sessionRes.data
+    if (!sessionData) return undefined
+
+    const model = sessionData.model as { limit?: { context?: number } } | undefined
+    const contextLimit = model?.limit?.context
+    if (!contextLimit) return undefined
+
+    const messagesRes = await (client.session.messages as any)({ sessionID: sessionId, limit: 1 })
+    const messagesData = messagesRes.data
+    const messages = messagesData?.messages ?? messagesData
+    const lastMsg = Array.isArray(messages) ? messages[messages.length - 1] : messages
+    if (!lastMsg?.tokens?.input) return undefined
+
+    const totalInputTokens = lastMsg.tokens.input
+    return Math.min(100, Math.round((totalInputTokens / contextLimit) * 100))
+  } catch {
+    return undefined
+  }
 }
 
 const pkg = await import("./package.json", { assert: { type: "json" } })
@@ -149,24 +188,9 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
 
         const sessionId = (event as any).sessionId ?? "unknown"
         const projectName = directory ? basename(directory) : undefined
-        const state = await readState(sessionId)
-
-        if (event.type === "session.created") {
-          const isSubagent = await isSubagentSession(sessionId)
-          await writeState(sessionId, {
-            model: (event as any).properties?.model,
-            isSubagent,
-          })
-          continue
-        }
 
         if (event.type === "session.idle") {
-          if (state.isSubagent) continue
-
-          const now = Date.now() / 1000
-          if (state.lastStopTime && now - state.lastStopTime < 5) continue
-
-          await writeState(sessionId, { lastStopTime: now })
+          if (await isSubagentSession(sessionId)) continue
 
           const evt: AgentEvent = {
             source: "opencode",
@@ -177,8 +201,8 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
             message: "",
             eventId: crypto.randomUUID(),
             projectName,
-            modelName: formatModelName(state.model),
-            toolName: state.lastToolName,
+            modelName: formatModelName(await getOrLoadModel(client, sessionId)),
+            contextPercent: await getContextPercent(sessionId, client),
           }
           await sendAgentEvent(client, token, evt)
         }
@@ -210,9 +234,6 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
       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") {
@@ -230,8 +251,9 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
           message: lines.join("\n---\n").slice(0, 512),
           eventId: crypto.randomUUID(),
           projectName,
-          modelName: formatModelName(state.model),
+          modelName: formatModelName(await getOrLoadModel(client, sessionID)),
           toolName: tool,
+          contextPercent: await getContextPercent(sessionID, client),
         }
         await sendAgentEvent(client, token, evt)
         return
@@ -243,11 +265,12 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
         sessionId: sessionID,
         category: "tool_running",
         title: `Running ${formatToolName(tool)}`,
-        message: "",
+        message: formatToolDescription(tool, output.args),
         eventId: crypto.randomUUID(),
         projectName,
-        modelName: formatModelName(state.model),
+        modelName: formatModelName(await getOrLoadModel(client, sessionID)),
         toolName: tool,
+        contextPercent: await getContextPercent(sessionID, client),
       }
       await sendAgentEvent(client, token, evt)
     },
@@ -262,7 +285,6 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
 
       if (tool === "question") return
 
-      const state = await readState(sessionID)
       const projectName = directory ? basename(directory) : undefined
 
       const evt: AgentEvent = {
@@ -274,8 +296,9 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
         message: "",
         eventId: crypto.randomUUID(),
         projectName,
-        modelName: formatModelName(state.model),
+        modelName: formatModelName(await getOrLoadModel(client, sessionID)),
         toolName: tool,
+        contextPercent: await getContextPercent(sessionID, client),
       }
       await sendAgentEvent(client, token, evt)
     },
@@ -285,8 +308,7 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
       if (!token) return
 
       const sessionID = (input as any).sessionID ?? "unknown"
-      const state = await readState(sessionID)
-      if (state.isSubagent) return
+      if (await isSubagentSession(sessionID)) return
 
       const projectName = directory ? basename(directory) : undefined
 
@@ -301,7 +323,8 @@ export const MoshiHooks: Plugin = async ({ client, directory }) => {
         message: prompt.slice(0, 256),
         eventId: crypto.randomUUID(),
         projectName,
-        modelName: formatModelName(state.model),
+        modelName: formatModelName(await getOrLoadModel(client, sessionID)),
+        contextPercent: await getContextPercent(sessionID, client),
       }
       await sendAgentEvent(client, token, evt)
     },

package/package.json

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