docs: improve keybinds configuration format in README

Update keybinds configuration example to use proper TOML table syntax instead of dot notation for better readability and standard TOML formatting.

🤖 Generated with [opencode](https://opencode.ai)

Co-Authored-By: opencode <noreply@opencode.ai>

.github/workflows/deploy.yml

@@ -3,7 +3,7 @@ name: deploy
 on:
   push:
     branches:
-      - dontlook
+      - dev
   workflow_dispatch:
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}

README.md

@@ -1,8 +1,24 @@
-[![OpenCode Terminal UI](screenshot.png)](https://github.com/sst/opencode)
+<p align="center">
+  <a href="https://opencode.ai">
+    <picture>
+      <source srcset="packages/web/src/assets/logo-dark.svg" media="(prefers-color-scheme: dark)">
+      <source srcset="packages/web/src/assets/logo-light.svg" media="(prefers-color-scheme: light)">
+      <img src="packages/web/src/assets/logo-light.svg" alt="opencode logo">
+    </picture>
+  </a>
+</p>
+<p align="center">
+  <a href="https://www.npmjs.com/package/opencode-ai"><img alt="npm" src="https://img.shields.io/npm/v/opencode-ai?style=flat-square" /></a>
+  <a href="https://github.com/sst/opencode/actions/workflows/publish.yml"><img alt="Build status" src="https://img.shields.io/github/actions/workflow/status/sst/opencode/publish.yml?style=flat-square&branch=dev" /></a>
+</p>
+
+---
 
 AI coding agent, built for the terminal.
 
-⚠️ **Note:** version 0.1.x is a full rewrite and we do not have proper documentation for it yet. Should have this out week of June 17th 2025 📚
+**Note:** Version 0.1.x is a full rewrite, and we do not have proper documentation for it yet. Should have this out week of June 17th 2025.
+
+[![opencode Terminal UI](screenshot.png)](https://opencode.ai)
 
 ### Installation
 
@@ -16,13 +32,13 @@ brew install sst/tap/opencode      # macOS
 paru -S opencode-bin               # Arch Linux
 ```
 
-> **Note:** Remove previous versions < 0.1.x first if installed
+> **Note:** Remove versions older than 0.1.x before installing
 
 ### Providers
 
-The recommended approach is to sign up for claude pro or max and do `opencode auth login` and select Anthropic. It is the most cost effective way to use this tool.
+The recommended approach is to sign up for Claude Pro or Max, run `opencode auth login`, and select Anthropic. It's the most cost-effective way to use opencode.
 
-Additionally opencode is powered by the provider list at [models.dev](https://models.dev) so you can use `opencode auth login` to configure api keys for any provider you'd like to use. This is stored in `~/.local/share/opencode/auth.json`
+opencode is powered by the provider list at [Models.dev](https://models.dev), so you can use `opencode auth login` to configure API keys for any provider you'd like to use. This is stored in `~/.local/share/opencode/auth.json`.
 
 ```bash
 $ opencode auth login
@@ -41,13 +57,103 @@ $ opencode auth login
 └
 ```
 
-The models.dev dataset is also used to detect common environment variables like `OPENAI_API_KEY` to autoload that provider.
+The Models.dev dataset is also used to detect common environment variables like `OPENAI_API_KEY` to autoload that provider.
 
-If there are additional providers you want to use you can submit a PR to the [models.dev repo](https://github.com/sst/models.dev). If configuring just for yourself check out the Config section below
+If there are additional providers you want to use you can submit a PR to the [Models.dev repo](https://github.com/sst/models.dev). If configuring just for yourself check out the Config section below.
+
+### Global Config
+
+Some basic configuration is available in the global config file.
+
+```toml
+# ~/.config/opencode/config
+theme = "opencode"
+provider = "anthropic"
+model = "claude-sonnet-4-20250514"
+autoupdate = true
+
+keybinds.leader = "ctrl+x"
+keybinds.session_new = "<leader>n"
+keybinds.editor_open = "<leader>e"
+```
+
+#### Keybinds
+
+You can configure the keybinds in the global config file. (Note: values listed below are the defaults.)
+
+```toml
+# ~/.config/opencode/config
+
+[keybinds]
+leader = "ctrl+x"
+help = "<leader>h"
+editor_open = "<leader>e"
+session_new = "<leader>n"
+session_list = "<leader>l"
+session_share = "<leader>s"
+session_interrupt = "esc"
+session_compact = "<leader>c"
+tool_details = "<leader>d"
+model_list = "<leader>m"
+theme_list = "<leader>t"
+project_init = "<leader>i"
+input_clear = "ctrl+c"
+input_paste = "ctrl+v"
+input_submit = "enter"
+input_newline = "shift+enter"
+history_previous = "up"
+history_next = "down"
+messages_page_up = "pgup"
+messages_page_down = "pgdown"
+messages_half_page_up = "ctrl+alt+u"
+messages_half_page_down = "ctrl+alt+d"
+messages_previous = "ctrl+alt+k"
+messages_next = "ctrl+alt+j"
+messages_first = "ctrl+g"
+messages_last = "ctrl+alt+g"
+app_exit = "ctrl+c,<leader>q"
+```
+
+#### Models.dev
+
+You can also extend the models.dev database with your own providers by mirroring the structure found [here](https://github.com/sst/models.dev/tree/dev/providers/anthropic)
+
+Start with a `provider.toml` file in `~/.config/opencode/providers`
+
+```toml
+# ~/.config/opencode/providers/openrouter/provider.toml
+[provider]
+name = "OpenRouter"
+env = ["OPENROUTER_API_KEY"]
+npm = "@openrouter/ai-sdk-provider"
+
+[options]
+baseURL = "https://api.openrouter.ai" # optional settings
+```
+
+And models in `~/.config/opencode/providers/openrouter/models/[model-id]`
+
+```toml
+# ~/.config/opencode/providers/openrouter/models/anthropic/claude-3.5-sonnet.toml
+name = "Claude 4 Sonnet"
+attachment = true
+reasoning = false
+temperature = true
+
+[cost]
+input = 3.00
+output = 15.00
+inputCached = 3.75
+outputCached = 0.30
+
+[limit]
+context = 200_000
+output = 50_000
+```
 
 ### Project Config
 
-Project configuration is optional. You can place an `opencode.json` file in the root of your repo and it will be loaded.
+Project configuration is optional. You can place an `opencode.json` file in the root of your repo and is meant to be checked in and shared with your team.
 
 ```json title="opencode.json"
 {
@@ -78,21 +184,19 @@ Project configuration is optional. You can place an `opencode.json` file in the
 
 #### Providers
 
-You can use opencode with any provider listed at [here](https://ai-sdk.dev/providers/ai-sdk-providers). Use the npm package name as the key in your config. Note we use v5 of the ai-sdk and not all providers support that yet.
+You can use opencode with any provider listed at [here](https://ai-sdk.dev/providers/ai-sdk-providers). Be sure to specify the npm package to use to load the provider.
 
 ```json title="opencode.json"
 {
   "$schema": "https://opencode.ai/config.json",
   "provider": {
-    "@ai-sdk/openai-compatible": {
-      "name": "ollama",
+    "ollama": {
+      "npm": "@ai-sdk/openai-compatible",
       "options": {
         "baseURL": "http://localhost:11434/v1"
       },
       "models": {
-        "llama2": {
-          "name": "llama2"
-        }
+        "llama2": {}
       }
     }
   }
@@ -101,30 +205,30 @@ You can use opencode with any provider listed at [here](https://ai-sdk.dev/provi
 
 ### Contributing
 
-To run opencode locally you need
+To run opencode locally you need.
 
-- bun
-- golang 1.24.x
+- Bun
+- Golang 1.24.x
 
-To run
+To run.
 
-```
+```bash
 $ bun install
-$ cd packages/opencode
-$ bun run src/index.ts
+$ bun run packages/opencode/src/index.ts
 ```
 
 ### FAQ
 
-#### How do I use this with OpenRouter
+#### How do I use this with OpenRouter?
 
-OpenRouter is not yet in the models.dev database but you can configure it manually.
+OpenRouter is not in the Models.dev database yet, but you can configure it manually.
 
 ```json title="opencode.json"
 {
   "$schema": "https://opencode.ai/config.json",
   "provider": {
-    "@openrouter/ai-sdk-provider": {
+    "openrouter": {
+      "npm": "@openrouter/ai-sdk-provider",
       "name": "OpenRouter",
       "options": {
         "apiKey": "sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
@@ -138,3 +242,24 @@ OpenRouter is not yet in the models.dev database but you can configure it manual
   }
 }
 ```
+
+#### How is this different than Claude Code?
+
+It's very similar to Claude Code in terms of capability. Here are the key differences:
+
+- 100% open source
+- Not coupled to any provider. Although Anthropic is recommended, opencode can be used with OpenAI, Google or even local models. As models evolve the gaps between them will close and pricing will drop so being provider agnostic is important.
+- A focus on TUI. opencode is built by neovim users and the creators of [terminal.shop](https://terminal.shop); we are going to push the limits of what's possible in the terminal.
+- A client/server architecture. This for example can allow opencode to run on your computer, while you can drive it remotely from a mobile app. Meaning that the TUI frontend is just one of the possible clients.
+
+#### What about Windows support?
+
+There are some minor problems blocking opencode from working on windows. We are working on on them now. You'll need to use WSL for now.
+
+#### What's the other repo?
+
+The other confusingly named repo has no relation to this one. You can [read the story behind it here](https://x.com/thdxr/status/1933561254481666466).
+
+---
+
+**Join our community** [YouTube](https://www.youtube.com/c/sst-dev) | [X.com](https://x.com/SST_dev)

bun.lock

@@ -45,6 +45,7 @@
         "zod-openapi": "4.2.4",
       },
       "devDependencies": {
+        "@ai-sdk/anthropic": "1.2.12",
         "@tsconfig/bun": "1.0.7",
         "@types/bun": "latest",
         "@types/turndown": "5.0.5",
@@ -74,7 +75,7 @@
         "sharp": "0.32.5",
         "shiki": "3.4.2",
         "solid-js": "1.9.7",
-        "toolbeam-docs-theme": "0.2.4",
+        "toolbeam-docs-theme": "0.3.0",
       },
       "devDependencies": {
         "@types/node": "catalog:",
@@ -86,6 +87,9 @@
     "sharp",
     "esbuild",
   ],
+  "patchedDependencies": {
+    "ai@4.3.16": "patches/ai@4.3.16.patch",
+  },
   "overrides": {
     "zod": "3.24.2",
   },
@@ -96,6 +100,8 @@
     "zod": "3.24.2",
   },
   "packages": {
+    "@ai-sdk/anthropic": ["@ai-sdk/anthropic@1.2.12", "", { "dependencies": { "@ai-sdk/provider": "1.1.3", "@ai-sdk/provider-utils": "2.2.8" }, "peerDependencies": { "zod": "^3.0.0" } }, "sha512-YSzjlko7JvuiyQFmI9RN1tNZdEiZxc+6xld/0tq/VkJaHpEzGAb1yiNxxvmYVcjvfu/PcvCxAAYXmTYQQ63IHQ=="],
+
     "@ai-sdk/provider": ["@ai-sdk/provider@1.1.3", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-qZMxYJ0qqX/RfnuIaab+zp8UAeJn/ygXXAffR5I4N0n1IrvA6qBsjc8hXLmBiMV2zoXlifkacF7sEFnYnjBcqg=="],
 
     "@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@2.2.8", "", { "dependencies": { "@ai-sdk/provider": "1.1.3", "nanoid": "^3.3.8", "secure-json-parse": "^2.7.0" }, "peerDependencies": { "zod": "^3.23.8" } }, "sha512-fqhG+4sCVv8x7nFzYnFo19ryhAa3w096Kmc3hWxMQfW/TubPOmt3A6tYZhl4mUfQWWQMsuSkLrtjlWuXBVSGQA=="],
@@ -1488,7 +1494,7 @@
 
     "token-types": ["token-types@6.0.0", "", { "dependencies": { "@tokenizer/token": "^0.3.0", "ieee754": "^1.2.1" } }, "sha512-lbDrTLVsHhOMljPscd0yitpozq7Ga2M5Cvez5AjGg8GASBjtt6iERCAJ93yommPmz62fb45oFIXHEZ3u9bfJEA=="],
 
-    "toolbeam-docs-theme": ["toolbeam-docs-theme@0.2.4", "", { "peerDependencies": { "@astrojs/starlight": "^0.34.3", "astro": "^5.7.13" } }, "sha512-W5mdbcgRpTBDFyEdcU81USs3MFZoXMInpSznc/AFZCwqz8atk4iBNDIlhvihpGHY54Nf5crKmZwJjxVojkHFvA=="],
+    "toolbeam-docs-theme": ["toolbeam-docs-theme@0.3.0", "", { "peerDependencies": { "@astrojs/starlight": "^0.34.3", "astro": "^5.7.13" } }, "sha512-qlBkKRp8HVYV7p7jaG9lT2lvQY7c8b9czZ0tnsJUrN2TBTtEyFJymCdkhhpZNC9U4oGZ7lLk0glRJHrndWvVsg=="],
 
     "tr46": ["tr46@0.0.3", "", {}, "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="],
 

infra/app.ts

@@ -31,17 +31,6 @@ export const api = new sst.cloudflare.Worker("Api", {
   },
 })
 
-// new sst.cloudflare.StaticSite("Web", {
-//   path: "packages/web",
-//   domain,
-//   environment: {
-//     VITE_API_URL: api.url,
-//   },
-//   build: {
-//     command: "bun run build",
-//     output: "dist",
-//   },
-// })
 new sst.cloudflare.x.Astro("Web", {
   domain,
   path: "packages/web",

opencode.json

@@ -1,16 +1,5 @@
 {
   "$schema": "https://opencode.ai/config.json",
-  "provider": {
-    "@ai-sdk/openai-compatible": {
-      "name": "ollama",
-      "options": {
-        "baseURL": "http://localhost:11434/v1"
-      },
-      "models": {
-        "qwen3": {},
-        "deepseek-r1": {},
-        "llama2": {}
-      }
-    }
-  }
+  "mcp": {},
+  "provider": {}
 }

package.json

@@ -37,5 +37,8 @@
     "esbuild",
     "protobufjs",
     "sharp"
-  ]
+  ],
+  "patchedDependencies": {
+    "ai@4.3.16": "patches/ai@4.3.16.patch"
+  }
 }

packages/opencode/AGENTS.md

@@ -19,14 +19,14 @@
 
 ## IMPORTANT
 
-- Try to keep things in one function unless composable or reusablte
+- Try to keep things in one function unless composable or reusable
 - DO NOT do unnecessary destructuring of variables
-- DO NOT use else statements unless necessary
-- DO NOT use try catch if it can be avoided
-- AVOID try catch where possible
-- AVOID else statements
+- DO NOT use `else` statements unless necessary
+- DO NOT use `try`/`catch` if it can be avoided
+- AVOID `try`/`catch` where possible
+- AVOID `else` statements
 - AVOID using `any` type
-- AVOID let statements
+- AVOID `let` statements
 - PREFER single word variable names where possible
 - Use as many bun apis as possible like Bun.file()
 

packages/opencode/config.schema.json

@@ -21,6 +21,9 @@
           "id": {
             "type": "string"
           },
+          "npm": {
+            "type": "string"
+          },
           "models": {
             "type": "object",
             "additionalProperties": {

packages/opencode/package.json

@@ -20,7 +20,8 @@
     "@types/turndown": "5.0.5",
     "@types/yargs": "17.0.33",
     "typescript": "catalog:",
-    "zod-to-json-schema": "3.24.5"
+    "zod-to-json-schema": "3.24.5",
+    "@ai-sdk/anthropic": "1.2.12"
   },
   "dependencies": {
     "@clack/prompts": "0.11.0",

packages/opencode/script/publish.ts

@@ -29,7 +29,7 @@ const targets = [
   ["linux", "x64"],
   ["darwin", "x64"],
   ["darwin", "arm64"],
-  ["windows", "x64"],
+  // ["windows", "x64"],
 ]
 
 await $`rm -rf dist`

packages/opencode/src/app/app.ts

@@ -18,6 +18,7 @@ export namespace App {
         data: z.string(),
         root: z.string(),
         cwd: z.string(),
+        state: z.string(),
       }),
       time: z.object({
         initialized: z.number().optional(),
@@ -32,7 +33,7 @@ export namespace App {
 
   const APP_JSON = "app.json"
 
-  async function create(input: { cwd: string; version: string }) {
+  async function create(input: { cwd: string }) {
     log.info("creating", {
       cwd: input.cwd,
     })
@@ -49,9 +50,7 @@ export namespace App {
     const stateFile = Bun.file(path.join(data, APP_JSON))
     const state = (await stateFile.json().catch(() => ({}))) as {
       initialized: number
-      version: string
     }
-    state.version = input.version
     await stateFile.write(JSON.stringify(state))
 
     const services = new Map<
@@ -70,13 +69,13 @@ export namespace App {
       git: git !== undefined,
       path: {
         config: Global.Path.config,
+        state: Global.Path.state,
         data,
         root: git ?? input.cwd,
         cwd: input.cwd,
       },
     }
     const result = {
-      version: input.version,
       services,
       info,
     }
@@ -108,7 +107,7 @@ export namespace App {
   }
 
   export async function provide<T>(
-    input: { cwd: string; version: string },
+    input: { cwd: string },
     cb: (app: Info) => Promise<T>,
   ) {
     const app = await create(input)
@@ -124,12 +123,11 @@ export namespace App {
   }
 
   export async function initialize() {
-    const { info, version } = ctx.use()
+    const { info } = ctx.use()
     info.time.initialized = Date.now()
     await Bun.write(
       path.join(info.path.data, APP_JSON),
       JSON.stringify({
-        version,
         initialized: Date.now(),
       }),
     )

packages/opencode/src/auth/anthropic.ts

@@ -1,5 +1,4 @@
 import { generatePKCE } from "@openauthjs/openauth/pkce"
-import fs from "fs/promises"
 import { Auth } from "./index"
 
 export namespace AuthAnthropic {
@@ -49,6 +48,7 @@ export namespace AuthAnthropic {
     await Auth.set("anthropic", {
       type: "oauth",
       refresh: json.refresh_token as string,
+      access: json.access_token as string,
       expires: Date.now() + json.expires_in * 1000,
     })
   }
@@ -56,6 +56,7 @@ export namespace AuthAnthropic {
   export async function access() {
     const info = await Auth.get("anthropic")
     if (!info || info.type !== "oauth") return
+    if (info.access && info.expires > Date.now()) return info.access
     const response = await fetch(
       "https://console.anthropic.com/v1/oauth/token",
       {
@@ -75,6 +76,7 @@ export namespace AuthAnthropic {
     await Auth.set("anthropic", {
       type: "oauth",
       refresh: json.refresh_token as string,
+      access: json.access_token as string,
       expires: Date.now() + json.expires_in * 1000,
     })
     return json.access_token as string

packages/opencode/src/auth/index.ts

@@ -7,6 +7,7 @@ export namespace Auth {
   export const Oauth = z.object({
     type: z.literal("oauth"),
     refresh: z.string(),
+    access: z.string(),
     expires: z.number(),
   })
 

packages/opencode/src/bun/index.ts

@@ -43,6 +43,7 @@ export namespace BunProc {
       version: z.string(),
     }),
   )
+
   export async function install(pkg: string, version = "latest") {
     const mod = path.join(Global.Path.cache, "node_modules", pkg)
     const pkgjson = Bun.file(path.join(Global.Path.cache, "package.json"))

packages/opencode/src/cli/cmd/auth.ts

@@ -5,7 +5,7 @@ import * as prompts from "@clack/prompts"
 import open from "open"
 import { UI } from "../ui"
 import { ModelsDev } from "../../provider/models"
-import { map, pipe, sort, sortBy, values } from "remeda"
+import { map, pipe, sortBy, values } from "remeda"
 
 export const AuthCommand = cmd({
   command: "auth",
@@ -16,7 +16,7 @@ export const AuthCommand = cmd({
       .command(AuthLogoutCommand)
       .command(AuthListCommand)
       .demandCommand(),
-  async handler(args) {},
+  async handler() {},
 })
 
 export const AuthListCommand = cmd({
@@ -78,9 +78,16 @@ export const AuthLoginCommand = cmd({
 
     if (provider === "other") {
       provider = await prompts.text({
-        message: "Enter provider - must match @ai-sdk/<provider>",
+        message: "Enter provider id",
+        validate: (x) =>
+          x.match(/^[a-z-]+$/) ? undefined : "a-z and hyphens only",
       })
       if (prompts.isCancel(provider)) throw new UI.CancelledError()
+      provider = provider.replace(/^@ai-sdk\//, "")
+      if (prompts.isCancel(provider)) throw new UI.CancelledError()
+      prompts.log.warn(
+        `This only stores a credential for ${provider} - you will need configure it in opencode.json, check the docs for examples.`,
+      )
     }
 
     if (provider === "amazon-bedrock") {
@@ -115,7 +122,9 @@ export const AuthLoginCommand = cmd({
         try {
           await open(url)
         } catch (e) {
-          prompts.log.error("Failed to open browser perhaps you are running without a display or X server, please open the following URL in your browser:")
+          prompts.log.error(
+            "Failed to open browser perhaps you are running without a display or X server, please open the following URL in your browser:",
+          )
         }
         prompts.log.info(url)
 

packages/opencode/src/cli/cmd/generate.ts

@@ -2,7 +2,6 @@ import { Server } from "../../server/server"
 import fs from "fs/promises"
 import path from "path"
 import type { CommandModule } from "yargs"
-import { Config } from "../../config/config"
 
 export const GenerateCommand = {
   command: "generate",

packages/opencode/src/cli/cmd/run.ts

@@ -6,14 +6,9 @@ import { Session } from "../../session"
 import { Share } from "../../share/share"
 import { Message } from "../../session/message"
 import { UI } from "../ui"
-import { VERSION } from "../version"
-
-const COLOR = [
-  UI.Style.TEXT_SUCCESS_BOLD,
-  UI.Style.TEXT_INFO_BOLD,
-  UI.Style.TEXT_HIGHLIGHT_BOLD,
-  UI.Style.TEXT_WARNING_BOLD,
-]
+import { cmd } from "./cmd"
+import { GlobalConfig } from "../../global/config"
+import { Flag } from "../../flag/flag"
 
 const TOOL: Record<string, [string, string]> = {
   opencode_todowrite: ["Todo", UI.Style.TEXT_WARNING_BOLD],
@@ -27,7 +22,7 @@ const TOOL: Record<string, [string, string]> = {
   opencode_write: ["Write", UI.Style.TEXT_SUCCESS_BOLD],
 }
 
-export const RunCommand = {
+export const RunCommand = cmd({
   command: "run [message..]",
   describe: "Run OpenCode with a message",
   builder: (yargs: Argv) => {
@@ -42,17 +37,16 @@ export const RunCommand = {
         describe: "Session ID to continue",
         type: "string",
       })
+      .option("share", {
+        type: "boolean",
+        describe: "Share the session",
+      })
   },
-  handler: async (args: {
-    message: string[]
-    session?: string
-    printLogs?: boolean
-  }) => {
+  handler: async (args) => {
     const message = args.message.join(" ")
     await App.provide(
       {
         cwd: process.cwd(),
-        version: VERSION,
       },
       async () => {
         await Share.init()
@@ -60,14 +54,27 @@ export const RunCommand = {
           ? await Session.get(args.session)
           : await Session.create()
 
-        UI.println(UI.Style.TEXT_HIGHLIGHT_BOLD + "◍  OpenCode", VERSION)
+        UI.empty()
+        UI.println(UI.logo())
         UI.empty()
         UI.println(UI.Style.TEXT_NORMAL_BOLD + "> ", message)
         UI.empty()
+
+        const cfg = await GlobalConfig.get()
+        if (cfg.autoshare || Flag.OPENCODE_AUTO_SHARE || args.share) {
+          await Session.share(session.id)
+          UI.println(
+            UI.Style.TEXT_INFO_BOLD +
+              "~  https://dev.opencode.ai/s/" +
+              session.id.slice(-8),
+          )
+        }
+        UI.empty()
+
+        const { providerID, modelID } = await Provider.defaultModel()
         UI.println(
-          UI.Style.TEXT_INFO_BOLD +
-            "~  https://dev.opencode.ai/s/" +
-            session.id.slice(-8),
+          UI.Style.TEXT_NORMAL_BOLD + "@ ",
+          UI.Style.TEXT_NORMAL + `${providerID}/${modelID}`,
         )
         UI.empty()
 
@@ -113,8 +120,6 @@ export const RunCommand = {
             printEvent(UI.Style.TEXT_NORMAL_BOLD, "Text", part.text)
           }
         })
-
-        const { providerID, modelID } = await Provider.defaultModel()
         await Session.chat({
           sessionID: session.id,
           providerID,
@@ -130,4 +135,4 @@ export const RunCommand = {
       },
     )
   },
-}
+})

packages/opencode/src/cli/cmd/scrap.ts

@@ -1,6 +1,5 @@
 import { App } from "../../app/app"
 import { LSP } from "../../lsp"
-import { VERSION } from "../version"
 import { cmd } from "./cmd"
 
 export const ScrapCommand = cmd({
@@ -8,9 +7,12 @@ export const ScrapCommand = cmd({
   builder: (yargs) =>
     yargs.positional("file", { type: "string", demandOption: true }),
   async handler(args) {
-    await App.provide({ cwd: process.cwd(), version: VERSION }, async (app) => {
-      await LSP.touchFile(args.file, true)
-      console.log(await LSP.diagnostics())
-    })
+    await App.provide(
+      { cwd: process.cwd() },
+      async () => {
+        await LSP.touchFile(args.file, true)
+        console.log(await LSP.diagnostics())
+      },
+    )
   },
 })

packages/opencode/src/cli/cmd/upgrade.ts

@@ -1,113 +1,7 @@
 import type { Argv } from "yargs"
 import { UI } from "../ui"
-import { VERSION } from "../version"
-import path from "path"
-import fs from "fs/promises"
-import os from "os"
 import * as prompts from "@clack/prompts"
-import { Global } from "../../global"
-
-const API = "https://api.github.com/repos/sst/opencode"
-
-interface Release {
-  tag_name: string
-  name: string
-  assets: Array<{
-    name: string
-    browser_download_url: string
-  }>
-}
-
-function asset(): string {
-  const platform = os.platform()
-  const arch = os.arch()
-
-  if (platform === "darwin") {
-    return arch === "arm64"
-      ? "opencode-darwin-arm64.zip"
-      : "opencode-darwin-x64.zip"
-  }
-  if (platform === "linux") {
-    return arch === "arm64"
-      ? "opencode-linux-arm64.zip"
-      : "opencode-linux-x64.zip"
-  }
-  if (platform === "win32") {
-    return "opencode-windows-x64.zip"
-  }
-
-  throw new Error(`Unsupported platform: ${platform}-${arch}`)
-}
-
-function compare(current: string, latest: string): number {
-  const a = current.replace(/^v/, "")
-  const b = latest.replace(/^v/, "")
-
-  const aParts = a.split(".").map(Number)
-  const bParts = b.split(".").map(Number)
-
-  for (let i = 0; i < Math.max(aParts.length, bParts.length); i++) {
-    const aPart = aParts[i] || 0
-    const bPart = bParts[i] || 0
-
-    if (aPart < bPart) return -1
-    if (aPart > bPart) return 1
-  }
-
-  return 0
-}
-
-async function latest(): Promise<Release> {
-  const response = await fetch(`${API}/releases/latest`)
-  if (!response.ok) {
-    throw new Error(`Failed to fetch latest release: ${response.statusText}`)
-  }
-  return response.json()
-}
-
-async function specific(version: string): Promise<Release> {
-  const tag = version.startsWith("v") ? version : `v${version}`
-  const response = await fetch(`${API}/releases/tags/${tag}`)
-  if (!response.ok) {
-    throw new Error(`Failed to fetch release ${tag}: ${response.statusText}`)
-  }
-  return response.json()
-}
-
-async function download(url: string): Promise<string> {
-  const response = await fetch(url)
-  if (!response.ok) {
-    throw new Error(`Failed to download: ${response.statusText}`)
-  }
-
-  const buffer = await response.arrayBuffer()
-  const temp = path.join(Global.Path.cache, `opencode-update-${Date.now()}.zip`)
-
-  await Bun.write(temp, buffer)
-
-  const extractDir = path.join(
-    Global.Path.cache,
-    `opencode-extract-${Date.now()}`,
-  )
-  await fs.mkdir(extractDir, { recursive: true })
-
-  const proc = Bun.spawn(["unzip", "-o", temp, "-d", extractDir], {
-    stdout: "pipe",
-    stderr: "pipe",
-  })
-
-  const result = await proc.exited
-  if (result !== 0) {
-    throw new Error("Failed to extract update")
-  }
-
-  await fs.unlink(temp)
-
-  const binary = path.join(extractDir, "opencode")
-  await fs.chmod(binary, 0o755)
-
-  return binary
-}
+import { Installation } from "../../installation"
 
 export const UpgradeCommand = {
   command: "upgrade [target]",
@@ -123,70 +17,28 @@ export const UpgradeCommand = {
     UI.println(UI.logo("  "))
     UI.empty()
     prompts.intro("Upgrade")
-
-    if (!process.execPath.includes(path.join(".opencode", "bin")) && false) {
+    const method = await Installation.method()
+    if (method === "unknown") {
       prompts.log.error(
         `opencode is installed to ${process.execPath} and seems to be managed by a package manager`,
       )
       prompts.outro("Done")
       return
     }
-
-    const release = args.target
-      ? await specific(args.target).catch(() => {})
-      : await latest().catch(() => {})
-    if (!release) {
-      prompts.log.error("Failed to fetch release information")
-      prompts.outro("Done")
-      return
-    }
-
-    const target = release.tag_name
-
-    if (VERSION !== "dev" && compare(VERSION, target) >= 0) {
-      prompts.log.success(`Already up to date`)
-      prompts.outro("Done")
-      return
-    }
-
-    prompts.log.info(`From ${VERSION} → ${target}`)
-
-    const name = asset()
-    const found = release.assets.find((a) => a.name === name)
-
-    if (!found) {
-      prompts.log.error(`No binary found for platform: ${name}`)
-      prompts.outro("Done")
-      return
-    }
-
+    const target = args.target ?? (await Installation.latest())
+    prompts.log.info(`From ${Installation.VERSION} → ${target}`)
     const spinner = prompts.spinner()
-    spinner.start("Downloading update...")
-
-    const downloadPath = await download(found.browser_download_url).catch(
-      () => {},
-    )
-    if (!downloadPath) {
-      spinner.stop("Download failed")
-      prompts.log.error("Download failed")
+    spinner.start("Upgrading...")
+    const err = await Installation.upgrade(method, target).catch((err) => err)
+    if (err) {
+      spinner.stop("Upgrade failed")
+      if (err instanceof Installation.UpgradeFailedError)
+        prompts.log.error(err.data.stderr)
+      else if (err instanceof Error) prompts.log.error(err.message)
       prompts.outro("Done")
       return
     }
-
-    spinner.stop("Download complete")
-
-    const renamed = await fs
-      .rename(downloadPath, process.execPath)
-      .catch(() => {})
-
-    if (renamed === undefined) {
-      prompts.log.error("Install failed")
-      await fs.unlink(downloadPath).catch(() => {})
-      prompts.outro("Done")
-      return
-    }
-
-    prompts.log.success(`Successfully upgraded to ${target}`)
+    spinner.stop("Upgrade complete")
     prompts.outro("Done")
   },
 }

packages/opencode/src/cli/ui.ts

@@ -3,9 +3,9 @@ import { NamedError } from "../util/error"
 
 export namespace UI {
   const LOGO = [
-    `█▀▀█ █▀▀█ █▀▀ █▀▀▄ █▀▀ █▀▀█ █▀▀▄ █▀▀`,
-    `█░░█ █░░█ █▀▀ █░░█ █░░ █░░█ █░░█ █▀▀`,
-    `▀▀▀▀ █▀▀▀ ▀▀▀ ▀  ▀ ▀▀▀ ▀▀▀▀ ▀▀▀  ▀▀▀`,
+    [`█▀▀█ █▀▀█ █▀▀ █▀▀▄ `, `█▀▀ █▀▀█ █▀▀▄ █▀▀`],
+    [`█░░█ █░░█ █▀▀ █░░█ `, `█░░ █░░█ █░░█ █▀▀`],
+    [`▀▀▀▀ █▀▀▀ ▀▀▀ ▀  ▀ `, `▀▀▀ ▀▀▀▀ ▀▀▀  ▀▀▀`],
   ]
 
   export const CancelledError = NamedError.create("UICancelledError", z.void())
@@ -48,12 +48,10 @@ export namespace UI {
     const result = []
     for (const row of LOGO) {
       if (pad) result.push(pad)
-      for (let i = 0; i < row.length; i++) {
-        const color =
-          i > 18 ? Bun.color("white", "ansi") : Bun.color("gray", "ansi")
-        const char = row[i]
-        result.push(color + char)
-      }
+      result.push(Bun.color("gray", "ansi"))
+      result.push(row[0])
+      result.push("\x1b[0m")
+      result.push(row[1])
       result.push("\n")
     }
     return result.join("").trimEnd()

packages/opencode/src/cli/version.ts

@@ -1,6 +0,0 @@
-declare global {
-  const OPENCODE_VERSION: string
-}
-
-export const VERSION =
-  typeof OPENCODE_VERSION === "string" ? OPENCODE_VERSION : "dev"

packages/opencode/src/external/fzf.ts

@@ -116,11 +116,15 @@ export namespace Fzf {
     return filepath
   }
 
-  export async function search(cwd: string, query: string) {
-    const results = await $`${await filepath()} --filter ${query}`
+  export async function search(input: {
+    cwd: string
+    query: string
+    limit?: number
+  }) {
+    const results = await $`${await filepath()} --filter=${input.query}`
       .quiet()
       .throws(false)
-      .cwd(cwd)
+      .cwd(input.cwd)
       .text()
     const split = results
       .trim()

packages/opencode/src/external/ripgrep.ts

@@ -1,10 +1,11 @@
-import { App } from "../app/app"
 import path from "path"
 import { Global } from "../global"
 import fs from "fs/promises"
 import { z } from "zod"
 import { NamedError } from "../util/error"
 import { lazy } from "../util/lazy"
+import { $ } from "bun"
+import { Fzf } from "./fzf"
 
 export namespace Ripgrep {
   const PLATFORM = {
@@ -111,4 +112,18 @@ export namespace Ripgrep {
     const { filepath } = await state()
     return filepath
   }
+
+  export async function files(input: {
+    cwd: string
+    query?: string
+    limit?: number
+  }) {
+    const commands = [`${await filepath()} --files --hidden --glob='!.git/*'`]
+    if (input.query)
+      commands.push(`${await Fzf.filepath()} --filter=${input.query}`)
+    if (input.limit) commands.push(`head -n ${input.limit}`)
+    const joined = commands.join(" | ")
+    const result = await $`${{ raw: joined }}`.cwd(input.cwd).text()
+    return result.split("\n").filter(Boolean)
+  }
 }

packages/opencode/src/file/index.ts

@@ -1,10 +0,0 @@
-export namespace File {
-  const glob = new Bun.Glob("**/*")
-  export async function search(path: string, query: string) {
-    for await (const entry of glob.scan({
-      cwd: path,
-      onlyFiles: true,
-    })) {
-    }
-  }
-}

packages/opencode/src/global/config.ts

@@ -0,0 +1,26 @@
+import { z } from "zod"
+import { Global } from "."
+import { lazy } from "../util/lazy"
+import path from "path"
+
+export namespace GlobalConfig {
+  export const Info = z.object({
+    provider: z.string().optional(),
+    model: z.string().optional(),
+    autoupdate: z.boolean().optional(),
+    autoshare: z.boolean().optional(),
+    disabled_providers: z.array(z.string()).optional(),
+  })
+  export type Info = z.infer<typeof Info>
+
+  export const get = lazy(async () => {
+    const toml = await import(path.join(Global.Path.config, "config"), {
+      with: {
+        type: "toml",
+      },
+    })
+      .then((mod) => mod.default)
+      .catch(() => ({}))
+    return Info.parse(toml)
+  })
+}

packages/opencode/src/global/index.ts

@@ -1,5 +1,5 @@
 import fs from "fs/promises"
-import { xdgData, xdgCache, xdgConfig } from "xdg-basedir"
+import { xdgData, xdgCache, xdgConfig, xdgState } from "xdg-basedir"
 import path from "path"
 
 const app = "opencode"
@@ -7,18 +7,23 @@ const app = "opencode"
 const data = path.join(xdgData!, app)
 const cache = path.join(xdgCache!, app)
 const config = path.join(xdgConfig!, app)
-
-await Promise.all([
-  fs.mkdir(data, { recursive: true }),
-  fs.mkdir(config, { recursive: true }),
-  fs.mkdir(cache, { recursive: true }),
-])
+const state = path.join(xdgState!, app)
 
 export namespace Global {
   export const Path = {
     data,
     bin: path.join(data, "bin"),
+    providers: path.join(config, "providers"),
     cache,
     config,
+    state,
   } as const
 }
+
+await Promise.all([
+  fs.mkdir(Global.Path.data, { recursive: true }),
+  fs.mkdir(Global.Path.config, { recursive: true }),
+  fs.mkdir(Global.Path.cache, { recursive: true }),
+  fs.mkdir(Global.Path.providers, { recursive: true }),
+  fs.mkdir(Global.Path.state, { recursive: true }),
+])

packages/opencode/src/index.ts

@@ -9,17 +9,19 @@ import yargs from "yargs"
 import { hideBin } from "yargs/helpers"
 import { RunCommand } from "./cli/cmd/run"
 import { GenerateCommand } from "./cli/cmd/generate"
-import { VERSION } from "./cli/version"
 import { ScrapCommand } from "./cli/cmd/scrap"
 import { Log } from "./util/log"
 import { AuthCommand, AuthLoginCommand } from "./cli/cmd/auth"
 import { UpgradeCommand } from "./cli/cmd/upgrade"
 import { Provider } from "./provider/provider"
 import { UI } from "./cli/ui"
+import { GlobalConfig } from "./global/config"
+import { Installation } from "./installation"
+import { Bus } from "./bus"
 
 const cli = yargs(hideBin(process.argv))
   .scriptName("opencode")
-  .version(VERSION)
+  .version(Installation.VERSION)
   .option("print-logs", {
     describe: "Print logs to stderr",
     type: "boolean",
@@ -27,7 +29,7 @@ const cli = yargs(hideBin(process.argv))
   .middleware(async () => {
     await Log.init({ print: process.argv.includes("--print-logs") })
     Log.Default.info("opencode", {
-      version: VERSION,
+      version: Installation.VERSION,
       args: process.argv.slice(2),
     })
   })
@@ -44,51 +46,65 @@ const cli = yargs(hideBin(process.argv))
       while (true) {
         const cwd = args.project ? path.resolve(args.project) : process.cwd()
         process.chdir(cwd)
-        const result = await App.provide(
-          { cwd, version: VERSION },
-          async () => {
-            const providers = await Provider.list()
-            if (Object.keys(providers).length === 0) {
-              return "needs_provider"
+        const result = await App.provide({ cwd }, async (app) => {
+          const providers = await Provider.list()
+          if (Object.keys(providers).length === 0) {
+            return "needs_provider"
+          }
+
+          await Share.init()
+          const server = Server.listen()
+
+          let cmd = ["go", "run", "./main.go"]
+          let cwd = new URL("../../tui/cmd/opencode", import.meta.url).pathname
+          if (Bun.embeddedFiles.length > 0) {
+            const blob = Bun.embeddedFiles[0] as File
+            const binary = path.join(Global.Path.cache, "tui", blob.name)
+            const file = Bun.file(binary)
+            if (!(await file.exists())) {
+              await Bun.write(file, blob, { mode: 0o755 })
+              await fs.chmod(binary, 0o755)
             }
+            cwd = process.cwd()
+            cmd = [binary]
+          }
+          const proc = Bun.spawn({
+            cmd: [...cmd, ...process.argv.slice(2)],
+            cwd,
+            stdout: "inherit",
+            stderr: "inherit",
+            stdin: "inherit",
+            env: {
+              ...process.env,
+              OPENCODE_SERVER: server.url.toString(),
+              OPENCODE_APP_INFO: JSON.stringify(app),
+            },
+            onExit: () => {
+              server.stop()
+            },
+          })
 
-            await Share.init()
-            const server = Server.listen()
+          ;(async () => {
+            if (Installation.VERSION === "dev") return
+            if (Installation.isSnapshot()) return
+            const config = await GlobalConfig.get()
+            if (config.autoupdate === false) return
+            const latest = await Installation.latest()
+            if (Installation.VERSION === latest) return
+            const method = await Installation.method()
+            if (method === "unknown") return
+            await Installation.upgrade(method, latest)
+              .then(() => {
+                Bus.publish(Installation.Event.Updated, { version: latest })
+              })
+              .catch(() => {})
+          })()
 
-            let cmd = ["go", "run", "./main.go"]
-            let cwd = new URL("../../tui/cmd/opencode", import.meta.url)
-              .pathname
-            if (Bun.embeddedFiles.length > 0) {
-              const blob = Bun.embeddedFiles[0] as File
-              const binary = path.join(Global.Path.cache, "tui", blob.name)
-              const file = Bun.file(binary)
-              if (!(await file.exists())) {
-                await Bun.write(file, blob, { mode: 0o755 })
-                await fs.chmod(binary, 0o755)
-              }
-              cwd = process.cwd()
-              cmd = [binary]
-            }
-            const proc = Bun.spawn({
-              cmd: [...cmd, ...process.argv.slice(2)],
-              cwd,
-              stdout: "inherit",
-              stderr: "inherit",
-              stdin: "inherit",
-              env: {
-                ...process.env,
-                OPENCODE_SERVER: server.url.toString(),
-              },
-              onExit: () => {
-                server.stop()
-              },
-            })
-            await proc.exited
-            await server.stop()
+          await proc.exited
+          server.stop()
 
-            return "done"
-          },
-        )
+          return "done"
+        })
         if (result === "done") break
         if (result === "needs_provider") {
           UI.empty()
@@ -104,21 +120,20 @@ const cli = yargs(hideBin(process.argv))
   .command(ScrapCommand)
   .command(AuthCommand)
   .command(UpgradeCommand)
-  .fail((msg, err) => {
+  .fail((msg) => {
     if (
       msg.startsWith("Unknown argument") ||
       msg.startsWith("Not enough non-option arguments")
     ) {
       cli.showHelp("log")
     }
-    Log.Default.error(msg, {
-      err,
-    })
   })
   .strict()
 
 try {
   await cli.parse()
 } catch (e) {
-  Log.Default.error(e)
+  Log.Default.error(e, {
+    stack: e instanceof Error ? e.stack : undefined,
+  })
 }

packages/opencode/src/installation/index.ts

@@ -0,0 +1,122 @@
+import path from "path"
+import { $ } from "bun"
+import { z } from "zod"
+import { NamedError } from "../util/error"
+import { Bus } from "../bus"
+
+declare global {
+  const OPENCODE_VERSION: string
+}
+
+export namespace Installation {
+  export type Method = Awaited<ReturnType<typeof method>>
+
+  export const Event = {
+    Updated: Bus.event(
+      "installation.updated",
+      z.object({
+        version: z.string(),
+      }),
+    ),
+  }
+
+  export const Info = z
+    .object({
+      version: z.string(),
+      latest: z.string(),
+    })
+    .openapi({
+      ref: "InstallationInfo",
+    })
+  export type Info = z.infer<typeof Info>
+
+  export async function info() {
+    return {
+      version: VERSION,
+      latest: await latest(),
+    }
+  }
+
+  export function isSnapshot() {
+    return VERSION.startsWith("0.0.0")
+  }
+
+  export async function method() {
+    if (process.execPath.includes(path.join(".opencode", "bin"))) return "curl"
+    const exec = process.execPath.toLowerCase()
+
+    const checks = [
+      {
+        name: "npm" as const,
+        command: () => $`npm list -g --depth=0`.throws(false).text(),
+      },
+      {
+        name: "yarn" as const,
+        command: () => $`yarn global list`.throws(false).text(),
+      },
+      {
+        name: "pnpm" as const,
+        command: () => $`pnpm list -g --depth=0`.throws(false).text(),
+      },
+      {
+        name: "bun" as const,
+        command: () => $`bun pm ls -g`.throws(false).text(),
+      },
+    ]
+
+    checks.sort((a, b) => {
+      const aMatches = exec.includes(a.name)
+      const bMatches = exec.includes(b.name)
+      if (aMatches && !bMatches) return -1
+      if (!aMatches && bMatches) return 1
+      return 0
+    })
+
+    for (const check of checks) {
+      const output = await check.command()
+      if (output.includes("opencode-ai")) {
+        return check.name
+      }
+    }
+
+    return "unknown"
+  }
+
+  export const UpgradeFailedError = NamedError.create(
+    "UpgradeFailedError",
+    z.object({
+      stderr: z.string(),
+    }),
+  )
+
+  export async function upgrade(method: Method, target: string) {
+    const cmd = (() => {
+      switch (method) {
+        case "curl":
+          return $`curl -fsSL https://opencode.ai/install | bash`
+        case "npm":
+          return $`npm install -g opencode-ai@${target}`
+        case "pnpm":
+          return $`pnpm install -g opencode-ai@${target}`
+        case "bun":
+          return $`bun install -g opencode-ai@${target}`
+        default:
+          throw new Error(`Unknown method: ${method}`)
+      }
+    })()
+    const result = await cmd.quiet().throws(false)
+    if (result.exitCode !== 0)
+      throw new UpgradeFailedError({
+        stderr: result.stderr.toString("utf8"),
+      })
+  }
+
+  export const VERSION =
+    typeof OPENCODE_VERSION === "string" ? OPENCODE_VERSION : "dev"
+
+  export async function latest() {
+    return fetch("https://api.github.com/repos/sst/opencode/releases/latest")
+      .then((res) => res.json())
+      .then((data) => data.tag_name.slice(1) as string)
+  }
+}

packages/opencode/src/provider/models.ts

@@ -1,5 +1,4 @@
 import { Global } from "../global"
-import { lazy } from "../util/lazy"
 import { Log } from "../util/log"
 import path from "path"
 import { z } from "zod"
@@ -17,8 +16,8 @@ export namespace ModelsDev {
       cost: z.object({
         input: z.number(),
         output: z.number(),
-        inputCached: z.number(),
-        outputCached: z.number(),
+        cache_read: z.number().optional(),
+        cache_write: z.number().optional(),
       }),
       limit: z.object({
         context: z.number(),
@@ -36,6 +35,7 @@ export namespace ModelsDev {
       name: z.string(),
       env: z.array(z.string()),
       id: z.string(),
+      npm: z.string().optional(),
       models: z.record(Model),
     })
     .openapi({
@@ -63,30 +63,4 @@ export namespace ModelsDev {
       throw new Error(`Failed to fetch models.dev: ${result.statusText}`)
     await Bun.write(file, result)
   }
-
-  const aisdk = lazy(async () => {
-    log.info("fetching ai-sdk")
-    const response = await fetch(
-      "https://registry.npmjs.org/-/v1/search?text=scope:@ai-sdk",
-    )
-    if (!response.ok)
-      throw new Error(
-        `Failed to fetch ai-sdk information: ${response.statusText}`,
-      )
-    const result = await response.json()
-    log.info("found ai-sdk", result.objects.length)
-    return result.objects
-      .filter((obj: any) => obj.package.name.startsWith("@ai-sdk/"))
-      .reduce((acc: any, obj: any) => {
-        acc[obj.package.name] = obj
-        return acc
-      }, {})
-  })
-
-  export async function pkg(providerID: string): Promise<[string, string]> {
-    const packages = await aisdk()
-    const match = packages[`@ai-sdk/${providerID}`]
-    if (match) return [match.package.name, "latest"]
-    return [providerID, "latest"]
-  }
 }

packages/opencode/src/provider/provider.ts

@@ -1,4 +1,5 @@
 import z from "zod"
+import path from "path"
 import { App } from "../app/app"
 import { Config } from "../config/config"
 import { mergeDeep, sortBy } from "remeda"
@@ -23,6 +24,8 @@ import { ModelsDev } from "./models"
 import { NamedError } from "../util/error"
 import { Auth } from "../auth"
 import { TaskTool } from "../tool/task"
+import { GlobalConfig } from "../global/config"
+import { Global } from "../global"
 
 export namespace Provider {
   const log = Log.create({ service: "provider" })
@@ -40,16 +43,23 @@ export namespace Provider {
       for (const model of Object.values(provider.models)) {
         model.cost = {
           input: 0,
-          inputCached: 0,
           output: 0,
-          outputCached: 0,
         }
       }
       return {
         apiKey: "",
-        headers: {
-          authorization: `Bearer ${access}`,
-          "anthropic-beta": "oauth-2025-04-20",
+        async fetch(input: any, init: any) {
+          const access = await AuthAnthropic.access()
+          const headers = {
+            ...init.headers,
+            authorization: `Bearer ${access}`,
+            "anthropic-beta": "oauth-2025-04-20",
+          }
+          delete headers["x-api-key"]
+          return fetch(input, {
+            ...init,
+            headers,
+          })
         },
       }
     },
@@ -91,9 +101,11 @@ export namespace Provider {
     ) {
       const provider = providers[id]
       if (!provider) {
+        const info = database[id]
+        if (!info) return
         providers[id] = {
           source,
-          info: database[id],
+          info,
           options,
         }
         return
@@ -102,12 +114,39 @@ export namespace Provider {
       provider.source = source
     }
 
-    for (const [providerID, provider] of Object.entries(
-      config.provider ?? {},
-    )) {
+    const configProviders = Object.entries(config.provider ?? {})
+    for await (const providerPath of new Bun.Glob("*/provider.toml").scan({
+      cwd: Global.Path.providers,
+    })) {
+      const [providerID] = providerPath.split("/")
+      const toml = await import(
+        path.join(Global.Path.providers, providerPath),
+        {
+          with: {
+            type: "toml",
+          },
+        }
+      ).then((mod) => mod.default)
+      toml.models = {}
+      const modelsPath = path.join(Global.Path.providers, providerID, "models")
+      for await (const modelPath of new Bun.Glob("**/*.toml").scan({
+        cwd: modelsPath,
+      })) {
+        const modelID = modelPath.slice(0, -5)
+        toml.models[modelID] = await import(path.join(modelsPath, modelPath), {
+          with: {
+            type: "toml",
+          },
+        })
+      }
+      configProviders.unshift([providerID, toml])
+    }
+
+    for (const [providerID, provider] of configProviders) {
       const existing = database[providerID]
       const parsed: ModelsDev.Provider = {
         id: providerID,
+        npm: provider.npm ?? existing?.npm,
         name: provider.name ?? existing?.name ?? providerID,
         env: provider.env ?? existing?.env ?? [],
         models: existing?.models ?? {},
@@ -139,8 +178,12 @@ export namespace Provider {
       database[providerID] = parsed
     }
 
+    const disabled = await GlobalConfig.get().then(
+      (cfg) => new Set(cfg.disabled_providers ?? []),
+    )
     // load env
     for (const [providerID, provider] of Object.entries(database)) {
+      if (disabled.has(providerID)) continue
       if (provider.env.some((item) => process.env[item])) {
         mergeProvider(providerID, {}, "env")
       }
@@ -148,6 +191,7 @@ export namespace Provider {
 
     // load apikeys
     for (const [providerID, provider] of Object.entries(await Auth.all())) {
+      if (disabled.has(providerID)) continue
       if (provider.type === "api") {
         mergeProvider(providerID, { apiKey: provider.key }, "api")
       }
@@ -155,14 +199,13 @@ export namespace Provider {
 
     // load custom
     for (const [providerID, fn] of Object.entries(CUSTOM_LOADERS)) {
+      if (disabled.has(providerID)) continue
       const result = await fn(database[providerID])
       if (result) mergeProvider(providerID, result, "custom")
     }
 
     // load config
-    for (const [providerID, provider] of Object.entries(
-      config.provider ?? {},
-    )) {
+    for (const [providerID, provider] of configProviders) {
       mergeProvider(providerID, provider.options ?? {}, "config")
     }
 
@@ -181,22 +224,22 @@ export namespace Provider {
     return state().then((state) => state.providers)
   }
 
-  async function getSDK(providerID: string) {
+  async function getSDK(provider: ModelsDev.Provider) {
     return (async () => {
       using _ = log.time("getSDK", {
-        providerID,
+        providerID: provider.id,
       })
       const s = await state()
-      const existing = s.sdk.get(providerID)
+      const existing = s.sdk.get(provider.id)
       if (existing) return existing
-      const [pkg, version] = await ModelsDev.pkg(providerID)
-      const mod = await import(await BunProc.install(pkg, version))
+      const pkg = provider.npm ?? provider.id
+      const mod = await import(await BunProc.install(pkg, "latest"))
       const fn = mod[Object.keys(mod).find((key) => key.startsWith("create"))!]
-      const loaded = fn(s.providers[providerID]?.options)
-      s.sdk.set(providerID, loaded)
+      const loaded = fn(s.providers[provider.id]?.options)
+      s.sdk.set(provider.id, loaded)
       return loaded as SDK
     })().catch((e) => {
-      throw new InitError({ providerID: providerID }, { cause: e })
+      throw new InitError({ providerID: provider.id }, { cause: e })
     })
   }
 
@@ -214,8 +257,7 @@ export namespace Provider {
     if (!provider) throw new ModelNotFoundError({ providerID, modelID })
     const info = provider.info.models[modelID]
     if (!info) throw new ModelNotFoundError({ providerID, modelID })
-
-    const sdk = await getSDK(providerID)
+    const sdk = await getSDK(provider.info)
 
     try {
       const language =
@@ -257,7 +299,10 @@ export namespace Provider {
   }
 
   export async function defaultModel() {
-    const [provider] = await list().then((val) => Object.values(val))
+    const cfg = await GlobalConfig.get()
+    const provider = await list()
+      .then((val) => Object.values(val))
+      .then((x) => x.find((p) => !cfg.provider || cfg.provider === p.info.id))
     if (!provider) throw new Error("no providers found")
     const [model] = sort(Object.values(provider.info.models))
     if (!model) throw new Error("no models found")
@@ -285,11 +330,16 @@ export namespace Provider {
     TaskTool,
     TodoReadTool,
   ]
+
   const TOOL_MAPPING: Record<string, Tool.Info[]> = {
     anthropic: TOOLS.filter((t) => t.id !== "opencode.patch"),
-    openai: TOOLS,
+    openai: TOOLS.map((t) => ({
+      ...t,
+      parameters: optionalToNullable(t.parameters),
+    })),
     google: TOOLS,
   }
+
   export async function tools(providerID: string) {
     /*
     const cfg = await Config.get()
@@ -301,6 +351,38 @@ export namespace Provider {
     return TOOL_MAPPING[providerID] ?? TOOLS
   }
 
+  function optionalToNullable(schema: z.ZodTypeAny): z.ZodTypeAny {
+    if (schema instanceof z.ZodObject) {
+      const shape = schema.shape
+      const newShape: Record<string, z.ZodTypeAny> = {}
+
+      for (const [key, value] of Object.entries(shape)) {
+        const zodValue = value as z.ZodTypeAny
+        if (zodValue instanceof z.ZodOptional) {
+          newShape[key] = zodValue.unwrap().nullable()
+        } else {
+          newShape[key] = optionalToNullable(zodValue)
+        }
+      }
+
+      return z.object(newShape)
+    }
+
+    if (schema instanceof z.ZodArray) {
+      return z.array(optionalToNullable(schema.element))
+    }
+
+    if (schema instanceof z.ZodUnion) {
+      return z.union(
+        schema.options.map((option: z.ZodTypeAny) =>
+          optionalToNullable(option),
+        ) as [z.ZodTypeAny, z.ZodTypeAny, ...z.ZodTypeAny[]],
+      )
+    }
+
+    return schema
+  }
+
   export const ModelNotFoundError = NamedError.create(
     "ProviderModelNotFoundError",
     z.object({

packages/opencode/src/server/server.ts

@@ -12,8 +12,9 @@ import { App } from "../app/app"
 import { Global } from "../global"
 import { mapValues } from "remeda"
 import { NamedError } from "../util/error"
-import { Fzf } from "../external/fzf"
 import { ModelsDev } from "../provider/models"
+import { Ripgrep } from "../external/ripgrep"
+import { Installation } from "../installation"
 
 const ERRORS = {
   400: {
@@ -457,10 +458,33 @@ export namespace Server {
         async (c) => {
           const body = c.req.valid("json")
           const app = App.info()
-          const result = await Fzf.search(app.path.cwd, body.query)
+          const result = await Ripgrep.files({
+            cwd: app.path.cwd,
+            query: body.query,
+            limit: 10,
+          })
           return c.json(result)
         },
       )
+      .post(
+        "installation_info",
+        describeRoute({
+          description: "Get installation info",
+          responses: {
+            200: {
+              description: "Get installation info",
+              content: {
+                "application/json": {
+                  schema: resolver(Installation.Info),
+                },
+              },
+            },
+          },
+        }),
+        async (c) => {
+          return c.json(Installation.info())
+        },
+      )
 
     return result
   }

packages/opencode/src/session/index.ts

@@ -13,6 +13,7 @@ import {
   type LanguageModelUsage,
   type CoreMessage,
   type UIMessage,
+  type ProviderMetadata,
 } from "ai"
 import { z, ZodSchema } from "zod"
 import { Decimal } from "decimal.js"
@@ -29,6 +30,8 @@ import type { Tool } from "../tool/tool"
 import { SystemPrompt } from "./system"
 import { Flag } from "../flag/flag"
 import type { ModelsDev } from "../provider/models"
+import { GlobalConfig } from "../global/config"
+import { Installation } from "../installation"
 
 export namespace Session {
   const log = Log.create({ service: "session" })
@@ -44,6 +47,7 @@ export namespace Session {
         })
         .optional(),
       title: z.string(),
+      version: z.string(),
       time: z.object({
         created: z.number(),
         updated: z.number(),
@@ -69,19 +73,30 @@ export namespace Session {
     ),
   }
 
-  const state = App.state("session", () => {
-    const sessions = new Map<string, Info>()
-    const messages = new Map<string, Message.Info[]>()
+  const state = App.state(
+    "session",
+    () => {
+      const sessions = new Map<string, Info>()
+      const messages = new Map<string, Message.Info[]>()
+      const pending = new Map<string, AbortController>()
 
-    return {
-      sessions,
-      messages,
-    }
-  })
+      return {
+        sessions,
+        messages,
+        pending,
+      }
+    },
+    async (state) => {
+      for (const [_, controller] of state.pending) {
+        controller.abort()
+      }
+    },
+  )
 
   export async function create(parentID?: string) {
     const result: Info = {
       id: Identifier.descending("session"),
+      version: Installation.VERSION,
       parentID,
       title:
         (parentID ? "Child session - " : "New Session - ") +
@@ -94,7 +109,8 @@ export namespace Session {
     log.info("created", result)
     state().sessions.set(result.id, result)
     await Storage.writeJSON("session/info/" + result.id, result)
-    if (!result.parentID && Flag.OPENCODE_AUTO_SHARE)
+    const cfg = await GlobalConfig.get()
+    if (!result.parentID && (Flag.OPENCODE_AUTO_SHARE || cfg.autoshare))
       share(result.id).then((share) => {
         update(result.id, (draft) => {
           draft.share = share
@@ -168,10 +184,10 @@ export namespace Session {
   }
 
   export function abort(sessionID: string) {
-    const controller = pending.get(sessionID)
+    const controller = state().pending.get(sessionID)
     if (!controller) return false
     controller.abort()
-    pending.delete(sessionID)
+    state().pending.delete(sessionID)
     return true
   }
 
@@ -203,10 +219,13 @@ export namespace Session {
     if (previous?.metadata.assistant) {
       const tokens =
         previous.metadata.assistant.tokens.input +
+        previous.metadata.assistant.tokens.cache.read +
+        previous.metadata.assistant.tokens.cache.write +
         previous.metadata.assistant.tokens.output
       if (
+        model.info.limit.context &&
         tokens >
-        (model.info.limit.context - (model.info.limit.output ?? 0)) * 0.9
+          (model.info.limit.context - (model.info.limit.output ?? 0)) * 0.9
       ) {
         await summarize({
           sessionID: input.sessionID,
@@ -234,6 +253,15 @@ export namespace Session {
             (x): CoreMessage => ({
               role: "system",
               content: x,
+              providerOptions: {
+                ...(input.providerID === "anthropic"
+                  ? {
+                      anthropic: {
+                        cacheControl: { type: "ephemeral" },
+                      },
+                    }
+                  : {}),
+              },
             }),
           ),
           ...convertToCoreMessages([
@@ -252,7 +280,7 @@ export namespace Session {
               draft.title = result.text
             })
         })
-        .catch((e) => {})
+        .catch(() => {})
     }
     const msg: Message.Info = {
       role: "user",
@@ -270,7 +298,7 @@ export namespace Session {
     msgs.push(msg)
 
     const system = input.system ?? SystemPrompt.provider(input.providerID)
-    system.push(...(await SystemPrompt.environment(input.sessionID)))
+    system.push(...(await SystemPrompt.environment()))
     system.push(...(await SystemPrompt.custom()))
 
     const next: Message.Info = {
@@ -289,6 +317,7 @@ export namespace Session {
             input: 0,
             output: 0,
             reasoning: 0,
+            cache: { read: 0, write: 0 },
           },
           modelID: input.modelID,
           providerID: input.providerID,
@@ -315,6 +344,16 @@ export namespace Session {
               sessionID: input.sessionID,
               abort: abort.signal,
               messageID: next.id,
+              metadata: async (val) => {
+                next.metadata.tool[opts.toolCallId] = {
+                  ...val,
+                  time: {
+                    start: 0,
+                    end: 0,
+                  },
+                }
+                await updateMessage(next)
+              },
             })
             next.metadata!.tool![opts.toolCallId] = {
               ...result.metadata,
@@ -379,13 +418,29 @@ export namespace Session {
     }
 
     let text: Message.TextPart | undefined
+    await Bun.write(
+      "/tmp/message.json",
+      JSON.stringify(
+        [
+          ...system.map(
+            (x): CoreMessage => ({
+              role: "system",
+              content: x,
+            }),
+          ),
+          ...convertToCoreMessages(
+            msgs.map(toUIMessage).filter((x) => x.parts.length > 0),
+          ),
+        ],
+        null,
+        2,
+      ),
+    )
     const result = streamText({
       onStepFinish: async (step) => {
-        log.info("step finish", {
-          finishReason: step.finishReason,
-        })
+        log.info("step finish", { finishReason: step.finishReason })
         const assistant = next.metadata!.assistant!
-        const usage = getUsage(step.usage, model.info)
+        const usage = getUsage(model.info, step.usage, step.providerMetadata)
         assistant.cost += usage.cost
         assistant.tokens = usage.tokens
         await updateMessage(next)
@@ -399,8 +454,11 @@ export namespace Session {
         text = undefined
       },
       async onFinish(input) {
+        log.info("message finish", {
+          reason: input.finishReason,
+        })
         const assistant = next.metadata!.assistant!
-        const usage = getUsage(input.usage, model.info)
+        const usage = getUsage(model.info, input.usage, input.providerMetadata)
         assistant.cost = usage.cost
         await updateMessage(next)
       },
@@ -444,18 +502,26 @@ export namespace Session {
       maxSteps: 1000,
       messages: [
         ...system.map(
-          (x): CoreMessage => ({
+          (x, index): CoreMessage => ({
             role: "system",
             content: x,
+            providerOptions: {
+              ...(input.providerID === "anthropic" && index < 4
+                ? {
+                    anthropic: {
+                      cacheControl: { type: "ephemeral" },
+                    },
+                  }
+                : {}),
+            },
           }),
         ),
         ...convertToCoreMessages(
           msgs.map(toUIMessage).filter((x) => x.parts.length > 0),
         ),
       ],
-      temperature: model.info.id === "codex-mini-latest" ? undefined : 0,
+      temperature: model.info.temperature ? 0 : undefined,
       tools: {
-        ...(await MCP.tools()),
         ...tools,
       },
       model: model.language,
@@ -639,6 +705,7 @@ export namespace Session {
             input: 0,
             output: 0,
             reasoning: 0,
+            cache: { read: 0, write: 0 },
           },
         },
         time: {
@@ -674,37 +741,56 @@ export namespace Session {
       text: result.text,
     })
     const assistant = next.metadata!.assistant!
-    const usage = getUsage(result.usage, model.info)
+    const usage = getUsage(model.info, result.usage, result.providerMetadata)
     assistant.cost = usage.cost
     assistant.tokens = usage.tokens
     await updateMessage(next)
   }
 
-  const pending = new Map<string, AbortController>()
   function lock(sessionID: string) {
     log.info("locking", { sessionID })
-    if (pending.has(sessionID)) throw new BusyError(sessionID)
+    if (state().pending.has(sessionID)) throw new BusyError(sessionID)
     const controller = new AbortController()
-    pending.set(sessionID, controller)
+    state().pending.set(sessionID, controller)
     return {
       signal: controller.signal,
       [Symbol.dispose]() {
         log.info("unlocking", { sessionID })
-        pending.delete(sessionID)
+        state().pending.delete(sessionID)
       },
     }
   }
 
-  function getUsage(usage: LanguageModelUsage, model: ModelsDev.Model) {
+  function getUsage(
+    model: ModelsDev.Model,
+    usage: LanguageModelUsage,
+    metadata?: ProviderMetadata,
+  ) {
     const tokens = {
       input: usage.promptTokens ?? 0,
       output: usage.completionTokens ?? 0,
       reasoning: 0,
+      cache: {
+        write: (metadata?.["anthropic"]?.["cacheCreationInputTokens"] ??
+          0) as number,
+        read: (metadata?.["anthropic"]?.["cacheReadInputTokens"] ??
+          0) as number,
+      },
     }
     return {
       cost: new Decimal(0)
         .add(new Decimal(tokens.input).mul(model.cost.input).div(1_000_000))
         .add(new Decimal(tokens.output).mul(model.cost.output).div(1_000_000))
+        .add(
+          new Decimal(tokens.cache.read)
+            .mul(model.cost.cache_read ?? 0)
+            .div(1_000_000),
+        )
+        .add(
+          new Decimal(tokens.cache.write)
+            .mul(model.cost.cache_write ?? 0)
+            .div(1_000_000),
+        )
         .toNumber(),
       tokens,
     }

packages/opencode/src/session/message.ts

@@ -174,6 +174,10 @@ export namespace Message {
               input: z.number(),
               output: z.number(),
               reasoning: z.number(),
+              cache: z.object({
+                read: z.number(),
+                write: z.number(),
+              }),
             }),
           })
           .optional(),

packages/opencode/src/session/prompt/title.txt

@@ -1,4 +1,4 @@
-you will generate a short title based on the first message a user begins a conversation with
+You will generate a short title based on the first message a user begins a conversation with
 - ensure it is not more than 50 characters long
 - the title should be a summary of the user's message
 - it should be one line long

packages/opencode/src/session/system.ts

@@ -1,5 +1,5 @@
 import { App } from "../app/app"
-import { ListTool } from "../tool/ls"
+import { Ripgrep } from "../external/ripgrep"
 import { Filesystem } from "../util/filesystem"
 
 import PROMPT_ANTHROPIC from "./prompt/anthropic.txt"
@@ -22,8 +22,57 @@ export namespace SystemPrompt {
     return result
   }
 
-  export async function environment(sessionID: string) {
+  export async function environment() {
     const app = App.info()
+
+    const tree = async () => {
+      const files = await Ripgrep.files({
+        cwd: app.path.cwd,
+      })
+      type Node = {
+        children: Record<string, Node>
+      }
+      const root: Node = {
+        children: {},
+      }
+      for (const file of files) {
+        const parts = file.split("/")
+        let node = root
+        for (const part of parts) {
+          const existing = node.children[part]
+          if (existing) {
+            node = existing
+            continue
+          }
+          node.children[part] = {
+            children: {},
+          }
+          node = node.children[part]
+        }
+      }
+
+      function render(path: string[], node: Node): string {
+        // if (path.length === 3) return "\t".repeat(path.length) + "..."
+        const lines: string[] = []
+        const entries = Object.entries(node.children).sort(([a], [b]) =>
+          a.localeCompare(b),
+        )
+
+        for (const [name, child] of entries) {
+          const currentPath = [...path, name]
+          const indent = "\t".repeat(path.length)
+          const hasChildren = Object.keys(child.children).length > 0
+          lines.push(`${indent}${name}` + (hasChildren ? "/" : ""))
+
+          if (hasChildren) lines.push(render(currentPath, child))
+        }
+
+        return lines.join("\n")
+      }
+      const result = render([], root)
+      return result
+    }
+
     return [
       [
         `Here is some useful information about the environment you are running in:`,
@@ -34,7 +83,7 @@ export namespace SystemPrompt {
         `  Today's date: ${new Date().toDateString()}`,
         `</env>`,
         `<project>`,
-        `  ${app.git ? await ListTool.execute({ path: app.path.cwd, ignore: [] }, { sessionID: sessionID, messageID: "", abort: AbortSignal.any([]) }).then((x) => x.output) : ""}`,
+        `  ${app.git ? await tree() : ""}`,
         `</project>`,
       ].join("\n"),
     ]

packages/opencode/src/storage/storage.ts

@@ -24,8 +24,6 @@ export namespace Storage {
     }
   })
 
-  const locks = new Map<string, Promise<void>>()
-
   export async function readJSON<T>(key: string) {
     return Bun.file(path.join(state().dir, key + ".json")).json() as Promise<T>
   }

packages/opencode/src/tool/bash.ts

@@ -35,7 +35,7 @@ export const BashTool = Tool.define({
       .min(0)
       .max(MAX_TIMEOUT)
       .describe("Optional timeout in milliseconds")
-      .nullable(),
+      .optional(),
     description: z
       .string()
       .describe(

packages/opencode/src/tool/edit.ts

@@ -21,7 +21,7 @@ export const EditTool = Tool.define({
       ),
     replaceAll: z
       .boolean()
-      .nullable()
+      .optional()
       .describe("Replace all occurences of old_string (default false)"),
   }),
   async execute(params, ctx) {
@@ -87,7 +87,9 @@ export const EditTool = Tool.define({
       await file.write(contentNew)
     })()
 
-    const diff = createTwoFilesPatch(filepath, filepath, contentOld, contentNew)
+    const diff = trimDiff(
+      createTwoFilesPatch(filepath, filepath, contentOld, contentNew),
+    )
 
     FileTimes.read(ctx.sessionID, filepath)
 
@@ -113,3 +115,39 @@ export const EditTool = Tool.define({
     }
   },
 })
+
+function trimDiff(diff: string): string {
+  const lines = diff.split("\n")
+  const contentLines = lines.filter(
+    (line) =>
+      (line.startsWith("+") || line.startsWith("-") || line.startsWith(" ")) &&
+      !line.startsWith("---") &&
+      !line.startsWith("+++"),
+  )
+
+  if (contentLines.length === 0) return diff
+
+  let min = Infinity
+  for (const line of contentLines) {
+    const content = line.slice(1)
+    if (content.trim().length > 0) {
+      const match = content.match(/^(\s*)/)
+      if (match) min = Math.min(min, match[1].length)
+    }
+  }
+  if (min === Infinity || min === 0) return diff
+  const trimmedLines = lines.map((line) => {
+    if (
+      (line.startsWith("+") || line.startsWith("-") || line.startsWith(" ")) &&
+      !line.startsWith("---") &&
+      !line.startsWith("+++")
+    ) {
+      const prefix = line[0]
+      const content = line.slice(1)
+      return prefix + content.slice(min)
+    }
+    return line
+  })
+
+  return trimmedLines.join("\n")
+}

packages/opencode/src/tool/glob.ts

@@ -11,7 +11,7 @@ export const GlobTool = Tool.define({
     pattern: z.string().describe("The glob pattern to match files against"),
     path: z
       .string()
-      .nullable()
+      .optional()
       .describe(
         `The directory to search in. If not specified, the current working directory will be used. IMPORTANT: Omit this field to use the default directory. DO NOT enter "undefined" or "null" - simply omit it for the default behavior. Must be a valid directory path if provided.`,
       ),

packages/opencode/src/tool/grep.ts

@@ -14,13 +14,13 @@ export const GrepTool = Tool.define({
       .describe("The regex pattern to search for in file contents"),
     path: z
       .string()
-      .nullable()
+      .optional()
       .describe(
         "The directory to search in. Defaults to the current working directory.",
       ),
     include: z
       .string()
-      .nullable()
+      .optional()
       .describe(
         'File pattern to include in the search (e.g. "*.js", "*.{ts,tsx}")',
       ),

packages/opencode/src/tool/ls.ts

@@ -4,7 +4,7 @@ import { App } from "../app/app"
 import * as path from "path"
 import DESCRIPTION from "./ls.txt"
 
-const IGNORE_PATTERNS = [
+export const IGNORE_PATTERNS = [
   "node_modules/",
   "__pycache__/",
   ".git/",
@@ -18,6 +18,8 @@ const IGNORE_PATTERNS = [
   ".vscode/",
 ]
 
+const LIMIT = 100
+
 export const ListTool = Tool.define({
   id: "opencode.list",
   description: DESCRIPTION,
@@ -27,11 +29,11 @@ export const ListTool = Tool.define({
       .describe(
         "The absolute path to the directory to list (must be absolute, not relative)",
       )
-      .nullable(),
+      .optional(),
     ignore: z
       .array(z.string())
       .describe("List of glob patterns to ignore")
-      .nullable(),
+      .optional(),
   }),
   async execute(params) {
     const app = App.info()
@@ -45,7 +47,7 @@ export const ListTool = Tool.define({
       if (params.ignore?.some((pattern) => new Bun.Glob(pattern).match(file)))
         continue
       files.push(file)
-      if (files.length >= 1000) break
+      if (files.length >= LIMIT) break
     }
 
     // Build directory structure
@@ -99,7 +101,7 @@ export const ListTool = Tool.define({
     return {
       metadata: {
         count: files.length,
-        truncated: files.length >= 1000,
+        truncated: files.length >= LIMIT,
         title: path.relative(app.path.root, searchPath),
       },
       output,

packages/opencode/src/tool/patch.ts

@@ -4,7 +4,6 @@ import * as fs from "fs/promises"
 import { Tool } from "./tool"
 import { FileTimes } from "./util/file-times"
 import DESCRIPTION from "./patch.txt"
-import { App } from "../app/app"
 
 const PatchParams = z.object({
   patchText: z

packages/opencode/src/tool/read.ts

@@ -19,11 +19,11 @@ export const ReadTool = Tool.define({
     offset: z
       .number()
       .describe("The line number to start reading from (0-based)")
-      .nullable(),
+      .optional(),
     limit: z
       .number()
       .describe("The number of lines to read (defaults to 2000)")
-      .nullable(),
+      .optional(),
   }),
   async execute(params, ctx) {
     let filePath = params.filePath

packages/opencode/src/tool/task.ts

@@ -2,6 +2,8 @@ import { Tool } from "./tool"
 import DESCRIPTION from "./task.txt"
 import { z } from "zod"
 import { Session } from "../session"
+import { Bus } from "../bus"
+import { Message } from "../session/message"
 
 export const TaskTool = Tool.define({
   id: "opencode.task",
@@ -17,6 +19,28 @@ export const TaskTool = Tool.define({
     const msg = await Session.getMessage(ctx.sessionID, ctx.messageID)
     const metadata = msg.metadata.assistant!
 
+    function summary(input: Message.Info) {
+      const result = []
+
+      for (const part of input.parts) {
+        if (part.type === "tool-invocation") {
+          result.push({
+            toolInvocation: part.toolInvocation,
+            metadata: input.metadata.tool[part.toolInvocation.toolCallId],
+          })
+        }
+      }
+      return result
+    }
+
+    const unsub = Bus.subscribe(Message.Event.Updated, async (evt) => {
+      if (evt.properties.info.metadata.sessionID !== ctx.sessionID) return
+      ctx.metadata({
+        title: params.description,
+        summary: summary(evt.properties.info),
+      })
+    })
+
     const result = await Session.chat({
       sessionID: session.id,
       modelID: metadata.modelID,
@@ -28,10 +52,11 @@ export const TaskTool = Tool.define({
         },
       ],
     })
-
+    unsub()
     return {
       metadata: {
         title: params.description,
+        summary: summary(result),
       },
       output: result.parts.findLast((x) => x.type === "text")!.text,
     }

packages/opencode/src/tool/tool.ts

@@ -5,10 +5,11 @@ export namespace Tool {
     title: string
     [key: string]: any
   }
-  export type Context = {
+  export type Context<M extends Metadata = Metadata> = {
     sessionID: string
     messageID: string
     abort: AbortSignal
+    metadata(meta: M): void
   }
   export interface Info<
     Parameters extends StandardSchemaV1 = StandardSchemaV1,

packages/opencode/src/tool/webfetch.ts

@@ -22,7 +22,7 @@ export const WebFetchTool = Tool.define({
       .min(0)
       .max(MAX_TIMEOUT / 1000)
       .describe("Optional timeout in seconds (max 120)")
-      .nullable(),
+      .optional(),
   }),
   async execute(params, ctx) {
     // Validate URL

packages/opencode/src/util/error.ts

@@ -11,15 +11,16 @@ export abstract class NamedError extends Error {
     name: Name,
     data: Data,
   ) {
+    const schema = z
+      .object({
+        name: z.literal(name),
+        data,
+      })
+      .openapi({
+        ref: name,
+      })
     const result = class extends NamedError {
-      public static readonly Schema = z
-        .object({
-          name: z.literal(name),
-          data: data,
-        })
-        .openapi({
-          ref: name,
-        })
+      public static readonly Schema = schema
 
       public readonly name = name as Name
 
@@ -40,7 +41,7 @@ export abstract class NamedError extends Error {
       }
 
       schema() {
-        return result.Schema
+        return schema
       }
 
       toObject() {

packages/opencode/test/tool/tool.test.ts

@@ -3,21 +3,33 @@ import { App } from "../../src/app/app"
 import { GlobTool } from "../../src/tool/glob"
 import { ListTool } from "../../src/tool/ls"
 
+const ctx = {
+  sessionID: "test",
+  messageID: "",
+  abort: AbortSignal.any([]),
+  metadata: () => {},
+}
 describe("tool.glob", () => {
   test("truncate", async () => {
-    await App.provide({ cwd: process.cwd(), version: "test" }, async () => {
+    await App.provide({ cwd: process.cwd() }, async () => {
       let result = await GlobTool.execute(
-        { pattern: "./node_modules/**/*" },
-        { sessionID: "test" },
+        {
+          pattern: "./node_modules/**/*",
+          path: undefined,
+        },
+        ctx,
       )
       expect(result.metadata.truncated).toBe(true)
     })
   })
   test("basic", async () => {
-    await App.provide({ cwd: process.cwd(), version: "test" }, async () => {
+    await App.provide({ cwd: process.cwd() }, async () => {
       let result = await GlobTool.execute(
-        { pattern: "*.json" },
-        { sessionID: "test" },
+        {
+          pattern: "*.json",
+          path: undefined,
+        },
+        ctx,
       )
       expect(result.metadata).toMatchObject({
         truncated: false,
@@ -29,15 +41,12 @@ describe("tool.glob", () => {
 
 describe("tool.ls", () => {
   test("basic", async () => {
-    const result = await App.provide(
-      { cwd: process.cwd(), version: "test" },
-      async () => {
-        return await ListTool.execute(
-          { path: "./example" },
-          { sessionID: "test" },
-        )
-      },
-    )
+    const result = await App.provide({ cwd: process.cwd() }, async () => {
+      return await ListTool.execute(
+        { path: "./example", ignore: [".git"] },
+        ctx,
+      )
+    })
     expect(result.output).toMatchSnapshot()
   })
 })

packages/tui/app.log

@@ -1,219 +0,0 @@
-time=2025-05-30T22:01:45.386-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-05-30T22:01:45.391-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-05-30T22:01:50.683-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-05-30T22:01:50.683-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-05-30T22:01:50.683-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-05-30T22:01:50.683-04:00 level=INFO msg="TUI message channel closed"
-time=2025-05-30T22:01:50.683-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-05-30T22:01:50.683-04:00 level=INFO msg="TUI exited" result="{width:98 height:57 currentPage:chat previousPage: pages:map[chat:0xc00013b450] loadedPages:map[chat:true] status:{app:0xc0002e05b0 queue:[] width:98 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0002e05b0 showPermissions:false permissions:0xc000159408 showHelp:false help:0xc0006822d0 showQuit:true quit:0xc00024b479 showSessionDialog:false sessionDialog:0xc0001f0240 showCommandDialog:false commandDialog:0xc0003cbba0 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6a7a0} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6a620}] showModelDialog:false modelDialog:0xc0001f45a0 showInitDialog:false initDialog:{width:98 height:57 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc0001f0480 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc0001f04c0}"
-time=2025-05-30T22:13:24.046-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-05-30T22:13:24.051-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-05-30T22:13:25.991-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-05-30T22:13:25.991-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-05-30T22:13:25.991-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-05-30T22:13:25.991-04:00 level=INFO msg="TUI message channel closed"
-time=2025-05-30T22:13:25.991-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-05-30T22:13:25.991-04:00 level=INFO msg="TUI exited" result="{width:199 height:57 currentPage:chat previousPage: pages:map[chat:0xc00025f950] loadedPages:map[chat:true] status:{app:0xc0000ca230 queue:[] width:199 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0000ca230 showPermissions:false permissions:0xc00029f908 showHelp:false help:0xc00045d9b0 showQuit:true quit:0xc0005a0be9 showSessionDialog:false sessionDialog:0xc00012e3c0 showCommandDialog:false commandDialog:0xc0004379e0 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6a7a0} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6a620}] showModelDialog:false modelDialog:0xc0002f2e60 showInitDialog:false initDialog:{width:199 height:57 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc00013ac88 showThemeDialog:false themeDialog:0xc00012e600 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc00012e640}"
-time=2025-05-31T16:00:29.137-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-05-31T16:00:29.141-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-05-31T16:00:36.530-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-05-31T16:00:36.531-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-05-31T16:00:36.531-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-05-31T16:00:36.531-04:00 level=INFO msg="TUI message channel closed"
-time=2025-05-31T16:00:36.531-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-05-31T16:00:36.531-04:00 level=INFO msg="TUI exited" result="{width:106 height:54 currentPage:chat previousPage: pages:map[chat:0xc000157450] loadedPages:map[chat:true] status:{app:0xc00020c5b0 queue:[] width:106 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc00020c5b0 showPermissions:false permissions:0xc000175408 showHelp:false help:0xc00070c270 showQuit:true quit:0xc000299979 showSessionDialog:false sessionDialog:0xc0001f02c0 showCommandDialog:false commandDialog:0xc0003cbba0 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6a7a0} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6a620}] showModelDialog:false modelDialog:0xc00021a5a0 showInitDialog:false initDialog:{width:106 height:54 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc0001f0500 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc0001f0540}"
-time=2025-05-31T16:06:20.089-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-05-31T16:06:20.094-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-05-31T16:06:20.095-04:00 level=ERROR msg="Failed to subscribe to events" error="Get \"http://localhost:16713/event\": dial tcp [::1]:16713: connect: connection refused"
-time=2025-05-31T17:54:04.009-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-05-31T17:54:04.014-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-05-31T17:54:06.337-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-05-31T17:54:06.337-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-05-31T17:54:06.337-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-05-31T17:54:06.337-04:00 level=INFO msg="TUI message channel closed"
-time=2025-05-31T17:54:06.337-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-05-31T17:54:06.337-04:00 level=INFO msg="TUI exited" result="{width:106 height:25 currentPage:chat previousPage: pages:map[chat:0xc0002332c0] loadedPages:map[chat:true] status:{app:0xc0002b1810 queue:[] width:106 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0002b1810 showPermissions:false permissions:0xc000267408 showHelp:false help:0xc00048dbc0 showQuit:true quit:0xc0004a2719 showSessionDialog:false sessionDialog:0xc000319ec0 showCommandDialog:false commandDialog:0xc000387980 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6a7a0} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6a620}] showModelDialog:false modelDialog:0xc0000c6960 showInitDialog:false initDialog:{width:106 height:25 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d6c88 showThemeDialog:false themeDialog:0xc0000ac480 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc0000ac4c0}"
-time=2025-05-31T17:54:17.103-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-05-31T17:54:17.108-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-05-31T17:54:18.391-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-05-31T17:54:18.392-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-05-31T17:54:18.392-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-05-31T17:54:18.392-04:00 level=INFO msg="TUI message channel closed"
-time=2025-05-31T17:54:18.392-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-05-31T17:54:18.392-04:00 level=INFO msg="TUI exited" result="{width:106 height:25 currentPage:chat previousPage: pages:map[chat:0xc00042a960] loadedPages:map[chat:true] status:{app:0xc000163ce0 queue:[] width:106 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc000163ce0 showPermissions:false permissions:0xc0001df408 showHelp:false help:0xc0005198f0 showQuit:true quit:0xc0003a5ef9 showSessionDialog:false sessionDialog:0xc000323840 showCommandDialog:false commandDialog:0xc00043b0e0 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6a7a0} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6a620}] showModelDialog:false modelDialog:0xc0004028c0 showInitDialog:false initDialog:{width:106 height:25 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d6c88 showThemeDialog:false themeDialog:0xc000323a80 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc000323ac0}"
-time=2025-05-31T17:59:54.360-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-05-31T17:59:54.364-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-05-31T17:59:55.814-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-05-31T17:59:55.815-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-05-31T17:59:55.815-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-05-31T17:59:55.815-04:00 level=INFO msg="TUI message channel closed"
-time=2025-05-31T17:59:55.815-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-05-31T17:59:55.815-04:00 level=INFO msg="TUI exited" result="{width:106 height:25 currentPage:chat previousPage: pages:map[chat:0xc0002787d0] loadedPages:map[chat:true] status:{app:0xc0003fed90 queue:[] width:106 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0003fed90 showPermissions:false permissions:0xc0002b1908 showHelp:false help:0xc000126150 showQuit:true quit:0xc00011d439 showSessionDialog:false sessionDialog:0xc00025e380 showCommandDialog:false commandDialog:0xc00047fc00 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6a7a0} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6a620}] showModelDialog:false modelDialog:0xc0002f6d20 showInitDialog:false initDialog:{width:106 height:25 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0001b2c88 showThemeDialog:false themeDialog:0xc00025e5c0 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc00025e600}"
-time=2025-05-31T17:59:56.746-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-05-31T17:59:56.750-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-05-31T18:00:10.757-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-05-31T18:00:10.757-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-05-31T18:00:10.757-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-05-31T18:00:10.757-04:00 level=INFO msg="TUI message channel closed"
-time=2025-05-31T18:00:10.757-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-05-31T18:00:10.757-04:00 level=INFO msg="TUI exited" result="{width:211 height:54 currentPage:chat previousPage: pages:map[chat:0xc00053b090] loadedPages:map[chat:true] status:{app:0xc000300cb0 queue:[] width:211 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc000300cb0 showPermissions:false permissions:0xc0002c5408 showHelp:false help:0xc000682f90 showQuit:true quit:0xc0006134d9 showSessionDialog:false sessionDialog:0xc00031f980 showCommandDialog:false commandDialog:0xc0003d9520 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6a7a0} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6a620}] showModelDialog:false modelDialog:0xc000395220 showInitDialog:false initDialog:{width:211 height:54 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc00013ac88 showThemeDialog:false themeDialog:0xc00031fbc0 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc00031fc00}"
-time=2025-05-31T18:35:42.289-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-05-31T18:35:42.294-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-05-31T18:36:54.773-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-05-31T18:36:54.773-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-05-31T18:36:54.773-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-05-31T18:36:54.773-04:00 level=INFO msg="TUI message channel closed"
-time=2025-05-31T18:36:54.773-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-05-31T18:36:54.773-04:00 level=INFO msg="TUI exited" result="{width:106 height:25 currentPage:chat previousPage: pages:map[chat:0xc00012f0e0] loadedPages:map[chat:true] status:{app:0xc0002aa070 queue:[] width:106 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0002aa070 showPermissions:false permissions:0xc000267408 showHelp:false help:0xc00041b8f0 showQuit:true quit:0xc000345ee9 showSessionDialog:false sessionDialog:0xc00032ba40 showCommandDialog:false commandDialog:0xc00043b300 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6a7a0} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6a620}] showModelDialog:false modelDialog:0xc000426f00 showInitDialog:false initDialog:{width:106 height:25 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d6c88 showThemeDialog:false themeDialog:0xc00032bc80 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc00032bcc0}"
-time=2025-05-31T18:36:56.011-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-05-31T18:36:56.015-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-05-31T18:37:44.063-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-05-31T18:37:44.064-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-05-31T18:37:44.064-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-05-31T18:37:44.064-04:00 level=INFO msg="TUI message channel closed"
-time=2025-05-31T18:37:44.064-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-05-31T18:37:44.064-04:00 level=INFO msg="TUI exited" result="{width:211 height:54 currentPage:chat previousPage: pages:map[chat:0xc000420280] loadedPages:map[chat:true] status:{app:0xc0002d8000 queue:[] width:211 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0002d8000 showPermissions:false permissions:0xc000271408 showHelp:false help:0xc00048da70 showQuit:true quit:0xc000390809 showSessionDialog:false sessionDialog:0xc000323b80 showCommandDialog:false commandDialog:0xc0003e5920 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6a7a0} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6a620}] showModelDialog:false modelDialog:0xc00025f9a0 showInitDialog:false initDialog:{width:211 height:54 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d6c88 showThemeDialog:false themeDialog:0xc000323dc0 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc000323e00}"
-time=2025-05-31T20:32:32.443-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-05-31T20:32:32.448-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-05-31T20:33:09.783-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-05-31T20:33:09.783-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-05-31T20:33:09.783-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-05-31T20:33:09.783-04:00 level=INFO msg="TUI message channel closed"
-time=2025-05-31T20:33:09.783-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-05-31T20:33:09.783-04:00 level=INFO msg="TUI exited" result="{width:199 height:56 currentPage:chat previousPage: pages:map[chat:0xc00032c960] loadedPages:map[chat:true] status:{app:0xc000279420 queue:[] width:199 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc000279420 showPermissions:false permissions:0xc0001fb408 showHelp:false help:0xc000154150 showQuit:true quit:0xc000528849 showSessionDialog:false sessionDialog:0xc000309e40 showCommandDialog:false commandDialog:0xc0003a3800 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6a800} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6a680}] showModelDialog:false modelDialog:0xc0002e7cc0 showInitDialog:false initDialog:{width:199 height:56 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc0000ac400 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc0000ac440}"
-time=2025-06-01T14:37:36.423-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-01T14:37:36.427-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-01T14:38:19.951-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-01T14:38:19.951-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-01T14:38:19.951-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-01T14:38:19.951-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-01T14:38:19.951-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-01T14:38:19.951-04:00 level=INFO msg="TUI exited" result="{width:199 height:56 currentPage:chat previousPage: pages:map[chat:0xc00035b9f0] loadedPages:map[chat:true] status:{app:0xc000226d90 queue:[] width:199 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc000226d90 showPermissions:false permissions:0xc00027f908 showHelp:false help:0xc0005139e0 showQuit:true quit:0xc000510d49 showSessionDialog:false sessionDialog:0xc0001e84c0 showCommandDialog:false commandDialog:0xc00051a160 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6a800} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6a680}] showModelDialog:false modelDialog:0xc0002675e0 showInitDialog:false initDialog:{width:199 height:56 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc00013ac88 showThemeDialog:false themeDialog:0xc0001e8700 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc0001e8740}"
-time=2025-06-01T14:38:50.886-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-01T14:38:50.891-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-01T14:38:53.495-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-01T14:38:53.495-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-01T14:38:53.495-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-01T14:38:53.495-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-01T14:38:53.495-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-01T14:38:53.495-04:00 level=INFO msg="TUI exited" result="{width:199 height:56 currentPage:chat previousPage: pages:map[chat:0xc0005ac8c0] loadedPages:map[chat:true] status:{app:0xc0002796c0 queue:[] width:199 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0002796c0 showPermissions:false permissions:0xc00028b408 showHelp:false help:0xc000490d80 showQuit:true quit:0xc000582589 showSessionDialog:false sessionDialog:0xc0003359c0 showCommandDialog:false commandDialog:0xc00042d480 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6a800} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6a680}] showModelDialog:false modelDialog:0xc000389360 showInitDialog:false initDialog:{width:199 height:56 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc000335c00 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc000335c80}"
-time=2025-06-01T14:39:49.852-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-01T14:39:49.856-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-01T14:39:57.071-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-01T14:39:57.071-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-01T14:39:57.071-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-01T14:39:57.071-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-01T14:39:57.071-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-01T14:39:57.071-04:00 level=INFO msg="TUI exited" result="{width:199 height:56 currentPage:chat previousPage: pages:map[chat:0xc000616f00] loadedPages:map[chat:true] status:{app:0xc000333490 queue:[] width:199 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc000333490 showPermissions:false permissions:0xc0004faa08 showHelp:false help:0xc000471140 showQuit:true quit:0xc000459299 showSessionDialog:false sessionDialog:0xc000352500 showCommandDialog:false commandDialog:0xc00041ed80 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6a800} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6a680}] showModelDialog:false modelDialog:0xc000515a40 showInitDialog:false initDialog:{width:199 height:56 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc00013ac88 showThemeDialog:false themeDialog:0xc000352740 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc000352780}"
-time=2025-06-01T14:40:21.954-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-01T14:40:21.958-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-01T14:41:29.195-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-01T14:41:29.195-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-01T14:41:29.195-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-01T14:41:29.195-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-01T14:41:29.195-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-01T14:41:29.195-04:00 level=INFO msg="TUI exited" result="{width:199 height:56 currentPage:chat previousPage: pages:map[chat:0xc0002cc280] loadedPages:map[chat:true] status:{app:0xc0002e64d0 queue:[] width:199 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0002e64d0 showPermissions:false permissions:0xc00026f408 showHelp:false help:0xc00051c1b0 showQuit:true quit:0xc00051a819 showSessionDialog:false sessionDialog:0xc00030fec0 showCommandDialog:false commandDialog:0xc00042d760 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6a800} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6a680}] showModelDialog:false modelDialog:0xc0002ce1e0 showInitDialog:false initDialog:{width:199 height:56 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc0000ac480 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc0000ac4c0}"
-time=2025-06-01T14:58:27.272-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-01T14:58:27.276-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-01T14:58:59.711-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-01T14:58:59.711-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-01T14:58:59.711-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-01T14:58:59.711-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-01T14:58:59.711-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-01T14:58:59.711-04:00 level=INFO msg="TUI exited" result="{width:199 height:56 currentPage:chat previousPage: pages:map[chat:0xc000316280] loadedPages:map[chat:true] status:{app:0xc0002b5810 queue:[] width:199 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0002b5810 showPermissions:false permissions:0xc000269408 showHelp:false help:0xc000490e10 showQuit:true quit:0xc00047a929 showSessionDialog:false sessionDialog:0xc0000adb40 showCommandDialog:false commandDialog:0xc0003e59c0 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6a800} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6a680}] showModelDialog:false modelDialog:0xc00024fd60 showInitDialog:false initDialog:{width:199 height:56 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc0000add80 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc0000addc0}"
-time=2025-06-01T15:02:54.453-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-01T15:02:54.458-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-01T15:02:56.136-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-01T15:02:56.136-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-01T15:02:56.136-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-01T15:02:56.136-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-01T15:02:56.136-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-01T15:02:56.136-04:00 level=INFO msg="TUI exited" result="{width:199 height:56 currentPage:chat previousPage: pages:map[chat:0xc000392ff0] loadedPages:map[chat:true] status:{app:0xc0001ecc40 queue:[] width:199 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0001ecc40 showPermissions:false permissions:0xc000205408 showHelp:false help:0xc00051c0c0 showQuit:true quit:0xc0003b3f49 showSessionDialog:false sessionDialog:0xc000319980 showCommandDialog:false commandDialog:0xc00042d220 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6b340} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6b1c0}] showModelDialog:false modelDialog:0xc0005c52c0 showInitDialog:false initDialog:{width:199 height:56 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc000319bc0 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc000319c00}"
-time=2025-06-01T15:02:57.053-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-01T15:02:57.057-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-01T15:02:58.135-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-01T15:02:58.135-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-01T15:02:58.135-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-01T15:02:58.135-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-01T15:02:58.135-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-01T15:02:58.135-04:00 level=INFO msg="TUI exited" result="{width:199 height:56 currentPage:chat previousPage: pages:map[chat:0xc0004411d0] loadedPages:map[chat:true] status:{app:0xc00023ee70 queue:[] width:199 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc00023ee70 showPermissions:false permissions:0xc000177408 showHelp:false help:0xc000520030 showQuit:true quit:0xc000314929 showSessionDialog:false sessionDialog:0xc000319d00 showCommandDialog:false commandDialog:0xc0003e5860 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6b340} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6b1c0}] showModelDialog:false modelDialog:0xc0002c9a40 showInitDialog:false initDialog:{width:199 height:56 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc000319f40 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc0000ac000}"
-time=2025-06-01T15:15:13.582-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-01T15:15:13.587-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-01T15:15:19.009-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-01T15:15:19.010-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-01T15:15:19.010-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-01T15:15:19.010-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-01T15:15:19.010-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-01T15:15:19.010-04:00 level=INFO msg="TUI exited" result="{width:199 height:56 currentPage:chat previousPage: pages:map[chat:0xc0001490e0] loadedPages:map[chat:true] status:{app:0xc0001efb90 queue:[] width:199 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0001efb90 showPermissions:false permissions:0xc000167408 showHelp:false help:0xc00052c1b0 showQuit:true quit:0xc000254629 showSessionDialog:false sessionDialog:0xc00030fe80 showCommandDialog:false commandDialog:0xc0003a3420 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6b340} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6b1c0}] showModelDialog:false modelDialog:0xc0000c6640 showInitDialog:false initDialog:{width:199 height:56 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc0000ac440 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc0000ac480}"
-time=2025-06-01T15:15:20.678-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-01T15:15:20.683-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-01T15:15:23.252-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-01T15:15:23.253-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-01T15:15:23.253-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-01T15:15:23.253-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-01T15:15:23.253-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-01T15:15:23.253-04:00 level=INFO msg="TUI exited" result="{width:199 height:56 currentPage:chat previousPage: pages:map[chat:0xc0002c47d0] loadedPages:map[chat:true] status:{app:0xc0003363f0 queue:[] width:199 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0003363f0 showPermissions:false permissions:0xc0002f3408 showHelp:false help:0xc0007055f0 showQuit:true quit:0xc00041c9b9 showSessionDialog:false sessionDialog:0xc00033bd00 showCommandDialog:false commandDialog:0xc000437700 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6b340} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6b1c0}] showModelDialog:false modelDialog:0xc0003d9c20 showInitDialog:false initDialog:{width:199 height:56 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc00013ac88 showThemeDialog:false themeDialog:0xc00033bf40 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc00034a140}"
-time=2025-06-02T11:40:21.643-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-02T11:40:21.648-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-02T11:40:24.684-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-02T11:40:24.684-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-02T11:40:24.684-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-02T11:40:24.684-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-02T11:40:24.684-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-02T11:40:24.684-04:00 level=INFO msg="TUI exited" result="{width:347 height:89 currentPage:chat previousPage: pages:map[chat:0xc00020d180] loadedPages:map[chat:true] status:{app:0xc0002a8230 queue:[] width:347 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0002a8230 showPermissions:false permissions:0xc000239408 showHelp:false help:0xc00051c1e0 showQuit:true quit:0xc000598909 showSessionDialog:false sessionDialog:0xc000309f00 showCommandDialog:false commandDialog:0xc0003a3660 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6b340} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6b1c0}] showModelDialog:false modelDialog:0xc0000c4a00 showInitDialog:false initDialog:{width:347 height:89 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc0000aa4c0 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc0000aa500}"
-time=2025-06-02T11:40:55.224-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-02T11:40:55.228-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-02T11:41:03.512-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-02T11:41:03.512-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-02T11:41:03.512-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-02T11:41:03.512-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-02T11:41:03.512-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-02T11:41:03.512-04:00 level=INFO msg="TUI exited" result="{width:347 height:89 currentPage:chat previousPage: pages:map[chat:0xc0001467d0] loadedPages:map[chat:true] status:{app:0xc0004feee0 queue:[] width:347 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0004feee0 showPermissions:false permissions:0xc000167408 showHelp:false help:0xc00059cd50 showQuit:true quit:0xc00038aaa9 showSessionDialog:false sessionDialog:0xc00030ff00 showCommandDialog:false commandDialog:0xc0003e5aa0 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6b340} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6b1c0}] showModelDialog:false modelDialog:0xc00029be00 showInitDialog:false initDialog:{width:347 height:89 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc0000aa4c0 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc0000aa500}"
-time=2025-06-02T11:41:05.131-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-02T11:41:05.136-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-02T11:41:06.417-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-02T11:41:06.417-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-02T11:41:06.417-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-02T11:41:06.417-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-02T11:41:06.417-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-02T11:41:06.417-04:00 level=INFO msg="TUI exited" result="{width:347 height:89 currentPage:chat previousPage: pages:map[chat:0xc0002527d0] loadedPages:map[chat:true] status:{app:0xc0002e0d90 queue:[] width:347 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0002e0d90 showPermissions:false permissions:0xc00027b408 showHelp:false help:0xc0004900c0 showQuit:true quit:0xc00047ae69 showSessionDialog:false sessionDialog:0xc000319f40 showCommandDialog:false commandDialog:0xc00042d880 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6b340} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6b1c0}] showModelDialog:false modelDialog:0xc000357e00 showInitDialog:false initDialog:{width:347 height:89 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc0000aa500 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc0000aa540}"
-time=2025-06-02T19:36:04.879-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-02T19:36:04.883-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-02T19:36:07.068-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-02T19:36:07.068-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-02T19:36:07.068-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-02T19:36:07.068-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-02T19:36:07.068-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-02T19:36:07.068-04:00 level=INFO msg="TUI exited" result="{width:145 height:36 currentPage:chat previousPage: pages:map[chat:0xc000544b40] loadedPages:map[chat:true] status:{app:0xc000249b90 queue:[] width:145 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc000249b90 showPermissions:false permissions:0xc000207408 showHelp:false help:0xc00011a1e0 showQuit:true quit:0xc0003890b9 showSessionDialog:false sessionDialog:0xc000319f40 showCommandDialog:false commandDialog:0xc0003e5520 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6b340} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6b1c0}] showModelDialog:false modelDialog:0xc000547220 showInitDialog:false initDialog:{width:145 height:36 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc0000ac500 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc0000ac540}"
-time=2025-06-02T19:44:20.524-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-02T19:44:20.529-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-02T19:45:43.720-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-02T19:45:43.720-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-02T19:45:43.720-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-02T19:45:43.720-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-02T19:45:43.720-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-02T19:45:43.720-04:00 level=INFO msg="TUI exited" result="{width:145 height:36 currentPage:chat previousPage: pages:map[chat:0xc0001f87d0] loadedPages:map[chat:true] status:{app:0xc000270cb0 queue:[] width:145 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc000270cb0 showPermissions:false permissions:0xc00022f408 showHelp:false help:0xc000490e70 showQuit:true quit:0xc000388ab9 showSessionDialog:false sessionDialog:0xc000319f00 showCommandDialog:false commandDialog:0xc0003e55e0 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6b340} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6b1c0}] showModelDialog:false modelDialog:0xc00030bd60 showInitDialog:false initDialog:{width:145 height:36 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc0000ac4c0 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc0000ac500}"
-time=2025-06-02T19:45:47.456-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-02T19:45:47.462-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-02T19:46:50.039-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-02T19:46:50.039-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-02T19:46:50.039-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-02T19:46:50.039-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-02T19:46:50.039-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-02T19:46:50.039-04:00 level=INFO msg="TUI exited" result="{width:145 height:36 currentPage:chat previousPage: pages:map[chat:0xc00035b9f0] loadedPages:map[chat:true] status:{app:0xc0000ec230 queue:[] width:145 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc0000ec230 showPermissions:false permissions:0xc0005e5408 showHelp:false help:0xc0005ad950 showQuit:true quit:0xc0005a0c09 showSessionDialog:false sessionDialog:0xc00012e440 showCommandDialog:false commandDialog:0xc0003c2160 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6b340} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6b1c0}] showModelDialog:false modelDialog:0xc0002c74a0 showInitDialog:false initDialog:{width:145 height:36 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc00013ac88 showThemeDialog:false themeDialog:0xc00012e680 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc00012e6c0}"
-time=2025-06-02T19:47:11.433-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-02T19:47:11.438-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-02T19:48:43.841-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-02T19:48:43.841-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-02T19:48:43.842-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-02T19:48:43.842-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-02T19:48:43.842-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-02T19:48:43.842-04:00 level=INFO msg="TUI exited" result="{width:145 height:36 currentPage:chat previousPage: pages:map[chat:0xc0001f9040] loadedPages:map[chat:true] status:{app:0xc000270070 queue:[] width:145 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc000270070 showPermissions:false permissions:0xc00022f408 showHelp:false help:0xc000122090 showQuit:true quit:0xc000447c19 showSessionDialog:false sessionDialog:0xc000323b40 showCommandDialog:false commandDialog:0xc0003cb540 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6b340} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6b1c0}] showModelDialog:false modelDialog:0xc00044d5e0 showInitDialog:false initDialog:{width:145 height:36 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc000323d80 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc000323dc0}"
-time=2025-06-02T19:48:57.679-04:00 level=DEBUG msg="Set theme from config" theme=opencode
-time=2025-06-02T19:48:57.685-04:00 level=INFO msg="Reading directory: /home/thdxr"
-time=2025-06-02T19:50:56.190-04:00 level=INFO msg="Cancelling all subscriptions"
-time=2025-06-02T19:50:56.190-04:00 level=INFO msg="subscription cancelled" name=status
-time=2025-06-02T19:50:56.190-04:00 level=INFO msg="All subscription goroutines completed successfully"
-time=2025-06-02T19:50:56.190-04:00 level=INFO msg="TUI message channel closed"
-time=2025-06-02T19:50:56.190-04:00 level=INFO msg="All goroutines cleaned up"
-time=2025-06-02T19:50:56.190-04:00 level=INFO msg="TUI exited" result="{width:145 height:36 currentPage:chat previousPage: pages:map[chat:0xc000564be0] loadedPages:map[chat:true] status:{app:0xc000250d20 queue:[] width:145 messageTTL:4000000000 activeUntil:{wall:0 ext:0 loc:<nil>}} app:0xc000250d20 showPermissions:false permissions:0xc0004d6a08 showHelp:false help:0xc00061d5c0 showQuit:true quit:0xc0005578a9 showSessionDialog:false sessionDialog:0xc00032a640 showCommandDialog:false commandDialog:0xc0003e51e0 commands:[{ID:init Title:Initialize Project Description:Create/Update the CONTEXT.md memory file Handler:0xb6b340} {ID:compact_conversation Title:Compact Conversation Description:Summarize the current session to save tokens Handler:0xb6b1c0}] showModelDialog:false modelDialog:0xc000620aa0 showInitDialog:false initDialog:{width:145 height:36 selected:0 keys:{Tab:{keys:[] help:{Key: Desc:} disabled:false} Left:{keys:[] help:{Key: Desc:} disabled:false} Right:{keys:[] help:{Key: Desc:} disabled:false} Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false} Y:{keys:[] help:{Key: Desc:} disabled:false} N:{keys:[] help:{Key: Desc:} disabled:false}}} showFilepicker:false filepicker:0xc0000d4c88 showThemeDialog:false themeDialog:0xc00032a880 showMultiArgumentsDialog:false multiArgumentsDialog:{width:0 height:0 inputs:[] focusIndex:0 keys:{Enter:{keys:[] help:{Key: Desc:} disabled:false} Escape:{keys:[] help:{Key: Desc:} disabled:false}} commandID: content: argNames:[]} showToolsDialog:false toolsDialog:0xc00032a8c0}"

packages/tui/cmd/opencode/main.go

@@ -2,17 +2,14 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"log/slog"
 	"os"
 	"path/filepath"
 	"strings"
-	"sync"
-	"time"
 
 	tea "github.com/charmbracelet/bubbletea/v2"
-	zone "github.com/lrstanley/bubblezone"
 	"github.com/sst/opencode/internal/app"
-	"github.com/sst/opencode/internal/pubsub"
 	"github.com/sst/opencode/internal/tui"
 	"github.com/sst/opencode/pkg/client"
 )
@@ -20,18 +17,18 @@ import (
 var Version = "dev"
 
 func main() {
-	url := os.Getenv("OPENCODE_SERVER")
-	httpClient, err := client.NewClientWithResponses(url)
-	if err != nil {
-		slog.Error("Failed to create client", "error", err)
-		os.Exit(1)
+	version := Version
+	if version != "dev" && !strings.HasPrefix(Version, "v") {
+		version = "v" + Version
 	}
-	paths, err := httpClient.PostPathGetWithResponse(context.Background())
-	if err != nil {
-		panic(err)
-	}
-	logfile := filepath.Join(paths.JSON200.Data, "log", "tui.log")
 
+	url := os.Getenv("OPENCODE_SERVER")
+
+	appInfoStr := os.Getenv("OPENCODE_APP_INFO")
+	var appInfo client.AppInfo
+	json.Unmarshal([]byte(appInfoStr), &appInfo)
+
+	logfile := filepath.Join(appInfo.Path.Data, "log", "tui.log")
 	if _, err := os.Stat(filepath.Dir(logfile)); os.IsNotExist(err) {
 		err := os.MkdirAll(filepath.Dir(logfile), 0755)
 		if err != nil {
@@ -48,26 +45,26 @@ func main() {
 	logger := slog.New(slog.NewTextHandler(file, &slog.HandlerOptions{Level: slog.LevelDebug}))
 	slog.SetDefault(logger)
 
+	httpClient, err := client.NewClientWithResponses(url)
+	if err != nil {
+		slog.Error("Failed to create client", "error", err)
+		os.Exit(1)
+	}
+
 	// Create main context for the application
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	version := Version
-	if version != "dev" && !strings.HasPrefix(Version, "v") {
-		version = "v" + Version
-	}
-	app_, err := app.New(ctx, version, httpClient)
+	app_, err := app.New(ctx, version, appInfo, httpClient)
 	if err != nil {
 		panic(err)
 	}
 
-	// Set up the TUI
-	zone.NewGlobal()
 	program := tea.NewProgram(
 		tui.NewModel(app_),
-		// tea.WithMouseCellMotion(),
-		tea.WithKeyboardEnhancements(),
 		tea.WithAltScreen(),
+		tea.WithKeyboardEnhancements(),
+		tea.WithMouseCellMotion(),
 	)
 
 	eventClient, err := client.NewClient(url)
@@ -88,133 +85,11 @@ func main() {
 		}
 	}()
 
-	// Setup the subscriptions, this will send services events to the TUI
-	ch, cancelSubs := setupSubscriptions(app_, ctx)
-
-	// Create a context for the TUI message handler
-	tuiCtx, tuiCancel := context.WithCancel(ctx)
-	var tuiWg sync.WaitGroup
-	tuiWg.Add(1)
-
-	// Set up message handling for the TUI
-	go func() {
-		defer tuiWg.Done()
-		// defer logging.RecoverPanic("TUI-message-handler", func() {
-		// 	attemptTUIRecovery(program)
-		// })
-
-		for {
-			select {
-			case <-tuiCtx.Done():
-				slog.Info("TUI message handler shutting down")
-				return
-			case msg, ok := <-ch:
-				if !ok {
-					slog.Info("TUI message channel closed")
-					return
-				}
-				program.Send(msg)
-			}
-		}
-	}()
-
-	// Cleanup function for when the program exits
-	cleanup := func() {
-		// Cancel subscriptions first
-		cancelSubs()
-
-		// Then cancel TUI message handler
-		tuiCancel()
-
-		// Wait for TUI message handler to finish
-		tuiWg.Wait()
-
-		slog.Info("All goroutines cleaned up")
-	}
-
 	// Run the TUI
 	result, err := program.Run()
-	cleanup()
-
 	if err != nil {
 		slog.Error("TUI error", "error", err)
-		// return fmt.Errorf("TUI error: %v", err)
 	}
 
 	slog.Info("TUI exited", "result", result)
 }
-
-func setupSubscriber[T any](
-	ctx context.Context,
-	wg *sync.WaitGroup,
-	name string,
-	subscriber func(context.Context) <-chan pubsub.Event[T],
-	outputCh chan<- tea.Msg,
-) {
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		// defer logging.RecoverPanic(fmt.Sprintf("subscription-%s", name), nil)
-
-		subCh := subscriber(ctx)
-		if subCh == nil {
-			slog.Warn("subscription channel is nil", "name", name)
-			return
-		}
-
-		for {
-			select {
-			case event, ok := <-subCh:
-				if !ok {
-					slog.Info("subscription channel closed", "name", name)
-					return
-				}
-
-				var msg tea.Msg = event
-
-				select {
-				case outputCh <- msg:
-				case <-time.After(2 * time.Second):
-					slog.Warn("message dropped due to slow consumer", "name", name)
-				case <-ctx.Done():
-					slog.Info("subscription cancelled", "name", name)
-					return
-				}
-			case <-ctx.Done():
-				slog.Info("subscription cancelled", "name", name)
-				return
-			}
-		}
-	}()
-}
-
-func setupSubscriptions(app *app.App, parentCtx context.Context) (chan tea.Msg, func()) {
-	ch := make(chan tea.Msg, 100)
-
-	wg := sync.WaitGroup{}
-	ctx, cancel := context.WithCancel(parentCtx) // Inherit from parent context
-
-	setupSubscriber(ctx, &wg, "status", app.Status.Subscribe, ch)
-
-	cleanupFunc := func() {
-		slog.Info("Cancelling all subscriptions")
-		cancel() // Signal all goroutines to stop
-
-		waitCh := make(chan struct{})
-		go func() {
-			// defer logging.RecoverPanic("subscription-cleanup", nil)
-			wg.Wait()
-			close(waitCh)
-		}()
-
-		select {
-		case <-waitCh:
-			slog.Info("All subscription goroutines completed successfully")
-			close(ch) // Only close after all writers are confirmed done
-		case <-time.After(5 * time.Second):
-			slog.Warn("Timed out waiting for some subscription goroutines to complete")
-			close(ch)
-		}
-	}
-	return ch, cleanupFunc
-}

packages/tui/go.mod

@@ -5,14 +5,12 @@ go 1.24.0
 require (
 	github.com/BurntSushi/toml v1.5.0
 	github.com/alecthomas/chroma/v2 v2.18.0
-	github.com/bmatcuk/doublestar/v4 v4.8.1
 	github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1
 	github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3
 	github.com/charmbracelet/glamour v0.10.0
-	github.com/charmbracelet/lipgloss/v2 v2.0.0-beta1
+	github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1
 	github.com/charmbracelet/x/ansi v0.8.0
 	github.com/lithammer/fuzzysearch v1.1.8
-	github.com/lrstanley/bubblezone v0.0.0-20250315020633-c249a3fe1231
 	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6
 	github.com/muesli/reflow v0.3.0
 	github.com/muesli/termenv v0.16.0
@@ -27,7 +25,6 @@ require (
 	dario.cat/mergo v1.0.2 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/atombender/go-jsonschema v0.20.0 // indirect
-	github.com/charmbracelet/bubbletea v1.3.4 // indirect
 	github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834 // indirect
 	github.com/charmbracelet/x/exp/slice v0.0.0-20250327172914-2fdc97757edf // indirect
 	github.com/charmbracelet/x/input v0.3.5-0.20250424101541-abb4d9a9b197 // indirect
@@ -66,13 +63,11 @@ require (
 	github.com/charmbracelet/x/term v0.2.1 // indirect
 	github.com/disintegration/imaging v1.6.2
 	github.com/dlclark/regexp2 v1.11.5 // indirect
-	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-localereader v0.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/microcosm-cc/bluemonday v1.0.27 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect

packages/tui/go.sum

@@ -24,12 +24,8 @@ github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
-github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38=
-github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1 h1:swACzss0FjnyPz1enfX56GKkLiuKg5FlyVmOLIlU2kE=
 github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1/go.mod h1:6HamsBKWqEC/FVHuQMHgQL+knPyvHH55HwJDHl/adMw=
-github.com/charmbracelet/bubbletea v1.3.4 h1:kCg7B+jSCFPLYRA52SDZjr51kG/fMUEoPoZrkaDHyoI=
-github.com/charmbracelet/bubbletea v1.3.4/go.mod h1:dtcUCyCGEX3g9tosuYiut3MXgY/Jsv9nKVdibKKRRXo=
 github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3 h1:5A2e3myxXMpCES+kjEWgGsaf9VgZXjZbLi5iMTH7j40=
 github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3/go.mod h1:ZFDg5oPjyRYrPAa3iFrtP1DO8xy+LUQxd9JFHEcuwJY=
 github.com/charmbracelet/colorprofile v0.3.1 h1:k8dTHMd7fgw4bnFd7jXTLZrSU/CQrKnL3m+AxCzDz40=
@@ -38,8 +34,8 @@ github.com/charmbracelet/glamour v0.10.0 h1:MtZvfwsYCx8jEPFJm3rIBFIMZUfUJ765oX8V
 github.com/charmbracelet/glamour v0.10.0/go.mod h1:f+uf+I/ChNmqo087elLnVdCiVgjSKWuXa/l6NU2ndYk=
 github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834 h1:ZR7e0ro+SZZiIZD7msJyA+NjkCNNavuiPBLgerbOziE=
 github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834/go.mod h1:aKC/t2arECF6rNOnaKaVU6y4t4ZeHQzqfxedE/VkVhA=
-github.com/charmbracelet/lipgloss/v2 v2.0.0-beta1 h1:SOylT6+BQzPHEjn15TIzawBPVD0QmhKXbcb3jY0ZIKU=
-github.com/charmbracelet/lipgloss/v2 v2.0.0-beta1/go.mod h1:tRlx/Hu0lo/j9viunCN2H+Ze6JrmdjQlXUQvvArgaOc=
+github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1 h1:D9AJJuYTN5pvz6mpIGO1ijLKpfTYSHOtKGgwoTQ4Gog=
+github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1/go.mod h1:tRlx/Hu0lo/j9viunCN2H+Ze6JrmdjQlXUQvvArgaOc=
 github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE=
 github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q=
 github.com/charmbracelet/x/cellbuf v0.0.14-0.20250501183327-ad3bc78c6a81 h1:iGrflaL5jQW6crML+pZx/ulWAVZQR3CQoRGvFsr2Tyg=
@@ -69,8 +65,6 @@ github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cn
 github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960/go.mod h1:9HQzr9D/0PGwMEbC3d5AB7oi67+h4TsQqItC1GVYG58=
 github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 h1:PRxIJD8XjimM5aTknUK9w6DHLDox2r2M3DI4i2pnd3w=
 github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936/go.mod h1:ttYvX5qlB+mlV1okblJqcSMtR4c52UKxDiX9GRBS8+Q=
-github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
-github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
@@ -126,16 +120,12 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4=
 github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4=
-github.com/lrstanley/bubblezone v0.0.0-20250315020633-c249a3fe1231 h1:9rjt7AfnrXKNSZhp36A3/4QAZAwGGCGD/p8Bse26zms=
-github.com/lrstanley/bubblezone v0.0.0-20250315020633-c249a3fe1231/go.mod h1:S5etECMx+sZnW0Gm100Ma9J1PgVCTgNyFaqGu2b08b4=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
-github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
@@ -267,7 +257,6 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

packages/tui/internal/app/app.go

@@ -11,116 +11,143 @@ import (
 	tea "github.com/charmbracelet/bubbletea/v2"
 	"github.com/sst/opencode/internal/commands"
 	"github.com/sst/opencode/internal/config"
-	"github.com/sst/opencode/internal/state"
-	"github.com/sst/opencode/internal/status"
 	"github.com/sst/opencode/internal/theme"
 	"github.com/sst/opencode/internal/util"
 	"github.com/sst/opencode/pkg/client"
 )
 
+var RootPath string
+
 type App struct {
-	ConfigPath string
-	Config     *config.Config
-	Client     *client.ClientWithResponses
-	Provider   *client.ProviderInfo
-	Model      *client.ModelInfo
-	Session    *client.SessionInfo
-	Messages   []client.MessageInfo
-	Status     status.Service
-	Commands   commands.Registry
+	Info      client.AppInfo
+	Version   string
+	StatePath string
+	Config    *config.Config
+	Client    *client.ClientWithResponses
+	Provider  *client.ProviderInfo
+	Model     *client.ModelInfo
+	Session   *client.SessionInfo
+	Messages  []client.MessageInfo
+	Commands  commands.CommandRegistry
 }
 
-type AppInfo struct {
-	client.AppInfo
-	Version string
+type SessionSelectedMsg = *client.SessionInfo
+type ModelSelectedMsg struct {
+	Provider client.ProviderInfo
+	Model    client.ModelInfo
+}
+type SessionClearedMsg struct{}
+type CompactSessionMsg struct{}
+type SendMsg struct {
+	Text        string
+	Attachments []Attachment
 }
 
-var Info AppInfo
+func New(
+	ctx context.Context,
+	version string,
+	appInfo client.AppInfo,
+	httpClient *client.ClientWithResponses,
+) (*App, error) {
+	RootPath = appInfo.Path.Root
 
-func New(ctx context.Context, version string, httpClient *client.ClientWithResponses) (*App, error) {
-	err := status.InitService()
-	if err != nil {
-		slog.Error("Failed to initialize status service", "error", err)
-		return nil, err
-	}
-
-	appInfoResponse, _ := httpClient.PostAppInfoWithResponse(ctx)
-	appInfo := appInfoResponse.JSON200
-	Info = AppInfo{Version: version}
-	Info.Git = appInfo.Git
-	Info.Path = appInfo.Path
-	Info.Time = appInfo.Time
-	Info.User = appInfo.User
-
-	providersResponse, err := httpClient.PostProviderListWithResponse(ctx)
-	if err != nil {
-		return nil, err
-	}
-	providers := []client.ProviderInfo{}
-	var defaultProvider *client.ProviderInfo
-	var defaultModel *client.ModelInfo
-
-	var anthropic *client.ProviderInfo
-	for _, provider := range providersResponse.JSON200.Providers {
-		if provider.Id == "anthropic" {
-			anthropic = &provider
-		}
-	}
-
-	// default to anthropic if available
-	if anthropic != nil {
-		defaultProvider = anthropic
-		defaultModel = getDefaultModel(providersResponse, *anthropic)
-	}
-
-	for _, provider := range providersResponse.JSON200.Providers {
-		if defaultProvider == nil || defaultModel == nil {
-			defaultProvider = &provider
-			defaultModel = getDefaultModel(providersResponse, provider)
-		}
-		providers = append(providers, provider)
-	}
-	if len(providers) == 0 {
-		return nil, fmt.Errorf("no providers found")
-	}
-
-	appConfigPath := filepath.Join(Info.Path.Config, "config")
+	appConfigPath := filepath.Join(appInfo.Path.Config, "config")
 	appConfig, err := config.LoadConfig(appConfigPath)
 	if err != nil {
-		slog.Info("No TUI config found, using default values", "error", err)
-		appConfig = config.NewConfig("opencode", defaultProvider.Id, defaultModel.Id)
-		config.SaveConfig(appConfigPath, appConfig)
+		appConfig = config.NewConfig()
+	}
+	if len(appConfig.Keybinds) == 0 {
+		appConfig.Keybinds = make(map[string]string)
+		appConfig.Keybinds["leader"] = "ctrl+x"
 	}
 
-	var currentProvider *client.ProviderInfo
-	var currentModel *client.ModelInfo
-	for _, provider := range providers {
-		if provider.Id == appConfig.Provider {
-			currentProvider = &provider
+	appStatePath := filepath.Join(appInfo.Path.State, "tui")
+	appState, err := config.LoadState(appStatePath)
+	if err != nil {
+		appState = config.NewState()
+		config.SaveState(appStatePath, appState)
+	}
 
-			for _, model := range provider.Models {
-				if model.Id == appConfig.Model {
-					currentModel = &model
+	mergedConfig := config.MergeState(appState, appConfig)
+	theme.SetTheme(mergedConfig.Theme)
+
+	slog.Debug("Loaded config", "config", mergedConfig)
+
+	app := &App{
+		Info:      appInfo,
+		Version:   version,
+		StatePath: appStatePath,
+		Config:    mergedConfig,
+		Client:    httpClient,
+		Session:   &client.SessionInfo{},
+		Messages:  []client.MessageInfo{},
+		Commands:  commands.LoadFromConfig(mergedConfig),
+	}
+
+	return app, nil
+}
+
+func (a *App) InitializeProvider() tea.Cmd {
+	return func() tea.Msg {
+		providersResponse, err := a.Client.PostProviderListWithResponse(context.Background())
+		if err != nil {
+			slog.Error("Failed to list providers", "error", err)
+			// TODO: notify user
+			return nil
+		}
+		providers := []client.ProviderInfo{}
+		var defaultProvider *client.ProviderInfo
+		var defaultModel *client.ModelInfo
+
+		var anthropic *client.ProviderInfo
+		for _, provider := range providersResponse.JSON200.Providers {
+			if provider.Id == "anthropic" {
+				anthropic = &provider
+			}
+		}
+
+		// default to anthropic if available
+		if anthropic != nil {
+			defaultProvider = anthropic
+			defaultModel = getDefaultModel(providersResponse, *anthropic)
+		}
+
+		for _, provider := range providersResponse.JSON200.Providers {
+			if defaultProvider == nil || defaultModel == nil {
+				defaultProvider = &provider
+				defaultModel = getDefaultModel(providersResponse, provider)
+			}
+			providers = append(providers, provider)
+		}
+		if len(providers) == 0 {
+			slog.Error("No providers configured")
+			return nil
+		}
+
+		var currentProvider *client.ProviderInfo
+		var currentModel *client.ModelInfo
+		for _, provider := range providers {
+			if provider.Id == a.Config.Provider {
+				currentProvider = &provider
+
+				for _, model := range provider.Models {
+					if model.Id == a.Config.Model {
+						currentModel = &model
+					}
 				}
 			}
 		}
+		if currentProvider == nil || currentModel == nil {
+			currentProvider = defaultProvider
+			currentModel = defaultModel
+		}
+
+		// TODO: handle no provider or model setup, yet
+		return ModelSelectedMsg{
+			Provider: *currentProvider,
+			Model:    *currentModel,
+		}
 	}
-
-	app := &App{
-		ConfigPath: appConfigPath,
-		Config:     appConfig,
-		Client:     httpClient,
-		Provider:   currentProvider,
-		Model:      currentModel,
-		Session:    &client.SessionInfo{},
-		Messages:   []client.MessageInfo{},
-		Status:     status.GetService(),
-		Commands:   commands.NewCommandRegistry(),
-	}
-
-	theme.SetTheme(appConfig.Theme)
-
-	return app, nil
 }
 
 func getDefaultModel(response *client.PostProviderListResponse, provider client.ProviderInfo) *client.ModelInfo {
@@ -151,8 +178,12 @@ func (a *App) IsBusy() bool {
 	return lastMessage.Metadata.Time.Completed == nil
 }
 
-func (a *App) SaveConfig() {
-	config.SaveConfig(a.ConfigPath, a.Config)
+func (a *App) SaveState() {
+	state := config.ConfigToState(a.Config)
+	err := config.SaveState(a.StatePath, state)
+	if err != nil {
+		slog.Error("Failed to save state", "error", err)
+	}
 }
 
 func (a *App) InitializeProject(ctx context.Context) tea.Cmd {
@@ -160,31 +191,47 @@ func (a *App) InitializeProject(ctx context.Context) tea.Cmd {
 
 	session, err := a.CreateSession(ctx)
 	if err != nil {
-		status.Error(err.Error())
+		// status.Error(err.Error())
 		return nil
 	}
 
 	a.Session = session
-	cmds = append(cmds, util.CmdHandler(state.SessionSelectedMsg(session)))
+	cmds = append(cmds, util.CmdHandler(SessionSelectedMsg(session)))
 
 	go func() {
-		// TODO: Handle no provider or model setup, yet
 		response, err := a.Client.PostSessionInitialize(ctx, client.PostSessionInitializeJSONRequestBody{
 			SessionID:  a.Session.Id,
 			ProviderID: a.Provider.Id,
 			ModelID:    a.Model.Id,
 		})
 		if err != nil {
-			status.Error(err.Error())
+			slog.Error("Failed to initialize project", "error", err)
+			// status.Error(err.Error())
 		}
 		if response != nil && response.StatusCode != 200 {
-			status.Error(fmt.Sprintf("failed to initialize project: %d", response.StatusCode))
+			slog.Error("Failed to initialize project", "error", response.StatusCode)
+			// status.Error(fmt.Sprintf("failed to initialize project: %d", response.StatusCode))
 		}
 	}()
 
 	return tea.Batch(cmds...)
 }
 
+func (a *App) CompactSession(ctx context.Context) tea.Cmd {
+	response, err := a.Client.PostSessionSummarizeWithResponse(ctx, client.PostSessionSummarizeJSONRequestBody{
+		SessionID:  a.Session.Id,
+		ProviderID: a.Provider.Id,
+		ModelID:    a.Model.Id,
+	})
+	if err != nil {
+		slog.Error("Failed to compact session", "error", err)
+	}
+	if response != nil && response.StatusCode() != 200 {
+		slog.Error("Failed to compact session", "error", response.StatusCode)
+	}
+	return nil
+}
+
 func (a *App) MarkProjectInitialized(ctx context.Context) error {
 	response, err := a.Client.PostAppInitialize(ctx)
 	if err != nil {
@@ -214,11 +261,11 @@ func (a *App) SendChatMessage(ctx context.Context, text string, attachments []At
 	if a.Session.Id == "" {
 		session, err := a.CreateSession(ctx)
 		if err != nil {
-			status.Error(err.Error())
+			// status.Error(err.Error())
 			return nil
 		}
 		a.Session = session
-		cmds = append(cmds, util.CmdHandler(state.SessionSelectedMsg(session)))
+		cmds = append(cmds, util.CmdHandler(SessionSelectedMsg(session)))
 	}
 
 	// TODO: Handle attachments when API supports them
@@ -243,11 +290,11 @@ func (a *App) SendChatMessage(ctx context.Context, text string, attachments []At
 		})
 		if err != nil {
 			slog.Error("Failed to send message", "error", err)
-			status.Error(err.Error())
+			// status.Error(err.Error())
 		}
 		if response != nil && response.StatusCode != 200 {
 			slog.Error("Failed to send message", "error", fmt.Sprintf("failed to send message: %d", response.StatusCode))
-			status.Error(fmt.Sprintf("failed to send message: %d", response.StatusCode))
+			// status.Error(fmt.Sprintf("failed to send message: %d", response.StatusCode))
 		}
 	}()
 
@@ -262,12 +309,12 @@ func (a *App) Cancel(ctx context.Context, sessionID string) error {
 	})
 	if err != nil {
 		slog.Error("Failed to cancel session", "error", err)
-		status.Error(err.Error())
+		// status.Error(err.Error())
 		return err
 	}
 	if response != nil && response.StatusCode != 200 {
 		slog.Error("Failed to cancel session", "error", fmt.Sprintf("failed to cancel session: %d", response.StatusCode))
-		status.Error(fmt.Sprintf("failed to cancel session: %d", response.StatusCode))
+		// status.Error(fmt.Sprintf("failed to cancel session: %d", response.StatusCode))
 		return fmt.Errorf("failed to cancel session: %d", response.StatusCode)
 	}
 	return nil
@@ -323,3 +370,7 @@ func (a *App) ListProviders(ctx context.Context) ([]client.ProviderInfo, error)
 	providers := *resp.JSON200
 	return providers.Providers, nil
 }
+
+// func (a *App) loadCustomKeybinds() {
+//
+// }

packages/tui/internal/commands/command.go

@@ -1,71 +1,281 @@
 package commands
 
 import (
-	"github.com/charmbracelet/bubbles/v2/key"
+	"slices"
+	"strings"
+
+	tea "github.com/charmbracelet/bubbletea/v2"
+	"github.com/sst/opencode/internal/config"
 )
 
-// Command represents a user-triggerable action.
+type ExecuteCommandMsg Command
+type ExecuteCommandsMsg []Command
+type CommandExecutedMsg Command
+
+type Keybinding struct {
+	RequiresLeader bool
+	Key            string
+}
+
+func (k Keybinding) Matches(msg tea.KeyPressMsg, leader bool) bool {
+	key := k.Key
+	key = strings.TrimSpace(key)
+	return key == msg.String() && (k.RequiresLeader == leader)
+}
+
+type CommandName string
 type Command struct {
-	// Name is the identifier used for slash commands (e.g., "new").
-	Name string
-	// Description is a short explanation of what the command does.
+	Name        CommandName
 	Description string
-	// KeyBinding is the keyboard shortcut to trigger this command.
-	KeyBinding key.Binding
+	Keybindings []Keybinding
+	Trigger     string
 }
 
-// Registry holds all the available commands.
-type Registry map[string]Command
-
-// ExecuteCommandMsg is a message sent when a command should be executed.
-type ExecuteCommandMsg struct {
-	Name string
+func (c Command) Keys() []string {
+	var keys []string
+	for _, k := range c.Keybindings {
+		keys = append(keys, k.Key)
+	}
+	return keys
 }
 
-func NewCommandRegistry() Registry {
-	return Registry{
-		"help": {
-			Name:        "help",
+type CommandRegistry map[CommandName]Command
+
+func (r CommandRegistry) Sorted() []Command {
+	var commands []Command
+	for _, command := range r {
+		commands = append(commands, command)
+	}
+	slices.SortFunc(commands, func(a, b Command) int {
+		if a.Name == AppExitCommand {
+			return 1
+		}
+		if b.Name == AppExitCommand {
+			return -1
+		}
+		return strings.Compare(string(a.Name), string(b.Name))
+	})
+	return commands
+}
+
+func (r CommandRegistry) Matches(msg tea.KeyPressMsg, leader bool) []Command {
+	var matched []Command
+	for _, command := range r.Sorted() {
+		if command.Matches(msg, leader) {
+			matched = append(matched, command)
+		}
+	}
+	return matched
+}
+
+const (
+	AppHelpCommand              CommandName = "app_help"
+	EditorOpenCommand           CommandName = "editor_open"
+	SessionNewCommand           CommandName = "session_new"
+	SessionListCommand          CommandName = "session_list"
+	SessionShareCommand         CommandName = "session_share"
+	SessionInterruptCommand     CommandName = "session_interrupt"
+	SessionCompactCommand       CommandName = "session_compact"
+	ToolDetailsCommand          CommandName = "tool_details"
+	ModelListCommand            CommandName = "model_list"
+	ThemeListCommand            CommandName = "theme_list"
+	ProjectInitCommand          CommandName = "project_init"
+	InputClearCommand           CommandName = "input_clear"
+	InputPasteCommand           CommandName = "input_paste"
+	InputSubmitCommand          CommandName = "input_submit"
+	InputNewlineCommand         CommandName = "input_newline"
+	HistoryPreviousCommand      CommandName = "history_previous"
+	HistoryNextCommand          CommandName = "history_next"
+	MessagesPageUpCommand       CommandName = "messages_page_up"
+	MessagesPageDownCommand     CommandName = "messages_page_down"
+	MessagesHalfPageUpCommand   CommandName = "messages_half_page_up"
+	MessagesHalfPageDownCommand CommandName = "messages_half_page_down"
+	MessagesPreviousCommand     CommandName = "messages_previous"
+	MessagesNextCommand         CommandName = "messages_next"
+	MessagesFirstCommand        CommandName = "messages_first"
+	MessagesLastCommand         CommandName = "messages_last"
+	AppExitCommand              CommandName = "app_exit"
+)
+
+func (k Command) Matches(msg tea.KeyPressMsg, leader bool) bool {
+	for _, binding := range k.Keybindings {
+		if binding.Matches(msg, leader) {
+			return true
+		}
+	}
+	return false
+}
+
+func (k Command) FromConfig(config *config.Config) Command {
+	if keybind, ok := config.Keybinds[string(k.Name)]; ok {
+		k.Keybindings = parseBindings(keybind)
+	}
+	return k
+}
+
+func parseBindings(bindings ...string) []Keybinding {
+	var parsedBindings []Keybinding
+	for _, binding := range bindings {
+		for p := range strings.SplitSeq(binding, ",") {
+			requireLeader := strings.HasPrefix(p, "<leader>")
+			keybinding := strings.ReplaceAll(p, "<leader>", "")
+			keybinding = strings.TrimSpace(keybinding)
+			parsedBindings = append(parsedBindings, Keybinding{
+				RequiresLeader: requireLeader,
+				Key:            keybinding,
+			})
+		}
+	}
+	return parsedBindings
+}
+
+func LoadFromConfig(config *config.Config) CommandRegistry {
+	defaults := []Command{
+		{
+			Name:        AppHelpCommand,
 			Description: "show help",
-			KeyBinding: key.NewBinding(
-				key.WithKeys("f1", "super+/", "super+h"),
-			),
+			Keybindings: parseBindings("<leader>h"),
+			Trigger:     "help",
 		},
-		"new": {
-			Name:        "new",
+		{
+			Name:        EditorOpenCommand,
+			Description: "open editor",
+			Keybindings: parseBindings("<leader>e"),
+			Trigger:     "editor",
+		},
+		{
+			Name:        SessionNewCommand,
 			Description: "new session",
-			KeyBinding: key.NewBinding(
-				key.WithKeys("f2", "super+n"),
-			),
+			Keybindings: parseBindings("<leader>n"),
+			Trigger:     "new",
 		},
-		"sessions": {
-			Name:        "sessions",
-			Description: "switch session",
-			KeyBinding: key.NewBinding(
-				key.WithKeys("f3", "super+s"),
-			),
+		{
+			Name:        SessionListCommand,
+			Description: "list sessions",
+			Keybindings: parseBindings("<leader>l"),
+			Trigger:     "sessions",
 		},
-		"model": {
-			Name:        "model",
-			Description: "switch model",
-			KeyBinding: key.NewBinding(
-				key.WithKeys("f4", "super+m"),
-			),
+		{
+			Name:        SessionShareCommand,
+			Description: "share session",
+			Keybindings: parseBindings("<leader>s"),
+			Trigger:     "share",
 		},
-		"theme": {
-			Name:        "theme",
-			Description: "switch theme",
-			KeyBinding: key.NewBinding(
-				key.WithKeys("f5", "super+t"),
-			),
+		{
+			Name:        SessionInterruptCommand,
+			Description: "interrupt session",
+			Keybindings: parseBindings("esc"),
 		},
-		"quit": {
-			Name:        "quit",
-			Description: "quit",
-			KeyBinding: key.NewBinding(
-				key.WithKeys("f10", "ctrl+c", "super+q"),
-			),
+		{
+			Name:        SessionCompactCommand,
+			Description: "compact the session",
+			Keybindings: parseBindings("<leader>c"),
+			Trigger:     "compact",
+		},
+		{
+			Name:        ToolDetailsCommand,
+			Description: "toggle tool details",
+			Keybindings: parseBindings("<leader>d"),
+			Trigger:     "details",
+		},
+		{
+			Name:        ModelListCommand,
+			Description: "list models",
+			Keybindings: parseBindings("<leader>m"),
+			Trigger:     "models",
+		},
+		{
+			Name:        ThemeListCommand,
+			Description: "list themes",
+			Keybindings: parseBindings("<leader>t"),
+			Trigger:     "themes",
+		},
+		{
+			Name:        ProjectInitCommand,
+			Description: "create or update AGENTS.md",
+			Keybindings: parseBindings("<leader>i"),
+			Trigger:     "init",
+		},
+		{
+			Name:        InputClearCommand,
+			Description: "clear input",
+			Keybindings: parseBindings("ctrl+c"),
+		},
+		{
+			Name:        InputPasteCommand,
+			Description: "paste content",
+			Keybindings: parseBindings("ctrl+v"),
+		},
+		{
+			Name:        InputSubmitCommand,
+			Description: "submit message",
+			Keybindings: parseBindings("enter"),
+		},
+		{
+			Name:        InputNewlineCommand,
+			Description: "insert newline",
+			Keybindings: parseBindings("shift+enter"),
+		},
+		{
+			Name:        HistoryPreviousCommand,
+			Description: "previous prompt",
+			Keybindings: parseBindings("up"),
+		},
+		{
+			Name:        HistoryNextCommand,
+			Description: "next prompt",
+			Keybindings: parseBindings("down"),
+		},
+		{
+			Name:        MessagesPageUpCommand,
+			Description: "page up",
+			Keybindings: parseBindings("pgup"),
+		},
+		{
+			Name:        MessagesPageDownCommand,
+			Description: "page down",
+			Keybindings: parseBindings("pgdown"),
+		},
+		{
+			Name:        MessagesHalfPageUpCommand,
+			Description: "half page up",
+			Keybindings: parseBindings("ctrl+alt+u"),
+		},
+		{
+			Name:        MessagesHalfPageDownCommand,
+			Description: "half page down",
+			Keybindings: parseBindings("ctrl+alt+d"),
+		},
+		{
+			Name:        MessagesPreviousCommand,
+			Description: "previous message",
+			Keybindings: parseBindings("ctrl+alt+k"),
+		},
+		{
+			Name:        MessagesNextCommand,
+			Description: "next message",
+			Keybindings: parseBindings("ctrl+alt+j"),
+		},
+		{
+			Name:        MessagesFirstCommand,
+			Description: "first message",
+			Keybindings: parseBindings("ctrl+g"),
+		},
+		{
+			Name:        MessagesLastCommand,
+			Description: "last message",
+			Keybindings: parseBindings("ctrl+alt+g"),
+		},
+		{
+			Name:        AppExitCommand,
+			Description: "exit the app",
+			Keybindings: parseBindings("ctrl+c", "<leader>q"),
+			Trigger:     "exit",
 		},
 	}
+	registry := make(CommandRegistry)
+	for _, command := range defaults {
+		registry[command.Name] = command.FromConfig(config)
+	}
+	return registry
 }
-

packages/tui/internal/completions/commands.go

@@ -2,10 +2,14 @@ package completions
 
 import (
 	"sort"
+	"strings"
 
+	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/lithammer/fuzzysearch/fuzzy"
 	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/commands"
 	"github.com/sst/opencode/internal/components/dialog"
+	"github.com/sst/opencode/internal/theme"
 )
 
 type CommandCompletionProvider struct {
@@ -27,15 +31,39 @@ func (c *CommandCompletionProvider) GetEntry() dialog.CompletionItemI {
 	})
 }
 
+func (c *CommandCompletionProvider) GetEmptyMessage() string {
+	return "no matching commands"
+}
+
+func getCommandCompletionItem(cmd commands.Command, space int) dialog.CompletionItemI {
+	t := theme.CurrentTheme()
+	spacer := strings.Repeat(" ", space)
+	title := "  /" + cmd.Trigger + lipgloss.NewStyle().Foreground(t.TextMuted()).Render(spacer+cmd.Description)
+	value := string(cmd.Name)
+	return dialog.NewCompletionItem(dialog.CompletionItem{
+		Title: title,
+		Value: value,
+	})
+}
+
 func (c *CommandCompletionProvider) GetChildEntries(query string) ([]dialog.CompletionItemI, error) {
+	space := 1
+	for _, cmd := range c.app.Commands {
+		if lipgloss.Width(cmd.Trigger) > space {
+			space = lipgloss.Width(cmd.Trigger)
+		}
+	}
+	space += 2
+
 	if query == "" {
 		// If no query, return all commands
 		items := []dialog.CompletionItemI{}
 		for _, cmd := range c.app.Commands {
-			items = append(items, dialog.NewCompletionItem(dialog.CompletionItem{
-				Title: "  /" + cmd.Name,
-				Value: "/" + cmd.Name,
-			}))
+			if cmd.Trigger == "" {
+				continue
+			}
+			space := space - lipgloss.Width(cmd.Trigger)
+			items = append(items, getCommandCompletionItem(cmd, space))
 		}
 		return items, nil
 	}
@@ -45,11 +73,12 @@ func (c *CommandCompletionProvider) GetChildEntries(query string) ([]dialog.Comp
 	commandMap := make(map[string]dialog.CompletionItemI)
 
 	for _, cmd := range c.app.Commands {
-		commandNames = append(commandNames, cmd.Name)
-		commandMap[cmd.Name] = dialog.NewCompletionItem(dialog.CompletionItem{
-			Title: "  /" + cmd.Name,
-			Value: "/" + cmd.Name,
-		})
+		if cmd.Trigger == "" {
+			continue
+		}
+		space := space - lipgloss.Width(cmd.Trigger)
+		commandNames = append(commandNames, cmd.Trigger)
+		commandMap[cmd.Trigger] = getCommandCompletionItem(cmd, space)
 	}
 
 	// Find fuzzy matches
@@ -65,7 +94,5 @@ func (c *CommandCompletionProvider) GetChildEntries(query string) ([]dialog.Comp
 			items = append(items, item)
 		}
 	}
-
 	return items, nil
 }
-

packages/tui/internal/completions/files-folders.go

@@ -24,6 +24,10 @@ func (cg *filesAndFoldersContextGroup) GetEntry() dialog.CompletionItemI {
 	})
 }
 
+func (cg *filesAndFoldersContextGroup) GetEmptyMessage() string {
+	return "no matching files"
+}
+
 func (cg *filesAndFoldersContextGroup) getFiles(query string) ([]string, error) {
 	response, err := cg.app.Client.PostFileSearchWithResponse(context.Background(), client.PostFileSearchJSONRequestBody{
 		Query: query,

packages/tui/internal/components/chat/chat.go

@@ -1,22 +0,0 @@
-package chat
-
-import (
-	"github.com/sst/opencode/internal/app"
-	"github.com/sst/opencode/internal/styles"
-	"github.com/sst/opencode/internal/theme"
-)
-
-type SendMsg struct {
-	Text        string
-	Attachments []app.Attachment
-}
-
-func repo(width int) string {
-	repo := "github.com/sst/opencode"
-	t := theme.CurrentTheme()
-
-	return styles.BaseStyle().
-		Foreground(t.TextMuted()).
-		Width(width).
-		Render(repo)
-}

packages/tui/internal/components/chat/editor.go

@@ -3,11 +3,8 @@ package chat
 import (
 	"fmt"
 	"log/slog"
-	"os"
-	"os/exec"
 	"strings"
 
-	"github.com/charmbracelet/bubbles/v2/key"
 	"github.com/charmbracelet/bubbles/v2/spinner"
 	"github.com/charmbracelet/bubbles/v2/textarea"
 	tea "github.com/charmbracelet/bubbletea/v2"
@@ -17,81 +14,35 @@ import (
 	"github.com/sst/opencode/internal/components/dialog"
 	"github.com/sst/opencode/internal/image"
 	"github.com/sst/opencode/internal/layout"
-	"github.com/sst/opencode/internal/status"
 	"github.com/sst/opencode/internal/styles"
 	"github.com/sst/opencode/internal/theme"
 	"github.com/sst/opencode/internal/util"
 )
 
+type EditorComponent interface {
+	tea.Model
+	tea.ViewModel
+	layout.Sizeable
+	Value() string
+	Submit() (tea.Model, tea.Cmd)
+	Clear() (tea.Model, tea.Cmd)
+	Paste() (tea.Model, tea.Cmd)
+	Newline() (tea.Model, tea.Cmd)
+	Previous() (tea.Model, tea.Cmd)
+	Next() (tea.Model, tea.Cmd)
+}
+
 type editorComponent struct {
-	width          int
-	height         int
 	app            *app.App
+	width, height  int
 	textarea       textarea.Model
 	attachments    []app.Attachment
-	deleteMode     bool
 	history        []string
 	historyIndex   int
 	currentMessage string
 	spinner        spinner.Model
 }
 
-type EditorKeyMaps struct {
-	Send        key.Binding
-	OpenEditor  key.Binding
-	Paste       key.Binding
-	HistoryUp   key.Binding
-	HistoryDown key.Binding
-}
-
-type DeleteAttachmentKeyMaps struct {
-	AttachmentDeleteMode key.Binding
-	Escape               key.Binding
-	DeleteAllAttachments key.Binding
-}
-
-var editorMaps = EditorKeyMaps{
-	Send: key.NewBinding(
-		key.WithKeys("enter"),
-		key.WithHelp("enter", "send message"),
-	),
-	OpenEditor: key.NewBinding(
-		key.WithKeys("f12"),
-		key.WithHelp("f12", "open editor"),
-	),
-	Paste: key.NewBinding(
-		key.WithKeys("ctrl+v"),
-		key.WithHelp("ctrl+v", "paste content"),
-	),
-	HistoryUp: key.NewBinding(
-		key.WithKeys("up"),
-		key.WithHelp("up", "previous message"),
-	),
-	HistoryDown: key.NewBinding(
-		key.WithKeys("down"),
-		key.WithHelp("down", "next message"),
-	),
-}
-
-var DeleteKeyMaps = DeleteAttachmentKeyMaps{
-	AttachmentDeleteMode: key.NewBinding(
-		key.WithKeys("ctrl+r"),
-		key.WithHelp("ctrl+r+{i}", "delete attachment at index i"),
-	),
-	Escape: key.NewBinding(
-		key.WithKeys("esc"),
-		key.WithHelp("esc", "cancel delete mode"),
-	),
-	DeleteAllAttachments: key.NewBinding(
-		key.WithKeys("r"),
-		key.WithHelp("ctrl+r+r", "delete all attachments"),
-	),
-}
-
-const (
-	maxAttachments = 5
-)
-
 func (m *editorComponent) Init() tea.Cmd {
 	return tea.Batch(textarea.Blink, m.spinner.Tick, tea.EnableReportFocus)
 }
@@ -100,151 +51,38 @@ func (m *editorComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmds []tea.Cmd
 	var cmd tea.Cmd
 	switch msg := msg.(type) {
-	case dialog.ThemeChangedMsg:
+	case tea.KeyPressMsg:
+		// Maximize editor responsiveness for printable characters
+		if msg.Text != "" {
+			m.textarea, cmd = m.textarea.Update(msg)
+			return m, cmd
+		}
+
+		// // TODO: ?
+		// if key.Matches(msg, messageKeys.PageUp) ||
+		// 	key.Matches(msg, messageKeys.PageDown) ||
+		// 	key.Matches(msg, messageKeys.HalfPageUp) ||
+		// 	key.Matches(msg, messageKeys.HalfPageDown) {
+		// 	return m, nil
+		// }
+
+	case dialog.ThemeSelectedMsg:
 		m.textarea = createTextArea(&m.textarea)
+		m.spinner = createSpinner()
+		return m, tea.Batch(m.spinner.Tick, textarea.Blink)
 	case dialog.CompletionSelectedMsg:
 		if msg.IsCommand {
-			// Execute the command directly
 			commandName := strings.TrimPrefix(msg.CompletionValue, "/")
 			m.textarea.Reset()
-			return m, util.CmdHandler(commands.ExecuteCommandMsg{Name: commandName})
+			return m, util.CmdHandler(
+				commands.ExecuteCommandMsg(m.app.Commands[commands.CommandName(commandName)]),
+			)
 		} else {
-			// For files, replace the text in the editor
 			existingValue := m.textarea.Value()
 			modifiedValue := strings.Replace(existingValue, msg.SearchString, msg.CompletionValue, 1)
 			m.textarea.SetValue(modifiedValue)
 			return m, nil
 		}
-	case tea.KeyMsg:
-		switch msg.String() {
-		case "ctrl+c":
-			if m.textarea.Value() != "" {
-				m.textarea.Reset()
-				return m, func() tea.Msg {
-					return nil
-				}
-			}
-		case "shift+enter":
-			value := m.textarea.Value()
-			m.textarea.SetValue(value + "\n")
-			return m, nil
-		}
-
-		if key.Matches(msg, DeleteKeyMaps.AttachmentDeleteMode) {
-			m.deleteMode = true
-			return m, nil
-		}
-		if key.Matches(msg, DeleteKeyMaps.DeleteAllAttachments) && m.deleteMode {
-			m.deleteMode = false
-			m.attachments = nil
-			return m, nil
-		}
-		// if m.deleteMode && len(msg.Runes) > 0 && unicode.IsDigit(msg.Runes[0]) {
-		// 	num := int(msg.Runes[0] - '0')
-		// 	m.deleteMode = false
-		// 	if num < 10 && len(m.attachments) > num {
-		// 		if num == 0 {
-		// 			m.attachments = m.attachments[num+1:]
-		// 		} else {
-		// 			m.attachments = slices.Delete(m.attachments, num, num+1)
-		// 		}
-		// 		return m, nil
-		// 	}
-		// }
-		if key.Matches(msg, messageKeys.PageUp) || key.Matches(msg, messageKeys.PageDown) ||
-			key.Matches(msg, messageKeys.HalfPageUp) || key.Matches(msg, messageKeys.HalfPageDown) {
-			return m, nil
-		}
-		if key.Matches(msg, editorMaps.OpenEditor) {
-			if m.app.IsBusy() {
-				status.Warn("Agent is working, please wait...")
-				return m, nil
-			}
-			value := m.textarea.Value()
-			m.textarea.Reset()
-			return m, m.openEditor(value)
-		}
-		if key.Matches(msg, DeleteKeyMaps.Escape) {
-			m.deleteMode = false
-			return m, nil
-		}
-
-		if key.Matches(msg, editorMaps.Paste) {
-			imageBytes, text, err := image.GetImageFromClipboard()
-			if err != nil {
-				slog.Error(err.Error())
-				return m, cmd
-			}
-			if len(imageBytes) != 0 {
-				attachmentName := fmt.Sprintf("clipboard-image-%d", len(m.attachments))
-				attachment := app.Attachment{FilePath: attachmentName, FileName: attachmentName, Content: imageBytes, MimeType: "image/png"}
-				m.attachments = append(m.attachments, attachment)
-			} else {
-				m.textarea.SetValue(m.textarea.Value() + text)
-			}
-			return m, cmd
-		}
-
-		// Handle history navigation with up/down arrow keys
-		// Only handle history navigation if the filepicker is not open and completion dialog is not open
-		if m.textarea.Focused() && key.Matches(msg, editorMaps.HistoryUp) {
-			// TODO: fix this
-			//  && !m.app.IsFilepickerOpen() && !m.app.IsCompletionDialogOpen() {
-			// Get the current line number
-			currentLine := m.textarea.Line()
-
-			// Only navigate history if we're at the first line
-			if currentLine == 0 && len(m.history) > 0 {
-				// Save current message if we're just starting to navigate
-				if m.historyIndex == len(m.history) {
-					m.currentMessage = m.textarea.Value()
-				}
-
-				// Go to previous message in history
-				if m.historyIndex > 0 {
-					m.historyIndex--
-					m.textarea.SetValue(m.history[m.historyIndex])
-				}
-				return m, nil
-			}
-		}
-
-		if m.textarea.Focused() && key.Matches(msg, editorMaps.HistoryDown) {
-			// TODO: fix this
-			// && !m.app.IsFilepickerOpen() && !m.app.IsCompletionDialogOpen() {
-			// Get the current line number and total lines
-			currentLine := m.textarea.Line()
-			value := m.textarea.Value()
-			lines := strings.Split(value, "\n")
-			totalLines := len(lines)
-
-			// Only navigate history if we're at the last line
-			if currentLine == totalLines-1 {
-				if m.historyIndex < len(m.history)-1 {
-					// Go to next message in history
-					m.historyIndex++
-					m.textarea.SetValue(m.history[m.historyIndex])
-				} else if m.historyIndex == len(m.history)-1 {
-					// Return to the current message being composed
-					m.historyIndex = len(m.history)
-					m.textarea.SetValue(m.currentMessage)
-				}
-				return m, nil
-			}
-		}
-
-		// Handle Enter key
-		if m.textarea.Focused() && key.Matches(msg, editorMaps.Send) {
-			value := m.textarea.Value()
-			if len(value) > 0 && value[len(value)-1] == '\\' {
-				// If the last character is a backslash, remove it and add a newline
-				m.textarea.SetValue(value[:len(value)-1] + "\n")
-				return m, nil
-			} else {
-				// Otherwise, send the message
-				return m, m.send()
-			}
-		}
 	}
 
 	m.spinner, cmd = m.spinner.Update(msg)
@@ -258,8 +96,8 @@ func (m *editorComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 func (m *editorComponent) View() string {
 	t := theme.CurrentTheme()
-	base := styles.BaseStyle().Render
-	muted := styles.Muted().Render
+	base := styles.BaseStyle().Background(t.Background()).Render
+	muted := styles.Muted().Background(t.Background()).Render
 	promptStyle := lipgloss.NewStyle().
 		Padding(0, 0, 0, 1).
 		Bold(true).
@@ -281,7 +119,7 @@ func (m *editorComponent) View() string {
 		BorderBackground(t.Background()).
 		Render(textarea)
 
-	hint := base("enter") + muted(" send   ") + base("shift") + muted("+") + base("enter") + muted(" newline")
+	hint := base("enter") + muted(" send   ")
 	if m.app.IsBusy() {
 		hint = muted("working") + m.spinner.View() + muted("  ") + base("esc") + muted(" interrupt")
 	}
@@ -292,22 +130,19 @@ func (m *editorComponent) View() string {
 	}
 
 	space := m.width - 2 - lipgloss.Width(model) - lipgloss.Width(hint)
-	spacer := lipgloss.NewStyle().Width(space).Render("")
+	spacer := lipgloss.NewStyle().Background(t.Background()).Width(space).Render("")
 
-	info := lipgloss.JoinHorizontal(lipgloss.Left, hint, spacer, model)
-	info = styles.Padded().Render(info)
-
-	content := lipgloss.JoinVertical(
-		lipgloss.Top,
-		// m.attachmentsContent(),
-		"",
-		textarea,
-		info,
-	)
+	info := hint + spacer + model
+	info = styles.Padded().Background(t.Background()).Render(info)
 
+	content := strings.Join([]string{"", textarea, info}, "\n")
 	return content
 }
 
+func (m *editorComponent) GetSize() (width, height int) {
+	return m.width, m.height
+}
+
 func (m *editorComponent) SetSize(width, height int) tea.Cmd {
 	m.width = width
 	m.height = height
@@ -316,54 +151,22 @@ func (m *editorComponent) SetSize(width, height int) tea.Cmd {
 	return nil
 }
 
-func (m *editorComponent) GetSize() (int, int) {
-	return m.width, m.height
+func (m *editorComponent) Value() string {
+	return strings.TrimSpace(m.textarea.Value())
 }
 
-func (m *editorComponent) openEditor(value string) tea.Cmd {
-	editor := os.Getenv("EDITOR")
-	if editor == "" {
-		editor = "nvim"
-	}
-
-	tmpfile, err := os.CreateTemp("", "msg_*.md")
-	tmpfile.WriteString(value)
-	if err != nil {
-		status.Error(err.Error())
-		return nil
-	}
-	tmpfile.Close()
-	c := exec.Command(editor, tmpfile.Name()) //nolint:gosec
-	c.Stdin = os.Stdin
-	c.Stdout = os.Stdout
-	c.Stderr = os.Stderr
-	return tea.ExecProcess(c, func(err error) tea.Msg {
-		if err != nil {
-			status.Error(err.Error())
-			return nil
-		}
-		content, err := os.ReadFile(tmpfile.Name())
-		if err != nil {
-			status.Error(err.Error())
-			return nil
-		}
-		if len(content) == 0 {
-			status.Warn("Message is empty")
-			return nil
-		}
-		os.Remove(tmpfile.Name())
-		attachments := m.attachments
-		m.attachments = nil
-		return SendMsg{
-			Text:        string(content),
-			Attachments: attachments,
-		}
-	})
-}
-
-func (m *editorComponent) send() tea.Cmd {
-	value := strings.TrimSpace(m.textarea.Value())
+func (m *editorComponent) Submit() (tea.Model, tea.Cmd) {
+	value := m.Value()
 	m.textarea.Reset()
+	if value == "" {
+		return m, nil
+	}
+	if len(value) > 0 && value[len(value)-1] == '\\' {
+		// If the last character is a backslash, remove it and add a newline
+		m.textarea.SetValue(value[:len(value)-1] + "\n")
+		return m, nil
+	}
+
 	attachments := m.attachments
 
 	// Save to history if not empty and not a duplicate of the last entry
@@ -376,52 +179,82 @@ func (m *editorComponent) send() tea.Cmd {
 	}
 
 	m.attachments = nil
-	if value == "" {
-		return nil
-	}
 
-	// Check for slash command
-	// if strings.HasPrefix(value, "/") {
-	// 	commandName := strings.TrimPrefix(value, "/")
-	// 	if _, ok := m.app.Commands[commandName]; ok {
-	// 		return util.CmdHandler(commands.ExecuteCommandMsg{Name: commandName})
-	// 	}
-	// }
-	slog.Info("Send message", "value", value)
-
-	return tea.Batch(
-		util.CmdHandler(SendMsg{
+	return m, tea.Batch(
+		util.CmdHandler(app.SendMsg{
 			Text:        value,
 			Attachments: attachments,
 		}),
 	)
 }
 
-func (m *editorComponent) attachmentsContent() string {
-	if len(m.attachments) == 0 {
-		return ""
-	}
+func (m *editorComponent) Clear() (tea.Model, tea.Cmd) {
+	m.textarea.Reset()
+	return m, nil
+}
 
-	t := theme.CurrentTheme()
-	var styledAttachments []string
-	attachmentStyles := styles.BaseStyle().
-		MarginLeft(1).
-		Background(t.TextMuted()).
-		Foreground(t.Text())
-	for i, attachment := range m.attachments {
-		var filename string
-		if len(attachment.FileName) > 10 {
-			filename = fmt.Sprintf(" %s %s...", styles.DocumentIcon, attachment.FileName[0:7])
-		} else {
-			filename = fmt.Sprintf(" %s %s", styles.DocumentIcon, attachment.FileName)
-		}
-		if m.deleteMode {
-			filename = fmt.Sprintf("%d%s", i, filename)
-		}
-		styledAttachments = append(styledAttachments, attachmentStyles.Render(filename))
+func (m *editorComponent) Paste() (tea.Model, tea.Cmd) {
+	imageBytes, text, err := image.GetImageFromClipboard()
+	if err != nil {
+		slog.Error(err.Error())
+		return m, nil
 	}
-	content := lipgloss.JoinHorizontal(lipgloss.Left, styledAttachments...)
-	return content
+	if len(imageBytes) != 0 {
+		attachmentName := fmt.Sprintf("clipboard-image-%d", len(m.attachments))
+		attachment := app.Attachment{FilePath: attachmentName, FileName: attachmentName, Content: imageBytes, MimeType: "image/png"}
+		m.attachments = append(m.attachments, attachment)
+	} else {
+		m.textarea.SetValue(m.textarea.Value() + text)
+	}
+	return m, nil
+}
+
+func (m *editorComponent) Newline() (tea.Model, tea.Cmd) {
+	value := m.textarea.Value()
+	m.textarea.SetValue(value + "\n")
+	return m, nil
+}
+
+func (m *editorComponent) Previous() (tea.Model, tea.Cmd) {
+	currentLine := m.textarea.Line()
+
+	// Only navigate history if we're at the first line
+	if currentLine == 0 && len(m.history) > 0 {
+		// Save current message if we're just starting to navigate
+		if m.historyIndex == len(m.history) {
+			m.currentMessage = m.textarea.Value()
+		}
+
+		// Go to previous message in history
+		if m.historyIndex > 0 {
+			m.historyIndex--
+			m.textarea.SetValue(m.history[m.historyIndex])
+		}
+		return m, nil
+	}
+	return m, nil
+}
+
+func (m *editorComponent) Next() (tea.Model, tea.Cmd) {
+	currentLine := m.textarea.Line()
+	value := m.textarea.Value()
+	lines := strings.Split(value, "\n")
+	totalLines := len(lines)
+
+	// Only navigate history if we're at the last line
+	if currentLine == totalLines-1 {
+		if m.historyIndex < len(m.history)-1 {
+			// Go to next message in history
+			m.historyIndex++
+			m.textarea.SetValue(m.history[m.historyIndex])
+		} else if m.historyIndex == len(m.history)-1 {
+			// Return to the current message being composed
+			m.historyIndex = len(m.history)
+			m.textarea.SetValue(m.currentMessage)
+		}
+		return m, nil
+	}
+	return m, nil
 }
 
 func createTextArea(existing *textarea.Model) textarea.Model {
@@ -456,12 +289,19 @@ func createTextArea(existing *textarea.Model) textarea.Model {
 	return ta
 }
 
-func (m *editorComponent) GetValue() string {
-	return m.textarea.Value()
+func createSpinner() spinner.Model {
+	return spinner.New(
+		spinner.WithSpinner(spinner.Ellipsis),
+		spinner.WithStyle(
+			styles.
+				Muted().
+				Background(theme.CurrentTheme().Background()).
+				Width(3)),
+	)
 }
 
-func NewEditorComponent(app *app.App) layout.ModelWithView {
-	s := spinner.New(spinner.WithSpinner(spinner.Ellipsis), spinner.WithStyle(styles.Muted().Width(3)))
+func NewEditorComponent(app *app.App) EditorComponent {
+	s := createSpinner()
 	ta := createTextArea(nil)
 
 	return &editorComponent{

packages/tui/internal/components/chat/message.go

@@ -2,7 +2,6 @@ package chat
 
 import (
 	"fmt"
-	"log/slog"
 	"path/filepath"
 	"slices"
 	"strings"
@@ -24,7 +23,7 @@ import (
 
 func toMarkdown(content string, width int, backgroundColor compat.AdaptiveColor) string {
 	r := styles.GetMarkdownRenderer(width, backgroundColor)
-	content = strings.ReplaceAll(content, app.Info.Path.Root+"/", "")
+	content = strings.ReplaceAll(content, app.RootPath+"/", "")
 	rendered, _ := r.Render(content)
 	lines := strings.Split(rendered, "\n")
 
@@ -131,8 +130,8 @@ func renderContentBlock(content string, options ...renderingOption) string {
 	}
 
 	style := styles.BaseStyle().
-		MarginTop(renderer.marginTop).
-		MarginBottom(renderer.marginBottom).
+		// MarginTop(renderer.marginTop).
+		// MarginBottom(renderer.marginBottom).
 		PaddingTop(renderer.paddingTop).
 		PaddingBottom(renderer.paddingBottom).
 		PaddingLeft(renderer.paddingLeft).
@@ -188,20 +187,34 @@ func renderContentBlock(content string, options ...renderingOption) string {
 		content,
 		lipgloss.WithWhitespaceStyle(lipgloss.NewStyle().Background(t.Background())),
 	)
+	if renderer.marginTop > 0 {
+		for range renderer.marginTop {
+			content = "\n" + content
+		}
+	}
+	if renderer.marginBottom > 0 {
+		for range renderer.marginBottom {
+			content = content + "\n"
+		}
+	}
+
 	return content
 }
 
+func calculatePadding() int {
+	if layout.Current.Viewport.Width < 80 {
+		return 5
+	} else if layout.Current.Viewport.Width < 120 {
+		return 15
+	} else {
+		return 20
+	}
+}
+
 func renderText(message client.MessageInfo, text string, author string) string {
 	t := theme.CurrentTheme()
 	width := layout.Current.Container.Width
-	padding := 0
-	if layout.Current.Viewport.Width < 80 {
-		padding = 5
-	} else if layout.Current.Viewport.Width < 120 {
-		padding = 15
-	} else {
-		padding = 20
-	}
+	padding := calculatePadding()
 
 	timestamp := time.UnixMilli(int64(message.Metadata.Time.Created)).Local().Format("02 Jan 2006 03:04 PM")
 	if time.Now().Format("02 Jan 2006") == timestamp[:11] {
@@ -210,18 +223,13 @@ func renderText(message client.MessageInfo, text string, author string) string {
 	}
 	info := fmt.Sprintf("%s (%s)", author, timestamp)
 
-	align := lipgloss.Left
-	switch message.Role {
-	case client.User:
-		align = lipgloss.Right
-	case client.Assistant:
-		align = lipgloss.Left
-	}
-
 	textWidth := max(lipgloss.Width(text), lipgloss.Width(info))
 	markdownWidth := min(textWidth, width-padding-4) // -4 for the border and padding
+	if message.Role == client.Assistant {
+		markdownWidth = width - padding - 4
+	}
 	content := toMarkdown(text, markdownWidth, t.BackgroundSubtle())
-	content = lipgloss.JoinVertical(align, content, info)
+	content = strings.Join([]string{content, info}, "\n")
 
 	switch message.Role {
 	case client.User:
@@ -242,7 +250,8 @@ func renderToolInvocation(
 	toolCall client.MessageToolInvocationToolCall,
 	result *string,
 	metadata client.MessageInfo_Metadata_Tool_AdditionalProperties,
-	showResult bool,
+	showDetails bool,
+	isLast bool,
 ) string {
 	ignoredTools := []string{"opencode_todoread"}
 	if slices.Contains(ignoredTools, toolCall.ToolName) {
@@ -253,7 +262,7 @@ func renderToolInvocation(
 	innerWidth := outerWidth - 6
 	paddingTop := 0
 	paddingBottom := 0
-	if showResult {
+	if showDetails {
 		paddingTop = 1
 		if result == nil || *result == "" {
 			paddingBottom = 1
@@ -270,12 +279,26 @@ func renderToolInvocation(
 		PaddingRight(2).
 		BorderLeft(true).
 		BorderRight(true).
+		BorderBackground(t.Background()).
 		BorderForeground(t.BackgroundSubtle()).
 		BorderStyle(lipgloss.ThickBorder())
 
 	if toolCall.State == "partial-call" {
+		title := renderToolAction(toolCall.ToolName)
+		if !showDetails {
+			title = "∟ " + title
+			padding := calculatePadding()
+			style := lipgloss.NewStyle().Width(outerWidth - padding - 4).Background(t.BackgroundSubtle())
+			return renderContentBlock(style.Render(title),
+				WithAlign(lipgloss.Left),
+				WithBorderColor(t.Accent()),
+				WithPaddingTop(0),
+				WithPaddingBottom(1),
+			)
+		}
+
 		style = style.Foreground(t.TextMuted())
-		return style.Render(renderToolAction(toolCall.ToolName))
+		return style.Render(title)
 	}
 
 	toolArgs := ""
@@ -294,10 +317,6 @@ func renderToolInvocation(
 		}
 	}
 
-	if len(toolArgsMap) == 0 {
-		slog.Debug("no args")
-	}
-
 	body := ""
 	error := ""
 	finished := result != nil && *result != ""
@@ -333,7 +352,7 @@ func renderToolInvocation(
 	switch toolCall.ToolName {
 	case "opencode_read":
 		toolArgs = renderArgs(&toolArgsMap, "filePath")
-		title = fmt.Sprintf("Read: %s   %s", toolArgs, elapsed)
+		title = fmt.Sprintf("READ %s   %s", toolArgs, elapsed)
 		if preview, ok := metadata.Get("preview"); ok && toolArgsMap["filePath"] != nil {
 			filename := toolArgsMap["filePath"].(string)
 			body = preview.(string)
@@ -341,7 +360,7 @@ func renderToolInvocation(
 		}
 	case "opencode_edit":
 		if filename, ok := toolArgsMap["filePath"].(string); ok {
-			title = fmt.Sprintf("Edit: %s   %s", relative(filename), elapsed)
+			title = fmt.Sprintf("EDIT %s   %s", relative(filename), elapsed)
 			if d, ok := metadata.Get("diff"); ok {
 				patch := d.(string)
 				var formattedDiff string
@@ -358,12 +377,13 @@ func renderToolInvocation(
 				formattedDiff = strings.TrimSpace(formattedDiff)
 				formattedDiff = lipgloss.NewStyle().
 					BorderStyle(lipgloss.ThickBorder()).
+					BorderBackground(t.Background()).
 					BorderForeground(t.BackgroundSubtle()).
 					BorderLeft(true).
 					BorderRight(true).
 					Render(formattedDiff)
 
-				if showResult {
+				if showDetails {
 					style = style.Width(lipgloss.Width(formattedDiff))
 					title += "\n"
 				}
@@ -381,14 +401,14 @@ func renderToolInvocation(
 		}
 	case "opencode_write":
 		if filename, ok := toolArgsMap["filePath"].(string); ok {
-			title = fmt.Sprintf("Write: %s   %s", relative(filename), elapsed)
+			title = fmt.Sprintf("WRITE %s   %s", relative(filename), elapsed)
 			if content, ok := toolArgsMap["content"].(string); ok {
 				body = renderFile(filename, content)
 			}
 		}
 	case "opencode_bash":
 		if description, ok := toolArgsMap["description"].(string); ok {
-			title = fmt.Sprintf("Shell: %s   %s", description, elapsed)
+			title = fmt.Sprintf("SHELL %s   %s", description, elapsed)
 		}
 		if stdout, ok := metadata.Get("stdout"); ok {
 			command := toolArgsMap["command"].(string)
@@ -399,7 +419,7 @@ func renderToolInvocation(
 		}
 	case "opencode_webfetch":
 		toolArgs = renderArgs(&toolArgsMap, "url")
-		title = fmt.Sprintf("Fetching: %s   %s", toolArgs, elapsed)
+		title = fmt.Sprintf("FETCH %s   %s", toolArgs, elapsed)
 		if format, ok := toolArgsMap["format"].(string); ok {
 			body = *result
 			body = truncateHeight(body, 10)
@@ -409,7 +429,7 @@ func renderToolInvocation(
 			body = renderContentBlock(body, WithFullWidth(), WithMarginBottom(1))
 		}
 	case "opencode_todowrite":
-		title = fmt.Sprintf("Planning   %s", elapsed)
+		title = fmt.Sprintf("PLAN   %s", elapsed)
 
 		if to, ok := metadata.Get("todos"); ok && finished {
 			todos := to.([]any)
@@ -430,12 +450,28 @@ func renderToolInvocation(
 		}
 	default:
 		toolName := renderToolName(toolCall.ToolName)
-		title = fmt.Sprintf("%s: %s   %s", toolName, toolArgs, elapsed)
+		title = fmt.Sprintf("%s %s   %s", toolName, toolArgs, elapsed)
 		body = *result
 		body = truncateHeight(body, 10)
 		body = renderContentBlock(body, WithFullWidth(), WithMarginBottom(1))
 	}
 
+	if !showDetails {
+		title = "∟ " + title
+		padding := calculatePadding()
+		style := lipgloss.NewStyle().Width(outerWidth - padding - 4).Background(t.BackgroundSubtle())
+		paddingBottom := 0
+		if isLast {
+			paddingBottom = 1
+		}
+		return renderContentBlock(style.Render(title),
+			WithAlign(lipgloss.Left),
+			WithBorderColor(t.Accent()),
+			WithPaddingTop(0),
+			WithPaddingBottom(paddingBottom),
+		)
+	}
+
 	if body == "" && error == "" {
 		body = *result
 		body = truncateHeight(body, 10)
@@ -449,10 +485,10 @@ func renderToolInvocation(
 		content,
 		lipgloss.WithWhitespaceStyle(lipgloss.NewStyle().Background(t.Background())),
 	)
-	if showResult && body != "" && error == "" {
+	if showDetails && body != "" && error == "" {
 		content += "\n" + body
 	}
-	if showResult && error != "" {
+	if showDetails && error != "" {
 		content += "\n" + error
 	}
 	return content
@@ -463,19 +499,17 @@ func renderToolName(name string) string {
 	// case agent.AgentToolName:
 	// 	return "Task"
 	case "opencode_ls":
-		return "List"
+		return "LIST"
 	case "opencode_webfetch":
-		return "Fetch"
-	case "opencode_todoread":
-		return "Planning"
+		return "FETCH"
 	case "opencode_todowrite":
-		return "Planning"
+		return "PLAN"
 	default:
 		normalizedName := name
 		if strings.HasPrefix(name, "opencode_") {
 			normalizedName = strings.TrimPrefix(name, "opencode_")
 		}
-		return cases.Title(language.Und).String(normalizedName)
+		return cases.Upper(language.Und).String(normalizedName)
 	}
 }
 
@@ -541,6 +575,8 @@ func renderToolAction(name string) string {
 		return "Reading file..."
 	case "opencode_write":
 		return "Preparing write..."
+	case "opencode_todowrite", "opencode_todoread":
+		return "Planning..."
 	case "opencode_patch":
 		return "Preparing patch..."
 	case "opencode_batch":
@@ -583,7 +619,7 @@ func truncateHeight(content string, height int) string {
 }
 
 func relative(path string) string {
-	return strings.TrimPrefix(path, app.Info.Path.Root+"/")
+	return strings.TrimPrefix(path, app.RootPath+"/")
 }
 
 func extension(path string) string {

packages/tui/internal/components/chat/messages.go

@@ -1,10 +1,10 @@
 package chat
 
 import (
+	"slices"
 	"strings"
 	"time"
 
-	"github.com/charmbracelet/bubbles/v2/key"
 	"github.com/charmbracelet/bubbles/v2/spinner"
 	"github.com/charmbracelet/bubbles/v2/viewport"
 	tea "github.com/charmbracelet/bubbletea/v2"
@@ -12,51 +12,37 @@ import (
 	"github.com/sst/opencode/internal/app"
 	"github.com/sst/opencode/internal/components/dialog"
 	"github.com/sst/opencode/internal/layout"
-	"github.com/sst/opencode/internal/state"
 	"github.com/sst/opencode/internal/styles"
 	"github.com/sst/opencode/internal/theme"
 	"github.com/sst/opencode/pkg/client"
 )
 
+type MessagesComponent interface {
+	tea.Model
+	tea.ViewModel
+	PageUp() (tea.Model, tea.Cmd)
+	PageDown() (tea.Model, tea.Cmd)
+	HalfPageUp() (tea.Model, tea.Cmd)
+	HalfPageDown() (tea.Model, tea.Cmd)
+	First() (tea.Model, tea.Cmd)
+	Last() (tea.Model, tea.Cmd)
+	// Previous() (tea.Model, tea.Cmd)
+	// Next() (tea.Model, tea.Cmd)
+}
+
 type messagesComponent struct {
-	app             *app.App
 	width, height   int
+	app             *app.App
 	viewport        viewport.Model
 	spinner         spinner.Model
-	rendering       bool
 	attachments     viewport.Model
-	showToolResults bool
 	cache           *MessageCache
+	rendering       bool
+	showToolDetails bool
 	tail            bool
 }
 type renderFinishedMsg struct{}
-type ToggleToolMessagesMsg struct{}
-
-type MessageKeys struct {
-	PageDown     key.Binding
-	PageUp       key.Binding
-	HalfPageUp   key.Binding
-	HalfPageDown key.Binding
-}
-
-var messageKeys = MessageKeys{
-	PageDown: key.NewBinding(
-		key.WithKeys("pgdown"),
-		key.WithHelp("f/pgdn", "page down"),
-	),
-	PageUp: key.NewBinding(
-		key.WithKeys("pgup"),
-		key.WithHelp("b/pgup", "page up"),
-	),
-	HalfPageUp: key.NewBinding(
-		key.WithKeys("ctrl+u"),
-		key.WithHelp("ctrl+u", "½ page up"),
-	),
-	HalfPageDown: key.NewBinding(
-		key.WithKeys("ctrl+d", "ctrl+d"),
-		key.WithHelp("ctrl+d", "½ page down"),
-	),
-}
+type ToggleToolDetailsMsg struct{}
 
 func (m *messagesComponent) Init() tea.Cmd {
 	return tea.Batch(m.viewport.Init(), m.spinner.Tick)
@@ -64,50 +50,45 @@ func (m *messagesComponent) Init() tea.Cmd {
 
 func (m *messagesComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmds []tea.Cmd
-	switch msg := msg.(type) {
-	case SendMsg:
+	switch msg.(type) {
+	case app.SendMsg:
 		m.viewport.GotoBottom()
 		m.tail = true
 		return m, nil
-	case dialog.ThemeChangedMsg:
+	case dialog.ThemeSelectedMsg:
 		m.cache.Clear()
 		m.renderView()
 		return m, nil
-	case ToggleToolMessagesMsg:
-		m.showToolResults = !m.showToolResults
+	case ToggleToolDetailsMsg:
+		m.showToolDetails = !m.showToolDetails
 		m.renderView()
 		return m, nil
-	case state.SessionSelectedMsg:
+	case app.SessionSelectedMsg:
 		m.cache.Clear()
 		cmd := m.Reload()
 		m.viewport.GotoBottom()
 		return m, cmd
-	case state.SessionClearedMsg:
+	case app.SessionClearedMsg:
 		m.cache.Clear()
 		cmd := m.Reload()
 		return m, cmd
-	case tea.KeyMsg:
-		if key.Matches(msg, messageKeys.PageUp) ||
-			key.Matches(msg, messageKeys.PageDown) ||
-			key.Matches(msg, messageKeys.HalfPageUp) ||
-			key.Matches(msg, messageKeys.HalfPageDown) {
-			u, cmd := m.viewport.Update(msg)
-			m.viewport = u
-			m.tail = m.viewport.AtBottom()
-			cmds = append(cmds, cmd)
-		}
 	case renderFinishedMsg:
 		m.rendering = false
 		if m.tail {
 			m.viewport.GotoBottom()
 		}
-	case state.StateUpdatedMsg:
+	case client.EventSessionUpdated, client.EventMessageUpdated:
 		m.renderView()
 		if m.tail {
 			m.viewport.GotoBottom()
 		}
 	}
 
+	viewport, cmd := m.viewport.Update(msg)
+	m.viewport = viewport
+	m.tail = m.viewport.AtBottom()
+	cmds = append(cmds, cmd)
+
 	spinner, cmd := m.spinner.Update(msg)
 	m.spinner = spinner
 	cmds = append(cmds, cmd)
@@ -135,16 +116,27 @@ func (m *messagesComponent) renderView() {
 	for _, message := range m.app.Messages {
 		var content string
 		var cached bool
+		lastToolIndex := 0
+		lastToolIndices := []int{}
+		for i, p := range message.Parts {
+			part, _ := p.ValueByDiscriminator()
+			switch part.(type) {
+			case client.MessagePartText:
+				lastToolIndices = append(lastToolIndices, lastToolIndex)
+			case client.MessagePartToolInvocation:
+				lastToolIndex = i
+			}
+		}
 
 		author := ""
 		switch message.Role {
 		case client.User:
-			author = app.Info.User
+			author = m.app.Info.User
 		case client.Assistant:
 			author = message.Metadata.Assistant.ModelID
 		}
 
-		for _, p := range message.Parts {
+		for i, p := range message.Parts {
 			part, err := p.ValueByDiscriminator()
 			if err != nil {
 				continue //TODO: handle error?
@@ -171,6 +163,7 @@ func (m *messagesComponent) renderView() {
 					previousBlockType = assistantTextBlock
 				}
 			case client.MessagePartToolInvocation:
+				isLastToolInvocation := slices.Contains(lastToolIndices, i)
 				toolInvocationPart := part.(client.MessagePartToolInvocation)
 				toolCall, _ := toolInvocationPart.ToolInvocation.AsMessageToolInvocationToolCall()
 				metadata := client.MessageInfo_Metadata_Tool_AdditionalProperties{}
@@ -186,20 +179,32 @@ func (m *messagesComponent) renderView() {
 				if toolCall.State == "result" {
 					key := m.cache.GenerateKey(message.Id,
 						toolCall.ToolCallId,
-						m.showToolResults,
+						m.showToolDetails,
 						layout.Current.Viewport.Width,
 					)
 					content, cached = m.cache.Get(key)
 					if !cached {
-						content = renderToolInvocation(toolCall, result, metadata, m.showToolResults)
+						content = renderToolInvocation(
+							toolCall,
+							result,
+							metadata,
+							m.showToolDetails,
+							isLastToolInvocation,
+						)
 						m.cache.Set(key, content)
 					}
 				} else {
-					// if the tool call isn't finished, never cache
-					content = renderToolInvocation(toolCall, result, metadata, m.showToolResults)
+					// if the tool call isn't finished, don't cache
+					content = renderToolInvocation(
+						toolCall,
+						result,
+						metadata,
+						m.showToolDetails,
+						isLastToolInvocation,
+					)
 				}
 
-				if previousBlockType != toolInvocationBlock {
+				if previousBlockType != toolInvocationBlock && m.showToolDetails {
 					blocks = append(blocks, "")
 				}
 				blocks = append(blocks, content)
@@ -242,8 +247,8 @@ func (m *messagesComponent) header() string {
 
 	t := theme.CurrentTheme()
 	width := layout.Current.Container.Width
-	base := styles.BaseStyle().Render
-	muted := styles.Muted().Render
+	base := styles.BaseStyle().Background(t.Background()).Render
+	muted := styles.Muted().Background(t.Background()).Render
 	headerLines := []string{}
 	headerLines = append(headerLines, toMarkdown("# "+m.app.Session.Title, width-6, t.Background()))
 	if m.app.Session.Share != nil && m.app.Session.Share.Url != "" {
@@ -257,7 +262,7 @@ func (m *messagesComponent) header() string {
 		Width(width).
 		PaddingLeft(2).
 		PaddingRight(2).
-		// Background(t.BackgroundElement()).
+		Background(t.Background()).
 		BorderLeft(true).
 		BorderRight(true).
 		BorderBackground(t.Background()).
@@ -289,15 +294,11 @@ func (m *messagesComponent) View() string {
 }
 
 func (m *messagesComponent) home() string {
-	// t := theme.CurrentTheme()
-	baseStyle := styles.BaseStyle()
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle().Background(t.Background())
 	base := baseStyle.Render
-	muted := styles.Muted().Render
+	muted := styles.Muted().Background(t.Background()).Render
 
-	// 	mark := `
-	// ███▀▀█
-	// ███  █
-	// ▀▀▀▀▀▀  `
 	open := `
 █▀▀█ █▀▀█ █▀▀ █▀▀▄ 
 █░░█ █░░█ █▀▀ █░░█ 
@@ -309,9 +310,8 @@ func (m *messagesComponent) home() string {
 
 	logo := lipgloss.JoinHorizontal(
 		lipgloss.Top,
-		// styles.BaseStyle().Foreground(t.Primary()).Render(mark),
-		styles.Muted().Render(open),
-		styles.BaseStyle().Render(code),
+		muted(open),
+		base(code),
 	)
 	// cwd := app.Info.Path.Cwd
 	// config := app.Info.Path.Config
@@ -327,13 +327,13 @@ func (m *messagesComponent) home() string {
 
 	commandLines := []string{}
 	for _, command := range commands {
-		commandLines = append(commandLines, (base(command[0]) + " " + muted(command[1])))
+		commandLines = append(commandLines, (base(command[0]+" ") + muted(command[1])))
 	}
 
 	logoAndVersion := lipgloss.JoinVertical(
 		lipgloss.Right,
 		logo,
-		muted(app.Info.Version),
+		muted(m.app.Version),
 	)
 
 	lines := []string{}
@@ -347,22 +347,18 @@ func (m *messagesComponent) home() string {
 	lines = append(lines, commandLines...)
 	lines = append(lines, "")
 	if m.rendering {
-		lines = append(lines, styles.Muted().Render("Loading session..."))
+		lines = append(lines, base("Loading session..."))
 	} else {
 		lines = append(lines, "")
 	}
 
-	t := theme.CurrentTheme()
 	return lipgloss.Place(
 		m.width,
 		m.height,
 		lipgloss.Center,
 		lipgloss.Center,
 		baseStyle.Width(lipgloss.Width(logoAndVersion)).Render(
-			lipgloss.JoinVertical(
-				lipgloss.Top,
-				lines...,
-			),
+			strings.Join(lines, "\n"),
 		),
 		lipgloss.WithWhitespaceStyle(lipgloss.NewStyle().Background(t.Background())),
 	)
@@ -398,26 +394,55 @@ func (m *messagesComponent) Reload() tea.Cmd {
 	}
 }
 
-func NewMessagesComponent(app *app.App) layout.ModelWithView {
+func (m *messagesComponent) PageUp() (tea.Model, tea.Cmd) {
+	m.viewport.ViewUp()
+	return m, nil
+}
+
+func (m *messagesComponent) PageDown() (tea.Model, tea.Cmd) {
+	m.viewport.ViewDown()
+	return m, nil
+}
+
+func (m *messagesComponent) HalfPageUp() (tea.Model, tea.Cmd) {
+	m.viewport.HalfViewUp()
+	return m, nil
+}
+
+func (m *messagesComponent) HalfPageDown() (tea.Model, tea.Cmd) {
+	m.viewport.HalfViewDown()
+	return m, nil
+}
+
+func (m *messagesComponent) First() (tea.Model, tea.Cmd) {
+	m.viewport.GotoTop()
+	m.tail = false
+	return m, nil
+}
+
+func (m *messagesComponent) Last() (tea.Model, tea.Cmd) {
+	m.viewport.GotoBottom()
+	m.tail = true
+	return m, nil
+}
+
+func NewMessagesComponent(app *app.App) MessagesComponent {
 	customSpinner := spinner.Spinner{
 		Frames: []string{" ", "┃", "┃"},
 		FPS:    time.Second / 3,
 	}
 	s := spinner.New(spinner.WithSpinner(customSpinner))
 
-	vp := viewport.New()          //(0, 0)
-	attachments := viewport.New() //(0, 0)
-	vp.KeyMap.PageUp = messageKeys.PageUp
-	vp.KeyMap.PageDown = messageKeys.PageDown
-	vp.KeyMap.HalfPageUp = messageKeys.HalfPageUp
-	vp.KeyMap.HalfPageDown = messageKeys.HalfPageDown
+	vp := viewport.New()
+	attachments := viewport.New()
+	vp.KeyMap = viewport.KeyMap{}
 
 	return &messagesComponent{
 		app:             app,
 		viewport:        vp,
 		spinner:         s,
 		attachments:     attachments,
-		showToolResults: true,
+		showToolDetails: true,
 		cache:           NewMessageCache(),
 		tail:            true,
 	}

packages/tui/internal/components/core/status.go

@@ -1,264 +0,0 @@
-package core
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	tea "github.com/charmbracelet/bubbletea/v2"
-	"github.com/charmbracelet/lipgloss/v2"
-	"github.com/sst/opencode/internal/app"
-	"github.com/sst/opencode/internal/layout"
-	"github.com/sst/opencode/internal/pubsub"
-	"github.com/sst/opencode/internal/status"
-	"github.com/sst/opencode/internal/styles"
-	"github.com/sst/opencode/internal/theme"
-)
-
-type StatusComponent interface {
-	layout.ModelWithView
-}
-
-type statusComponent struct {
-	app         *app.App
-	queue       []status.StatusMessage
-	width       int
-	messageTTL  time.Duration
-	activeUntil time.Time
-}
-
-// clearMessageCmd is a command that clears status messages after a timeout
-func (m statusComponent) clearMessageCmd() tea.Cmd {
-	return tea.Tick(time.Second, func(t time.Time) tea.Msg {
-		return statusCleanupMsg{time: t}
-	})
-}
-
-// statusCleanupMsg is a message that triggers cleanup of expired status messages
-type statusCleanupMsg struct {
-	time time.Time
-}
-
-func (m statusComponent) Init() tea.Cmd {
-	return m.clearMessageCmd()
-}
-
-func (m statusComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	switch msg := msg.(type) {
-	case tea.WindowSizeMsg:
-		m.width = msg.Width
-		return m, nil
-	case pubsub.Event[status.StatusMessage]:
-		if msg.Type == status.EventStatusPublished {
-			// If this is a critical message, move it to the front of the queue
-			if msg.Payload.Critical {
-				// Insert at the front of the queue
-				m.queue = append([]status.StatusMessage{msg.Payload}, m.queue...)
-
-				// Reset active time to show critical message immediately
-				m.activeUntil = time.Time{}
-			} else {
-				// Otherwise, just add it to the queue
-				m.queue = append(m.queue, msg.Payload)
-
-				// If this is the first message and nothing is active, activate it immediately
-				if len(m.queue) == 1 && m.activeUntil.IsZero() {
-					now := time.Now()
-					duration := m.messageTTL
-					if msg.Payload.Duration > 0 {
-						duration = msg.Payload.Duration
-					}
-					m.activeUntil = now.Add(duration)
-				}
-			}
-		}
-	case statusCleanupMsg:
-		now := msg.time
-
-		// If the active message has expired, remove it and activate the next one
-		if !m.activeUntil.IsZero() && m.activeUntil.Before(now) {
-			// Current message expired, remove it if we have one
-			if len(m.queue) > 0 {
-				m.queue = m.queue[1:]
-			}
-			m.activeUntil = time.Time{}
-		}
-
-		// If we have messages in queue but none are active, activate the first one
-		if len(m.queue) > 0 && m.activeUntil.IsZero() {
-			// Use custom duration if specified, otherwise use default
-			duration := m.messageTTL
-			if m.queue[0].Duration > 0 {
-				duration = m.queue[0].Duration
-			}
-			m.activeUntil = now.Add(duration)
-		}
-
-		return m, m.clearMessageCmd()
-	}
-	return m, nil
-}
-
-func logo() string {
-	t := theme.CurrentTheme()
-	base := lipgloss.NewStyle().Background(t.BackgroundElement()).Foreground(t.TextMuted()).Render
-	emphasis := lipgloss.NewStyle().Bold(true).Background(t.BackgroundElement()).Foreground(t.Text()).Render
-
-	open := base("open")
-	code := emphasis("code ")
-	version := base(app.Info.Version)
-	return styles.Padded().
-		Background(t.BackgroundElement()).
-		Render(open + code + version)
-}
-
-func formatTokensAndCost(tokens float32, contextWindow float32, cost float32) string {
-	// Format tokens in human-readable format (e.g., 110K, 1.2M)
-	var formattedTokens string
-	switch {
-	case tokens >= 1_000_000:
-		formattedTokens = fmt.Sprintf("%.1fM", float64(tokens)/1_000_000)
-	case tokens >= 1_000:
-		formattedTokens = fmt.Sprintf("%.1fK", float64(tokens)/1_000)
-	default:
-		formattedTokens = fmt.Sprintf("%d", int(tokens))
-	}
-
-	// Remove .0 suffix if present
-	if strings.HasSuffix(formattedTokens, ".0K") {
-		formattedTokens = strings.Replace(formattedTokens, ".0K", "K", 1)
-	}
-	if strings.HasSuffix(formattedTokens, ".0M") {
-		formattedTokens = strings.Replace(formattedTokens, ".0M", "M", 1)
-	}
-
-	// Format cost with $ symbol and 2 decimal places
-	formattedCost := fmt.Sprintf("$%.2f", cost)
-	percentage := (float64(tokens) / float64(contextWindow)) * 100
-
-	return fmt.Sprintf("Tokens: %s (%d%%), Cost: %s", formattedTokens, int(percentage), formattedCost)
-}
-
-func (m statusComponent) View() string {
-	if m.app.Session.Id == "" {
-		return styles.BaseStyle().
-			Width(m.width).
-			Height(2).
-			Render("")
-	}
-
-	t := theme.CurrentTheme()
-	logo := logo()
-
-	cwd := styles.Padded().
-		Foreground(t.TextMuted()).
-		Background(t.BackgroundSubtle()).
-		Render(app.Info.Path.Cwd)
-
-	sessionInfo := ""
-	if m.app.Session.Id != "" {
-		tokens := float32(0)
-		cost := float32(0)
-		contextWindow := m.app.Model.Limit.Context
-
-		for _, message := range m.app.Messages {
-			if message.Metadata.Assistant != nil {
-				cost += message.Metadata.Assistant.Cost
-				usage := message.Metadata.Assistant.Tokens
-				if usage.Output > 0 {
-					tokens = (usage.Input + usage.Output + usage.Reasoning)
-				}
-			}
-		}
-
-		sessionInfo = styles.Padded().
-			Background(t.BackgroundElement()).
-			Foreground(t.TextMuted()).
-			Render(formatTokensAndCost(tokens, contextWindow, cost))
-	}
-
-	// diagnostics := styles.Padded().Background(t.BackgroundElement()).Render(m.projectDiagnostics())
-
-	space := max(
-		0,
-		m.width-lipgloss.Width(logo)-lipgloss.Width(cwd)-lipgloss.Width(sessionInfo),
-	)
-	spacer := lipgloss.NewStyle().Background(t.BackgroundSubtle()).Width(space).Render("")
-
-	status := logo + cwd + spacer + sessionInfo
-
-	blank := styles.BaseStyle().Background(t.Background()).Width(m.width).Render("")
-	return blank + "\n" + status
-
-	// Display the first status message if available
-	// var statusMessage string
-	// if len(m.queue) > 0 {
-	// 	sm := m.queue[0]
-	// 	infoStyle := styles.Padded().
-	// 		Foreground(t.Background())
-	//
-	// 	switch sm.Level {
-	// 	case "info":
-	// 		infoStyle = infoStyle.Background(t.Info())
-	// 	case "warn":
-	// 		infoStyle = infoStyle.Background(t.Warning())
-	// 	case "error":
-	// 		infoStyle = infoStyle.Background(t.Error())
-	// 	case "debug":
-	// 		infoStyle = infoStyle.Background(t.TextMuted())
-	// 	}
-	//
-	// 	// Truncate message if it's longer than available width
-	// 	msg := sm.Message
-	// 	availWidth := statusWidth - 10
-	//
-	// 	// If we have enough space, show inline
-	// 	if availWidth >= minInlineWidth {
-	// 		if len(msg) > availWidth && availWidth > 0 {
-	// 			msg = msg[:availWidth] + "..."
-	// 		}
-	// 		status += infoStyle.Width(statusWidth).Render(msg)
-	// 	} else {
-	// 		// Otherwise, prepare a full-width message to show above
-	// 		if len(msg) > m.width-10 && m.width > 10 {
-	// 			msg = msg[:m.width-10] + "..."
-	// 		}
-	// 		statusMessage = infoStyle.Width(m.width).Render(msg)
-	//
-	// 		// Add empty space in the status bar
-	// 		status += styles.Padded().
-	// 			Foreground(t.Text()).
-	// 			Background(t.BackgroundSubtle()).
-	// 			Width(statusWidth).
-	// 			Render("")
-	// 	}
-	// } else {
-	// 	status += styles.Padded().
-	// 		Foreground(t.Text()).
-	// 		Background(t.BackgroundSubtle()).
-	// 		Width(statusWidth).
-	// 		Render("")
-	// }
-
-	// status += diagnostics
-	// status += modelName
-
-	// If we have a separate status message, prepend it
-	// if statusMessage != "" {
-	// 	return statusMessage + "\n" + status
-	// } else {
-	// blank := styles.BaseStyle().Background(t.Background()).Width(m.width).Render("")
-	// return blank + "\n" + status
-	// }
-}
-
-func NewStatusCmp(app *app.App) StatusComponent {
-	statusComponent := &statusComponent{
-		app:         app,
-		queue:       []status.StatusMessage{},
-		messageTTL:  4 * time.Second,
-		activeUntil: time.Time{},
-	}
-
-	return statusComponent
-}

packages/tui/internal/components/dialog/complete.go

@@ -1,20 +1,19 @@
 package dialog
 
 import (
+	"log/slog"
+
 	"github.com/charmbracelet/bubbles/v2/key"
 	"github.com/charmbracelet/bubbles/v2/textarea"
 	tea "github.com/charmbracelet/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/sst/opencode/internal/components/list"
-	"github.com/sst/opencode/internal/layout"
-	"github.com/sst/opencode/internal/status"
 	"github.com/sst/opencode/internal/styles"
 	"github.com/sst/opencode/internal/theme"
 	"github.com/sst/opencode/internal/util"
 )
 
 type CompletionItem struct {
-	title string
 	Title string
 	Value string
 }
@@ -36,8 +35,7 @@ func (ci *CompletionItem) Render(selected bool, width int) string {
 
 	if selected {
 		itemStyle = itemStyle.
-			Foreground(t.Primary()).
-			Bold(true)
+			Foreground(t.Primary())
 	}
 
 	title := itemStyle.Render(
@@ -63,6 +61,7 @@ type CompletionProvider interface {
 	GetId() string
 	GetEntry() CompletionItemI
 	GetChildEntries(query string) ([]CompletionItemI, error)
+	GetEmptyMessage() string
 }
 
 type CompletionSelectedMsg struct {
@@ -78,7 +77,8 @@ type CompletionDialogCompleteItemMsg struct {
 type CompletionDialogCloseMsg struct{}
 
 type CompletionDialog interface {
-	layout.ModelWithView
+	tea.Model
+	tea.ViewModel
 	SetWidth(width int)
 	IsEmpty() bool
 	SetProvider(provider CompletionProvider)
@@ -142,8 +142,11 @@ func (c *completionDialogComponent) close() tea.Cmd {
 func (c *completionDialogComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmds []tea.Cmd
 	switch msg := msg.(type) {
+	case []CompletionItemI:
+		c.list.SetItems(msg)
 	case tea.KeyMsg:
 		if c.pseudoSearchTextArea.Focused() {
+			slog.Info("CompletionDialog", "key", msg.String(), "focused", true)
 			if !key.Matches(msg, completionDialogKeys.Complete) {
 				var cmd tea.Cmd
 				c.pseudoSearchTextArea, cmd = c.pseudoSearchTextArea.Update(msg)
@@ -156,18 +159,20 @@ func (c *completionDialogComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				}
 
 				if query != c.query {
-					items, err := c.completionProvider.GetChildEntries(query)
-					if err != nil {
-						status.Error(err.Error())
-					}
-
-					c.list.SetItems(items)
 					c.query = query
+					cmd = func() tea.Msg {
+						items, err := c.completionProvider.GetChildEntries(query)
+						slog.Info("CompletionDialog", "query", query, "items", len(items))
+						if err != nil {
+							slog.Error("Failed to get completion items", "error", err)
+						}
+						return items
+					}
+					cmds = append(cmds, cmd)
 				}
 
 				u, cmd := c.list.Update(msg)
 				c.list = u.(list.List[CompletionItemI])
-
 				cmds = append(cmds, cmd)
 			}
 
@@ -187,14 +192,19 @@ func (c *completionDialogComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 			return c, tea.Batch(cmds...)
 		} else {
-			items, err := c.completionProvider.GetChildEntries("")
-			if err != nil {
-				status.Error(err.Error())
+			slog.Info("CompletionDialog", "key", msg.String(), "focused", false)
+			cmd := func() tea.Msg {
+				items, err := c.completionProvider.GetChildEntries("")
+				if err != nil {
+					slog.Error("Failed to get completion items", "error", err)
+					// status.Error(err.Error())
+				}
+				return items
 			}
-
-			c.list.SetItems(items)
+			cmds = append(cmds, cmd)
+			cmds = append(cmds, c.pseudoSearchTextArea.Focus())
 			c.pseudoSearchTextArea.SetValue(msg.String())
-			return c, c.pseudoSearchTextArea.Focus()
+			return c, tea.Batch(cmds...)
 		}
 	case tea.WindowSizeMsg:
 		c.width = msg.Width
@@ -227,6 +237,7 @@ func (c *completionDialogComponent) View() string {
 		BorderBottom(false).
 		BorderRight(true).
 		BorderLeft(true).
+		BorderBackground(t.Background()).
 		BorderForeground(t.BackgroundSubtle()).
 		Width(c.width).
 		Render(c.list.View())
@@ -243,29 +254,28 @@ func (c *completionDialogComponent) IsEmpty() bool {
 func (c *completionDialogComponent) SetProvider(provider CompletionProvider) {
 	if c.completionProvider.GetId() != provider.GetId() {
 		c.completionProvider = provider
-		items, err := provider.GetChildEntries("")
-		if err != nil {
-			status.Error(err.Error())
-		}
-		c.list.SetItems(items)
+		c.list.SetEmptyMessage(" " + provider.GetEmptyMessage())
 	}
 }
 
 func NewCompletionDialogComponent(completionProvider CompletionProvider) CompletionDialog {
 	ti := textarea.New()
 
-	items, err := completionProvider.GetChildEntries("")
-	if err != nil {
-		status.Error(err.Error())
-	}
-
 	li := list.NewListComponent(
-		items,
+		[]CompletionItemI{},
 		7,
-		"No matches",
+		completionProvider.GetEmptyMessage(),
 		false,
 	)
 
+	go func() {
+		items, err := completionProvider.GetChildEntries("")
+		if err != nil {
+			// status.Error(err.Error())
+		}
+		li.SetItems(items)
+	}()
+
 	return &completionDialogComponent{
 		query:                "",
 		completionProvider:   completionProvider,

packages/tui/internal/components/dialog/help.go

@@ -3,9 +3,9 @@ package dialog
 import (
 	"strings"
 
-	"github.com/charmbracelet/bubbles/v2/key"
 	tea "github.com/charmbracelet/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
+	"github.com/sst/opencode/internal/commands"
 	"github.com/sst/opencode/internal/components/modal"
 	"github.com/sst/opencode/internal/layout"
 	"github.com/sst/opencode/internal/theme"
@@ -15,28 +15,9 @@ type helpDialog struct {
 	width    int
 	height   int
 	modal    *modal.Modal
-	bindings []key.Binding
+	commands []commands.Command
 }
 
-// func (i bindingItem) Render(selected bool, width int) string {
-// 	t := theme.CurrentTheme()
-// 	baseStyle := styles.BaseStyle().
-// 		Width(width - 2).
-// 		Background(t.BackgroundElement())
-//
-// 	if selected {
-// 		baseStyle = baseStyle.
-// 			Background(t.Primary()).
-// 			Foreground(t.BackgroundElement()).
-// 			Bold(true)
-// 	} else {
-// 		baseStyle = baseStyle.
-// 			Foreground(t.Text())
-// 	}
-//
-// 	return baseStyle.Padding(0, 1).Render(i.binding.Help().Desc)
-// }
-
 func (h *helpDialog) Init() tea.Cmd {
 	return nil
 }
@@ -63,19 +44,24 @@ func (h *helpDialog) View() string {
 		PaddingLeft(1).Background(t.BackgroundElement())
 
 	lines := []string{}
-	for _, b := range h.bindings {
-		content := keyStyle.Render(b.Help().Key)
-		content += descStyle.Render(" " + b.Help().Desc)
-		for i, key := range b.Keys() {
-			if i == 0 {
-				keyString := " (" + strings.ToUpper(key) + ")"
-				// space := max(h.width-lipgloss.Width(content)-lipgloss.Width(keyString), 0)
-				// spacer := strings.Repeat(" ", space)
-				// content += descStyle.Render(spacer)
-				content += descStyle.Render(keyString)
-			}
+	for _, b := range h.commands {
+		// Only interested in slash commands
+		if b.Trigger == "" {
+			continue
 		}
 
+		content := keyStyle.Render("/" + b.Trigger)
+		content += descStyle.Render(" " + b.Description)
+		// for i, key := range b.Keybindings {
+		// 	if i == 0 {
+		// keyString := " (" + key.Key + ")"
+		// space := max(h.width-lipgloss.Width(content)-lipgloss.Width(keyString), 0)
+		// spacer := strings.Repeat(" ", space)
+		// content += descStyle.Render(spacer)
+		// content += descStyle.Render(keyString)
+		// 	}
+		// }
+
 		lines = append(lines, contentStyle.Render(content))
 	}
 
@@ -94,9 +80,9 @@ type HelpDialog interface {
 	layout.Modal
 }
 
-func NewHelpDialog(bindings ...key.Binding) HelpDialog {
+func NewHelpDialog(commands []commands.Command) HelpDialog {
 	return &helpDialog{
-		bindings: bindings,
+		commands: commands,
 		modal:    modal.New(),
 	}
 }

packages/tui/internal/components/dialog/models.go

@@ -13,7 +13,6 @@ import (
 	"github.com/sst/opencode/internal/app"
 	"github.com/sst/opencode/internal/components/modal"
 	"github.com/sst/opencode/internal/layout"
-	"github.com/sst/opencode/internal/state"
 	"github.com/sst/opencode/internal/styles"
 	"github.com/sst/opencode/internal/theme"
 	"github.com/sst/opencode/internal/util"
@@ -115,7 +114,7 @@ func (m *modelDialog) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			return m, tea.Sequence(
 				util.CmdHandler(modal.CloseModalMsg{}),
 				util.CmdHandler(
-					state.ModelSelectedMsg{
+					app.ModelSelectedMsg{
 						Provider: m.provider,
 						Model:    models[m.selectedIdx],
 					}),

packages/tui/internal/components/dialog/permission.go

@@ -6,7 +6,6 @@ import (
 	"github.com/charmbracelet/bubbles/v2/viewport"
 	tea "github.com/charmbracelet/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
-	"github.com/sst/opencode/internal/layout"
 	"github.com/sst/opencode/internal/styles"
 	"github.com/sst/opencode/internal/theme"
 	"github.com/sst/opencode/internal/util"
@@ -30,7 +29,8 @@ type PermissionResponseMsg struct {
 
 // PermissionDialogComponent interface for permission dialog component
 type PermissionDialogComponent interface {
-	layout.ModelWithView
+	tea.Model
+	tea.ViewModel
 	// SetPermissions(permission permission.PermissionRequest) tea.Cmd
 }
 

packages/tui/internal/components/dialog/session.go

@@ -8,7 +8,6 @@ import (
 	"github.com/sst/opencode/internal/components/list"
 	"github.com/sst/opencode/internal/components/modal"
 	"github.com/sst/opencode/internal/layout"
-	"github.com/sst/opencode/internal/state"
 	"github.com/sst/opencode/internal/styles"
 	"github.com/sst/opencode/internal/theme"
 	"github.com/sst/opencode/internal/util"
@@ -69,7 +68,7 @@ func (s *sessionDialog) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				s.selectedSessionID = selectedSession.Id
 				return s, tea.Sequence(
 					util.CmdHandler(modal.CloseModalMsg{}),
-					util.CmdHandler(state.SessionSelectedMsg(&selectedSession)),
+					util.CmdHandler(app.SessionSelectedMsg(&selectedSession)),
 				)
 			}
 		}

packages/tui/internal/components/dialog/theme.go

@@ -5,14 +5,13 @@ import (
 	list "github.com/sst/opencode/internal/components/list"
 	"github.com/sst/opencode/internal/components/modal"
 	"github.com/sst/opencode/internal/layout"
-	"github.com/sst/opencode/internal/status"
 	"github.com/sst/opencode/internal/styles"
 	"github.com/sst/opencode/internal/theme"
 	"github.com/sst/opencode/internal/util"
 )
 
-// ThemeChangedMsg is sent when the theme is changed
-type ThemeChangedMsg struct {
+// ThemeSelectedMsg is sent when the theme is changed
+type ThemeSelectedMsg struct {
 	ThemeName string
 }
 
@@ -71,12 +70,12 @@ func (t *themeDialog) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 					return t, util.CmdHandler(modal.CloseModalMsg{})
 				}
 				if err := theme.SetTheme(selectedTheme); err != nil {
-					status.Error(err.Error())
+					// status.Error(err.Error())
 					return t, nil
 				}
 				return t, tea.Sequence(
 					util.CmdHandler(modal.CloseModalMsg{}),
-					util.CmdHandler(ThemeChangedMsg{ThemeName: selectedTheme}),
+					util.CmdHandler(ThemeSelectedMsg{ThemeName: selectedTheme}),
 				)
 			}
 		}

packages/tui/internal/components/list/list.go

@@ -4,7 +4,6 @@ import (
 	"github.com/charmbracelet/bubbles/v2/key"
 	tea "github.com/charmbracelet/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
-	"github.com/sst/opencode/internal/layout"
 )
 
 type ListItem interface {
@@ -12,12 +11,14 @@ type ListItem interface {
 }
 
 type List[T ListItem] interface {
-	layout.ModelWithView
+	tea.Model
+	tea.ViewModel
 	SetMaxWidth(maxWidth int)
 	GetSelectedItem() (item T, idx int)
 	SetItems(items []T)
 	GetItems() []T
 	SetSelectedIndex(idx int)
+	SetEmptyMessage(msg string)
 	IsEmpty() bool
 }
 
@@ -100,6 +101,10 @@ func (c *listComponent[T]) GetItems() []T {
 	return c.items
 }
 
+func (c *listComponent[T]) SetEmptyMessage(msg string) {
+	c.fallbackMsg = msg
+}
+
 func (c *listComponent[T]) IsEmpty() bool {
 	return len(c.items) == 0
 }

packages/tui/internal/components/status/status.go

@@ -0,0 +1,140 @@
+package status
+
+import (
+	"fmt"
+	"strings"
+
+	tea "github.com/charmbracelet/bubbletea/v2"
+	"github.com/charmbracelet/lipgloss/v2"
+	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/styles"
+	"github.com/sst/opencode/internal/theme"
+)
+
+type StatusComponent interface {
+	tea.Model
+	tea.ViewModel
+}
+
+type statusComponent struct {
+	app   *app.App
+	width int
+}
+
+func (m statusComponent) Init() tea.Cmd {
+	return nil
+}
+
+func (m statusComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		m.width = msg.Width
+		return m, nil
+	}
+	return m, nil
+}
+
+func (m statusComponent) logo() string {
+	t := theme.CurrentTheme()
+	base := lipgloss.NewStyle().Background(t.BackgroundElement()).Foreground(t.TextMuted()).Render
+	emphasis := lipgloss.NewStyle().Bold(true).Background(t.BackgroundElement()).Foreground(t.Text()).Render
+
+	open := base("open")
+	code := emphasis("code ")
+	version := base(m.app.Version)
+	return styles.Padded().
+		Background(t.BackgroundElement()).
+		Render(open + code + version)
+}
+
+func formatTokensAndCost(tokens float32, contextWindow float32, cost float32) string {
+	// Format tokens in human-readable format (e.g., 110K, 1.2M)
+	var formattedTokens string
+	switch {
+	case tokens >= 1_000_000:
+		formattedTokens = fmt.Sprintf("%.1fM", float64(tokens)/1_000_000)
+	case tokens >= 1_000:
+		formattedTokens = fmt.Sprintf("%.1fK", float64(tokens)/1_000)
+	default:
+		formattedTokens = fmt.Sprintf("%d", int(tokens))
+	}
+
+	// Remove .0 suffix if present
+	if strings.HasSuffix(formattedTokens, ".0K") {
+		formattedTokens = strings.Replace(formattedTokens, ".0K", "K", 1)
+	}
+	if strings.HasSuffix(formattedTokens, ".0M") {
+		formattedTokens = strings.Replace(formattedTokens, ".0M", "M", 1)
+	}
+
+	// Format cost with $ symbol and 2 decimal places
+	formattedCost := fmt.Sprintf("$%.2f", cost)
+	percentage := (float64(tokens) / float64(contextWindow)) * 100
+
+	return fmt.Sprintf("Tokens: %s (%d%%), Cost: %s", formattedTokens, int(percentage), formattedCost)
+}
+
+func (m statusComponent) View() string {
+	t := theme.CurrentTheme()
+	if m.app.Session.Id == "" {
+		return styles.BaseStyle().
+			Background(t.Background()).
+			Width(m.width).
+			Height(2).
+			Render("")
+	}
+
+	logo := m.logo()
+
+	cwd := styles.Padded().
+		Foreground(t.TextMuted()).
+		Background(t.BackgroundSubtle()).
+		Render(m.app.Info.Path.Cwd)
+
+	sessionInfo := ""
+	if m.app.Session.Id != "" {
+		tokens := float32(0)
+		cost := float32(0)
+		contextWindow := m.app.Model.Limit.Context
+
+		for _, message := range m.app.Messages {
+			if message.Metadata.Assistant != nil {
+				cost += message.Metadata.Assistant.Cost
+				usage := message.Metadata.Assistant.Tokens
+				if usage.Output > 0 {
+					tokens = (usage.Input +
+						usage.Cache.Write +
+						usage.Cache.Read +
+						usage.Output +
+						usage.Reasoning)
+				}
+			}
+		}
+
+		sessionInfo = styles.Padded().
+			Background(t.BackgroundElement()).
+			Foreground(t.TextMuted()).
+			Render(formatTokensAndCost(tokens, contextWindow, cost))
+	}
+
+	// diagnostics := styles.Padded().Background(t.BackgroundElement()).Render(m.projectDiagnostics())
+
+	space := max(
+		0,
+		m.width-lipgloss.Width(logo)-lipgloss.Width(cwd)-lipgloss.Width(sessionInfo),
+	)
+	spacer := lipgloss.NewStyle().Background(t.BackgroundSubtle()).Width(space).Render("")
+
+	status := logo + cwd + spacer + sessionInfo
+
+	blank := styles.BaseStyle().Background(t.Background()).Width(m.width).Render("")
+	return blank + "\n" + status
+}
+
+func NewStatusCmp(app *app.App) StatusComponent {
+	statusComponent := &statusComponent{
+		app: app,
+	}
+
+	return statusComponent
+}

packages/tui/internal/config/config.go

@@ -9,25 +9,57 @@ import (
 	"github.com/BurntSushi/toml"
 )
 
-type Config struct {
+type State struct {
 	Theme    string `toml:"theme"`
 	Provider string `toml:"provider"`
 	Model    string `toml:"model"`
 }
 
-// NewConfig creates a new Config instance with default values.
-// This can be useful for initializing a new configuration file.
-func NewConfig(theme, provider, model string) *Config {
-	return &Config{
-		Theme:    theme,
-		Provider: provider,
-		Model:    model,
+type Config struct {
+	Theme    string            `toml:"theme"`
+	Provider string            `toml:"provider"`
+	Model    string            `toml:"model"`
+	Keybinds map[string]string `toml:"keybinds"`
+}
+
+func NewState() *State {
+	return &State{
+		Theme: "opencode",
 	}
 }
 
-// SaveConfig writes the provided Config struct to the specified TOML file.
+func NewConfig() *Config {
+	keybinds := make(map[string]string)
+	keybinds["leader"] = "ctrl+x"
+	return &Config{
+		Keybinds: keybinds,
+	}
+}
+
+func ConfigToState(config *Config) *State {
+	return &State{
+		Theme:    config.Theme,
+		Provider: config.Provider,
+		Model:    config.Model,
+	}
+}
+
+func MergeState(state *State, config *Config) *Config {
+	if config.Theme == "" {
+		config.Theme = state.Theme
+	}
+	if config.Provider == "" {
+		config.Provider = state.Provider
+	}
+	if config.Model == "" {
+		config.Model = state.Model
+	}
+	return config
+}
+
+// SaveState writes the provided Config struct to the specified TOML file.
 // It will create the file if it doesn't exist, or overwrite it if it does.
-func SaveConfig(filePath string, config *Config) error {
+func SaveState(filePath string, state *State) error {
 	file, err := os.Create(filePath)
 	if err != nil {
 		return fmt.Errorf("failed to create/open config file %s: %w", filePath, err)
@@ -35,17 +67,15 @@ func SaveConfig(filePath string, config *Config) error {
 	defer file.Close()
 
 	writer := bufio.NewWriter(file)
-
 	encoder := toml.NewEncoder(writer)
-	if err := encoder.Encode(config); err != nil {
-		return fmt.Errorf("failed to encode config to TOML file %s: %w", filePath, err)
+	if err := encoder.Encode(state); err != nil {
+		return fmt.Errorf("failed to encode state to TOML file %s: %w", filePath, err)
 	}
-
 	if err := writer.Flush(); err != nil {
-		return fmt.Errorf("failed to flush writer for config file %s: %w", filePath, err)
+		return fmt.Errorf("failed to flush writer for state file %s: %w", filePath, err)
 	}
 
-	slog.Debug("Configuration saved to file", "file", filePath)
+	slog.Debug("State saved to file", "file", filePath)
 	return nil
 }
 
@@ -53,13 +83,24 @@ func SaveConfig(filePath string, config *Config) error {
 // It returns a pointer to the Config struct and an error if any issues occur.
 func LoadConfig(filePath string) (*Config, error) {
 	var config Config
-
 	if _, err := toml.DecodeFile(filePath, &config); err != nil {
 		if _, statErr := os.Stat(filePath); os.IsNotExist(statErr) {
 			return nil, fmt.Errorf("config file not found at %s: %w", filePath, statErr)
 		}
 		return nil, fmt.Errorf("failed to decode TOML from file %s: %w", filePath, err)
 	}
-
 	return &config, nil
 }
+
+// LoadState loads the state from the specified TOML file.
+// It returns a pointer to the State struct and an error if any issues occur.
+func LoadState(filePath string) (*State, error) {
+	var state State
+	if _, err := toml.DecodeFile(filePath, &state); err != nil {
+		if _, statErr := os.Stat(filePath); os.IsNotExist(statErr) {
+			return nil, fmt.Errorf("state file not found at %s: %w", filePath, statErr)
+		}
+		return nil, fmt.Errorf("failed to decode TOML from file %s: %w", filePath, err)
+	}
+	return &state, nil
+}

packages/tui/internal/layout/container.go

@@ -6,20 +6,12 @@ import (
 	"github.com/sst/opencode/internal/theme"
 )
 
-type ModelWithView interface {
+type Container interface {
 	tea.Model
 	tea.ViewModel
-}
-
-type Container interface {
-	ModelWithView
 	Sizeable
-	Focus()
-	Blur()
-	MaxWidth() int
-	Alignment() lipgloss.Position
-	GetPosition() (x, y int)
-	GetContent() ModelWithView
+	Focusable
+	Alignable
 }
 
 type container struct {
@@ -28,7 +20,7 @@ type container struct {
 	x      int
 	y      int
 
-	content ModelWithView
+	content tea.ViewModel
 
 	paddingTop    int
 	paddingRight  int
@@ -48,13 +40,19 @@ type container struct {
 }
 
 func (c *container) Init() tea.Cmd {
-	return c.content.Init()
+	if model, ok := c.content.(tea.Model); ok {
+		return model.Init()
+	}
+	return nil
 }
 
 func (c *container) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	u, cmd := c.content.Update(msg)
-	c.content = u.(ModelWithView)
-	return c, cmd
+	if model, ok := c.content.(tea.Model); ok {
+		u, cmd := model.Update(msg)
+		c.content = u.(tea.ViewModel)
+		return c, cmd
+	}
+	return c, nil
 }
 
 func (c *container) View() string {
@@ -156,21 +154,28 @@ func (c *container) Alignment() lipgloss.Position {
 }
 
 // Focus sets the container as focused
-func (c *container) Focus() {
+func (c *container) Focus() tea.Cmd {
 	c.focused = true
-	// Pass focus to content if it supports it
-	if focusable, ok := c.content.(interface{ Focus() }); ok {
-		focusable.Focus()
+	if focusable, ok := c.content.(Focusable); ok {
+		return focusable.Focus()
 	}
+	return nil
 }
 
 // Blur removes focus from the container
-func (c *container) Blur() {
+func (c *container) Blur() tea.Cmd {
 	c.focused = false
-	// Remove focus from content if it supports it
-	if blurable, ok := c.content.(interface{ Blur() }); ok {
-		blurable.Blur()
+	if blurable, ok := c.content.(Focusable); ok {
+		return blurable.Blur()
 	}
+	return nil
+}
+
+func (c *container) IsFocused() bool {
+	if blurable, ok := c.content.(Focusable); ok {
+		return blurable.IsFocused()
+	}
+	return c.focused
 }
 
 // GetPosition returns the x, y coordinates of the container
@@ -178,14 +183,14 @@ func (c *container) GetPosition() (x, y int) {
 	return c.x, c.y
 }
 
-// GetContent returns the content of the container
-func (c *container) GetContent() ModelWithView {
-	return c.content
+func (c *container) SetPosition(x, y int) {
+	c.x = x
+	c.y = y
 }
 
 type ContainerOption func(*container)
 
-func NewContainer(content ModelWithView, options ...ContainerOption) Container {
+func NewContainer(content tea.ViewModel, options ...ContainerOption) Container {
 	c := &container{
 		content:     content,
 		borderStyle: lipgloss.NormalBorder(),

packages/tui/internal/layout/flex.go

@@ -13,22 +13,22 @@ const (
 	FlexDirectionVertical
 )
 
-type FlexPaneSize struct {
+type FlexChildSize struct {
 	Fixed bool
 	Size  int
 }
 
-var FlexPaneSizeGrow = FlexPaneSize{Fixed: false}
+var FlexChildSizeGrow = FlexChildSize{Fixed: false}
 
-func FlexPaneSizeFixed(size int) FlexPaneSize {
-	return FlexPaneSize{Fixed: true, Size: size}
+func FlexChildSizeFixed(size int) FlexChildSize {
+	return FlexChildSize{Fixed: true, Size: size}
 }
 
 type FlexLayout interface {
-	ModelWithView
+	tea.ViewModel
 	Sizeable
-	SetPanes(panes []Container) tea.Cmd
-	SetPaneSizes(sizes []FlexPaneSize) tea.Cmd
+	SetChildren(panes []tea.ViewModel) tea.Cmd
+	SetSizes(sizes []FlexChildSize) tea.Cmd
 	SetDirection(direction FlexDirection) tea.Cmd
 }
 
@@ -36,94 +36,69 @@ type flexLayout struct {
 	width     int
 	height    int
 	direction FlexDirection
-	panes     []Container
-	sizes     []FlexPaneSize
+	children  []tea.ViewModel
+	sizes     []FlexChildSize
 }
 
 type FlexLayoutOption func(*flexLayout)
 
-func (f *flexLayout) Init() tea.Cmd {
-	var cmds []tea.Cmd
-	for _, pane := range f.panes {
-		if pane != nil {
-			cmds = append(cmds, pane.Init())
-		}
-	}
-	return tea.Batch(cmds...)
-}
-
-func (f *flexLayout) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	var cmds []tea.Cmd
-	switch msg := msg.(type) {
-	case tea.WindowSizeMsg:
-		return f, f.SetSize(msg.Width, msg.Height)
-	}
-
-	for i, pane := range f.panes {
-		if pane != nil {
-			u, cmd := pane.Update(msg)
-			f.panes[i] = u.(Container)
-			if cmd != nil {
-				cmds = append(cmds, cmd)
-			}
-		}
-	}
-
-	return f, tea.Batch(cmds...)
-}
-
 func (f *flexLayout) View() string {
-	if len(f.panes) == 0 {
+	if len(f.children) == 0 {
 		return ""
 	}
 
 	t := theme.CurrentTheme()
-	views := make([]string, 0, len(f.panes))
-	for i, pane := range f.panes {
-		if pane == nil {
+	views := make([]string, 0, len(f.children))
+	for i, child := range f.children {
+		if child == nil {
 			continue
 		}
 
-		var paneWidth, paneHeight int
+		alignment := lipgloss.Center
+		if alignable, ok := child.(Alignable); ok {
+			alignment = alignable.Alignment()
+		}
+		var childWidth, childHeight int
 		if f.direction == FlexDirectionHorizontal {
-			paneWidth, paneHeight = f.calculatePaneSize(i)
+			childWidth, childHeight = f.calculateChildSize(i)
 			view := lipgloss.PlaceHorizontal(
-				paneWidth,
-				pane.Alignment(),
-				pane.View(),
+				childWidth,
+				alignment,
+				child.View(),
+				// TODO: make configurable WithBackgroundStyle
 				lipgloss.WithWhitespaceStyle(lipgloss.NewStyle().Background(t.Background())),
 			)
 			views = append(views, view)
 		} else {
-			paneWidth, paneHeight = f.calculatePaneSize(i)
+			childWidth, childHeight = f.calculateChildSize(i)
 			view := lipgloss.Place(
 				f.width,
-				paneHeight,
+				childHeight,
 				lipgloss.Center,
-				pane.Alignment(),
-				pane.View(),
+				alignment,
+				child.View(),
+				// TODO: make configurable WithBackgroundStyle
 				lipgloss.WithWhitespaceStyle(lipgloss.NewStyle().Background(t.Background())),
 			)
 			views = append(views, view)
 		}
 	}
-
 	if f.direction == FlexDirectionHorizontal {
 		return lipgloss.JoinHorizontal(lipgloss.Center, views...)
 	}
 	return lipgloss.JoinVertical(lipgloss.Center, views...)
 }
 
-func (f *flexLayout) calculatePaneSize(index int) (width, height int) {
-	if index >= len(f.panes) {
+func (f *flexLayout) calculateChildSize(index int) (width, height int) {
+	if index >= len(f.children) {
 		return 0, 0
 	}
 
 	totalFixed := 0
 	flexCount := 0
 
-	for i, pane := range f.panes {
-		if pane == nil {
+	for i, child := range f.children {
+		if child == nil {
 			continue
 		}
 		if i < len(f.sizes) && f.sizes[i].Fixed {
@@ -165,9 +140,13 @@ func (f *flexLayout) SetSize(width, height int) tea.Cmd {
 	var cmds []tea.Cmd
 	currentX, currentY := 0, 0
 
-	for i, pane := range f.panes {
-		if pane != nil {
-			paneWidth, paneHeight := f.calculatePaneSize(i)
+	for i, child := range f.children {
+		if child != nil {
+			paneWidth, paneHeight := f.calculateChildSize(i)
+			alignment := lipgloss.Center
+			if alignable, ok := child.(Alignable); ok {
+				alignment = alignable.Alignment()
+			}
 
 			// Calculate actual position based on alignment
 			actualX, actualY := currentX, currentY
@@ -179,11 +158,13 @@ func (f *flexLayout) SetSize(width, height int) tea.Cmd {
 			} else {
 				// In vertical layout, horizontal alignment affects X position
 				contentWidth := paneWidth
-				if pane.MaxWidth() > 0 && contentWidth > pane.MaxWidth() {
-					contentWidth = pane.MaxWidth()
+				if alignable, ok := child.(Alignable); ok {
+					if alignable.MaxWidth() > 0 && contentWidth > alignable.MaxWidth() {
+						contentWidth = alignable.MaxWidth()
+					}
 				}
 
-				switch pane.Alignment() {
+				switch alignment {
 				case lipgloss.Center:
 					actualX = (f.width - contentWidth) / 2
 				case lipgloss.Right:
@@ -193,14 +174,15 @@ func (f *flexLayout) SetSize(width, height int) tea.Cmd {
 				}
 			}
 
-			// Set position if the pane is a *container
-			if c, ok := pane.(*container); ok {
-				c.x = actualX
-				c.y = actualY
+			// Set position if the pane is Alignable
+			if c, ok := child.(Alignable); ok {
+				c.SetPosition(actualX, actualY)
 			}
 
-			cmd := pane.SetSize(paneWidth, paneHeight)
-			cmds = append(cmds, cmd)
+			if sizeable, ok := child.(Sizeable); ok {
+				cmd := sizeable.SetSize(paneWidth, paneHeight)
+				cmds = append(cmds, cmd)
+			}
 
 			// Update position for next pane
 			if f.direction == FlexDirectionHorizontal {
@@ -217,15 +199,15 @@ func (f *flexLayout) GetSize() (int, int) {
 	return f.width, f.height
 }
 
-func (f *flexLayout) SetPanes(panes []Container) tea.Cmd {
-	f.panes = panes
+func (f *flexLayout) SetChildren(children []tea.ViewModel) tea.Cmd {
+	f.children = children
 	if f.width > 0 && f.height > 0 {
 		return f.SetSize(f.width, f.height)
 	}
 	return nil
 }
 
-func (f *flexLayout) SetPaneSizes(sizes []FlexPaneSize) tea.Cmd {
+func (f *flexLayout) SetSizes(sizes []FlexChildSize) tea.Cmd {
 	f.sizes = sizes
 	if f.width > 0 && f.height > 0 {
 		return f.SetSize(f.width, f.height)
@@ -241,11 +223,11 @@ func (f *flexLayout) SetDirection(direction FlexDirection) tea.Cmd {
 	return nil
 }
 
-func NewFlexLayout(options ...FlexLayoutOption) FlexLayout {
+func NewFlexLayout(children []tea.ViewModel, options ...FlexLayoutOption) FlexLayout {
 	layout := &flexLayout{
+		children:  children,
 		direction: FlexDirectionHorizontal,
-		panes:     []Container{},
-		sizes:     []FlexPaneSize{},
+		sizes:     []FlexChildSize{},
 	}
 	for _, option := range options {
 		option(layout)
@@ -259,13 +241,13 @@ func WithDirection(direction FlexDirection) FlexLayoutOption {
 	}
 }
 
-func WithPanes(panes ...Container) FlexLayoutOption {
+func WithChildren(children ...tea.ViewModel) FlexLayoutOption {
 	return func(f *flexLayout) {
-		f.panes = panes
+		f.children = children
 	}
 }
 
-func WithPaneSizes(sizes ...FlexPaneSize) FlexLayoutOption {
+func WithSizes(sizes ...FlexChildSize) FlexLayoutOption {
 	return func(f *flexLayout) {
 		f.sizes = sizes
 	}

packages/tui/internal/layout/layout.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/charmbracelet/bubbles/v2/key"
 	tea "github.com/charmbracelet/bubbletea/v2"
+	"github.com/charmbracelet/lipgloss/v2"
 )
 
 var Current *LayoutInfo
@@ -45,6 +46,13 @@ type Sizeable interface {
 	GetSize() (int, int)
 }
 
+type Alignable interface {
+	MaxWidth() int
+	Alignment() lipgloss.Position
+	SetPosition(x, y int)
+	GetPosition() (x, y int)
+}
+
 func KeyMapToSlice(t any) (bindings []key.Binding) {
 	typ := reflect.TypeOf(t)
 	if typ.Kind() != reflect.Struct {

packages/tui/internal/page/chat.go

@@ -1,188 +0,0 @@
-package page
-
-import (
-	"context"
-
-	"github.com/charmbracelet/bubbles/v2/key"
-	tea "github.com/charmbracelet/bubbletea/v2"
-	"github.com/charmbracelet/lipgloss/v2"
-	"github.com/sst/opencode/internal/app"
-	"github.com/sst/opencode/internal/completions"
-	"github.com/sst/opencode/internal/components/chat"
-	"github.com/sst/opencode/internal/components/dialog"
-	"github.com/sst/opencode/internal/layout"
-	"github.com/sst/opencode/internal/util"
-)
-
-var ChatPage PageID = "chat"
-
-type chatPage struct {
-	app                  *app.App
-	editor               layout.Container
-	messages             layout.Container
-	layout               layout.FlexLayout
-	completionDialog     dialog.CompletionDialog
-	completionManager    *completions.CompletionManager
-	showCompletionDialog bool
-}
-
-type ChatKeyMap struct {
-	Cancel               key.Binding
-	ToggleTools          key.Binding
-	ShowCompletionDialog key.Binding
-}
-
-var keyMap = ChatKeyMap{
-	Cancel: key.NewBinding(
-		key.WithKeys("esc"),
-		key.WithHelp("esc", "cancel"),
-	),
-	ToggleTools: key.NewBinding(
-		key.WithKeys("ctrl+h"),
-		key.WithHelp("ctrl+h", "toggle tools"),
-	),
-	ShowCompletionDialog: key.NewBinding(
-		key.WithKeys("/"),
-		key.WithHelp("/", "Complete"),
-	),
-}
-
-func (p *chatPage) Init() tea.Cmd {
-	cmds := []tea.Cmd{
-		p.layout.Init(),
-	}
-	cmds = append(cmds, p.completionDialog.Init())
-	return tea.Batch(cmds...)
-}
-
-func (p *chatPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	var cmds []tea.Cmd
-	switch msg := msg.(type) {
-	case tea.WindowSizeMsg:
-		cmd := p.layout.SetSize(msg.Width, msg.Height)
-		cmds = append(cmds, cmd)
-	case chat.SendMsg:
-		p.showCompletionDialog = false
-		cmd := p.sendMessage(msg.Text, msg.Attachments)
-		if cmd != nil {
-			return p, cmd
-		}
-	case dialog.CompletionDialogCloseMsg:
-		p.showCompletionDialog = false
-	case tea.KeyMsg:
-		switch msg.String() {
-		case "ctrl+c":
-			_, cmd := p.editor.Update(msg)
-			if cmd != nil {
-				return p, cmd
-			}
-		}
-
-		switch {
-		case key.Matches(msg, keyMap.ShowCompletionDialog):
-			p.showCompletionDialog = true
-			// Continue sending keys to layout->chat
-		case key.Matches(msg, keyMap.Cancel):
-			if p.app.Session.Id != "" {
-				// Cancel the current session's generation process
-				// This allows users to interrupt long-running operations
-				p.app.Cancel(context.Background(), p.app.Session.Id)
-				return p, nil
-			}
-		case key.Matches(msg, keyMap.ToggleTools):
-			return p, util.CmdHandler(chat.ToggleToolMessagesMsg{})
-		}
-	}
-
-	if p.showCompletionDialog {
-		// Get the current text from the editor to determine which provider to use
-		editorModel := p.editor.GetContent().(interface{ GetValue() string })
-		currentInput := editorModel.GetValue()
-
-		provider := p.completionManager.GetProvider(currentInput)
-		p.completionDialog.SetProvider(provider)
-
-		context, contextCmd := p.completionDialog.Update(msg)
-		p.completionDialog = context.(dialog.CompletionDialog)
-		cmds = append(cmds, contextCmd)
-
-		// Doesn't forward event if enter key is pressed and there are completions
-		if keyMsg, ok := msg.(tea.KeyMsg); ok {
-			if keyMsg.String() == "enter" { // && !p.completionDialog.IsEmpty() {
-				return p, tea.Batch(cmds...)
-			}
-		}
-	}
-
-	u, cmd := p.layout.Update(msg)
-	cmds = append(cmds, cmd)
-	p.layout = u.(layout.FlexLayout)
-	return p, tea.Batch(cmds...)
-}
-
-func (p *chatPage) sendMessage(text string, attachments []app.Attachment) tea.Cmd {
-	var cmds []tea.Cmd
-	cmd := p.app.SendChatMessage(context.Background(), text, attachments)
-	cmds = append(cmds, cmd)
-	return tea.Batch(cmds...)
-}
-
-func (p *chatPage) SetSize(width, height int) tea.Cmd {
-	return p.layout.SetSize(width, height)
-}
-
-func (p *chatPage) GetSize() (int, int) {
-	return p.layout.GetSize()
-}
-
-func (p *chatPage) View() string {
-	layoutView := p.layout.View()
-
-	if p.showCompletionDialog {
-		editorWidth, _ := p.editor.GetSize()
-		editorX, editorY := p.editor.GetPosition()
-
-		p.completionDialog.SetWidth(editorWidth)
-		overlay := p.completionDialog.View()
-
-		layoutView = layout.PlaceOverlay(
-			editorX,
-			editorY-lipgloss.Height(overlay)+2,
-			overlay,
-			layoutView,
-		)
-	}
-
-	return layoutView
-}
-
-func NewChatPage(app *app.App) layout.ModelWithView {
-	completionManager := completions.NewCompletionManager(app)
-	initialProvider := completionManager.GetProvider("")
-	completionDialog := dialog.NewCompletionDialogComponent(initialProvider)
-
-	messagesContainer := layout.NewContainer(
-		chat.NewMessagesComponent(app),
-	)
-	editorContainer := layout.NewContainer(
-		chat.NewEditorComponent(app),
-		layout.WithMaxWidth(layout.Current.Container.Width),
-		layout.WithAlignCenter(),
-	)
-
-	return &chatPage{
-		app:               app,
-		editor:            editorContainer,
-		messages:          messagesContainer,
-		completionDialog:  completionDialog,
-		completionManager: completionManager,
-		layout: layout.NewFlexLayout(
-			layout.WithPanes(messagesContainer, editorContainer),
-			layout.WithDirection(layout.FlexDirectionVertical),
-			layout.WithPaneSizes(
-				layout.FlexPaneSizeGrow,
-				layout.FlexPaneSizeFixed(6),
-			),
-		),
-	}
-}

packages/tui/internal/page/page.go

@@ -1,8 +0,0 @@
-package page
-
-type PageID string
-
-// PageChangeMsg is used to change the current page
-type PageChangeMsg struct {
-	ID PageID
-}

packages/tui/internal/pubsub/broker.go

@@ -1,113 +0,0 @@
-package pubsub
-
-import (
-	"context"
-	"fmt"
-	"log/slog"
-	"sync"
-	"time"
-)
-
-const defaultChannelBufferSize = 100
-
-type Broker[T any] struct {
-	subs     map[chan Event[T]]context.CancelFunc
-	mu       sync.RWMutex
-	isClosed bool
-}
-
-func NewBroker[T any]() *Broker[T] {
-	return &Broker[T]{
-		subs: make(map[chan Event[T]]context.CancelFunc),
-	}
-}
-
-func (b *Broker[T]) Shutdown() {
-	b.mu.Lock()
-	if b.isClosed {
-		b.mu.Unlock()
-		return
-	}
-	b.isClosed = true
-
-	for ch, cancel := range b.subs {
-		cancel()
-		close(ch)
-		delete(b.subs, ch)
-	}
-	b.mu.Unlock()
-	slog.Debug("PubSub broker shut down", "type", fmt.Sprintf("%T", *new(T)))
-}
-
-func (b *Broker[T]) Subscribe(ctx context.Context) <-chan Event[T] {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-
-	if b.isClosed {
-		closedCh := make(chan Event[T])
-		close(closedCh)
-		return closedCh
-	}
-
-	subCtx, subCancel := context.WithCancel(ctx)
-	subscriberChannel := make(chan Event[T], defaultChannelBufferSize)
-	b.subs[subscriberChannel] = subCancel
-
-	go func() {
-		<-subCtx.Done()
-		b.mu.Lock()
-		defer b.mu.Unlock()
-		if _, ok := b.subs[subscriberChannel]; ok {
-			close(subscriberChannel)
-			delete(b.subs, subscriberChannel)
-		}
-	}()
-
-	return subscriberChannel
-}
-
-func (b *Broker[T]) Publish(eventType EventType, payload T) {
-	b.mu.RLock()
-	defer b.mu.RUnlock()
-
-	if b.isClosed {
-		slog.Warn("Attempted to publish on a closed pubsub broker", "type", eventType, "payload_type", fmt.Sprintf("%T", payload))
-		return
-	}
-
-	event := Event[T]{Type: eventType, Payload: payload}
-
-	for ch := range b.subs {
-		// Non-blocking send with a fallback to a goroutine to prevent slow subscribers
-		// from blocking the publisher.
-		select {
-		case ch <- event:
-			// Successfully sent
-		default:
-			// Subscriber channel is full or receiver is slow.
-			// Send in a new goroutine to avoid blocking the publisher.
-			// This might lead to out-of-order delivery for this specific slow subscriber.
-			go func(sChan chan Event[T], ev Event[T]) {
-				// Re-check if broker is closed before attempting send in goroutine
-				b.mu.RLock()
-				isBrokerClosed := b.isClosed
-				b.mu.RUnlock()
-				if isBrokerClosed {
-					return
-				}
-
-				select {
-				case sChan <- ev:
-				case <-time.After(2 * time.Second): // Timeout for slow subscriber
-					slog.Warn("PubSub: Dropped event for slow subscriber after timeout", "type", ev.Type)
-				}
-			}(ch, event)
-		}
-	}
-}
-
-func (b *Broker[T]) GetSubscriberCount() int {
-	b.mu.RLock()
-	defer b.mu.RUnlock()
-	return len(b.subs)
-}

packages/tui/internal/pubsub/events.go

@@ -1,24 +0,0 @@
-package pubsub
-
-import "context"
-
-type EventType string
-
-const (
-	EventTypeCreated EventType = "created"
-	EventTypeUpdated EventType = "updated"
-	EventTypeDeleted EventType = "deleted"
-)
-
-type Event[T any] struct {
-	Type    EventType
-	Payload T
-}
-
-type Subscriber[T any] interface {
-	Subscribe(ctx context.Context) <-chan Event[T]
-}
-
-type Publisher[T any] interface {
-	Publish(eventType EventType, payload T)
-}

packages/tui/internal/state/state.go

@@ -1,19 +0,0 @@
-package state
-
-import (
-	"github.com/sst/opencode/pkg/client"
-)
-
-type SessionSelectedMsg = *client.SessionInfo
-type ModelSelectedMsg struct {
-	Provider client.ProviderInfo
-	Model    client.ModelInfo
-}
-
-type SessionClearedMsg struct{}
-type CompactSessionMsg struct{}
-
-// TODO: remove
-type StateUpdatedMsg struct {
-	State map[string]any
-}

packages/tui/internal/status/status.go

@@ -1,142 +0,0 @@
-package status
-
-import (
-	"context"
-	"fmt"
-	"log/slog"
-	"sync"
-	"time"
-
-	"github.com/sst/opencode/internal/pubsub"
-)
-
-type Level string
-
-const (
-	LevelInfo  Level = "info"
-	LevelWarn  Level = "warn"
-	LevelError Level = "error"
-	LevelDebug Level = "debug"
-)
-
-type StatusMessage struct {
-	Level     Level         `json:"level"`
-	Message   string        `json:"message"`
-	Timestamp time.Time     `json:"timestamp"`
-	Critical  bool          `json:"critical"`
-	Duration  time.Duration `json:"duration"`
-}
-
-// StatusOption is a function that configures a status message
-type StatusOption func(*StatusMessage)
-
-// WithCritical marks a status message as critical, causing it to be displayed immediately
-func WithCritical(critical bool) StatusOption {
-	return func(msg *StatusMessage) {
-		msg.Critical = critical
-	}
-}
-
-// WithDuration sets a custom display duration for a status message
-func WithDuration(duration time.Duration) StatusOption {
-	return func(msg *StatusMessage) {
-		msg.Duration = duration
-	}
-}
-
-const (
-	EventStatusPublished pubsub.EventType = "status_published"
-)
-
-type Service interface {
-	pubsub.Subscriber[StatusMessage]
-
-	Info(message string, opts ...StatusOption)
-	Warn(message string, opts ...StatusOption)
-	Error(message string, opts ...StatusOption)
-	Debug(message string, opts ...StatusOption)
-}
-
-type service struct {
-	broker *pubsub.Broker[StatusMessage]
-	mu     sync.RWMutex
-}
-
-var globalStatusService *service
-
-func InitService() error {
-	if globalStatusService != nil {
-		return fmt.Errorf("status service already initialized")
-	}
-	broker := pubsub.NewBroker[StatusMessage]()
-	globalStatusService = &service{
-		broker: broker,
-	}
-	return nil
-}
-
-func GetService() Service {
-	if globalStatusService == nil {
-		panic("status service not initialized. Call status.InitService() at application startup.")
-	}
-	return globalStatusService
-}
-
-func (s *service) Info(message string, opts ...StatusOption) {
-	s.publish(LevelInfo, message, opts...)
-	slog.Info(message)
-}
-
-func (s *service) Warn(message string, opts ...StatusOption) {
-	s.publish(LevelWarn, message, opts...)
-	slog.Warn(message)
-}
-
-func (s *service) Error(message string, opts ...StatusOption) {
-	s.publish(LevelError, message, opts...)
-	slog.Error(message)
-}
-
-func (s *service) Debug(message string, opts ...StatusOption) {
-	s.publish(LevelDebug, message, opts...)
-	slog.Debug(message)
-}
-
-func (s *service) publish(level Level, messageText string, opts ...StatusOption) {
-	statusMsg := StatusMessage{
-		Level:     level,
-		Message:   messageText,
-		Timestamp: time.Now(),
-	}
-
-	// Apply all options
-	for _, opt := range opts {
-		opt(&statusMsg)
-	}
-
-	s.broker.Publish(EventStatusPublished, statusMsg)
-}
-
-func (s *service) Subscribe(ctx context.Context) <-chan pubsub.Event[StatusMessage] {
-	return s.broker.Subscribe(ctx)
-}
-
-func Info(message string, opts ...StatusOption) {
-	GetService().Info(message, opts...)
-}
-
-func Warn(message string, opts ...StatusOption) {
-	GetService().Warn(message, opts...)
-}
-
-func Error(message string, opts ...StatusOption) {
-	GetService().Error(message, opts...)
-}
-
-func Debug(message string, opts ...StatusOption) {
-	GetService().Debug(message, opts...)
-}
-
-func Subscribe(ctx context.Context) <-chan pubsub.Event[StatusMessage] {
-	return GetService().Subscribe(ctx)
-}

packages/tui/internal/styles/icons.go

@@ -1,12 +0,0 @@
-package styles
-
-const (
-	OpenCodeIcon string = "◍"
-
-	ErrorIcon    string = "ⓔ"
-	WarningIcon  string = "ⓦ"
-	InfoIcon     string = "ⓘ"
-	HintIcon     string = "ⓗ"
-	SpinnerIcon  string = "⟳"
-	DocumentIcon string = "🖼"
-)

packages/tui/internal/theme/everforest.go

@@ -0,0 +1,298 @@
+package theme
+
+import (
+	"github.com/charmbracelet/lipgloss/v2"
+	"github.com/charmbracelet/lipgloss/v2/compat"
+)
+
+// EverforestTheme implements the Theme interface with Everforest colors.
+// It provides both dark and light variants with Medium (default) contrast.
+type EverforestTheme struct {
+	BaseTheme
+}
+
+// NewEverforestTheme creates a new instance of the Everforest Medium theme.
+func NewEverforestTheme() *EverforestTheme {
+	// Everforest color palette - Medium variant
+	// Official colors from https://github.com/sainnhe/everforest/wiki
+	// Dark mode colors - using Everforest:Dark Medium contrast palette
+	darkStep1 := "#2d353b"  // App background
+	darkStep2 := "#333c43"  // Subtle background
+	darkStep3 := "#343f44"  // UI element background
+	darkStep4 := "#3d484d"  // Hovered UI element background
+	darkStep5 := "#475258"  // Active/Selected UI element background
+	darkStep6 := "#7a8478"  // Subtle borders and separators
+	darkStep7 := "#859289"  // UI element border and focus rings
+	darkStep8 := "#9da9a0"  // Hovered UI element border
+	darkStep9 := "#a7c080"  // Solid backgrounds
+	darkStep10 := "#83c092" // Hovered solid backgrounds
+	darkStep11 := "#7a8478" // Low-contrast text
+	darkStep12 := "#d3c6aa" // High-contrast text
+
+	// Dark mode accent colors
+	darkPrimary := darkStep9   // Primary uses step 9 (green)
+	darkSecondary := "#7fbbb3" // Secondary (blue)
+	darkAccent := "#d699b6"    // Accent (purple)
+	darkRed := "#e67e80"       // Error (red)
+	darkOrange := "#e69875"    // Warning (orange)
+	darkGreen := "#a7c080"     // Success (green)
+	darkCyan := "#83c092"      // Info (aqua)
+	darkYellow := "#dbbc7f"    // Emphasized text
+
+	// Light mode colors for the Everforest:Light Medium contrast palette
+	lightStep1 := "#fdf6e3"  // App background
+	lightStep2 := "#efebd4"  // Subtle background
+	lightStep3 := "#f4f0d9"  // UI element background
+	lightStep4 := "#efebd4"  // Hovered UI element background
+	lightStep5 := "#e6e2cc"  // Active/Selected UI element background
+	lightStep6 := "#a6b0a0"  // Subtle borders and separators
+	lightStep7 := "#939f91"  // UI element border and focus rings
+	lightStep8 := "#829181"  // Hovered UI element border
+	lightStep9 := "#8da101"  // Solid backgrounds
+	lightStep10 := "#35a77c" // Hovered solid backgrounds
+	lightStep11 := "#a6b0a0" // Low-contrast text
+	lightStep12 := "#5c6a72" // High-contrast text
+
+	// Light mode accent colors
+	lightPrimary := lightStep9  // Primary uses step 9 (green)
+	lightSecondary := "#3a94c5" // Secondary blue
+	lightAccent := "#df69ba"    // Accent purple
+	lightRed := "#f85552"       // Error red
+	lightOrange := "#f57d26"    // Warning orange
+	lightGreen := "#8da101"     // Success green
+	lightCyan := "#35a77c"      // Info aqua
+	lightYellow := "#dfa000"    // Emphasized text
+
+	// Unused variables. These could be used for hover states
+	_ = darkStep4
+	_ = darkStep5
+	_ = darkStep10
+	_ = lightStep4
+	_ = lightStep5
+	_ = lightStep10
+
+	theme := &EverforestTheme{}
+
+	// Base colors
+	theme.PrimaryColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkPrimary),
+		Light: lipgloss.Color(lightPrimary),
+	}
+	theme.SecondaryColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkSecondary),
+		Light: lipgloss.Color(lightSecondary),
+	}
+	theme.AccentColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkAccent),
+		Light: lipgloss.Color(lightAccent),
+	}
+
+	// Status colors
+	theme.ErrorColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkRed),
+		Light: lipgloss.Color(lightRed),
+	}
+	theme.WarningColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkOrange),
+		Light: lipgloss.Color(lightOrange),
+	}
+	theme.SuccessColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkGreen),
+		Light: lipgloss.Color(lightGreen),
+	}
+	theme.InfoColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkCyan),
+		Light: lipgloss.Color(lightCyan),
+	}
+
+	// Text colors
+	theme.TextColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkStep12),
+		Light: lipgloss.Color(lightStep12),
+	}
+	theme.TextMutedColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkStep11),
+		Light: lipgloss.Color(lightStep11),
+	}
+
+	// Background colors
+	theme.BackgroundColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkStep1),
+		Light: lipgloss.Color(lightStep1),
+	}
+	theme.BackgroundSubtleColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkStep2),
+		Light: lipgloss.Color(lightStep2),
+	}
+	theme.BackgroundElementColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkStep3),
+		Light: lipgloss.Color(lightStep3),
+	}
+
+	// Border colors
+	theme.BorderColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkStep7),
+		Light: lipgloss.Color(lightStep7),
+	}
+	theme.BorderActiveColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkStep8),
+		Light: lipgloss.Color(lightStep8),
+	}
+	theme.BorderSubtleColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkStep6),
+		Light: lipgloss.Color(lightStep6),
+	}
+
+	// Diff view colors
+	theme.DiffAddedColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color("#A7C080"),
+		Light: lipgloss.Color("#8DA101"),
+	}
+	theme.DiffRemovedColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color("#E67E80"),
+		Light: lipgloss.Color("#F85552"),
+	}
+	theme.DiffContextColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color("#7A8478"),
+		Light: lipgloss.Color("#A6B0A0"),
+	}
+	theme.DiffHunkHeaderColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color("#859289"),
+		Light: lipgloss.Color("#939F91"),
+	}
+	theme.DiffHighlightAddedColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color("#A7C080"),
+		Light: lipgloss.Color("#8DA101"),
+	}
+	theme.DiffHighlightRemovedColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color("#E67E80"),
+		Light: lipgloss.Color("#F85552"),
+	}
+	theme.DiffAddedBgColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color("#425047"),
+		Light: lipgloss.Color("#F0F1D2"),
+	}
+	theme.DiffRemovedBgColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color("#543A48"),
+		Light: lipgloss.Color("#FBE3DA"),
+	}
+	theme.DiffContextBgColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkStep2),
+		Light: lipgloss.Color(lightStep2),
+	}
+	theme.DiffLineNumberColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkStep3),
+		Light: lipgloss.Color(lightStep3),
+	}
+	theme.DiffAddedLineNumberBgColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color("#3A4A3F"),
+		Light: lipgloss.Color("#E8F2D1"),
+	}
+	theme.DiffRemovedLineNumberBgColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color("#4A3A40"),
+		Light: lipgloss.Color("#FBDAD2"),
+	}
+
+	// Markdown colors
+	theme.MarkdownTextColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkStep12),
+		Light: lipgloss.Color(lightStep12),
+	}
+	theme.MarkdownHeadingColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkSecondary),
+		Light: lipgloss.Color(lightSecondary),
+	}
+	theme.MarkdownLinkColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkPrimary),
+		Light: lipgloss.Color(lightPrimary),
+	}
+	theme.MarkdownLinkTextColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkCyan),
+		Light: lipgloss.Color(lightCyan),
+	}
+	theme.MarkdownCodeColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkGreen),
+		Light: lipgloss.Color(lightGreen),
+	}
+	theme.MarkdownBlockQuoteColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkYellow),
+		Light: lipgloss.Color(lightYellow),
+	}
+	theme.MarkdownEmphColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkYellow),
+		Light: lipgloss.Color(lightYellow),
+	}
+	theme.MarkdownStrongColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkAccent),
+		Light: lipgloss.Color(lightAccent),
+	}
+	theme.MarkdownHorizontalRuleColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkStep11),
+		Light: lipgloss.Color(lightStep11),
+	}
+	theme.MarkdownListItemColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkPrimary),
+		Light: lipgloss.Color(lightPrimary),
+	}
+	theme.MarkdownListEnumerationColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkCyan),
+		Light: lipgloss.Color(lightCyan),
+	}
+	theme.MarkdownImageColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkPrimary),
+		Light: lipgloss.Color(lightPrimary),
+	}
+	theme.MarkdownImageTextColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkCyan),
+		Light: lipgloss.Color(lightCyan),
+	}
+	theme.MarkdownCodeBlockColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkStep12),
+		Light: lipgloss.Color(lightStep12),
+	}
+
+	// Syntax highlighting colors
+	theme.SyntaxCommentColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkStep11),
+		Light: lipgloss.Color(lightStep11),
+	}
+	theme.SyntaxKeywordColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkPrimary),
+		Light: lipgloss.Color(lightPrimary),
+	}
+	theme.SyntaxFunctionColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkSecondary),
+		Light: lipgloss.Color(lightSecondary),
+	}
+	theme.SyntaxVariableColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkRed),
+		Light: lipgloss.Color(lightRed),
+	}
+	theme.SyntaxStringColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkGreen),
+		Light: lipgloss.Color(lightGreen),
+	}
+	theme.SyntaxNumberColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkAccent),
+		Light: lipgloss.Color(lightAccent),
+	}
+	theme.SyntaxTypeColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkYellow),
+		Light: lipgloss.Color(lightYellow),
+	}
+	theme.SyntaxOperatorColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkCyan),
+		Light: lipgloss.Color(lightCyan),
+	}
+	theme.SyntaxPunctuationColor = compat.AdaptiveColor{
+		Dark:  lipgloss.Color(darkStep12),
+		Light: lipgloss.Color(lightStep12),
+	}
+
+	return theme
+}
+
+func init() {
+	// Register the Everforest theme with the theme manager
+	RegisterTheme("everforest", NewEverforestTheme())
+}

packages/tui/internal/tui/tui.go

@@ -3,195 +3,196 @@ package tui
 import (
 	"context"
 	"log/slog"
+	"os"
+	"os/exec"
 
-	"github.com/charmbracelet/bubbles/v2/cursor"
 	"github.com/charmbracelet/bubbles/v2/key"
-	"github.com/charmbracelet/bubbles/v2/spinner"
 	tea "github.com/charmbracelet/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
 
 	"github.com/sst/opencode/internal/app"
 	"github.com/sst/opencode/internal/commands"
-	"github.com/sst/opencode/internal/components/core"
+	"github.com/sst/opencode/internal/completions"
+	"github.com/sst/opencode/internal/components/chat"
 	"github.com/sst/opencode/internal/components/dialog"
 	"github.com/sst/opencode/internal/components/modal"
+	"github.com/sst/opencode/internal/components/status"
 	"github.com/sst/opencode/internal/layout"
-	"github.com/sst/opencode/internal/page"
-	"github.com/sst/opencode/internal/state"
 	"github.com/sst/opencode/internal/styles"
-	"github.com/sst/opencode/internal/theme"
 	"github.com/sst/opencode/internal/util"
 	"github.com/sst/opencode/pkg/client"
 )
 
 type appModel struct {
-	width, height int
-	currentPage   page.PageID
-	previousPage  page.PageID
-	pages         map[page.PageID]layout.ModelWithView
-	loadedPages   map[page.PageID]bool
-	status        core.StatusComponent
-	app           *app.App
-	modal         layout.Modal
+	width, height        int
+	app                  *app.App
+	modal                layout.Modal
+	status               status.StatusComponent
+	editor               chat.EditorComponent
+	messages             chat.MessagesComponent
+	editorContainer      layout.Container
+	layout               layout.FlexLayout
+	completions          dialog.CompletionDialog
+	completionManager    *completions.CompletionManager
+	showCompletionDialog bool
+	leaderBinding        *key.Binding
+	isLeaderSequence     bool
 }
 
 func (a appModel) Init() tea.Cmd {
-	t := theme.CurrentTheme()
 	var cmds []tea.Cmd
-	cmds = append(cmds, tea.SetBackgroundColor(t.Background()))
 	cmds = append(cmds, tea.RequestBackgroundColor)
-
-	cmd := a.pages[a.currentPage].Init()
-	a.loadedPages[a.currentPage] = true
-	cmds = append(cmds, cmd)
-
-	cmd = a.status.Init()
-	cmds = append(cmds, cmd)
+	cmds = append(cmds, a.app.InitializeProvider())
+	cmds = append(cmds, a.editor.Init())
+	cmds = append(cmds, a.messages.Init())
+	cmds = append(cmds, a.status.Init())
+	cmds = append(cmds, a.completions.Init())
 
 	// Check if we should show the init dialog
 	cmds = append(cmds, func() tea.Msg {
-		shouldShow := app.Info.Git && app.Info.Time.Initialized == nil
+		shouldShow := a.app.Info.Git && a.app.Info.Time.Initialized == nil
 		return dialog.ShowInitDialogMsg{Show: shouldShow}
 	})
 
 	return tea.Batch(cmds...)
 }
 
-func (a appModel) updateAllPages(msg tea.Msg) (tea.Model, tea.Cmd) {
-	var cmds []tea.Cmd
-	var cmd tea.Cmd
-
-	for id := range a.pages {
-		updated, cmd := a.pages[id].Update(msg)
-		a.pages[id] = updated.(layout.ModelWithView)
-		cmds = append(cmds, cmd)
-	}
-
-	s, cmd := a.status.Update(msg)
-	cmds = append(cmds, cmd)
-	a.status = s.(core.StatusComponent)
-
-	return a, tea.Batch(cmds...)
-}
-
 func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmds []tea.Cmd
-	var cmd tea.Cmd
 
-	if a.modal != nil {
-		bypassModal := false
-
-		if _, ok := msg.(modal.CloseModalMsg); ok {
-			a.modal = nil
-			return a, nil
-		}
-
-		if msg, ok := msg.(tea.KeyMsg); ok {
+	switch msg := msg.(type) {
+	case tea.KeyPressMsg:
+		// 1. Handle active modal
+		if a.modal != nil {
 			switch msg.String() {
-			case "esc":
+			// Escape always closes current modal
+			case "esc", "ctrl+c":
 				a.modal = nil
 				return a, nil
-			case "ctrl+c":
-				return a, tea.Quit
 			}
 
-			// don't send commands to the modal
-			for _, cmdDef := range a.app.Commands {
-				if key.Matches(msg, cmdDef.KeyBinding) {
-					bypassModal = true
-					break
-				}
-			}
-		}
-
-		// thanks i hate this
-		switch msg.(type) {
-		case tea.WindowSizeMsg:
-			bypassModal = true
-		case client.EventSessionUpdated:
-			bypassModal = true
-		case client.EventMessageUpdated:
-			bypassModal = true
-		case cursor.BlinkMsg:
-			bypassModal = true
-		case spinner.TickMsg:
-			bypassModal = true
-		}
-
-		if !bypassModal {
+			// Pass all other key presses to the modal
 			updatedModal, cmd := a.modal.Update(msg)
 			a.modal = updatedModal.(layout.Modal)
 			return a, cmd
 		}
-	}
 
-	switch msg := msg.(type) {
-	case commands.ExecuteCommandMsg:
-		switch msg.Name {
-		case "quit":
-			return a, tea.Quit
-		case "new":
-			a.app.Session = &client.SessionInfo{}
-			a.app.Messages = []client.MessageInfo{}
-			cmds = append(cmds, util.CmdHandler(state.SessionClearedMsg{}))
-		case "sessions":
-			sessionDialog := dialog.NewSessionDialog(a.app)
-			a.modal = sessionDialog
-		case "model":
-			modelDialog := dialog.NewModelDialog(a.app)
-			a.modal = modelDialog
-		case "theme":
-			themeDialog := dialog.NewThemeDialog()
-			a.modal = themeDialog
-		case "help":
-			var helpBindings []key.Binding
-			for _, cmd := range a.app.Commands {
-				// Create a new binding for help display
-				helpBindings = append(helpBindings, key.NewBinding(
-					key.WithKeys(cmd.KeyBinding.Keys()...),
-					key.WithHelp("/"+cmd.Name, cmd.Description),
-				))
+		// 2. Check for commands that require leader
+		if a.isLeaderSequence {
+			matches := a.app.Commands.Matches(msg, a.isLeaderSequence)
+			// Reset leader state
+			a.isLeaderSequence = false
+			if len(matches) > 0 {
+				return a, util.CmdHandler(commands.ExecuteCommandsMsg(matches))
 			}
-			helpDialog := dialog.NewHelpDialog(helpBindings...)
-			a.modal = helpDialog
 		}
-		slog.Info("Execute command", "cmds", cmds)
-		return a, tea.Batch(cmds...)
 
+		// 3. Handle completions trigger
+		switch msg.String() {
+		case "/":
+			a.showCompletionDialog = true
+		}
+
+		if a.showCompletionDialog {
+			updated, cmd := a.editor.Update(msg)
+			a.editor = updated.(chat.EditorComponent)
+			cmds = append(cmds, cmd)
+
+			currentInput := a.editor.Value()
+			provider := a.completionManager.GetProvider(currentInput)
+			a.completions.SetProvider(provider)
+
+			context, contextCmd := a.completions.Update(msg)
+			a.completions = context.(dialog.CompletionDialog)
+			cmds = append(cmds, contextCmd)
+			return a, tea.Batch(cmds...)
+
+			// Doesn't forward event if enter key is pressed
+			// if msg.String() == "enter" {
+			// 	return a, tea.Batch(cmds...)
+			// }
+		}
+
+		// 4. Maximize editor responsiveness for printable characters
+		if msg.Text != "" {
+			updated, cmd := a.editor.Update(msg)
+			a.editor = updated.(chat.EditorComponent)
+			cmds = append(cmds, cmd)
+			return a, tea.Batch(cmds...)
+		}
+
+		// 5. Check for leader key activation
+		if a.leaderBinding != nil &&
+			!a.isLeaderSequence &&
+			key.Matches(msg, *a.leaderBinding) {
+			a.isLeaderSequence = true
+			return a, nil
+		}
+
+		// 6. Check again for commands that don't require leader
+		matches := a.app.Commands.Matches(msg, a.isLeaderSequence)
+		if len(matches) > 0 {
+			return a, util.CmdHandler(commands.ExecuteCommandsMsg(matches))
+		}
+
+		// 7. Fallback to editor. This shouldn't happen?
+		// All printable characters were already sent, and
+		// any other keypress that didn't match a command
+		// is likely a noop.
+		updatedEditor, cmd := a.editor.Update(msg)
+		a.editor = updatedEditor.(chat.EditorComponent)
+		return a, cmd
+	case tea.MouseWheelMsg:
+		if a.modal != nil {
+			return a, nil
+		}
+		updated, cmd := a.messages.Update(msg)
+		a.messages = updated.(chat.MessagesComponent)
+		cmds = append(cmds, cmd)
 	case tea.BackgroundColorMsg:
 		styles.Terminal = &styles.TerminalInfo{
 			BackgroundIsDark: msg.IsDark(),
 		}
-
-	case cursor.BlinkMsg:
-		return a.updateAllPages(msg)
-
-	case spinner.TickMsg:
-		return a.updateAllPages(msg)
-
+		slog.Debug("Background color", "isDark", msg.IsDark())
+	case modal.CloseModalMsg:
+		a.modal = nil
+		return a, nil
+	case commands.ExecuteCommandMsg:
+		updated, cmd := a.executeCommand(commands.Command(msg))
+		return updated, cmd
+	case commands.ExecuteCommandsMsg:
+		for _, command := range msg {
+			updated, cmd := a.executeCommand(command)
+			if cmd != nil {
+				return updated, cmd
+			}
+		}
+	case app.SendMsg:
+		a.showCompletionDialog = false
+		cmd := a.app.SendChatMessage(context.Background(), msg.Text, msg.Attachments)
+		cmds = append(cmds, cmd)
+	case dialog.CompletionDialogCloseMsg:
+		a.showCompletionDialog = false
 	case client.EventSessionUpdated:
 		if msg.Properties.Info.Id == a.app.Session.Id {
 			a.app.Session = &msg.Properties.Info
-			return a.updateAllPages(state.StateUpdatedMsg{State: nil})
 		}
-
 	case client.EventMessageUpdated:
 		if msg.Properties.Info.Metadata.SessionID == a.app.Session.Id {
+			exists := false
 			for i, m := range a.app.Messages {
 				if m.Id == msg.Properties.Info.Id {
 					a.app.Messages[i] = msg.Properties.Info
-					return a.updateAllPages(state.StateUpdatedMsg{State: nil})
+					exists = true
 				}
 			}
-			a.app.Messages = append(a.app.Messages, msg.Properties.Info)
-			return a.updateAllPages(state.StateUpdatedMsg{State: nil})
+			if !exists {
+				a.app.Messages = append(a.app.Messages, msg.Properties.Info)
+			}
 		}
-
 	case tea.WindowSizeMsg:
 		msg.Height -= 2 // Make space for the status bar
 		a.width, a.height = msg.Width, msg.Height
-
-		// TODO: move away from global state
 		layout.Current = &layout.LayoutInfo{
 			Viewport: layout.Dimensions{
 				Width:  a.width,
@@ -201,140 +202,75 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				Width: min(a.width, 80),
 			},
 		}
-
-		s, cmd := a.status.Update(msg)
-		a.status = s.(core.StatusComponent)
-		if cmd != nil {
-			cmds = append(cmds, cmd)
-		}
-
-		updated, cmd := a.pages[a.currentPage].Update(msg)
-		a.pages[a.currentPage] = updated.(layout.ModelWithView)
-		if cmd != nil {
-			cmds = append(cmds, cmd)
-		}
-
-		if a.modal != nil {
-			s, cmd := a.modal.Update(msg)
-			a.modal = s.(layout.Modal)
-			if cmd != nil {
-				cmds = append(cmds, cmd)
-			}
-		}
-
-		return a, tea.Batch(cmds...)
-
-	// case pubsub.Event[permission.PermissionRequest]:
-	// 	a.showPermissions = true
-	// 	return a, a.permissions.SetPermissions(msg.Payload)
-
-	case dialog.PermissionResponseMsg:
-		// TODO: Permissions service not implemented in API yet
-		// var cmd tea.Cmd
-		// switch msg.Action {
-		// case dialog.PermissionAllow:
-		// 	a.app.Permissions.Grant(context.Background(), msg.Permission)
-		// case dialog.PermissionAllowForSession:
-		// 	a.app.Permissions.GrantPersistant(context.Background(), msg.Permission)
-		// case dialog.PermissionDeny:
-		// 	a.app.Permissions.Deny(context.Background(), msg.Permission)
-		// }
-		// a.showPermissions = false
-		return a, nil
-
-	case page.PageChangeMsg:
-		return a, a.moveToPage(msg.ID)
-
-	case state.SessionSelectedMsg:
+		a.layout.SetSize(a.width, a.height)
+	case app.SessionSelectedMsg:
 		a.app.Session = msg
 		a.app.Messages, _ = a.app.ListMessages(context.Background(), msg.Id)
-		return a.updateAllPages(msg)
-
-	case state.ModelSelectedMsg:
+	case app.ModelSelectedMsg:
 		a.app.Provider = &msg.Provider
 		a.app.Model = &msg.Model
 		a.app.Config.Provider = msg.Provider.Id
 		a.app.Config.Model = msg.Model.Id
-		a.app.SaveConfig()
-		return a.updateAllPages(msg)
-
-	case dialog.ThemeChangedMsg:
+		a.app.SaveState()
+	case dialog.ThemeSelectedMsg:
 		a.app.Config.Theme = msg.ThemeName
-		a.app.SaveConfig()
-
-		updated, cmd := a.pages[a.currentPage].Update(msg)
-		a.pages[a.currentPage] = updated.(layout.ModelWithView)
-		if cmd != nil {
-			cmds = append(cmds, cmd)
-		}
-
-		s, cmd := a.status.Update(msg)
-		cmds = append(cmds, cmd)
-		a.status = s.(core.StatusComponent)
-
-		t := theme.CurrentTheme()
-		cmds = append(cmds, tea.SetBackgroundColor(t.Background()))
-		return a, tea.Batch(cmds...)
-
-	case tea.KeyMsg:
-		switch msg.String() {
-		// give the editor a chance to clear input
-		case "ctrl+c":
-			updated, cmd := a.pages[a.currentPage].Update(msg)
-			a.pages[a.currentPage] = updated.(layout.ModelWithView)
-			if cmd != nil {
-				return a, cmd
-			}
-		}
-
-		// First, check for modal triggers from the command registry
-		if a.modal == nil {
-			for _, cmdDef := range a.app.Commands {
-				if key.Matches(msg, cmdDef.KeyBinding) {
-					// If a key matches, send an ExecuteCommandMsg to self.
-					// This unifies keybinding and slash command handling.
-					return a, util.CmdHandler(commands.ExecuteCommandMsg{Name: cmdDef.Name})
-				}
-			}
-		}
+		a.app.SaveState()
 	}
 
 	// update status bar
 	s, cmd := a.status.Update(msg)
 	cmds = append(cmds, cmd)
-	a.status = s.(core.StatusComponent)
+	a.status = s.(status.StatusComponent)
 
-	// update current page
-	updated, cmd := a.pages[a.currentPage].Update(msg)
-	a.pages[a.currentPage] = updated.(layout.ModelWithView)
+	// update editor
+	u, cmd := a.editor.Update(msg)
+	a.editor = u.(chat.EditorComponent)
 	cmds = append(cmds, cmd)
+
+	// update messages
+	u, cmd = a.messages.Update(msg)
+	a.messages = u.(chat.MessagesComponent)
+	cmds = append(cmds, cmd)
+
+	// update modal
+	if a.modal != nil {
+		u, cmd := a.modal.Update(msg)
+		a.modal = u.(layout.Modal)
+		cmds = append(cmds, cmd)
+	}
+
+	if a.showCompletionDialog {
+		u, cmd := a.completions.Update(msg)
+		a.completions = u.(dialog.CompletionDialog)
+		cmds = append(cmds, cmd)
+	}
+
 	return a, tea.Batch(cmds...)
 }
 
-func (a *appModel) moveToPage(pageID page.PageID) tea.Cmd {
-	var cmds []tea.Cmd
-	if _, ok := a.loadedPages[pageID]; !ok {
-		cmd := a.pages[pageID].Init()
-		cmds = append(cmds, cmd)
-		a.loadedPages[pageID] = true
-	}
-	a.previousPage = a.currentPage
-	a.currentPage = pageID
-	if sizable, ok := a.pages[a.currentPage].(layout.Sizeable); ok {
-		cmd := sizable.SetSize(a.width, a.height)
-		cmds = append(cmds, cmd)
-	}
-
-	return tea.Batch(cmds...)
-}
-
 func (a appModel) View() string {
-	components := []string{
-		a.pages[a.currentPage].View(),
-	}
-	components = append(components, a.status.View())
-	appView := lipgloss.JoinVertical(lipgloss.Top, components...)
+	layoutView := a.layout.View()
 
+	if a.showCompletionDialog {
+		editorWidth, _ := a.editorContainer.GetSize()
+		editorX, editorY := a.editorContainer.GetPosition()
+
+		a.completions.SetWidth(editorWidth)
+		overlay := a.completions.View()
+
+		layoutView = layout.PlaceOverlay(
+			editorX,
+			editorY-lipgloss.Height(overlay)+2,
+			overlay,
+			layoutView,
+		)
+	}
+
+	components := []string{
+		layoutView,
+		a.status.View(),
+	}
+	appView := lipgloss.JoinVertical(lipgloss.Top, components...)
 	if a.modal != nil {
 		appView = a.modal.Render(appView)
 	}
@@ -342,16 +278,221 @@ func (a appModel) View() string {
 	return appView
 }
 
+func (a appModel) executeCommand(command commands.Command) (tea.Model, tea.Cmd) {
+	cmds := []tea.Cmd{
+		util.CmdHandler(commands.CommandExecutedMsg(command)),
+	}
+	switch command.Name {
+	case commands.AppHelpCommand:
+		helpDialog := dialog.NewHelpDialog(a.app.Commands.Sorted())
+		a.modal = helpDialog
+	case commands.EditorOpenCommand:
+		if a.app.IsBusy() {
+			// status.Warn("Agent is working, please wait...")
+			return a, nil
+		}
+		editor := os.Getenv("EDITOR")
+		if editor == "" {
+			// TODO: let the user know there's no EDITOR set
+			return a, nil
+		}
+
+		value := a.editor.Value()
+		updated, cmd := a.editor.Clear()
+		a.editor = updated.(chat.EditorComponent)
+		cmds = append(cmds, cmd)
+
+		tmpfile, err := os.CreateTemp("", "msg_*.md")
+		tmpfile.WriteString(value)
+		if err != nil {
+			slog.Error("Failed to create temp file", "error", err)
+			return a, nil
+		}
+		tmpfile.Close()
+		c := exec.Command(editor, tmpfile.Name()) //nolint:gosec
+		c.Stdin = os.Stdin
+		c.Stdout = os.Stdout
+		c.Stderr = os.Stderr
+		cmd = tea.ExecProcess(c, func(err error) tea.Msg {
+			if err != nil {
+				slog.Error("Failed to open editor", "error", err)
+				return nil
+			}
+			content, err := os.ReadFile(tmpfile.Name())
+			if err != nil {
+				slog.Error("Failed to read file", "error", err)
+				return nil
+			}
+			if len(content) == 0 {
+				slog.Warn("Message is empty")
+				return nil
+			}
+			os.Remove(tmpfile.Name())
+			// attachments := m.attachments
+			// m.attachments = nil
+			return app.SendMsg{
+				Text:        string(content),
+				Attachments: []app.Attachment{}, // attachments,
+			}
+		})
+		cmds = append(cmds, cmd)
+	case commands.SessionNewCommand:
+		if a.app.Session.Id == "" {
+			return a, nil
+		}
+		a.app.Session = &client.SessionInfo{}
+		a.app.Messages = []client.MessageInfo{}
+		cmds = append(cmds, util.CmdHandler(app.SessionClearedMsg{}))
+	case commands.SessionListCommand:
+		sessionDialog := dialog.NewSessionDialog(a.app)
+		a.modal = sessionDialog
+	case commands.SessionShareCommand:
+		if a.app.Session.Id == "" {
+			return a, nil
+		}
+		a.app.Client.PostSessionShareWithResponse(
+			context.Background(),
+			client.PostSessionShareJSONRequestBody{
+				SessionID: a.app.Session.Id,
+			},
+		)
+	case commands.SessionInterruptCommand:
+		if a.app.Session.Id == "" {
+			return a, nil
+		}
+		a.app.Cancel(context.Background(), a.app.Session.Id)
+		return a, nil
+	case commands.SessionCompactCommand:
+		if a.app.Session.Id == "" {
+			return a, nil
+		}
+		// TODO: block until compaction is complete
+		a.app.CompactSession(context.Background())
+	case commands.ToolDetailsCommand:
+		cmds = append(cmds, util.CmdHandler(chat.ToggleToolDetailsMsg{}))
+	case commands.ModelListCommand:
+		modelDialog := dialog.NewModelDialog(a.app)
+		a.modal = modelDialog
+	case commands.ThemeListCommand:
+		themeDialog := dialog.NewThemeDialog()
+		a.modal = themeDialog
+	case commands.ProjectInitCommand:
+		cmds = append(cmds, a.app.InitializeProject(context.Background()))
+	case commands.InputClearCommand:
+		if a.editor.Value() == "" {
+			return a, nil
+		}
+		updated, cmd := a.editor.Clear()
+		a.editor = updated.(chat.EditorComponent)
+		cmds = append(cmds, cmd)
+	case commands.InputPasteCommand:
+		updated, cmd := a.editor.Paste()
+		a.editor = updated.(chat.EditorComponent)
+		cmds = append(cmds, cmd)
+	case commands.InputSubmitCommand:
+		updated, cmd := a.editor.Submit()
+		a.editor = updated.(chat.EditorComponent)
+		cmds = append(cmds, cmd)
+	case commands.InputNewlineCommand:
+		updated, cmd := a.editor.Newline()
+		a.editor = updated.(chat.EditorComponent)
+		cmds = append(cmds, cmd)
+	case commands.HistoryPreviousCommand:
+		if a.showCompletionDialog {
+			return a, nil
+		}
+		updated, cmd := a.editor.Previous()
+		a.editor = updated.(chat.EditorComponent)
+		cmds = append(cmds, cmd)
+	case commands.HistoryNextCommand:
+		if a.showCompletionDialog {
+			return a, nil
+		}
+		updated, cmd := a.editor.Next()
+		a.editor = updated.(chat.EditorComponent)
+		cmds = append(cmds, cmd)
+	case commands.MessagesFirstCommand:
+		updated, cmd := a.messages.First()
+		a.messages = updated.(chat.MessagesComponent)
+		cmds = append(cmds, cmd)
+	case commands.MessagesLastCommand:
+		updated, cmd := a.messages.Last()
+		a.messages = updated.(chat.MessagesComponent)
+		cmds = append(cmds, cmd)
+	case commands.MessagesPageUpCommand:
+		if a.showCompletionDialog {
+			return a, nil
+		}
+		updated, cmd := a.messages.PageUp()
+		a.messages = updated.(chat.MessagesComponent)
+		cmds = append(cmds, cmd)
+	case commands.MessagesPageDownCommand:
+		if a.showCompletionDialog {
+			return a, nil
+		}
+		updated, cmd := a.messages.PageDown()
+		a.messages = updated.(chat.MessagesComponent)
+		cmds = append(cmds, cmd)
+	case commands.MessagesHalfPageUpCommand:
+		if a.showCompletionDialog {
+			return a, nil
+		}
+		updated, cmd := a.messages.HalfPageUp()
+		a.messages = updated.(chat.MessagesComponent)
+		cmds = append(cmds, cmd)
+	case commands.MessagesHalfPageDownCommand:
+		if a.showCompletionDialog {
+			return a, nil
+		}
+		updated, cmd := a.messages.HalfPageDown()
+		a.messages = updated.(chat.MessagesComponent)
+		cmds = append(cmds, cmd)
+	case commands.AppExitCommand:
+		return a, tea.Quit
+	}
+	return a, tea.Batch(cmds...)
+}
+
 func NewModel(app *app.App) tea.Model {
-	startPage := page.ChatPage
+	completionManager := completions.NewCompletionManager(app)
+	initialProvider := completionManager.GetProvider("")
+
+	messages := chat.NewMessagesComponent(app)
+	editor := chat.NewEditorComponent(app)
+	completions := dialog.NewCompletionDialogComponent(initialProvider)
+
+	editorContainer := layout.NewContainer(
+		editor,
+		layout.WithMaxWidth(layout.Current.Container.Width),
+		layout.WithAlignCenter(),
+	)
+	messagesContainer := layout.NewContainer(messages)
+
+	var leaderBinding *key.Binding
+	if leader, ok := app.Config.Keybinds["leader"]; ok {
+		binding := key.NewBinding(key.WithKeys(leader))
+		leaderBinding = &binding
+	}
+
 	model := &appModel{
-		currentPage: startPage,
-		loadedPages: make(map[page.PageID]bool),
-		status:      core.NewStatusCmp(app),
-		app:         app,
-		pages: map[page.PageID]layout.ModelWithView{
-			page.ChatPage: page.NewChatPage(app),
-		},
+		status:               status.NewStatusCmp(app),
+		app:                  app,
+		editor:               editor,
+		messages:             messages,
+		completions:          completions,
+		completionManager:    completionManager,
+		leaderBinding:        leaderBinding,
+		isLeaderSequence:     false,
+		showCompletionDialog: false,
+		editorContainer:      editorContainer,
+		layout: layout.NewFlexLayout(
+			[]tea.ViewModel{messagesContainer, editorContainer},
+			layout.WithDirection(layout.FlexDirectionVertical),
+			layout.WithSizes(
+				layout.FlexChildSizeGrow,
+				layout.FlexChildSizeFixed(6),
+			),
+		),
 	}
 
 	return model

packages/tui/pkg/client/gen/openapi.json

@@ -478,6 +478,25 @@
           }
         }
       }
+    },
+    "/installation_info": {
+      "post": {
+        "responses": {
+          "200": {
+            "description": "Get installation info",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InstallationInfo"
+                }
+              }
+            }
+          }
+        },
+        "operationId": "postInstallation_info",
+        "parameters": [],
+        "description": "Get installation info"
+      }
     }
   },
   "components": {
@@ -504,6 +523,9 @@
           },
           {
             "$ref": "#/components/schemas/Event.session.error"
+          },
+          {
+            "$ref": "#/components/schemas/Event.installation.updated"
           }
         ],
         "discriminator": {
@@ -515,7 +537,8 @@
             "message.updated": "#/components/schemas/Event.message.updated",
             "message.part.updated": "#/components/schemas/Event.message.part.updated",
             "session.updated": "#/components/schemas/Event.session.updated",
-            "session.error": "#/components/schemas/Event.session.error"
+            "session.error": "#/components/schemas/Event.session.error",
+            "installation.updated": "#/components/schemas/Event.installation.updated"
           }
         }
       },
@@ -782,12 +805,28 @@
                       },
                       "reasoning": {
                         "type": "number"
+                      },
+                      "cache": {
+                        "type": "object",
+                        "properties": {
+                          "read": {
+                            "type": "number"
+                          },
+                          "write": {
+                            "type": "number"
+                          }
+                        },
+                        "required": [
+                          "read",
+                          "write"
+                        ]
                       }
                     },
                     "required": [
                       "input",
                       "output",
-                      "reasoning"
+                      "reasoning",
+                      "cache"
                     ]
                   }
                 },
@@ -1253,6 +1292,30 @@
           "properties"
         ]
       },
+      "Event.installation.updated": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "const": "installation.updated"
+          },
+          "properties": {
+            "type": "object",
+            "properties": {
+              "version": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "version"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "properties"
+        ]
+      },
       "App.Info": {
         "type": "object",
         "properties": {
@@ -1276,13 +1339,17 @@
               },
               "cwd": {
                 "type": "string"
+              },
+              "state": {
+                "type": "string"
               }
             },
             "required": [
               "config",
               "data",
               "root",
-              "cwd"
+              "cwd",
+              "state"
             ]
           },
           "time": {
@@ -1328,6 +1395,9 @@
           "id": {
             "type": "string"
           },
+          "npm": {
+            "type": "string"
+          },
           "models": {
             "type": "object",
             "additionalProperties": {
@@ -1408,6 +1478,21 @@
           "limit",
           "id"
         ]
+      },
+      "InstallationInfo": {
+        "type": "object",
+        "properties": {
+          "version": {
+            "type": "string"
+          },
+          "latest": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "version",
+          "latest"
+        ]
       }
     }
   }

packages/tui/pkg/client/generated-client.go

@@ -31,6 +31,7 @@ type AppInfo struct {
 		Cwd    string `json:"cwd"`
 		Data   string `json:"data"`
 		Root   string `json:"root"`
+		State  string `json:"state"`
 	} `json:"path"`
 	Time struct {
 		Initialized *float32 `json:"initialized,omitempty"`
@@ -48,6 +49,14 @@ type Event struct {
 	union json.RawMessage
 }
 
+// EventInstallationUpdated defines model for Event.installation.updated.
+type EventInstallationUpdated struct {
+	Properties struct {
+		Version string `json:"version"`
+	} `json:"properties"`
+	Type string `json:"type"`
+}
+
 // EventLspClientDiagnostics defines model for Event.lsp.client.diagnostics.
 type EventLspClientDiagnostics struct {
 	Properties struct {
@@ -111,6 +120,12 @@ type EventStorageWrite struct {
 	Type string `json:"type"`
 }
 
+// InstallationInfo defines model for InstallationInfo.
+type InstallationInfo struct {
+	Latest  string `json:"latest"`
+	Version string `json:"version"`
+}
+
 // MessageInfo defines model for Message.Info.
 type MessageInfo struct {
 	Id       string `json:"id"`
@@ -126,6 +141,10 @@ type MessageInfo struct {
 			Summary    *bool    `json:"summary,omitempty"`
 			System     []string `json:"system"`
 			Tokens     struct {
+				Cache struct {
+					Read  float32 `json:"read"`
+					Write float32 `json:"write"`
+				} `json:"cache"`
 				Input     float32 `json:"input"`
 				Output    float32 `json:"output"`
 				Reasoning float32 `json:"reasoning"`
@@ -265,6 +284,7 @@ type ProviderInfo struct {
 	Id     string               `json:"id"`
 	Models map[string]ModelInfo `json:"models"`
 	Name   string               `json:"name"`
+	Npm    *string              `json:"npm,omitempty"`
 }
 
 // ProviderAuthError defines model for ProviderAuthError.
@@ -648,6 +668,34 @@ func (t *Event) MergeEventSessionError(v EventSessionError) error {
 	return err
 }
 
+// AsEventInstallationUpdated returns the union data inside the Event as a EventInstallationUpdated
+func (t Event) AsEventInstallationUpdated() (EventInstallationUpdated, error) {
+	var body EventInstallationUpdated
+	err := json.Unmarshal(t.union, &body)
+	return body, err
+}
+
+// FromEventInstallationUpdated overwrites any union data inside the Event as the provided EventInstallationUpdated
+func (t *Event) FromEventInstallationUpdated(v EventInstallationUpdated) error {
+	v.Type = "installation.updated"
+	b, err := json.Marshal(v)
+	t.union = b
+	return err
+}
+
+// MergeEventInstallationUpdated performs a merge with any union data inside the Event, using the provided EventInstallationUpdated
+func (t *Event) MergeEventInstallationUpdated(v EventInstallationUpdated) error {
+	v.Type = "installation.updated"
+	b, err := json.Marshal(v)
+	if err != nil {
+		return err
+	}
+
+	merged, err := runtime.JSONMerge(t.union, b)
+	t.union = merged
+	return err
+}
+
 func (t Event) Discriminator() (string, error) {
 	var discriminator struct {
 		Discriminator string `json:"type"`
@@ -662,6 +710,8 @@ func (t Event) ValueByDiscriminator() (interface{}, error) {
 		return nil, err
 	}
 	switch discriminator {
+	case "installation.updated":
+		return t.AsEventInstallationUpdated()
 	case "lsp.client.diagnostics":
 		return t.AsEventLspClientDiagnostics()
 	case "message.part.updated":
@@ -1284,6 +1334,9 @@ type ClientInterface interface {
 
 	PostFileSearch(ctx context.Context, body PostFileSearchJSONRequestBody, reqEditors ...RequestEditorFn) (*http.Response, error)
 
+	// PostInstallationInfo request
+	PostInstallationInfo(ctx context.Context, reqEditors ...RequestEditorFn) (*http.Response, error)
+
 	// PostPathGet request
 	PostPathGet(ctx context.Context, reqEditors ...RequestEditorFn) (*http.Response, error)
 
@@ -1387,6 +1440,18 @@ func (c *Client) PostFileSearch(ctx context.Context, body PostFileSearchJSONRequ
 	return c.Client.Do(req)
 }
 
+func (c *Client) PostInstallationInfo(ctx context.Context, reqEditors ...RequestEditorFn) (*http.Response, error) {
+	req, err := NewPostInstallationInfoRequest(c.Server)
+	if err != nil {
+		return nil, err
+	}
+	req = req.WithContext(ctx)
+	if err := c.applyEditors(ctx, req, reqEditors); err != nil {
+		return nil, err
+	}
+	return c.Client.Do(req)
+}
+
 func (c *Client) PostPathGet(ctx context.Context, reqEditors ...RequestEditorFn) (*http.Response, error) {
 	req, err := NewPostPathGetRequest(c.Server)
 	if err != nil {
@@ -1700,6 +1765,33 @@ func NewPostFileSearchRequestWithBody(server string, contentType string, body io
 	return req, nil
 }
 
+// NewPostInstallationInfoRequest generates requests for PostInstallationInfo
+func NewPostInstallationInfoRequest(server string) (*http.Request, error) {
+	var err error
+
+	serverURL, err := url.Parse(server)
+	if err != nil {
+		return nil, err
+	}
+
+	operationPath := fmt.Sprintf("/installation_info")
+	if operationPath[0] == '/' {
+		operationPath = "." + operationPath
+	}
+
+	queryURL, err := serverURL.Parse(operationPath)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest("POST", queryURL.String(), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	return req, nil
+}
+
 // NewPostPathGetRequest generates requests for PostPathGet
 func NewPostPathGetRequest(server string) (*http.Request, error) {
 	var err error
@@ -2105,6 +2197,9 @@ type ClientWithResponsesInterface interface {
 
 	PostFileSearchWithResponse(ctx context.Context, body PostFileSearchJSONRequestBody, reqEditors ...RequestEditorFn) (*PostFileSearchResponse, error)
 
+	// PostInstallationInfoWithResponse request
+	PostInstallationInfoWithResponse(ctx context.Context, reqEditors ...RequestEditorFn) (*PostInstallationInfoResponse, error)
+
 	// PostPathGetWithResponse request
 	PostPathGetWithResponse(ctx context.Context, reqEditors ...RequestEditorFn) (*PostPathGetResponse, error)
 
@@ -2236,6 +2331,28 @@ func (r PostFileSearchResponse) StatusCode() int {
 	return 0
 }
 
+type PostInstallationInfoResponse struct {
+	Body         []byte
+	HTTPResponse *http.Response
+	JSON200      *InstallationInfo
+}
+
+// Status returns HTTPResponse.Status
+func (r PostInstallationInfoResponse) Status() string {
+	if r.HTTPResponse != nil {
+		return r.HTTPResponse.Status
+	}
+	return http.StatusText(0)
+}
+
+// StatusCode returns HTTPResponse.StatusCode
+func (r PostInstallationInfoResponse) StatusCode() int {
+	if r.HTTPResponse != nil {
+		return r.HTTPResponse.StatusCode
+	}
+	return 0
+}
+
 type PostPathGetResponse struct {
 	Body         []byte
 	HTTPResponse *http.Response
@@ -2509,6 +2626,15 @@ func (c *ClientWithResponses) PostFileSearchWithResponse(ctx context.Context, bo
 	return ParsePostFileSearchResponse(rsp)
 }
 
+// PostInstallationInfoWithResponse request returning *PostInstallationInfoResponse
+func (c *ClientWithResponses) PostInstallationInfoWithResponse(ctx context.Context, reqEditors ...RequestEditorFn) (*PostInstallationInfoResponse, error) {
+	rsp, err := c.PostInstallationInfo(ctx, reqEditors...)
+	if err != nil {
+		return nil, err
+	}
+	return ParsePostInstallationInfoResponse(rsp)
+}
+
 // PostPathGetWithResponse request returning *PostPathGetResponse
 func (c *ClientWithResponses) PostPathGetWithResponse(ctx context.Context, reqEditors ...RequestEditorFn) (*PostPathGetResponse, error) {
 	rsp, err := c.PostPathGet(ctx, reqEditors...)
@@ -2751,6 +2877,32 @@ func ParsePostFileSearchResponse(rsp *http.Response) (*PostFileSearchResponse, e
 	return response, nil
 }
 
+// ParsePostInstallationInfoResponse parses an HTTP response from a PostInstallationInfoWithResponse call
+func ParsePostInstallationInfoResponse(rsp *http.Response) (*PostInstallationInfoResponse, error) {
+	bodyBytes, err := io.ReadAll(rsp.Body)
+	defer func() { _ = rsp.Body.Close() }()
+	if err != nil {
+		return nil, err
+	}
+
+	response := &PostInstallationInfoResponse{
+		Body:         bodyBytes,
+		HTTPResponse: rsp,
+	}
+
+	switch {
+	case strings.Contains(rsp.Header.Get("Content-Type"), "json") && rsp.StatusCode == 200:
+		var dest InstallationInfo
+		if err := json.Unmarshal(bodyBytes, &dest); err != nil {
+			return nil, err
+		}
+		response.JSON200 = &dest
+
+	}
+
+	return response, nil
+}
+
 // ParsePostPathGetResponse parses an HTTP response from a PostPathGetWithResponse call
 func ParsePostPathGetResponse(rsp *http.Response) (*PostPathGetResponse, error) {
 	bodyBytes, err := io.ReadAll(rsp.Body)

packages/web/package.json

@@ -27,7 +27,7 @@
     "sharp": "0.32.5",
     "shiki": "3.4.2",
     "solid-js": "1.9.7",
-    "toolbeam-docs-theme": "0.2.4"
+    "toolbeam-docs-theme": "0.3.0"
   },
   "devDependencies": {
     "@types/node": "catalog:",

packages/web/src/components/CodeBlock.tsx

@@ -18,9 +18,9 @@ function CodeBlock(props: CodeBlockProps) {
   const [local, rest] = splitProps(props, ["code", "lang", "onRendered"])
   let containerRef!: HTMLDivElement
 
-  const [html] = createResource(async () => {
-    return (await codeToHtml(local.code, {
-      lang: local.lang || "text",
+  const [html] = createResource(() => [local.code, local.lang], async ([code, lang]) => {
+    return (await codeToHtml(code || "", {
+      lang: lang || "text",
       themes: {
         light: "github-light",
         dark: "github-dark",

packages/web/src/components/Header.astro

@@ -54,9 +54,3 @@ const links = config.social || [];
 		}
 	}
 </style>
-<style is:global>
-body > div.page > header {
-	border-color: var(--sl-color-divider);
-}
-</style>
-

packages/web/src/components/codeblock.module.css

@@ -1,7 +1,7 @@
 .codeblock {
   pre {
-    --shiki-dark-bg: var(--sl-color-bg) !important;
-    background-color: var(--sl-color-bg) !important;
+    --shiki-dark-bg: var(--sl-color-bg-surface) !important;
+    background-color: var(--sl-color-bg-surface) !important;
   }
 }
 

packages/web/src/components/markdownview.module.css

@@ -12,6 +12,10 @@
     margin-bottom: 1rem;
   }
 
+  strong {
+    font-weight: 600;
+  }
+
   ol {
     list-style-position: inside;
     padding-left: 0.75rem;

packages/web/src/components/share.module.css

@@ -5,6 +5,10 @@
   gap: 2.5rem;
   line-height: 1;
 
+  --sm-tool-width: 28rem;
+  --md-tool-width: 40rem;
+  --lg-tool-width: 56rem;
+
   --term-icon: url("data:image/svg+xml,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2060%2016'%20preserveAspectRatio%3D'xMidYMid%20meet'%3E%3Ccircle%20cx%3D'8'%20cy%3D'8'%20r%3D'8'%2F%3E%3Ccircle%20cx%3D'30'%20cy%3D'8'%20r%3D'8'%2F%3E%3Ccircle%20cx%3D'52'%20cy%3D'8'%20r%3D'8'%2F%3E%3C%2Fsvg%3E");
 }
 
@@ -37,7 +41,7 @@
 
 [data-element-label] {
   text-transform: uppercase;
-  letter-spacing: 0.05em;
+  letter-spacing: -0.5px;
   color: var(--sl-color-text-dimmed);
 }
 
@@ -164,30 +168,6 @@
       }
     }
   }
-  [data-section="system-prompt"] {
-    display: flex;
-    gap: 0.3125rem;
-
-    [data-section="icon"] {
-      flex: 0 0 auto;
-      color: var(--sl-color-text-dimmed);
-      opacity: 0.85;
-      svg {
-        display: block;
-      }
-    }
-
-    [data-section="content"] {
-      display: flex;
-      flex-direction: column;
-      gap: 0.5rem;
-    }
-
-    button {
-      line-height: 1rem;
-      font-size: 0.875rem;
-    }
-  }
 }
 
 .parts {
@@ -227,6 +207,7 @@
     }
 
     & > [data-section="content"] {
+      flex: 1 1 auto;
       min-width: 0;
       padding: 0 0 0.375rem;
       display: flex;
@@ -236,20 +217,28 @@
       [data-part-tool-body] {
         display: flex;
         flex-direction: column;
+        align-items: flex-start;
         gap: 0.375rem;
       }
 
-      span[data-part-title] {
+      [data-part-title] {
         line-height: 18px;
-        font-size: 0.75rem;
+        font-size: 0.875rem;
+        color: var(--sl-color-text-secondary);
+        max-wdith: var(--sm-tool-width);
 
-        b {
-          word-break: break-all;
-          font-weight: 500;
+        display: flex;
+        align-items: flex-start;
+        gap: 0.375rem;
+
+        span[data-element-label] {
+          color: var(--sl-color-text-secondary);
         }
 
-        &[data-size="md"] {
-          font-size: 0.875rem;
+        b {
+        color: var(--sl-color-text);
+          word-break: break-all;
+          font-weight: 500;
         }
       }
 
@@ -267,7 +256,7 @@
         display: inline-grid;
         align-items: center;
         grid-template-columns: max-content max-content minmax(0, 1fr);
-        max-width: 100%;
+        max-width: var(--md-tool-width);
         gap: 0.25rem 0.375rem;
 
         & > div:nth-child(3n + 1) {
@@ -279,16 +268,14 @@
 
         & > div:nth-child(3n + 2),
         & > div:nth-child(3n + 3) {
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
           font-size: 0.75rem;
           line-height: 1.5;
         }
 
         & > div:nth-child(3n + 3) {
           padding-left: 0.125rem;
-          color: var(--sl-color-text-dimmed);
+          word-break: break-word;
+          color: var(--sl-color-text-secondary);
         }
       }
 
@@ -302,6 +289,11 @@
           font-size: 0.75rem;
         }
       }
+
+      [data-part-tool-edit] {
+        width: 100%;
+        max-width: var(--lg-tool-width);
+      }
     }
   }
 
@@ -325,16 +317,6 @@
     & > [data-section="content"] > [data-part-tool-body] {
       gap: 0.5rem;
     }
-    [data-part-title] {
-      display: flex;
-      align-items: flex-start;
-      gap: 0.5rem;
-
-      b {
-        color: var(--sl-color-text);
-        word-break: break-all;
-      }
-    }
   }
 
   [data-part-type="tool-grep"] {
@@ -342,16 +324,6 @@
       > [data-section="content"] > [data-part-tool-body] {
       gap: 0.5rem;
     }
-    [data-part-title] {
-      display: flex;
-      align-items: flex-start;
-      gap: 0.5rem;
-
-      b {
-        color: var(--sl-color-text);
-        word-break: break-all;
-      }
-    }
   }
 
   [data-part-type="tool-write"],
@@ -359,7 +331,9 @@
   [data-part-type="tool-fetch"] {
     [data-part-tool-result] {
       [data-part-tool-code] {
+        width: var(--md-tool-width);
         border: 1px solid var(--sl-color-divider);
+        background-color: var(--sl-color-bg-surface);
         border-radius: 0.25rem;
         padding: 0.5rem calc(0.5rem + 3px);
 
@@ -372,8 +346,6 @@
       }
     }
   }
-  [data-part-type="tool-edit"] {
-  }
 }
 
 .message-text {
@@ -384,6 +356,8 @@
   flex-direction: column;
   align-items: flex-start;
   gap: 1rem;
+  align-self: flex-start;
+  max-width: var(--md-tool-width);
 
   &[data-size="sm"] {
     pre {
@@ -411,7 +385,7 @@
     font-size: 0.75rem;
   }
 
-  &[data-highlight="true"] {
+  &[data-invert="true"] {
     background-color: var(--sl-color-blue-high);
 
     pre {
@@ -428,6 +402,10 @@
     }
   }
 
+  &[data-highlight="true"] {
+    background-color: var(--sl-color-blue-low);
+  }
+
   &[data-expanded="true"] {
     pre {
       display: block;
@@ -443,6 +421,73 @@
   }
 }
 
+.message-error {
+  background-color: var(--sl-color-bg-surface);
+  padding: 0.5rem calc(0.5rem + 3px);
+  border-radius: 0.25rem;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 1rem;
+  align-self: flex-start;
+  max-width: var(--md-tool-width);
+
+  [data-section="content"] {
+    p {
+      margin-bottom: 0.5rem;
+      line-height: 1.5;
+      font-size: 0.75rem;
+      white-space: pre-wrap;
+      word-break: break-word;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+
+      span {
+        margin-right: 0.25rem;
+        &:last-child {
+          margin-right: 0;
+        }
+      }
+      span[data-color="red"] {
+        color: var(--sl-color-red);
+      }
+      span[data-color="dimmed"] {
+        color: var(--sl-color-text-dimmed);
+      }
+      span[data-marker="label"] {
+        text-transform: uppercase;
+        letter-spacing: -0.5px;
+      }
+      span[data-separator] {
+        margin-right: 0.375rem;
+      }
+    }
+  }
+
+  &[data-expanded="true"] {
+    [data-section="content"] {
+      display: block;
+    }
+  }
+  &[data-expanded="false"] {
+    [data-section="content"] {
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 7;
+      overflow: hidden;
+    }
+  }
+
+  button {
+    flex: 0 0 auto;
+    padding: 2px 0;
+    font-size: 0.75rem;
+  }
+
+}
+
 .message-terminal {
   display: flex;
   flex-direction: column;
@@ -450,6 +495,7 @@
   gap: 0.5rem;
 
   & > [data-section="body"] {
+    width: var(--sm-tool-width);
     border: 1px solid var(--sl-color-divider);
     border-radius: 0.25rem;
     max-width: 100%;
@@ -460,7 +506,7 @@
       width: 100%;
       height: 1.625rem;
       text-align: center;
-      padding: 0 0.75rem 0 3.25rem;
+      padding: 0 3.25rem;
 
       & > span {
         max-width: min(100%, 140ch);
@@ -491,12 +537,10 @@
 
   [data-section="content"] {
     padding: 0.5rem calc(0.5rem + 3px);
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    gap: 1rem;
 
     pre {
+      --shiki-dark-bg: var(--sl-color-bg) !important;
+      background-color: var(--sl-color-bg) !important;
       line-height: 1.6;
       font-size: 0.75rem;
       white-space: pre-wrap;
@@ -533,6 +577,8 @@
   flex-direction: column;
   align-items: flex-start;
   gap: 1rem;
+  align-self: flex-start;
+  max-width: var(--md-tool-width);
 
   button {
     flex: 0 0 auto;
@@ -540,6 +586,10 @@
     font-size: 0.75rem;
   }
 
+  &[data-highlight="true"] {
+    background-color: var(--sl-color-blue-low);
+  }
+
   &[data-expanded="true"] {
     [data-elment-markdown] {
       display: block;
@@ -566,6 +616,7 @@
   list-style-type: none;
   padding: 0;
   margin: 0;
+  width: var(--sm-tool-width);
   border: 1px solid var(--sl-color-divider);
   border-radius: 0.25rem;
 
@@ -577,6 +628,7 @@
     padding: 0.375rem 0.625rem 0.375rem 1.75rem;
     border-bottom: 1px solid var(--sl-color-divider);
     line-height: 1.5;
+    word-break: break-word;
 
     &:last-child {
       border-bottom: none;
@@ -614,9 +666,9 @@
       }
     }
     &[data-status="completed"] {
-      color: var(--sl-color-text-dimmed);
+      color: var(--sl-color-text-secondary);
 
-      & > span { border-color: var(--sl-color-hairline); }
+      & > span { border-color: var(--sl-color-green-low); }
       & > span::before {
         content: "";
         position: absolute;
@@ -624,7 +676,7 @@
         left: 2px;
         width: calc(0.75rem - 2px - 4px);
         height: calc(0.75rem - 2px - 4px);
-        box-shadow: inset 1rem 1rem var(--sl-color-divider);
+        box-shadow: inset 1rem 1rem var(--sl-color-green);
 
         transform-origin: bottom left;
         clip-path: polygon(14% 44%, 0 65%, 50% 100%, 100% 16%, 80% 0%, 43% 62%);

patches/ai@4.3.16.patch

@@ -0,0 +1,13 @@
+diff --git a/dist/index.mjs b/dist/index.mjs
+index 92a80377692488c4ba8801ce33e7736ad7055e43..add6281bbecaa1c03d3b48eb99aead4a7a7336b2 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -1593,7 +1593,7 @@ function prepareCallSettings({
+   return {
+     maxTokens,
+     // TODO v5 remove default 0 for temperature
+-    temperature: temperature != null ? temperature : 0,
++    temperature: temperature,
+     topP,
+     topK,
+     presencePenalty,