stop loading models.dev format from global config

docs: update README
BREAKING CONFIG CHANGE
2026-08-03 08:46:15 -04:00 · 2025-06-18 23:08:51 -04:00 · 2025-06-18 23:03:54 -04:00 · 2025-06-18 23:01:19 -04:00 · 2025-06-18 23:01:19 -04:00 · 2025-06-18 22:26:51 -04:00
90 changed files with 4402 additions and 2553 deletions
@@ -3,7 +3,7 @@ name: deploy
 on:
  push:
    branches:
-      - dontlook
+      - dev
  workflow_dispatch:

 concurrency: ${{ github.workflow }}-${{ github.ref }}
@@ -5,5 +5,3 @@ node_modules
 .env
 .idea
 .vscode
-app.log
-gopls.log
@@ -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,17 +57,60 @@ $ 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.

-### Project Config
+### Config

-Project configuration is optional. You can place an `opencode.json` file in the root of your repo, and it will be loaded.
+Config is optional and can be placed in the root of your repo or globally in `~/.config/opencode/config.json`. It can be checked in and shared with your team.

 ```json title="opencode.json"
 {
  "$schema": "http://opencode.ai/config.json"
+  "theme": "opencode",
+  "model": "anthropic/claude-sonnet-4-20250514" // format is provider/model
+  "autoshare": false,
+  "autoupdate": true,
+}
+```
+
+#### Keybinds
+
+You can configure custom keybinds, the values listed below are the defaults.
+
+```json title="opencode.json"
+{
+  "$schema": "http://opencode.ai/config.json",
+  "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"
+  }
 }
 ```

@@ -78,21 +137,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.
+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. Remember most popular providers are preloaded from [models.dev](https://models.dev)

 ```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,34 +158,32 @@ 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"
-      },
+      "options": {},
      "models": {
        "anthropic/claude-3.5-sonnet": {
          "name": "Claude 3.5 Sonnet"
@@ -139,15 +194,25 @@ OpenRouter is not yet in the models.dev database, but you can configure it manua
 }
 ```

-#### How is this different than claude code?
+And then to configure an api key you can do `opencode auth login` and select "Other -> 'openrouter'"

-It is very similar to claude code in terms of capability - here are the key differences:
+#### 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.
- TUI focus - opencode is built by neovim users and the creators of https://terminal.shop - we are going to push the limits of what's possible in the terminal
- client/server architecture - this means the tui frontend is just the first of many. For example, opencode can run on your computer and you can drive it remotely from a mobile app
+- 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.

-#### Windows Support
+#### What about Windows support?

-There are some minor problems blocking opencode from working on windows. We will fix them soon - would need to use wsl for now.
+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)
@@ -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,10 +75,11 @@
        "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:",
+        "opencode": "workspace:*",
        "typescript": "catalog:",
      },
    },
@@ -86,6 +88,9 @@
    "sharp",
    "esbuild",
  ],
+  "patchedDependencies": {
+    "ai@4.3.16": "patches/ai@4.3.16.patch",
+  },
  "overrides": {
    "zod": "3.24.2",
  },
@@ -96,6 +101,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 +1495,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=="],

@@ -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",
@@ -1,16 +1,4 @@
 {
  "$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": {}
 }
@@ -37,5 +37,8 @@
    "esbuild",
    "protobufjs",
    "sharp"
-  ]
+  ],
+  "patchedDependencies": {
+    "ai@4.3.16": "patches/ai@4.3.16.patch"
+  }
 }
@@ -19,9 +19,9 @@ export class SyncServer extends DurableObject<Env> {
    this.ctx.acceptWebSocket(server)

    const data = await this.ctx.storage.list()
-    for (const [key, content] of data.entries()) {
-      server.send(JSON.stringify({ key, content }))
-    }
+    Array.from(data.entries())
+      .filter(([key, _]) => key.startsWith("session/"))
+      .map(([key, content]) => server.send(JSON.stringify({ key, content })))

    return new Response(null, {
      status: 101,
@@ -71,11 +71,9 @@ export class SyncServer extends DurableObject<Env> {

  public async getData() {
    const data = await this.ctx.storage.list()
-    const messages = []
-    for (const [key, content] of data.entries()) {
-      messages.push({ key, content })
-    }
-    return messages
+    return Array.from(data.entries())
+      .filter(([key, _]) => key.startsWith("session/"))
+      .map(([key, content]) => ({ key, content }))
  }

  private async getSecret() {
@@ -4,11 +4,123 @@
    "$schema": {
      "type": "string"
    },
+    "theme": {
+      "type": "string"
+    },
+    "keybinds": {
+      "type": "object",
+      "properties": {
+        "leader": {
+          "type": "string"
+        },
+        "help": {
+          "type": "string"
+        },
+        "editor_open": {
+          "type": "string"
+        },
+        "session_new": {
+          "type": "string"
+        },
+        "session_list": {
+          "type": "string"
+        },
+        "session_share": {
+          "type": "string"
+        },
+        "session_interrupt": {
+          "type": "string"
+        },
+        "session_compact": {
+          "type": "string"
+        },
+        "tool_details": {
+          "type": "string"
+        },
+        "model_list": {
+          "type": "string"
+        },
+        "theme_list": {
+          "type": "string"
+        },
+        "project_init": {
+          "type": "string"
+        },
+        "input_clear": {
+          "type": "string"
+        },
+        "input_paste": {
+          "type": "string"
+        },
+        "input_submit": {
+          "type": "string"
+        },
+        "input_newline": {
+          "type": "string"
+        },
+        "history_previous": {
+          "type": "string"
+        },
+        "history_next": {
+          "type": "string"
+        },
+        "messages_page_up": {
+          "type": "string"
+        },
+        "messages_page_down": {
+          "type": "string"
+        },
+        "messages_half_page_up": {
+          "type": "string"
+        },
+        "messages_half_page_down": {
+          "type": "string"
+        },
+        "messages_previous": {
+          "type": "string"
+        },
+        "messages_next": {
+          "type": "string"
+        },
+        "messages_first": {
+          "type": "string"
+        },
+        "messages_last": {
+          "type": "string"
+        },
+        "app_exit": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "autoshare": {
+      "type": "boolean",
+      "description": "Share newly created sessions automatically"
+    },
+    "autoupdate": {
+      "type": "boolean",
+      "description": "Automatically update to the latest version"
+    },
+    "disabled_providers": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "description": "Disable providers that are loaded automatically"
+    },
+    "model": {
+      "type": "string",
+      "description": "Model to use in the format of provider/model, eg anthropic/claude-2"
+    },
    "provider": {
      "type": "object",
      "additionalProperties": {
        "type": "object",
        "properties": {
+          "api": {
+            "type": "string"
+          },
          "name": {
            "type": "string"
          },
@@ -21,6 +133,9 @@
          "id": {
            "type": "string"
          },
+          "npm": {
+            "type": "string"
+          },
          "models": {
            "type": "object",
            "additionalProperties": {
@@ -47,18 +162,16 @@
                    "output": {
                      "type": "number"
                    },
-                    "inputCached": {
+                    "cache_read": {
                      "type": "number"
                    },
-                    "outputCached": {
+                    "cache_write": {
                      "type": "number"
                    }
                  },
                  "required": [
                    "input",
-                    "output",
-                    "inputCached",
-                    "outputCached"
+                    "output"
                  ],
                  "additionalProperties": false
                },
@@ -9,10 +9,7 @@
    "dev": "bun run ./src/index.ts"
  },
  "exports": {
-    "./*": [
-      "./src/*.ts",
-      "./src/*/index.ts"
-    ]
+    "./*": "./src/*.ts"
  },
  "devDependencies": {
    "@tsconfig/bun": "1.0.7",
@@ -20,7 +17,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",
@@ -29,7 +29,7 @@ const targets = [
  ["linux", "x64"],
  ["darwin", "x64"],
  ["darwin", "arm64"],
-  ["windows", "x64"],
+  // ["windows", "x64"],
 ]

 await $`rm -rf dist`
@@ -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(),
      }),
    )
@@ -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
@@ -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(),
  })

@@ -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"))
@@ -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)

@@ -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",
@@ -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 { Flag } from "../../flag/flag"
+import { Config } from "../../config/config"

 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 Config.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 = {
      },
    )
  },
-}
+})
@@ -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())
+      },
+    )
  },
 })
@@ -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")
  },
 }
@@ -1,6 +0,0 @@
-declare global {
-  const OPENCODE_VERSION: string
-}
-
-export const VERSION =
-  typeof OPENCODE_VERSION === "string" ? OPENCODE_VERSION : "dev"
@@ -1,14 +1,19 @@
 import { Log } from "../util/log"
+import path from "path"
 import { z } from "zod"
 import { App } from "../app/app"
 import { Filesystem } from "../util/filesystem"
 import { ModelsDev } from "../provider/models"
+import { mergeDeep } from "remeda"
+import { Global } from "../global"
+import fs from "fs/promises"
+import { lazy } from "../util/lazy"

 export namespace Config {
  const log = Log.create({ service: "config" })

  export const state = App.state("config", async (app) => {
-    let result: Info = {}
+    let result = await global()
    for (const file of ["opencode.jsonc", "opencode.json"]) {
      const [resolved] = await Filesystem.findUp(
        file,
@@ -17,7 +22,10 @@ export namespace Config {
      )
      if (!resolved) continue
      try {
-        result = await import(resolved).then((mod) => Info.parse(mod.default))
+        result = mergeDeep(
+          result,
+          await import(resolved).then((mod) => Info.parse(mod.default)),
+        )
        log.info("found", { path: resolved })
        break
      } catch (e) {
@@ -34,23 +42,84 @@ export namespace Config {
    return result
  })

-  export const McpLocal = z.object({
-    type: z.literal("local"),
-    command: z.string().array(),
-    environment: z.record(z.string(), z.string()).optional(),
-  })
+  export const McpLocal = z
+    .object({
+      type: z.literal("local"),
+      command: z.string().array(),
+      environment: z.record(z.string(), z.string()).optional(),
+    })
+    .openapi({
+      ref: "Config.McpLocal",
+    })

-  export const McpRemote = z.object({
-    type: z.literal("remote"),
-    url: z.string(),
-  })
+  export const McpRemote = z
+    .object({
+      type: z.literal("remote"),
+      url: z.string(),
+    })
+    .openapi({
+      ref: "Config.McpRemote",
+    })

  export const Mcp = z.discriminatedUnion("type", [McpLocal, McpRemote])
  export type Mcp = z.infer<typeof Mcp>

+  export const Keybinds = z
+    .object({
+      leader: z.string().optional(),
+      help: z.string().optional(),
+      editor_open: z.string().optional(),
+      session_new: z.string().optional(),
+      session_list: z.string().optional(),
+      session_share: z.string().optional(),
+      session_interrupt: z.string().optional(),
+      session_compact: z.string().optional(),
+      tool_details: z.string().optional(),
+      model_list: z.string().optional(),
+      theme_list: z.string().optional(),
+      project_init: z.string().optional(),
+      input_clear: z.string().optional(),
+      input_paste: z.string().optional(),
+      input_submit: z.string().optional(),
+      input_newline: z.string().optional(),
+      history_previous: z.string().optional(),
+      history_next: z.string().optional(),
+      messages_page_up: z.string().optional(),
+      messages_page_down: z.string().optional(),
+      messages_half_page_up: z.string().optional(),
+      messages_half_page_down: z.string().optional(),
+      messages_previous: z.string().optional(),
+      messages_next: z.string().optional(),
+      messages_first: z.string().optional(),
+      messages_last: z.string().optional(),
+      app_exit: z.string().optional(),
+    })
+    .openapi({
+      ref: "Config.Keybinds",
+    })
  export const Info = z
    .object({
      $schema: z.string().optional(),
+      theme: z.string().optional(),
+      keybinds: Keybinds.optional(),
+      autoshare: z
+        .boolean()
+        .optional()
+        .describe("Share newly created sessions automatically"),
+      autoupdate: z
+        .boolean()
+        .optional()
+        .describe("Automatically update to the latest version"),
+      disabled_providers: z
+        .array(z.string())
+        .optional()
+        .describe("Disable providers that are loaded automatically"),
+      model: z
+        .string()
+        .describe(
+          "Model to use in the format of provider/model, eg anthropic/claude-2",
+        )
+        .optional(),
      provider: z
        .record(
          ModelsDev.Provider.partial().extend({
@@ -61,10 +130,37 @@ export namespace Config {
        .optional(),
      mcp: z.record(z.string(), Mcp).optional(),
    })
-    .strict()
+    .openapi({
+      ref: "Config.Info",
+    })

  export type Info = z.output<typeof Info>

+  export const global = lazy(async () => {
+    let result = await Bun.file(path.join(Global.Path.config, "config.json"))
+      .json()
+      .then((mod) => Info.parse(mod))
+      .catch(() => ({}) as Info)
+
+    await import(path.join(Global.Path.config, "config"), {
+      with: {
+        type: "toml",
+      },
+    })
+      .then(async (mod) => {
+        const { provider, model, ...rest } = mod.default
+        if (provider && model) result.model = `${provider}/${model}`
+        result = mergeDeep(result, rest)
+        await Bun.write(
+          path.join(Global.Path.config, "config.json"),
+          JSON.stringify(result, null, 2),
+        )
+        await fs.unlink(path.join(Global.Path.config, "config"))
+      })
+      .catch(() => {})
+    return Info.parse(result)
+  })
+
  export function get() {
    return state()
  }
@@ -1,4 +1,3 @@
-import { App } from "../app/app"
 import path from "path"
 import { Global } from "../global"
 import fs from "fs/promises"
@@ -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,
-    })) {
-    }
-  }
-}
@@ -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 }),
+])
@@ -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 { Installation } from "./installation"
+import { Bus } from "./bus"
+import { Config } from "./config/config"

 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,52 +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 (app) => {
-            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 Config.global()
+            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(),
-                OPENCODE_APP_INFO: JSON.stringify(app),
-              },
-              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()
@@ -105,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,
+  })
 }
