fix(#243): claude on aws bedrock (#241)

Co-authored-by: Dax Raad <d@ironbay.co>

.github/workflows/build.yml

@@ -1,37 +0,0 @@
-name: build
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - dev
-
-concurrency: ${{ github.workflow }}-${{ github.ref }}
-
-permissions:
-  contents: write
-  packages: write
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - run: git fetch --force --tags
-
-      - uses: actions/setup-go@v5
-        with:
-          go-version: ">=1.23.2"
-          cache: true
-          cache-dependency-path: go.sum
-
-      - run: go mod download
-
-      - uses: goreleaser/goreleaser-action@v6
-        with:
-          distribution: goreleaser
-          version: latest
-          args: build --snapshot --clean

.github/workflows/deploy.yml

@@ -3,7 +3,8 @@ name: deploy
 on:
   push:
     branches:
-      - dontlook
+      - dev
+      - production
   workflow_dispatch:
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
@@ -20,6 +21,6 @@ jobs:
 
       - run: bun install
 
-      - run: bun sst deploy --stage=dev
+      - run: bun sst deploy --stage=${{ github.ref_name }}
         env:
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}

.github/workflows/publish.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - dontlook
+      - dev
     tags:
       - "*"
 

.gitignore

@@ -3,3 +3,5 @@ node_modules
 .opencode
 .sst
 .env
+.idea
+.vscode

README.md

@@ -1,658 +1,98 @@
-◧ 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">AI coding agent, built for the terminal.</p>
+<p align="center">
+  <a href="https://opencode.ai/docs"><img alt="View docs" src="https://img.shields.io/badge/view-docs-blue?style=flat-square" /></a>
+  <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>
 
-![OpenCode Terminal UI](screenshot.png)
+[![opencode Terminal UI](packages/web/src/assets/themes/opencode.png)](https://opencode.ai)
 
-> **⚠️ Notice:** We are in progress of a complete overhaul in the `dontlook` branch - should be released mid June. The README below is for the current version
+---
 
-A powerful terminal-based AI assistant for developers, providing intelligent coding assistance directly in your terminal.
-
-## Overview
-
-OpenCode is a Go-based CLI application that brings AI assistance to your terminal. It provides a TUI (Terminal User Interface) for interacting with various AI models to help with coding tasks, debugging, and more.
-
-## Features
-
-- **Interactive TUI**: Built with [Bubble Tea](https://github.com/charmbracelet/bubbletea) for a smooth terminal experience
-- **Multiple AI Providers**: Support for OpenAI, Anthropic Claude, Google Gemini, AWS Bedrock, Groq, Azure OpenAI, and OpenRouter
-- **Session Management**: Save and manage multiple conversation sessions
-- **Tool Integration**: AI can execute commands, search files, and modify code
-- **Vim-like Editor**: Integrated editor with text input capabilities
-- **Persistent Storage**: SQLite database for storing conversations and sessions
-- **LSP Integration**: Language Server Protocol support for code intelligence
-- **File Change Tracking**: Track and visualize file changes during sessions
-- **External Editor Support**: Open your preferred editor for composing messages
-- **Named Arguments for Custom Commands**: Create powerful custom commands with multiple named placeholders
-
-## Installation
-
-### Using the Install Script
+### Installation
 
 ```bash
-# Install the latest version
+# YOLO
 curl -fsSL https://opencode.ai/install | bash
 
-# Install a specific version
-curl -fsSL https://opencode.ai/install | VERSION=0.1.0 bash
+# Package managers
+npm i -g opencode-ai@latest        # or bun/pnpm/yarn
+brew install sst/tap/opencode      # macOS
+paru -S opencode-bin               # Arch Linux
 ```
 
-### Using Homebrew (macOS and Linux)
+> **Note:** Remove versions older than 0.1.x before installing
+
+### Documentation
+
+For more info on how to configure opencode [**head over to our docs**](https://opencode.ai/docs).
+
+### Contributing
+
+To run opencode locally you need.
+
+- Bun
+- Golang 1.24.x
+
+And run.
 
 ```bash
-brew install sst/tap/opencode
+$ bun install
+$ bun run packages/opencode/src/index.ts
 ```
 
-### Using AUR (Arch Linux)
+### FAQ
 
-```bash
-# Using yay
-yay -S opencode-bin
+#### How do I use this with OpenRouter?
 
-# Using paru
-paru -S opencode-bin
-```
+OpenRouter is not in the Models.dev database yet, but you can configure it manually.
 
-### Using Go
-
-```bash
-go install github.com/sst/opencode@latest
-```
-
-## Configuration
-
-OpenCode looks for configuration in the following locations:
-
-- `$HOME/.opencode.json`
-- `$XDG_CONFIG_HOME/opencode/.opencode.json`
-- `./.opencode.json` (local directory)
-
-### Environment Variables
-
-You can configure OpenCode using environment variables:
-
-| Environment Variable       | Purpose                                                |
-| -------------------------- | ------------------------------------------------------ |
-| `ANTHROPIC_API_KEY`        | For Claude models                                      |
-| `OPENAI_API_KEY`           | For OpenAI models                                      |
-| `GEMINI_API_KEY`           | For Google Gemini models                               |
-| `VERTEXAI_PROJECT`         | For Google Cloud VertexAI (Gemini)                     |
-| `VERTEXAI_LOCATION`        | For Google Cloud VertexAI (Gemini)                     |
-| `GROQ_API_KEY`             | For Groq models                                        |
-| `AWS_ACCESS_KEY_ID`        | For AWS Bedrock (Claude)                               |
-| `AWS_SECRET_ACCESS_KEY`    | For AWS Bedrock (Claude)                               |
-| `AWS_REGION`               | For AWS Bedrock (Claude)                               |
-| `AZURE_OPENAI_ENDPOINT`    | For Azure OpenAI models                                |
-| `AZURE_OPENAI_API_KEY`     | For Azure OpenAI models (optional when using Entra ID) |
-| `AZURE_OPENAI_API_VERSION` | For Azure OpenAI models                                |
-
-### Configuration File Structure
-
-```json
+```json title="opencode.json"
 {
-  "data": {
-    "directory": ".opencode"
-  },
-  "providers": {
-    "openai": {
-      "apiKey": "your-api-key",
-      "disabled": false
-    },
-    "anthropic": {
-      "apiKey": "your-api-key",
-      "disabled": false
-    },
-    "groq": {
-      "apiKey": "your-api-key",
-      "disabled": false
-    },
+  "$schema": "https://opencode.ai/config.json",
+  "provider": {
     "openrouter": {
-      "apiKey": "your-api-key",
-      "disabled": false
-    }
-  },
-  "agents": {
-    "primary": {
-      "model": "claude-3.7-sonnet",
-      "maxTokens": 5000
-    },
-    "task": {
-      "model": "claude-3.7-sonnet",
-      "maxTokens": 5000
-    },
-    "title": {
-      "model": "claude-3.7-sonnet",
-      "maxTokens": 80
-    }
-  },
-  "mcpServers": {
-    "example": {
-      "type": "stdio",
-      "command": "path/to/mcp-server",
-      "env": [],
-      "args": []
-    }
-  },
-  "lsp": {
-    "go": {
-      "disabled": false,
-      "command": "gopls"
-    }
-  },
-  "shell": {
-    "path": "/bin/zsh",
-    "args": ["-l"]
-  },
-  "debug": false,
-  "debugLSP": false
-}
-```
-
-## Supported AI Models
-
-OpenCode supports a variety of AI models from different providers:
-
-### OpenAI
-
-- GPT-4.1 family (gpt-4.1, gpt-4.1-mini, gpt-4.1-nano)
-- GPT-4.5 Preview
-- GPT-4o family (gpt-4o, gpt-4o-mini)
-- O1 family (o1, o1-pro, o1-mini)
-- O3 family (o3, o3-mini)
-- O4 Mini
-
-### Anthropic
-
-- Claude 3.5 Sonnet
-- Claude 3.5 Haiku
-- Claude 3.7 Sonnet
-- Claude 3 Haiku
-- Claude 3 Opus
-
-### Google
-
-- Gemini 2.5
-- Gemini 2.5 Flash
-- Gemini 2.0 Flash
-- Gemini 2.0 Flash Lite
-
-### AWS Bedrock
-
-- Claude 3.7 Sonnet
-
-### Groq
-
-- Llama 4 Maverick (17b-128e-instruct)
-- Llama 4 Scout (17b-16e-instruct)
-- QWEN QWQ-32b
-- Deepseek R1 distill Llama 70b
-- Llama 3.3 70b Versatile
-
-### Azure OpenAI
-
-- GPT-4.1 family (gpt-4.1, gpt-4.1-mini, gpt-4.1-nano)
-- GPT-4.5 Preview
-- GPT-4o family (gpt-4o, gpt-4o-mini)
-- O1 family (o1, o1-mini)
-- O3 family (o3, o3-mini)
-- O4 Mini
-
-### Google Cloud VertexAI
-
-- Gemini 2.5
-- Gemini 2.5 Flash
-
-## Using Bedrock Models
-
-To use bedrock models with OpenCode you need three things.
-
-1. Valid AWS credentials (the env vars: `AWS_SECRET_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and `AWS_REGION`)
-2. Access to the corresponding model in AWS Bedrock in your region.
-   a. You can request access in the AWS console on the Bedrock -> "Model access" page.
-3. A correct configuration file. You don't need the `providers` key. Instead you have to prefix your models per agent with `bedrock.` and then a valid model. For now only Claude 3.7 is supported.
-
-```json
-{
-  "agents": {
-    "primary": {
-      "model": "bedrock.claude-3.7-sonnet",
-      "maxTokens": 5000,
-      "reasoningEffort": ""
-    },
-    "task": {
-      "model": "bedrock.claude-3.7-sonnet",
-      "maxTokens": 5000,
-      "reasoningEffort": ""
-    },
-    "title": {
-      "model": "bedrock.claude-3.7-sonnet",
-      "maxTokens": 80,
-      "reasoningEffort": ""
-    }
-  }
-}
-```
-
-## Interactive Mode Usage
-
-```bash
-# Start OpenCode
-opencode
-
-# Start with debug logging
-opencode -d
-
-# Start with a specific working directory
-opencode -c /path/to/project
-```
-
-## Non-interactive Prompt Mode
-
-You can run OpenCode in non-interactive mode by passing a prompt directly as a command-line argument or by piping text into the command. This is useful for scripting, automation, or when you want a quick answer without launching the full TUI.
-
-```bash
-# Run a single prompt and print the AI's response to the terminal
-opencode -p "Explain the use of context in Go"
-
-# Pipe input to OpenCode (equivalent to using -p flag)
-echo "Explain the use of context in Go" | opencode
-
-# Get response in JSON format
-opencode -p "Explain the use of context in Go" -f json
-# Or with piped input
-echo "Explain the use of context in Go" | opencode -f json
-
-# Run without showing the spinner
-opencode -p "Explain the use of context in Go" -q
-# Or with piped input
-echo "Explain the use of context in Go" | opencode -q
-
-# Enable verbose logging to stderr
-opencode -p "Explain the use of context in Go" --verbose
-# Or with piped input
-echo "Explain the use of context in Go" | opencode --verbose
-
-# Restrict the agent to only use specific tools
-opencode -p "Explain the use of context in Go" --allowedTools=view,ls,glob
-# Or with piped input
-echo "Explain the use of context in Go" | opencode --allowedTools=view,ls,glob
-
-# Prevent the agent from using specific tools
-opencode -p "Explain the use of context in Go" --excludedTools=bash,edit
-# Or with piped input
-echo "Explain the use of context in Go" | opencode --excludedTools=bash,edit
-```
-
-In this mode, OpenCode will process your prompt, print the result to standard output, and then exit. All permissions are auto-approved for the session.
-
-### Tool Restrictions
-
-You can control which tools the AI assistant has access to in non-interactive mode:
-
-- `--allowedTools`: Comma-separated list of tools that the agent is allowed to use. Only these tools will be available.
-- `--excludedTools`: Comma-separated list of tools that the agent is not allowed to use. All other tools will be available.
-
-These flags are mutually exclusive - you can use either `--allowedTools` or `--excludedTools`, but not both at the same time.
-
-### Output Formats
-
-OpenCode supports the following output formats in non-interactive mode:
-
-| Format | Description                     |
-| ------ | ------------------------------- |
-| `text` | Plain text output (default)     |
-| `json` | Output wrapped in a JSON object |
-
-The output format is implemented as a strongly-typed `OutputFormat` in the codebase, ensuring type safety and validation when processing outputs.
-
-## Command-line Flags
-
-| Flag              | Short | Description                                         |
-| ----------------- | ----- | --------------------------------------------------- |
-| `--help`          | `-h`  | Display help information                            |
-| `--debug`         | `-d`  | Enable debug mode                                   |
-| `--cwd`           | `-c`  | Set current working directory                       |
-| `--prompt`        | `-p`  | Run a single prompt in non-interactive mode         |
-| `--output-format` | `-f`  | Output format for non-interactive mode (text, json) |
-| `--quiet`         | `-q`  | Hide spinner in non-interactive mode                |
-| `--verbose`       |       | Display logs to stderr in non-interactive mode      |
-| `--allowedTools`  |       | Restrict the agent to only use specified tools      |
-| `--excludedTools` |       | Prevent the agent from using specified tools        |
-
-## Keyboard Shortcuts
-
-### Global Shortcuts
-
-| Shortcut | Action                                                  |
-| -------- | ------------------------------------------------------- |
-| `Ctrl+C` | Quit application                                        |
-| `Ctrl+?` | Toggle help dialog                                      |
-| `?`      | Toggle help dialog (when not in editing mode)           |
-| `Ctrl+L` | View logs                                               |
-| `Ctrl+A` | Switch session                                          |
-| `Ctrl+K` | Command dialog                                          |
-| `Ctrl+O` | Toggle model selection dialog                           |
-| `Esc`    | Close current overlay/dialog or return to previous mode |
-
-### Chat Page Shortcuts
-
-| Shortcut | Action                                  |
-| -------- | --------------------------------------- |
-| `Ctrl+N` | Create new session                      |
-| `Ctrl+X` | Cancel current operation/generation     |
-| `i`      | Focus editor (when not in writing mode) |
-| `Esc`    | Exit writing mode and focus messages    |
-
-### Editor Shortcuts
-
-| Shortcut            | Action                                    |
-| ------------------- | ----------------------------------------- |
-| `Ctrl+S`            | Send message (when editor is focused)     |
-| `Enter` or `Ctrl+S` | Send message (when editor is not focused) |
-| `Ctrl+E`            | Open external editor                      |
-| `Esc`               | Blur editor and focus messages            |
-
-### Session Dialog Shortcuts
-
-| Shortcut   | Action           |
-| ---------- | ---------------- |
-| `↑` or `k` | Previous session |
-| `↓` or `j` | Next session     |
-| `Enter`    | Select session   |
-| `Esc`      | Close dialog     |
-
-### Model Dialog Shortcuts
-
-| Shortcut   | Action            |
-| ---------- | ----------------- |
-| `↑` or `k` | Move up           |
-| `↓` or `j` | Move down         |
-| `←` or `h` | Previous provider |
-| `→` or `l` | Next provider     |
-| `Esc`      | Close dialog      |
-
-### Permission Dialog Shortcuts
-
-| Shortcut                | Action                       |
-| ----------------------- | ---------------------------- |
-| `←` or `left`           | Switch options left          |
-| `→` or `right` or `tab` | Switch options right         |
-| `Enter` or `space`      | Confirm selection            |
-| `a`                     | Allow permission             |
-| `A`                     | Allow permission for session |
-| `d`                     | Deny permission              |
-
-### Logs Page Shortcuts
-
-| Shortcut           | Action              |
-| ------------------ | ------------------- |
-| `Backspace` or `q` | Return to chat page |
-
-## AI Assistant Tools
-
-OpenCode's AI assistant has access to various tools to help with coding tasks:
-
-### File and Code Tools
-
-| Tool          | Description                 | Parameters                                                                               |
-| ------------- | --------------------------- | ---------------------------------------------------------------------------------------- |
-| `glob`        | Find files by pattern       | `pattern` (required), `path` (optional)                                                  |
-| `grep`        | Search file contents        | `pattern` (required), `path` (optional), `include` (optional), `literal_text` (optional) |
-| `ls`          | List directory contents     | `path` (optional), `ignore` (optional array of patterns)                                 |
-| `view`        | View file contents          | `file_path` (required), `offset` (optional), `limit` (optional)                          |
-| `write`       | Write to files              | `file_path` (required), `content` (required)                                             |
-| `edit`        | Edit files                  | Various parameters for file editing                                                      |
-| `patch`       | Apply patches to files      | `file_path` (required), `diff` (required)                                                |
-| `diagnostics` | Get diagnostics information | `file_path` (optional)                                                                   |
-
-### Other Tools
-
-| Tool    | Description                     | Parameters                                                  |
-| ------- | ------------------------------- | ----------------------------------------------------------- |
-| `bash`  | Execute shell commands          | `command` (required), `timeout` (optional)                  |
-| `fetch` | Fetch data from URLs            | `url` (required), `format` (required), `timeout` (optional) |
-| `agent` | Run sub-tasks with the AI agent | `prompt` (required)                                         |
-
-### Shell Configuration
-
-OpenCode allows you to configure the shell used by the `bash` tool. By default, it uses:
-
-1. The shell specified in the config file (if provided)
-2. The shell from the `$SHELL` environment variable (if available)
-3. Falls back to `/bin/bash` if neither of the above is available
-
-To configure a custom shell, add a `shell` section to your `.opencode.json` configuration file:
-
-```json
-{
-  "shell": {
-    "path": "/bin/zsh",
-    "args": ["-l"]
-  }
-}
-```
-
-You can specify any shell executable and custom arguments:
-
-```json
-{
-  "shell": {
-    "path": "/usr/bin/fish",
-    "args": []
-  }
-}
-```
-
-## Architecture
-
-OpenCode is built with a modular architecture:
-
-- **cmd**: Command-line interface using Cobra
-- **internal/app**: Core application services
-- **internal/config**: Configuration management
-- **internal/db**: Database operations and migrations
-- **internal/llm**: LLM providers and tools integration
-- **internal/tui**: Terminal UI components and layouts
-- **internal/logging**: Logging infrastructure
-- **internal/message**: Message handling
-- **internal/session**: Session management
-- **internal/lsp**: Language Server Protocol integration
-
-## Custom Commands
-
-OpenCode supports custom commands that can be created by users to quickly send predefined prompts to the AI assistant.
-
-### Creating Custom Commands
-
-Custom commands are predefined prompts stored as Markdown files in one of three locations:
-
-1. **User Commands** (prefixed with `user:`):
-
-   ```
-   $XDG_CONFIG_HOME/opencode/commands/
-   ```
-
-   (typically `~/.config/opencode/commands/` on Linux/macOS)
-
-   or
-
-   ```
-   $HOME/.opencode/commands/
-   ```
-
-2. **Project Commands** (prefixed with `project:`):
-   ```
-   <PROJECT DIR>/.opencode/commands/
-   ```
-
-Each `.md` file in these directories becomes a custom command. The file name (without extension) becomes the command ID.
-
-For example, creating a file at `~/.config/opencode/commands/prime-context.md` with content:
-
-```markdown
-RUN git ls-files
-READ README.md
-```
-
-This creates a command called `user:prime-context`.
-
-### Command Arguments
-
-OpenCode supports named arguments in custom commands using placeholders in the format `$NAME` (where NAME consists of uppercase letters, numbers, and underscores, and must start with a letter).
-
-For example:
-
-```markdown
-# Fetch Context for Issue $ISSUE_NUMBER
-
-RUN gh issue view $ISSUE_NUMBER --json title,body,comments
-RUN git grep --author="$AUTHOR_NAME" -n .
-RUN grep -R "$SEARCH_PATTERN" $DIRECTORY
-```
-
-When you run a command with arguments, OpenCode will prompt you to enter values for each unique placeholder. Named arguments provide several benefits:
-
-- Clear identification of what each argument represents
-- Ability to use the same argument multiple times
-- Better organization for commands with multiple inputs
-
-### Organizing Commands
-
-You can organize commands in subdirectories:
-
-```
-~/.config/opencode/commands/git/commit.md
-```
-
-This creates a command with ID `user:git:commit`.
-
-### Using Custom Commands
-
-1. Press `Ctrl+K` to open the command dialog
-2. Select your custom command (prefixed with either `user:` or `project:`)
-3. Press Enter to execute the command
-
-The content of the command file will be sent as a message to the AI assistant.
-
-## MCP (Model Context Protocol)
-
-OpenCode implements the Model Context Protocol (MCP) to extend its capabilities through external tools. MCP provides a standardized way for the AI assistant to interact with external services and tools.
-
-### MCP Features
-
-- **External Tool Integration**: Connect to external tools and services via a standardized protocol
-- **Tool Discovery**: Automatically discover available tools from MCP servers
-- **Multiple Connection Types**:
-  - **Stdio**: Communicate with tools via standard input/output
-  - **SSE**: Communicate with tools via Server-Sent Events
-- **Security**: Permission system for controlling access to MCP tools
-
-### Configuring MCP Servers
-
-MCP servers are defined in the configuration file under the `mcpServers` section:
-
-```json
-{
-  "mcpServers": {
-    "example": {
-      "type": "stdio",
-      "command": "path/to/mcp-server",
-      "env": [],
-      "args": []
-    },
-    "web-example": {
-      "type": "sse",
-      "url": "https://example.com/mcp",
-      "headers": {
-        "Authorization": "Bearer token"
+      "npm": "@openrouter/ai-sdk-provider",
+      "name": "OpenRouter",
+      "options": {},
+      "models": {
+        "anthropic/claude-3.5-sonnet": {
+          "name": "Claude 3.5 Sonnet"
+        }
       }
     }
   }
 }
 ```
 
-### MCP Tool Usage
+And then to configure an api key you can do `opencode auth login` and select "Other -> 'openrouter'"
 
-Once configured, MCP tools are automatically available to the AI assistant alongside built-in tools. They follow the same permission model as other tools, requiring user approval before execution.
+#### How is this different than Claude Code?
 
-## LSP (Language Server Protocol)
+It's very similar to Claude Code in terms of capability. Here are the key differences:
 
-OpenCode integrates with Language Server Protocol to provide code intelligence features across multiple programming languages.
+- 100% open source
+- Not coupled to any provider. Although Anthropic is recommended, opencode can be used with OpenAI, Google or even local models. As models evolve the gaps between them will close and pricing will drop so being provider agnostic is important.
+- A focus on TUI. opencode is built by neovim users and the creators of [terminal.shop](https://terminal.shop); we are going to push the limits of what's possible in the terminal.
+- A client/server architecture. This for example can allow opencode to run on your computer, while you can drive it remotely from a mobile app. Meaning that the TUI frontend is just one of the possible clients.
 
-### LSP Features
+#### What about Windows support?
 
-- **Multi-language Support**: Connect to language servers for different programming languages
-- **Diagnostics**: Receive error checking and linting information
-- **File Watching**: Automatically notify language servers of file changes
+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.
 
-### Configuring LSP
+#### What's the other repo?
 
-Language servers are configured in the configuration file under the `lsp` section:
+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).
 
-```json
-{
-  "lsp": {
-    "go": {
-      "disabled": false,
-      "command": "gopls"
-    },
-    "typescript": {
-      "disabled": false,
-      "command": "typescript-language-server",
-      "args": ["--stdio"]
-    }
-  }
-}
-```
+---
 
-### LSP Integration with AI
-
-The AI assistant can access LSP features through the `diagnostics` tool, allowing it to:
-
-- Check for errors in your code
-- Suggest fixes based on diagnostics
-
-While the LSP client implementation supports the full LSP protocol (including completions, hover, definition, etc.), currently only diagnostics are exposed to the AI assistant.
-
-## Development
-
-### Prerequisites
-
-- Go 1.24.0 or higher
-
-### Building from Source
-
-```bash
-# Clone the repository
-git clone https://github.com/sst/opencode.git
-cd opencode
-
-# Build
-go build -o opencode
-
-# Run
-./opencode
-```
-
-## Acknowledgments
-
-OpenCode gratefully acknowledges the contributions and support from these key individuals:
-
-- [@isaacphi](https://github.com/isaacphi) - For the [mcp-language-server](https://github.com/isaacphi/mcp-language-server) project which provided the foundation for our LSP client implementation
-- [@adamdottv](https://github.com/adamdottv) - For the design direction and UI/UX architecture
-
-Special thanks to the broader open source community whose tools and libraries have made this project possible.
-
-## License
-
-OpenCode is licensed under the MIT License. See the [LICENSE](LICENSE) file for details.
-
-## Contributing
-
-Contributions are welcome! Here's how you can contribute:
-
-1. Fork the repository
-2. Create a feature branch (`git checkout -b feature/amazing-feature`)
-3. Commit your changes (`git commit -m 'Add some amazing feature'`)
-4. Push to the branch (`git push origin feature/amazing-feature`)
-5. Open a Pull Request
-
-Please make sure to update tests as appropriate and follow the existing code style.
+**Join our community** [YouTube](https://www.youtube.com/c/sst-dev) | [X.com](https://x.com/SST_dev)

bun.lock

@@ -5,7 +5,7 @@
       "name": "opencode",
       "devDependencies": {
         "prettier": "3.5.3",
-        "sst": "3.17.4",
+        "sst": "3.17.6",
       },
     },
     "packages/function": {
@@ -43,13 +43,17 @@
         "yargs": "18.0.0",
         "zod": "catalog:",
         "zod-openapi": "4.2.4",
+        "zod-validation-error": "3.5.2",
       },
       "devDependencies": {
+        "@ai-sdk/amazon-bedrock": "2.2.10",
+        "@ai-sdk/anthropic": "1.2.12",
         "@tsconfig/bun": "1.0.7",
         "@types/bun": "latest",
         "@types/turndown": "5.0.5",
         "@types/yargs": "17.0.33",
         "typescript": "catalog:",
+        "zod-to-json-schema": "3.24.5",
       },
     },
     "packages/web": {
@@ -73,10 +77,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:",
       },
     },
@@ -85,21 +90,30 @@
     "sharp",
     "esbuild",
   ],
+  "patchedDependencies": {
+    "ai@4.3.16": "patches/ai@4.3.16.patch",
+  },
   "overrides": {
     "zod": "3.24.2",
   },
   "catalog": {
     "@types/node": "22.13.9",
-    "ai": "5.0.0-alpha.7",
+    "ai": "4.3.16",
     "typescript": "5.8.2",
     "zod": "3.24.2",
   },
   "packages": {
-    "@ai-sdk/gateway": ["@ai-sdk/gateway@1.0.0-alpha.7", "", { "dependencies": { "@ai-sdk/provider": "2.0.0-alpha.7", "@ai-sdk/provider-utils": "3.0.0-alpha.7" }, "peerDependencies": { "zod": "^3.24.0" } }, "sha512-gz1V165eiJnQIexfLyKm11vimrmQ3zdcJhPpjeLFmDU9wrvZwLuklfZ0WgfYSb+EjiP1cKypwt6JSGvWkfKIAQ=="],
+    "@ai-sdk/amazon-bedrock": ["@ai-sdk/amazon-bedrock@2.2.10", "", { "dependencies": { "@ai-sdk/provider": "1.1.3", "@ai-sdk/provider-utils": "2.2.8", "@smithy/eventstream-codec": "^4.0.1", "@smithy/util-utf8": "^4.0.0", "aws4fetch": "^1.0.20" }, "peerDependencies": { "zod": "^3.0.0" } }, "sha512-icLGO7Q0NinnHIPgT+y1QjHVwH4HwV+brWbvM+FfCG2Afpa89PyKa3Ret91kGjZpBgM/xnj1B7K5eM+rRlsXQA=="],
 
-    "@ai-sdk/provider": ["@ai-sdk/provider@2.0.0-alpha.7", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-lhdrARU3SSmt5p/GNNK7VhazvZpKSCIOjpHUfX7f5jIhVGi/vvlxP1rD6Go57nn1MtuGKNqL04AebSRFDQsQbw=="],
+    "@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-utils": ["@ai-sdk/provider-utils@3.0.0-alpha.7", "", { "dependencies": { "@ai-sdk/provider": "2.0.0-alpha.7", "@standard-schema/spec": "^1.0.0", "zod-to-json-schema": "^3.24.1" }, "peerDependencies": { "zod": "^3.23.8" } }, "sha512-AYkT3jskmo7Lwzijo/yHKD1jC+UZizsROO8ULTg9aJZUwR4ABZzAxh4NxDIEy4TWRfBGufp+/9ICHAn6pkU71w=="],
+    "@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=="],
+
+    "@ai-sdk/react": ["@ai-sdk/react@1.2.12", "", { "dependencies": { "@ai-sdk/provider-utils": "2.2.8", "@ai-sdk/ui-utils": "1.2.11", "swr": "^2.2.5", "throttleit": "2.1.0" }, "peerDependencies": { "react": "^18 || ^19 || ^19.0.0-rc", "zod": "^3.23.8" }, "optionalPeers": ["zod"] }, "sha512-jK1IZZ22evPZoQW3vlkZ7wvjYGYF+tRBKXtrcolduIkQ/m/sOAVcVeVDUDvh1T91xCnWCdUGCPZg2avZ90mv3g=="],
+
+    "@ai-sdk/ui-utils": ["@ai-sdk/ui-utils@1.2.11", "", { "dependencies": { "@ai-sdk/provider": "1.1.3", "@ai-sdk/provider-utils": "2.2.8", "zod-to-json-schema": "^3.24.1" }, "peerDependencies": { "zod": "^3.23.8" } }, "sha512-3zcwCc8ezzFlwp3ZD15wAPjf2Au4s3vAbKsXQVyhxODHcmu0iyPO2Eua6D/vicq/AUm/BAo60r97O6HU+EI0+w=="],
 
     "@ampproject/remapping": ["@ampproject/remapping@2.3.0", "", { "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.24" } }, "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw=="],
 
@@ -127,6 +141,12 @@
 
     "@astrojs/underscore-redirects": ["@astrojs/underscore-redirects@0.6.1", "", {}, "sha512-4bMLrs2KW+8/vHEE5Ffv2HbxCbbgXO+2N6MpoCsMXUlUoi7pgEEx8kbkzMXJ2dZtWF3gvwm9lvgjnFeanC2LGg=="],
 
+    "@aws-crypto/crc32": ["@aws-crypto/crc32@5.2.0", "", { "dependencies": { "@aws-crypto/util": "^5.2.0", "@aws-sdk/types": "^3.222.0", "tslib": "^2.6.2" } }, "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg=="],
+
+    "@aws-crypto/util": ["@aws-crypto/util@5.2.0", "", { "dependencies": { "@aws-sdk/types": "^3.222.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.6.2" } }, "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ=="],
+
+    "@aws-sdk/types": ["@aws-sdk/types@3.821.0", "", { "dependencies": { "@smithy/types": "^4.3.1", "tslib": "^2.6.2" } }, "sha512-Znroqdai1a90TlxGaJ+FK1lwC0fHpo97Xjsp5UKGR5JODYm7f9+/fF17ebO1KdoBr/Rm0UIFiF5VmI8ts9F1eA=="],
+
     "@babel/code-frame": ["@babel/code-frame@7.27.1", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.27.1", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg=="],
 
     "@babel/compat-data": ["@babel/compat-data@7.27.3", "", {}, "sha512-V42wFfx1ymFte+ecf6iXghnnP8kWTO+ZLXIyZq+1LAXHHvTZdVxicn4yiVYdYMGaCO3tmqub11AorKkv+iodqw=="],
@@ -407,6 +427,18 @@
 
     "@shikijs/vscode-textmate": ["@shikijs/vscode-textmate@10.0.2", "", {}, "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg=="],
 
+    "@smithy/eventstream-codec": ["@smithy/eventstream-codec@4.0.4", "", { "dependencies": { "@aws-crypto/crc32": "5.2.0", "@smithy/types": "^4.3.1", "@smithy/util-hex-encoding": "^4.0.0", "tslib": "^2.6.2" } }, "sha512-7XoWfZqWb/QoR/rAU4VSi0mWnO2vu9/ltS6JZ5ZSZv0eovLVfDfu0/AX4ub33RsJTOth3TiFWSHS5YdztvFnig=="],
+
+    "@smithy/is-array-buffer": ["@smithy/is-array-buffer@4.0.0", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw=="],
+
+    "@smithy/types": ["@smithy/types@4.3.1", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA=="],
+
+    "@smithy/util-buffer-from": ["@smithy/util-buffer-from@4.0.0", "", { "dependencies": { "@smithy/is-array-buffer": "^4.0.0", "tslib": "^2.6.2" } }, "sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug=="],
+
+    "@smithy/util-hex-encoding": ["@smithy/util-hex-encoding@4.0.0", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw=="],
+
+    "@smithy/util-utf8": ["@smithy/util-utf8@4.0.0", "", { "dependencies": { "@smithy/util-buffer-from": "^4.0.0", "tslib": "^2.6.2" } }, "sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow=="],
+
     "@standard-schema/spec": ["@standard-schema/spec@1.0.0", "", {}, "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA=="],
 
     "@swc/helpers": ["@swc/helpers@0.5.17", "", { "dependencies": { "tslib": "^2.8.0" } }, "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A=="],
@@ -429,6 +461,8 @@
 
     "@types/debug": ["@types/debug@4.1.12", "", { "dependencies": { "@types/ms": "*" } }, "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ=="],
 
+    "@types/diff-match-patch": ["@types/diff-match-patch@1.0.36", "", {}, "sha512-xFdR6tkm0MWvBfO8xXCSsinYxHcqkQUlcHeSpMC2ukzOb6lwQAfDmW+Qt0AvlGd8HpsS28qKsB+oPeJn9I39jg=="],
+
     "@types/estree": ["@types/estree@1.0.7", "", {}, "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ=="],
 
     "@types/estree-jsx": ["@types/estree-jsx@1.0.5", "", { "dependencies": { "@types/estree": "*" } }, "sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg=="],
@@ -473,7 +507,7 @@
 
     "acorn-walk": ["acorn-walk@8.3.2", "", {}, "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A=="],
 
-    "ai": ["ai@5.0.0-alpha.7", "", { "dependencies": { "@ai-sdk/gateway": "1.0.0-alpha.7", "@ai-sdk/provider": "2.0.0-alpha.7", "@ai-sdk/provider-utils": "3.0.0-alpha.7", "@opentelemetry/api": "1.9.0" }, "peerDependencies": { "zod": "^3.23.8" } }, "sha512-ShCk3frIMdVtK9knvWKiFS7N6Vwnf8mLMv670+T//W9oqfoetSVPBhTF6Dy+oDM/bjVSsBf1BuYImLDvHICOIQ=="],
+    "ai": ["ai@4.3.16", "", { "dependencies": { "@ai-sdk/provider": "1.1.3", "@ai-sdk/provider-utils": "2.2.8", "@ai-sdk/react": "1.2.12", "@ai-sdk/ui-utils": "1.2.11", "@opentelemetry/api": "1.9.0", "jsondiffpatch": "0.6.0" }, "peerDependencies": { "react": "^18 || ^19 || ^19.0.0-rc", "zod": "^3.23.8" }, "optionalPeers": ["react"] }, "sha512-KUDwlThJ5tr2Vw0A1ZkbDKNME3wzWhuVfAOwIvFUzl1TPVDFAXDFTXio3p+jaKneB+dKNCvFFlolYmmgHttG1g=="],
 
     "ansi-align": ["ansi-align@3.0.1", "", { "dependencies": { "string-width": "^4.1.0" } }, "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="],
 
@@ -685,6 +719,8 @@
 
     "diff": ["diff@8.0.2", "", {}, "sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg=="],
 
+    "diff-match-patch": ["diff-match-patch@1.0.5", "", {}, "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="],
+
     "direction": ["direction@2.0.1", "", { "bin": { "direction": "cli.js" } }, "sha512-9S6m9Sukh1cZNknO1CWAr2QAWsbKLafQiyM5gZ7VgXHeuaoUwffKN4q6NC4A/Mf9iiPlOXQEKW/Mv/mh9/3YFA=="],
 
     "dlv": ["dlv@1.1.3", "", {}, "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="],
@@ -969,6 +1005,8 @@
 
     "json5": ["json5@2.2.3", "", { "bin": { "json5": "lib/cli.js" } }, "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="],
 
+    "jsondiffpatch": ["jsondiffpatch@0.6.0", "", { "dependencies": { "@types/diff-match-patch": "^1.0.36", "chalk": "^5.3.0", "diff-match-patch": "^1.0.5" }, "bin": { "jsondiffpatch": "bin/jsondiffpatch.js" } }, "sha512-3QItJOXp2AP1uv7waBkao5nCvhEv+QmJAd38Ybq7wNI74Q+BBmnLn4EDKz6yI9xGAIQoUF87qHt+kc1IVxB4zQ=="],
+
     "kleur": ["kleur@4.1.5", "", {}, "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ=="],
 
     "klona": ["klona@2.0.6", "", {}, "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA=="],
@@ -1273,6 +1311,8 @@
 
     "rc": ["rc@1.2.8", "", { "dependencies": { "deep-extend": "^0.6.0", "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" }, "bin": { "rc": "./cli.js" } }, "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="],
 
+    "react": ["react@19.1.0", "", {}, "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg=="],
+
     "readable-stream": ["readable-stream@3.6.2", "", { "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } }, "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="],
 
     "readdirp": ["readdirp@4.1.2", "", {}, "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg=="],
@@ -1353,6 +1393,8 @@
 
     "sax": ["sax@1.2.1", "", {}, "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="],
 
+    "secure-json-parse": ["secure-json-parse@2.7.0", "", {}, "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw=="],
+
     "semver": ["semver@7.7.2", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="],
 
     "send": ["send@1.2.0", "", { "dependencies": { "debug": "^4.3.5", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "fresh": "^2.0.0", "http-errors": "^2.0.0", "mime-types": "^3.0.1", "ms": "^2.1.3", "on-finished": "^2.4.1", "range-parser": "^1.2.1", "statuses": "^2.0.1" } }, "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw=="],
@@ -1405,23 +1447,23 @@
 
     "split2": ["split2@3.2.2", "", { "dependencies": { "readable-stream": "^3.0.0" } }, "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="],
 
-    "sst": ["sst@3.17.4", "", { "dependencies": { "aws-sdk": "2.1692.0", "aws4fetch": "1.0.18", "jose": "5.2.3", "opencontrol": "0.0.6", "openid-client": "5.6.4" }, "optionalDependencies": { "sst-darwin-arm64": "3.17.4", "sst-darwin-x64": "3.17.4", "sst-linux-arm64": "3.17.4", "sst-linux-x64": "3.17.4", "sst-linux-x86": "3.17.4", "sst-win32-arm64": "3.17.4", "sst-win32-x64": "3.17.4", "sst-win32-x86": "3.17.4" }, "bin": { "sst": "bin/sst.mjs" } }, "sha512-WpAws1ASJIilKC9/DGBhZ5wk2I4gtlzHXKpuwPC25bHWjqllv1jZiehIYhhN0PpV2pV8xCvqzyN8Gdm3J4EWQg=="],
+    "sst": ["sst@3.17.6", "", { "dependencies": { "aws-sdk": "2.1692.0", "aws4fetch": "1.0.18", "jose": "5.2.3", "opencontrol": "0.0.6", "openid-client": "5.6.4" }, "optionalDependencies": { "sst-darwin-arm64": "3.17.6", "sst-darwin-x64": "3.17.6", "sst-linux-arm64": "3.17.6", "sst-linux-x64": "3.17.6", "sst-linux-x86": "3.17.6", "sst-win32-arm64": "3.17.6", "sst-win32-x64": "3.17.6", "sst-win32-x86": "3.17.6" }, "bin": { "sst": "bin/sst.mjs" } }, "sha512-p+AcqwfYQUdkxeRjCikQoTMviPCBiGoU7M0vcV6GDVmVis8hzhVw4EFfHTafZC+aWfy1Ke2UQi66vZlEVWuEqA=="],
 
-    "sst-darwin-arm64": ["sst-darwin-arm64@3.17.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-IJansQWlPdiaQNsJw3FQ+Q/ZXN1hzrq2Q31xG4l2HhA1doj1C3y+6s57vu4cTRDFo2OwBlC4+zlQBJHsOYGhrA=="],
+    "sst-darwin-arm64": ["sst-darwin-arm64@3.17.6", "", { "os": "darwin", "cpu": "arm64" }, "sha512-6tb7KlcPR7PTi3ofQv8dX/n6Jf7pNP9VfrnYL4HBWnWrcYaZeJ5MWobILfIJ/y2jHgoqmg9e5C3266Eds0JQyw=="],
 
-    "sst-darwin-x64": ["sst-darwin-x64@3.17.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-mHd26/AtaQ79ajqzsutRhgEjkCxX+bXgW4KJIN0AGT3110fo2OL0x2UXmfX+sxSWOFHvJQsjFjFm4CLtQSxyBg=="],
+    "sst-darwin-x64": ["sst-darwin-x64@3.17.6", "", { "os": "darwin", "cpu": "x64" }, "sha512-lFakq6/EgTuBSjbl8Kry4pfgAPEIyn6o7ZkyRz3hz5331wUaX88yfjs3tL9JQ8Ey6jBUYxwhP/Q1n7fzIG046g=="],
 
-    "sst-linux-arm64": ["sst-linux-arm64@3.17.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-unaNWOY3oEI/jUUG47/2Gbreaoi/D/rLsTPeKyYEWhWEBWCojns7LfMQs1bgW0qjBGmazB2IJD4NVYhYqYQxqQ=="],
+    "sst-linux-arm64": ["sst-linux-arm64@3.17.6", "", { "os": "linux", "cpu": "arm64" }, "sha512-SdTxXMbTEdiwOqp37w31kXv97vHqSx3oK9h/76lKg7V9k5JxPJ6JMefPLhoKWwK0Zh6AndY2zo2oRoEv4SIaDw=="],
 
-    "sst-linux-x64": ["sst-linux-x64@3.17.4", "", { "os": "linux", "cpu": "x64" }, "sha512-zoErI6dVoRxWcmoVVrzNJWKEqfUF/MyQInEkGROGY2YsFFzOM5RD5Dsdm9q6oDGwx+NxFAhQWc8/8C+OmoW1nA=="],
+    "sst-linux-x64": ["sst-linux-x64@3.17.6", "", { "os": "linux", "cpu": "x64" }, "sha512-qneh7uWDiTUYx8X1Y3h2YVw3SJ0ybBBlRrVybIvCM09JqQ8+qq/XjKXGzA/3/EF0Jr7Ug8cARSn9CwxhdQGN7Q=="],
 
-    "sst-linux-x86": ["sst-linux-x86@3.17.4", "", { "os": "linux", "cpu": "none" }, "sha512-7ZHS2rxzxVAxMFW3u5+GMRGGACaBMuLht8JYxqruD8mFVqk9UaPQgrFKIHGKWHLBJLVnF2AdwmlHOcEKP+UJWA=="],
+    "sst-linux-x86": ["sst-linux-x86@3.17.6", "", { "os": "linux", "cpu": "none" }, "sha512-pU3D5OeqnmfxGqN31DxuwWnc1OayxhkErnITHhZ39D0MTiwbIgCapH26FuLW8B08/uxJWG8djUlOboCRhSBvWA=="],
 
-    "sst-win32-arm64": ["sst-win32-arm64@3.17.4", "", { "os": "win32", "cpu": "arm64" }, "sha512-q4cedr6WD3NqeQkDvmAsIgMgPIjziIWy81wA3ZmnY6UT0jFgFus23ppLIi6F4BFJfOygvAP2PeGrRR3o8giclw=="],
+    "sst-win32-arm64": ["sst-win32-arm64@3.17.6", "", { "os": "win32", "cpu": "arm64" }, "sha512-Rr3RTYWAsH9sM9CbM/sAZCk7dB1OsSAljjJuuHMvdSAYW3RDpXEza0PBJGxnBID2eOrpswEchzMPL2d8LtL7oA=="],
 
-    "sst-win32-x64": ["sst-win32-x64@3.17.4", "", { "os": "win32", "cpu": "x64" }, "sha512-sSQL041YCusZ8/0ynYGe9DCmPYVZOFsemXKUA9tX4IGSDqXae1FN0Sj7HQ17JyY24UUirY1zR7LFk+7KrP6wiA=="],
+    "sst-win32-x64": ["sst-win32-x64@3.17.6", "", { "os": "win32", "cpu": "x64" }, "sha512-yZ3roxwI0Wve9PFzdrrF1kfzCmIMFCCoa8qKeXY7LxCJ4QQIqHbCOccLK1Wv/MIU/mcZHWXTQVCLHw77uaa0GQ=="],
 
-    "sst-win32-x86": ["sst-win32-x86@3.17.4", "", { "os": "win32", "cpu": "none" }, "sha512-WhjsD2dkA2fbQ03CgwIJb+2p0osll2PTXlr7HC3L+H8wG2DgLFPjoE+6N8n6r2dVMVaDzuNwy/7J8hRB29blaw=="],
+    "sst-win32-x86": ["sst-win32-x86@3.17.6", "", { "os": "win32", "cpu": "none" }, "sha512-zV7TJWPJN9PmIXr15iXFSs0tbGsa52oBR3+xiKrUj2qj9XsZe7HBFwskRnHyiFq0durZY9kk9ZtoVlpuUuzr1g=="],
 
     "stacktracey": ["stacktracey@2.1.8", "", { "dependencies": { "as-table": "^1.0.36", "get-source": "^2.0.12" } }, "sha512-Kpij9riA+UNg7TnphqjH7/CzctQ/owJGNbFkfEeve4Z4uxT5+JapVLFXcsurIfN34gnTWZNJ/f7NMG0E8JDzTw=="],
 
@@ -1453,6 +1495,8 @@
 
     "supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],
 
+    "swr": ["swr@2.3.3", "", { "dependencies": { "dequal": "^2.0.3", "use-sync-external-store": "^1.4.0" }, "peerDependencies": { "react": "^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-dshNvs3ExOqtZ6kJBaAsabhPdHyeY4P2cKwRCniDVifBMoG/SVI7tfLWqPXriVspf2Rg4tPzXJTnwaihIeFw2A=="],
+
     "tar-fs": ["tar-fs@3.0.9", "", { "dependencies": { "pump": "^3.0.0", "tar-stream": "^3.1.5" }, "optionalDependencies": { "bare-fs": "^4.0.1", "bare-path": "^3.0.0" } }, "sha512-XF4w9Xp+ZQgifKakjZYmFdkLoSWd34VGKcsTCwlNWM7QG3ZbaxnTsaBwnjFZqHRf/rROxaR8rXnbtwdvaDI+lA=="],
 
     "tar-stream": ["tar-stream@3.1.7", "", { "dependencies": { "b4a": "^1.6.4", "fast-fifo": "^1.2.0", "streamx": "^2.15.0" } }, "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ=="],
@@ -1461,6 +1505,8 @@
 
     "thread-stream": ["thread-stream@0.15.2", "", { "dependencies": { "real-require": "^0.1.0" } }, "sha512-UkEhKIg2pD+fjkHQKyJO3yoIvAP3N6RlNFt2dUhcS1FGvCD1cQa1M/PGknCLFIyZdtJOWQjejp7bdNqmN7zwdA=="],
 
+    "throttleit": ["throttleit@2.1.0", "", {}, "sha512-nt6AMGKW1p/70DF/hGBdJB57B8Tspmbp5gfJ8ilhLnt7kkr2ye7hzD6NVG8GGErk2HWF34igrL2CXmNIkzKqKw=="],
+
     "tiny-inflate": ["tiny-inflate@1.0.3", "", {}, "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw=="],
 
     "tinyexec": ["tinyexec@0.3.2", "", {}, "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA=="],
@@ -1471,7 +1517,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=="],
 
@@ -1545,6 +1591,8 @@
 
     "url": ["url@0.10.3", "", { "dependencies": { "punycode": "1.3.2", "querystring": "0.2.0" } }, "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ=="],
 
+    "use-sync-external-store": ["use-sync-external-store@1.5.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A=="],
+
     "util": ["util@0.12.5", "", { "dependencies": { "inherits": "^2.0.3", "is-arguments": "^1.0.4", "is-generator-function": "^1.0.7", "is-typed-array": "^1.1.3", "which-typed-array": "^1.1.2" } }, "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA=="],
 
     "util-deprecate": ["util-deprecate@1.0.2", "", {}, "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="],
@@ -1629,12 +1677,24 @@
 
     "zod-to-ts": ["zod-to-ts@1.2.0", "", { "peerDependencies": { "typescript": "^4.9.4 || ^5.0.2", "zod": "^3" } }, "sha512-x30XE43V+InwGpvTySRNz9kB7qFU8DlyEy7BsSTCHPH1R0QasMmHWZDCzYm6bVXtj/9NNJAZF3jW8rzFvH5OFA=="],
 
+    "zod-validation-error": ["zod-validation-error@3.5.2", "", { "peerDependencies": { "zod": "^3.25.0" } }, "sha512-mdi7YOLtram5dzJ5aDtm1AG9+mxRma1iaMrZdYIpFO7epdKBUwLHIxTF8CPDeCQ828zAXYtizrKlEJAtzgfgrw=="],
+
     "zwitch": ["zwitch@2.0.4", "", {}, "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A=="],
 
+    "@ai-sdk/amazon-bedrock/aws4fetch": ["aws4fetch@1.0.20", "", {}, "sha512-/djoAN709iY65ETD6LKCtyyEI04XIBP5xVvfmNxsEP0uJB5tyaGBztSryRr4HqMStr9R06PisQE7m9zDTXKu6g=="],
+
     "@ampproject/remapping/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.25", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="],
 
     "@astrojs/mdx/@astrojs/markdown-remark": ["@astrojs/markdown-remark@6.3.2", "", { "dependencies": { "@astrojs/internal-helpers": "0.6.1", "@astrojs/prism": "3.3.0", "github-slugger": "^2.0.0", "hast-util-from-html": "^2.0.3", "hast-util-to-text": "^4.0.2", "import-meta-resolve": "^4.1.0", "js-yaml": "^4.1.0", "mdast-util-definitions": "^6.0.0", "rehype-raw": "^7.0.0", "rehype-stringify": "^10.0.1", "remark-gfm": "^4.0.1", "remark-parse": "^11.0.0", "remark-rehype": "^11.1.2", "remark-smartypants": "^3.0.2", "shiki": "^3.2.1", "smol-toml": "^1.3.1", "unified": "^11.0.5", "unist-util-remove-position": "^5.0.0", "unist-util-visit": "^5.0.0", "unist-util-visit-parents": "^6.0.1", "vfile": "^6.0.3" } }, "sha512-bO35JbWpVvyKRl7cmSJD822e8YA8ThR/YbUsciWNA7yTcqpIAL2hJDToWP5KcZBWxGT6IOdOkHSXARSNZc4l/Q=="],
 
+    "@aws-crypto/crc32/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
+
+    "@aws-crypto/util/@smithy/util-utf8": ["@smithy/util-utf8@2.3.0", "", { "dependencies": { "@smithy/util-buffer-from": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A=="],
+
+    "@aws-crypto/util/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
+
+    "@aws-sdk/types/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
+
     "@babel/core/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],
 
     "@babel/generator/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.25", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="],
@@ -1655,6 +1715,18 @@
 
     "@rollup/pluginutils/estree-walker": ["estree-walker@2.0.2", "", {}, "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="],
 
+    "@smithy/eventstream-codec/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
+
+    "@smithy/is-array-buffer/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
+
+    "@smithy/types/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
+
+    "@smithy/util-buffer-from/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
+
+    "@smithy/util-hex-encoding/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
+
+    "@smithy/util-utf8/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
+
     "@swc/helpers/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
     "ansi-align/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
@@ -1725,6 +1797,8 @@
 
     "@astrojs/mdx/@astrojs/markdown-remark/@astrojs/prism": ["@astrojs/prism@3.3.0", "", { "dependencies": { "prismjs": "^1.30.0" } }, "sha512-q8VwfU/fDZNoDOf+r7jUnMC2//H2l0TuQ6FkGJL8vD8nw/q5KiL3DS1KKBI3QhI9UQhpJ5dc7AtqfbXWuOgLCQ=="],
 
+    "@aws-crypto/util/@smithy/util-utf8/@smithy/util-buffer-from": ["@smithy/util-buffer-from@2.2.0", "", { "dependencies": { "@smithy/is-array-buffer": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA=="],
+
     "@babel/helper-compilation-targets/lru-cache/yallist": ["yallist@3.1.1", "", {}, "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="],
 
     "ansi-align/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
@@ -1791,6 +1865,8 @@
 
     "wrangler/esbuild/@esbuild/win32-x64": ["@esbuild/win32-x64@0.25.4", "", { "os": "win32", "cpu": "x64" }, "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ=="],
 
+    "@aws-crypto/util/@smithy/util-utf8/@smithy/util-buffer-from/@smithy/is-array-buffer": ["@smithy/is-array-buffer@2.2.0", "", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA=="],
+
     "ansi-align/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
 
     "args/chalk/ansi-styles/color-convert": ["color-convert@1.9.3", "", { "dependencies": { "color-name": "1.1.3" } }, "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="],

infra/app.ts

@@ -23,25 +23,15 @@ export const api = new sst.cloudflare.Worker("Api", {
         },
       ])
       args.migrations = {
-        oldTag: "v1",
-        newTag: "v1",
+        // Note: when releasing the next tag, make sure all stages use tag v2
+        oldTag: $app.stage === "production" ? "" : "v1",
+        newTag: $app.stage === "production" ? "" : "v1",
         //newSqliteClasses: ["SyncServer"],
       }
     },
   },
 })
 
-// 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",

install

@@ -12,23 +12,28 @@ requested_version=${VERSION:-}
 
 os=$(uname -s | tr '[:upper:]' '[:lower:]')
 if [[ "$os" == "darwin" ]]; then
-    os="mac"
+    os="darwin"
 fi
 arch=$(uname -m)
 
 if [[ "$arch" == "aarch64" ]]; then
   arch="arm64"
+elif [[ "$arch" == "x86_64" ]]; then
+  arch="x64"
 fi
 
-filename="$APP-$os-$arch.tar.gz"
+filename="$APP-$os-$arch.zip"
 
 
 case "$filename" in
     *"-linux-"*)
-        [[ "$arch" == "x86_64" || "$arch" == "arm64" || "$arch" == "i386" ]] || exit 1
+        [[ "$arch" == "x64" || "$arch" == "arm64" ]] || exit 1
     ;;
-    *"-mac-"*)
-        [[ "$arch" == "x86_64" || "$arch" == "arm64" ]] || exit 1
+    *"-darwin-"*)
+        [[ "$arch" == "x64" || "$arch" == "arm64" ]] || exit 1
+    ;;
+    *"-windows-"*)
+        [[ "$arch" == "x64" ]] || exit 1
     ;;
     *)
         echo "${RED}Unsupported OS/Arch: $os/$arch${NC}"
@@ -88,8 +93,9 @@ check_version() {
 download_and_install() {
     print_message info "Downloading ${ORANGE}opencode ${GREEN}version: ${YELLOW}$specific_version ${GREEN}..."
     mkdir -p opencodetmp && cd opencodetmp
-    curl -# -L $url | tar xz
-    mv opencode $INSTALL_DIR
+    curl -# -L -o "$filename" "$url"
+    unzip -q "$filename"
+    mv opencode "$INSTALL_DIR"
     cd .. && rm -rf opencodetmp 
 }
 
@@ -101,7 +107,9 @@ add_to_path() {
     local config_file=$1
     local command=$2
 
-    if [[ -w $config_file ]]; then
+    if grep -Fxq "$command" "$config_file"; then
+        print_message info "Command already exists in $config_file, skipping write."
+    elif [[ -w $config_file ]]; then
         echo -e "\n# opencode" >> "$config_file"
         echo "$command" >> "$config_file"
         print_message info "Successfully added ${ORANGE}opencode ${GREEN}to \$PATH in $config_file"
@@ -167,6 +175,7 @@ if [[ ":$PATH:" != *":$INSTALL_DIR:"* ]]; then
             add_to_path "$config_file" "export PATH=$INSTALL_DIR:\$PATH"
         ;;
         *)
+            export PATH=$INSTALL_DIR:$PATH
             print_message warning "Manually add the directory to $config_file (or similar):"
             print_message info "  export PATH=$INSTALL_DIR:\$PATH"
         ;;

opencode.json

@@ -0,0 +1,3 @@
+{
+  "$schema": "https://opencode.ai/config.json"
+}

package.json

@@ -6,7 +6,7 @@
   "packageManager": "bun@1.2.14",
   "scripts": {
     "typecheck": "bun run --filter='*' typecheck",
-    "dev": "sst dev"
+    "postinstall": "./scripts/hooks"
   },
   "workspaces": {
     "packages": [
@@ -16,12 +16,12 @@
       "typescript": "5.8.2",
       "@types/node": "22.13.9",
       "zod": "3.24.2",
-      "ai": "5.0.0-alpha.7"
+      "ai": "4.3.16"
     }
   },
   "devDependencies": {
     "prettier": "3.5.3",
-    "sst": "3.17.4"
+    "sst": "3.17.6"
   },
   "repository": {
     "type": "git",
@@ -38,5 +38,8 @@
     "esbuild",
     "protobufjs",
     "sharp"
-  ]
+  ],
+  "patchedDependencies": {
+    "ai@4.3.16": "patches/ai@4.3.16.patch"
+  }
 }

packages/function/src/api.ts

@@ -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() {
@@ -122,7 +120,7 @@ export default {
       return new Response(
         JSON.stringify({
           secret,
-          url: "https://dev.opencode.ai/s/" + short,
+          url: "https://opencode.ai/s/" + short,
         }),
         {
           headers: { "Content-Type": "application/json" },

packages/opencode/AGENTS.md

@@ -1,4 +1,4 @@
-# OpenCode Agent Guidelines
+# opencode agent guidelines
 
 ## Build/Test Commands
 
@@ -16,9 +16,19 @@
 - **Naming**: camelCase for variables/functions, PascalCase for classes/namespaces
 - **Error handling**: Use Result patterns, avoid throwing exceptions in tools
 - **File structure**: Namespace-based organization (e.g., `Tool.define()`, `Session.create()`)
+
+## IMPORTANT
+
+- Try to keep things in one function unless composable or reusable
 - DO NOT do unnecessary destructuring of variables
-- DO NOT use else statements unless necessary
-- DO NOT use try catch if it can be avoided
+- DO NOT use `else` statements unless necessary
+- DO NOT use `try`/`catch` if it can be avoided
+- AVOID `try`/`catch` where possible
+- AVOID `else` statements
+- AVOID using `any` type
+- AVOID `let` statements
+- PREFER single word variable names where possible
+- Use as many bun apis as possible like Bun.file()
 
 ## Architecture
 
@@ -27,4 +37,3 @@
 - **Validation**: All inputs validated with Zod schemas
 - **Logging**: Use `Log.create({ service: "name" })` pattern
 - **Storage**: Use `Storage` namespace for persistence
-

packages/opencode/config.schema.json

@@ -0,0 +1,302 @@
+{
+  "type": "object",
+  "properties": {
+    "$schema": {
+      "type": "string",
+      "description": "JSON schema reference for configuration validation"
+    },
+    "theme": {
+      "type": "string",
+      "description": "Theme name to use for the interface"
+    },
+    "keybinds": {
+      "type": "object",
+      "properties": {
+        "leader": {
+          "type": "string",
+          "description": "Leader key for keybind combinations"
+        },
+        "help": {
+          "type": "string",
+          "description": "Show help dialog"
+        },
+        "editor_open": {
+          "type": "string",
+          "description": "Open external editor"
+        },
+        "session_new": {
+          "type": "string",
+          "description": "Create a new session"
+        },
+        "session_list": {
+          "type": "string",
+          "description": "List all sessions"
+        },
+        "session_share": {
+          "type": "string",
+          "description": "Share current session"
+        },
+        "session_interrupt": {
+          "type": "string",
+          "description": "Interrupt current session"
+        },
+        "session_compact": {
+          "type": "string",
+          "description": "Toggle compact mode for session"
+        },
+        "tool_details": {
+          "type": "string",
+          "description": "Show tool details"
+        },
+        "model_list": {
+          "type": "string",
+          "description": "List available models"
+        },
+        "theme_list": {
+          "type": "string",
+          "description": "List available themes"
+        },
+        "project_init": {
+          "type": "string",
+          "description": "Initialize project configuration"
+        },
+        "input_clear": {
+          "type": "string",
+          "description": "Clear input field"
+        },
+        "input_paste": {
+          "type": "string",
+          "description": "Paste from clipboard"
+        },
+        "input_submit": {
+          "type": "string",
+          "description": "Submit input"
+        },
+        "input_newline": {
+          "type": "string",
+          "description": "Insert newline in input"
+        },
+        "history_previous": {
+          "type": "string",
+          "description": "Navigate to previous history item"
+        },
+        "history_next": {
+          "type": "string",
+          "description": "Navigate to next history item"
+        },
+        "messages_page_up": {
+          "type": "string",
+          "description": "Scroll messages up by one page"
+        },
+        "messages_page_down": {
+          "type": "string",
+          "description": "Scroll messages down by one page"
+        },
+        "messages_half_page_up": {
+          "type": "string",
+          "description": "Scroll messages up by half page"
+        },
+        "messages_half_page_down": {
+          "type": "string",
+          "description": "Scroll messages down by half page"
+        },
+        "messages_previous": {
+          "type": "string",
+          "description": "Navigate to previous message"
+        },
+        "messages_next": {
+          "type": "string",
+          "description": "Navigate to next message"
+        },
+        "messages_first": {
+          "type": "string",
+          "description": "Navigate to first message"
+        },
+        "messages_last": {
+          "type": "string",
+          "description": "Navigate to last message"
+        },
+        "app_exit": {
+          "type": "string",
+          "description": "Exit the application"
+        }
+      },
+      "additionalProperties": false,
+      "description": "Custom keybind configurations"
+    },
+    "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"
+          },
+          "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"
+                  ],
+                  "additionalProperties": false
+                },
+                "limit": {
+                  "type": "object",
+                  "properties": {
+                    "context": {
+                      "type": "number"
+                    },
+                    "output": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "context",
+                    "output"
+                  ],
+                  "additionalProperties": false
+                },
+                "id": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            }
+          },
+          "options": {
+            "type": "object",
+            "additionalProperties": {}
+          }
+        },
+        "required": [
+          "models"
+        ],
+        "additionalProperties": false
+      },
+      "description": "Custom provider configurations and model overrides"
+    },
+    "mcp": {
+      "type": "object",
+      "additionalProperties": {
+        "anyOf": [
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "const": "local",
+                "description": "Type of MCP server connection"
+              },
+              "command": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                "description": "Command and arguments to run the MCP server"
+              },
+              "environment": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "string"
+                },
+                "description": "Environment variables to set when running the MCP server"
+              }
+            },
+            "required": [
+              "type",
+              "command"
+            ],
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "const": "remote",
+                "description": "Type of MCP server connection"
+              },
+              "url": {
+                "type": "string",
+                "description": "URL of the remote MCP server"
+              }
+            },
+            "required": [
+              "type",
+              "url"
+            ],
+            "additionalProperties": false
+          }
+        ]
+      },
+      "description": "MCP (Model Context Protocol) server configurations"
+    }
+  },
+  "additionalProperties": false,
+  "$schema": "http://json-schema.org/draft-07/schema#"
+}

