From 7d4965cb29f5345bd405d2c43c53ea6b5fb11102 Mon Sep 17 00:00:00 2001
From: Aiden Cline <aidenpcline@gmail.com>
Date: Mon, 29 Jun 2026 22:56:48 -0500
Subject: [PATCH] Revert "refactor(core): trim mcp event surface"

This reverts commit 1982e43f85c19c4a0abd86df5d15143334cb2727.
---
 packages/opencode/src/mcp/index.ts      |  9 +-----
 packages/schema/src/mcp-event.ts        | 10 ++++++-
 packages/sdk/js/src/v2/gen/types.gen.ts | 37 +++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/packages/opencode/src/mcp/index.ts b/packages/opencode/src/mcp/index.ts
index 16a112323c..e5dbaefa41 100644
--- a/packages/opencode/src/mcp/index.ts
+++ b/packages/opencode/src/mcp/index.ts
@@ -27,7 +27,6 @@ import { McpOAuthCallback } from "./oauth-callback"
 import { McpAuth } from "./auth"
 import { EventV2Bridge } from "@/event-v2-bridge"
 import { TuiEvent } from "@/server/tui-event"
-import { Event } from "@opencode-ai/schema/event"
 import open from "open"
 import { Cause, Effect, Exit, Layer, Context, Schema, Stream } from "effect"
 import { EffectBridge } from "@/effect/bridge"
@@ -62,13 +61,7 @@ export type Resource = Schema.Schema.Type<typeof Resource>
 
 export const ToolsChanged = McpEvent.ToolsChanged
 
-export const BrowserOpenFailed = Event.define({
-  type: "mcp.browser.open.failed",
-  schema: {
-    mcpName: Schema.String,
-    url: Schema.String,
-  },
-})
+export const BrowserOpenFailed = McpEvent.BrowserOpenFailed
 
 export const Failed = NamedError.create("MCPFailed", {
   name: Schema.String,
diff --git a/packages/schema/src/mcp-event.ts b/packages/schema/src/mcp-event.ts
index f373d6402c..1d050df927 100644
--- a/packages/schema/src/mcp-event.ts
+++ b/packages/schema/src/mcp-event.ts
@@ -10,4 +10,12 @@ export const ToolsChanged = Event.define({
   },
 })
 
-export const Definitions = Event.inventory(ToolsChanged)
+export const BrowserOpenFailed = Event.define({
+  type: "mcp.browser.open.failed",
+  schema: {
+    mcpName: Schema.String,
+    url: Schema.String,
+  },
+})
+
+export const Definitions = Event.inventory(ToolsChanged, BrowserOpenFailed)
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index f434c1ee4b..9259dad941 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -80,6 +80,7 @@ export type Event =
   | EventTuiToastShow2
   | EventTuiSessionSelect2
   | EventMcpToolsChanged
+  | EventMcpBrowserOpenFailed
   | EventCommandExecuted
   | EventProjectUpdated
   | EventSessionStatus
@@ -1512,6 +1513,14 @@ export type GlobalEvent = {
           server: string
         }
       }
+    | {
+        id: string
+        type: "mcp.browser.open.failed"
+        properties: {
+          mcpName: string
+          url: string
+        }
+      }
     | {
         id: string
         type: "command.executed"
@@ -2990,6 +2999,7 @@ export type V2Event =
   | TuiToastShow
   | TuiSessionSelect
   | McpToolsChanged
+  | McpBrowserOpenFailed
   | CommandExecuted
   | ProjectUpdated
   | SessionStatus2
@@ -6026,6 +6036,24 @@ export type McpToolsChanged = {
   }
 }
 
+export type McpBrowserOpenFailed = {
+  id: string
+  metadata?: {
+    [key: string]: unknown
+  }
+  type: "mcp.browser.open.failed"
+  durable?: {
+    aggregateID: string
+    seq: number
+    version: number
+  }
+  location?: LocationRef
+  data: {
+    mcpName: string
+    url: string
+  }
+}
+
 export type CommandExecuted = {
   id: string
   metadata?: {
@@ -7089,6 +7117,15 @@ export type EventMcpToolsChanged = {
   }
 }
 
+export type EventMcpBrowserOpenFailed = {
+  id: string
+  type: "mcp.browser.open.failed"
+  properties: {
+    mcpName: string
+    url: string
+  }
+}
+
 export type EventCommandExecuted = {
   id: string
   type: "command.executed"