From f29cb81c7d6e5992b2524f85fc0e3976bdc529e5 Mon Sep 17 00:00:00 2001
From: Ryan Vogel <me@ryan.ceo>
Date: Wed, 8 Apr 2026 15:30:58 +0000
Subject: [PATCH] feat(opencode): add observability logging to push relay and
 session status

Add structured logging to the push notification pipeline so events
can be traced end-to-end when --print-logs is enabled:
- push-relay map(): log every classification decision and skip reason
- push-relay dedupe(): log suppressed duplicates with elapsed time
- push-relay start()/stop(): log init failures and teardown
- session/status: log every idle/busy/retry transition
---
 packages/opencode/src/server/push-relay.ts | 69 ++++++++++++++++++----
 packages/opencode/src/session/status.ts    |  9 +++
 2 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/packages/opencode/src/server/push-relay.ts b/packages/opencode/src/server/push-relay.ts
index 9e1e8a538c..e33683a58f 100644
--- a/packages/opencode/src/server/push-relay.ts
+++ b/packages/opencode/src/server/push-relay.ts
@@ -230,24 +230,54 @@ function map(event: Event): { type: Type; sessionID: string } | undefined {
     const sessionID = str(event.properties.sessionID)
     if (!sessionID) return
     const route = routeSession(sessionID)
+    log.info("map: matched permission.asked", {
+      eventType: event.type,
+      sessionID: route.sessionID,
+      originalSessionID: sessionID,
+      subagent: route.subagent,
+    })
     return { type: "permission", sessionID: route.sessionID }
   }
 
   if (event.type === "session.error") {
     const sessionID = str(event.properties.sessionID)
     if (!sessionID) return
-    if (routeSession(sessionID).subagent) return
-    if (!shouldNotifyError(event.properties.error)) return
+    const route = routeSession(sessionID)
+    if (route.subagent) {
+      log.info("map: skipped session.error (subagent)", { sessionID })
+      return
+    }
+    if (!shouldNotifyError(event.properties.error)) {
+      log.info("map: skipped session.error (suppressed error type)", {
+        sessionID,
+        errorName: obj(event.properties.error) ? str(event.properties.error.name) : undefined,
+      })
+      return
+    }
+    log.info("map: matched session.error", { sessionID })
     return { type: "error", sessionID }
   }
 
-  if (event.type !== "session.status") return
-  const sessionID = str(event.properties.sessionID)
-  if (!sessionID) return
-  if (!obj(event.properties.status)) return
-  if (event.properties.status.type !== "idle") return
-  if (routeSession(sessionID).subagent) return
-  return { type: "complete", sessionID }
+  if (event.type === "session.status") {
+    const sessionID = str(event.properties.sessionID)
+    if (!sessionID) return
+    if (!obj(event.properties.status)) return
+    const statusType = str(event.properties.status.type)
+    if (statusType !== "idle") {
+      log.info("map: skipped session.status (non-idle)", { sessionID, statusType })
+      return
+    }
+    const route = routeSession(sessionID)
+    if (route.subagent) {
+      log.info("map: skipped session.status idle (subagent)", { sessionID })
+      return
+    }
+    log.info("map: matched session.status idle", { sessionID })
+    return { type: "complete", sessionID }
+  }
+
+  // not a push-eligible event type
+  return
 }
 
 function text(input: string) {
@@ -366,7 +396,15 @@ function dedupe(input: { type: Type; sessionID: string }) {
   const prev = next.seen.get(key)
   next.seen.set(key, now)
   if (!prev) return false
-  return now - prev < 5_000
+  const isDupe = now - prev < 5_000
+  if (isDupe) {
+    log.info("dedupe: suppressed duplicate", {
+      type: input.type,
+      sessionID: input.sessionID,
+      elapsedMs: now - prev,
+    })
+  }
+  return isDupe
 }
 
 async function post(input: { type: Type; sessionID: string }) {
@@ -436,8 +474,14 @@ export namespace PushRelay {
   export function start(input: Input) {
     const relayURL = norm(input.relayURL.trim())
     const relaySecret = input.relaySecret.trim()
-    if (!relayURL) return
-    if (!relaySecret) return
+    if (!relayURL) {
+      log.warn("start: relay URL is empty, push relay disabled")
+      return
+    }
+    if (!relaySecret) {
+      log.warn("start: relay secret is empty, push relay disabled")
+      return
+    }
 
     stop()
 
@@ -480,6 +524,7 @@ export namespace PushRelay {
   export function stop() {
     const next = state
     if (!next) return
+    log.info("stopping push relay")
     state = undefined
     next.stop()
   }
diff --git a/packages/opencode/src/session/status.ts b/packages/opencode/src/session/status.ts
index 34a79eed11..93e0d6ccf9 100644
--- a/packages/opencode/src/session/status.ts
+++ b/packages/opencode/src/session/status.ts
@@ -2,10 +2,13 @@ import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
 import { InstanceState } from "@/effect/instance-state"
 import { makeRuntime } from "@/effect/run-service"
+import { Log } from "@/util/log"
 import { SessionID } from "./schema"
 import { Effect, Layer, ServiceMap } from "effect"
 import z from "zod"
 
+const log = Log.create({ service: "session-status" })
+
 export namespace SessionStatus {
   export const Info = z
     .union([
@@ -72,6 +75,12 @@ export namespace SessionStatus {
 
       const set = Effect.fn("SessionStatus.set")(function* (sessionID: SessionID, status: Info) {
         const data = yield* InstanceState.get(state)
+        const prev = data.get(sessionID)
+        log.info("session status change", {
+          sessionID,
+          from: prev?.type ?? "idle",
+          to: status.type,
+        })
         yield* bus.publish(Event.Status, { sessionID, status })
         if (status.type === "idle") {
           yield* bus.publish(Event.Idle, { sessionID })