packages/opencode/package.json

@@ -5,20 +5,21 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "dev": "bun run ./src/index.ts"
   },
   "exports": {
-    "./*": [
-      "./src/*.ts",
-      "./src/*/index.ts"
-    ]
+    "./*": "./src/*.ts"
   },
   "devDependencies": {
+    "@ai-sdk/amazon-bedrock": "2.2.10",
+    "@ai-sdk/anthropic": "1.2.12",
     "@tsconfig/bun": "1.0.7",
     "@types/bun": "latest",
     "@types/turndown": "5.0.5",
     "@types/yargs": "17.0.33",
-    "typescript": "catalog:"
+    "typescript": "catalog:",
+    "zod-to-json-schema": "3.24.5"
   },
   "dependencies": {
     "@clack/prompts": "0.11.0",
@@ -42,6 +43,7 @@
     "xdg-basedir": "5.1.0",
     "yargs": "18.0.0",
     "zod": "catalog:",
-    "zod-openapi": "4.2.4"
+    "zod-openapi": "4.2.4",
+    "zod-validation-error": "3.5.2"
   }
 }

packages/opencode/script/PKGBUILD.template

@@ -1,23 +0,0 @@
-# Maintainer: dax
-# Maintainer: adam
-
-pkgname='opencode-bin'
-pkgver={{VERSION}}
-pkgrel=1
-pkgdesc='The AI coding agent built for the terminal.'
-url='https://github.com/sst/opencode'
-arch=('aarch64' 'x86_64')
-license=('MIT')
-provides=('opencode')
-conflicts=('opencode')
-depends=('fzf' 'ripgrep')
-
-source_aarch64=("${pkgname}_${pkgver}_aarch64.zip::{{ARM64_URL}}")
-sha256sums_aarch64=('{{ARM64_SHA}}')
-
-source_x86_64=("${pkgname}_${pkgver}_x86_64.zip::{{X64_URL}}")
-sha256sums_x86_64=('{{X64_SHA}}')
-
-package() {
-  install -Dm755 ./opencode "${pkgdir}/usr/bin/opencode"
-}

packages/opencode/script/postinstall.mjs

@@ -80,9 +80,9 @@ function main() {
 
     // Create symlink to the actual binary
     fs.symlinkSync(binaryPath, binScript)
-    console.log(`OpenCode binary symlinked: ${binScript} -> ${binaryPath}`)
+    console.log(`opencode binary symlinked: ${binScript} -> ${binaryPath}`)
   } catch (error) {
-    console.error("Failed to create OpenCode binary symlink:", error.message)
+    console.error("Failed to create opencode binary symlink:", error.message)
     process.exit(1)
   }
 }

packages/opencode/script/publish.ts

@@ -29,7 +29,7 @@ const targets = [
   ["linux", "x64"],
   ["darwin", "x64"],
   ["darwin", "arm64"],
-  ["windows", "x64"],
+  // ["windows", "x64"],
 ]
 
 await $`rm -rf dist`
