diff --git a/.opencode/opencode.jsonc b/.opencode/opencode.jsonc
index c3f0b7070d..52fd004324 100644
--- a/.opencode/opencode.jsonc
+++ b/.opencode/opencode.jsonc
@@ -9,12 +9,7 @@
       "options": {},
     },
   },
-  "mcp": {
-    "context7": {
-      "type": "remote",
-      "url": "https://mcp.context7.com/mcp",
-    },
-  },
+  "mcp": {},
   "tools": {
     "github-triage": false,
     "github-pr-search": false,
diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts
index 59d2db3682..b83c470d0a 100644
--- a/packages/opencode/src/cli/cmd/run.ts
+++ b/packages/opencode/src/cli/cmd/run.ts
@@ -367,15 +367,6 @@ export const RunCommand = cmd({
     }
 
     async function execute(sdk: OpencodeClient) {
-      function show() {
-        if (args.format === "json") return
-        if (!process.stdout.isTTY) return
-        const text = message.trimEnd()
-        if (!text) return
-        UI.empty()
-        text.split("\n").forEach((line) => UI.println(`> ${line}`))
-        UI.empty()
-      }
       const seen = new Set<string>()
 
       function head(info: Message) {
@@ -418,7 +409,18 @@ export const RunCommand = cmd({
       let error: string | undefined
 
       async function loop() {
+        UI.empty()
+        UI.println(`> ${args.message}`)
+        UI.empty()
+        let start = false
         for await (const event of events.stream) {
+          if (event.type === "message.updated" && event.properties.info.role === "assistant" && !start) {
+            start = true
+            UI.empty()
+            UI.println(`# ${event.properties.info.agent} · ${event.properties.info.modelID}`)
+            UI.empty()
+          }
+
           if (event.type === "message.part.updated") {
             const part = event.properties.part
             if (part.sessionID !== sessionID) continue
@@ -530,8 +532,6 @@ export const RunCommand = cmd({
       }
       await share(sdk, sessionID)
 
-      if (!args.command) show()
-
       loop().catch((e) => {
         console.error(e)
         process.exit(1)
diff --git a/packages/opencode/src/tool/registry.ts b/packages/opencode/src/tool/registry.ts
index 7b3a458897..3cb7715947 100644
--- a/packages/opencode/src/tool/registry.ts
+++ b/packages/opencode/src/tool/registry.ts
@@ -110,7 +110,7 @@ export namespace ToolRegistry {
       TaskTool,
       WebFetchTool,
       TodoWriteTool,
-      TodoReadTool,
+      // TodoReadTool,
       WebSearchTool,
       CodeSearchTool,
       SkillTool,