@@ -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)
+  }
+}
@@ -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(),
@@ -33,9 +32,11 @@ export namespace ModelsDev {

  export const Provider = z
    .object({
+      api: z.string().optional(),
      name: z.string(),
      env: z.array(z.string()),
      id: z.string(),
+      npm: z.string().optional(),
      models: z.record(Model),
    })
    .openapi({
@@ -63,30 +64,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"]
-  }
 }
@@ -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,7 @@ import { ModelsDev } from "./models"
 import { NamedError } from "../util/error"
 import { Auth } from "../auth"
 import { TaskTool } from "../tool/task"
+import { Global } from "../global"

 export namespace Provider {
  const log = Log.create({ service: "provider" })
@@ -40,16 +42,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 +100,12 @@ export namespace Provider {
    ) {
      const provider = providers[id]
      if (!provider) {
+        const info = database[id]
+        if (!info) return
+        if (info.api) options["baseURL"] = info.api
        providers[id] = {
          source,
-          info: database[id],
+          info,
          options,
        }
        return
@@ -102,12 +114,13 @@ export namespace Provider {
      provider.source = source
    }

-    for (const [providerID, provider] of Object.entries(
-      config.provider ?? {},
-    )) {
+    const configProviders = Object.entries(config.provider ?? {})
+
+    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 +152,12 @@ export namespace Provider {
      database[providerID] = parsed
    }

+    const disabled = await Config.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 +165,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 +173,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 +198,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 +231,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 +273,10 @@ export namespace Provider {
  }

  export async function defaultModel() {
-    const [provider] = await list().then((val) => Object.values(val))
+    const cfg = await Config.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 +304,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 +325,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({
@@ -12,9 +12,10 @@ 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"
+import { Config } from "../config/config"

 const ERRORS = {
  400: {
@@ -140,6 +141,25 @@ export namespace Server {
          return c.json(App.info())
        },
      )
+      .post(
+        "/config_get",
+        describeRoute({
+          description: "Get config info",
+          responses: {
+            200: {
+              description: "Get config info",
+              content: {
+                "application/json": {
+                  schema: resolver(Config.Info),
+                },
+              },
+            },
+          },
+        }),
+        async (c) => {
+          return c.json(await Config.get())
+        },
+      )
      .post(
        "/app_initialize",
        describeRoute({
@@ -466,6 +486,25 @@ export namespace Server {
          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
  }
@@ -30,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 { Installation } from "../installation"
+import { Config } from "../config/config"

 export namespace Session {
  const log = Log.create({ service: "session" })
@@ -40,11 +42,11 @@ export namespace Session {
      parentID: Identifier.schema("session").optional(),
      share: z
        .object({
-          secret: z.string(),
          url: z.string(),
        })
        .optional(),
      title: z.string(),
+      version: z.string(),
      time: z.object({
        created: z.number(),
        updated: z.number(),
@@ -55,6 +57,12 @@ export namespace Session {
    })
  export type Info = z.output<typeof Info>

+  export const ShareInfo = z.object({
+    secret: z.string(),
+    url: z.string(),
+  })
+  export type ShareInfo = z.output<typeof ShareInfo>
+
  export const Event = {
    Updated: Bus.event(
      "session.updated",
@@ -70,19 +78,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 - ") +
@@ -95,7 +114,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 Config.get()
+    if (!result.parentID && (Flag.OPENCODE_AUTO_SHARE || cfg.autoshare))
      share(result.id).then((share) => {
        update(result.id, (draft) => {
          draft.share = share
@@ -117,13 +137,20 @@ export namespace Session {
    return read as Info
  }

+  export async function getShare(id: string) {
+    return Storage.readJSON<ShareInfo>("session/share/" + id)
+  }
+
  export async function share(id: string) {
    const session = await get(id)
    if (session.share) return session.share
    const share = await Share.create(id)
    await update(id, (draft) => {
-      draft.share = share
+      draft.share = {
+        url: share.url,
+      }
    })
+    await Storage.writeJSON<ShareInfo>("session/share/" + id, share)
    for (const msg of await messages(id)) {
      await Share.sync("session/message/" + id + "/" + msg.id, msg)
    }
@@ -169,10 +196,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
  }

@@ -208,8 +235,9 @@ export namespace Session {
        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,
@@ -328,6 +356,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,
@@ -412,9 +450,7 @@ export namespace Session {
    )
    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(model.info, step.usage, step.providerMetadata)
        assistant.cost += usage.cost
@@ -430,6 +466,9 @@ export namespace Session {
        text = undefined
      },
      async onFinish(input) {
+        log.info("message finish", {
+          reason: input.finishReason,
+        })
        const assistant = next.metadata!.assistant!
        const usage = getUsage(model.info, input.usage, input.providerMetadata)
        assistant.cost = usage.cost
@@ -493,7 +532,7 @@ export namespace Session {
          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: {
        ...tools,
      },
@@ -720,17 +759,16 @@ export namespace Session {
    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)
      },
    }
  }
@@ -755,6 +793,16 @@ export namespace Session {
      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,
    }
@@ -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
@@ -19,10 +19,11 @@ export namespace Share {
  export async function sync(key: string, content: any) {
    const [root, ...splits] = key.split("/")
    if (root !== "session") return
-    const [, sessionID] = splits
-    const session = await Session.get(sessionID)
-    if (!session.share) return
-    const { secret } = session.share
+    const [sub, sessionID] = splits
+    if (sub === "share") return
+    const share = await Session.getShare(sessionID).catch(() => {})
+    if (!share) return
+    const { secret } = share
    pending.set(key, content)
    queue = queue
      .then(async () => {
@@ -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>
  }
@@ -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(
@@ -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")
+}
@@ -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.`,
      ),
@@ -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}")',
      ),
@@ -29,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()
@@ -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
@@ -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
@@ -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,
    }
@@ -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,
@@ -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
@@ -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() {
@@ -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()
  })
 })
@@ -23,10 +23,28 @@ func main() {
 	}

 	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 {
+			slog.Error("Failed to create log directory", "error", err)
+			os.Exit(1)
+		}
+	}
+	file, err := os.Create(logfile)
+	if err != nil {
+		slog.Error("Failed to create log file", "error", err)
+		os.Exit(1)
+	}
+	defer file.Close()
+	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)
@@ -46,7 +64,7 @@ func main() {
 		tui.NewModel(app_),
 		tea.WithAltScreen(),
 		tea.WithKeyboardEnhancements(),
-		// tea.WithMouseCellMotion(),
+		tea.WithMouseCellMotion(),
 	)

 	eventClient, err := client.NewClient(url)
@@ -67,35 +85,10 @@ func main() {
 		}
 	}()

-	go func() {
-		paths, err := httpClient.PostPathGetWithResponse(context.Background())
-		if err != nil {
-			panic(err)
-		}
-		logfile := filepath.Join(paths.JSON200.Data, "log", "tui.log")
-
-		if _, err := os.Stat(filepath.Dir(logfile)); os.IsNotExist(err) {
-			err := os.MkdirAll(filepath.Dir(logfile), 0755)
-			if err != nil {
-				slog.Error("Failed to create log directory", "error", err)
-				os.Exit(1)
-			}
-		}
-		file, err := os.Create(logfile)
-		if err != nil {
-			slog.Error("Failed to create log file", "error", err)
-			os.Exit(1)
-		}
-		defer file.Close()
-		logger := slog.New(slog.NewTextHandler(file, &slog.HandlerOptions{Level: slog.LevelDebug}))
-		slog.SetDefault(logger)
-	}()
-
 	// Run the TUI
 	result, err := program.Run()
 	if err != nil {
 		slog.Error("TUI error", "error", err)
-		// return fmt.Errorf("TUI error: %v", err)
 	}

 	slog.Info("TUI exited", "result", result)
@@ -8,7 +8,7 @@ require (
 	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/muesli/ansi v0.0.0-20230316100256-276c6243b2f6
@@ -34,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=
@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"path/filepath"
 	"sort"
+	"strings"

 	"log/slog"

 	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/theme"
 	"github.com/sst/opencode/internal/util"
 	"github.com/sst/opencode/pkg/client"
@@ -20,16 +20,32 @@ import (
 var RootPath string

 type App struct {
-	Info       client.AppInfo
-	Version    string
-	ConfigPath string
-	Config     *config.Config
-	Client     *client.ClientWithResponses
-	Provider   *client.ProviderInfo
-	Model      *client.ModelInfo
-	Session    *client.SessionInfo
-	Messages   []client.MessageInfo
-	Commands   commands.Registry
+	Info      client.AppInfo
+	Version   string
+	StatePath string
+	Configg   *client.ConfigInfo
+	Client    *client.ClientWithResponses
+	State     *config.State
+	Provider  *client.ProviderInfo
+	Model     *client.ModelInfo
+	Session   *client.SessionInfo
+	Messages  []client.MessageInfo
+	Commands  commands.CommandRegistry
+}
+
+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
+}
+type CompletionDialogTriggerdMsg struct {
+	InitialValue string
 }

 func New(
@@ -40,23 +56,51 @@ func New(
 ) (*App, error) {
 	RootPath = appInfo.Path.Root

-	appConfigPath := filepath.Join(appInfo.Path.Config, "config")
-	appConfig, err := config.LoadConfig(appConfigPath)
+	configResponse, err := httpClient.PostConfigGetWithResponse(ctx)
 	if err != nil {
-		appConfig = config.NewConfig()
-		config.SaveConfig(appConfigPath, appConfig)
+		return nil, err
 	}
-	theme.SetTheme(appConfig.Theme)
+	configInfo := configResponse.JSON200
+	if configInfo.Keybinds == nil {
+		leader := "ctrl+x"
+		keybinds := client.ConfigKeybinds{
+			Leader: &leader,
+		}
+		configInfo.Keybinds = &keybinds
+	}
+
+	appStatePath := filepath.Join(appInfo.Path.State, "tui")
+	appState, err := config.LoadState(appStatePath)
+	if err != nil {
+		appState = config.NewState()
+		config.SaveState(appStatePath, appState)
+	}
+
+	if configInfo.Theme != nil {
+		appState.Theme = *configInfo.Theme
+	}
+	if configInfo.Model != nil {
+		splits := strings.Split(*configInfo.Model, "/")
+		appState.Provider = splits[0]
+		appState.Model = strings.Join(splits[1:], "/")
+	}
+
+	if appState.Theme != "" {
+		theme.SetTheme(appState.Theme)
+	}
+
+	slog.Debug("Loaded config", "config", configInfo)

 	app := &App{
-		Info:       appInfo,
-		Version:    version,
-		ConfigPath: appConfigPath,
-		Config:     appConfig,
-		Client:     httpClient,
-		Session:    &client.SessionInfo{},
-		Messages:   []client.MessageInfo{},
-		Commands:   commands.NewCommandRegistry(),
+		Info:      appInfo,
+		Version:   version,
+		StatePath: appStatePath,
+		Configg:   configInfo,
+		State:     appState,
+		Client:    httpClient,
+		Session:   &client.SessionInfo{},
+		Messages:  []client.MessageInfo{},
+		Commands:  commands.LoadFromConfig(configInfo),
 	}

 	return app, nil
@@ -102,11 +146,11 @@ func (a *App) InitializeProvider() tea.Cmd {
 		var currentProvider *client.ProviderInfo
 		var currentModel *client.ModelInfo
 		for _, provider := range providers {
-			if provider.Id == a.Config.Provider {
+			if provider.Id == a.State.Provider {
 				currentProvider = &provider

 				for _, model := range provider.Models {
-					if model.Id == a.Config.Model {
+					if model.Id == a.State.Model {
 						currentModel = &model
 					}
 				}
@@ -118,7 +162,7 @@ func (a *App) InitializeProvider() tea.Cmd {
 		}

 		// TODO: handle no provider or model setup, yet
-		return state.ModelSelectedMsg{
+		return ModelSelectedMsg{
 			Provider: *currentProvider,
 			Model:    *currentModel,
 		}
@@ -153,8 +197,11 @@ 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() {
+	err := config.SaveState(a.StatePath, a.State)
+	if err != nil {
+		slog.Error("Failed to save state", "error", err)
+	}
 }

 func (a *App) InitializeProject(ctx context.Context) tea.Cmd {
@@ -167,19 +214,20 @@ func (a *App) InitializeProject(ctx context.Context) tea.Cmd {
 	}

 	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 {
+			slog.Error("Failed to initialize project", "error", err)
 			// status.Error(err.Error())
 		}
 		if response != nil && response.StatusCode != 200 {
+			slog.Error("Failed to initialize project", "error", response.StatusCode)
 			// status.Error(fmt.Sprintf("failed to initialize project: %d", response.StatusCode))
 		}
 	}()
@@ -187,6 +235,21 @@ func (a *App) InitializeProject(ctx context.Context) tea.Cmd {
 	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 {
@@ -220,7 +283,7 @@ func (a *App) SendChatMessage(ctx context.Context, text string, attachments []At
 			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
@@ -325,3 +388,7 @@ func (a *App) ListProviders(ctx context.Context) ([]client.ProviderInfo, error)
 	providers := *resp.JSON200
 	return providers.Providers, nil
 }
+
+// func (a *App) loadCustomKeybinds() {
+//
+// }
@@ -1,71 +1,281 @@
 package commands

 import (
-	"github.com/charmbracelet/bubbles/v2/key"
+	"encoding/json"
+	"slices"
+	"strings"
+
+	tea "github.com/charmbracelet/bubbletea/v2"
+	"github.com/sst/opencode/pkg/client"
 )

-// 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 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 *client.ConfigInfo) 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)
+	keybinds := map[string]string{}
+	marshalled, _ := json.Marshal(*config.Keybinds)
+	json.Unmarshal(marshalled, &keybinds)
+	for _, command := range defaults {
+		if keybind, ok := keybinds[string(command.Name)]; ok {
+			command.Keybindings = parseBindings(keybind)
+		}
+		registry[command.Name] = command
+	}
+	return registry
 }
-
@@ -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
 }
-
@@ -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,
@@ -20,10 +20,13 @@ func NewCompletionManager(app *app.App) *CompletionManager {
 	}
 }

+func (m *CompletionManager) DefaultProvider() dialog.CompletionProvider {
+	return m.providers["commands"]
+}
+
 func (m *CompletionManager) GetProvider(input string) dialog.CompletionProvider {
 	if strings.HasPrefix(input, "/") {
 		return m.providers["commands"]
 	}
 	return m.providers["files"]
 }
-
@@ -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)
-}
@@ -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"
@@ -22,75 +19,30 @@ import (
 	"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)
 }
@@ -99,150 +51,37 @@ 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:
-		m.textarea = createTextArea(&m.textarea)
-	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})
-		} 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)
-			}
+	case tea.KeyPressMsg:
+		// Maximize editor responsiveness for printable characters
+		if msg.Text != "" {
+			m.textarea, cmd = m.textarea.Update(msg)
 			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()
+		// // 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
+		// }

-			// 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()
-			}
+	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 {
+			commandName := strings.TrimPrefix(msg.CompletionValue, "/")
+			m.textarea.Reset()
+			return m, util.CmdHandler(
+				commands.ExecuteCommandMsg(m.app.Commands[commands.CommandName(commandName)]),
+			)
+		} else {
+			existingValue := m.textarea.Value()
+			modifiedValue := strings.Replace(existingValue, msg.SearchString, msg.CompletionValue, 1)
+			m.textarea.SetValue(modifiedValue + " ")
+			return m, nil
 		}
 	}

@@ -276,7 +115,7 @@ func (m *editorComponent) View() string {
 		PaddingBottom(1).
 		Background(t.BackgroundElement()).
 		Border(lipgloss.ThickBorder(), false, true).
-		BorderForeground(t.BackgroundSubtle()).
+		BorderForeground(t.BackgroundElement()).
 		BorderBackground(t.Background()).
 		Render(textarea)

@@ -287,7 +126,7 @@ func (m *editorComponent) View() string {

 	model := ""
 	if m.app.Model != nil {
-		model = base(m.app.Model.Name) + muted(" • /model")
+		model = muted(m.app.Provider.Name) + base(" "+m.app.Model.Name)
 	}

 	space := m.width - 2 - lipgloss.Width(model) - lipgloss.Width(hint)
@@ -297,10 +136,13 @@ func (m *editorComponent) View() string {
 	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
@@ -309,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 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 := strings.TrimSpace(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
@@ -369,26 +179,84 @@ 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})
-	// 	}
-	// }
-
-	return tea.Batch(
-		util.CmdHandler(SendMsg{
+	return m, tea.Batch(
+		util.CmdHandler(app.SendMsg{
 			Text:        value,
 			Attachments: attachments,
 		}),
 	)
 }

+func (m *editorComponent) Clear() (tea.Model, tea.Cmd) {
+	m.textarea.Reset()
+	return m, nil
+}
+
+func (m *editorComponent) Paste() (tea.Model, tea.Cmd) {
+	imageBytes, text, err := image.GetImageFromClipboard()
+	if err != nil {
+		slog.Error(err.Error())
+		return m, nil
+	}
+	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 {
 	t := theme.CurrentTheme()
 	bgColor := t.BackgroundElement()
@@ -421,12 +289,8 @@ func createTextArea(existing *textarea.Model) textarea.Model {
 	return ta
 }

-func (m *editorComponent) GetValue() string {
-	return m.textarea.Value()
-}
-
-func NewEditorComponent(app *app.App) layout.ModelWithView {
-	s := spinner.New(
+func createSpinner() spinner.Model {
+	return spinner.New(
 		spinner.WithSpinner(spinner.Ellipsis),
 		spinner.WithStyle(
 			styles.
@@ -434,6 +298,10 @@ func NewEditorComponent(app *app.App) layout.ModelWithView {
 				Background(theme.CurrentTheme().Background()).
 				Width(3)),
 	)
+}
+
+func NewEditorComponent(app *app.App) EditorComponent {
+	s := createSpinner()
 	ta := createTextArea(nil)

 	return &editorComponent{
@@ -201,17 +201,20 @@ func renderContentBlock(content string, options ...renderingOption) string {
 	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] {
@@ -222,9 +225,11 @@ func renderText(message client.MessageInfo, text string, author string) string {

 	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 = strings.Join([]string{content, info}, "\n")
-	// content = lipgloss.JoinVertical(align, content, info)

 	switch message.Role {
 	case client.User:
@@ -245,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) {
@@ -256,7 +262,7 @@ func renderToolInvocation(
 	innerWidth := outerWidth - 6
 	paddingTop := 0
 	paddingBottom := 0
-	if showResult {
+	if showDetails {
 		paddingTop = 1
 		if result == nil || *result == "" {
 			paddingBottom = 1
@@ -278,8 +284,21 @@ func renderToolInvocation(
 		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 := ""
@@ -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
@@ -364,7 +383,7 @@ func renderToolInvocation(
 					BorderRight(true).
 					Render(formattedDiff)

-				if showResult {
+				if showDetails {
 					style = style.Width(lipgloss.Width(formattedDiff))
 					title += "\n"
 				}
@@ -382,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)
@@ -400,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)
@@ -410,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)
@@ -431,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)
@@ -450,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
@@ -464,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)
 	}
 }

@@ -542,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":
@@ -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,6 +116,17 @@ 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 {
@@ -144,7 +136,7 @@ func (m *messagesComponent) renderView() {
 			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)
@@ -261,7 +266,7 @@ func (m *messagesComponent) header() string {
 		BorderLeft(true).
 		BorderRight(true).
 		BorderBackground(t.Background()).
-		BorderForeground(t.BackgroundSubtle()).
+		BorderForeground(t.BackgroundElement()).
 		BorderStyle(lipgloss.ThickBorder()).
 		Render(header)

@@ -389,7 +394,39 @@ 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,
@@ -398,17 +435,14 @@ func NewMessagesComponent(app *app.App) layout.ModelWithView {

 	vp := viewport.New()
 	attachments := viewport.New()
-	vp.KeyMap.PageUp = messageKeys.PageUp
-	vp.KeyMap.PageDown = messageKeys.PageDown
-	vp.KeyMap.HalfPageUp = messageKeys.HalfPageUp
-	vp.KeyMap.HalfPageDown = messageKeys.HalfPageDown
+	vp.KeyMap = viewport.KeyMap{}

 	return &messagesComponent{
 		app:             app,
 		viewport:        vp,
 		spinner:         s,
 		attachments:     attachments,
-		showToolResults: true,
+		showToolDetails: true,
 		cache:           NewMessageCache(),
 		tail:            true,
 	}
@@ -1,19 +1,20 @@
 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/app"
 	"github.com/sst/opencode/internal/components/list"
-	"github.com/sst/opencode/internal/layout"
 	"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
 }
@@ -35,8 +36,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(
@@ -62,6 +62,7 @@ type CompletionProvider interface {
 	GetId() string
 	GetEntry() CompletionItemI
 	GetChildEntries(query string) ([]CompletionItemI, error)
+	GetEmptyMessage() string
 }

 type CompletionSelectedMsg struct {
@@ -77,7 +78,8 @@ type CompletionDialogCompleteItemMsg struct {
 type CompletionDialogCloseMsg struct{}

 type CompletionDialog interface {
-	layout.ModelWithView
+	tea.Model
+	tea.ViewModel
 	SetWidth(width int)
 	IsEmpty() bool
 	SetProvider(provider CompletionProvider)
@@ -110,39 +112,13 @@ func (c *completionDialogComponent) Init() tea.Cmd {
 	return nil
 }

-func (c *completionDialogComponent) complete(item CompletionItemI) tea.Cmd {
-	value := c.pseudoSearchTextArea.Value()
-
-	if value == "" {
-		return nil
-	}
-
-	// Check if this is a command completion
-	isCommand := c.completionProvider.GetId() == "commands"
-
-	return tea.Batch(
-		util.CmdHandler(CompletionSelectedMsg{
-			SearchString:    value,
-			CompletionValue: item.GetValue(),
-			IsCommand:       isCommand,
-		}),
-		c.close(),
-	)
-}
-
-func (c *completionDialogComponent) close() tea.Cmd {
-	c.list.SetItems([]CompletionItemI{})
-	c.pseudoSearchTextArea.Reset()
-	c.pseudoSearchTextArea.Blur()
-
-	return util.CmdHandler(CompletionDialogCloseMsg{})
-}
-
 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 app.CompletionDialogTriggerdMsg:
+		c.pseudoSearchTextArea.SetValue(msg.InitialValue)
 	case tea.KeyMsg:
 		if c.pseudoSearchTextArea.Focused() {
 			if !key.Matches(msg, completionDialogKeys.Complete) {
@@ -161,9 +137,8 @@ func (c *completionDialogComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 					cmd = func() tea.Msg {
 						items, err := c.completionProvider.GetChildEntries(query)
 						if err != nil {
-							// status.Error(err.Error())
+							slog.Error("Failed to get completion items", "error", err)
 						}
-						// c.list.SetItems(items)
 						return items
 					}
 					cmds = append(cmds, cmd)
@@ -193,13 +168,13 @@ func (c *completionDialogComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			cmd := func() tea.Msg {
 				items, err := c.completionProvider.GetChildEntries("")
 				if err != nil {
-					// status.Error(err.Error())
+					slog.Error("Failed to get completion items", "error", err)
 				}
 				return items
 			}
 			cmds = append(cmds, cmd)
 			cmds = append(cmds, c.pseudoSearchTextArea.Focus())
-			c.pseudoSearchTextArea.SetValue(msg.String())
+			// c.pseudoSearchTextArea.SetValue(msg.String())
 			return c, tea.Batch(cmds...)
 		}
 	case tea.WindowSizeMsg:
@@ -250,23 +225,52 @@ func (c *completionDialogComponent) IsEmpty() bool {
 func (c *completionDialogComponent) SetProvider(provider CompletionProvider) {
 	if c.completionProvider.GetId() != provider.GetId() {
 		c.completionProvider = provider
+		c.list.SetEmptyMessage(" " + provider.GetEmptyMessage())
 	}
 }

+func (c *completionDialogComponent) complete(item CompletionItemI) tea.Cmd {
+	value := c.pseudoSearchTextArea.Value()
+
+	if value == "" {
+		return nil
+	}
+
+	// Check if this is a command completion
+	isCommand := c.completionProvider.GetId() == "commands"
+
+	return tea.Batch(
+		util.CmdHandler(CompletionSelectedMsg{
+			SearchString:    value,
+			CompletionValue: item.GetValue(),
+			IsCommand:       isCommand,
+		}),
+		c.close(),
+	)
+}
+
+func (c *completionDialogComponent) close() tea.Cmd {
+	c.list.SetItems([]CompletionItemI{})
+	c.pseudoSearchTextArea.Reset()
+	c.pseudoSearchTextArea.Blur()
+
+	return util.CmdHandler(CompletionDialogCloseMsg{})
+}
+
 func NewCompletionDialogComponent(completionProvider CompletionProvider) CompletionDialog {
 	ti := textarea.New()

 	li := list.NewListComponent(
 		[]CompletionItemI{},
 		7,
-		"No matches",
+		completionProvider.GetEmptyMessage(),
 		false,
 	)

 	go func() {
 		items, err := completionProvider.GetChildEntries("")
 		if err != nil {
-			// status.Error(err.Error())
+			slog.Error("Failed to get completion items", "error", err)
 		}
 		li.SetItems(items)
 	}()
@@ -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,
-		modal:    modal.New(),
+		commands: commands,
+		modal:    modal.New(modal.WithTitle("Help")),
 	}
 }
@@ -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],
 					}),
@@ -181,6 +180,7 @@ func (m *modelDialog) switchProvider(offset int) {

 	m.hScrollOffset = newOffset
 	m.provider = m.availableProviders[m.hScrollOffset]
+	m.modal.SetTitle(fmt.Sprintf("Select %s Model", m.provider.Name))
 	m.setupModelsForProvider(m.provider.Id)
 }

@@ -190,14 +190,6 @@ func (m *modelDialog) View() string {
 		Background(t.BackgroundElement()).
 		Foreground(t.Text())

-	// Capitalize first letter of provider name
-	title := baseStyle.
-		Foreground(t.Primary()).
-		Bold(true).
-		Width(maxDialogWidth).
-		Padding(0, 0, 1).
-		Render(fmt.Sprintf("Select %s Model", m.provider.Name))
-
 	// Render visible models
 	endIdx := min(m.scrollOffset+numVisibleModels, len(m.provider.Models))
 	modelItems := make([]string, 0, endIdx-m.scrollOffset)
@@ -218,8 +210,9 @@ func (m *modelDialog) View() string {

 	content := lipgloss.JoinVertical(
 		lipgloss.Left,
-		title,
-		baseStyle.Width(maxDialogWidth).Render(lipgloss.JoinVertical(lipgloss.Left, modelItems...)),
+		baseStyle.
+			Width(maxDialogWidth).
+			Render(lipgloss.JoinVertical(lipgloss.Left, modelItems...)),
 		scrollIndicator,
 	)

@@ -239,12 +232,7 @@ func (m *modelDialog) getScrollIndicators(maxWidth int) string {
 	}

 	if m.hScrollPossible {
-		if m.hScrollOffset > 0 {
-			indicator = "← " + indicator
-		}
-		if m.hScrollOffset < len(m.availableProviders)-1 {
-			indicator += "→"
-		}
+		indicator = "← " + indicator + "→"
 	}

 	if indicator == "" {
@@ -314,6 +302,6 @@ func NewModelDialog(app *app.App) ModelDialog {
 		hScrollOffset:      0,
 		hScrollPossible:    len(availableProviders) > 1,
 		provider:           availableProviders[0],
-		modal:              modal.New(),
+		modal:              modal.New(modal.WithTitle(fmt.Sprintf("Select %s Model", availableProviders[0].Name))),
 	}
 }
@@ -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
 }

@@ -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"
@@ -20,14 +19,12 @@ type SessionDialog interface {
 	layout.Modal
 }

-type sessionItem struct {
-	session client.SessionInfo
-}
+type sessionItem client.SessionInfo

 func (s sessionItem) Render(selected bool, width int) string {
 	t := theme.CurrentTheme()
 	baseStyle := styles.BaseStyle().
-		Width(width - 2).
+		Width(width - 4).
 		Background(t.BackgroundElement())

 	if selected {
@@ -40,7 +37,7 @@ func (s sessionItem) Render(selected bool, width int) string {
 			Foreground(t.Text())
 	}

-	return baseStyle.Padding(0, 1).Render(s.session.Title)
+	return baseStyle.Padding(0, 1).Render(s.Title)
 }

 type sessionDialog struct {
@@ -61,15 +58,14 @@ func (s *sessionDialog) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		s.width = msg.Width
 		s.height = msg.Height
 		s.list.SetMaxWidth(layout.Current.Container.Width - 12)
-	case tea.KeyMsg:
+	case tea.KeyPressMsg:
 		switch msg.String() {
 		case "enter":
 			if item, idx := s.list.GetSelectedItem(); idx >= 0 {
-				selectedSession := item.session
-				s.selectedSessionID = selectedSession.Id
+				s.selectedSessionID = item.Id
 				return s, tea.Sequence(
 					util.CmdHandler(modal.CloseModalMsg{}),
-					util.CmdHandler(state.SessionSelectedMsg(&selectedSession)),
+					util.CmdHandler(app.SessionSelectedMsg(&item)),
 				)
 			}
 		}
@@ -95,7 +91,10 @@ func NewSessionDialog(app *app.App) SessionDialog {

 	var sessionItems []sessionItem
 	for _, sess := range sessions {
-		sessionItems = append(sessionItems, sessionItem{session: sess})
+		if sess.ParentID != nil {
+			continue
+		}
+		sessionItems = append(sessionItems, sessionItem(sess))
 	}

 	list := list.NewListComponent(
@@ -10,8 +10,8 @@ import (
 	"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
 }

@@ -75,7 +75,7 @@ func (t *themeDialog) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				}
 				return t, tea.Sequence(
 					util.CmdHandler(modal.CloseModalMsg{}),
-					util.CmdHandler(ThemeChangedMsg{ThemeName: selectedTheme}),
+					util.CmdHandler(ThemeSelectedMsg{ThemeName: selectedTheme}),
 				)
 			}
 		}
@@ -1,10 +1,10 @@
 package list

 import (
+	"strings"
+
 	"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 +12,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 +102,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
 }
@@ -143,7 +149,7 @@ func (c *listComponent[T]) View() string {
 		listItems = append(listItems, title)
 	}

-	return lipgloss.JoinVertical(lipgloss.Left, listItems...)
+	return strings.Join(listItems, "\n")
 }

 func NewListComponent[T ListItem](items []T, maxVisibleItems int, fallbackMsg string, useAlphaNumericKeys bool) List[T] {
@@ -1,6 +1,8 @@
 package modal

 import (
+	"strings"
+
 	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/sst/opencode/internal/layout"
 	"github.com/sst/opencode/internal/styles"
@@ -66,6 +68,10 @@ func New(opts ...ModalOption) *Modal {
 	return m
 }

+func (m *Modal) SetTitle(title string) {
+	m.title = title
+}
+
 // Render renders the modal centered on the screen
 func (m *Modal) Render(contentView string, background string) string {
 	t := theme.CurrentTheme()
@@ -95,15 +101,21 @@ func (m *Modal) Render(contentView string, background string) string {
 		titleStyle := baseStyle.
 			Foreground(t.Primary()).
 			Bold(true).
-			Width(innerWidth).
 			Padding(0, 1)

-		titleView := titleStyle.Render(m.title)
-		finalContent = lipgloss.JoinVertical(
-			lipgloss.Left,
-			titleView,
-			contentView,
-		)
+		// titleView := titleStyle.Render(m.title)
+		escStyle := baseStyle.Foreground(t.TextMuted()).Bold(false)
+		escText := escStyle.Render("esc")
+
+		// Calculate position for esc text
+		titleWidth := lipgloss.Width(m.title)
+		escWidth := lipgloss.Width(escText)
+		spacesNeeded := max(0, innerWidth-titleWidth-escWidth-3)
+		spacer := strings.Repeat(" ", spacesNeeded)
+		titleLine := m.title + spacer + escText
+		titleLine = titleStyle.Render(titleLine)
+
+		finalContent = strings.Join([]string{titleLine, contentView}, "\n") + "\n"
 	} else {
 		finalContent = contentView
 	}
@@ -1,4 +1,4 @@
-package core
+package status

 import (
 	"fmt"
@@ -7,13 +7,13 @@ import (
 	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/styles"
 	"github.com/sst/opencode/internal/theme"
 )

 type StatusComponent interface {
-	layout.ModelWithView
+	tea.Model
+	tea.ViewModel
 }

 type statusComponent struct {
@@ -7,25 +7,31 @@ import (
 	"os"

 	"github.com/BurntSushi/toml"
+	"github.com/sst/opencode/pkg/client"
 )

-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() *Config {
-	return &Config{
+func NewState() *State {
+	return &State{
 		Theme: "opencode",
 	}
 }

-// SaveConfig writes the provided Config struct to the specified TOML file.
+func MergeState(state *State, config *client.ConfigInfo) *client.ConfigInfo {
+	if config.Theme == nil {
+		config.Theme = &state.Theme
+	}
+	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)
@@ -34,26 +40,26 @@ func SaveConfig(filePath string, config *Config) error {

 	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
 }

-// LoadConfig reads a Config struct from the specified TOML file.
-// 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 {
+// 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("config file not found at %s: %w", filePath, 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 &config, nil
+	return &state, nil
 }
@@ -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(),
@@ -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
 	}
@@ -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 {
@@ -1,187 +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
-		if keyMsg, ok := msg.(tea.KeyMsg); ok {
-			if keyMsg.String() == "enter" {
-				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),
-			),
-		),
-	}
-}
@@ -1,8 +0,0 @@
-package page
-
-type PageID string
-
-// PageChangeMsg is used to change the current page
-type PageChangeMsg struct {
-	ID PageID
-}
@@ -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
-}
@@ -1,12 +0,0 @@
-package styles
-
-const (
-	OpenCodeIcon string = "◍"
-
-	ErrorIcon    string = "ⓔ"
-	WarningIcon  string = "ⓦ"
-	InfoIcon     string = "ⓘ"
-	HintIcon     string = "ⓗ"
-	SpinnerIcon  string = "⟳"
-	DocumentIcon string = "🖼"
-)
@@ -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())
+}
@@ -3,52 +3,51 @@ package tui
 import (
 	"context"
 	"log/slog"
+	"os"
+	"os/exec"
+	"strings"

-	"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, a.app.InitializeProvider())
-
-	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 {
@@ -59,141 +58,177 @@ func (a appModel) Init() tea.Cmd {
 	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 "/":
+			if !a.showCompletionDialog {
+				a.showCompletionDialog = true
+
+				initialValue := "/"
+				currentInput := a.editor.Value()
+				// if the input doesn't end with a space,
+				// then we want to include the last word
+				if !strings.HasSuffix(currentInput, " ") {
+					words := strings.Split(a.editor.Value(), " ")
+					if len(words) > 0 {
+						lastWord := words[len(words)-1]
+						lastWord = strings.TrimSpace(lastWord)
+						initialValue = lastWord + "/"
+					}
+				}
+				updated, cmd := a.completions.Update(
+					app.CompletionDialogTriggerdMsg{
+						InitialValue: initialValue,
+					},
+				)
+				a.completions = updated.(dialog.CompletionDialog)
+				cmds = append(cmds, cmd)
+
+				updated, cmd = a.completions.Update(msg)
+				a.completions = updated.(dialog.CompletionDialog)
+				cmds = append(cmds, cmd)
+
+				updated, cmd = a.editor.Update(msg)
+				a.editor = updated.(chat.EditorComponent)
+				cmds = append(cmds, cmd)
+				return a, tea.Sequence(cmds...)
+			}
+		}
+
+		if a.showCompletionDialog {
+			switch msg.String() {
+			case "tab", "enter", "esc":
+				context, contextCmd := a.completions.Update(msg)
+				a.completions = context.(dialog.CompletionDialog)
+				cmds = append(cmds, contextCmd)
+				return a, tea.Batch(cmds...)
+			}
+
+			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...)
+		}
+
+		// 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
+		a.completions.SetProvider(a.completionManager.DefaultProvider())
 	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,
@@ -203,122 +238,79 @@ 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 page.PageChangeMsg:
-		return a, a.moveToPage(msg.ID)
-
-	case state.SessionSelectedMsg:
+		a.layout.SetSize(a.width, a.height)
+	case app.SessionSelectedMsg:
+		var err error
 		a.app.Session = msg
-		a.app.Messages, _ = a.app.ListMessages(context.Background(), msg.Id)
-		return a.updateAllPages(msg)
-
-	case state.ModelSelectedMsg:
+		a.app.Messages, err = a.app.ListMessages(context.Background(), msg.Id)
+		if err != nil {
+			slog.Error("Failed to list messages", "error", err)
+		}
+	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.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.State.Provider = msg.Provider.Id
+		a.app.State.Model = msg.Model.Id
+		a.app.SaveState()
+	case dialog.ThemeSelectedMsg:
+		a.app.State.Theme = msg.ThemeName
+		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)
 	}
@@ -326,16 +318,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.DefaultProvider()
+
+	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 (*app.Configg.Keybinds).Leader != nil {
+		binding := key.NewBinding(key.WithKeys(*app.Configg.Keybinds.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
@@ -44,6 +44,25 @@
        "description": "Get app info"
      }
    },
+    "/config_get": {
+      "post": {
+        "responses": {
+          "200": {
+            "description": "Get config info",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Config.Info"
+                }
+              }
+            }
+          }
+        },
+        "operationId": "postConfig_get",
+        "parameters": [],
+        "description": "Get config info"
+      }
+    },
    "/app_initialize": {
      "post": {
        "responses": {
@@ -478,6 +497,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": {
@@ -499,6 +537,9 @@
          {
            "$ref": "#/components/schemas/Event.message.part.updated"
          },
+          {
+            "$ref": "#/components/schemas/Event.installation.updated"
+          },
          {
            "$ref": "#/components/schemas/Event.session.updated"
          },
@@ -514,6 +555,7 @@
            "permission.updated": "#/components/schemas/Event.permission.updated",
            "message.updated": "#/components/schemas/Event.message.updated",
            "message.part.updated": "#/components/schemas/Event.message.part.updated",
+            "installation.updated": "#/components/schemas/Event.installation.updated",
            "session.updated": "#/components/schemas/Event.session.updated",
            "session.error": "#/components/schemas/Event.session.error"
          }
@@ -1159,6 +1201,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"
+        ]
+      },
      "Event.session.updated": {
        "type": "object",
        "properties": {
@@ -1197,21 +1263,20 @@
          "share": {
            "type": "object",
            "properties": {
-              "secret": {
-                "type": "string"
-              },
              "url": {
                "type": "string"
              }
            },
            "required": [
-              "secret",
              "url"
            ]
          },
          "title": {
            "type": "string"
          },
+          "version": {
+            "type": "string"
+          },
          "time": {
            "type": "object",
            "properties": {
@@ -1231,6 +1296,7 @@
        "required": [
          "id",
          "title",
+          "version",
          "time"
        ]
      },
@@ -1292,13 +1358,17 @@
              },
              "cwd": {
                "type": "string"
+              },
+              "state": {
+                "type": "string"
              }
            },
            "required": [
              "config",
              "data",
              "root",
-              "cwd"
+              "cwd",
+              "state"
            ]
          },
          "time": {
@@ -1317,21 +1387,243 @@
          "time"
        ]
      },
-      "Error": {
+      "Config.Info": {
        "type": "object",
        "properties": {
-          "data": {
+          "$schema": {
+            "type": "string"
+          },
+          "theme": {
+            "type": "string"
+          },
+          "keybinds": {
+            "$ref": "#/components/schemas/Config.Keybinds"
+          },
+          "autoshare": {
+            "type": "boolean",
+            "description": "Share newly created sessions automatically"
+          },
+          "autoupdate": {
+            "type": "boolean",
+            "description": "Automatically update to the latest version"
+          },
+          "disabled_providers": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "Disable providers that are loaded automatically"
+          },
+          "model": {
+            "type": "string",
+            "description": "Model to use in the format of provider/model, eg anthropic/claude-2"
+          },
+          "provider": {
            "type": "object",
-            "additionalProperties": {}
+            "additionalProperties": {
+              "type": "object",
+              "properties": {
+                "api": {
+                  "type": "string"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "env": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "id": {
+                  "type": "string"
+                },
+                "npm": {
+                  "type": "string"
+                },
+                "models": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "object",
+                    "properties": {
+                      "name": {
+                        "type": "string"
+                      },
+                      "attachment": {
+                        "type": "boolean"
+                      },
+                      "reasoning": {
+                        "type": "boolean"
+                      },
+                      "temperature": {
+                        "type": "boolean"
+                      },
+                      "cost": {
+                        "type": "object",
+                        "properties": {
+                          "input": {
+                            "type": "number"
+                          },
+                          "output": {
+                            "type": "number"
+                          },
+                          "cache_read": {
+                            "type": "number"
+                          },
+                          "cache_write": {
+                            "type": "number"
+                          }
+                        },
+                        "required": [
+                          "input",
+                          "output"
+                        ]
+                      },
+                      "limit": {
+                        "type": "object",
+                        "properties": {
+                          "context": {
+                            "type": "number"
+                          },
+                          "output": {
+                            "type": "number"
+                          }
+                        },
+                        "required": [
+                          "context",
+                          "output"
+                        ]
+                      },
+                      "id": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                },
+                "options": {
+                  "type": "object",
+                  "additionalProperties": {}
+                }
+              },
+              "required": [
+                "models"
+              ]
+            }
+          },
+          "mcp": {
+            "type": "object",
+            "additionalProperties": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/Config.McpLocal"
+                },
+                {
+                  "$ref": "#/components/schemas/Config.McpRemote"
+                }
+              ],
+              "discriminator": {
+                "propertyName": "type",
+                "mapping": {
+                  "local": "#/components/schemas/Config.McpLocal",
+                  "remote": "#/components/schemas/Config.McpRemote"
+                }
+              }
+            }
          }
-        },
-        "required": [
-          "data"
-        ]
+        }
+      },
+      "Config.Keybinds": {
+        "type": "object",
+        "properties": {
+          "leader": {
+            "type": "string"
+          },
+          "help": {
+            "type": "string"
+          },
+          "editor_open": {
+            "type": "string"
+          },
+          "session_new": {
+            "type": "string"
+          },
+          "session_list": {
+            "type": "string"
+          },
+          "session_share": {
+            "type": "string"
+          },
+          "session_interrupt": {
+            "type": "string"
+          },
+          "session_compact": {
+            "type": "string"
+          },
+          "tool_details": {
+            "type": "string"
+          },
+          "model_list": {
+            "type": "string"
+          },
+          "theme_list": {
+            "type": "string"
+          },
+          "project_init": {
+            "type": "string"
+          },
+          "input_clear": {
+            "type": "string"
+          },
+          "input_paste": {
+            "type": "string"
+          },
+          "input_submit": {
+            "type": "string"
+          },
+          "input_newline": {
+            "type": "string"
+          },
+          "history_previous": {
+            "type": "string"
+          },
+          "history_next": {
+            "type": "string"
+          },
+          "messages_page_up": {
+            "type": "string"
+          },
+          "messages_page_down": {
+            "type": "string"
+          },
+          "messages_half_page_up": {
+            "type": "string"
+          },
+          "messages_half_page_down": {
+            "type": "string"
+          },
+          "messages_previous": {
+            "type": "string"
+          },
+          "messages_next": {
+            "type": "string"
+          },
+          "messages_first": {
+            "type": "string"
+          },
+          "messages_last": {
+            "type": "string"
+          },
+          "app_exit": {
+            "type": "string"
+          }
+        }
      },
      "Provider.Info": {
        "type": "object",
        "properties": {
+          "api": {
+            "type": "string"
+          },
          "name": {
            "type": "string"
          },
@@ -1344,6 +1636,9 @@
          "id": {
            "type": "string"
          },
+          "npm": {
+            "type": "string"
+          },
          "models": {
            "type": "object",
            "additionalProperties": {
@@ -1382,18 +1677,16 @@
              "output": {
                "type": "number"
              },
-              "inputCached": {
+              "cache_read": {
                "type": "number"
              },
-              "outputCached": {
+              "cache_write": {
                "type": "number"
              }
            },
            "required": [
              "input",
-              "output",
-              "inputCached",
-              "outputCached"
+              "output"
            ]
          },
          "limit": {
@@ -1424,6 +1717,74 @@
          "limit",
          "id"
        ]
+      },
+      "Config.McpLocal": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "const": "local"
+          },
+          "command": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "environment": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "type",
+          "command"
+        ]
+      },
+      "Config.McpRemote": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "const": "remote"
+          },
+          "url": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "url"
+        ]
+      },
+      "Error": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "object",
+            "additionalProperties": {}
+          }
+        },
+        "required": [
+          "data"
+        ]
+      },
+      "InstallationInfo": {
+        "type": "object",
+        "properties": {
+          "version": {
+            "type": "string"
+          },
+          "latest": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "version",
+          "latest"
+        ]
      }
    }
  }
@@ -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"`
@@ -38,6 +39,100 @@ type AppInfo struct {
 	User string `json:"user"`
 }

+// ConfigInfo defines model for Config.Info.
+type ConfigInfo struct {
+	Schema *string `json:"$schema,omitempty"`
+
+	// Autoshare Share newly created sessions automatically
+	Autoshare *bool `json:"autoshare,omitempty"`
+
+	// Autoupdate Automatically update to the latest version
+	Autoupdate *bool `json:"autoupdate,omitempty"`
+
+	// DisabledProviders Disable providers that are loaded automatically
+	DisabledProviders *[]string                                       `json:"disabled_providers,omitempty"`
+	Keybinds          *ConfigKeybinds                                 `json:"keybinds,omitempty"`
+	Mcp               *map[string]ConfigInfo_Mcp_AdditionalProperties `json:"mcp,omitempty"`
+
+	// Model Model to use in the format of provider/model, eg anthropic/claude-2
+	Model    *string `json:"model,omitempty"`
+	Provider *map[string]struct {
+		Api    *string   `json:"api,omitempty"`
+		Env    *[]string `json:"env,omitempty"`
+		Id     *string   `json:"id,omitempty"`
+		Models map[string]struct {
+			Attachment *bool `json:"attachment,omitempty"`
+			Cost       *struct {
+				CacheRead  *float32 `json:"cache_read,omitempty"`
+				CacheWrite *float32 `json:"cache_write,omitempty"`
+				Input      float32  `json:"input"`
+				Output     float32  `json:"output"`
+			} `json:"cost,omitempty"`
+			Id    *string `json:"id,omitempty"`
+			Limit *struct {
+				Context float32 `json:"context"`
+				Output  float32 `json:"output"`
+			} `json:"limit,omitempty"`
+			Name        *string `json:"name,omitempty"`
+			Reasoning   *bool   `json:"reasoning,omitempty"`
+			Temperature *bool   `json:"temperature,omitempty"`
+		} `json:"models"`
+		Name    *string                 `json:"name,omitempty"`
+		Npm     *string                 `json:"npm,omitempty"`
+		Options *map[string]interface{} `json:"options,omitempty"`
+	} `json:"provider,omitempty"`
+	Theme *string `json:"theme,omitempty"`
+}
+
+// ConfigInfo_Mcp_AdditionalProperties defines model for Config.Info.mcp.AdditionalProperties.
+type ConfigInfo_Mcp_AdditionalProperties struct {
+	union json.RawMessage
+}
+
+// ConfigKeybinds defines model for Config.Keybinds.
+type ConfigKeybinds struct {
+	AppExit              *string `json:"app_exit,omitempty"`
+	EditorOpen           *string `json:"editor_open,omitempty"`
+	Help                 *string `json:"help,omitempty"`
+	HistoryNext          *string `json:"history_next,omitempty"`
+	HistoryPrevious      *string `json:"history_previous,omitempty"`
+	InputClear           *string `json:"input_clear,omitempty"`
+	InputNewline         *string `json:"input_newline,omitempty"`
+	InputPaste           *string `json:"input_paste,omitempty"`
+	InputSubmit          *string `json:"input_submit,omitempty"`
+	Leader               *string `json:"leader,omitempty"`
+	MessagesFirst        *string `json:"messages_first,omitempty"`
+	MessagesHalfPageDown *string `json:"messages_half_page_down,omitempty"`
+	MessagesHalfPageUp   *string `json:"messages_half_page_up,omitempty"`
+	MessagesLast         *string `json:"messages_last,omitempty"`
+	MessagesNext         *string `json:"messages_next,omitempty"`
+	MessagesPageDown     *string `json:"messages_page_down,omitempty"`
+	MessagesPageUp       *string `json:"messages_page_up,omitempty"`
+	MessagesPrevious     *string `json:"messages_previous,omitempty"`
+	ModelList            *string `json:"model_list,omitempty"`
+	ProjectInit          *string `json:"project_init,omitempty"`
+	SessionCompact       *string `json:"session_compact,omitempty"`
+	SessionInterrupt     *string `json:"session_interrupt,omitempty"`
+	SessionList          *string `json:"session_list,omitempty"`
+	SessionNew           *string `json:"session_new,omitempty"`
+	SessionShare         *string `json:"session_share,omitempty"`
+	ThemeList            *string `json:"theme_list,omitempty"`
+	ToolDetails          *string `json:"tool_details,omitempty"`
+}
+
+// ConfigMcpLocal defines model for Config.McpLocal.
+type ConfigMcpLocal struct {
+	Command     []string           `json:"command"`
+	Environment *map[string]string `json:"environment,omitempty"`
+	Type        string             `json:"type"`
+}
+
+// ConfigMcpRemote defines model for Config.McpRemote.
+type ConfigMcpRemote struct {
+	Type string `json:"type"`
+	Url  string `json:"url"`
+}
+
 // Error defines model for Error.
 type Error struct {
 	Data map[string]interface{} `json:"data"`
@@ -48,6 +143,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 +214,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"`
@@ -248,10 +357,10 @@ type MessageToolInvocationToolResult struct {
 type ModelInfo struct {
 	Attachment bool `json:"attachment"`
 	Cost       struct {
-		Input        float32 `json:"input"`
-		InputCached  float32 `json:"inputCached"`
-		Output       float32 `json:"output"`
-		OutputCached float32 `json:"outputCached"`
+		CacheRead  *float32 `json:"cache_read,omitempty"`
+		CacheWrite *float32 `json:"cache_write,omitempty"`
+		Input      float32  `json:"input"`
+		Output     float32  `json:"output"`
 	} `json:"cost"`
 	Id    string `json:"id"`
 	Limit struct {
@@ -265,10 +374,12 @@ type ModelInfo struct {

 // ProviderInfo defines model for Provider.Info.
 type ProviderInfo struct {
+	Api    *string              `json:"api,omitempty"`
 	Env    []string             `json:"env"`
 	Id     string               `json:"id"`
 	Models map[string]ModelInfo `json:"models"`
 	Name   string               `json:"name"`
+	Npm    *string              `json:"npm,omitempty"`
 }

 // ProviderAuthError defines model for ProviderAuthError.
@@ -304,14 +415,14 @@ type SessionInfo struct {
 	Id       string  `json:"id"`
 	ParentID *string `json:"parentID,omitempty"`
 	Share    *struct {
-		Secret string `json:"secret"`
-		Url    string `json:"url"`
+		Url string `json:"url"`
 	} `json:"share,omitempty"`
 	Time struct {
 		Created float32 `json:"created"`
 		Updated float32 `json:"updated"`
 	} `json:"time"`
-	Title string `json:"title"`
+	Title   string `json:"title"`
+	Version string `json:"version"`
 }

 // PostFileSearchJSONBody defines parameters for PostFileSearch.
@@ -456,6 +567,95 @@ func (a MessageInfo_Metadata_Tool_AdditionalProperties) MarshalJSON() ([]byte, e
 	return json.Marshal(object)
 }

+// AsConfigMcpLocal returns the union data inside the ConfigInfo_Mcp_AdditionalProperties as a ConfigMcpLocal
+func (t ConfigInfo_Mcp_AdditionalProperties) AsConfigMcpLocal() (ConfigMcpLocal, error) {
+	var body ConfigMcpLocal
+	err := json.Unmarshal(t.union, &body)
+	return body, err
+}
+
+// FromConfigMcpLocal overwrites any union data inside the ConfigInfo_Mcp_AdditionalProperties as the provided ConfigMcpLocal
+func (t *ConfigInfo_Mcp_AdditionalProperties) FromConfigMcpLocal(v ConfigMcpLocal) error {
+	v.Type = "local"
+	b, err := json.Marshal(v)
+	t.union = b
+	return err
+}
+
+// MergeConfigMcpLocal performs a merge with any union data inside the ConfigInfo_Mcp_AdditionalProperties, using the provided ConfigMcpLocal
+func (t *ConfigInfo_Mcp_AdditionalProperties) MergeConfigMcpLocal(v ConfigMcpLocal) error {
+	v.Type = "local"
+	b, err := json.Marshal(v)
+	if err != nil {
+		return err
+	}
+
+	merged, err := runtime.JSONMerge(t.union, b)
+	t.union = merged
+	return err
+}
+
+// AsConfigMcpRemote returns the union data inside the ConfigInfo_Mcp_AdditionalProperties as a ConfigMcpRemote
+func (t ConfigInfo_Mcp_AdditionalProperties) AsConfigMcpRemote() (ConfigMcpRemote, error) {
+	var body ConfigMcpRemote
+	err := json.Unmarshal(t.union, &body)
+	return body, err
+}
+
+// FromConfigMcpRemote overwrites any union data inside the ConfigInfo_Mcp_AdditionalProperties as the provided ConfigMcpRemote
+func (t *ConfigInfo_Mcp_AdditionalProperties) FromConfigMcpRemote(v ConfigMcpRemote) error {
+	v.Type = "remote"
+	b, err := json.Marshal(v)
+	t.union = b
+	return err
+}
+
+// MergeConfigMcpRemote performs a merge with any union data inside the ConfigInfo_Mcp_AdditionalProperties, using the provided ConfigMcpRemote
+func (t *ConfigInfo_Mcp_AdditionalProperties) MergeConfigMcpRemote(v ConfigMcpRemote) error {
+	v.Type = "remote"
+	b, err := json.Marshal(v)
+	if err != nil {
+		return err
+	}
+
+	merged, err := runtime.JSONMerge(t.union, b)
+	t.union = merged
+	return err
+}
+
+func (t ConfigInfo_Mcp_AdditionalProperties) Discriminator() (string, error) {
+	var discriminator struct {
+		Discriminator string `json:"type"`
+	}
+	err := json.Unmarshal(t.union, &discriminator)
+	return discriminator.Discriminator, err
+}
+
+func (t ConfigInfo_Mcp_AdditionalProperties) ValueByDiscriminator() (interface{}, error) {
+	discriminator, err := t.Discriminator()
+	if err != nil {
+		return nil, err
+	}
+	switch discriminator {
+	case "local":
+		return t.AsConfigMcpLocal()
+	case "remote":
+		return t.AsConfigMcpRemote()
+	default:
+		return nil, errors.New("unknown discriminator value: " + discriminator)
+	}
+}
+
+func (t ConfigInfo_Mcp_AdditionalProperties) MarshalJSON() ([]byte, error) {
+	b, err := t.union.MarshalJSON()
+	return b, err
+}
+
+func (t *ConfigInfo_Mcp_AdditionalProperties) UnmarshalJSON(b []byte) error {
+	err := t.union.UnmarshalJSON(b)
+	return err
+}
+
 // AsEventStorageWrite returns the union data inside the Event as a EventStorageWrite
 func (t Event) AsEventStorageWrite() (EventStorageWrite, error) {
 	var body EventStorageWrite
@@ -596,6 +796,34 @@ func (t *Event) MergeEventMessagePartUpdated(v EventMessagePartUpdated) 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
+}
+
 // AsEventSessionUpdated returns the union data inside the Event as a EventSessionUpdated
 func (t Event) AsEventSessionUpdated() (EventSessionUpdated, error) {
 	var body EventSessionUpdated
@@ -666,6 +894,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":
@@ -1280,6 +1510,9 @@ type ClientInterface interface {
 	// PostAppInitialize request
 	PostAppInitialize(ctx context.Context, reqEditors ...RequestEditorFn) (*http.Response, error)

+	// PostConfigGet request
+	PostConfigGet(ctx context.Context, reqEditors ...RequestEditorFn) (*http.Response, error)
+
 	// GetEvent request
 	GetEvent(ctx context.Context, reqEditors ...RequestEditorFn) (*http.Response, error)

@@ -1288,6 +1521,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)

@@ -1355,6 +1591,18 @@ func (c *Client) PostAppInitialize(ctx context.Context, reqEditors ...RequestEdi
 	return c.Client.Do(req)
 }

+func (c *Client) PostConfigGet(ctx context.Context, reqEditors ...RequestEditorFn) (*http.Response, error) {
+	req, err := NewPostConfigGetRequest(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) GetEvent(ctx context.Context, reqEditors ...RequestEditorFn) (*http.Response, error) {
 	req, err := NewGetEventRequest(c.Server)
 	if err != nil {
@@ -1391,6 +1639,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 {
@@ -1637,6 +1897,33 @@ func NewPostAppInitializeRequest(server string) (*http.Request, error) {
 	return req, nil
 }

+// NewPostConfigGetRequest generates requests for PostConfigGet
+func NewPostConfigGetRequest(server string) (*http.Request, error) {
+	var err error
+
+	serverURL, err := url.Parse(server)
+	if err != nil {
+		return nil, err
+	}
+
+	operationPath := fmt.Sprintf("/config_get")
+	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
+}
+
 // NewGetEventRequest generates requests for GetEvent
 func NewGetEventRequest(server string) (*http.Request, error) {
 	var err error
@@ -1704,6 +1991,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
@@ -2101,6 +2415,9 @@ type ClientWithResponsesInterface interface {
 	// PostAppInitializeWithResponse request
 	PostAppInitializeWithResponse(ctx context.Context, reqEditors ...RequestEditorFn) (*PostAppInitializeResponse, error)

+	// PostConfigGetWithResponse request
+	PostConfigGetWithResponse(ctx context.Context, reqEditors ...RequestEditorFn) (*PostConfigGetResponse, error)
+
 	// GetEventWithResponse request
 	GetEventWithResponse(ctx context.Context, reqEditors ...RequestEditorFn) (*GetEventResponse, error)

@@ -2109,6 +2426,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)

@@ -2196,6 +2516,28 @@ func (r PostAppInitializeResponse) StatusCode() int {
 	return 0
 }

+type PostConfigGetResponse struct {
+	Body         []byte
+	HTTPResponse *http.Response
+	JSON200      *ConfigInfo
+}
+
+// Status returns HTTPResponse.Status
+func (r PostConfigGetResponse) Status() string {
+	if r.HTTPResponse != nil {
+		return r.HTTPResponse.Status
+	}
+	return http.StatusText(0)
+}
+
+// StatusCode returns HTTPResponse.StatusCode
+func (r PostConfigGetResponse) StatusCode() int {
+	if r.HTTPResponse != nil {
+		return r.HTTPResponse.StatusCode
+	}
+	return 0
+}
+
 type GetEventResponse struct {
 	Body         []byte
 	HTTPResponse *http.Response
@@ -2240,6 +2582,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
@@ -2487,6 +2851,15 @@ func (c *ClientWithResponses) PostAppInitializeWithResponse(ctx context.Context,
 	return ParsePostAppInitializeResponse(rsp)
 }

+// PostConfigGetWithResponse request returning *PostConfigGetResponse
+func (c *ClientWithResponses) PostConfigGetWithResponse(ctx context.Context, reqEditors ...RequestEditorFn) (*PostConfigGetResponse, error) {
+	rsp, err := c.PostConfigGet(ctx, reqEditors...)
+	if err != nil {
+		return nil, err
+	}
+	return ParsePostConfigGetResponse(rsp)
+}
+
 // GetEventWithResponse request returning *GetEventResponse
 func (c *ClientWithResponses) GetEventWithResponse(ctx context.Context, reqEditors ...RequestEditorFn) (*GetEventResponse, error) {
 	rsp, err := c.GetEvent(ctx, reqEditors...)
@@ -2513,6 +2886,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...)
@@ -2703,6 +3085,32 @@ func ParsePostAppInitializeResponse(rsp *http.Response) (*PostAppInitializeRespo
 	return response, nil
 }

+// ParsePostConfigGetResponse parses an HTTP response from a PostConfigGetWithResponse call
+func ParsePostConfigGetResponse(rsp *http.Response) (*PostConfigGetResponse, error) {
+	bodyBytes, err := io.ReadAll(rsp.Body)
+	defer func() { _ = rsp.Body.Close() }()
+	if err != nil {
+		return nil, err
+	}
+
+	response := &PostConfigGetResponse{
+		Body:         bodyBytes,
+		HTTPResponse: rsp,
+	}
+
+	switch {
+	case strings.Contains(rsp.Header.Get("Content-Type"), "json") && rsp.StatusCode == 200:
+		var dest ConfigInfo
+		if err := json.Unmarshal(bodyBytes, &dest); err != nil {
+			return nil, err
+		}
+		response.JSON200 = &dest
+
+	}
+
+	return response, nil
+}
+
 // ParseGetEventResponse parses an HTTP response from a GetEventWithResponse call
 func ParseGetEventResponse(rsp *http.Response) (*GetEventResponse, error) {
 	bodyBytes, err := io.ReadAll(rsp.Body)
@@ -2755,6 +3163,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)
@@ -27,9 +27,10 @@
    "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": {
+    "opencode": "workspace:*",
    "@types/node": "catalog:",
    "typescript": "catalog:"
  }
@@ -1,3 +1,5 @@
-<svg width="33" height="42" viewBox="0 0 33 42" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0.5 0H32.5V41.5955H0.5V0ZM24.5 8.5H8.5V33H24.5V8.5Z" fill="black"/>
+<svg width="600" height="600" viewBox="0 0 600 600" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="600" height="600" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M115 180H300V420H115V180ZM253.75 229.044H161.25V370.405H253.75V229.044Z" fill="white"/>
+<path d="M346.25 180H485V229.044H392.5V370.405H485V419.449H346.25V180Z" fill="white"/>
 </svg>
@@ -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",
@@ -10,7 +10,7 @@ const path = Astro.url.pathname;
 const links = config.social || [];
 ---

-{ path.startsWith("/share")
+{ path.startsWith("/s")
  ? <div class="header sl-flex">
      <div class="title-wrapper sl-flex">
        <SiteTitle {...Astro.props} />
@@ -54,9 +54,3 @@ const links = config.social || [];
 		}
 	}
 </style>
-<style is:global>
-body > div.page > header {
-	border-color: var(--sl-color-divider);
-}
-</style>
-
@@ -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;
  }
 }

@@ -35,3 +35,12 @@ export function IconGemini(props: JSX.SvgSVGAttributes<SVGSVGElement>) {
    </svg>
  )
 }
+
+export function IconOpencode(props: JSX.SvgSVGAttributes<SVGSVGElement>) {
+  return (
+    <svg {...props} viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path fill-rule="evenodd" clip-rule="evenodd" d="M0 13H35V58H0V13ZM26.25 22.1957H8.75V48.701H26.25V22.1957Z" fill="currentColor" />
+      <path d="M43.75 13H70V22.1957H52.5V48.701H70V57.8967H43.75V13Z" fill="currentColor" />
+    </svg>
+  )
+}
@@ -12,6 +12,10 @@
    margin-bottom: 1rem;
  }

+  strong {
+    font-weight: 600;
+  }
+
  ol {
    list-style-position: inside;
    padding-left: 0.75rem;
@@ -1,9 +1,18 @@
 .root {
-  padding-top: 0.5rem;
  display: flex;
  flex-direction: column;
  gap: 2.5rem;
  line-height: 1;
+  padding: 1.5rem;
+
+  @media (max-width: 30rem) {
+    padding: 1rem;
+    gap: 2rem;
+  }
+
+  --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,93 +46,42 @@

 [data-element-label] {
  text-transform: uppercase;
-  letter-spacing: 0.05em;
+  letter-spacing: -0.5px;
  color: var(--sl-color-text-dimmed);
 }

 .header {
  display: flex;
  flex-direction: column;
-  gap: 0.75rem;
+  gap: 1rem;

  @media (max-width: 30rem) {
    gap: 1rem;
  }

  [data-section="title"] {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 3rem;
+    h1 {
+      font-size: 2.75rem;
+      font-weight: 500;
+      line-height: 1.15;
+      letter-spacing: -0.05em;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 3;
+      overflow: hidden;

-    & > div {
-      flex: 0 0 auto;
-      display: flex;
-      flex-direction: column;
-      gap: 0.5rem;
-      align-items: flex-end;
-
-      [data-section="date"] {
-        span {
-          font-size: 0.875rem;
-          color: var(--sl-color-text-secondary);
-
-          &[data-placeholder] {
-            color: var(--sl-color-text-dimmed);
-          }
-        }
+      @media (max-width: 30rem) {
+        font-size: 1.75rem;
+        line-height: 1.25;
+        -webkit-line-clamp: 3;
      }
-
-      p[data-section="status"] {
-        flex: 0 0 auto;
-        display: flex;
-        gap: 0.375rem;
-        font-size: 0.75rem;
-
-        span:first-child {
-          color: var(--sl-color-divider);
-
-          &[data-status="connected"] {
-            color: var(--sl-color-green);
-          }
-          &[data-status="connecting"] {
-            color: var(--sl-color-orange);
-          }
-          &[data-status="disconnected"] {
-            color: var(--sl-color-divider);
-          }
-          &[data-status="reconnecting"] {
-            color: var(--sl-color-orange);
-          }
-          &[data-status="error"] {
-            color: var(--sl-color-red);
-          }
-        }
-      }
-
    }
  }

  [data-section="row"] {
    display: flex;
    flex-direction: column;
-    gap: 0.375rem;
-  }
-
-  h1 {
-    font-size: 1.75rem;
-    font-weight: 500;
-    line-height: 1.25;
-    letter-spacing: -0.05em;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-
-    @media (max-width: 30rem) {
-      font-size: 1.25rem;
-      -webkit-line-clamp: 3;
-    }
+    gap: 0.5rem;
  }

  [data-section="stats"] {
@@ -146,11 +104,12 @@
    }
  }

+  [data-section="stats"][data-section-root],
  [data-section="stats"][data-section-models] {
    li {
      gap: 0.3125rem;

-      [data-stat-model-icon] {
+      [data-stat-icon] {
        flex: 0 0 auto;
        color: var(--sl-color-text-dimmed);
        opacity: 0.85;
@@ -164,27 +123,10 @@
      }
    }
  }
-  [data-section="system-prompt"] {
-    display: flex;
-    gap: 0.3125rem;

-    [data-section="icon"] {
-      flex: 0 0 auto;
+  [data-section="time"] {
+    span {
      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;
    }
  }
@@ -207,14 +149,80 @@
      align-items: center;
      justify-content: flex-start;

-      a:first-child {
-        display: block;
-        flex: 0 0 auto;
-        width: 18px;
-        opacity: 0.65;
-        svg {
-          color: var(--sl-color-text-secondary);
+      [data-element-anchor] {
+        position: relative;
+
+        a:first-child {
          display: block;
+          flex: 0 0 auto;
+          width: 18px;
+          opacity: 0.65;
+
+          svg {
+            color: var(--sl-color-text-secondary);
+            display: block;
+
+            &:nth-child(3) {
+              color: var(--sl-color-green-high);
+            }
+          }
+
+          svg:nth-child(2),
+          svg:nth-child(3) {
+            display: none;
+          }
+          &:hover {
+            svg:nth-child(1) {
+              display: none;
+            }
+            svg:nth-child(2) {
+              display: block;
+            }
+          }
+        }
+
+        [data-element-tooltip] {
+          position: absolute;
+          top: 50%;
+          left: calc(100% + 12px);
+          transform: translate(0, -50%);
+          line-height: 1.1;
+          padding: 0.375em 0.5em calc(0.375em + 2px);
+          background: var(--sl-color-white);
+          color: var(--sl-color-text-invert);
+          font-size: 0.6875rem;
+          border-radius: 7px;
+          white-space: nowrap;
+
+          opacity: 0;
+          visibility: hidden;
+
+          &::after {
+            content: "";
+            position: absolute;
+            top: 50%;
+            left: -15px;
+            transform: translateY(-50%);
+            border: 8px solid transparent;
+            border-right-color: var(--sl-color-white);
+          }
+        }
+
+        &[data-status="copied"] {
+          [data-element-tooltip] {
+            opacity: 1;
+            visibility: visible;
+          }
+          a,
+          a:hover {
+            svg:nth-child(1),
+            svg:nth-child(2) {
+              display: none;
+            }
+            svg:nth-child(3) {
+              display: block;
+            }
+          }
        }
      }

@@ -227,6 +235,7 @@
    }

    & > [data-section="content"] {
+      flex: 1 1 auto;
      min-width: 0;
      padding: 0 0 0.375rem;
      display: flex;
@@ -236,20 +245,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 +284,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 +296,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 +317,11 @@
          font-size: 0.75rem;
        }
      }
+
+      [data-part-tool-edit] {
+        width: 100%;
+        max-width: var(--lg-tool-width);
+      }
    }
  }

@@ -325,16 +345,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 +352,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 +359,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,7 +374,43 @@
      }
    }
  }
-  [data-part-type="tool-edit"] {
+  [data-part-type="connection-status"] {
+    & > [data-section="decoration"] {
+      span:first-child {
+        flex: 0 0 auto;
+        display: block;
+        margin: 2px;
+        width: 14px;
+        height: 14px;
+        border-radius: 50%;
+        background-color: var(--sl-color-divider);
+
+        &[data-status="connected"] {
+          background-color: var(--sl-color-green);
+        }
+        &[data-status="connecting"] {
+          background-color: var(--sl-color-orange);
+        }
+        &[data-status="disconnected"] {
+          background-color: var(--sl-color-divider);
+        }
+        &[data-status="reconnecting"] {
+          background-color: var(--sl-color-orange);
+        }
+        &[data-status="error"] {
+          background-color: var(--sl-color-red);
+        }
+      }
+    }
+
+    & > [data-section="content"] {
+      span {
+        display: block;
+        line-height: 18px;
+        font-size: 0.875rem;
+        color: var(--sl-color-text-dimmed);
+      }
+    }
  }
 }

@@ -384,6 +422,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 +451,7 @@
    font-size: 0.75rem;
  }

-  &[data-highlight="true"] {
+  &[data-invert="true"] {
    background-color: var(--sl-color-blue-high);

    pre {
@@ -428,6 +468,10 @@
    }
  }

+  &[data-highlight="true"] {
+    background-color: var(--sl-color-blue-low);
+  }
+
  &[data-expanded="true"] {
    pre {
      display: block;
@@ -443,16 +487,85 @@
  }
 }

+.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"] {
+    pre {
+      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;
  align-items: flex-start;
  gap: 0.5rem;
+  width: 100%;
+  max-width: var(--sm-tool-width);

  & > [data-section="body"] {
+    width: 100%;
    border: 1px solid var(--sl-color-divider);
    border-radius: 0.25rem;
-    max-width: 100%;

    [data-section="header"] {
      position: relative;
@@ -460,7 +573,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 +604,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 +644,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 +653,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 +683,8 @@
  list-style-type: none;
  padding: 0;
  margin: 0;
+  width: 100%;
+  max-width: var(--sm-tool-width);
  border: 1px solid var(--sl-color-divider);
  border-radius: 0.25rem;

@@ -577,6 +696,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 +734,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 +744,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%);
@@ -13,7 +13,7 @@ const data = await res.json();

 let cost = 0;
 const models: Set<string> = new Set();
-const version = "v0.1.1";
+const version = `v${data.info.version}`;
 Object.values(data.messages).forEach((d) => {
  const assistant = d.metadata?.assistant;
  if (assistant) {
@@ -74,7 +74,11 @@ const ogImage = `https://social-cards.sst.dev/opencode-share/${encodedTitle}.png
 body > .page > .main-frame .main-pane > main > .content-panel:first-of-type {
  display: none;
 }
+body > .page > .main-frame .main-pane > main {
+  padding: 0;
+}
 body > .page > .main-frame .main-pane > main > .content-panel + .content-panel {
  border-top: none !important;
+  padding: 0;
 }
 </style>
@@ -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,
Author	SHA1	Message	Date
Dax Raad	1252b65166	stop loading models.dev format from global config	2025-06-18 23:08:51 -04:00
Dax Raad	6840276dad	docs: update README	2025-06-18 23:03:54 -04:00
Dax Raad	bd8c3cd0f1	BREAKING CONFIG CHANGE We have changed the config format yet again - but this should be the final time. You can see the readme for more details but the summary is - got rid of global providers config - got rid of global toml - global config is now in `~/.config/opencode/config.json` - it will be merged with any project level config	2025-06-18 23:01:19 -04:00
Dax Raad	e5e9b3e3c0	rework config	2025-06-18 23:01:19 -04:00
Frank	1e8a681de9	Render version	2025-06-18 22:26:51 -04:00
Jay V	a834bedc17	ignore: share copy link	2025-06-18 20:18:10 -04:00
Dax Raad	6a3392385e	support global config	2025-06-18 18:56:52 -04:00
Jay V	6a00e063c4	ignore: share logo	2025-06-18 18:33:51 -04:00
Jay V	73a0ce2b7d	ignore: share	2025-06-18 18:22:19 -04:00
Jay V	4d1afd01fa	ignore: share	2025-06-18 18:21:44 -04:00
Jay V	801d5f47bd	ignore: share favicon	2025-06-18 18:10:22 -04:00
Jay V	b6caae9708	ignore: share	2025-06-18 18:01:34 -04:00
adamdottv	183ca64ef9	feat(tui): show provider next to model	2025-06-18 16:09:49 -05:00
adamdottv	8c32cfe829	chore: tui style tweaks	2025-06-18 15:59:58 -05:00
Jay V	73dcc88da1	ignore: share	2025-06-18 16:54:33 -04:00
Jay V	14bded65dc	ignore: share	2025-06-18 16:54:33 -04:00
adamdottv	87d1d3fb62	fix(tui): file completion quirks	2025-06-18 15:51:26 -05:00
Frank	e054454109	Api: only return session messages	2025-06-18 16:20:34 -04:00
Dax Raad	a6142cf975	ignore: types	2025-06-18 16:20:03 -04:00
Jay V	69332e5fa3	ignore: share	2025-06-18 16:15:22 -04:00
Jay V	20201ba3c4	ignore: share	2025-06-18 16:15:11 -04:00
Dax Raad	658067186a	ignore: share page stuff	2025-06-18 16:13:33 -04:00
adamdottv	ac777b77cf	fix(tui): modal visuals	2025-06-18 15:12:24 -05:00
Dax Raad	5944ae2023	share types	2025-06-18 15:34:13 -04:00
Jay V	2f10961ba8	ignore: share	2025-06-18 15:32:40 -04:00
adamdottv	fae97978a3	chore: cleanup logs	2025-06-18 14:18:46 -05:00
Dax Raad	3423415e49	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>	2025-06-18 15:10:46 -04:00
adamdottv	1d0bfc2b2a	fix(tui): help dialog sorting	2025-06-18 14:06:20 -05:00
adamdottv	bd46cf0f86	feat(tui): configurable keybinds and mouse scroll	2025-06-18 13:56:51 -05:00
Dax Raad	d4157d9a96	ctrl+c should gracefully clean up pending sessions	2025-06-18 14:11:49 -04:00
Jay V	6e4ef585d8	ignore: share error styles	2025-06-18 14:10:14 -04:00
Dax Raad	e05c3b7a76	fix panic when invalid config	2025-06-18 14:03:16 -04:00
Dax Raad	f99904bc1c	track version on session info	2025-06-18 13:40:36 -04:00
Jay V	b796d6763f	ignore: share page styles	2025-06-18 12:53:48 -04:00
Dax Raad	c1250abdf8	implemented diff trimming	2025-06-18 11:20:40 -04:00
Dax Raad	ebe51534a1	allow setting options in global provider store	2025-06-18 11:06:16 -04:00
Dax Raad	b8bbee4718	fix issue with provider cache	2025-06-18 10:56:23 -04:00
Dax Raad	8f852b396f	fix deploys	2025-06-18 10:47:07 -04:00
Dax Raad	ae4d089c06	remove call to npm causing noticible delay when starting chat	2025-06-18 10:35:41 -04:00
Dax Raad	5110fbdaf9	fix issue when running opencode in empty directory	2025-06-18 10:29:09 -04:00
Dax Raad	e6ddb474fc	ignore: sync	2025-06-18 08:36:25 -04:00
SBSTN	0dc71774ce	Add Everforest Theme (#170 )	2025-06-18 05:55:38 -05:00
Dax Raad	b470466e30	integrate cache read/write data	2025-06-17 20:51:39 -04:00
Jay V	d1f9311931	ignore: share page polish	2025-06-17 20:26:12 -04:00
Dax Raad	1c58023df9	improve anthropic oauth token caching and authentication handling 🤖 Generated with [opencode](https://opencode.ai) Co-Authored-By: opencode <noreply@opencode.ai>	2025-06-17 13:23:15 -04:00
Dax Raad	4e0aa58b7e	ignore: fix	2025-06-17 13:04:26 -04:00
Dax Raad	23ee34b35f	state	2025-06-17 12:29:28 -04:00
Dax Raad	674c9a5220	support disabling providers from automatically being added	2025-06-17 12:23:04 -04:00
Dax Raad	54c86ed43a	docs: readme	2025-06-17 12:17:45 -04:00
Dax Raad	676d75ee75	docs: update README	2025-06-17 12:14:38 -04:00
Dax Raad	70dc0a12f2	docs: readme	2025-06-17 12:12:33 -04:00
Dax Raad	d579c5e8aa	support global config for providers	2025-06-17 12:10:44 -04:00
Dax Raad	ee91f31313	fix issue with tool schemas and google	2025-06-17 11:27:07 -04:00
Dax Raad	57b3051024	fix agent getting caught in summary loop	2025-06-17 10:50:03 -04:00
Dax Raad	ae5cf3cc23	ci: fix	2025-06-17 10:38:01 -04:00
Dax Raad	68e1b3c46c	Fix TypeScript compilation errors and consolidate version handling 🤖 Generated with [opencode](https://opencode.ai) Co-Authored-By: opencode <noreply@opencode.ai>	2025-06-17 10:27:49 -04:00
adamdottv	2d68814abc	feat: better collapsed tool call visuals	2025-06-17 08:35:18 -05:00
adamdottv	a5da5127fa	chore: consolidate chat page into tui.go	2025-06-17 07:09:04 -05:00
Dax Raad	b5a4439704	Add autoshare configuration and improve run command UI Enables automatic session sharing via global config or flag, enhances UI with logo display and provider/model info positioning. 🤖 Generated with [opencode](https://opencode.ai) Co-Authored-By: opencode <noreply@opencode.ai>	2025-06-17 01:45:32 -04:00
Dax Raad	9c5616521d	do not autoupgrade snapshot builds	2025-06-17 01:18:32 -04:00
Dax Raad	3fe163416d	autoupgrade	2025-06-17 01:05:05 -04:00
Dax	d054f88130	Improve upgrade command with installation method detection (#158 )	2025-06-17 00:07:17 -04:00
Jay	b929b4f4b9	docs: Update README.md	2025-06-16 21:01:38 -04:00
Jay V	4c0c83b02d	docs: readme	2025-06-16 20:10:19 -04:00
adamdottv	d6d45bdc63	feat: share and init commands	2025-06-16 15:58:52 -05:00
Dax Raad	13a83721b0	ci: fixed ci issue	2025-06-16 16:58:25 -04:00
Dax Raad	f0edffbae9	docs: readme	2025-06-16 16:53:43 -04:00
Dax Raad	8131bee49a	ignore: logs	2025-06-16 16:02:45 -04:00
Dax Raad	b5f44ae13f	docs: update readme	2025-06-16 15:42:35 -04:00
Miles Till	0d23f2a7fd	fix: incorrect lipgloss version (#131 )	2025-06-16 14:35:46 -05:00
Dax Raad	ac096d84ad	remove windows builds	2025-06-16 15:11:14 -04:00
Dax Raad	fcaf0e6dbf	opencode auth login: validation on provider id and better error messages	2025-06-16 15:09:49 -04:00
Dax Raad	19e259d90d	docs: readme	2025-06-16 15:04:32 -04:00
Dax Raad	2c9fd1e776	BREAKING CHANGE: the config structure has changed, custom providers have an `npm` field now to specify which npm package to load. see examples in README.md	2025-06-16 15:02:25 -04:00