@@ -64,7 +64,7 @@ for (const [os, arch] of targets) {
 
 await $`mkdir -p ./dist/${pkg.name}`
 await $`cp -r ./bin ./dist/${pkg.name}/bin`
-await $`cp ./script/postinstall.js ./dist/${pkg.name}/postinstall.js`
+await $`cp ./script/postinstall.mjs ./dist/${pkg.name}/postinstall.mjs`
 await Bun.file(`./dist/${pkg.name}/package.json`).write(
   JSON.stringify(
     {
@@ -73,7 +73,7 @@ await Bun.file(`./dist/${pkg.name}/package.json`).write(
         [pkg.name]: `./bin/${pkg.name}`,
       },
       scripts: {
-        postinstall: "node ./postinstall.js",
+        postinstall: "node ./postinstall.mjs",
       },
       version,
       optionalDependencies,
@@ -108,9 +108,10 @@ if (!snapshot) {
     .filter((x: string) => {
       const lower = x.toLowerCase()
       return (
-        !lower.includes("chore:") &&
+        !lower.includes("ignore:") &&
         !lower.includes("ci:") &&
-        !lower.includes("docs:")
+        !lower.includes("docs:") &&
+        !lower.includes("doc:")
       )
     })
     .join("\n")
@@ -118,30 +119,52 @@ if (!snapshot) {
   if (!dry)
     await $`gh release create v${version} --title "v${version}" --notes ${notes} ./dist/*.zip`
 
+  // Calculate SHA values
+  const arm64Sha =
+    await $`sha256sum ./dist/opencode-linux-arm64.zip | cut -d' ' -f1`
+      .text()
+      .then((x) => x.trim())
+  const x64Sha =
+    await $`sha256sum ./dist/opencode-linux-x64.zip | cut -d' ' -f1`
+      .text()
+      .then((x) => x.trim())
+  const macX64Sha =
+    await $`sha256sum ./dist/opencode-darwin-x64.zip | cut -d' ' -f1`
+      .text()
+      .then((x) => x.trim())
+  const macArm64Sha =
+    await $`sha256sum ./dist/opencode-darwin-arm64.zip | cut -d' ' -f1`
+      .text()
+      .then((x) => x.trim())
+
   // AUR package
-  const pkgbuildTemplate = await Bun.file("./script/PKGBUILD.template").text()
-  const pkgbuild = pkgbuildTemplate
-    .replace("{{VERSION}}", version.split("-")[0])
-    .replace(
-      "{{ARM64_URL}}",
-      `https://github.com/sst/opencode/releases/download/v${version}/opencode-linux-arm64.zip`,
-    )
-    .replace(
-      "{{ARM64_SHA}}",
-      await $`sha256sum ./dist/opencode-linux-arm64.zip | cut -d' ' -f1`
-        .text()
-        .then((x) => x.trim()),
-    )
-    .replace(
-      "{{X64_URL}}",
-      `https://github.com/sst/opencode/releases/download/v${version}/opencode-linux-x64.zip`,
-    )
-    .replace(
-      "{{X64_SHA}}",
-      await $`sha256sum ./dist/opencode-linux-x64.zip | cut -d' ' -f1`
-        .text()
-        .then((x) => x.trim()),
-    )
+  const pkgbuild = [
+    "# Maintainer: dax",
+    "# Maintainer: adam",
+    "",
+    "pkgname='opencode-bin'",
+    `pkgver=${version.split("-")[0]}`,
+    "options=('!debug' '!strip')",
+    "pkgrel=1",
+    "pkgdesc='The AI coding agent built for the terminal.'",
+    "url='https://github.com/sst/opencode'",
+    "arch=('aarch64' 'x86_64')",
+    "license=('MIT')",
+    "provides=('opencode')",
+    "conflicts=('opencode')",
+    "depends=('fzf' 'ripgrep')",
+    "",
+    `source_aarch64=("\${pkgname}_\${pkgver}_aarch64.zip::https://github.com/sst/opencode/releases/download/v${version}/opencode-linux-arm64.zip")`,
+    `sha256sums_aarch64=('${arm64Sha}')`,
+    "",
+    `source_x86_64=("\${pkgname}_\${pkgver}_x86_64.zip::https://github.com/sst/opencode/releases/download/v${version}/opencode-linux-x64.zip")`,
+    `sha256sums_x86_64=('${x64Sha}')`,
+    "",
+    "package() {",
+    '  install -Dm755 ./opencode "${pkgdir}/usr/bin/opencode"',
+    "}",
+    "",
+  ].join("\n")
 
   await $`rm -rf ./dist/aur-opencode-bin`
 
@@ -151,4 +174,62 @@ if (!snapshot) {
   await $`cd ./dist/aur-opencode-bin && git add PKGBUILD .SRCINFO`
   await $`cd ./dist/aur-opencode-bin && git commit -m "Update to v${version}"`
   if (!dry) await $`cd ./dist/aur-opencode-bin && git push`
+
+  // Homebrew formula
+  const homebrewFormula = [
+    "# typed: false",
+    "# frozen_string_literal: true",
+    "",
+    "# This file was generated by GoReleaser. DO NOT EDIT.",
+    "class Opencode < Formula",
+    `  desc "The AI coding agent built for the terminal."`,
+    `  homepage "https://github.com/sst/opencode"`,
+    `  version "${version.split("-")[0]}"`,
+    "",
+    "  on_macos do",
+    "    if Hardware::CPU.intel?",
+    `      url "https://github.com/sst/opencode/releases/download/v${version}/opencode-darwin-x64.zip"`,
+    `      sha256 "${macX64Sha}"`,
+    "",
+    "      def install",
+    '        bin.install "opencode"',
+    "      end",
+    "    end",
+    "    if Hardware::CPU.arm?",
+    `      url "https://github.com/sst/opencode/releases/download/v${version}/opencode-darwin-arm64.zip"`,
+    `      sha256 "${macArm64Sha}"`,
+    "",
+    "      def install",
+    '        bin.install "opencode"',
+    "      end",
+    "    end",
+    "  end",
+    "",
+    "  on_linux do",
+    "    if Hardware::CPU.intel? and Hardware::CPU.is_64_bit?",
+    `      url "https://github.com/sst/opencode/releases/download/v${version}/opencode-linux-x64.zip"`,
+    `      sha256 "${x64Sha}"`,
+    "      def install",
+    '        bin.install "opencode"',
+    "      end",
+    "    end",
+    "    if Hardware::CPU.arm? and Hardware::CPU.is_64_bit?",
+    `      url "https://github.com/sst/opencode/releases/download/v${version}/opencode-linux-arm64.zip"`,
+    `      sha256 "${arm64Sha}"`,
+    "      def install",
+    '        bin.install "opencode"',
+    "      end",
+    "    end",
+    "  end",
+    "end",
+    "",
+    "",
+  ].join("\n")
+
+  await $`rm -rf ./dist/homebrew-tap`
+  await $`git clone https://${process.env["GITHUB_TOKEN"]}@github.com/sst/homebrew-tap.git ./dist/homebrew-tap`
+  await Bun.file("./dist/homebrew-tap/opencode.rb").write(homebrewFormula)
+  await $`cd ./dist/homebrew-tap && git add opencode.rb`
+  await $`cd ./dist/homebrew-tap && git commit -m "Update to v${version}"`
+  if (!dry) await $`cd ./dist/homebrew-tap && git push`
 }

packages/opencode/script/schema.ts

@@ -0,0 +1,8 @@
+#!/usr/bin/env bun
+
+import "zod-openapi/extend"
+import { Config } from "../src/config/config"
+import { zodToJsonSchema } from "zod-to-json-schema"
+
+const result = zodToJsonSchema(Config.Info)
+await Bun.write("config.schema.json", JSON.stringify(result, null, 2))

packages/opencode/src/app/app.ts

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

packages/opencode/src/auth/anthropic.ts

@@ -1,5 +1,4 @@
 import { generatePKCE } from "@openauthjs/openauth/pkce"
-import fs from "fs/promises"
 import { Auth } from "./index"
 
 export namespace AuthAnthropic {
@@ -9,7 +8,7 @@ export namespace AuthAnthropic {
     const pkce = await generatePKCE()
     const url = new URL("https://claude.ai/oauth/authorize", import.meta.url)
     url.searchParams.set("code", "true")
-    url.searchParams.set("client_id", "9d1c250a-e61b-44d9-88ed-5944d1962f5e")
+    url.searchParams.set("client_id", CLIENT_ID)
     url.searchParams.set("response_type", "code")
     url.searchParams.set(
       "redirect_uri",
@@ -39,7 +38,7 @@ export namespace AuthAnthropic {
         code: splits[0],
         state: splits[1],
         grant_type: "authorization_code",
-        client_id: "9d1c250a-e61b-44d9-88ed-5944d1962f5e",
+        client_id: CLIENT_ID,
         redirect_uri: "https://console.anthropic.com/oauth/code/callback",
         code_verifier: verifier,
       }),
@@ -49,6 +48,7 @@ export namespace AuthAnthropic {
     await Auth.set("anthropic", {
       type: "oauth",
       refresh: json.refresh_token as string,
+      access: json.access_token as string,
       expires: Date.now() + json.expires_in * 1000,
     })
   }
@@ -56,6 +56,7 @@ export namespace AuthAnthropic {
   export async function access() {
     const info = await Auth.get("anthropic")
     if (!info || info.type !== "oauth") return
+    if (info.access && info.expires > Date.now()) return info.access
     const response = await fetch(
       "https://console.anthropic.com/v1/oauth/token",
       {
@@ -75,6 +76,7 @@ export namespace AuthAnthropic {
     await Auth.set("anthropic", {
       type: "oauth",
       refresh: json.refresh_token as string,
+      access: json.access_token as string,
       expires: Date.now() + json.expires_in * 1000,
     })
     return json.access_token as string

packages/opencode/src/auth/index.ts

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

packages/opencode/src/bun/index.ts

@@ -43,16 +43,26 @@ export namespace BunProc {
       version: z.string(),
     }),
   )
+
   export async function install(pkg: string, version = "latest") {
-    const dir = path.join(Global.Path.cache, `node_modules`, pkg)
-    if (!(await Bun.file(path.join(dir, "package.json")).exists())) {
-      log.info("installing", { pkg })
-      await BunProc.run(["add", `${pkg}@${version}`], {
-        cwd: Global.Path.cache,
-      }).catch(() => {
-        throw new InstallFailedError({ pkg, version })
-      })
-    }
-    return dir
+    const mod = path.join(Global.Path.cache, "node_modules", pkg)
+    const pkgjson = Bun.file(path.join(Global.Path.cache, "package.json"))
+    const parsed = await pkgjson.json().catch(() => ({
+      dependencies: {},
+    }))
+    if (parsed.dependencies[pkg] === version) return mod
+    parsed.dependencies[pkg] = version
+    await Bun.write(pkgjson, JSON.stringify(parsed, null, 2))
+    await BunProc.run(["install"], {
+      cwd: Global.Path.cache,
+    }).catch((e) => {
+      new InstallFailedError(
+        { pkg, version },
+        {
+          cause: e,
+        },
+      )
+    })
+    return mod
   }
 }

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

@@ -5,17 +5,18 @@ import * as prompts from "@clack/prompts"
 import open from "open"
 import { UI } from "../ui"
 import { ModelsDev } from "../../provider/models"
+import { map, pipe, sortBy, values } from "remeda"
 
 export const AuthCommand = cmd({
   command: "auth",
-  describe: "manage credentials",
+  describe: "Manage credentials",
   builder: (yargs) =>
     yargs
       .command(AuthLoginCommand)
       .command(AuthLogoutCommand)
       .command(AuthListCommand)
       .demandCommand(),
-  async handler(args) {},
+  async handler() { },
 })
 
 export const AuthListCommand = cmd({
@@ -43,26 +44,60 @@ export const AuthLoginCommand = cmd({
   async handler() {
     UI.empty()
     prompts.intro("Add credential")
-    const provider = await prompts.select({
+    const providers = await ModelsDev.get()
+    const priority: Record<string, number> = {
+      anthropic: 0,
+      openai: 1,
+      google: 2,
+    }
+    let provider = await prompts.select({
       message: "Select provider",
-      maxItems: 2,
+      maxItems: 8,
       options: [
+        ...pipe(
+          providers,
+          values(),
+          sortBy(
+            (x) => priority[x.id] ?? 99,
+            (x) => x.name ?? x.id,
+          ),
+          map((x) => ({
+            label: x.name,
+            value: x.id,
+            hint: priority[x.id] === 0 ? "recommended" : undefined,
+          })),
+        ),
         {
-          label: "Anthropic",
-          value: "anthropic",
-        },
-        {
-          label: "OpenAI",
-          value: "openai",
-        },
-        {
-          label: "Google",
-          value: "google",
+          value: "other",
+          label: "Other",
         },
       ],
     })
+
     if (prompts.isCancel(provider)) throw new UI.CancelledError()
 
+    if (provider === "other") {
+      provider = await prompts.text({
+        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") {
+      prompts.log.info(
+        "Amazon bedrock can be configured with standard AWS environment variables like AWS_PROFILE or AWS_ACCESS_KEY_ID",
+      )
+      prompts.outro("Done")
+      return
+    }
+
     if (provider === "anthropic") {
       const method = await prompts.select({
         message: "Login method",
@@ -83,8 +118,14 @@ export const AuthLoginCommand = cmd({
         // some weird bug where program exits without this
         await new Promise((resolve) => setTimeout(resolve, 10))
         const { url, verifier } = await AuthAnthropic.authorize()
-        prompts.note("Opening browser...")
-        await open(url)
+        prompts.note("Trying to open browser...")
+        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.info(url)
 
         const code = await prompts.text({

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

@@ -6,68 +6,102 @@ 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],
-  opencode_todoread: ["Todo", UI.Style.TEXT_WARNING_BOLD],
-  opencode_bash: ["Bash", UI.Style.TEXT_DANGER_BOLD],
-  opencode_edit: ["Edit", UI.Style.TEXT_SUCCESS_BOLD],
-  opencode_glob: ["Glob", UI.Style.TEXT_INFO_BOLD],
-  opencode_grep: ["Grep", UI.Style.TEXT_INFO_BOLD],
-  opencode_list: ["List", UI.Style.TEXT_INFO_BOLD],
-  opencode_read: ["Read", UI.Style.TEXT_HIGHLIGHT_BOLD],
-  opencode_write: ["Write", UI.Style.TEXT_SUCCESS_BOLD],
+  todowrite: ["Todo", UI.Style.TEXT_WARNING_BOLD],
+  todoread: ["Todo", UI.Style.TEXT_WARNING_BOLD],
+  bash: ["Bash", UI.Style.TEXT_DANGER_BOLD],
+  edit: ["Edit", UI.Style.TEXT_SUCCESS_BOLD],
+  glob: ["Glob", UI.Style.TEXT_INFO_BOLD],
+  grep: ["Grep", UI.Style.TEXT_INFO_BOLD],
+  list: ["List", UI.Style.TEXT_INFO_BOLD],
+  read: ["Read", UI.Style.TEXT_HIGHLIGHT_BOLD],
+  write: ["Write", UI.Style.TEXT_SUCCESS_BOLD],
+  websearch: ["Search", UI.Style.TEXT_DIM_BOLD],
 }
 
-export const RunCommand = {
+export const RunCommand = cmd({
   command: "run [message..]",
-  describe: "Run OpenCode with a message",
+  describe: "Run opencode with a message",
   builder: (yargs: Argv) => {
     return yargs
       .positional("message", {
-        describe: "Message to send",
+        describe: "message to send",
         type: "string",
         array: true,
         default: [],
       })
+      .option("continue", {
+        alias: ["c"],
+        describe: "Continue the last session",
+        type: "boolean",
+      })
       .option("session", {
+        alias: ["s"],
         describe: "Session ID to continue",
         type: "string",
       })
+      .option("share", {
+        type: "boolean",
+        describe: "share the session",
+      })
+      .option("model", {
+        type: "string",
+        alias: ["m"],
+        describe: "Model to use in the format of provider/model",
+      })
   },
-  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()
-        const session = args.session
-          ? await Session.get(args.session)
-          : await Session.create()
+        const session = await (async () => {
+          if (args.continue) {
+            const first = await Session.list().next()
+            if (first.done) return
+            return first.value
+          }
 
-        UI.println(UI.Style.TEXT_HIGHLIGHT_BOLD + "◍  OpenCode", VERSION)
+          if (args.session) return Session.get(args.session)
+
+          return Session.create()
+        })()
+
+        if (!session) {
+          UI.error("Session not found")
+          return
+        }
+
+        UI.empty()
+        UI.println(UI.logo())
         UI.empty()
         UI.println(UI.Style.TEXT_NORMAL_BOLD + "> ", message)
         UI.empty()
-        UI.println(
-          UI.Style.TEXT_INFO_BOLD +
-            "~  https://dev.opencode.ai/s/" +
+
+        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://opencode.ai/s/" +
             session.id.slice(-8),
+          )
+        }
+        UI.empty()
+
+        const { providerID, modelID } = args.model
+          ? Provider.parseModel(args.model)
+          : await Provider.defaultModel()
+        UI.println(
+          UI.Style.TEXT_NORMAL_BOLD + "@ ",
+          UI.Style.TEXT_NORMAL + `${providerID}/${modelID}`,
         )
         UI.empty()
 
@@ -75,8 +109,8 @@ export const RunCommand = {
           UI.println(
             color + `|`,
             UI.Style.TEXT_NORMAL +
-              UI.Style.TEXT_DIM +
-              ` ${type.padEnd(7, " ")}`,
+            UI.Style.TEXT_DIM +
+            ` ${type.padEnd(7, " ")}`,
             "",
             UI.Style.TEXT_NORMAL + title,
           )
@@ -113,8 +147,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 +162,4 @@ export const RunCommand = {
       },
     )
   },
-}
+})

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

@@ -1,14 +1,18 @@
 import { App } from "../../app/app"
-import { VERSION } from "../version"
+import { LSP } from "../../lsp"
 import { cmd } from "./cmd"
 
 export const ScrapCommand = cmd({
   command: "scrap <file>",
   builder: (yargs) =>
     yargs.positional("file", { type: "string", demandOption: true }),
-  async handler() {
-    await App.provide({ cwd: process.cwd(), version: VERSION }, async (app) => {
-      Bun.resolveSync("typescript/lib/tsserver.js", app.path.cwd)
-    })
+  async handler(args) {
+    await App.provide(
+      { cwd: process.cwd() },
+      async () => {
+        await LSP.touchFile(args.file, true)
+        console.log(await LSP.diagnostics())
+      },
+    )
   },
 })

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

@@ -0,0 +1,44 @@
+import type { Argv } from "yargs"
+import { UI } from "../ui"
+import * as prompts from "@clack/prompts"
+import { Installation } from "../../installation"
+
+export const UpgradeCommand = {
+  command: "upgrade [target]",
+  describe: "upgrade opencode to the latest version or a specific version",
+  builder: (yargs: Argv) => {
+    return yargs.positional("target", {
+      describe: "specific version to upgrade to (e.g., '0.1.48' or 'v0.1.48')",
+      type: "string",
+    })
+  },
+  handler: async (args: { target?: string }) => {
+    UI.empty()
+    UI.println(UI.logo("  "))
+    UI.empty()
+    prompts.intro("Upgrade")
+    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 target = args.target ?? (await Installation.latest())
+    prompts.log.info(`From ${Installation.VERSION} → ${target}`)
+    const spinner = prompts.spinner()
+    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("Upgrade complete")
+    prompts.outro("Done")
+  },
+}

packages/opencode/src/cli/error.ts

@@ -0,0 +1,13 @@
+import { Config } from "../config/config"
+
+export function FormatError(input: unknown) {
+  if (Config.JsonError.isInstance(input))
+    return `Config file at ${input.data.path} is not valid JSON`
+  if (Config.InvalidError.isInstance(input))
+    return [
+      `Config file at ${input.data.path} is invalid`,
+      ...(input.data.issues?.map(
+        (issue) => "↳ " + issue.message + " " + issue.path.join("."),
+      ) ?? []),
+    ].join("\n")
+}

packages/opencode/src/cli/router.ts

@@ -1,193 +0,0 @@
-import { createCli, type TrpcCliMeta } from "trpc-cli"
-import { initTRPC } from "@trpc/server"
-import { z } from "zod"
-import { Server } from "../server/server"
-import { AuthAnthropic } from "../auth/anthropic"
-import { UI } from "./ui"
-import { App } from "../app/app"
-import { Bus } from "../bus"
-import { Provider } from "../provider/provider"
-import { Session } from "../session"
-import { Share } from "../share/share"
-import { Message } from "../session/message"
-import { VERSION } from "./version"
-import { LSP } from "../lsp"
-import fs from "fs/promises"
-import path from "path"
-
-const t = initTRPC.meta<TrpcCliMeta>().create()
-
-export const router = t.router({
-  generate: t.procedure
-    .meta({
-      description: "Generate OpenAPI and event specs",
-    })
-    .input(z.object({}))
-    .mutation(async () => {
-      const specs = await Server.openapi()
-      const dir = "gen"
-      await fs.rmdir(dir, { recursive: true }).catch(() => {})
-      await fs.mkdir(dir, { recursive: true })
-      await Bun.write(
-        path.join(dir, "openapi.json"),
-        JSON.stringify(specs, null, 2),
-      )
-      return "Generated OpenAPI specs in gen/ directory"
-    }),
-
-  run: t.procedure
-    .meta({
-      description: "Run OpenCode with a message",
-    })
-    .input(
-      z.object({
-        message: z.array(z.string()).default([]).describe("Message to send"),
-        session: z.string().optional().describe("Session ID to continue"),
-      }),
-    )
-    .mutation(
-      async ({ input }: { input: { message: string[]; session?: string } }) => {
-        const message = input.message.join(" ")
-        await App.provide(
-          {
-            cwd: process.cwd(),
-            version: "0.0.0",
-          },
-          async () => {
-            await Share.init()
-            const session = input.session
-              ? await Session.get(input.session)
-              : await Session.create()
-
-            UI.println(UI.Style.TEXT_HIGHLIGHT_BOLD + "◍  OpenCode", VERSION)
-            UI.empty()
-            UI.println(UI.Style.TEXT_NORMAL_BOLD + "> ", message)
-            UI.empty()
-            UI.println(
-              UI.Style.TEXT_INFO_BOLD +
-                "~  https://dev.opencode.ai/s?id=" +
-                session.id.slice(-8),
-            )
-            UI.empty()
-
-            function printEvent(color: string, type: string, title: string) {
-              UI.println(
-                color + `|`,
-                UI.Style.TEXT_NORMAL +
-                  UI.Style.TEXT_DIM +
-                  ` ${type.padEnd(7, " ")}`,
-                "",
-                UI.Style.TEXT_NORMAL + title,
-              )
-            }
-
-            Bus.subscribe(Message.Event.PartUpdated, async (message) => {
-              const part = message.properties.part
-              if (
-                part.type === "tool-invocation" &&
-                part.toolInvocation.state === "result"
-              ) {
-                if (part.toolInvocation.toolName === "opencode_todowrite")
-                  return
-
-                const args = part.toolInvocation.args as any
-                const tool = part.toolInvocation.toolName
-
-                if (tool === "opencode_edit")
-                  printEvent(UI.Style.TEXT_SUCCESS_BOLD, "Edit", args.filePath)
-                if (tool === "opencode_bash")
-                  printEvent(
-                    UI.Style.TEXT_WARNING_BOLD,
-                    "Execute",
-                    args.command,
-                  )
-                if (tool === "opencode_read")
-                  printEvent(UI.Style.TEXT_INFO_BOLD, "Read", args.filePath)
-                if (tool === "opencode_write")
-                  printEvent(
-                    UI.Style.TEXT_SUCCESS_BOLD,
-                    "Create",
-                    args.filePath,
-                  )
-                if (tool === "opencode_list")
-                  printEvent(UI.Style.TEXT_INFO_BOLD, "List", args.path)
-                if (tool === "opencode_glob")
-                  printEvent(
-                    UI.Style.TEXT_INFO_BOLD,
-                    "Glob",
-                    args.pattern + (args.path ? " in " + args.path : ""),
-                  )
-              }
-
-              if (part.type === "text") {
-                if (part.text.includes("\n")) {
-                  UI.empty()
-                  UI.println(part.text)
-                  UI.empty()
-                  return
-                }
-                printEvent(UI.Style.TEXT_NORMAL_BOLD, "Text", part.text)
-              }
-            })
-
-            const { providerID, modelID } = await Provider.defaultModel()
-            await Session.chat({
-              sessionID: session.id,
-              providerID,
-              modelID,
-              parts: [
-                {
-                  type: "text",
-                  text: message,
-                },
-              ],
-            })
-            UI.empty()
-          },
-        )
-        return "Session completed"
-      },
-    ),
-
-  scrap: t.procedure
-    .meta({
-      description: "Test command for scraping files",
-    })
-    .input(
-      z.object({
-        file: z.string().describe("File to process"),
-      }),
-    )
-    .mutation(async ({ input }: { input: { file: string } }) => {
-      await App.provide({ cwd: process.cwd(), version: VERSION }, async () => {
-        await LSP.touchFile(input.file, true)
-        await LSP.diagnostics()
-      })
-      return `Processed file: ${input.file}`
-    }),
-
-  login: t.router({
-    anthropic: t.procedure
-      .meta({
-        description: "Login to Anthropic",
-      })
-      .input(z.object({}))
-      .mutation(async () => {
-        const { url, verifier } = await AuthAnthropic.authorize()
-
-        UI.println("Login to Anthropic")
-        UI.println("Open the following URL in your browser:")
-        UI.println(url)
-        UI.println("")
-
-        const code = await UI.input("Paste the authorization code here: ")
-        await AuthAnthropic.exchange(code, verifier)
-        return "Successfully logged in to Anthropic"
-      }),
-  }),
-})
-
-export function createOpenCodeCli() {
-  return createCli({ router })
-}
-

packages/opencode/src/cli/ui.ts

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

packages/opencode/src/cli/version.ts

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

packages/opencode/src/config/config.ts

@@ -1,55 +1,159 @@
 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"
+import { NamedError } from "../util/error"
 
 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,
-        app.path.cwd,
-        app.path.root,
-      )
-      if (!resolved) continue
-      try {
-        result = await import(resolved).then((mod) => Info.parse(mod.default))
-        log.info("found", { path: resolved })
-        break
-      } catch (e) {
-        if (e instanceof z.ZodError) {
-          for (const issue of e.issues) {
-            log.info(issue.message)
-          }
-          throw e
-        }
-        continue
+      const found = await Filesystem.findUp(file, app.path.cwd, app.path.root)
+      for (const resolved of found.toReversed()) {
+        result = mergeDeep(result, await load(resolved))
       }
     }
     log.info("loaded", result)
     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").describe("Type of MCP server connection"),
+      command: z
+        .string()
+        .array()
+        .describe("Command and arguments to run the MCP server"),
+      environment: z
+        .record(z.string(), z.string())
+        .optional()
+        .describe("Environment variables to set when running the MCP server"),
+    })
+    .strict()
+    .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").describe("Type of MCP server connection"),
+      url: z.string().describe("URL of the remote MCP server"),
+    })
+    .strict()
+    .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()
+        .describe("Leader key for keybind combinations"),
+      help: z.string().optional().describe("Show help dialog"),
+      editor_open: z.string().optional().describe("Open external editor"),
+      session_new: z.string().optional().describe("Create a new session"),
+      session_list: z.string().optional().describe("List all sessions"),
+      session_share: z.string().optional().describe("Share current session"),
+      session_interrupt: z
+        .string()
+        .optional()
+        .describe("Interrupt current session"),
+      session_compact: z
+        .string()
+        .optional()
+        .describe("Toggle compact mode for session"),
+      tool_details: z.string().optional().describe("Show tool details"),
+      model_list: z.string().optional().describe("List available models"),
+      theme_list: z.string().optional().describe("List available themes"),
+      project_init: z
+        .string()
+        .optional()
+        .describe("Initialize project configuration"),
+      input_clear: z.string().optional().describe("Clear input field"),
+      input_paste: z.string().optional().describe("Paste from clipboard"),
+      input_submit: z.string().optional().describe("Submit input"),
+      input_newline: z.string().optional().describe("Insert newline in input"),
+      history_previous: z
+        .string()
+        .optional()
+        .describe("Navigate to previous history item"),
+      history_next: z
+        .string()
+        .optional()
+        .describe("Navigate to next history item"),
+      messages_page_up: z
+        .string()
+        .optional()
+        .describe("Scroll messages up by one page"),
+      messages_page_down: z
+        .string()
+        .optional()
+        .describe("Scroll messages down by one page"),
+      messages_half_page_up: z
+        .string()
+        .optional()
+        .describe("Scroll messages up by half page"),
+      messages_half_page_down: z
+        .string()
+        .optional()
+        .describe("Scroll messages down by half page"),
+      messages_previous: z
+        .string()
+        .optional()
+        .describe("Navigate to previous message"),
+      messages_next: z.string().optional().describe("Navigate to next message"),
+      messages_first: z
+        .string()
+        .optional()
+        .describe("Navigate to first message"),
+      messages_last: z.string().optional().describe("Navigate to last message"),
+      app_exit: z.string().optional().describe("Exit the application"),
+    })
+    .strict()
+    .openapi({
+      ref: "Config.Keybinds",
+    })
   export const Info = z
     .object({
+      $schema: z
+        .string()
+        .optional()
+        .describe("JSON schema reference for configuration validation"),
+      theme: z
+        .string()
+        .optional()
+        .describe("Theme name to use for the interface"),
+      keybinds: Keybinds.optional().describe("Custom keybind configurations"),
+      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({
@@ -57,18 +161,72 @@ export namespace Config {
             options: z.record(z.any()).optional(),
           }),
         )
-        .optional(),
-      tool: z
-        .object({
-          provider: z.record(z.string(), z.string().array()).optional(),
-        })
-        .optional(),
-      mcp: z.record(z.string(), Mcp).optional(),
+        .optional()
+        .describe("Custom provider configurations and model overrides"),
+      mcp: z
+        .record(z.string(), Mcp)
+        .optional()
+        .describe("MCP (Model Context Protocol) server configurations"),
     })
     .strict()
+    .openapi({
+      ref: "Config.Info",
+    })
 
   export type Info = z.output<typeof Info>
 
+  export const global = lazy(async () => {
+    let result = await load(path.join(Global.Path.config, "config.json"))
+
+    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["$schema"] = "https://opencode.ai/config.json"
+        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 result
+  })
+
+  async function load(path: string) {
+    const data = await Bun.file(path)
+      .json()
+      .catch((err) => {
+        if (err.code === "ENOENT") return {}
+        throw new JsonError({ path }, { cause: err })
+      })
+
+    const parsed = Info.safeParse(data)
+    if (parsed.success) return parsed.data
+    throw new InvalidError({ path, issues: parsed.error.issues })
+  }
+
+  export const JsonError = NamedError.create(
+    "ConfigJsonError",
+    z.object({
+      path: z.string(),
+    }),
+  )
+
+  export const InvalidError = NamedError.create(
+    "ConfigInvalidError",
+    z.object({
+      path: z.string(),
+      issues: z.custom<z.ZodIssue[]>().optional(),
+    }),
+  )
+
   export function get() {
     return state()
   }

packages/opencode/src/external/fzf.ts

@@ -1,4 +1,3 @@
-import { App } from "../app/app"
 import path from "path"
 import { Global } from "../global"
 import fs from "fs/promises"
@@ -6,6 +5,7 @@ import { z } from "zod"
 import { NamedError } from "../util/error"
 import { lazy } from "../util/lazy"
 import { Log } from "../util/log"
+import { $ } from "bun"
 
 export namespace Fzf {
   const log = Log.create({ service: "fzf" })
@@ -116,19 +116,23 @@ export namespace Fzf {
     return filepath
   }
 
-  export async function search(cwd: string, query: string) {
-    const process = Bun.spawn({
-      cwd,
-      stdin: "inherit",
-      stdout: "pipe",
-      stderr: "pipe",
-      cmd: [await filepath(), "--filter", query],
-    })
-    await process.exited
-    const stdout = await Bun.readableStreamToText(process.stdout)
-    return stdout
+  export async function search(input: {
+    cwd: string
+    query: string
+    limit?: number
+  }) {
+    const results = await $`${await filepath()} --filter=${input.query}`
+      .quiet()
+      .throws(false)
+      .cwd(input.cwd)
+      .text()
+    const split = results
       .trim()
       .split("\n")
       .filter((line) => line.length > 0)
+    log.info("results", {
+      count: split.length,
+    })
+    return split
   }
 }

packages/opencode/src/external/ripgrep.ts

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

packages/opencode/src/file/index.ts

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

packages/opencode/src/flag/flag.ts

@@ -0,0 +1,8 @@
+export namespace Flag {
+  export const OPENCODE_AUTO_SHARE = truthy("OPENCODE_AUTO_SHARE")
+
+  function truthy(key: string) {
+    const value = process.env[key]?.toLowerCase()
+    return value === "true" || value === "1"
+  }
+}

packages/opencode/src/global/index.ts

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

packages/opencode/src/index.ts

@@ -3,25 +3,27 @@ import { App } from "./app/app"
 import { Server } from "./server/server"
 import fs from "fs/promises"
 import path from "path"
-
 import { Share } from "./share/share"
-
 import { Global } from "./global"
-
 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"
+import { NamedError } from "./util/error"
+import { FormatError } from "./cli/error"
 
 const cli = yargs(hideBin(process.argv))
   .scriptName("opencode")
-  .version(VERSION)
+  .version(Installation.VERSION)
   .option("print-logs", {
     describe: "Print logs to stderr",
     type: "boolean",
@@ -29,14 +31,14 @@ 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),
     })
   })
   .usage("\n" + UI.logo())
   .command({
     command: "$0 [project]",
-    describe: "Start OpenCode TUI",
+    describe: "start opencode TUI",
     builder: (yargs) =>
       yargs.positional("project", {
         type: "string",
@@ -46,51 +48,65 @@ const cli = yargs(hideBin(process.argv))
       while (true) {
         const cwd = args.project ? path.resolve(args.project) : process.cwd()
         process.chdir(cwd)
-        const result = await App.provide(
-          { cwd, version: VERSION },
-          async () => {
-            const providers = await Provider.list()
-            if (Object.keys(providers).length === 0) {
-              return "needs_provider"
+        const result = await App.provide({ cwd }, async (app) => {
+          const providers = await Provider.list()
+          if (Object.keys(providers).length === 0) {
+            return "needs_provider"
+          }
+
+          await Share.init()
+          const server = Server.listen()
+
+          let cmd = ["go", "run", "./main.go"]
+          let cwd = new URL("../../tui/cmd/opencode", import.meta.url).pathname
+          if (Bun.embeddedFiles.length > 0) {
+            const blob = Bun.embeddedFiles[0] as File
+            const binary = path.join(Global.Path.cache, "tui", blob.name)
+            const file = Bun.file(binary)
+            if (!(await file.exists())) {
+              await Bun.write(file, blob, { mode: 0o755 })
+              await fs.chmod(binary, 0o755)
             }
+            cwd = process.cwd()
+            cmd = [binary]
+          }
+          const proc = Bun.spawn({
+            cmd: [...cmd, ...process.argv.slice(2)],
+            cwd,
+            stdout: "inherit",
+            stderr: "inherit",
+            stdin: "inherit",
+            env: {
+              ...process.env,
+              OPENCODE_SERVER: server.url.toString(),
+              OPENCODE_APP_INFO: JSON.stringify(app),
+            },
+            onExit: () => {
+              server.stop()
+            },
+          })
 
-            await Share.init()
-            const server = Server.listen()
+          ;(async () => {
+            if (Installation.VERSION === "dev") return
+            if (Installation.isSnapshot()) return
+            const config = await 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,
-              cwd,
-              stdout: "inherit",
-              stderr: "inherit",
-              stdin: "inherit",
-              env: {
-                ...process.env,
-                OPENCODE_SERVER: server.url.toString(),
-              },
-              onExit: () => {
-                server.stop()
-              },
-            })
-            await proc.exited
-            await server.stop()
+          await proc.exited
+          server.stop()
 
-            return "done"
-          },
-        )
+          return "done"
+        })
         if (result === "done") break
         if (result === "needs_provider") {
           UI.empty()
@@ -105,21 +121,39 @@ const cli = yargs(hideBin(process.argv))
   .command(GenerateCommand)
   .command(ScrapCommand)
   .command(AuthCommand)
-  .fail((msg, err) => {
+  .command(UpgradeCommand)
+  .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)
+  const data: Record<string, any> = {}
+  if (e instanceof NamedError) {
+    const obj = e.toObject()
+    Object.assign(data, {
+      ...obj.data,
+    })
+  }
+  if (e instanceof Error) {
+    Object.assign(data, {
+      name: e.name,
+      message: e.message,
+      cause: e.cause?.toString(),
+    })
+  }
+  Log.Default.error("fatal", data)
+  const formatted = FormatError(e)
+  if (formatted) UI.error(formatted)
+  if (!formatted)
+    UI.error(
+      "Unexpected error, check log file at " + Log.file() + " for more details",
+    )
 }

packages/opencode/src/installation/index.ts

@@ -0,0 +1,126 @@
+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 function isDev() {
+    return VERSION === "dev"
+  }
+
+  export async function method() {
+    if (process.execPath.includes(path.join(".opencode", "bin"))) return "curl"
+    const exec = process.execPath.toLowerCase()
+
+    const checks = [
+      {
+        name: "npm" as const,
+        command: () => $`npm list -g --depth=0`.throws(false).text(),
+      },
+      {
+        name: "yarn" as const,
+        command: () => $`yarn global list`.throws(false).text(),
+      },
+      {
+        name: "pnpm" as const,
+        command: () => $`pnpm list -g --depth=0`.throws(false).text(),
+      },
+      {
+        name: "bun" as const,
+        command: () => $`bun pm ls -g`.throws(false).text(),
+      },
+    ]
+
+    checks.sort((a, b) => {
+      const aMatches = exec.includes(a.name)
+      const bMatches = exec.includes(b.name)
+      if (aMatches && !bMatches) return -1
+      if (!aMatches && bMatches) return 1
+      return 0
+    })
+
+    for (const check of checks) {
+      const output = await check.command()
+      if (output.includes("opencode-ai")) {
+        return check.name
+      }
+    }
+
+    return "unknown"
+  }
+
+  export const UpgradeFailedError = NamedError.create(
+    "UpgradeFailedError",
+    z.object({
+      stderr: z.string(),
+    }),
+  )
+
+  export async function upgrade(method: Method, target: string) {
+    const cmd = (() => {
+      switch (method) {
+        case "curl":
+          return $`curl -fsSL https://opencode.ai/install | bash`
+        case "npm":
+          return $`npm install -g opencode-ai@${target}`
+        case "pnpm":
+          return $`pnpm install -g opencode-ai@${target}`
+        case "bun":
+          return $`bun install -g opencode-ai@${target}`
+        default:
+          throw new Error(`Unknown method: ${method}`)
+      }
+    })()
+    const result = await cmd.quiet().throws(false)
+    if (result.exitCode !== 0)
+      throw new UpgradeFailedError({
+        stderr: result.stderr.toString("utf8"),
+      })
+  }
+
+  export const VERSION =
+    typeof OPENCODE_VERSION === "string" ? OPENCODE_VERSION : "dev"
+
+  export async function latest() {
+    return fetch("https://api.github.com/repos/sst/opencode/releases/latest")
+      .then((res) => res.json())
+      .then((data) => data.tag_name.slice(1) as string)
+  }
+}

packages/opencode/src/lsp/client.ts

@@ -11,6 +11,7 @@ import { LANGUAGE_EXTENSIONS } from "./language"
 import { Bus } from "../bus"
 import z from "zod"
 import type { LSPServer } from "./server"
+import { NamedError } from "../util/error"
 
 export namespace LSPClient {
   const log = Log.create({ service: "lsp.client" })
@@ -19,6 +20,13 @@ export namespace LSPClient {
 
   export type Diagnostic = VSCodeDiagnostic
 
+  export const InitializeError = NamedError.create(
+    "LSPInitializeError",
+    z.object({
+      serverID: z.string(),
+    }),
+  )
+
   export const Event = {
     Diagnostics: Bus.event(
       "lsp.client.diagnostics",
@@ -52,32 +60,40 @@ export namespace LSPClient {
     })
     connection.listen()
 
-    await connection.sendRequest("initialize", {
-      processId: server.process.pid,
-      workspaceFolders: [
-        {
-          name: "workspace",
-          uri: "file://" + app.path.cwd,
-        },
-      ],
-      initializationOptions: {
-        ...server.initialization,
-      },
-      capabilities: {
-        workspace: {
-          configuration: true,
-        },
-        textDocument: {
-          synchronization: {
-            didOpen: true,
-            didChange: true,
+    log.info("sending initialize", { id: serverID })
+    await Promise.race([
+      connection.sendRequest("initialize", {
+        processId: server.process.pid,
+        workspaceFolders: [
+          {
+            name: "workspace",
+            uri: "file://" + app.path.cwd,
           },
-          publishDiagnostics: {
-            versionSupport: true,
+        ],
+        initializationOptions: {
+          ...server.initialization,
+        },
+        capabilities: {
+          workspace: {
+            configuration: true,
+          },
+          textDocument: {
+            synchronization: {
+              didOpen: true,
+              didChange: true,
+            },
+            publishDiagnostics: {
+              versionSupport: true,
+            },
           },
         },
-      },
-    })
+      }),
+      new Promise((_, reject) => {
+        setTimeout(() => {
+          reject(new InitializeError({ serverID }))
+        }, 5_000)
+      }),
+    ])
     await connection.sendNotification("initialized", {})
     log.info("initialized")
 

packages/opencode/src/lsp/index.ts

@@ -12,9 +12,10 @@ export namespace LSP {
     async () => {
       log.info("initializing")
       const clients = new Map<string, LSPClient.Info>()
-
+      const skip = new Set<string>()
       return {
         clients,
+        skip,
       }
     },
     async (state) => {
@@ -31,11 +32,19 @@ export namespace LSP {
       x.extensions.includes(extension),
     )
     for (const match of matches) {
+      if (s.skip.has(match.id)) continue
       const existing = s.clients.get(match.id)
       if (existing) continue
       const handle = await match.spawn(App.info())
-      if (!handle) continue
-      const client = await LSPClient.create(match.id, handle)
+      if (!handle) {
+        s.skip.add(match.id)
+        continue
+      }
+      const client = await LSPClient.create(match.id, handle).catch(() => {})
+      if (!client) {
+        s.skip.add(match.id)
+        continue
+      }
       s.clients.set(match.id, client)
     }
     if (waitForDiagnostics) {

packages/opencode/src/lsp/server.ts

@@ -70,6 +70,9 @@ export namespace LSPServer {
           const proc = Bun.spawn({
             cmd: ["go", "install", "golang.org/x/tools/gopls@latest"],
             env: { ...process.env, GOBIN: Global.Path.bin },
+            stdout: "pipe",
+            stderr: "pipe",
+            stdin: "pipe",
           })
           const exit = await proc.exited
           if (exit !== 0) {

packages/opencode/src/permission/index.ts

@@ -64,6 +64,7 @@ export namespace Permission {
     title: Info["title"]
     metadata: Info["metadata"]
   }) {
+    return
     const { pending, approved } = state()
     log.info("asking", {
       sessionID: input.sessionID,

packages/opencode/src/provider/models.ts

@@ -7,31 +7,42 @@ export namespace ModelsDev {
   const log = Log.create({ service: "models.dev" })
   const filepath = path.join(Global.Path.cache, "models.json")
 
-  export const Model = z.object({
-    name: z.string(),
-    attachment: z.boolean(),
-    reasoning: z.boolean(),
-    temperature: z.boolean(),
-    cost: z.object({
-      input: z.number(),
-      output: z.number(),
-      inputCached: z.number(),
-      outputCached: z.number(),
-    }),
-    limit: z.object({
-      context: z.number(),
-      output: z.number(),
-    }),
-    id: z.string(),
-  })
+  export const Model = z
+    .object({
+      name: z.string(),
+      attachment: z.boolean(),
+      reasoning: z.boolean(),
+      temperature: z.boolean(),
+      cost: z.object({
+        input: z.number(),
+        output: z.number(),
+        cache_read: z.number().optional(),
+        cache_write: z.number().optional(),
+      }),
+      limit: z.object({
+        context: z.number(),
+        output: z.number(),
+      }),
+      id: z.string(),
+    })
+    .openapi({
+      ref: "Model.Info",
+    })
   export type Model = z.infer<typeof Model>
 
-  export const Provider = z.object({
-    name: z.string(),
-    env: z.array(z.string()),
-    id: z.string(),
-    models: z.record(Model),
-  })
+  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({
+      ref: "Provider.Info",
+    })
+
   export type Provider = z.infer<typeof Provider>
 
   export async function get() {

packages/opencode/src/provider/provider.ts

@@ -1,11 +1,9 @@
 import z from "zod"
 import { App } from "../app/app"
 import { Config } from "../config/config"
-import { mergeDeep, pipe, sortBy } from "remeda"
+import { mergeDeep, sortBy } from "remeda"
 import { NoSuchModelError, type LanguageModel, type Provider as SDK } from "ai"
 import { Log } from "../util/log"
-import path from "path"
-import { Global } from "../global"
 import { BunProc } from "../bun"
 import { BashTool } from "../tool/bash"
 import { EditTool } from "../tool/edit"
@@ -29,11 +27,15 @@ import { TaskTool } from "../tool/task"
 export namespace Provider {
   const log = Log.create({ service: "provider" })
 
-  type CustomLoader = (
-    provider: ModelsDev.Provider,
-  ) => Promise<Record<string, any> | false>
+  type CustomLoader = (provider: ModelsDev.Provider) => Promise<
+    | {
+        getModel?: (sdk: any, modelID: string) => Promise<any>
+        options: Record<string, any>
+      }
+    | false
+  >
 
-  type Source = "env" | "config" | "custom"
+  type Source = "env" | "config" | "custom" | "api"
 
   const CUSTOM_LOADERS: Record<string, CustomLoader> = {
     async anthropic(provider) {
@@ -42,27 +44,56 @@ 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",
+        options: {
+          apiKey: "",
+          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,
+            })
+          },
         },
       }
     },
+    openai: async () => {
+      return {
+        async getModel(sdk: any, modelID: string) {
+          return sdk.responses(modelID)
+        },
+        options: {},
+      }
+    },
     "amazon-bedrock": async () => {
-      if (!process.env["AWS_PROFILE"]) return false
+      if (!process.env["AWS_PROFILE"]) false
+
+      const region = process.env["AWS_REGION"] ?? "us-east-1"
+
       const { fromNodeProviderChain } = await import(
         await BunProc.install("@aws-sdk/credential-providers")
       )
       return {
-        region: process.env["AWS_REGION"] ?? "us-east-1",
-        credentialProvider: fromNodeProviderChain(),
+        options: {
+          region,
+          credentialProvider: fromNodeProviderChain(),
+        },
+        async getModel(sdk: any, modelID: string) {
+          if (modelID.includes("claude")) {
+            const prefix = region.split("-")[0]
+            modelID = `${prefix}.${modelID}`
+          }
+          return sdk.languageModel(modelID)
+        },
       }
     },
   }
@@ -75,6 +106,7 @@ export namespace Provider {
       [providerID: string]: {
         source: Source
         info: ModelsDev.Provider
+        getModel?: (sdk: any, modelID: string) => Promise<any>
         options: Record<string, any>
       }
     } = {}
@@ -84,32 +116,38 @@ export namespace Provider {
     >()
     const sdk = new Map<string, SDK>()
 
-    log.info("loading")
+    log.info("init")
 
     function mergeProvider(
       id: string,
       options: Record<string, any>,
       source: Source,
+      getModel?: (sdk: any, modelID: string) => Promise<any>,
     ) {
       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
       }
       provider.options = mergeDeep(provider.options, options)
       provider.source = source
+      provider.getModel = getModel ?? provider.getModel
     }
 
-    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 ?? {},
@@ -141,28 +179,44 @@ 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")
       }
     }
 
+    // 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")
+      }
+    }
+
     // 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")
+      if (result)
+        mergeProvider(providerID, result.options, "custom", result.getModel)
     }
 
     // load config
-    for (const [providerID, provider] of Object.entries(
-      config.provider ?? {},
-    )) {
+    for (const [providerID, provider] of configProviders) {
       mergeProvider(providerID, provider.options ?? {}, "config")
     }
 
-    for (const providerID of Object.keys(providers)) {
-      log.info("loaded", { providerID })
+    for (const [providerID, provider] of Object.entries(providers)) {
+      if (Object.keys(provider.info.models).length === 0) {
+        delete providers[providerID]
+        continue
+      }
+      log.info("found", { providerID })
     }
 
     return {
@@ -176,32 +230,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: provider.id,
+      })
       const s = await state()
-      const existing = s.sdk.get(providerID)
+      const existing = s.sdk.get(provider.id)
       if (existing) return existing
-      const dir = path.join(
-        Global.Path.cache,
-        `node_modules`,
-        `@ai-sdk`,
-        providerID,
-      )
-      if (!(await Bun.file(path.join(dir, "package.json")).exists())) {
-        log.info("installing", {
-          providerID,
-        })
-        await BunProc.run(["add", `@ai-sdk/${providerID}@alpha`], {
-          cwd: Global.Path.cache,
-        })
-      }
-      const mod = await import(path.join(dir))
+      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 })
     })
   }
 
@@ -210,7 +254,7 @@ export namespace Provider {
     const s = await state()
     if (s.models.has(key)) return s.models.get(key)!
 
-    log.info("loading", {
+    log.info("getModel", {
       providerID,
       modelID,
     })
@@ -219,13 +263,12 @@ 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 =
-        // @ts-expect-error
-        "responses" in sdk ? sdk.responses(modelID) : sdk.languageModel(modelID)
+      const language = provider.getModel
+        ? await provider.getModel(sdk, modelID)
+        : sdk.languageModel(modelID)
       log.info("found", { providerID, modelID })
       s.models.set(key, {
         info,
@@ -262,7 +305,15 @@ export namespace Provider {
   }
 
   export async function defaultModel() {
-    const [provider] = await list().then((val) => Object.values(val))
+    const cfg = await Config.get()
+    if (cfg.model) return parseModel(cfg.model)
+    const provider = await list()
+      .then((val) => Object.values(val))
+      .then((x) =>
+        x.find(
+          (p) => !cfg.provider || Object.keys(cfg.provider).includes(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")
@@ -272,6 +323,14 @@ export namespace Provider {
     }
   }
 
+  export function parseModel(model: string) {
+    const [providerID, ...rest] = model.split("/")
+    return {
+      providerID: providerID,
+      modelID: rest.join("/"),
+    }
+  }
+
   const TOOLS = [
     BashTool,
     EditTool,
@@ -290,20 +349,63 @@ export namespace Provider {
     TaskTool,
     TodoReadTool,
   ]
+
   const TOOL_MAPPING: Record<string, Tool.Info[]> = {
-    anthropic: TOOLS.filter((t) => t.id !== "opencode.patch"),
-    openai: TOOLS,
+    anthropic: TOOLS.filter((t) => t.id !== "patch"),
+    openai: TOOLS.map((t) => ({
+      ...t,
+      parameters: optionalToNullable(t.parameters),
+    })),
+    azure: TOOLS.map((t) => ({
+      ...t,
+      parameters: optionalToNullable(t.parameters),
+    })),
     google: TOOLS,
   }
+
   export async function tools(providerID: string) {
+    /*
     const cfg = await Config.get()
     if (cfg.tool?.provider?.[providerID])
       return cfg.tool.provider[providerID].map(
         (id) => TOOLS.find((t) => t.id === id)!,
       )
+        */
     return TOOL_MAPPING[providerID] ?? TOOLS
   }
 
+  function optionalToNullable(schema: z.ZodTypeAny): z.ZodTypeAny {
+    if (schema instanceof z.ZodObject) {
+      const shape = schema.shape
+      const newShape: Record<string, z.ZodTypeAny> = {}
+
+      for (const [key, value] of Object.entries(shape)) {
+        const zodValue = value as z.ZodTypeAny
+        if (zodValue instanceof z.ZodOptional) {
+          newShape[key] = zodValue.unwrap().nullable()
+        } else {
+          newShape[key] = optionalToNullable(zodValue)
+        }
+      }
+
+      return z.object(newShape)
+    }
+
+    if (schema instanceof z.ZodArray) {
+      return z.array(optionalToNullable(schema.element))
+    }
+
+    if (schema instanceof z.ZodUnion) {
+      return z.union(
+        schema.options.map((option: z.ZodTypeAny) =>
+          optionalToNullable(option),
+        ) as [z.ZodTypeAny, z.ZodTypeAny, ...z.ZodTypeAny[]],
+      )
+    }
+
+    return schema
+  }
+
   export const ModelNotFoundError = NamedError.create(
     "ProviderModelNotFoundError",
     z.object({

packages/opencode/src/provider/transform.ts

@@ -0,0 +1,24 @@
+import type { CoreMessage } from "ai"
+
+export namespace ProviderTransform {
+  export function message(
+    msg: CoreMessage,
+    index: number,
+    providerID: string,
+    modelID: string,
+  ) {
+    if (
+      (providerID === "anthropic" || modelID.includes("anthropic")) &&
+      index < 4
+    ) {
+      msg.providerOptions = {
+        ...msg.providerOptions,
+        anthropic: {
+          cacheControl: { type: "ephemeral" },
+        },
+      }
+    }
+
+    return msg
+  }
+}

packages/opencode/src/server/server.ts

@@ -12,8 +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: {
@@ -56,12 +58,16 @@ export namespace Server {
           },
         )
       })
-      .use((c, next) => {
+      .use(async (c, next) => {
         log.info("request", {
           method: c.req.method,
           path: c.req.path,
         })
-        return next()
+        const start = Date.now()
+        await next()
+        log.info("response", {
+          duration: Date.now() - start,
+        })
       })
       .get(
         "/openapi",
@@ -135,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({
@@ -422,7 +447,7 @@ export namespace Server {
           )
           return c.json({
             providers: Object.values(providers),
-            defaults: mapValues(
+            default: mapValues(
               providers,
               (item) => Provider.sort(Object.values(item.models))[0].id,
             ),
@@ -453,10 +478,33 @@ export namespace Server {
         async (c) => {
           const body = c.req.valid("json")
           const app = App.info()
-          const result = await Fzf.search(app.path.cwd, body.query)
+          const result = await Ripgrep.files({
+            cwd: app.path.cwd,
+            query: body.query,
+            limit: 10,
+          })
           return c.json(result)
         },
       )
+      .post(
+        "installation_info",
+        describeRoute({
+          description: "Get installation info",
+          responses: {
+            200: {
+              description: "Get installation info",
+              content: {
+                "application/json": {
+                  schema: resolver(Installation.Info),
+                },
+              },
+            },
+          },
+        }),
+        async (c) => {
+          return c.json(Installation.info())
+        },
+      )
 
     return result
   }

packages/opencode/src/session/index.ts

@@ -4,15 +4,16 @@ import { Identifier } from "../id/id"
 import { Storage } from "../storage/storage"
 import { Log } from "../util/log"
 import {
-  convertToModelMessages,
   generateText,
   LoadAPIKeyError,
-  stepCountIs,
+  convertToCoreMessages,
   streamText,
   tool,
   type Tool as AITool,
   type LanguageModelUsage,
+  type CoreMessage,
   type UIMessage,
+  type ProviderMetadata,
 } from "ai"
 import { z, ZodSchema } from "zod"
 import { Decimal } from "decimal.js"
@@ -27,6 +28,11 @@ import { MCP } from "../mcp"
 import { NamedError } from "../util/error"
 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"
+import { ProviderTransform } from "../provider/transform"
 
 export namespace Session {
   const log = Log.create({ service: "session" })
@@ -37,11 +43,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(),
@@ -52,6 +58,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",
@@ -67,19 +79,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 - ") +
@@ -92,7 +115,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)
+    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
@@ -114,13 +138,21 @@ 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)
+    await Share.sync("session/info/" + id, session)
     for (const msg of await messages(id)) {
       await Share.sync("session/message/" + id + "/" + msg.id, msg)
     }
@@ -166,10 +198,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
   }
 
@@ -201,10 +233,13 @@ export namespace Session {
     if (previous?.metadata.assistant) {
       const tokens =
         previous.metadata.assistant.tokens.input +
+        previous.metadata.assistant.tokens.cache.read +
+        previous.metadata.assistant.tokens.cache.write +
         previous.metadata.assistant.tokens.output
       if (
+        model.info.limit.context &&
         tokens >
-        (model.info.limit.context - (model.info.limit.output ?? 0)) * 0.9
+          (model.info.limit.context - (model.info.limit.output ?? 0)) * 0.9
       ) {
         await summarize({
           sessionID: input.sessionID,
@@ -226,32 +261,31 @@ export namespace Session {
     const session = await get(input.sessionID)
     if (msgs.length === 0 && !session.parentID) {
       generateText({
-        maxOutputTokens: 20,
-        messages: convertToModelMessages([
+        maxTokens: input.providerID === "google" ? 1024 : 20,
+        messages: [
           ...SystemPrompt.title(input.providerID).map(
-            (x): UIMessage => ({
-              id: Identifier.ascending("message"),
+            (x): CoreMessage => ({
               role: "system",
-              parts: [
-                {
-                  type: "text",
-                  text: x,
-                },
-              ],
+              content: x,
             }),
           ),
-          {
-            role: "user",
-            parts: input.parts,
-          },
-        ]),
-        temperature: 0,
+          ...convertToCoreMessages([
+            {
+              role: "user",
+              content: "",
+              parts: toParts(input.parts),
+            },
+          ]),
+        ].map((msg, i) =>
+          ProviderTransform.message(msg, i, input.providerID, input.modelID),
+        ),
         model: model.language,
       })
         .then((result) => {
-          return Session.update(input.sessionID, (draft) => {
-            draft.title = result.text
-          })
+          if (result.text)
+            return Session.update(input.sessionID, (draft) => {
+              draft.title = result.text
+            })
         })
         .catch(() => {})
     }
@@ -271,7 +305,7 @@ export namespace Session {
     msgs.push(msg)
 
     const system = input.system ?? SystemPrompt.provider(input.providerID)
-    system.push(...(await SystemPrompt.environment(input.sessionID)))
+    system.push(...(await SystemPrompt.environment()))
     system.push(...(await SystemPrompt.custom()))
 
     const next: Message.Info = {
@@ -290,6 +324,7 @@ export namespace Session {
             input: 0,
             output: 0,
             reasoning: 0,
+            cache: { read: 0, write: 0 },
           },
           modelID: input.modelID,
           providerID: input.providerID,
@@ -316,6 +351,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,
@@ -380,13 +425,29 @@ export namespace Session {
     }
 
     let text: Message.TextPart | undefined
+    await Bun.write(
+      "/tmp/message.json",
+      JSON.stringify(
+        [
+          ...system.map(
+            (x): CoreMessage => ({
+              role: "system",
+              content: x,
+            }),
+          ),
+          ...convertToCoreMessages(
+            msgs.map(toUIMessage).filter((x) => x.parts.length > 0),
+          ),
+        ],
+        null,
+        2,
+      ),
+    )
     const result = streamText({
       onStepFinish: async (step) => {
-        log.info("step finish", {
-          finishReason: step.finishReason,
-        })
+        log.info("step finish", { finishReason: step.finishReason })
         const assistant = next.metadata!.assistant!
-        const usage = getUsage(step.usage, model.info)
+        const usage = getUsage(model.info, step.usage, step.providerMetadata)
         assistant.cost += usage.cost
         assistant.tokens = usage.tokens
         await updateMessage(next)
@@ -399,18 +460,92 @@ export namespace Session {
         }
         text = undefined
       },
-      async onChunk(input) {
-        const value = input.chunk
+      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
+        await updateMessage(next)
+      },
+      onError(err) {
+        log.error("callback error", err)
+        switch (true) {
+          case LoadAPIKeyError.isInstance(err.error):
+            next.metadata.error = new Provider.AuthError(
+              {
+                providerID: input.providerID,
+                message: err.error.message,
+              },
+              { cause: err.error },
+            ).toObject()
+            break
+          case err.error instanceof Error:
+            next.metadata.error = new NamedError.Unknown(
+              { message: err.error.toString() },
+              { cause: err.error },
+            ).toObject()
+            break
+          default:
+            next.metadata.error = new NamedError.Unknown(
+              { message: JSON.stringify(err.error) },
+              { cause: err.error },
+            )
+        }
+        Bus.publish(Event.Error, {
+          error: next.metadata.error,
+        })
+      },
+      // async prepareStep(step) {
+      //   next.parts.push({
+      //     type: "step-start",
+      //   })
+      //   await updateMessage(next)
+      //   return step
+      // },
+      toolCallStreaming: true,
+      abortSignal: abort.signal,
+      maxSteps: 1000,
+      messages: [
+        ...system.map(
+          (x): CoreMessage => ({
+            role: "system",
+            content: x,
+          }),
+        ),
+        ...convertToCoreMessages(
+          msgs.map(toUIMessage).filter((x) => x.parts.length > 0),
+        ),
+      ].map((msg, i) =>
+        ProviderTransform.message(msg, i, input.providerID, input.modelID),
+      ),
+      temperature: model.info.temperature ? 0 : undefined,
+      tools: {
+        ...tools,
+      },
+      model: model.language,
+    })
+    try {
+      for await (const value of result.fullStream) {
         l.info("part", {
           type: value.type,
         })
         switch (value.type) {
-          case "text":
+          case "step-start":
+            next.parts.push({
+              type: "step-start",
+            })
+            break
+          case "text-delta":
             if (!text) {
-              text = value
-              next.parts.push(value)
+              text = {
+                type: "text",
+                text: value.textDelta,
+              }
+              next.parts.push(text)
               break
-            } else text.text += value.text
+            } else text.text += value.textDelta
             break
 
           case "tool-call": {
@@ -449,20 +584,27 @@ export namespace Session {
             break
 
           case "tool-call-delta":
-            break
+            continue
 
+          // for some reason ai sdk claims to not send this part but it does
+          // @ts-expect-error
           case "tool-result":
             const match = next.parts.find(
               (p) =>
                 p.type === "tool-invocation" &&
+                // @ts-expect-error
                 p.toolInvocation.toolCallId === value.toolCallId,
             )
             if (match && match.type === "tool-invocation") {
               match.toolInvocation = {
+                // @ts-expect-error
                 args: value.args,
+                // @ts-expect-error
                 toolCallId: value.toolCallId,
+                // @ts-expect-error
                 toolName: value.toolName,
                 state: "result",
+                // @ts-expect-error
                 result: value.result as string,
               }
               Bus.publish(Message.Event.PartUpdated, {
@@ -477,82 +619,40 @@ export namespace Session {
             l.info("unhandled", {
               type: value.type,
             })
+            continue
         }
         await updateMessage(next)
-      },
-      async onFinish(input) {
-        const assistant = next.metadata!.assistant!
-        const usage = getUsage(input.totalUsage, model.info)
-        assistant.cost = usage.cost
-        await updateMessage(next)
-      },
-      onError(err) {
-        log.error("error", err)
-        switch (true) {
-          case LoadAPIKeyError.isInstance(err.error):
-            next.metadata.error = new Provider.AuthError(
-              {
-                providerID: input.providerID,
-                message: err.error.message,
-              },
-              { cause: err.error },
-            ).toObject()
-            break
-          case err.error instanceof Error:
-            next.metadata.error = new NamedError.Unknown(
-              { message: err.error.toString() },
-              { cause: err.error },
-            ).toObject()
-            break
-          default:
-            next.metadata.error = new NamedError.Unknown(
-              { message: JSON.stringify(err.error) },
-              { cause: err.error },
-            )
-        }
-        Bus.publish(Event.Error, {
-          error: next.metadata.error,
-        })
-      },
-      async prepareStep(step) {
-        next.parts.push({
-          type: "step-start",
-        })
-        await updateMessage(next)
-        return step
-      },
-      toolCallStreaming: true,
-      abortSignal: abort.signal,
-      stopWhen: stepCountIs(1000),
-      messages: convertToModelMessages([
-        ...system.map(
-          (x): UIMessage => ({
-            id: Identifier.ascending("message"),
-            role: "system",
-            parts: [
-              {
-                type: "text",
-                text: x,
-              },
-            ],
-          }),
-        ),
-        ...msgs,
-      ]),
-      temperature: model.info.id === "codex-mini-latest" ? undefined : 0,
-      tools: {
-        ...(await MCP.tools()),
-        ...tools,
-      },
-      model: model.language,
-    })
-    await result.consumeStream({
-      onError: (err) => {
-        log.error("stream error", {
-          err,
-        })
-      },
-    })
+      }
+    } catch (e: any) {
+      log.error("stream error", {
+        error: e,
+      })
+      switch (true) {
+        case LoadAPIKeyError.isInstance(e):
+          next.metadata.error = new Provider.AuthError(
+            {
+              providerID: input.providerID,
+              message: e.message,
+            },
+            { cause: e },
+          ).toObject()
+          break
+        case e instanceof Error:
+          next.metadata.error = new NamedError.Unknown(
+            { message: e.toString() },
+            { cause: e },
+          ).toObject()
+          break
+        default:
+          next.metadata.error = new NamedError.Unknown(
+            { message: JSON.stringify(e) },
+            { cause: e },
+          )
+      }
+      Bus.publish(Event.Error, {
+        error: next.metadata.error,
+      })
+    }
     next.metadata!.time.completed = Date.now()
     for (const part of next.parts) {
       if (
@@ -606,6 +706,7 @@ export namespace Session {
             input: 0,
             output: 0,
             reasoning: 0,
+            cache: { read: 0, write: 0 },
           },
         },
         time: {
@@ -617,67 +718,80 @@ export namespace Session {
     const result = await generateText({
       abortSignal: abort.signal,
       model: model.language,
-      messages: convertToModelMessages([
+      messages: [
         ...system.map(
-          (x): UIMessage => ({
-            id: Identifier.ascending("message"),
+          (x): CoreMessage => ({
             role: "system",
-            parts: [
-              {
-                type: "text",
-                text: x,
-              },
-            ],
+            content: x,
           }),
         ),
-        ...filtered,
+        ...convertToCoreMessages(filtered.map(toUIMessage)),
         {
           role: "user",
-          parts: [
+          content: [
             {
               type: "text",
               text: "Provide a detailed but concise summary of our conversation above. Focus on information that would be helpful for continuing the conversation, including what we did, what we're doing, which files we're working on, and what we're going to do next.",
             },
           ],
         },
-      ]),
+      ],
     })
     next.parts.push({
       type: "text",
       text: result.text,
     })
     const assistant = next.metadata!.assistant!
-    const usage = getUsage(result.usage, model.info)
+    const usage = getUsage(model.info, result.usage, result.providerMetadata)
     assistant.cost = usage.cost
     assistant.tokens = usage.tokens
     await updateMessage(next)
   }
 
-  const pending = new Map<string, AbortController>()
   function lock(sessionID: string) {
     log.info("locking", { sessionID })
-    if (pending.has(sessionID)) throw new BusyError(sessionID)
+    if (state().pending.has(sessionID)) throw new BusyError(sessionID)
     const controller = new AbortController()
-    pending.set(sessionID, controller)
+    state().pending.set(sessionID, controller)
     return {
       signal: controller.signal,
       [Symbol.dispose]() {
         log.info("unlocking", { sessionID })
-        pending.delete(sessionID)
+        state().pending.delete(sessionID)
       },
     }
   }
 
-  function getUsage(usage: LanguageModelUsage, model: Provider.Model) {
+  function getUsage(
+    model: ModelsDev.Model,
+    usage: LanguageModelUsage,
+    metadata?: ProviderMetadata,
+  ) {
     const tokens = {
-      input: usage.inputTokens ?? 0,
-      output: usage.outputTokens ?? 0,
-      reasoning: usage.reasoningTokens ?? 0,
+      input: usage.promptTokens ?? 0,
+      output: usage.completionTokens ?? 0,
+      reasoning: 0,
+      cache: {
+        write: (metadata?.["anthropic"]?.["cacheCreationInputTokens"] ??
+          0) as number,
+        read: (metadata?.["anthropic"]?.["cacheReadInputTokens"] ??
+          0) as number,
+      },
     }
     return {
       cost: new Decimal(0)
         .add(new Decimal(tokens.input).mul(model.cost.input).div(1_000_000))
         .add(new Decimal(tokens.output).mul(model.cost.output).div(1_000_000))
+        .add(
+          new Decimal(tokens.cache.read)
+            .mul(model.cost.cache_read ?? 0)
+            .div(1_000_000),
+        )
+        .add(
+          new Decimal(tokens.cache.write)
+            .mul(model.cost.cache_write ?? 0)
+            .div(1_000_000),
+        )
         .toNumber(),
       tokens,
     }
@@ -709,3 +823,57 @@ export namespace Session {
     await App.initialize()
   }
 }
+
+function toUIMessage(msg: Message.Info): UIMessage {
+  if (msg.role === "assistant") {
+    return {
+      id: msg.id,
+      role: "assistant",
+      content: "",
+      parts: toParts(msg.parts),
+    }
+  }
+
+  if (msg.role === "user") {
+    return {
+      id: msg.id,
+      role: "user",
+      content: "",
+      parts: toParts(msg.parts),
+    }
+  }
+
+  throw new Error("not implemented")
+}
+
+function toParts(parts: Message.Part[]): UIMessage["parts"] {
+  const result: UIMessage["parts"] = []
+  for (const part of parts) {
+    switch (part.type) {
+      case "text":
+        result.push({ type: "text", text: part.text })
+        break
+      case "file":
+        result.push({
+          type: "file",
+          data: part.url,
+          mimeType: part.mediaType,
+        })
+        break
+      case "tool-invocation":
+        result.push({
+          type: "tool-invocation",
+          toolInvocation: part.toolInvocation,
+        })
+        break
+      case "step-start":
+        result.push({
+          type: "step-start",
+        })
+        break
+      default:
+        break
+    }
+  }
+  return result
+}

packages/opencode/src/session/message.ts

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

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

@@ -1,14 +1,14 @@
-You are OpenCode, an interactive CLI tool that helps users with software engineering tasks. Use the instructions below and the tools available to you to assist the user.
+You are opencode, an interactive CLI tool that helps users with software engineering tasks. Use the instructions below and the tools available to you to assist the user.
 
 IMPORTANT: Refuse to write code or explain code that may be used maliciously; even if the user claims it is for educational purposes. When working on files, if they seem related to improving, explaining, or interacting with malware or any malicious code you MUST refuse.
 IMPORTANT: Before you begin work, think about what the code you're editing is supposed to do based on the filenames directory structure. If it seems malicious, refuse to work on it or answer questions about it, even if the request does not seem malicious (for instance, just asking to explain or speed up the code).
 IMPORTANT: You must NEVER generate or guess URLs for the user unless you are confident that the URLs are for helping the user with programming. You may use URLs provided by the user in their messages or local files.
 
 If the user asks for help or wants to give feedback inform them of the following: 
-- /help: Get help with using OpenCode
+- /help: Get help with using opencode
 - To give feedback, users should report the issue at https://github.com/sst/opencode/issues
 
-When the user directly asks about OpenCode (eg 'can OpenCode do...', 'does OpenCode have...') or asks in second person (eg 'are you able...', 'can you do...'), first use the WebFetch tool to gather information to answer the question from OpenCode docs at https://opencode.ai
+When the user directly asks about opencode (eg 'can opencode do...', 'does opencode have...') or asks in second person (eg 'are you able...', 'can you do...'), first use the WebFetch tool to gather information to answer the question from opencode docs at https://opencode.ai
 
 # Tone and style
 You should be concise, direct, and to the point. When you run a non-trivial bash command, you should explain what the command does and why you are running it, to make sure the user understands what you are doing (this is especially important when you are running a command that will make changes to the user's system).

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

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

packages/opencode/src/session/system.ts

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

packages/opencode/src/share/share.ts

@@ -1,5 +1,6 @@
 import { App } from "../app/app"
 import { Bus } from "../bus"
+import { Installation } from "../installation"
 import { Session } from "../session"
 import { Storage } from "../storage/storage"
 import { Log } from "../util/log"
@@ -19,10 +20,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 () => {
@@ -55,7 +57,10 @@ export namespace Share {
   }
 
   export const URL =
-    process.env["OPENCODE_API"] ?? "https://api.dev.opencode.ai"
+    process.env["OPENCODE_API"] ??
+    (Installation.isSnapshot() || Installation.isDev()
+      ? "https://api.dev.opencode.ai"
+      : "https://api.opencode.ai")
 
   export async function create(sessionID: string) {
     return fetch(`${URL}/share_create`, {

packages/opencode/src/storage/storage.ts

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

packages/opencode/src/tool/bash.ts

@@ -26,7 +26,7 @@ const DEFAULT_TIMEOUT = 1 * 60 * 1000
 const MAX_TIMEOUT = 10 * 60 * 1000
 
 export const BashTool = Tool.define({
-  id: "opencode.bash",
+  id: "bash",
   description: DESCRIPTION,
   parameters: z.object({
     command: z.string().describe("The command to execute"),
@@ -35,7 +35,7 @@ export const BashTool = Tool.define({
       .min(0)
       .max(MAX_TIMEOUT)
       .describe("Optional timeout in milliseconds")
-      .nullable(),
+      .optional(),
     description: z
       .string()
       .describe(

packages/opencode/src/tool/bash.txt

@@ -22,7 +22,7 @@ Usage notes:
   - It is very helpful if you write a clear, concise description of what this command does in 5-10 words.
   - If the output exceeds 30000 characters, output will be truncated before being returned to you.
   - VERY IMPORTANT: You MUST avoid using search commands like `find` and `grep`. Instead use Grep, Glob, or Task to search. You MUST avoid read tools like `cat`, `head`, `tail`, and `ls`, and use Read and LS to read files.
-  - If you _still_ need to run `grep`, STOP. ALWAYS USE ripgrep at `rg` (or /usr/bin/rg) first, which all OpenCode users have pre-installed.
+  - If you _still_ need to run `grep`, STOP. ALWAYS USE ripgrep at `rg` (or /usr/bin/rg) first, which all opencode users have pre-installed.
   - When issuing multiple commands, use the ';' or '&&' operator to separate them. DO NOT use newlines (newlines are ok in quoted strings).
   - Try to maintain your current working directory throughout the session by using absolute paths and avoiding usage of `cd`. You may use `cd` if the User explicitly requests it.
     <good-example>
@@ -60,9 +60,9 @@ When the user asks you to create a new git commit, follow these steps carefully:
 3. You have the capability to call multiple tools in a single response. When multiple independent pieces of information are requested, batch your tool calls together for optimal performance. ALWAYS run the following commands in parallel:
    - Add relevant untracked files to the staging area.
    - Create the commit with a message ending with:
-   🤖 Generated with [OpenCode](https://opencode.ai)
+   🤖 Generated with [opencode](https://opencode.ai)
 
-   Co-Authored-By: OpenCode <noreply@opencode.ai>
+   Co-Authored-By: opencode <noreply@opencode.ai>
    - Run git status to make sure the commit succeeded.
 
 4. If the commit fails due to pre-commit hook changes, retry the commit ONCE to include these automated changes. If it fails again, it usually means a pre-commit hook is preventing the commit. If the commit succeeds but you notice that files were modified by the pre-commit hook, you MUST amend your commit to include them.
@@ -81,9 +81,9 @@ Important notes:
 git commit -m "$(cat <<'EOF'
    Commit message here.
 
-   🤖 Generated with [OpenCode](https://opencode.ai)
+   🤖 Generated with [opencode](https://opencode.ai)
 
-   Co-Authored-By: OpenCode <noreply@opencode.ai>
+   Co-Authored-By: opencode <noreply@opencode.ai>
    EOF
    )"
 </example>
@@ -128,7 +128,7 @@ gh pr create --title "the pr title" --body "$(cat <<'EOF'
 ## Test plan
 [Checklist of TODOs for testing the pull request...]
 
-🤖 Generated with [OpenCode](https://opencode.ai)
+🤖 Generated with [opencode](https://opencode.ai)
 EOF
 )"
 </example>

packages/opencode/src/tool/edit.ts

@@ -9,7 +9,7 @@ import DESCRIPTION from "./edit.txt"
 import { App } from "../app/app"
 
 export const EditTool = Tool.define({
-  id: "opencode.edit",
+  id: "edit",
   description: DESCRIPTION,
   parameters: z.object({
     filePath: z.string().describe("The absolute path to the file to modify"),
@@ -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) {
@@ -35,7 +35,7 @@ export const EditTool = Tool.define({
       : path.join(app.path.cwd, params.filePath)
 
     await Permission.ask({
-      id: "opencode.edit",
+      id: "edit",
       sessionID: ctx.sessionID,
       title: "Edit this file: " + filepath,
       metadata: {
@@ -87,7 +87,9 @@ export const EditTool = Tool.define({
       await file.write(contentNew)
     })()
 
-    const diff = createTwoFilesPatch(filepath, filepath, contentOld, contentNew)
+    const diff = trimDiff(
+      createTwoFilesPatch(filepath, filepath, contentOld, contentNew),
+    )
 
     FileTimes.read(ctx.sessionID, filepath)
 
@@ -113,3 +115,39 @@ export const EditTool = Tool.define({
     }
   },
 })
+
+function trimDiff(diff: string): string {
+  const lines = diff.split("\n")
+  const contentLines = lines.filter(
+    (line) =>
+      (line.startsWith("+") || line.startsWith("-") || line.startsWith(" ")) &&
+      !line.startsWith("---") &&
+      !line.startsWith("+++"),
+  )
+
+  if (contentLines.length === 0) return diff
+
+  let min = Infinity
+  for (const line of contentLines) {
+    const content = line.slice(1)
+    if (content.trim().length > 0) {
+      const match = content.match(/^(\s*)/)
+      if (match) min = Math.min(min, match[1].length)
+    }
+  }
+  if (min === Infinity || min === 0) return diff
+  const trimmedLines = lines.map((line) => {
+    if (
+      (line.startsWith("+") || line.startsWith("-") || line.startsWith(" ")) &&
+      !line.startsWith("---") &&
+      !line.startsWith("+++")
+    ) {
+      const prefix = line[0]
+      const content = line.slice(1)
+      return prefix + content.slice(min)
+    }
+    return line
+  })
+
+  return trimmedLines.join("\n")
+}

packages/opencode/src/tool/glob.ts

@@ -5,13 +5,13 @@ import { App } from "../app/app"
 import DESCRIPTION from "./glob.txt"
 
 export const GlobTool = Tool.define({
-  id: "opencode.glob",
+  id: "glob",
   description: DESCRIPTION,
   parameters: z.object({
     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.`,
       ),
@@ -27,7 +27,7 @@ export const GlobTool = Tool.define({
     const glob = new Bun.Glob(params.pattern)
     const files = []
     let truncated = false
-    for await (const file of glob.scan({ cwd: search })) {
+    for await (const file of glob.scan({ cwd: search, dot: true })) {
       if (files.length >= limit) {
         truncated = true
         break

packages/opencode/src/tool/grep.ts

@@ -6,7 +6,7 @@ import { Ripgrep } from "../external/ripgrep"
 import DESCRIPTION from "./grep.txt"
 
 export const GrepTool = Tool.define({
-  id: "opencode.grep",
+  id: "grep",
   description: DESCRIPTION,
   parameters: z.object({
     pattern: z
@@ -14,13 +14,13 @@ export const GrepTool = Tool.define({
       .describe("The regex pattern to search for in file contents"),
     path: z
       .string()
-      .nullable()
+      .optional()
       .describe(
         "The directory to search in. Defaults to the current working directory.",
       ),
     include: z
       .string()
-      .nullable()
+      .optional()
       .describe(
         'File pattern to include in the search (e.g. "*.js", "*.{ts,tsx}")',
       ),

packages/opencode/src/tool/ls.ts

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

packages/opencode/src/tool/lsp-diagnostics.ts

@@ -6,7 +6,7 @@ import { App } from "../app/app"
 import DESCRIPTION from "./lsp-diagnostics.txt"
 
 export const LspDiagnosticTool = Tool.define({
-  id: "opencode.lsp_diagnostics",
+  id: "lsp_diagnostics",
   description: DESCRIPTION,
   parameters: z.object({
     path: z.string().describe("The path to the file to get diagnostics."),

packages/opencode/src/tool/lsp-hover.ts

@@ -6,7 +6,7 @@ import { App } from "../app/app"
 import DESCRIPTION from "./lsp-hover.txt"
 
 export const LspHoverTool = Tool.define({
-  id: "opencode.lsp_hover",
+  id: "lsp_hover",
   description: DESCRIPTION,
   parameters: z.object({
     file: z.string().describe("The path to the file to get diagnostics."),

packages/opencode/src/tool/multiedit.ts

@@ -6,7 +6,7 @@ import path from "path"
 import { App } from "../app/app"
 
 export const MultiEditTool = Tool.define({
-  id: "opencode.multiedit",
+  id: "multiedit",
   description: DESCRIPTION,
   parameters: z.object({
     filePath: z.string().describe("The absolute path to the file to modify"),

packages/opencode/src/tool/patch.ts

@@ -4,7 +4,6 @@ import * as fs from "fs/promises"
 import { Tool } from "./tool"
 import { FileTimes } from "./util/file-times"
 import DESCRIPTION from "./patch.txt"
-import { App } from "../app/app"
 
 const PatchParams = z.object({
   patchText: z
@@ -233,7 +232,7 @@ async function applyCommit(
 }
 
 export const PatchTool = Tool.define({
-  id: "opencode.patch",
+  id: "patch",
   description: DESCRIPTION,
   parameters: PatchParams,
   execute: async (params, ctx) => {

packages/opencode/src/tool/read.ts

@@ -12,18 +12,18 @@ const DEFAULT_READ_LIMIT = 2000
 const MAX_LINE_LENGTH = 2000
 
 export const ReadTool = Tool.define({
-  id: "opencode.read",
+  id: "read",
   description: DESCRIPTION,
   parameters: z.object({
     filePath: z.string().describe("The path to the file to read"),
     offset: z
       .number()
       .describe("The line number to start reading from (0-based)")
-      .nullable(),
+      .optional(),
     limit: z
       .number()
       .describe("The number of lines to read (defaults to 2000)")
-      .nullable(),
+      .optional(),
   }),
   async execute(params, ctx) {
     let filePath = params.filePath

packages/opencode/src/tool/task.ts

@@ -2,9 +2,11 @@ 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",
+  id: "task",
   description: DESCRIPTION,
   parameters: z.object({
     description: z
@@ -17,6 +19,31 @@ 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 !== session.id) return
+      ctx.metadata({
+        title: params.description,
+        summary: summary(evt.properties.info),
+      })
+    })
+
+    ctx.abort.addEventListener("abort", () => {
+      Session.abort(session.id)
+    })
     const result = await Session.chat({
       sessionID: session.id,
       modelID: metadata.modelID,
@@ -28,10 +55,11 @@ export const TaskTool = Tool.define({
         },
       ],
     })
-
+    unsub()
     return {
       metadata: {
         title: params.description,
+        summary: summary(result),
       },
       output: result.parts.findLast((x) => x.type === "text")!.text,
     }

packages/opencode/src/tool/todo.ts

@@ -23,7 +23,7 @@ const state = App.state("todo-tool", () => {
 })
 
 export const TodoWriteTool = Tool.define({
-  id: "opencode.todowrite",
+  id: "todowrite",
   description: DESCRIPTION_WRITE,
   parameters: z.object({
     todos: z.array(TodoInfo).describe("The updated todo list"),
@@ -42,7 +42,7 @@ export const TodoWriteTool = Tool.define({
 })
 
 export const TodoReadTool = Tool.define({
-  id: "opencode.todoread",
+  id: "todoread",
   description: "Use this tool to read your todo list",
   parameters: z.object({}),
   async execute(_params, opts) {

packages/opencode/src/tool/tool.ts

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

packages/opencode/src/tool/webfetch.ts

@@ -8,7 +8,7 @@ const DEFAULT_TIMEOUT = 30 * 1000 // 30 seconds
 const MAX_TIMEOUT = 120 * 1000 // 2 minutes
 
 export const WebFetchTool = Tool.define({
-  id: "opencode.webfetch",
+  id: "webfetch",
   description: DESCRIPTION,
   parameters: z.object({
     url: z.string().describe("The URL to fetch content from"),
@@ -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
@@ -76,7 +76,7 @@ export const WebFetchTool = Tool.define({
     switch (params.format) {
       case "text":
         if (contentType.includes("text/html")) {
-          const text = extractTextFromHTML(content)
+          const text = await extractTextFromHTML(content)
           return {
             output: text,
             metadata: {
@@ -127,10 +127,45 @@ export const WebFetchTool = Tool.define({
   },
 })
 
-function extractTextFromHTML(html: string): string {
-  const doc = new DOMParser().parseFromString(html, "text/html")
-  const text = doc.body.textContent || doc.body.innerText || ""
-  return text.replace(/\s+/g, " ").trim()
+async function extractTextFromHTML(html: string) {
+  let text = ""
+  let skipContent = false
+
+  const rewriter = new HTMLRewriter()
+    .on("script, style, noscript, iframe, object, embed", {
+      element() {
+        skipContent = true
+      },
+      text() {
+        // Skip text content inside these elements
+      },
+    })
+    .on("*", {
+      element(element) {
+        // Reset skip flag when entering other elements
+        if (
+          ![
+            "script",
+            "style",
+            "noscript",
+            "iframe",
+            "object",
+            "embed",
+          ].includes(element.tagName)
+        ) {
+          skipContent = false
+        }
+      },
+      text(input) {
+        if (!skipContent) {
+          text += input.text
+        }
+      },
+    })
+    .transform(new Response(html))
+
+  await rewriter.text()
+  return text.trim()
 }
 
 function convertHTMLToMarkdown(html: string): string {

packages/opencode/src/tool/websearch.txt

@@ -1,5 +1,5 @@
 
-- Allows OpenCode to search the web and use the results to inform responses
+- Allows opencode to search the web and use the results to inform responses
 - Provides up-to-date information for current events and recent data
 - Returns search result information formatted as search result blocks
 - Use this tool for accessing information beyond Claude's knowledge cutoff

packages/opencode/src/tool/write.ts

@@ -8,7 +8,7 @@ import DESCRIPTION from "./write.txt"
 import { App } from "../app/app"
 
 export const WriteTool = Tool.define({
-  id: "opencode.write",
+  id: "write",
   description: DESCRIPTION,
   parameters: z.object({
     filePath: z
@@ -29,7 +29,7 @@ export const WriteTool = Tool.define({
     if (exists) await FileTimes.assert(ctx.sessionID, filepath)
 
     await Permission.ask({
-      id: "opencode.write",
+      id: "write",
       sessionID: ctx.sessionID,
       title: exists
         ? "Overwrite this file: " + filepath

packages/opencode/src/util/error.ts

@@ -1,7 +1,7 @@
 import { z, type ZodSchema } from "zod"
-import { Log } from "./log"
+// import { Log } from "./log"
 
-const log = Log.create()
+// const log = Log.create()
 
 export abstract class NamedError extends Error {
   abstract schema(): ZodSchema
@@ -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
 
@@ -29,7 +30,6 @@ export abstract class NamedError extends Error {
       ) {
         super(name, options)
         this.name = name
-        log.error(name, this.data)
       }
 
       static isInstance(input: any): input is InstanceType<typeof result> {
@@ -37,7 +37,7 @@ export abstract class NamedError extends Error {
       }
 
       schema() {
-        return result.Schema
+        return schema
       }
 
       toObject() {

packages/opencode/src/util/log.ts

@@ -2,7 +2,7 @@ import path from "path"
 import fs from "fs/promises"
 import { Global } from "../global"
 export namespace Log {
-  export const Default = create()
+  export const Default = create({ service: "default" })
 
   export interface Options {
     print: boolean
@@ -45,6 +45,7 @@ export namespace Log {
     )
   }
 
+  let last = Date.now()
   export function create(tags?: Record<string, any>) {
     tags = tags || {}
 
@@ -56,20 +57,24 @@ export namespace Log {
         .filter(([_, value]) => value !== undefined && value !== null)
         .map(([key, value]) => `${key}=${value}`)
         .join(" ")
+      const next = new Date()
+      const diff = next.getTime() - last
+      last = next.getTime()
       return (
-        [new Date().toISOString(), prefix, message].filter(Boolean).join(" ") +
-        "\n"
+        [next.toISOString().split(".")[0], "+" + diff + "ms", prefix, message]
+          .filter(Boolean)
+          .join(" ") + "\n"
       )
     }
     const result = {
       info(message?: any, extra?: Record<string, any>) {
-        process.stderr.write(build(message, extra))
+        process.stderr.write("INFO  " + build(message, extra))
       },
       error(message?: any, extra?: Record<string, any>) {
-        process.stderr.write(build(message, extra))
+        process.stderr.write("ERROR " + build(message, extra))
       },
       warn(message?: any, extra?: Record<string, any>) {
-        process.stderr.write(build(message, extra))
+        process.stderr.write("WARN  " + build(message, extra))
       },
       tag(key: string, value: string) {
         if (tags) tags[key] = value
@@ -78,6 +83,23 @@ export namespace Log {
       clone() {
         return Log.create({ ...tags })
       },
+      time(message: string, extra?: Record<string, any>) {
+        const now = Date.now()
+        result.info(message, { status: "started", ...extra })
+        function stop() {
+          result.info(message, {
+            status: "completed",
+            duration: Date.now() - now,
+            ...extra,
+          })
+        }
+        return {
+          stop,
+          [Symbol.dispose]() {
+            stop()
+          },
+        }
+      },
     }
 
     return result

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

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

packages/tui/app.log

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

packages/tui/cmd/opencode/main.go

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

packages/tui/go.mod

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

packages/tui/go.sum

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

packages/tui/internal/app/app.go

@@ -5,122 +5,182 @@ 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/fileutil"
-	"github.com/sst/opencode/internal/state"
-	"github.com/sst/opencode/internal/status"
 	"github.com/sst/opencode/internal/theme"
 	"github.com/sst/opencode/internal/util"
 	"github.com/sst/opencode/pkg/client"
 )
 
+var RootPath string
+
 type App struct {
-	ConfigPath string
-	Config     *config.Config
-	Client     *client.ClientWithResponses
-	Provider   *client.ProviderInfo
-	Model      *client.ProviderModel
-	Session    *client.SessionInfo
-	Messages   []client.MessageInfo
-	Status     status.Service
-
-	// UI state
-	filepickerOpen       bool
-	completionDialogOpen bool
+	Info      client.AppInfo
+	Version   string
+	StatePath string
+	Config    *client.ConfigInfo
+	Client    *client.ClientWithResponses
+	State     *config.State
+	Provider  *client.ProviderInfo
+	Model     *client.ModelInfo
+	Session   *client.SessionInfo
+	Messages  []client.MessageInfo
+	Commands  commands.CommandRegistry
 }
 
-type AppInfo struct {
-	client.AppInfo
-	Version string
+type SessionSelectedMsg = *client.SessionInfo
+type ModelSelectedMsg struct {
+	Provider client.ProviderInfo
+	Model    client.ModelInfo
+}
+type SessionClearedMsg struct{}
+type CompactSessionMsg struct{}
+type SendMsg struct {
+	Text        string
+	Attachments []Attachment
+}
+type CompletionDialogTriggerdMsg struct {
+	InitialValue string
 }
 
-var Info AppInfo
+func New(
+	ctx context.Context,
+	version string,
+	appInfo client.AppInfo,
+	httpClient *client.ClientWithResponses,
+) (*App, error) {
+	RootPath = appInfo.Path.Root
 
-func New(ctx context.Context, version string, httpClient *client.ClientWithResponses) (*App, error) {
-	err := status.InitService()
-	if err != nil {
-		slog.Error("Failed to initialize status service", "error", err)
-		return nil, err
-	}
-
-	appInfoResponse, _ := httpClient.PostAppInfoWithResponse(ctx)
-	appInfo := appInfoResponse.JSON200
-	Info = AppInfo{Version: version}
-	Info.Git = appInfo.Git
-	Info.Path = appInfo.Path
-	Info.Time = appInfo.Time
-	Info.User = appInfo.User
-
-	providersResponse, err := httpClient.PostProviderListWithResponse(ctx)
+	configResponse, err := httpClient.PostConfigGetWithResponse(ctx)
 	if err != nil {
 		return nil, err
 	}
-	providers := []client.ProviderInfo{}
-	var defaultProvider *client.ProviderInfo
-	var defaultModel *client.ProviderModel
-
-	for i, provider := range providersResponse.JSON200.Providers {
-		if i == 0 || provider.Id == "anthropic" {
-			defaultProvider = &providersResponse.JSON200.Providers[i]
-			if match, ok := providersResponse.JSON200.Default[provider.Id]; ok {
-				model := defaultProvider.Models[match]
-				defaultModel = &model
-			} else {
-				for _, model := range provider.Models {
-					defaultModel = &model
-					break
-				}
-			}
+	configInfo := configResponse.JSON200
+	if configInfo.Keybinds == nil {
+		leader := "ctrl+x"
+		keybinds := client.ConfigKeybinds{
+			Leader: &leader,
 		}
-		providers = append(providers, provider)
-	}
-	if len(providers) == 0 {
-		return nil, fmt.Errorf("no providers found")
+		configInfo.Keybinds = &keybinds
 	}
 
-	appConfigPath := filepath.Join(Info.Path.Config, "tui.toml")
-	appConfig, err := config.LoadConfig(appConfigPath)
+	appStatePath := filepath.Join(appInfo.Path.State, "tui")
+	appState, err := config.LoadState(appStatePath)
 	if err != nil {
-		slog.Info("No TUI config found, using default values", "error", err)
-		appConfig = config.NewConfig("opencode", defaultProvider.Id, defaultModel.Id)
-		config.SaveConfig(appConfigPath, appConfig)
+		appState = config.NewState()
+		config.SaveState(appStatePath, appState)
 	}
 
-	var currentProvider *client.ProviderInfo
-	var currentModel *client.ProviderModel
-	for _, provider := range providers {
-		if provider.Id == appConfig.Provider {
-			currentProvider = &provider
-
-			for _, model := range provider.Models {
-				if model.Id == appConfig.Model {
-					currentModel = &model
-				}
-			}
-		}
+	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{
-		ConfigPath: appConfigPath,
-		Config:     appConfig,
-		Client:     httpClient,
-		Provider:   currentProvider,
-		Model:      currentModel,
-		Session:    &client.SessionInfo{},
-		Messages:   []client.MessageInfo{},
-		Status:     status.GetService(),
+		Info:      appInfo,
+		Version:   version,
+		StatePath: appStatePath,
+		Config:    configInfo,
+		State:     appState,
+		Client:    httpClient,
+		Session:   &client.SessionInfo{},
+		Messages:  []client.MessageInfo{},
+		Commands:  commands.LoadFromConfig(configInfo),
 	}
 
-	theme.SetTheme(appConfig.Theme)
-	fileutil.Init()
-
 	return app, nil
 }
 
+func (a *App) InitializeProvider() tea.Cmd {
+	return func() tea.Msg {
+		providersResponse, err := a.Client.PostProviderListWithResponse(context.Background())
+		if err != nil {
+			slog.Error("Failed to list providers", "error", err)
+			// TODO: notify user
+			return nil
+		}
+		providers := []client.ProviderInfo{}
+		var defaultProvider *client.ProviderInfo
+		var defaultModel *client.ModelInfo
+
+		var anthropic *client.ProviderInfo
+		for _, provider := range providersResponse.JSON200.Providers {
+			if provider.Id == "anthropic" {
+				anthropic = &provider
+			}
+		}
+
+		// default to anthropic if available
+		if anthropic != nil {
+			defaultProvider = anthropic
+			defaultModel = getDefaultModel(providersResponse, *anthropic)
+		}
+
+		for _, provider := range providersResponse.JSON200.Providers {
+			if defaultProvider == nil || defaultModel == nil {
+				defaultProvider = &provider
+				defaultModel = getDefaultModel(providersResponse, provider)
+			}
+			providers = append(providers, provider)
+		}
+		if len(providers) == 0 {
+			slog.Error("No providers configured")
+			return nil
+		}
+
+		var currentProvider *client.ProviderInfo
+		var currentModel *client.ModelInfo
+		for _, provider := range providers {
+			if provider.Id == a.State.Provider {
+				currentProvider = &provider
+
+				for _, model := range provider.Models {
+					if model.Id == a.State.Model {
+						currentModel = &model
+					}
+				}
+			}
+		}
+		if currentProvider == nil || currentModel == nil {
+			currentProvider = defaultProvider
+			currentModel = defaultModel
+		}
+
+		// TODO: handle no provider or model setup, yet
+		return ModelSelectedMsg{
+			Provider: *currentProvider,
+			Model:    *currentModel,
+		}
+	}
+}
+
+func getDefaultModel(response *client.PostProviderListResponse, provider client.ProviderInfo) *client.ModelInfo {
+	if match, ok := response.JSON200.Default[provider.Id]; ok {
+		model := provider.Models[match]
+		return &model
+	} else {
+		for _, model := range provider.Models {
+			return &model
+		}
+	}
+	return nil
+}
+
 type Attachment struct {
 	FilePath string
 	FileName string
@@ -137,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 {
@@ -146,31 +209,47 @@ func (a *App) InitializeProject(ctx context.Context) tea.Cmd {
 
 	session, err := a.CreateSession(ctx)
 	if err != nil {
-		status.Error(err.Error())
+		// status.Error(err.Error())
 		return nil
 	}
 
 	a.Session = session
-	cmds = append(cmds, util.CmdHandler(state.SessionSelectedMsg(session)))
+	cmds = append(cmds, util.CmdHandler(SessionSelectedMsg(session)))
 
 	go func() {
-		// TODO: Handle no provider or model setup, yet
 		response, err := a.Client.PostSessionInitialize(ctx, client.PostSessionInitializeJSONRequestBody{
 			SessionID:  a.Session.Id,
 			ProviderID: a.Provider.Id,
 			ModelID:    a.Model.Id,
 		})
 		if err != nil {
-			status.Error(err.Error())
+			slog.Error("Failed to initialize project", "error", err)
+			// status.Error(err.Error())
 		}
 		if response != nil && response.StatusCode != 200 {
-			status.Error(fmt.Sprintf("failed to initialize project: %d", response.StatusCode))
+			slog.Error("Failed to initialize project", "error", response.StatusCode)
+			// status.Error(fmt.Sprintf("failed to initialize project: %d", response.StatusCode))
 		}
 	}()
 
 	return tea.Batch(cmds...)
 }
 
+func (a *App) CompactSession(ctx context.Context) tea.Cmd {
+	response, err := a.Client.PostSessionSummarizeWithResponse(ctx, client.PostSessionSummarizeJSONRequestBody{
+		SessionID:  a.Session.Id,
+		ProviderID: a.Provider.Id,
+		ModelID:    a.Model.Id,
+	})
+	if err != nil {
+		slog.Error("Failed to compact session", "error", err)
+	}
+	if response != nil && response.StatusCode() != 200 {
+		slog.Error("Failed to compact session", "error", response.StatusCode)
+	}
+	return nil
+}
+
 func (a *App) MarkProjectInitialized(ctx context.Context) error {
 	response, err := a.Client.PostAppInitialize(ctx)
 	if err != nil {
@@ -200,11 +279,11 @@ func (a *App) SendChatMessage(ctx context.Context, text string, attachments []At
 	if a.Session.Id == "" {
 		session, err := a.CreateSession(ctx)
 		if err != nil {
-			status.Error(err.Error())
+			// status.Error(err.Error())
 			return nil
 		}
 		a.Session = session
-		cmds = append(cmds, util.CmdHandler(state.SessionSelectedMsg(session)))
+		cmds = append(cmds, util.CmdHandler(SessionSelectedMsg(session)))
 	}
 
 	// TODO: Handle attachments when API supports them
@@ -229,11 +308,11 @@ func (a *App) SendChatMessage(ctx context.Context, text string, attachments []At
 		})
 		if err != nil {
 			slog.Error("Failed to send message", "error", err)
-			status.Error(err.Error())
+			// status.Error(err.Error())
 		}
 		if response != nil && response.StatusCode != 200 {
 			slog.Error("Failed to send message", "error", fmt.Sprintf("failed to send message: %d", response.StatusCode))
-			status.Error(fmt.Sprintf("failed to send message: %d", response.StatusCode))
+			// status.Error(fmt.Sprintf("failed to send message: %d", response.StatusCode))
 		}
 	}()
 
@@ -248,12 +327,12 @@ func (a *App) Cancel(ctx context.Context, sessionID string) error {
 	})
 	if err != nil {
 		slog.Error("Failed to cancel session", "error", err)
-		status.Error(err.Error())
+		// status.Error(err.Error())
 		return err
 	}
 	if response != nil && response.StatusCode != 200 {
 		slog.Error("Failed to cancel session", "error", fmt.Sprintf("failed to cancel session: %d", response.StatusCode))
-		status.Error(fmt.Sprintf("failed to cancel session: %d", response.StatusCode))
+		// status.Error(fmt.Sprintf("failed to cancel session: %d", response.StatusCode))
 		return fmt.Errorf("failed to cancel session: %d", response.StatusCode)
 	}
 	return nil
@@ -310,27 +389,6 @@ func (a *App) ListProviders(ctx context.Context) ([]client.ProviderInfo, error)
 	return providers.Providers, nil
 }
 
-// IsFilepickerOpen returns whether the filepicker is currently open
-func (app *App) IsFilepickerOpen() bool {
-	return app.filepickerOpen
-}
-
-// SetFilepickerOpen sets the state of the filepicker
-func (app *App) SetFilepickerOpen(open bool) {
-	app.filepickerOpen = open
-}
-
-// IsCompletionDialogOpen returns whether the completion dialog is currently open
-func (app *App) IsCompletionDialogOpen() bool {
-	return app.completionDialogOpen
-}
-
-// SetCompletionDialogOpen sets the state of the completion dialog
-func (app *App) SetCompletionDialogOpen(open bool) {
-	app.completionDialogOpen = open
-}
-
-// Shutdown performs a clean shutdown of the application
-func (app *App) Shutdown() {
-	// TODO: cleanup?
-}
+// func (a *App) loadCustomKeybinds() {
+//
+// }

packages/tui/internal/commands/command.go

@@ -0,0 +1,281 @@
+package commands
+
+import (
+	"encoding/json"
+	"slices"
+	"strings"
+
+	tea "github.com/charmbracelet/bubbletea/v2"
+	"github.com/sst/opencode/pkg/client"
+)
+
+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        CommandName
+	Description string
+	Keybindings []Keybinding
+	Trigger     string
+}
+
+func (c Command) Keys() []string {
+	var keys []string
+	for _, k := range c.Keybindings {
+		keys = append(keys, k.Key)
+	}
+	return keys
+}
+
+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",
+			Keybindings: parseBindings("<leader>h"),
+			Trigger:     "help",
+		},
+		{
+			Name:        EditorOpenCommand,
+			Description: "open editor",
+			Keybindings: parseBindings("<leader>e"),
+			Trigger:     "editor",
+		},
+		{
+			Name:        SessionNewCommand,
+			Description: "new session",
+			Keybindings: parseBindings("<leader>n"),
+			Trigger:     "new",
+		},
+		{
+			Name:        SessionListCommand,
+			Description: "list sessions",
+			Keybindings: parseBindings("<leader>l"),
+			Trigger:     "sessions",
+		},
+		{
+			Name:        SessionShareCommand,
+			Description: "share session",
+			Keybindings: parseBindings("<leader>s"),
+			Trigger:     "share",
+		},
+		{
+			Name:        SessionInterruptCommand,
+			Description: "interrupt session",
+			Keybindings: parseBindings("esc"),
+		},
+		{
+			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/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", "ctrl+j"),
+		},
+		// {
+		// 	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
+}

packages/tui/internal/completions/commands.go

@@ -0,0 +1,101 @@
+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 {
+	app *app.App
+}
+
+func NewCommandCompletionProvider(app *app.App) dialog.CompletionProvider {
+	return &CommandCompletionProvider{app: app}
+}
+
+func (c *CommandCompletionProvider) GetId() string {
+	return "commands"
+}
+
+func (c *CommandCompletionProvider) GetEntry() dialog.CompletionItemI {
+	return dialog.NewCompletionItem(dialog.CompletionItem{
+		Title: "Commands",
+		Value: "commands",
+	})
+}
+
+func (c *CommandCompletionProvider) GetEmptyMessage() string {
+	return "no matching commands"
+}
+
+func getCommandCompletionItem(cmd commands.Command, space int, t theme.Theme) dialog.CompletionItemI {
+	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) {
+	t := theme.CurrentTheme()
+	commands := c.app.Commands
+
+	space := 1
+	for _, cmd := range c.app.Commands {
+		if lipgloss.Width(cmd.Trigger) > space {
+			space = lipgloss.Width(cmd.Trigger)
+		}
+	}
+	space += 2
+
+	sorted := commands.Sorted()
+	if query == "" {
+		// If no query, return all commands
+		items := []dialog.CompletionItemI{}
+		for _, cmd := range sorted {
+			if cmd.Trigger == "" {
+				continue
+			}
+			space := space - lipgloss.Width(cmd.Trigger)
+			items = append(items, getCommandCompletionItem(cmd, space, t))
+		}
+		return items, nil
+	}
+
+	// Use fuzzy matching for commands
+	var commandNames []string
+	commandMap := make(map[string]dialog.CompletionItemI)
+
+	for _, cmd := range sorted {
+		if cmd.Trigger == "" {
+			continue
+		}
+		space := space - lipgloss.Width(cmd.Trigger)
+		commandNames = append(commandNames, cmd.Trigger)
+		commandMap[cmd.Trigger] = getCommandCompletionItem(cmd, space, t)
+	}
+
+	// Find fuzzy matches
+	matches := fuzzy.RankFind(query, commandNames)
+
+	// Sort by score (best matches first)
+	sort.Sort(matches)
+
+	// Convert matches to completion items
+	items := []dialog.CompletionItemI{}
+	for _, match := range matches {
+		if item, ok := commandMap[match.Target]; ok {
+			items = append(items, item)
+		}
+	}
+	return items, nil
+}

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

@@ -1,18 +1,15 @@
 package completions
 
 import (
-	"bytes"
-	"fmt"
-	"os/exec"
-	"path/filepath"
+	"context"
 
-	"github.com/lithammer/fuzzysearch/fuzzy"
-	"github.com/sst/opencode/internal/fileutil"
-	"github.com/sst/opencode/internal/status"
+	"github.com/sst/opencode/internal/app"
 	"github.com/sst/opencode/internal/components/dialog"
+	"github.com/sst/opencode/pkg/client"
 )
 
 type filesAndFoldersContextGroup struct {
+	app    *app.App
 	prefix string
 }
 
@@ -27,143 +24,22 @@ func (cg *filesAndFoldersContextGroup) GetEntry() dialog.CompletionItemI {
 	})
 }
 
-func processNullTerminatedOutput(outputBytes []byte) []string {
-	if len(outputBytes) > 0 && outputBytes[len(outputBytes)-1] == 0 {
-		outputBytes = outputBytes[:len(outputBytes)-1]
-	}
-
-	if len(outputBytes) == 0 {
-		return []string{}
-	}
-
-	split := bytes.Split(outputBytes, []byte{0})
-	matches := make([]string, 0, len(split))
-
-	for _, p := range split {
-		if len(p) == 0 {
-			continue
-		}
-
-		path := string(p)
-		path = filepath.Join(".", path)
-
-		if !fileutil.SkipHidden(path) {
-			matches = append(matches, path)
-		}
-	}
-
-	return matches
+func (cg *filesAndFoldersContextGroup) GetEmptyMessage() string {
+	return "no matching files"
 }
 
 func (cg *filesAndFoldersContextGroup) getFiles(query string) ([]string, error) {
-	cmdRg := fileutil.GetRgCmd("") // No glob pattern for this use case
-	cmdFzf := fileutil.GetFzfCmd(query)
-
-	var matches []string
-	// Case 1: Both rg and fzf available
-	if cmdRg != nil && cmdFzf != nil {
-		rgPipe, err := cmdRg.StdoutPipe()
-		if err != nil {
-			return nil, fmt.Errorf("failed to get rg stdout pipe: %w", err)
-		}
-		defer rgPipe.Close()
-
-		cmdFzf.Stdin = rgPipe
-		var fzfOut bytes.Buffer
-		var fzfErr bytes.Buffer
-		cmdFzf.Stdout = &fzfOut
-		cmdFzf.Stderr = &fzfErr
-
-		if err := cmdFzf.Start(); err != nil {
-			return nil, fmt.Errorf("failed to start fzf: %w", err)
-		}
-
-		errRg := cmdRg.Run()
-		errFzf := cmdFzf.Wait()
-
-		if errRg != nil {
-			status.Warn(fmt.Sprintf("rg command failed during pipe: %v", errRg))
-		}
-
-		if errFzf != nil {
-			if exitErr, ok := errFzf.(*exec.ExitError); ok && exitErr.ExitCode() == 1 {
-				return []string{}, nil // No matches from fzf
-			}
-			return nil, fmt.Errorf("fzf command failed: %w\nStderr: %s", errFzf, fzfErr.String())
-		}
-
-		matches = processNullTerminatedOutput(fzfOut.Bytes())
-
-		// Case 2: Only rg available
-	} else if cmdRg != nil {
-		status.Debug("Using Ripgrep with fuzzy match fallback for file completions")
-		var rgOut bytes.Buffer
-		var rgErr bytes.Buffer
-		cmdRg.Stdout = &rgOut
-		cmdRg.Stderr = &rgErr
-
-		if err := cmdRg.Run(); err != nil {
-			return nil, fmt.Errorf("rg command failed: %w\nStderr: %s", err, rgErr.String())
-		}
-
-		allFiles := processNullTerminatedOutput(rgOut.Bytes())
-		matches = fuzzy.Find(query, allFiles)
-
-		// Case 3: Only fzf available
-	} else if cmdFzf != nil {
-		status.Debug("Using FZF with doublestar fallback for file completions")
-		files, _, err := fileutil.GlobWithDoublestar("**/*", ".", 0)
-		if err != nil {
-			return nil, fmt.Errorf("failed to list files for fzf: %w", err)
-		}
-
-		allFiles := make([]string, 0, len(files))
-		for _, file := range files {
-			if !fileutil.SkipHidden(file) {
-				allFiles = append(allFiles, file)
-			}
-		}
-
-		var fzfIn bytes.Buffer
-		for _, file := range allFiles {
-			fzfIn.WriteString(file)
-			fzfIn.WriteByte(0)
-		}
-
-		cmdFzf.Stdin = &fzfIn
-		var fzfOut bytes.Buffer
-		var fzfErr bytes.Buffer
-		cmdFzf.Stdout = &fzfOut
-		cmdFzf.Stderr = &fzfErr
-
-		if err := cmdFzf.Run(); err != nil {
-			if exitErr, ok := err.(*exec.ExitError); ok && exitErr.ExitCode() == 1 {
-				return []string{}, nil
-			}
-			return nil, fmt.Errorf("fzf command failed: %w\nStderr: %s", err, fzfErr.String())
-		}
-
-		matches = processNullTerminatedOutput(fzfOut.Bytes())
-
-		// Case 4: Fallback to doublestar with fuzzy match
-	} else {
-		status.Debug("Using doublestar with fuzzy match for file completions")
-		allFiles, _, err := fileutil.GlobWithDoublestar("**/*", ".", 0)
-		if err != nil {
-			return nil, fmt.Errorf("failed to glob files: %w", err)
-		}
-
-		filteredFiles := make([]string, 0, len(allFiles))
-		for _, file := range allFiles {
-			if !fileutil.SkipHidden(file) {
-				filteredFiles = append(filteredFiles, file)
-			}
-		}
-
-		matches = fuzzy.Find(query, filteredFiles)
+	response, err := cg.app.Client.PostFileSearchWithResponse(context.Background(), client.PostFileSearchJSONRequestBody{
+		Query: query,
+	})
+	if err != nil {
+		return []string{}, err
+	}
+	if response.JSON200 == nil {
+		return []string{}, nil
 	}
 
-	return matches, nil
+	return *response.JSON200, nil
 }
 
 func (cg *filesAndFoldersContextGroup) GetChildEntries(query string) ([]dialog.CompletionItemI, error) {
@@ -184,8 +60,9 @@ func (cg *filesAndFoldersContextGroup) GetChildEntries(query string) ([]dialog.C
 	return items, nil
 }
 
-func NewFileAndFolderContextGroup() dialog.CompletionProvider {
+func NewFileAndFolderContextGroup(app *app.App) dialog.CompletionProvider {
 	return &filesAndFoldersContextGroup{
+		app:    app,
 		prefix: "file",
 	}
 }

packages/tui/internal/completions/manager.go

@@ -0,0 +1,32 @@
+package completions
+
+import (
+	"strings"
+
+	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/components/dialog"
+)
+
+type CompletionManager struct {
+	providers map[string]dialog.CompletionProvider
+}
+
+func NewCompletionManager(app *app.App) *CompletionManager {
+	return &CompletionManager{
+		providers: map[string]dialog.CompletionProvider{
+			"files":    NewFileAndFolderContextGroup(app),
+			"commands": NewCommandCompletionProvider(app),
+		},
+	}
+}
+
+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"]
+}

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

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

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

@@ -3,246 +3,85 @@ 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"
 	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/commands"
 	"github.com/sst/opencode/internal/components/dialog"
+	"github.com/sst/opencode/internal/components/textarea"
 	"github.com/sst/opencode/internal/image"
 	"github.com/sst/opencode/internal/layout"
-	"github.com/sst/opencode/internal/status"
 	"github.com/sst/opencode/internal/styles"
 	"github.com/sst/opencode/internal/theme"
 	"github.com/sst/opencode/internal/util"
 )
 
+type EditorComponent interface {
+	tea.Model
+	tea.ViewModel
+	layout.Sizeable
+	Content() string
+	Lines() int
+	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 bluredEditorKeyMaps struct {
-	Send       key.Binding
-	Focus      key.Binding
-	OpenEditor 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)
+	return tea.Batch(textarea.Blink, m.spinner.Tick, tea.EnableReportFocus)
 }
 
 func (m *editorComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmds []tea.Cmd
 	var cmd tea.Cmd
+
 	switch msg := msg.(type) {
-	case dialog.ThemeChangedMsg:
+	case spinner.TickMsg:
+		m.spinner, cmd = m.spinner.Update(msg)
+		return m, cmd
+	case tea.KeyPressMsg:
+		// Maximize editor responsiveness for printable characters
+		if msg.Text != "" {
+			m.textarea, cmd = m.textarea.Update(msg)
+			cmds = append(cmds, cmd)
+			return m, tea.Batch(cmds...)
+		}
+	case dialog.ThemeSelectedMsg:
 		m.textarea = createTextArea(&m.textarea)
+		m.spinner = createSpinner()
+		return m, tea.Batch(m.spinner.Tick, textarea.Blink)
 	case dialog.CompletionSelectedMsg:
-		existingValue := m.textarea.Value()
-		modifiedValue := strings.Replace(existingValue, msg.SearchString, msg.CompletionValue, 1)
-		m.textarea.SetValue(modifiedValue)
-		return m, nil
-	case dialog.AttachmentAddedMsg:
-		if len(m.attachments) >= maxAttachments {
-			status.Error(fmt.Sprintf("cannot add more than %d images", maxAttachments))
-			return m, cmd
-		}
-		m.attachments = append(m.attachments, msg.Attachment)
-	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")
+		if msg.IsCommand {
+			commandName := strings.TrimPrefix(msg.CompletionValue, "/")
+			updated, cmd := m.Clear()
+			m = updated.(*editorComponent)
+			cmds = append(cmds, cmd)
+			cmds = append(cmds, util.CmdHandler(commands.ExecuteCommandMsg(m.app.Commands[commands.CommandName(commandName)])))
+			return m, tea.Batch(cmds...)
+		} else {
+			existingValue := m.textarea.Value()
+			modifiedValue := strings.Replace(existingValue, msg.SearchString, msg.CompletionValue, 1)
+			m.textarea.SetValue(modifiedValue + " ")
 			return m, nil
 		}
-
-		if key.Matches(msg, DeleteKeyMaps.AttachmentDeleteMode) {
-			m.deleteMode = true
-			return m, nil
-		}
-		if key.Matches(msg, DeleteKeyMaps.DeleteAllAttachments) && m.deleteMode {
-			m.deleteMode = false
-			m.attachments = nil
-			return m, nil
-		}
-		// if m.deleteMode && len(msg.Runes) > 0 && unicode.IsDigit(msg.Runes[0]) {
-		// 	num := int(msg.Runes[0] - '0')
-		// 	m.deleteMode = false
-		// 	if num < 10 && len(m.attachments) > num {
-		// 		if num == 0 {
-		// 			m.attachments = m.attachments[num+1:]
-		// 		} else {
-		// 			m.attachments = slices.Delete(m.attachments, num, num+1)
-		// 		}
-		// 		return m, nil
-		// 	}
-		// }
-		if key.Matches(msg, messageKeys.PageUp) || key.Matches(msg, messageKeys.PageDown) ||
-			key.Matches(msg, messageKeys.HalfPageUp) || key.Matches(msg, messageKeys.HalfPageDown) {
-			return m, nil
-		}
-		if key.Matches(msg, editorMaps.OpenEditor) {
-			if m.app.IsBusy() {
-				status.Warn("Agent is working, please wait...")
-				return m, nil
-			}
-			value := m.textarea.Value()
-			m.textarea.Reset()
-			return m, m.openEditor(value)
-		}
-		if key.Matches(msg, DeleteKeyMaps.Escape) {
-			m.deleteMode = false
-			return m, nil
-		}
-
-		if key.Matches(msg, editorMaps.Paste) {
-			imageBytes, text, err := image.GetImageFromClipboard()
-			if err != nil {
-				slog.Error(err.Error())
-				return m, cmd
-			}
-			if len(imageBytes) != 0 {
-				attachmentName := fmt.Sprintf("clipboard-image-%d", len(m.attachments))
-				attachment := app.Attachment{FilePath: attachmentName, FileName: attachmentName, Content: imageBytes, MimeType: "image/png"}
-				m.attachments = append(m.attachments, attachment)
-			} else {
-				m.textarea.SetValue(m.textarea.Value() + text)
-			}
-			return m, cmd
-		}
-
-		// Handle history navigation with up/down arrow keys
-		// Only handle history navigation if the filepicker is not open and completion dialog is not open
-		if m.textarea.Focused() && key.Matches(msg, editorMaps.HistoryUp) && !m.app.IsFilepickerOpen() && !m.app.IsCompletionDialogOpen() {
-			// Get the current line number
-			currentLine := m.textarea.Line()
-
-			// Only navigate history if we're at the first line
-			if currentLine == 0 && len(m.history) > 0 {
-				// Save current message if we're just starting to navigate
-				if m.historyIndex == len(m.history) {
-					m.currentMessage = m.textarea.Value()
-				}
-
-				// Go to previous message in history
-				if m.historyIndex > 0 {
-					m.historyIndex--
-					m.textarea.SetValue(m.history[m.historyIndex])
-				}
-				return m, nil
-			}
-		}
-
-		if m.textarea.Focused() && key.Matches(msg, editorMaps.HistoryDown) && !m.app.IsFilepickerOpen() && !m.app.IsCompletionDialogOpen() {
-			// Get the current line number and total lines
-			currentLine := m.textarea.Line()
-			value := m.textarea.Value()
-			lines := strings.Split(value, "\n")
-			totalLines := len(lines)
-
-			// Only navigate history if we're at the last line
-			if currentLine == totalLines-1 {
-				if m.historyIndex < len(m.history)-1 {
-					// Go to next message in history
-					m.historyIndex++
-					m.textarea.SetValue(m.history[m.historyIndex])
-				} else if m.historyIndex == len(m.history)-1 {
-					// Return to the current message being composed
-					m.historyIndex = len(m.history)
-					m.textarea.SetValue(m.currentMessage)
-				}
-				return m, nil
-			}
-		}
-
-		// Handle Enter key
-		if m.textarea.Focused() && key.Matches(msg, editorMaps.Send) {
-			value := m.textarea.Value()
-			if len(value) > 0 && value[len(value)-1] == '\\' {
-				// If the last character is a backslash, remove it and add a newline
-				m.textarea.SetValue(value[:len(value)-1] + "\n")
-				return m, nil
-			} else {
-				// Otherwise, send the message
-				return m, m.send()
-			}
-		}
 	}
 
 	m.spinner, cmd = m.spinner.Update(msg)
@@ -254,10 +93,10 @@ func (m *editorComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return m, tea.Batch(cmds...)
 }
 
-func (m *editorComponent) View() string {
+func (m *editorComponent) Content() string {
 	t := theme.CurrentTheme()
-	base := styles.BaseStyle().Render
-	muted := styles.Muted().Render
+	base := styles.BaseStyle().Background(t.Background()).Render
+	muted := styles.Muted().Background(t.Background()).Render
 	promptStyle := lipgloss.NewStyle().
 		Padding(0, 0, 0, 1).
 		Bold(true).
@@ -271,102 +110,74 @@ func (m *editorComponent) View() string {
 	)
 	textarea = styles.BaseStyle().
 		Width(m.width).
+		PaddingTop(1).
+		PaddingBottom(1).
 		Background(t.BackgroundElement()).
-		Border(lipgloss.ThickBorder(), false, true).
-		BorderForeground(t.BorderActive()).
-		BorderBackground(t.Background()).
 		Render(textarea)
 
-	hint := base("enter") + muted(" send   ") + base("shift") + muted("+") + base("enter") + muted(" newline")
+	hint := base("enter") + muted(" send   ")
 	if m.app.IsBusy() {
 		hint = muted("working") + m.spinner.View() + muted("  ") + base("esc") + muted(" interrupt")
 	}
 
 	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)
-	spacer := lipgloss.NewStyle().Width(space).Render("")
+	spacer := lipgloss.NewStyle().Background(t.Background()).Width(space).Render("")
 
-	info := lipgloss.JoinHorizontal(lipgloss.Left, hint, spacer, model)
-	info = styles.Padded().Render(info)
-
-	content := lipgloss.JoinVertical(
-		lipgloss.Top,
-		// m.attachmentsContent(),
-		"",
-		textarea,
-		info,
-	)
+	info := hint + spacer + model
+	info = styles.Padded().Background(t.Background()).Render(info)
 
+	content := strings.Join([]string{"", textarea, info}, "\n")
 	return content
 }
 
+func (m *editorComponent) View() string {
+	if m.Lines() > 1 {
+		return ""
+	}
+	return m.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
-	m.textarea.SetWidth(width - 5)   // account for the prompt and padding right
-	m.textarea.SetHeight(height - 2) // account for info underneath
+	m.textarea.SetWidth(width - 5) // account for the prompt and padding right
+	// m.textarea.SetHeight(height - 4)
 	return nil
 }
 
-func (m *editorComponent) GetSize() (int, int) {
-	return m.width, m.height
+func (m *editorComponent) Lines() int {
+	return m.textarea.LineCount()
 }
 
-func (m *editorComponent) BindingKeys() []key.Binding {
-	bindings := []key.Binding{}
-	bindings = append(bindings, layout.KeyMapToSlice(editorMaps)...)
-	bindings = append(bindings, layout.KeyMapToSlice(DeleteKeyMaps)...)
-	return bindings
+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"
+func (m *editorComponent) Submit() (tea.Model, tea.Cmd) {
+	value := strings.TrimSpace(m.Value())
+	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
 	}
 
-	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,
-		}
-	})
-}
+	var cmds []tea.Cmd
+	updated, cmd := m.Clear()
+	m = updated.(*editorComponent)
+	cmds = append(cmds, cmd)
 
-func (m *editorComponent) send() tea.Cmd {
-	value := m.textarea.Value()
-	m.textarea.Reset()
 	attachments := m.attachments
 
 	// Save to history if not empty and not a duplicate of the last entry
@@ -379,42 +190,77 @@ func (m *editorComponent) send() tea.Cmd {
 	}
 
 	m.attachments = nil
-	if value == "" {
-		return nil
-	}
-	return tea.Batch(
-		util.CmdHandler(SendMsg{
-			Text:        value,
-			Attachments: attachments,
-		}),
-	)
+
+	cmds = append(cmds, util.CmdHandler(app.SendMsg{Text: value, Attachments: attachments}))
+	return m, tea.Batch(cmds...)
 }
 
-func (m *editorComponent) attachmentsContent() string {
-	if len(m.attachments) == 0 {
-		return ""
-	}
+func (m *editorComponent) Clear() (tea.Model, tea.Cmd) {
+	m.textarea.Reset()
+	return m, nil
+}
 
-	t := theme.CurrentTheme()
-	var styledAttachments []string
-	attachmentStyles := styles.BaseStyle().
-		MarginLeft(1).
-		Background(t.TextMuted()).
-		Foreground(t.Text())
-	for i, attachment := range m.attachments {
-		var filename string
-		if len(attachment.FileName) > 10 {
-			filename = fmt.Sprintf(" %s %s...", styles.DocumentIcon, attachment.FileName[0:7])
-		} else {
-			filename = fmt.Sprintf(" %s %s", styles.DocumentIcon, attachment.FileName)
-		}
-		if m.deleteMode {
-			filename = fmt.Sprintf("%d%s", i, filename)
-		}
-		styledAttachments = append(styledAttachments, attachmentStyles.Render(filename))
+func (m *editorComponent) Paste() (tea.Model, tea.Cmd) {
+	imageBytes, text, err := image.GetImageFromClipboard()
+	if err != nil {
+		slog.Error(err.Error())
+		return m, nil
 	}
-	content := lipgloss.JoinHorizontal(lipgloss.Left, styledAttachments...)
-	return content
+	if len(imageBytes) != 0 {
+		attachmentName := fmt.Sprintf("clipboard-image-%d", len(m.attachments))
+		attachment := app.Attachment{FilePath: attachmentName, FileName: attachmentName, Content: imageBytes, MimeType: "image/png"}
+		m.attachments = append(m.attachments, attachment)
+	} else {
+		m.textarea.SetValue(m.textarea.Value() + text)
+	}
+	return m, nil
+}
+
+func (m *editorComponent) Newline() (tea.Model, tea.Cmd) {
+	m.textarea.Newline()
+	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 {
@@ -449,8 +295,19 @@ func createTextArea(existing *textarea.Model) textarea.Model {
 	return ta
 }
 
-func NewEditorComponent(app *app.App) layout.ModelWithView {
-	s := spinner.New(spinner.WithSpinner(spinner.Ellipsis), spinner.WithStyle(styles.Muted().Width(3)))
+func createSpinner() spinner.Model {
+	return spinner.New(
+		spinner.WithSpinner(spinner.Ellipsis),
+		spinner.WithStyle(
+			styles.
+				Muted().
+				Background(theme.CurrentTheme().Background()).
+				Width(3)),
+	)
+}
+
+func NewEditorComponent(app *app.App) EditorComponent {
+	s := createSpinner()
 	ta := createTextArea(nil)
 
 	return &editorComponent{

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

@@ -1,8 +1,8 @@
 package chat
 
 import (
+	"encoding/json"
 	"fmt"
-	"log/slog"
 	"path/filepath"
 	"slices"
 	"strings"
@@ -24,7 +24,7 @@ import (
 
 func toMarkdown(content string, width int, backgroundColor compat.AdaptiveColor) string {
 	r := styles.GetMarkdownRenderer(width, backgroundColor)
-	content = strings.ReplaceAll(content, app.Info.Path.Root+"/", "")
+	content = strings.ReplaceAll(content, app.RootPath+"/", "")
 	rendered, _ := r.Render(content)
 	lines := strings.Split(rendered, "\n")
 
@@ -55,6 +55,10 @@ type blockRenderer struct {
 	fullWidth     bool
 	paddingTop    int
 	paddingBottom int
+	paddingLeft   int
+	paddingRight  int
+	marginTop     int
+	marginBottom  int
 }
 
 type renderingOption func(*blockRenderer)
@@ -77,6 +81,30 @@ func WithBorderColor(color compat.AdaptiveColor) renderingOption {
 	}
 }
 
+func WithMarginTop(padding int) renderingOption {
+	return func(c *blockRenderer) {
+		c.marginTop = padding
+	}
+}
+
+func WithMarginBottom(padding int) renderingOption {
+	return func(c *blockRenderer) {
+		c.marginBottom = padding
+	}
+}
+
+func WithPaddingLeft(padding int) renderingOption {
+	return func(c *blockRenderer) {
+		c.paddingLeft = padding
+	}
+}
+
+func WithPaddingRight(padding int) renderingOption {
+	return func(c *blockRenderer) {
+		c.paddingRight = padding
+	}
+}
+
 func WithPaddingTop(padding int) renderingOption {
 	return func(c *blockRenderer) {
 		c.paddingTop = padding
@@ -92,18 +120,24 @@ func WithPaddingBottom(padding int) renderingOption {
 func renderContentBlock(content string, options ...renderingOption) string {
 	t := theme.CurrentTheme()
 	renderer := &blockRenderer{
-		fullWidth: false,
+		fullWidth:     false,
+		paddingTop:    1,
+		paddingBottom: 1,
+		paddingLeft:   2,
+		paddingRight:  2,
 	}
 	for _, option := range options {
 		option(renderer)
 	}
 
 	style := styles.BaseStyle().
-		PaddingTop(1).
-		PaddingBottom(1).
-		PaddingLeft(2).
-		PaddingRight(2).
-		Background(t.BackgroundSubtle()).
+		// MarginTop(renderer.marginTop).
+		// MarginBottom(renderer.marginBottom).
+		PaddingTop(renderer.paddingTop).
+		PaddingBottom(renderer.paddingBottom).
+		PaddingLeft(renderer.paddingLeft).
+		PaddingRight(renderer.paddingRight).
+		Background(t.BackgroundPanel()).
 		Foreground(t.TextMuted()).
 		BorderStyle(lipgloss.ThickBorder())
 
@@ -112,7 +146,7 @@ func renderContentBlock(content string, options ...renderingOption) string {
 		align = *renderer.align
 	}
 
-	borderColor := t.BackgroundSubtle()
+	borderColor := t.BackgroundPanel()
 	if renderer.borderColor != nil {
 		borderColor = *renderer.borderColor
 	}
@@ -125,7 +159,7 @@ func renderContentBlock(content string, options ...renderingOption) string {
 			AlignHorizontal(align).
 			BorderLeftForeground(borderColor).
 			BorderLeftBackground(t.Background()).
-			BorderRightForeground(t.BackgroundSubtle()).
+			BorderRightForeground(t.BackgroundPanel()).
 			BorderRightBackground(t.Background())
 	case lipgloss.Right:
 		style = style.
@@ -134,7 +168,7 @@ func renderContentBlock(content string, options ...renderingOption) string {
 			AlignHorizontal(align).
 			BorderRightForeground(borderColor).
 			BorderRightBackground(t.Background()).
-			BorderLeftForeground(t.BackgroundSubtle()).
+			BorderLeftForeground(t.BackgroundPanel()).
 			BorderLeftBackground(t.Background())
 	}
 
@@ -142,37 +176,46 @@ func renderContentBlock(content string, options ...renderingOption) string {
 		style = style.Width(layout.Current.Container.Width)
 	}
 	content = style.Render(content)
-	if renderer.paddingTop > 0 {
-		content = strings.Repeat("\n", renderer.paddingTop) + content
-	}
-	if renderer.paddingBottom > 0 {
-		content = content + strings.Repeat("\n", renderer.paddingBottom)
-	}
 	content = lipgloss.PlaceHorizontal(
 		layout.Current.Container.Width,
 		align,
 		content,
+		lipgloss.WithWhitespaceStyle(lipgloss.NewStyle().Background(t.Background())),
 	)
 	content = lipgloss.PlaceHorizontal(
 		layout.Current.Viewport.Width,
 		lipgloss.Center,
 		content,
+		lipgloss.WithWhitespaceStyle(lipgloss.NewStyle().Background(t.Background())),
 	)
+	if renderer.marginTop > 0 {
+		for range renderer.marginTop {
+			content = "\n" + content
+		}
+	}
+	if renderer.marginBottom > 0 {
+		for range renderer.marginBottom {
+			content = content + "\n"
+		}
+	}
+
 	return content
 }
 
+func calculatePadding() int {
+	if layout.Current.Viewport.Width < 80 {
+		return 5
+	} else if layout.Current.Viewport.Width < 120 {
+		return 15
+	} else {
+		return 20
+	}
+}
+
 func renderText(message client.MessageInfo, text string, author string) string {
 	t := theme.CurrentTheme()
 	width := layout.Current.Container.Width
-	padding := 0
-	switch layout.Current.Size {
-	case layout.LayoutSizeSmall:
-		padding = 5
-	case layout.LayoutSizeNormal:
-		padding = 10
-	case layout.LayoutSizeLarge:
-		padding = 15
-	}
+	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] {
@@ -181,18 +224,13 @@ func renderText(message client.MessageInfo, text string, author string) string {
 	}
 	info := fmt.Sprintf("%s (%s)", author, timestamp)
 
-	align := lipgloss.Left
-	switch message.Role {
-	case client.User:
-		align = lipgloss.Right
-	case client.Assistant:
-		align = lipgloss.Left
-	}
-
-	textWidth := lipgloss.Width(text)
+	textWidth := max(lipgloss.Width(text), lipgloss.Width(info))
 	markdownWidth := min(textWidth, width-padding-4) // -4 for the border and padding
-	content := toMarkdown(text, markdownWidth, t.BackgroundSubtle())
-	content = lipgloss.JoinVertical(align, content, info)
+	if message.Role == client.Assistant {
+		markdownWidth = width - padding - 4
+	}
+	content := toMarkdown(text, markdownWidth, t.BackgroundPanel())
+	content = strings.Join([]string{content, info}, "\n")
 
 	switch message.Role {
 	case client.User:
@@ -203,7 +241,7 @@ func renderText(message client.MessageInfo, text string, author string) string {
 	case client.Assistant:
 		return renderContentBlock(content,
 			WithAlign(lipgloss.Left),
-			WithBorderColor(t.Primary()),
+			WithBorderColor(t.Accent()),
 		)
 	}
 	return ""
@@ -212,136 +250,187 @@ func renderText(message client.MessageInfo, text string, author string) string {
 func renderToolInvocation(
 	toolCall client.MessageToolInvocationToolCall,
 	result *string,
-	metadata map[string]any,
-	showResult bool,
+	metadata client.MessageInfo_Metadata_Tool_AdditionalProperties,
+	showDetails bool,
+	isLast bool,
+	contentOnly bool,
 ) string {
-	ignoredTools := []string{"opencode_todoread"}
+	ignoredTools := []string{"todoread"}
 	if slices.Contains(ignoredTools, toolCall.ToolName) {
 		return ""
 	}
 
-	padding := 1
-	outerWidth := layout.Current.Container.Width - 1 // subtract 1 for the border
-	innerWidth := outerWidth - padding - 4           // -4 for the border and padding
+	outerWidth := layout.Current.Container.Width
+	innerWidth := outerWidth - 6
+	paddingTop := 0
+	paddingBottom := 0
+	if showDetails {
+		paddingTop = 1
+		if result == nil || *result == "" {
+			paddingBottom = 1
+		}
+	}
 
 	t := theme.CurrentTheme()
 	style := styles.Muted().
 		Width(outerWidth).
-		PaddingLeft(padding).
+		Background(t.BackgroundPanel()).
+		PaddingTop(paddingTop).
+		PaddingBottom(paddingBottom).
+		PaddingLeft(2).
+		PaddingRight(2).
 		BorderLeft(true).
-		BorderForeground(t.BorderSubtle()).
+		BorderRight(true).
+		BorderBackground(t.Background()).
+		BorderForeground(t.BackgroundPanel()).
 		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.BackgroundPanel())
+			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 := ""
 	toolArgsMap := make(map[string]any)
 	if toolCall.Args != nil {
 		value := *toolCall.Args
-		m, ok := value.(map[string]any)
-		if ok {
+		if m, ok := value.(map[string]any); ok {
 			toolArgsMap = m
-			firstKey := ""
+
+			keys := make([]string, 0, len(toolArgsMap))
 			for key := range toolArgsMap {
-				firstKey = key
-				break
+				keys = append(keys, key)
 			}
+			slices.Sort(keys)
+			firstKey := ""
+			if len(keys) > 0 {
+				firstKey = keys[0]
+			}
+
 			toolArgs = renderArgs(&toolArgsMap, firstKey)
 		}
 	}
 
-	if len(toolArgsMap) == 0 {
-		slog.Debug("no args")
-	}
-
 	body := ""
 	error := ""
 	finished := result != nil && *result != ""
-	if finished {
-		body = *result
-	}
 
-	if metadata["error"] != nil && metadata["message"] != nil {
-		body = ""
-		error = styles.BaseStyle().
-			Foreground(t.Error()).
-			Render(metadata["message"].(string))
-		error = renderContentBlock(error, WithBorderColor(t.Error()), WithFullWidth(), WithPaddingTop(1), WithPaddingBottom(1))
-	}
-
-	elapsed := ""
-	if metadata["time"] != nil {
-		timeMap := metadata["time"].(map[string]any)
-		start := timeMap["start"].(float64)
-		end := timeMap["end"].(float64)
-		durationMs := end - start
-		duration := time.Duration(durationMs * float64(time.Millisecond))
-		roundedDuration := time.Duration(duration.Round(time.Millisecond))
-		if durationMs > 1000 {
-			roundedDuration = time.Duration(duration.Round(time.Second))
+	if e, ok := metadata.Get("error"); ok && e.(bool) == true {
+		if m, ok := metadata.Get("message"); ok {
+			style = style.BorderLeftForeground(t.Error())
+			error = styles.BaseStyle().
+				Background(t.BackgroundPanel()).
+				Foreground(t.Error()).
+				Render(m.(string))
+			error = renderContentBlock(
+				error,
+				WithFullWidth(),
+				WithBorderColor(t.Error()),
+				WithMarginBottom(1),
+			)
 		}
-		elapsed = styles.Muted().Render(roundedDuration.String())
 	}
 
 	title := ""
 	switch toolCall.ToolName {
-	case "opencode_read":
+	case "read":
 		toolArgs = renderArgs(&toolArgsMap, "filePath")
-		title = fmt.Sprintf("Read: %s   %s", toolArgs, elapsed)
-		body = ""
-		if metadata["preview"] != nil && toolArgsMap["filePath"] != nil {
+		title = fmt.Sprintf("READ %s", toolArgs)
+		if preview, ok := metadata.Get("preview"); ok && toolArgsMap["filePath"] != nil {
 			filename := toolArgsMap["filePath"].(string)
-			body = metadata["preview"].(string)
+			body = preview.(string)
 			body = renderFile(filename, body, WithTruncate(6))
 		}
-	case "opencode_edit":
-		filename := toolArgsMap["filePath"].(string)
-		title = fmt.Sprintf("Edit: %s   %s", relative(filename), elapsed)
-		if metadata["diff"] != nil {
-			patch := metadata["diff"].(string)
-			diffWidth := min(layout.Current.Viewport.Width, 120)
-			formattedDiff, _ := diff.FormatDiff(filename, patch, diff.WithTotalWidth(diffWidth))
-			body = strings.TrimSpace(formattedDiff)
-			body = lipgloss.Place(
-				layout.Current.Viewport.Width,
-				lipgloss.Height(body)+2,
-				lipgloss.Center,
-				lipgloss.Center,
-				body,
-				lipgloss.WithWhitespaceStyle(lipgloss.NewStyle().Background(t.Background())),
-			)
+	case "edit":
+		if filename, ok := toolArgsMap["filePath"].(string); ok {
+			title = fmt.Sprintf("EDIT %s", relative(filename))
+			if d, ok := metadata.Get("diff"); ok {
+				patch := d.(string)
+				var formattedDiff string
+				if layout.Current.Viewport.Width < 80 {
+					formattedDiff, _ = diff.FormatUnifiedDiff(
+						filename,
+						patch,
+						diff.WithWidth(layout.Current.Container.Width-2),
+					)
+				} else {
+					diffWidth := min(layout.Current.Viewport.Width-2, 120)
+					formattedDiff, _ = diff.FormatDiff(filename, patch, diff.WithTotalWidth(diffWidth))
+				}
+				formattedDiff = strings.TrimSpace(formattedDiff)
+				formattedDiff = lipgloss.NewStyle().
+					BorderStyle(lipgloss.ThickBorder()).
+					BorderBackground(t.Background()).
+					BorderForeground(t.BackgroundPanel()).
+					BorderLeft(true).
+					BorderRight(true).
+					Render(formattedDiff)
+
+				if showDetails {
+					style = style.Width(lipgloss.Width(formattedDiff))
+					title += "\n"
+				}
+
+				body = strings.TrimSpace(formattedDiff)
+				body = lipgloss.Place(
+					layout.Current.Viewport.Width,
+					lipgloss.Height(body)+1,
+					lipgloss.Center,
+					lipgloss.Top,
+					body,
+					lipgloss.WithWhitespaceStyle(lipgloss.NewStyle().Background(t.Background())),
+				)
+			}
 		}
-	case "opencode_write":
-		filename := toolArgsMap["filePath"].(string)
-		title = fmt.Sprintf("Write: %s   %s", relative(filename), elapsed)
-		content := toolArgsMap["content"].(string)
-		body = renderFile(filename, content)
-	case "opencode_bash":
-		description := toolArgsMap["description"].(string)
-		title = fmt.Sprintf("Shell: %s   %s", description, elapsed)
-		if metadata["stdout"] != nil {
+	case "write":
+		if filename, ok := toolArgsMap["filePath"].(string); ok {
+			title = fmt.Sprintf("WRITE %s", relative(filename))
+			if content, ok := toolArgsMap["content"].(string); ok {
+				body = renderFile(filename, content)
+			}
+		}
+	case "bash":
+		if description, ok := toolArgsMap["description"].(string); ok {
+			title = fmt.Sprintf("SHELL %s", description)
+		}
+		if stdout, ok := metadata.Get("stdout"); ok {
 			command := toolArgsMap["command"].(string)
-			stdout := metadata["stdout"].(string)
+			stdout := stdout.(string)
 			body = fmt.Sprintf("```console\n> %s\n%s```", command, stdout)
-			body = toMarkdown(body, innerWidth, t.BackgroundSubtle())
-			body = renderContentBlock(body, WithFullWidth(), WithPaddingTop(1), WithPaddingBottom(1))
+			body = toMarkdown(body, innerWidth, t.BackgroundPanel())
+			body = renderContentBlock(body, WithFullWidth(), WithMarginBottom(1))
 		}
-	case "opencode_webfetch":
-		title = fmt.Sprintf("Fetching: %s   %s", toolArgs, elapsed)
-		format := toolArgsMap["format"].(string)
-		body = truncateHeight(body, 10)
-		if format == "html" || format == "markdown" {
-			body = toMarkdown(body, innerWidth, t.BackgroundSubtle())
+	case "webfetch":
+		toolArgs = renderArgs(&toolArgsMap, "url")
+		title = fmt.Sprintf("FETCH %s", toolArgs)
+		if format, ok := toolArgsMap["format"].(string); ok {
+			if result != nil {
+				body = *result
+				body = truncateHeight(body, 10)
+				if format == "html" || format == "markdown" {
+					body = toMarkdown(body, innerWidth, t.BackgroundPanel())
+				}
+				body = renderContentBlock(body, WithFullWidth(), WithMarginBottom(1))
+			}
 		}
-		body = renderContentBlock(body, WithFullWidth(), WithPaddingTop(1), WithPaddingBottom(1))
-	case "opencode_todowrite":
-		title = fmt.Sprintf("Planning...   %s", elapsed)
-		if finished && metadata["todos"] != nil {
-			body = ""
-			todos := metadata["todos"].([]any)
+	case "todowrite":
+		title = fmt.Sprintf("PLAN")
+
+		if to, ok := metadata.Get("todos"); ok && finished {
+			todos := to.([]any)
 			for _, todo := range todos {
 				t := todo.(map[string]any)
 				content := t["content"].(string)
@@ -349,27 +438,101 @@ func renderToolInvocation(
 				case "completed":
 					body += fmt.Sprintf("- [x] %s\n", content)
 				// case "in-progress":
-				// 	body += fmt.Sprintf("- [ ] _%s_\n", content)
+				// 	body += fmt.Sprintf("- [ ] %s\n", content)
 				default:
 					body += fmt.Sprintf("- [ ] %s\n", content)
 				}
 			}
-			body = toMarkdown(body, innerWidth, t.BackgroundSubtle())
-			body = renderContentBlock(body, WithFullWidth(), WithPaddingTop(1), WithPaddingBottom(1))
+			body = toMarkdown(body, innerWidth, t.BackgroundPanel())
+			body = renderContentBlock(body, WithFullWidth(), WithMarginBottom(1))
 		}
+	case "task":
+		if description, ok := toolArgsMap["description"].(string); ok {
+			title = fmt.Sprintf("TASK %s", description)
+			if summary, ok := metadata.Get("summary"); ok {
+				toolcalls := summary.([]any)
+				// toolcalls :=
+
+				steps := []string{}
+				for _, toolcall := range toolcalls {
+					call := toolcall.(map[string]any)
+					if toolInvocation, ok := call["toolInvocation"].(map[string]any); ok {
+						data, _ := json.Marshal(toolInvocation)
+						var toolCall client.MessageToolInvocationToolCall
+						_ = json.Unmarshal(data, &toolCall)
+
+						if metadata, ok := call["metadata"].(map[string]any); ok {
+							data, _ = json.Marshal(metadata)
+							var toolMetadata client.MessageInfo_Metadata_Tool_AdditionalProperties
+							_ = json.Unmarshal(data, &toolMetadata)
+
+							step := renderToolInvocation(
+								toolCall,
+								nil,
+								toolMetadata,
+								false,
+								false,
+								true,
+							)
+							steps = append(steps, step)
+						}
+					}
+				}
+				body = strings.Join(steps, "\n")
+				body = renderContentBlock(body, WithFullWidth(), WithMarginBottom(1))
+			}
+		}
+
 	default:
 		toolName := renderToolName(toolCall.ToolName)
-		title = fmt.Sprintf("%s: %s   %s", toolName, toolArgs, elapsed)
+		title = fmt.Sprintf("%s %s", toolName, toolArgs)
+		if result == nil {
+			empty := ""
+			result = &empty
+		}
+		body = *result
 		body = truncateHeight(body, 10)
-		body = renderContentBlock(body, WithFullWidth(), WithPaddingTop(1), WithPaddingBottom(1))
+		body = renderContentBlock(body, WithFullWidth(), WithMarginBottom(1))
+	}
+
+	if contentOnly {
+		title = "∟ " + title
+		return title
+	}
+
+	if !showDetails {
+		title = "∟ " + title
+		padding := calculatePadding()
+		style := lipgloss.NewStyle().Width(outerWidth - padding - 4).Background(t.BackgroundPanel())
+		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)
+		body = renderContentBlock(body, WithFullWidth(), WithMarginBottom(1))
 	}
 
 	content := style.Render(title)
-	content = lipgloss.PlaceHorizontal(layout.Current.Viewport.Width, lipgloss.Center, content)
-	if showResult && body != "" && error == "" {
+	content = lipgloss.PlaceHorizontal(
+		layout.Current.Viewport.Width,
+		lipgloss.Center,
+		content,
+		lipgloss.WithWhitespaceStyle(lipgloss.NewStyle().Background(t.Background())),
+	)
+	if showDetails && body != "" && error == "" {
 		content += "\n" + body
 	}
-	if showResult && error != "" {
+	if showDetails && error != "" {
 		content += "\n" + error
 	}
 	return content
@@ -377,22 +540,18 @@ func renderToolInvocation(
 
 func renderToolName(name string) string {
 	switch name {
-	// case agent.AgentToolName:
-	// 	return "Task"
-	case "opencode_ls":
-		return "List"
-	case "opencode_webfetch":
-		return "Fetch"
-	case "opencode_todoread":
-		return "Planning"
-	case "opencode_todowrite":
-		return "Planning"
+	case "list":
+		return "LIST"
+	case "webfetch":
+		return "FETCH"
+	case "todowrite":
+		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)
 	}
 }
 
@@ -433,34 +592,36 @@ func renderFile(filename string, content string, options ...fileRenderingOption)
 		content = truncateHeight(content, renderer.height)
 	}
 	content = fmt.Sprintf("```%s\n%s\n```", extension(renderer.filename), content)
-	content = toMarkdown(content, width, t.BackgroundSubtle())
+	content = toMarkdown(content, width, t.BackgroundPanel())
 
-	return renderContentBlock(content, WithFullWidth(), WithPaddingTop(1), WithPaddingBottom(1))
+	return renderContentBlock(content, WithFullWidth(), WithMarginBottom(1))
 }
 
 func renderToolAction(name string) string {
 	switch name {
-	// case agent.AgentToolName:
-	// 	return "Preparing prompt..."
-	case "opencode_bash":
+	case "task":
+		return "Searching..."
+	case "bash":
 		return "Building command..."
-	case "opencode_edit":
+	case "edit":
 		return "Preparing edit..."
-	case "opencode_fetch":
-		return "Writing fetch..."
-	case "opencode_glob":
+	case "webfetch":
+		return "Fetching from the web..."
+	case "glob":
 		return "Finding files..."
-	case "opencode_grep":
+	case "grep":
 		return "Searching content..."
-	case "opencode_ls":
+	case "list":
 		return "Listing directory..."
-	case "opencode_read":
+	case "read":
 		return "Reading file..."
-	case "opencode_write":
+	case "write":
 		return "Preparing write..."
-	case "opencode_patch":
+	case "todowrite", "todoread":
+		return "Planning..."
+	case "patch":
 		return "Preparing patch..."
-	case "opencode_batch":
+	case "batch":
 		return "Running batch operations..."
 	}
 	return "Working..."
@@ -470,9 +631,17 @@ func renderArgs(args *map[string]any, titleKey string) string {
 	if args == nil || len(*args) == 0 {
 		return ""
 	}
+
+	keys := make([]string, 0, len(*args))
+	for key := range *args {
+		keys = append(keys, key)
+	}
+	slices.Sort(keys)
+
 	title := ""
 	parts := []string{}
-	for key, value := range *args {
+	for _, key := range keys {
+		value := (*args)[key]
 		if value == nil {
 			continue
 		}
@@ -500,7 +669,7 @@ func truncateHeight(content string, height int) string {
 }
 
 func relative(path string) string {
-	return strings.TrimPrefix(path, app.Info.Path.Root+"/")
+	return strings.TrimPrefix(path, app.RootPath+"/")
 }
 
 func extension(path string) string {

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

@@ -1,116 +1,102 @@
 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"
 	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/components/commands"
 	"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)
+	ToolDetailsVisible() bool
+}
+
 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
+	commands        commands.CommandsComponent
 	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)
+	return tea.Batch(m.viewport.Init(), m.spinner.Tick, m.commands.Init())
 }
 
 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
-		m.renderView()
-		return m, nil
-	case state.SessionSelectedMsg:
+		return m, m.Reload()
+	case ToggleToolDetailsMsg:
+		m.showToolDetails = !m.showToolDetails
+		return m, m.Reload()
+	case app.SessionSelectedMsg:
 		m.cache.Clear()
-		cmd := m.Reload()
-		m.viewport.GotoBottom()
-		return m, cmd
-	case state.SessionClearedMsg:
+		m.tail = true
+		return m, m.Reload()
+	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)
+
+	updated, cmd := m.commands.Update(msg)
+	m.commands = updated.(commands.CommandsComponent)
+	cmds = append(cmds, cmd)
+
 	return m, tea.Batch(cmds...)
 }
 
@@ -118,7 +104,6 @@ type blockType int
 
 const (
 	none blockType = iota
-	systemTextBlock
 	userTextBlock
 	assistantTextBlock
 	toolInvocationBlock
@@ -134,22 +119,29 @@ func (m *messagesComponent) renderView() {
 	blocks := make([]string, 0)
 	previousBlockType := none
 	for _, message := range m.app.Messages {
-		if message.Role == client.System {
-			continue // ignoring system messages for now
-		}
-
 		var content string
 		var cached bool
+		lastToolIndex := 0
+		lastToolIndices := []int{}
+		for i, p := range message.Parts {
+			part, _ := p.ValueByDiscriminator()
+			switch part.(type) {
+			case client.MessagePartText:
+				lastToolIndices = append(lastToolIndices, lastToolIndex)
+			case client.MessagePartToolInvocation:
+				lastToolIndex = i
+			}
+		}
 
 		author := ""
 		switch message.Role {
 		case client.User:
-			author = app.Info.User
+			author = m.app.Info.User
 		case client.Assistant:
 			author = message.Metadata.Assistant.ModelID
 		}
 
-		for _, p := range message.Parts {
+		for i, p := range message.Parts {
 			part, err := p.ValueByDiscriminator()
 			if err != nil {
 				continue //TODO: handle error?
@@ -174,15 +166,14 @@ func (m *messagesComponent) renderView() {
 					previousBlockType = userTextBlock
 				} else if message.Role == client.Assistant {
 					previousBlockType = assistantTextBlock
-				} else if message.Role == client.System {
-					previousBlockType = systemTextBlock
 				}
 			case client.MessagePartToolInvocation:
+				isLastToolInvocation := slices.Contains(lastToolIndices, i)
 				toolInvocationPart := part.(client.MessagePartToolInvocation)
 				toolCall, _ := toolInvocationPart.ToolInvocation.AsMessageToolInvocationToolCall()
-				metadata := map[string]any{}
+				metadata := client.MessageInfo_Metadata_Tool_AdditionalProperties{}
 				if _, ok := message.Metadata.Tool[toolCall.ToolCallId]; ok {
-					metadata = message.Metadata.Tool[toolCall.ToolCallId].(map[string]any)
+					metadata = message.Metadata.Tool[toolCall.ToolCallId]
 				}
 				var result *string
 				resultPart, resultError := toolInvocationPart.ToolInvocation.AsMessageToolInvocationToolResult()
@@ -193,20 +184,34 @@ 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,
+							false,
+						)
 						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,
+						false,
+					)
 				}
 
-				if previousBlockType != toolInvocationBlock {
+				if previousBlockType != toolInvocationBlock && m.showToolDetails {
 					blocks = append(blocks, "")
 				}
 				blocks = append(blocks, content)
@@ -215,14 +220,16 @@ func (m *messagesComponent) renderView() {
 		}
 
 		error := ""
-		errorValue, _ := message.Metadata.Error.ValueByDiscriminator()
-		switch errorValue.(type) {
-		case client.UnknownError:
-			clientError := errorValue.(client.UnknownError)
-			error = clientError.Data.Message
-			error = renderContentBlock(error, WithBorderColor(t.Error()), WithFullWidth(), WithPaddingTop(1), WithPaddingBottom(1))
-			blocks = append(blocks, error)
-			previousBlockType = errorBlock
+		if message.Metadata.Error != nil {
+			errorValue, _ := message.Metadata.Error.ValueByDiscriminator()
+			switch errorValue.(type) {
+			case client.UnknownError:
+				clientError := errorValue.(client.UnknownError)
+				error = clientError.Data.Message
+				error = renderContentBlock(error, WithBorderColor(t.Error()), WithFullWidth(), WithMarginTop(1), WithMarginBottom(1))
+				blocks = append(blocks, error)
+				previousBlockType = errorBlock
+			}
 		}
 	}
 
@@ -247,10 +254,10 @@ func (m *messagesComponent) header() string {
 
 	t := theme.CurrentTheme()
 	width := layout.Current.Container.Width
-	base := styles.BaseStyle().Render
-	muted := styles.Muted().Render
+	base := styles.BaseStyle().Background(t.Background()).Render
+	muted := styles.Muted().Background(t.Background()).Render
 	headerLines := []string{}
-	headerLines = append(headerLines, toMarkdown("# "+m.app.Session.Title, width, t.Background()))
+	headerLines = append(headerLines, toMarkdown("# "+m.app.Session.Title, width-6, t.Background()))
 	if m.app.Session.Share != nil && m.app.Session.Share.Url != "" {
 		headerLines = append(headerLines, muted(m.app.Session.Share.Url))
 	} else {
@@ -260,37 +267,51 @@ func (m *messagesComponent) header() string {
 
 	header = styles.BaseStyle().
 		Width(width).
-		PaddingTop(1).
-		BorderBottom(true).
-		BorderForeground(t.BorderSubtle()).
-		BorderStyle(lipgloss.NormalBorder()).
+		PaddingLeft(2).
+		PaddingRight(2).
 		Background(t.Background()).
+		BorderLeft(true).
+		BorderRight(true).
+		BorderBackground(t.Background()).
+		BorderForeground(t.BackgroundElement()).
+		BorderStyle(lipgloss.ThickBorder()).
 		Render(header)
 
-	return header
+	return "\n" + header + "\n"
 }
 
 func (m *messagesComponent) View() string {
-	if len(m.app.Messages) == 0 || m.rendering {
+	if len(m.app.Messages) == 0 {
 		return m.home()
 	}
+	if m.rendering {
+		return lipgloss.Place(
+			m.width,
+			m.height,
+			lipgloss.Center,
+			lipgloss.Center,
+			"Loading session...",
+		)
+	}
+	t := theme.CurrentTheme()
 	return lipgloss.JoinVertical(
 		lipgloss.Left,
-		lipgloss.PlaceHorizontal(m.width, lipgloss.Center, m.header()),
+		lipgloss.PlaceHorizontal(
+			m.width,
+			lipgloss.Center,
+			m.header(),
+			lipgloss.WithWhitespaceStyle(lipgloss.NewStyle().Background(t.Background())),
+		),
 		m.viewport.View(),
 	)
 }
 
 func (m *messagesComponent) home() string {
-	// t := theme.CurrentTheme()
-	baseStyle := styles.BaseStyle()
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle().Background(t.Background())
 	base := baseStyle.Render
-	muted := styles.Muted().Render
+	muted := styles.Muted().Background(t.Background()).Render
 
-	// 	mark := `
-	// ███▀▀█
-	// ███  █
-	// ▀▀▀▀▀▀  `
 	open := `
 █▀▀█ █▀▀█ █▀▀ █▀▀▄ 
 █░░█ █░░█ █▀▀ █░░█ 
@@ -302,56 +323,51 @@ func (m *messagesComponent) home() string {
 
 	logo := lipgloss.JoinHorizontal(
 		lipgloss.Top,
-		// styles.BaseStyle().Foreground(t.Primary()).Render(mark),
-		styles.Muted().Render(open),
-		styles.BaseStyle().Render(code),
+		muted(open),
+		base(code),
 	)
-	cwd := app.Info.Path.Cwd
-	config := app.Info.Path.Config
+	// cwd := app.Info.Path.Cwd
+	// config := app.Info.Path.Config
 
-	commands := [][]string{
-		{"/help", "show help"},
-		{"/sessions", "list sessions"},
-		{"/new", "start a new session"},
-		{"/model", "switch model"},
-		{"/share", "share the current session"},
-		{"/exit", "exit the app"},
-	}
+	versionStyle := lipgloss.NewStyle().
+		Background(t.Background()).
+		Foreground(t.TextMuted()).
+		Width(lipgloss.Width(logo)).
+		Align(lipgloss.Right)
+	version := versionStyle.Render(m.app.Version)
 
-	commandLines := []string{}
-	for _, command := range commands {
-		commandLines = append(commandLines, (base(command[0]) + " " + muted(command[1])))
-	}
-
-	logoAndVersion := lipgloss.JoinVertical(
-		lipgloss.Right,
-		logo,
-		muted(app.Info.Version),
+	logoAndVersion := strings.Join([]string{logo, version}, "\n")
+	logoAndVersion = lipgloss.PlaceHorizontal(
+		m.width,
+		lipgloss.Center,
+		logoAndVersion,
+		lipgloss.WithWhitespaceStyle(lipgloss.NewStyle().Background(t.Background())),
+	)
+	m.commands.SetBackgroundColor(t.Background())
+	commands := lipgloss.PlaceHorizontal(
+		m.width,
+		lipgloss.Center,
+		m.commands.View(),
+		lipgloss.WithWhitespaceStyle(lipgloss.NewStyle().Background(t.Background())),
 	)
 
 	lines := []string{}
-	lines = append(lines, "")
-	lines = append(lines, "")
 	lines = append(lines, logoAndVersion)
 	lines = append(lines, "")
-	lines = append(lines, base("cwd ")+muted(cwd))
-	lines = append(lines, base("config ")+muted(config))
 	lines = append(lines, "")
-	lines = append(lines, commandLines...)
-	lines = append(lines, "")
-	if m.rendering {
-		lines = append(lines, styles.Muted().Render("Loading session..."))
-	} else {
-		lines = append(lines, "")
-	}
+	// lines = append(lines, base("cwd ")+muted(cwd))
+	// lines = append(lines, base("config ")+muted(config))
+	// lines = append(lines, "")
+	lines = append(lines, commands)
 
-	return lipgloss.Place(m.width, m.height, lipgloss.Center, lipgloss.Center,
-		baseStyle.Width(lipgloss.Width(logoAndVersion)).Render(
-			lipgloss.JoinVertical(
-				lipgloss.Top,
-				lines...,
-			),
-		))
+	return lipgloss.Place(
+		m.width,
+		m.height,
+		lipgloss.Center,
+		lipgloss.Center,
+		baseStyle.Render(strings.Join(lines, "\n")),
+		lipgloss.WithWhitespaceStyle(lipgloss.NewStyle().Background(t.Background())),
+	)
 }
 
 func (m *messagesComponent) SetSize(width, height int) tea.Cmd {
@@ -368,6 +384,7 @@ func (m *messagesComponent) SetSize(width, height int) tea.Cmd {
 	m.viewport.SetHeight(height - lipgloss.Height(m.header()))
 	m.attachments.SetWidth(width + 40)
 	m.attachments.SetHeight(3)
+	m.commands.SetSize(width, height)
 	m.renderView()
 	return nil
 }
@@ -384,35 +401,67 @@ func (m *messagesComponent) Reload() tea.Cmd {
 	}
 }
 
-func (m *messagesComponent) BindingKeys() []key.Binding {
-	return []key.Binding{
-		m.viewport.KeyMap.PageDown,
-		m.viewport.KeyMap.PageUp,
-		m.viewport.KeyMap.HalfPageUp,
-		m.viewport.KeyMap.HalfPageDown,
-	}
+func (m *messagesComponent) PageUp() (tea.Model, tea.Cmd) {
+	m.viewport.ViewUp()
+	return m, nil
 }
 
-func NewMessagesComponent(app *app.App) layout.ModelWithView {
+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 (m *messagesComponent) ToolDetailsVisible() bool {
+	return m.showToolDetails
+}
+
+func NewMessagesComponent(app *app.App) MessagesComponent {
 	customSpinner := spinner.Spinner{
 		Frames: []string{" ", "┃", "┃"},
 		FPS:    time.Second / 3,
 	}
 	s := spinner.New(spinner.WithSpinner(customSpinner))
 
-	vp := viewport.New()          //(0, 0)
-	attachments := viewport.New() //(0, 0)
-	vp.KeyMap.PageUp = messageKeys.PageUp
-	vp.KeyMap.PageDown = messageKeys.PageDown
-	vp.KeyMap.HalfPageUp = messageKeys.HalfPageUp
-	vp.KeyMap.HalfPageDown = messageKeys.HalfPageDown
+	vp := viewport.New()
+	attachments := viewport.New()
+	vp.KeyMap = viewport.KeyMap{}
+
+	t := theme.CurrentTheme()
+	commandsView := commands.New(
+		app,
+		commands.WithBackground(t.Background()),
+		commands.WithLimit(6),
+	)
 
 	return &messagesComponent{
 		app:             app,
 		viewport:        vp,
 		spinner:         s,
 		attachments:     attachments,
-		showToolResults: true,
+		commands:        commandsView,
+		showToolDetails: true,
 		cache:           NewMessageCache(),
 		tail:            true,
 	}

packages/tui/internal/components/commands/commands.go

@@ -0,0 +1,201 @@
+package commands
+
+import (
+	"fmt"
+	"strings"
+
+	tea "github.com/charmbracelet/bubbletea/v2"
+	"github.com/charmbracelet/lipgloss/v2"
+	"github.com/charmbracelet/lipgloss/v2/compat"
+	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/commands"
+	"github.com/sst/opencode/internal/layout"
+	"github.com/sst/opencode/internal/styles"
+	"github.com/sst/opencode/internal/theme"
+)
+
+type CommandsComponent interface {
+	tea.Model
+	tea.ViewModel
+	layout.Sizeable
+	SetBackgroundColor(color compat.AdaptiveColor)
+}
+
+type commandsComponent struct {
+	app           *app.App
+	width, height int
+	showKeybinds  bool
+	background    *compat.AdaptiveColor
+	limit         *int
+}
+
+func (c *commandsComponent) SetSize(width, height int) tea.Cmd {
+	c.width = width
+	c.height = height
+	return nil
+}
+
+func (c *commandsComponent) GetSize() (int, int) {
+	return c.width, c.height
+}
+
+func (c *commandsComponent) SetBackgroundColor(color compat.AdaptiveColor) {
+	c.background = &color
+}
+
+func (c *commandsComponent) Init() tea.Cmd {
+	return nil
+}
+
+func (c *commandsComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		c.width = msg.Width
+		c.height = msg.Height
+	}
+	return c, nil
+}
+
+func (c *commandsComponent) View() string {
+	t := theme.CurrentTheme()
+
+	triggerStyle := lipgloss.NewStyle().
+		Foreground(t.Primary()).
+		Bold(true)
+
+	descriptionStyle := lipgloss.NewStyle().
+		Foreground(t.Text())
+
+	keybindStyle := lipgloss.NewStyle().
+		Foreground(t.TextMuted())
+
+	if c.background != nil {
+		triggerStyle = triggerStyle.Background(*c.background)
+		descriptionStyle = descriptionStyle.Background(*c.background)
+		keybindStyle = keybindStyle.Background(*c.background)
+	}
+
+	var commandsWithTriggers []commands.Command
+	for _, cmd := range c.app.Commands.Sorted() {
+		if cmd.Trigger != "" {
+			commandsWithTriggers = append(commandsWithTriggers, cmd)
+		}
+	}
+	if c.limit != nil && len(commandsWithTriggers) > *c.limit {
+		commandsWithTriggers = commandsWithTriggers[:*c.limit]
+	}
+
+	if len(commandsWithTriggers) == 0 {
+		return styles.Muted().Render("No commands with triggers available")
+	}
+
+	// Calculate column widths
+	maxTriggerWidth := 0
+	maxDescriptionWidth := 0
+	maxKeybindWidth := 0
+
+	// Prepare command data
+	type commandRow struct {
+		trigger     string
+		description string
+		keybinds    string
+	}
+
+	rows := make([]commandRow, 0, len(commandsWithTriggers))
+
+	for _, cmd := range commandsWithTriggers {
+		trigger := "/" + cmd.Trigger
+		description := cmd.Description
+
+		// Format keybindings
+		var keybindStrs []string
+		if c.showKeybinds {
+			for _, kb := range cmd.Keybindings {
+				if kb.RequiresLeader {
+					keybindStrs = append(keybindStrs, *c.app.Config.Keybinds.Leader+" "+kb.Key)
+				} else {
+					keybindStrs = append(keybindStrs, kb.Key)
+				}
+			}
+		}
+		keybinds := strings.Join(keybindStrs, ", ")
+
+		rows = append(rows, commandRow{
+			trigger:     trigger,
+			description: description,
+			keybinds:    keybinds,
+		})
+
+		// Update max widths
+		if len(trigger) > maxTriggerWidth {
+			maxTriggerWidth = len(trigger)
+		}
+		if len(description) > maxDescriptionWidth {
+			maxDescriptionWidth = len(description)
+		}
+		if len(keybinds) > maxKeybindWidth {
+			maxKeybindWidth = len(keybinds)
+		}
+	}
+
+	// Add padding between columns
+	columnPadding := 3
+
+	// Build the output
+	var output strings.Builder
+
+	for _, row := range rows {
+		// Pad each column to align properly
+		trigger := fmt.Sprintf("%-*s", maxTriggerWidth, row.trigger)
+		description := fmt.Sprintf("%-*s", maxDescriptionWidth, row.description)
+
+		// Apply styles and combine
+		line := triggerStyle.Render(trigger) +
+			triggerStyle.Render(strings.Repeat(" ", columnPadding)) +
+			descriptionStyle.Render(description)
+
+		if c.showKeybinds && row.keybinds != "" {
+			line += keybindStyle.Render(strings.Repeat(" ", columnPadding)) +
+				keybindStyle.Render(row.keybinds)
+		}
+
+		output.WriteString(line + "\n")
+	}
+
+	// Remove trailing newline
+	result := strings.TrimSuffix(output.String(), "\n")
+
+	return result
+}
+
+type Option func(*commandsComponent)
+
+func WithKeybinds(show bool) Option {
+	return func(c *commandsComponent) {
+		c.showKeybinds = show
+	}
+}
+
+func WithBackground(background compat.AdaptiveColor) Option {
+	return func(c *commandsComponent) {
+		c.background = &background
+	}
+}
+
+func WithLimit(limit int) Option {
+	return func(c *commandsComponent) {
+		c.limit = &limit
+	}
+}
+
+func New(app *app.App, opts ...Option) CommandsComponent {
+	c := &commandsComponent{
+		app:          app,
+		background:   nil,
+		showKeybinds: true,
+	}
+	for _, opt := range opts {
+		opt(c)
+	}
+	return c
+}

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

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

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

@@ -1,264 +0,0 @@
-package dialog
-
-import (
-	"fmt"
-	"github.com/charmbracelet/bubbles/v2/key"
-	"github.com/charmbracelet/bubbles/v2/textinput"
-	tea "github.com/charmbracelet/bubbletea/v2"
-	"github.com/charmbracelet/lipgloss/v2"
-
-	"github.com/sst/opencode/internal/styles"
-	"github.com/sst/opencode/internal/theme"
-	"github.com/sst/opencode/internal/util"
-)
-
-type argumentsDialogKeyMap struct {
-	Enter  key.Binding
-	Escape key.Binding
-}
-
-// ShortHelp implements key.Map.
-func (k argumentsDialogKeyMap) ShortHelp() []key.Binding {
-	return []key.Binding{
-		key.NewBinding(
-			key.WithKeys("enter"),
-			key.WithHelp("enter", "confirm"),
-		),
-		key.NewBinding(
-			key.WithKeys("esc"),
-			key.WithHelp("esc", "cancel"),
-		),
-	}
-}
-
-// FullHelp implements key.Map.
-func (k argumentsDialogKeyMap) FullHelp() [][]key.Binding {
-	return [][]key.Binding{k.ShortHelp()}
-}
-
-// ShowMultiArgumentsDialogMsg is a message that is sent to show the multi-arguments dialog.
-type ShowMultiArgumentsDialogMsg struct {
-	CommandID string
-	Content   string
-	ArgNames  []string
-}
-
-// CloseMultiArgumentsDialogMsg is a message that is sent when the multi-arguments dialog is closed.
-type CloseMultiArgumentsDialogMsg struct {
-	Submit    bool
-	CommandID string
-	Content   string
-	Args      map[string]string
-}
-
-// MultiArgumentsDialogCmp is a component that asks the user for multiple command arguments.
-type MultiArgumentsDialogCmp struct {
-	width, height int
-	inputs        []textinput.Model
-	focusIndex    int
-	keys          argumentsDialogKeyMap
-	commandID     string
-	content       string
-	argNames      []string
-}
-
-// NewMultiArgumentsDialogCmp creates a new MultiArgumentsDialogCmp.
-func NewMultiArgumentsDialogCmp(commandID, content string, argNames []string) MultiArgumentsDialogCmp {
-	t := theme.CurrentTheme()
-	inputs := make([]textinput.Model, len(argNames))
-
-	for i, name := range argNames {
-		ti := textinput.New()
-		ti.Placeholder = fmt.Sprintf("Enter value for %s...", name)
-		ti.SetWidth(40)
-		ti.Prompt = ""
-		ti.Styles.Blurred.Placeholder = ti.Styles.Blurred.Placeholder.Background(t.Background())
-		ti.Styles.Blurred.Text = ti.Styles.Blurred.Text.Background(t.Background())
-		ti.Styles.Blurred.Prompt = ti.Styles.Blurred.Prompt.Foreground(t.Primary())
-
-		ti.Styles.Focused.Placeholder = ti.Styles.Focused.Placeholder.Background(t.Background())
-		ti.Styles.Focused.Text = ti.Styles.Focused.Text.Background(t.Background())
-		ti.Styles.Focused.Prompt = ti.Styles.Focused.Prompt.Foreground(t.Primary())
-
-		// ti.PromptStyle = ti.PromptStyle.Background(t.Background())
-		// ti.TextStyle = ti.TextStyle.Background(t.Background())
-
-		// Only focus the first input initially
-		if i == 0 {
-			ti.Focus()
-			// ti.PromptStyle = ti.PromptStyle.Foreground(t.Primary())
-			// ti.TextStyle = ti.TextStyle.Foreground(t.Primary())
-		} else {
-			ti.Blur()
-		}
-
-		inputs[i] = ti
-	}
-
-	return MultiArgumentsDialogCmp{
-		inputs:     inputs,
-		keys:       argumentsDialogKeyMap{},
-		commandID:  commandID,
-		content:    content,
-		argNames:   argNames,
-		focusIndex: 0,
-	}
-}
-
-// Init implements tea.Model.
-func (m MultiArgumentsDialogCmp) Init() tea.Cmd {
-	// Make sure only the first input is focused
-	for i := range m.inputs {
-		if i == 0 {
-			m.inputs[i].Focus()
-		} else {
-			m.inputs[i].Blur()
-		}
-	}
-
-	return textinput.Blink
-}
-
-// Update implements tea.Model.
-func (m MultiArgumentsDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	var cmds []tea.Cmd
-	// t := theme.CurrentTheme()
-
-	switch msg := msg.(type) {
-	case tea.KeyMsg:
-		switch {
-		case key.Matches(msg, key.NewBinding(key.WithKeys("esc"))):
-			return m, util.CmdHandler(CloseMultiArgumentsDialogMsg{
-				Submit:    false,
-				CommandID: m.commandID,
-				Content:   m.content,
-				Args:      nil,
-			})
-		case key.Matches(msg, key.NewBinding(key.WithKeys("enter"))):
-			// If we're on the last input, submit the form
-			if m.focusIndex == len(m.inputs)-1 {
-				args := make(map[string]string)
-				for i, name := range m.argNames {
-					args[name] = m.inputs[i].Value()
-				}
-				return m, util.CmdHandler(CloseMultiArgumentsDialogMsg{
-					Submit:    true,
-					CommandID: m.commandID,
-					Content:   m.content,
-					Args:      args,
-				})
-			}
-			// Otherwise, move to the next input
-			m.inputs[m.focusIndex].Blur()
-			m.focusIndex++
-			m.inputs[m.focusIndex].Focus()
-			// m.inputs[m.focusIndex].PromptStyle = m.inputs[m.focusIndex].PromptStyle.Foreground(t.Primary())
-			// m.inputs[m.focusIndex].TextStyle = m.inputs[m.focusIndex].TextStyle.Foreground(t.Primary())
-		case key.Matches(msg, key.NewBinding(key.WithKeys("tab"))):
-			// Move to the next input
-			m.inputs[m.focusIndex].Blur()
-			m.focusIndex = (m.focusIndex + 1) % len(m.inputs)
-			m.inputs[m.focusIndex].Focus()
-			// m.inputs[m.focusIndex].PromptStyle = m.inputs[m.focusIndex].PromptStyle.Foreground(t.Primary())
-			// m.inputs[m.focusIndex].TextStyle = m.inputs[m.focusIndex].TextStyle.Foreground(t.Primary())
-		case key.Matches(msg, key.NewBinding(key.WithKeys("shift+tab"))):
-			// Move to the previous input
-			m.inputs[m.focusIndex].Blur()
-			m.focusIndex = (m.focusIndex - 1 + len(m.inputs)) % len(m.inputs)
-			m.inputs[m.focusIndex].Focus()
-			// m.inputs[m.focusIndex].PromptStyle = m.inputs[m.focusIndex].PromptStyle.Foreground(t.Primary())
-			// m.inputs[m.focusIndex].TextStyle = m.inputs[m.focusIndex].TextStyle.Foreground(t.Primary())
-		}
-	case tea.WindowSizeMsg:
-		m.width = msg.Width
-		m.height = msg.Height
-	}
-
-	// Update the focused input
-	var cmd tea.Cmd
-	m.inputs[m.focusIndex], cmd = m.inputs[m.focusIndex].Update(msg)
-	cmds = append(cmds, cmd)
-
-	return m, tea.Batch(cmds...)
-}
-
-// View implements tea.Model.
-func (m MultiArgumentsDialogCmp) View() string {
-	t := theme.CurrentTheme()
-	baseStyle := styles.BaseStyle()
-
-	// Calculate width needed for content
-	maxWidth := 60 // Width for explanation text
-
-	title := lipgloss.NewStyle().
-		Foreground(t.Primary()).
-		Bold(true).
-		Width(maxWidth).
-		Padding(0, 1).
-		Background(t.Background()).
-		Render("Command Arguments")
-
-	explanation := lipgloss.NewStyle().
-		Foreground(t.Text()).
-		Width(maxWidth).
-		Padding(0, 1).
-		Background(t.Background()).
-		Render("This command requires multiple arguments. Please enter values for each:")
-
-	// Create input fields for each argument
-	inputFields := make([]string, len(m.inputs))
-	for i, input := range m.inputs {
-		// Highlight the label of the focused input
-		labelStyle := lipgloss.NewStyle().
-			Width(maxWidth).
-			Padding(1, 1, 0, 1).
-			Background(t.Background())
-
-		if i == m.focusIndex {
-			labelStyle = labelStyle.Foreground(t.Primary()).Bold(true)
-		} else {
-			labelStyle = labelStyle.Foreground(t.TextMuted())
-		}
-
-		label := labelStyle.Render(m.argNames[i] + ":")
-
-		field := lipgloss.NewStyle().
-			Foreground(t.Text()).
-			Width(maxWidth).
-			Padding(0, 1).
-			Background(t.Background()).
-			Render(input.View())
-
-		inputFields[i] = lipgloss.JoinVertical(lipgloss.Left, label, field)
-	}
-
-	maxWidth = min(maxWidth, m.width-10)
-
-	// Join all elements vertically
-	elements := []string{title, explanation}
-	elements = append(elements, inputFields...)
-
-	content := lipgloss.JoinVertical(
-		lipgloss.Left,
-		elements...,
-	)
-
-	return baseStyle.Padding(1, 2).
-		Border(lipgloss.RoundedBorder()).
-		BorderBackground(t.Background()).
-		BorderForeground(t.TextMuted()).
-		Background(t.Background()).
-		Width(lipgloss.Width(content) + 4).
-		Render(content)
-}
-
-// SetSize sets the size of the component.
-func (m *MultiArgumentsDialogCmp) SetSize(width, height int) {
-	m.width = width
-	m.height = height
-}
-
-// Bindings implements layout.Bindings.
-func (m MultiArgumentsDialogCmp) Bindings() []key.Binding {
-	return m.keys.ShortHelp()
-}

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

@@ -1,180 +0,0 @@
-package dialog
-
-import (
-	"github.com/charmbracelet/bubbles/v2/key"
-	tea "github.com/charmbracelet/bubbletea/v2"
-	"github.com/charmbracelet/lipgloss/v2"
-	utilComponents "github.com/sst/opencode/internal/components/util"
-	"github.com/sst/opencode/internal/layout"
-	"github.com/sst/opencode/internal/styles"
-	"github.com/sst/opencode/internal/theme"
-	"github.com/sst/opencode/internal/util"
-)
-
-// Command represents a command that can be executed
-type Command struct {
-	ID          string
-	Title       string
-	Description string
-	Handler     func(cmd Command) tea.Cmd
-}
-
-func (ci Command) Render(selected bool, width int) string {
-	t := theme.CurrentTheme()
-	baseStyle := styles.BaseStyle()
-
-	descStyle := baseStyle.Width(width).Foreground(t.TextMuted())
-	itemStyle := baseStyle.Width(width).
-		Foreground(t.Text()).
-		Background(t.Background())
-
-	if selected {
-		itemStyle = itemStyle.
-			Background(t.Primary()).
-			Foreground(t.Background()).
-			Bold(true)
-		descStyle = descStyle.
-			Background(t.Primary()).
-			Foreground(t.Background())
-	}
-
-	title := itemStyle.Padding(0, 1).Render(ci.Title)
-	if ci.Description != "" {
-		description := descStyle.Padding(0, 1).Render(ci.Description)
-		return lipgloss.JoinVertical(lipgloss.Left, title, description)
-	}
-	return title
-}
-
-// CommandSelectedMsg is sent when a command is selected
-type CommandSelectedMsg struct {
-	Command Command
-}
-
-// CloseCommandDialogMsg is sent when the command dialog is closed
-type CloseCommandDialogMsg struct{}
-
-// CommandDialog interface for the command selection dialog
-type CommandDialog interface {
-	layout.ModelWithView
-	layout.Bindings
-	SetCommands(commands []Command)
-}
-
-type commandDialogComponent struct {
-	listView utilComponents.SimpleList[Command]
-	width    int
-	height   int
-}
-
-type commandKeyMap struct {
-	Enter  key.Binding
-	Escape key.Binding
-}
-
-var commandKeys = commandKeyMap{
-	Enter: key.NewBinding(
-		key.WithKeys("enter"),
-		key.WithHelp("enter", "select command"),
-	),
-	Escape: key.NewBinding(
-		key.WithKeys("esc"),
-		key.WithHelp("esc", "close"),
-	),
-}
-
-func (c *commandDialogComponent) Init() tea.Cmd {
-	return c.listView.Init()
-}
-
-func (c *commandDialogComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	var cmds []tea.Cmd
-	switch msg := msg.(type) {
-	case tea.KeyMsg:
-		switch {
-		case key.Matches(msg, commandKeys.Enter):
-			selectedItem, idx := c.listView.GetSelectedItem()
-			if idx != -1 {
-				return c, util.CmdHandler(CommandSelectedMsg{
-					Command: selectedItem,
-				})
-			}
-		case key.Matches(msg, commandKeys.Escape):
-			return c, util.CmdHandler(CloseCommandDialogMsg{})
-		}
-	case tea.WindowSizeMsg:
-		c.width = msg.Width
-		c.height = msg.Height
-	}
-
-	u, cmd := c.listView.Update(msg)
-	c.listView = u.(utilComponents.SimpleList[Command])
-	cmds = append(cmds, cmd)
-
-	return c, tea.Batch(cmds...)
-}
-
-func (c *commandDialogComponent) View() string {
-	t := theme.CurrentTheme()
-	baseStyle := styles.BaseStyle()
-
-	maxWidth := 40
-
-	commands := c.listView.GetItems()
-
-	for _, cmd := range commands {
-		if len(cmd.Title) > maxWidth-4 {
-			maxWidth = len(cmd.Title) + 4
-		}
-		if cmd.Description != "" {
-			if len(cmd.Description) > maxWidth-4 {
-				maxWidth = len(cmd.Description) + 4
-			}
-		}
-	}
-
-	c.listView.SetMaxWidth(maxWidth)
-
-	title := baseStyle.
-		Foreground(t.Primary()).
-		Bold(true).
-		Width(maxWidth).
-		Padding(0, 1).
-		Render("Commands")
-
-	content := lipgloss.JoinVertical(
-		lipgloss.Left,
-		title,
-		baseStyle.Width(maxWidth).Render(""),
-		baseStyle.Width(maxWidth).Render(c.listView.View()),
-		baseStyle.Width(maxWidth).Render(""),
-	)
-
-	return baseStyle.Padding(1, 2).
-		Border(lipgloss.RoundedBorder()).
-		BorderBackground(t.Background()).
-		BorderForeground(t.TextMuted()).
-		Width(lipgloss.Width(content) + 4).
-		Render(content)
-}
-
-func (c *commandDialogComponent) BindingKeys() []key.Binding {
-	return layout.KeyMapToSlice(commandKeys)
-}
-
-func (c *commandDialogComponent) SetCommands(commands []Command) {
-	c.listView.SetItems(commands)
-}
-
-// NewCommandDialogCmp creates a new command selection dialog
-func NewCommandDialogCmp() CommandDialog {
-	listView := utilComponents.NewSimpleList[Command](
-		[]Command{},
-		10,
-		"No commands available",
-		true,
-	)
-	return &commandDialogComponent{
-		listView: listView,
-	}
-}

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

@@ -1,26 +1,25 @@
 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"
-	utilComponents "github.com/sst/opencode/internal/components/util"
-	"github.com/sst/opencode/internal/layout"
-	"github.com/sst/opencode/internal/status"
+	"github.com/sst/opencode/internal/app"
+	"github.com/sst/opencode/internal/components/list"
 	"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
 }
 
 type CompletionItemI interface {
-	utilComponents.SimpleListItem
+	list.ListItem
 	GetValue() string
 	DisplayValue() string
 }
@@ -30,18 +29,17 @@ func (ci *CompletionItem) Render(selected bool, width int) string {
 	baseStyle := styles.BaseStyle()
 
 	itemStyle := baseStyle.
+		Background(t.BackgroundElement()).
 		Width(width).
 		Padding(0, 1)
 
 	if selected {
 		itemStyle = itemStyle.
-			Background(t.Background()).
-			Foreground(t.Primary()).
-			Bold(true)
+			Foreground(t.Primary())
 	}
 
 	title := itemStyle.Render(
-		ci.GetValue(),
+		ci.DisplayValue(),
 	)
 
 	return title
@@ -63,11 +61,13 @@ type CompletionProvider interface {
 	GetId() string
 	GetEntry() CompletionItemI
 	GetChildEntries(query string) ([]CompletionItemI, error)
+	GetEmptyMessage() string
 }
 
 type CompletionSelectedMsg struct {
 	SearchString    string
 	CompletionValue string
+	IsCommand       bool
 }
 
 type CompletionDialogCompleteItemMsg struct {
@@ -77,9 +77,11 @@ type CompletionDialogCompleteItemMsg struct {
 type CompletionDialogCloseMsg struct{}
 
 type CompletionDialog interface {
-	layout.ModelWithView
-	layout.Bindings
+	tea.Model
+	tea.ViewModel
 	SetWidth(width int)
+	IsEmpty() bool
+	SetProvider(provider CompletionProvider)
 }
 
 type completionDialogComponent struct {
@@ -88,7 +90,7 @@ type completionDialogComponent struct {
 	width                int
 	height               int
 	pseudoSearchTextArea textarea.Model
-	listView             utilComponents.SimpleList[CompletionItemI]
+	list                 list.List[CompletionItemI]
 }
 
 type completionDialogKeyMap struct {
@@ -98,10 +100,10 @@ type completionDialogKeyMap struct {
 
 var completionDialogKeys = completionDialogKeyMap{
 	Complete: key.NewBinding(
-		key.WithKeys("tab", "enter"),
+		key.WithKeys("tab", "enter", "right"),
 	),
 	Cancel: key.NewBinding(
-		key.WithKeys(" ", "esc", "backspace"),
+		key.WithKeys(" ", "esc", "backspace", "ctrl+c"),
 	),
 }
 
@@ -109,38 +111,16 @@ func (c *completionDialogComponent) Init() tea.Cmd {
 	return nil
 }
 
-func (c *completionDialogComponent) complete(item CompletionItemI) tea.Cmd {
-	value := c.pseudoSearchTextArea.Value()
-
-	if value == "" {
-		return nil
-	}
-
-	return tea.Batch(
-		util.CmdHandler(CompletionSelectedMsg{
-			SearchString:    value,
-			CompletionValue: item.GetValue(),
-		}),
-		c.close(),
-	)
-}
-
-func (c *completionDialogComponent) close() tea.Cmd {
-	c.listView.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) {
-
 				var cmd tea.Cmd
 				c.pseudoSearchTextArea, cmd = c.pseudoSearchTextArea.Update(msg)
 				cmds = append(cmds, cmd)
@@ -152,31 +132,29 @@ func (c *completionDialogComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				}
 
 				if query != c.query {
-					items, err := c.completionProvider.GetChildEntries(query)
-					if err != nil {
-						status.Error(err.Error())
-					}
-
-					c.listView.SetItems(items)
 					c.query = query
+					cmd = func() tea.Msg {
+						items, err := c.completionProvider.GetChildEntries(query)
+						if err != nil {
+							slog.Error("Failed to get completion items", "error", err)
+						}
+						return items
+					}
+					cmds = append(cmds, cmd)
 				}
 
-				u, cmd := c.listView.Update(msg)
-				c.listView = u.(utilComponents.SimpleList[CompletionItemI])
-
+				u, cmd := c.list.Update(msg)
+				c.list = u.(list.List[CompletionItemI])
 				cmds = append(cmds, cmd)
 			}
 
 			switch {
 			case key.Matches(msg, completionDialogKeys.Complete):
-				item, i := c.listView.GetSelectedItem()
+				item, i := c.list.GetSelectedItem()
 				if i == -1 {
 					return c, nil
 				}
-
-				cmd := c.complete(item)
-
-				return c, cmd
+				return c, c.complete(item)
 			case key.Matches(msg, completionDialogKeys.Cancel):
 				// Only close on backspace when there are no characters left
 				if msg.String() != "backspace" || len(c.pseudoSearchTextArea.Value()) <= 0 {
@@ -186,14 +164,16 @@ func (c *completionDialogComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 			return c, tea.Batch(cmds...)
 		} else {
-			items, err := c.completionProvider.GetChildEntries("")
-			if err != nil {
-				status.Error(err.Error())
+			cmd := func() tea.Msg {
+				items, err := c.completionProvider.GetChildEntries("")
+				if err != nil {
+					slog.Error("Failed to get completion items", "error", err)
+				}
+				return items
 			}
-
-			c.listView.SetItems(items)
-			c.pseudoSearchTextArea.SetValue(msg.String())
-			return c, c.pseudoSearchTextArea.Focus()
+			cmds = append(cmds, cmd)
+			cmds = append(cmds, c.pseudoSearchTextArea.Focus())
+			return c, tea.Batch(cmds...)
 		}
 	case tea.WindowSizeMsg:
 		c.width = msg.Width
@@ -208,8 +188,7 @@ func (c *completionDialogComponent) View() string {
 	baseStyle := styles.BaseStyle()
 
 	maxWidth := 40
-
-	completions := c.listView.GetItems()
+	completions := c.list.GetItems()
 
 	for _, cmd := range completions {
 		title := cmd.DisplayValue()
@@ -218,46 +197,77 @@ func (c *completionDialogComponent) View() string {
 		}
 	}
 
-	c.listView.SetMaxWidth(maxWidth)
+	c.list.SetMaxWidth(maxWidth)
 
 	return baseStyle.Padding(0, 0).
-		Border(lipgloss.NormalBorder()).
-		BorderBottom(false).
-		BorderRight(false).
-		BorderLeft(false).
-		BorderBackground(t.Background()).
-		BorderForeground(t.TextMuted()).
+		Background(t.BackgroundElement()).
 		Width(c.width).
-		Render(c.listView.View())
+		Render(c.list.View())
 }
 
 func (c *completionDialogComponent) SetWidth(width int) {
 	c.width = width
 }
 
-func (c *completionDialogComponent) BindingKeys() []key.Binding {
-	return layout.KeyMapToSlice(completionDialogKeys)
+func (c *completionDialogComponent) IsEmpty() bool {
+	return c.list.IsEmpty()
+}
+
+func (c *completionDialogComponent) SetProvider(provider CompletionProvider) {
+	if c.completionProvider.GetId() != provider.GetId() {
+		c.completionProvider = provider
+		c.list.SetEmptyMessage(" " + provider.GetEmptyMessage())
+		c.list.SetItems([]CompletionItemI{})
+	}
+}
+
+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.pseudoSearchTextArea.Reset()
+	c.pseudoSearchTextArea.Blur()
+	return util.CmdHandler(CompletionDialogCloseMsg{})
 }
 
 func NewCompletionDialogComponent(completionProvider CompletionProvider) CompletionDialog {
 	ti := textarea.New()
 
-	items, err := completionProvider.GetChildEntries("")
-	if err != nil {
-		status.Error(err.Error())
-	}
-
-	li := utilComponents.NewSimpleList(
-		items,
+	li := list.NewListComponent(
+		[]CompletionItemI{},
 		7,
-		"No file matches found",
+		completionProvider.GetEmptyMessage(),
 		false,
 	)
 
+	go func() {
+		items, err := completionProvider.GetChildEntries("")
+		if err != nil {
+			slog.Error("Failed to get completion items", "error", err)
+		}
+		li.SetItems(items)
+	}()
+
 	return &completionDialogComponent{
 		query:                "",
 		completionProvider:   completionProvider,
 		pseudoSearchTextArea: ti,
-		listView:             li,
+		list:                 li,
 	}
 }

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

@@ -1,155 +0,0 @@
-package dialog
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-
-	tea "github.com/charmbracelet/bubbletea/v2"
-	"github.com/sst/opencode/internal/app"
-	"github.com/sst/opencode/internal/util"
-)
-
-// Command prefix constants
-const (
-	UserCommandPrefix    = "user:"
-	ProjectCommandPrefix = "project:"
-)
-
-// namedArgPattern is a regex pattern to find named arguments in the format $NAME
-var namedArgPattern = regexp.MustCompile(`\$([A-Z][A-Z0-9_]*)`)
-
-// LoadCustomCommands loads custom commands from both XDG_CONFIG_HOME and project data directory
-func LoadCustomCommands() ([]Command, error) {
-	var commands []Command
-
-	homeCommandsDir := filepath.Join(app.Info.Path.Config, "commands")
-	homeCommands, err := loadCommandsFromDir(homeCommandsDir, UserCommandPrefix)
-	if err != nil {
-		// Log error but continue - we'll still try to load other commands
-		fmt.Printf("Warning: failed to load home commands: %v\n", err)
-	} else {
-		commands = append(commands, homeCommands...)
-	}
-
-	projectCommandsDir := filepath.Join(app.Info.Path.Root, ".opencode", "commands")
-	projectCommands, err := loadCommandsFromDir(projectCommandsDir, ProjectCommandPrefix)
-	if err != nil {
-		// Log error but return what we have so far
-		fmt.Printf("Warning: failed to load project commands: %v\n", err)
-	} else {
-		commands = append(commands, projectCommands...)
-	}
-
-	return commands, nil
-}
-
-// loadCommandsFromDir loads commands from a specific directory with the given prefix
-func loadCommandsFromDir(commandsDir string, prefix string) ([]Command, error) {
-	// Check if the commands directory exists
-	if _, err := os.Stat(commandsDir); os.IsNotExist(err) {
-		// Create the commands directory if it doesn't exist
-		if err := os.MkdirAll(commandsDir, 0755); err != nil {
-			return nil, fmt.Errorf("failed to create commands directory %s: %w", commandsDir, err)
-		}
-		// Return empty list since we just created the directory
-		return []Command{}, nil
-	}
-
-	var commands []Command
-
-	// Walk through the commands directory and load all .md files
-	err := filepath.Walk(commandsDir, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		// Skip directories
-		if info.IsDir() {
-			return nil
-		}
-
-		// Only process markdown files
-		if !strings.HasSuffix(strings.ToLower(info.Name()), ".md") {
-			return nil
-		}
-
-		// Read the file content
-		content, err := os.ReadFile(path)
-		if err != nil {
-			return fmt.Errorf("failed to read command file %s: %w", path, err)
-		}
-
-		// Get the command ID from the file name without the .md extension
-		commandID := strings.TrimSuffix(info.Name(), filepath.Ext(info.Name()))
-
-		// Get relative path from commands directory
-		relPath, err := filepath.Rel(commandsDir, path)
-		if err != nil {
-			return fmt.Errorf("failed to get relative path for %s: %w", path, err)
-		}
-
-		// Create the command ID from the relative path
-		// Replace directory separators with colons
-		commandIDPath := strings.ReplaceAll(filepath.Dir(relPath), string(filepath.Separator), ":")
-		if commandIDPath != "." {
-			commandID = commandIDPath + ":" + commandID
-		}
-
-		// Create a command
-		command := Command{
-			ID:          prefix + commandID,
-			Title:       prefix + commandID,
-			Description: fmt.Sprintf("Custom command from %s", relPath),
-			Handler: func(cmd Command) tea.Cmd {
-				commandContent := string(content)
-
-				// Check for named arguments
-				matches := namedArgPattern.FindAllStringSubmatch(commandContent, -1)
-				if len(matches) > 0 {
-					// Extract unique argument names
-					argNames := make([]string, 0)
-					argMap := make(map[string]bool)
-
-					for _, match := range matches {
-						argName := match[1] // Group 1 is the name without $
-						if !argMap[argName] {
-							argMap[argName] = true
-							argNames = append(argNames, argName)
-						}
-					}
-
-					// Show multi-arguments dialog for all named arguments
-					return util.CmdHandler(ShowMultiArgumentsDialogMsg{
-						CommandID: cmd.ID,
-						Content:   commandContent,
-						ArgNames:  argNames,
-					})
-				}
-
-				// No arguments needed, run command directly
-				return util.CmdHandler(CommandRunCustomMsg{
-					Content: commandContent,
-					Args:    nil, // No arguments
-				})
-			},
-		}
-
-		commands = append(commands, command)
-		return nil
-	})
-
-	if err != nil {
-		return nil, fmt.Errorf("failed to load custom commands from %s: %w", commandsDir, err)
-	}
-
-	return commands, nil
-}
-
-// CommandRunCustomMsg is sent when a custom command is executed
-type CommandRunCustomMsg struct {
-	Content string
-	Args    map[string]string // Map of argument names to values
-}

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

@@ -1,106 +0,0 @@
-package dialog
-
-import (
-	"testing"
-	"regexp"
-)
-
-func TestNamedArgPattern(t *testing.T) {
-	testCases := []struct {
-		input    string
-		expected []string
-	}{
-		{
-			input:    "This is a test with $ARGUMENTS placeholder",
-			expected: []string{"ARGUMENTS"},
-		},
-		{
-			input:    "This is a test with $FOO and $BAR placeholders",
-			expected: []string{"FOO", "BAR"},
-		},
-		{
-			input:    "This is a test with $FOO_BAR and $BAZ123 placeholders",
-			expected: []string{"FOO_BAR", "BAZ123"},
-		},
-		{
-			input:    "This is a test with no placeholders",
-			expected: []string{},
-		},
-		{
-			input:    "This is a test with $FOO appearing twice: $FOO",
-			expected: []string{"FOO"},
-		},
-		{
-			input:    "This is a test with $1INVALID placeholder",
-			expected: []string{},
-		},
-	}
-
-	for _, tc := range testCases {
-		matches := namedArgPattern.FindAllStringSubmatch(tc.input, -1)
-		
-		// Extract unique argument names
-		argNames := make([]string, 0)
-		argMap := make(map[string]bool)
-		
-		for _, match := range matches {
-			argName := match[1] // Group 1 is the name without $
-			if !argMap[argName] {
-				argMap[argName] = true
-				argNames = append(argNames, argName)
-			}
-		}
-		
-		// Check if we got the expected number of arguments
-		if len(argNames) != len(tc.expected) {
-			t.Errorf("Expected %d arguments, got %d for input: %s", len(tc.expected), len(argNames), tc.input)
-			continue
-		}
-		
-		// Check if we got the expected argument names
-		for _, expectedArg := range tc.expected {
-			found := false
-			for _, actualArg := range argNames {
-				if actualArg == expectedArg {
-					found = true
-					break
-				}
-			}
-			if !found {
-				t.Errorf("Expected argument %s not found in %v for input: %s", expectedArg, argNames, tc.input)
-			}
-		}
-	}
-}
-
-func TestRegexPattern(t *testing.T) {
-	pattern := regexp.MustCompile(`\$([A-Z][A-Z0-9_]*)`)
-	
-	validMatches := []string{
-		"$FOO",
-		"$BAR",
-		"$FOO_BAR",
-		"$BAZ123",
-		"$ARGUMENTS",
-	}
-	
-	invalidMatches := []string{
-		"$foo",
-		"$1BAR",
-		"$_FOO",
-		"FOO",
-		"$",
-	}
-	
-	for _, valid := range validMatches {
-		if !pattern.MatchString(valid) {
-			t.Errorf("Expected %s to match, but it didn't", valid)
-		}
-	}
-	
-	for _, invalid := range invalidMatches {
-		if pattern.MatchString(invalid) {
-			t.Errorf("Expected %s not to match, but it did", invalid)
-		}
-	}
-}

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

@@ -1,486 +0,0 @@
-package dialog
-
-import (
-	"fmt"
-	"net/http"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"time"
-
-	"log/slog"
-
-	"github.com/atotto/clipboard"
-	"github.com/charmbracelet/bubbles/v2/key"
-	"github.com/charmbracelet/bubbles/v2/textinput"
-	"github.com/charmbracelet/bubbles/v2/viewport"
-	tea "github.com/charmbracelet/bubbletea/v2"
-	"github.com/charmbracelet/lipgloss/v2"
-	"github.com/sst/opencode/internal/app"
-	"github.com/sst/opencode/internal/image"
-	"github.com/sst/opencode/internal/layout"
-	"github.com/sst/opencode/internal/status"
-	"github.com/sst/opencode/internal/styles"
-	"github.com/sst/opencode/internal/theme"
-	"github.com/sst/opencode/internal/util"
-)
-
-const (
-	maxAttachmentSize = int64(5 * 1024 * 1024) // 5MB
-	downArrow         = "down"
-	upArrow           = "up"
-)
-
-type FilePrickerKeyMap struct {
-	Enter          key.Binding
-	Down           key.Binding
-	Up             key.Binding
-	Forward        key.Binding
-	Backward       key.Binding
-	OpenFilePicker key.Binding
-	Esc            key.Binding
-	InsertCWD      key.Binding
-	Paste          key.Binding
-}
-
-var filePickerKeyMap = FilePrickerKeyMap{
-	Enter: key.NewBinding(
-		key.WithKeys("enter"),
-		key.WithHelp("enter", "select file/enter directory"),
-	),
-	Down: key.NewBinding(
-		key.WithKeys("j", downArrow),
-		key.WithHelp("↓/j", "down"),
-	),
-	Up: key.NewBinding(
-		key.WithKeys("k", upArrow),
-		key.WithHelp("↑/k", "up"),
-	),
-	Forward: key.NewBinding(
-		key.WithKeys("l"),
-		key.WithHelp("l", "enter directory"),
-	),
-	Backward: key.NewBinding(
-		key.WithKeys("h", "backspace"),
-		key.WithHelp("h/backspace", "go back"),
-	),
-	OpenFilePicker: key.NewBinding(
-		key.WithKeys("ctrl+f"),
-		key.WithHelp("ctrl+f", "open file picker"),
-	),
-	Esc: key.NewBinding(
-		key.WithKeys("esc"),
-		key.WithHelp("esc", "close/exit"),
-	),
-	InsertCWD: key.NewBinding(
-		key.WithKeys("i"),
-		key.WithHelp("i", "manual path input"),
-	),
-	Paste: key.NewBinding(
-		key.WithKeys("ctrl+v"),
-		key.WithHelp("ctrl+v", "paste file/directory path"),
-	),
-}
-
-type filepickerComponent struct {
-	basePath       string
-	width          int
-	height         int
-	cursor         int
-	err            error
-	cursorChain    stack
-	viewport       viewport.Model
-	dirs           []os.DirEntry
-	cwdDetails     *DirNode
-	selectedFile   string
-	cwd            textinput.Model
-	ShowFilePicker bool
-	app            *app.App
-}
-
-type DirNode struct {
-	parent    *DirNode
-	child     *DirNode
-	directory string
-}
-type stack []int
-
-func (s stack) Push(v int) stack {
-	return append(s, v)
-}
-
-func (s stack) Pop() (stack, int) {
-	l := len(s)
-	return s[:l-1], s[l-1]
-}
-
-type AttachmentAddedMsg struct {
-	Attachment app.Attachment
-}
-
-func (f *filepickerComponent) Init() tea.Cmd {
-	return nil
-}
-
-func (f *filepickerComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	var cmd tea.Cmd
-	switch msg := msg.(type) {
-	case tea.WindowSizeMsg:
-		f.width = 60
-		f.height = 20
-		f.viewport.SetWidth(80)
-		f.viewport.SetHeight(22)
-		f.cursor = 0
-		f.getCurrentFileBelowCursor()
-	case tea.KeyMsg:
-		if f.cwd.Focused() {
-			f.cwd, cmd = f.cwd.Update(msg)
-		}
-		switch {
-		case key.Matches(msg, filePickerKeyMap.InsertCWD):
-			f.cwd.Focus()
-			return f, cmd
-		case key.Matches(msg, filePickerKeyMap.Esc):
-			if f.cwd.Focused() {
-				f.cwd.Blur()
-			}
-		case key.Matches(msg, filePickerKeyMap.Down):
-			if !f.cwd.Focused() || msg.String() == downArrow {
-				if f.cursor < len(f.dirs)-1 {
-					f.cursor++
-					f.getCurrentFileBelowCursor()
-				}
-			}
-		case key.Matches(msg, filePickerKeyMap.Up):
-			if !f.cwd.Focused() || msg.String() == upArrow {
-				if f.cursor > 0 {
-					f.cursor--
-					f.getCurrentFileBelowCursor()
-				}
-			}
-		case key.Matches(msg, filePickerKeyMap.Enter):
-			var path string
-			var isPathDir bool
-			if f.cwd.Focused() {
-				path = f.cwd.Value()
-				fileInfo, err := os.Stat(path)
-				if err != nil {
-					status.Error("Invalid path")
-					return f, cmd
-				}
-				isPathDir = fileInfo.IsDir()
-			} else {
-				path = filepath.Join(f.cwdDetails.directory, "/", f.dirs[f.cursor].Name())
-				isPathDir = f.dirs[f.cursor].IsDir()
-			}
-			if isPathDir {
-				newWorkingDir := DirNode{parent: f.cwdDetails, directory: path}
-				f.cwdDetails.child = &newWorkingDir
-				f.cwdDetails = f.cwdDetails.child
-				f.cursorChain = f.cursorChain.Push(f.cursor)
-				f.dirs = readDir(f.cwdDetails.directory, false)
-				f.cursor = 0
-				f.cwd.SetValue(f.cwdDetails.directory)
-				f.getCurrentFileBelowCursor()
-			} else {
-				f.selectedFile = path
-				return f.addAttachmentToMessage()
-			}
-		case key.Matches(msg, filePickerKeyMap.Esc):
-			if !f.cwd.Focused() {
-				f.cursorChain = make(stack, 0)
-				f.cursor = 0
-			} else {
-				f.cwd.Blur()
-			}
-		case key.Matches(msg, filePickerKeyMap.Forward):
-			if !f.cwd.Focused() {
-				if f.dirs[f.cursor].IsDir() {
-					path := filepath.Join(f.cwdDetails.directory, "/", f.dirs[f.cursor].Name())
-					newWorkingDir := DirNode{parent: f.cwdDetails, directory: path}
-					f.cwdDetails.child = &newWorkingDir
-					f.cwdDetails = f.cwdDetails.child
-					f.cursorChain = f.cursorChain.Push(f.cursor)
-					f.dirs = readDir(f.cwdDetails.directory, false)
-					f.cursor = 0
-					f.cwd.SetValue(f.cwdDetails.directory)
-					f.getCurrentFileBelowCursor()
-				}
-			}
-		case key.Matches(msg, filePickerKeyMap.Backward):
-			if !f.cwd.Focused() {
-				if len(f.cursorChain) != 0 && f.cwdDetails.parent != nil {
-					f.cursorChain, f.cursor = f.cursorChain.Pop()
-					f.cwdDetails = f.cwdDetails.parent
-					f.cwdDetails.child = nil
-					f.dirs = readDir(f.cwdDetails.directory, false)
-					f.cwd.SetValue(f.cwdDetails.directory)
-					f.getCurrentFileBelowCursor()
-				}
-			}
-		case key.Matches(msg, filePickerKeyMap.Paste):
-			if f.cwd.Focused() {
-				val, err := clipboard.ReadAll()
-				if err != nil {
-					slog.Error("failed to read clipboard")
-					return f, cmd
-				}
-				f.cwd.SetValue(f.cwd.Value() + val)
-			}
-		case key.Matches(msg, filePickerKeyMap.OpenFilePicker):
-			f.dirs = readDir(f.cwdDetails.directory, false)
-			f.cursor = 0
-			f.getCurrentFileBelowCursor()
-		}
-	}
-	return f, cmd
-}
-
-func (f *filepickerComponent) addAttachmentToMessage() (tea.Model, tea.Cmd) {
-	// modeInfo := GetSelectedModel(config.Get())
-	// if !modeInfo.SupportsAttachments {
-	// 	status.Error(fmt.Sprintf("Model %s doesn't support attachments", modeInfo.Name))
-	// 	return f, nil
-	// }
-
-	selectedFilePath := f.selectedFile
-	if !isExtSupported(selectedFilePath) {
-		status.Error("Unsupported file")
-		return f, nil
-	}
-
-	isFileLarge, err := image.ValidateFileSize(selectedFilePath, maxAttachmentSize)
-	if err != nil {
-		status.Error("unable to read the image")
-		return f, nil
-	}
-	if isFileLarge {
-		status.Error("file too large, max 5MB")
-		return f, nil
-	}
-
-	content, err := os.ReadFile(selectedFilePath)
-	if err != nil {
-		status.Error("Unable read selected file")
-		return f, nil
-	}
-
-	mimeBufferSize := min(512, len(content))
-	mimeType := http.DetectContentType(content[:mimeBufferSize])
-	fileName := filepath.Base(selectedFilePath)
-	attachment := app.Attachment{FilePath: selectedFilePath, FileName: fileName, MimeType: mimeType, Content: content}
-	f.selectedFile = ""
-	return f, util.CmdHandler(AttachmentAddedMsg{attachment})
-}
-
-func (f *filepickerComponent) View() string {
-	t := theme.CurrentTheme()
-	const maxVisibleDirs = 20
-	const maxWidth = 80
-
-	adjustedWidth := maxWidth
-	for _, file := range f.dirs {
-		if len(file.Name()) > adjustedWidth-4 { // Account for padding
-			adjustedWidth = len(file.Name()) + 4
-		}
-	}
-	adjustedWidth = max(30, min(adjustedWidth, f.width-15)) + 1
-
-	files := make([]string, 0, maxVisibleDirs)
-	startIdx := 0
-
-	if len(f.dirs) > maxVisibleDirs {
-		halfVisible := maxVisibleDirs / 2
-		if f.cursor >= halfVisible && f.cursor < len(f.dirs)-halfVisible {
-			startIdx = f.cursor - halfVisible
-		} else if f.cursor >= len(f.dirs)-halfVisible {
-			startIdx = len(f.dirs) - maxVisibleDirs
-		}
-	}
-
-	endIdx := min(startIdx+maxVisibleDirs, len(f.dirs))
-
-	for i := startIdx; i < endIdx; i++ {
-		file := f.dirs[i]
-		itemStyle := styles.BaseStyle().Width(adjustedWidth)
-
-		if i == f.cursor {
-			itemStyle = itemStyle.
-				Background(t.Primary()).
-				Foreground(t.Background()).
-				Bold(true)
-		}
-		filename := file.Name()
-
-		if len(filename) > adjustedWidth-4 {
-			filename = filename[:adjustedWidth-7] + "..."
-		}
-		if file.IsDir() {
-			filename = filename + "/"
-		}
-
-		files = append(files, itemStyle.Padding(0, 1).Render(filename))
-	}
-
-	// Pad to always show exactly 21 lines
-	for len(files) < maxVisibleDirs {
-		files = append(files, styles.BaseStyle().Width(adjustedWidth).Render(""))
-	}
-
-	currentPath := styles.BaseStyle().
-		Height(1).
-		Width(adjustedWidth).
-		Render(f.cwd.View())
-
-	viewportstyle := lipgloss.NewStyle().
-		Width(f.viewport.Width()).
-		Background(t.Background()).
-		Border(lipgloss.RoundedBorder()).
-		BorderForeground(t.TextMuted()).
-		BorderBackground(t.Background()).
-		Padding(2).
-		Render(f.viewport.View())
-	var insertExitText string
-	if f.IsCWDFocused() {
-		insertExitText = "Press esc to exit typing path"
-	} else {
-		insertExitText = "Press i to start typing path"
-	}
-
-	content := lipgloss.JoinVertical(
-		lipgloss.Left,
-		currentPath,
-		styles.BaseStyle().Width(adjustedWidth).Render(""),
-		styles.BaseStyle().Width(adjustedWidth).Render(lipgloss.JoinVertical(lipgloss.Left, files...)),
-		styles.BaseStyle().Width(adjustedWidth).Render(""),
-		styles.BaseStyle().Foreground(t.TextMuted()).Width(adjustedWidth).Render(insertExitText),
-	)
-
-	f.cwd.SetValue(f.cwd.Value())
-	contentStyle := styles.BaseStyle().Padding(1, 2).
-		Border(lipgloss.RoundedBorder()).
-		BorderBackground(t.Background()).
-		BorderForeground(t.TextMuted()).
-		Width(lipgloss.Width(content) + 4)
-
-	return lipgloss.JoinHorizontal(lipgloss.Center, contentStyle.Render(content), viewportstyle)
-}
-
-type FilepickerComponent interface {
-	layout.ModelWithView
-	ToggleFilepicker(showFilepicker bool)
-	IsCWDFocused() bool
-}
-
-func (f *filepickerComponent) ToggleFilepicker(showFilepicker bool) {
-	f.ShowFilePicker = showFilepicker
-}
-
-func (f *filepickerComponent) IsCWDFocused() bool {
-	return f.cwd.Focused()
-}
-
-func NewFilepickerCmp(app *app.App) FilepickerComponent {
-	homepath, err := os.UserHomeDir()
-	if err != nil {
-		slog.Error("error loading user files")
-		return nil
-	}
-	baseDir := DirNode{parent: nil, directory: homepath}
-	dirs := readDir(homepath, false)
-	viewport := viewport.New() // viewport.New(0, 0)
-	currentDirectory := textinput.New()
-	currentDirectory.CharLimit = 200
-	currentDirectory.SetWidth(44)
-	// currentDirectory.Cursor.Blink = true
-	currentDirectory.SetValue(baseDir.directory)
-	return &filepickerComponent{cwdDetails: &baseDir, dirs: dirs, cursorChain: make(stack, 0), viewport: viewport, cwd: currentDirectory, app: app}
-}
-
-func (f *filepickerComponent) getCurrentFileBelowCursor() {
-	if len(f.dirs) == 0 || f.cursor < 0 || f.cursor >= len(f.dirs) {
-		slog.Error(fmt.Sprintf("Invalid cursor position. Dirs length: %d, Cursor: %d", len(f.dirs), f.cursor))
-		f.viewport.SetContent("Preview unavailable")
-		return
-	}
-
-	dir := f.dirs[f.cursor]
-	filename := dir.Name()
-	if !dir.IsDir() && isExtSupported(filename) {
-		fullPath := f.cwdDetails.directory + "/" + dir.Name()
-
-		go func() {
-			imageString, err := image.ImagePreview(f.viewport.Width()-4, fullPath)
-			if err != nil {
-				slog.Error(err.Error())
-				f.viewport.SetContent("Preview unavailable")
-				return
-			}
-
-			f.viewport.SetContent(imageString)
-		}()
-	} else {
-		f.viewport.SetContent("Preview unavailable")
-	}
-}
-
-func readDir(path string, showHidden bool) []os.DirEntry {
-	slog.Info(fmt.Sprintf("Reading directory: %s", path))
-
-	entriesChan := make(chan []os.DirEntry, 1)
-	errChan := make(chan error, 1)
-
-	go func() {
-		dirEntries, err := os.ReadDir(path)
-		if err != nil {
-			status.Error(err.Error())
-			errChan <- err
-			return
-		}
-		entriesChan <- dirEntries
-	}()
-
-	select {
-	case dirEntries := <-entriesChan:
-		sort.Slice(dirEntries, func(i, j int) bool {
-			if dirEntries[i].IsDir() == dirEntries[j].IsDir() {
-				return dirEntries[i].Name() < dirEntries[j].Name()
-			}
-			return dirEntries[i].IsDir()
-		})
-
-		if showHidden {
-			return dirEntries
-		}
-
-		var sanitizedDirEntries []os.DirEntry
-		for _, dirEntry := range dirEntries {
-			isHidden, _ := IsHidden(dirEntry.Name())
-			if !isHidden {
-				if dirEntry.IsDir() || isExtSupported(dirEntry.Name()) {
-					sanitizedDirEntries = append(sanitizedDirEntries, dirEntry)
-				}
-			}
-		}
-
-		return sanitizedDirEntries
-
-	case <-errChan:
-		status.Error(fmt.Sprintf("Error reading directory %s", path))
-		return []os.DirEntry{}
-
-	case <-time.After(5 * time.Second):
-		status.Error(fmt.Sprintf("Timeout reading directory %s", path))
-		return []os.DirEntry{}
-	}
-}
-
-func IsHidden(file string) (bool, error) {
-	return strings.HasPrefix(file, "."), nil
-}
-
-func isExtSupported(path string) bool {
-	ext := strings.ToLower(filepath.Ext(path))
-	return (ext == ".jpg" || ext == ".jpeg" || ext == ".webp" || ext == ".png")
-}

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

@@ -3,9 +3,9 @@ package dialog
 import (
 	"strings"
 
-	"github.com/charmbracelet/bubbles/v2/key"
 	tea "github.com/charmbracelet/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
+	"github.com/sst/opencode/internal/commands"
 	"github.com/sst/opencode/internal/components/modal"
 	"github.com/sst/opencode/internal/layout"
 	"github.com/sst/opencode/internal/theme"
@@ -15,28 +15,9 @@ type helpDialog struct {
 	width    int
 	height   int
 	modal    *modal.Modal
-	bindings []key.Binding
+	commands []commands.Command
 }
 
-// func (i bindingItem) Render(selected bool, width int) string {
-// 	t := theme.CurrentTheme()
-// 	baseStyle := styles.BaseStyle().
-// 		Width(width - 2).
-// 		Background(t.BackgroundElement())
-//
-// 	if selected {
-// 		baseStyle = baseStyle.
-// 			Background(t.Primary()).
-// 			Foreground(t.BackgroundElement()).
-// 			Bold(true)
-// 	} else {
-// 		baseStyle = baseStyle.
-// 			Foreground(t.Text())
-// 	}
-//
-// 	return baseStyle.Padding(0, 1).Render(i.binding.Help().Desc)
-// }
-
 func (h *helpDialog) Init() tea.Cmd {
 	return nil
 }
@@ -50,26 +31,6 @@ func (h *helpDialog) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return h, nil
 }
 
-// func removeDuplicateBindings(bindings []key.Binding) []key.Binding {
-// 	seen := make(map[string]struct{})
-// 	result := make([]key.Binding, 0, len(bindings))
-//
-// 	// Process bindings in reverse order
-// 	for i := len(bindings) - 1; i >= 0; i-- {
-// 		b := bindings[i]
-// 		k := strings.Join(b.Keys(), " ")
-// 		if _, ok := seen[k]; ok {
-// 			// duplicate, skip
-// 			continue
-// 		}
-// 		seen[k] = struct{}{}
-// 		// Add to the beginning of result to maintain original order
-// 		result = append([]key.Binding{b}, result...)
-// 	}
-//
-// 	return result
-// }
-
 func (h *helpDialog) View() string {
 	t := theme.CurrentTheme()
 	keyStyle := lipgloss.NewStyle().
@@ -79,22 +40,29 @@ func (h *helpDialog) View() string {
 	descStyle := lipgloss.NewStyle().
 		Background(t.BackgroundElement()).
 		Foreground(t.TextMuted())
+	contentStyle := lipgloss.NewStyle().
+		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
 		}
 
-		lines = append(lines, content)
+		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))
 	}
 
 	return strings.Join(lines, "\n")
@@ -112,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")),
 	}
 }

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

@@ -173,11 +173,6 @@ func (m *InitDialogCmp) SetSize(width, height int) {
 	m.height = height
 }
 
-// Bindings implements layout.Bindings.
-func (m InitDialogCmp) Bindings() []key.Binding {
-	return m.keys.ShortHelp()
-}
-
 // CloseInitDialogMsg is a message that is sent when the init dialog is closed.
 type CloseInitDialogMsg struct {
 	Initialize bool

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

@@ -13,7 +13,6 @@ import (
 	"github.com/sst/opencode/internal/app"
 	"github.com/sst/opencode/internal/components/modal"
 	"github.com/sst/opencode/internal/layout"
-	"github.com/sst/opencode/internal/state"
 	"github.com/sst/opencode/internal/styles"
 	"github.com/sst/opencode/internal/theme"
 	"github.com/sst/opencode/internal/util"
@@ -112,8 +111,14 @@ func (m *modelDialog) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}
 		case key.Matches(msg, modelKeys.Enter):
 			models := m.models()
-			cmd := util.CmdHandler(state.ModelSelectedMsg{Provider: m.provider, Model: models[m.selectedIdx]})
-			return m, tea.Batch(cmd, util.CmdHandler(modal.CloseModalMsg{}))
+			return m, tea.Sequence(
+				util.CmdHandler(modal.CloseModalMsg{}),
+				util.CmdHandler(
+					app.ModelSelectedMsg{
+						Provider: m.provider,
+						Model:    models[m.selectedIdx],
+					}),
+			)
 		case key.Matches(msg, modelKeys.Escape):
 			return m, util.CmdHandler(modal.CloseModalMsg{})
 		}
@@ -125,9 +130,9 @@ func (m *modelDialog) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return m, nil
 }
 
-func (m *modelDialog) models() []client.ProviderModel {
-	models := slices.SortedFunc(maps.Values(m.provider.Models), func(a, b client.ProviderModel) int {
-		return strings.Compare(*a.Name, *b.Name)
+func (m *modelDialog) models() []client.ModelInfo {
+	models := slices.SortedFunc(maps.Values(m.provider.Models), func(a, b client.ModelInfo) int {
+		return strings.Compare(a.Name, b.Name)
 	})
 	return models
 }
@@ -175,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)
 }
 
@@ -184,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)
@@ -205,15 +203,16 @@ func (m *modelDialog) View() string {
 				Foreground(t.BackgroundElement()).
 				Bold(true)
 		}
-		modelItems = append(modelItems, itemStyle.Render(*models[i].Name))
+		modelItems = append(modelItems, itemStyle.Render(models[i].Name))
 	}
 
 	scrollIndicator := m.getScrollIndicators(maxDialogWidth)
 
 	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,
 	)
 
@@ -233,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 == "" {
@@ -308,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))),
 	}
 }

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

@@ -6,7 +6,6 @@ import (
 	"github.com/charmbracelet/bubbles/v2/viewport"
 	tea "github.com/charmbracelet/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
-	"github.com/sst/opencode/internal/layout"
 	"github.com/sst/opencode/internal/styles"
 	"github.com/sst/opencode/internal/theme"
 	"github.com/sst/opencode/internal/util"
@@ -30,8 +29,8 @@ type PermissionResponseMsg struct {
 
 // PermissionDialogComponent interface for permission dialog component
 type PermissionDialogComponent interface {
-	layout.ModelWithView
-	layout.Bindings
+	tea.Model
+	tea.ViewModel
 	// SetPermissions(permission permission.PermissionRequest) tea.Cmd
 }
 
@@ -424,10 +423,6 @@ func (p *permissionDialogComponent) View() string {
 	return p.render()
 }
 
-func (p *permissionDialogComponent) BindingKeys() []key.Binding {
-	return layout.KeyMapToSlice(permissionsKeys)
-}
-
 func (p *permissionDialogComponent) SetSize() tea.Cmd {
 	// if p.permission.ID == "" {
 	// 	return nil