Update CLI run command and session handling

🤖 Generated with [OpenCode](https://opencode.ai) Co-Authored-By: OpenCode <noreply@opencode.ai>
subagent
2026-07-17 12:56:41 +02:00 · 2025-06-12 17:57:57 -04:00 · 2025-06-12 17:04:38 -04:00
340 changed files with 18879 additions and 36116 deletions
@@ -1,9 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-insert_final_newline = true
-end_of_line = lf
-indent_style = space
-indent_size = 2
-max_line_length = 80
@@ -0,0 +1,37 @@
+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
@@ -3,8 +3,7 @@ name: deploy
 on:
  push:
    branches:
-      - dev
-      - production
+      - dontlook
  workflow_dispatch:

 concurrency: ${{ github.workflow }}-${{ github.ref }}
@@ -17,10 +16,10 @@ jobs:

      - uses: oven-sh/setup-bun@v1
        with:
-          bun-version: 1.2.17
+          bun-version: latest

      - run: bun install

-      - run: bun sst deploy --stage=${{ github.ref_name }}
+      - run: bun sst deploy --stage=dev
        env:
          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
@@ -4,7 +4,7 @@ on:
  workflow_dispatch:
  push:
    branches:
-      - dev
+      - dontlook
    tags:
      - "*"

@@ -32,21 +32,13 @@ jobs:

      - uses: oven-sh/setup-bun@v2
        with:
-          bun-version: 1.2.17
-
-      - name: Install makepkg
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y pacman-package-manager
+          bun-version: 1.2.16

      - name: Setup SSH for AUR
        run: |
          mkdir -p ~/.ssh
          echo "${{ secrets.AUR_KEY }}" > ~/.ssh/id_rsa
          chmod 600 ~/.ssh/id_rsa
-          ssh-keyscan -H aur.archlinux.org >> ~/.ssh/known_hosts
-          git config --global user.email "opencode@sst.dev"
-          git config --global user.name "opencode"

      - name: Publish
        run: |
@@ -1,32 +0,0 @@
-name: stats
-
-on:
-  schedule:
-    - cron: "0 12 * * *" # Run daily at 12:00 UTC
-  workflow_dispatch: # Allow manual trigger
-
-jobs:
-  stats:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: latest
-
-      - name: Run stats script
-        run: bun scripts/stats.ts
-
-      - name: Commit stats
-        run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-          git add STATS.md
-          git diff --staged --quiet || git commit -m "ignore: update download stats $(date -I)"
-          git push
@@ -3,6 +3,3 @@ node_modules
 .opencode
 .sst
 .env
-.idea
-.vscode
-openapi.json
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2025 opencode
+Copyright (c) 2025 OpenCode

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,79 +1,658 @@
-<p align="center">
-  <a href="https://opencode.ai">
-    <picture>
-      <source srcset="packages/web/src/assets/logo-ornate-dark.svg" media="(prefers-color-scheme: dark)">
-      <source srcset="packages/web/src/assets/logo-ornate-light.svg" media="(prefers-color-scheme: light)">
-      <img src="packages/web/src/assets/logo-ornate-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://discord.gg/opencode"><img alt="Discord" src="https://img.shields.io/discord/1391832426048651334?style=flat-square&label=discord" /></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

-[![opencode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
+![OpenCode Terminal UI](screenshot.png)

---
+> **⚠️ 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

-### Installation
+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

 ```bash
-# YOLO
+# Install the latest version
 curl -fsSL https://opencode.ai/install | 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
+# Install a specific version
+curl -fsSL https://opencode.ai/install | VERSION=0.1.0 bash
 ```

-> **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
-
-For any new features we'd appreciate it if you could open an issue first to discuss what you'd like to implement. We're pretty responsive there and it'll save you from working on something that we don't end up using. No need to do this for simpler fixes.
-
-> **Note**: Please talk to us via github issues before spending time working on
-> a new feature
-
-To run opencode locally you need.
-
- Bun
- Golang 1.24.x
-
-And run.
+### Using Homebrew (macOS and Linux)

 ```bash
-$ bun install
-$ bun run packages/opencode/src/index.ts
+brew install sst/tap/opencode
 ```

-#### Development Notes
+### Using AUR (Arch Linux)

-**API Client**: After making changes to the TypeScript API endpoints in `packages/opencode/src/server/server.ts`, you will need the opencode team to generate a new stainless sdk for the clients.
+```bash
+# Using yay
+yay -S opencode-bin

-### FAQ
+# Using paru
+paru -S opencode-bin
+```

-#### How is this different than Claude Code?
+### Using Go

-It's very similar to Claude Code in terms of capability. Here are the key differences:
+```bash
+go install github.com/sst/opencode@latest
+```

- 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.
+## Configuration

-#### What's the other repo?
+OpenCode looks for configuration in the following locations:

-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).
+- `$HOME/.opencode.json`
+- `$XDG_CONFIG_HOME/opencode/.opencode.json`
+- `./.opencode.json` (local directory)

---
+### Environment Variables

-**Join our community** [Discord](https://discord.gg/opencode) | [YouTube](https://www.youtube.com/c/sst-dev) | [X.com](https://x.com/SST_dev)
+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
+{
+  "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
+    },
+    "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"
+      }
+    }
+  }
+}
+```
+
+### MCP Tool Usage
+
+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.
+
+## LSP (Language Server Protocol)
+
+OpenCode integrates with Language Server Protocol to provide code intelligence features across multiple programming languages.
+
+### LSP Features
+
+- **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
+
+### Configuring LSP
+
+Language servers are configured in the configuration file under the `lsp` section:
+
+```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.
@@ -1,12 +0,0 @@
-# Download Stats
-
-| Date       | GitHub Downloads | npm Downloads   | Total           |
-| ---------- | ---------------- | --------------- | --------------- |
-| 2025-06-29 | 18,789 (+0)      | 39,420 (+0)     | 58,209 (+0)     |
-| 2025-06-30 | 20,127 (+1,338)  | 41,059 (+1,639) | 61,186 (+2,977) |
-| 2025-07-01 | 22,108 (+1,981)  | 43,745 (+2,686) | 65,853 (+4,667) |
-| 2025-07-02 | 24,814 (+2,706)  | 46,168 (+2,423) | 70,982 (+5,129) |
-| 2025-07-03 | 27,834 (+3,020)  | 49,955 (+3,787) | 77,789 (+6,807) |
-| 2025-07-04 | 30,608 (+2,774)  | 54,758 (+4,803) | 85,366 (+7,577) |
-| 2025-07-05 | 32,524 (+1,916)  | 58,371 (+3,613) | 90,895 (+5,529) |
-| 2025-07-06 | 33,766 (+1,242)  | 59,694 (+1,323) | 93,460 (+2,565) |
@@ -5,7 +5,7 @@
      "name": "opencode",
      "devDependencies": {
        "prettier": "3.5.3",
-        "sst": "3.17.8",
+        "sst": "3.17.4",
      },
    },
    "packages/function": {
@@ -19,10 +19,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "0.0.5",
-      "bin": {
-        "opencode": "./bin/opencode",
-      },
+      "version": "0.0.0",
      "dependencies": {
        "@clack/prompts": "0.11.0",
        "@flystorage/file-storage": "1.1.0",
@@ -36,7 +33,6 @@
        "env-paths": "3.0.0",
        "hono": "4.7.10",
        "hono-openapi": "0.4.8",
-        "isomorphic-git": "1.32.1",
        "open": "10.1.2",
        "remeda": "2.22.3",
        "ts-lsp-client": "1.0.3",
@@ -47,17 +43,13 @@
        "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": {
@@ -75,19 +67,16 @@
        "astro": "5.7.13",
        "diff": "8.0.2",
        "js-base64": "3.7.7",
-        "lang-map": "0.4.0",
        "luxon": "3.6.1",
        "marked": "15.0.12",
-        "marked-shiki": "1.2.0",
        "rehype-autolink-headings": "7.1.0",
        "sharp": "0.32.5",
        "shiki": "3.4.2",
        "solid-js": "1.9.7",
-        "toolbeam-docs-theme": "0.4.1",
+        "toolbeam-docs-theme": "0.2.4",
      },
      "devDependencies": {
        "@types/node": "catalog:",
-        "opencode": "workspace:*",
        "typescript": "catalog:",
      },
    },
@@ -96,22 +85,21 @@
    "sharp",
    "esbuild",
  ],
+  "overrides": {
+    "zod": "3.24.2",
+  },
  "catalog": {
    "@types/node": "22.13.9",
-    "ai": "5.0.0-beta.7",
+    "ai": "5.0.0-alpha.7",
    "typescript": "5.8.2",
-    "zod": "3.25.49",
+    "zod": "3.24.2",
  },
  "packages": {
-    "@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/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/anthropic": ["@ai-sdk/anthropic@1.2.12", "", { "dependencies": { "@ai-sdk/provider": "1.1.3", "@ai-sdk/provider-utils": "2.2.8" }, "peerDependencies": { "zod": "^3.0.0" } }, "sha512-YSzjlko7JvuiyQFmI9RN1tNZdEiZxc+6xld/0tq/VkJaHpEzGAb1yiNxxvmYVcjvfu/PcvCxAAYXmTYQQ63IHQ=="],
+    "@ai-sdk/provider": ["@ai-sdk/provider@2.0.0-alpha.7", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-lhdrARU3SSmt5p/GNNK7VhazvZpKSCIOjpHUfX7f5jIhVGi/vvlxP1rD6Go57nn1MtuGKNqL04AebSRFDQsQbw=="],

-    "@ai-sdk/gateway": ["@ai-sdk/gateway@1.0.0-beta.3", "", { "dependencies": { "@ai-sdk/provider": "2.0.0-beta.1", "@ai-sdk/provider-utils": "3.0.0-beta.2" }, "peerDependencies": { "zod": "^3.25.49" } }, "sha512-g49gMSkXy94lYvl5LRh438OR/0JCG6ol0jV+iLot7cy5HLltZlGocEuauETBu4b10mDXOd7XIjTEZoQpYFMYLQ=="],
-
-    "@ai-sdk/provider": ["@ai-sdk/provider@2.0.0-beta.1", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Z8SPncMtS3RsoXITmT7NVwrAq6M44dmw0DoUOYJqNNtCu8iMWuxB8Nxsoqpa0uEEy9R1V1ZThJAXTYgjTUxl3w=="],
-
-    "@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.0-beta.2", "", { "dependencies": { "@ai-sdk/provider": "2.0.0-beta.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.3", "zod-to-json-schema": "^3.24.1" }, "peerDependencies": { "zod": "^3.25.49" } }, "sha512-H4K+4weOVgWqrDDeAbQWoA4U5mN4WrQPHQFdH7ynQYcnhj/pzctU9Q6mGlR5ESMWxaXxazxlOblSITlXo9bahA=="],
+    "@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=="],

    "@ampproject/remapping": ["@ampproject/remapping@2.3.0", "", { "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.24" } }, "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw=="],

@@ -139,12 +127,6 @@

    "@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=="],
@@ -425,18 +407,6 @@

    "@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=="],
@@ -455,7 +425,7 @@

    "@types/babel__traverse": ["@types/babel__traverse@7.20.7", "", { "dependencies": { "@babel/types": "^7.20.7" } }, "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng=="],

-    "@types/bun": ["@types/bun@1.2.18", "", { "dependencies": { "bun-types": "1.2.18" } }, "sha512-Xf6RaWVheyemaThV0kUfaAUvCNokFr+bH8Jxp+tTZfx7dAPA8z9ePnP9S9+Vspzuxxx9JRAXhnyccRj3GyCMdQ=="],
+    "@types/bun": ["@types/bun@1.2.16", "", { "dependencies": { "bun-types": "1.2.16" } }, "sha512-1aCZJ/6nSiViw339RsaNhkNoEloLaPzZhxMOYEa7OzRzO41IGg5n/7I43/ZIAW/c+Q6cT12Vf7fOZOoVIzb5BQ=="],

    "@types/debug": ["@types/debug@4.1.12", "", { "dependencies": { "@types/ms": "*" } }, "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ=="],

@@ -483,8 +453,6 @@

    "@types/node": ["@types/node@22.13.9", "", { "dependencies": { "undici-types": "~6.20.0" } }, "sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw=="],

-    "@types/react": ["@types/react@19.1.8", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-AwAfQ2Wa5bCx9WP8nZL2uMZWod7J7/JSplxbTmBQ5ms6QpqNYm672H0Vu9ZVKVngQ+ii4R/byguVEUZQyeg44g=="],
-
    "@types/sax": ["@types/sax@1.2.7", "", { "dependencies": { "@types/node": "*" } }, "sha512-rO73L89PJxeYM3s3pPPjiPgVVcymqU490g0YO5n5By0k2Erzj6tay/4lr1CHAAU4JyOWd1rpQ8bCf6cZfHU96A=="],

    "@types/turndown": ["@types/turndown@5.0.5", "", {}, "sha512-TL2IgGgc7B5j78rIccBtlYAnkuv8nUQqhQc+DSYV5j9Be9XOcm/SKOVRuA47xAVI3680Tk9B1d8flK2GWT2+4w=="],
@@ -505,7 +473,7 @@

    "acorn-walk": ["acorn-walk@8.3.2", "", {}, "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A=="],

-    "ai": ["ai@5.0.0-beta.7", "", { "dependencies": { "@ai-sdk/gateway": "1.0.0-beta.3", "@ai-sdk/provider": "2.0.0-beta.1", "@ai-sdk/provider-utils": "3.0.0-beta.2", "@opentelemetry/api": "1.9.0" }, "peerDependencies": { "zod": "^3.25.49" } }, "sha512-oC4KzUJCQPMB7v9rCqL/rVk2ogZvI6lYiXfKjzPYHwa1zIgy329qqRLmAd3mKEDTTG6By1r0zasQu7FKmG+4gw=="],
+    "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=="],

    "ansi-align": ["ansi-align@3.0.1", "", { "dependencies": { "string-width": "^4.1.0" } }, "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="],

@@ -535,8 +503,6 @@

    "astro-expressive-code": ["astro-expressive-code@0.41.2", "", { "dependencies": { "rehype-expressive-code": "^0.41.2" }, "peerDependencies": { "astro": "^4.0.0-beta || ^5.0.0-beta || ^3.3.0" } }, "sha512-HN0jWTnhr7mIV/2e6uu4PPRNNo/k4UEgTLZqbp3MrHU+caCARveG2yZxaZVBmxyiVdYqW5Pd3u3n2zjnshixbw=="],

-    "async-lock": ["async-lock@1.4.1", "", {}, "sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ=="],
-
    "atomic-sleep": ["atomic-sleep@1.0.0", "", {}, "sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ=="],

    "available-typed-arrays": ["available-typed-arrays@1.0.7", "", { "dependencies": { "possible-typed-array-names": "^1.0.0" } }, "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ=="],
@@ -595,7 +561,7 @@

    "buffer": ["buffer@4.9.2", "", { "dependencies": { "base64-js": "^1.0.2", "ieee754": "^1.1.4", "isarray": "^1.0.0" } }, "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="],

-    "bun-types": ["bun-types@1.2.18", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-04+Eha5NP7Z0A9YgDAzMk5PHR16ZuLVa83b26kH5+cp1qZW4F6FmAURngE7INf4tKOvCE69vYvDEwoNl1tGiWw=="],
+    "bun-types": ["bun-types@1.2.16", "", { "dependencies": { "@types/node": "*" } }, "sha512-ciXLrHV4PXax9vHvUrkvun9VPVGOVwbbbBF/Ev1cXz12lyEZMoJpIJABOfPcN9gDJRaiKF9MVbSygLg4NXu3/A=="],

    "bundle-name": ["bundle-name@4.1.0", "", { "dependencies": { "run-applescript": "^7.0.0" } }, "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q=="],

@@ -629,8 +595,6 @@

    "ci-info": ["ci-info@4.2.0", "", {}, "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg=="],

-    "clean-git-ref": ["clean-git-ref@2.0.1", "", {}, "sha512-bLSptAy2P0s6hU4PzuIMKmMJJSE6gLXGH1cntDu7bWJUksvuM+7ReOK61mozULErYvP6a15rnYl0zFDef+pyPw=="],
-
    "cli-boxes": ["cli-boxes@3.0.0", "", {}, "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g=="],

    "cliui": ["cliui@9.0.1", "", { "dependencies": { "string-width": "^7.2.0", "strip-ansi": "^7.1.0", "wrap-ansi": "^9.0.0" } }, "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w=="],
@@ -667,8 +631,6 @@

    "cors": ["cors@2.8.5", "", { "dependencies": { "object-assign": "^4", "vary": "^1" } }, "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g=="],

-    "crc-32": ["crc-32@1.2.2", "", { "bin": { "crc32": "bin/crc32.njs" } }, "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="],
-
    "cross-fetch": ["cross-fetch@3.2.0", "", { "dependencies": { "node-fetch": "^2.7.0" } }, "sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q=="],

    "crossws": ["crossws@0.3.5", "", { "dependencies": { "uncrypto": "^0.1.3" } }, "sha512-ojKiDvcmByhwa8YYqbQI/hg7MEU0NC03+pSdEq4ZUnZR9xXpwk7E43SMNGkn+JxJGPFtNvQ48+vV2p+P1ml5PA=="],
@@ -723,8 +685,6 @@

    "diff": ["diff@8.0.2", "", {}, "sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg=="],

-    "diff3": ["diff3@0.0.3", "", {}, "sha512-iSq8ngPOt0K53A6eVr4d5Kn6GNrM2nQZtC740pzIriHtn4pOQ2lyzEXQMBeVcWERN0ye7fhBsk9PbLLQOnUx/g=="],
-
    "direction": ["direction@2.0.1", "", { "bin": { "direction": "cli.js" } }, "sha512-9S6m9Sukh1cZNknO1CWAr2QAWsbKLafQiyM5gZ7VgXHeuaoUwffKN4q6NC4A/Mf9iiPlOXQEKW/Mv/mh9/3YFA=="],

    "dlv": ["dlv@1.1.3", "", {}, "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="],
@@ -791,7 +751,7 @@

    "eventsource": ["eventsource@3.0.7", "", { "dependencies": { "eventsource-parser": "^3.0.1" } }, "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA=="],

-    "eventsource-parser": ["eventsource-parser@3.0.3", "", {}, "sha512-nVpZkTMM9rF6AQ9gPJpFsNAMt48wIzB5TQgiTLdHiuO8XEDhUgZEhqKlZWXbIzo9VmJ/HvysHqEaVeD5v9TPvA=="],
+    "eventsource-parser": ["eventsource-parser@3.0.2", "", {}, "sha512-6RxOBZ/cYgd8usLwsEl+EC09Au/9BcmCKYF2/xbml6DNczf7nv0MQb+7BA2F+li6//I+28VNlQR37XfQtcAJuA=="],

    "exit-hook": ["exit-hook@2.2.1", "", {}, "sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw=="],

@@ -939,8 +899,6 @@

    "ieee754": ["ieee754@1.1.13", "", {}, "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="],

-    "ignore": ["ignore@5.3.2", "", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="],
-
    "import-meta-resolve": ["import-meta-resolve@4.1.0", "", {}, "sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw=="],

    "inherits": ["inherits@2.0.4", "", {}, "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="],
@@ -989,8 +947,6 @@

    "isarray": ["isarray@1.0.0", "", {}, "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="],

-    "isomorphic-git": ["isomorphic-git@1.32.1", "", { "dependencies": { "async-lock": "^1.4.1", "clean-git-ref": "^2.0.1", "crc-32": "^1.2.0", "diff3": "0.0.3", "ignore": "^5.1.4", "minimisted": "^2.0.0", "pako": "^1.0.10", "path-browserify": "^1.0.1", "pify": "^4.0.1", "readable-stream": "^3.4.0", "sha.js": "^2.4.9", "simple-get": "^4.0.1" }, "bin": { "isogit": "cli.cjs" } }, "sha512-NZCS7qpLkCZ1M/IrujYBD31sM6pd/fMVArK4fz4I7h6m0rUW2AsYU7S7zXeABuHL6HIfW6l53b4UQ/K441CQjg=="],
-
    "jmespath": ["jmespath@0.16.0", "", {}, "sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw=="],

    "jose": ["jose@5.2.3", "", {}, "sha512-KUXdbctm1uHVL8BYhnyHkgp3zDX5KW8ZhAKVFEfUbU2P8Alpzjb+48hHvjOdQIyPshoblhzsuqOwEEAbtHVirA=="],
@@ -1017,10 +973,6 @@

    "klona": ["klona@2.0.6", "", {}, "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA=="],

-    "lang-map": ["lang-map@0.4.0", "", { "dependencies": { "language-map": "^1.1.0" } }, "sha512-oiSqZIEUnWdFeDNsp4HId4tAxdFbx5iMBOwA3666Fn2L8Khj8NiD9xRvMsGmKXopPVkaDFtSv3CJOmXFUB0Hcg=="],
-
-    "language-map": ["language-map@1.5.0", "", {}, "sha512-n7gFZpe+DwEAX9cXVTw43i3wiudWDDtSn28RmdnS/HCPr284dQI/SztsamWanRr75oSlKSaGbV2nmWCTzGCoVg=="],
-
    "leven": ["leven@2.1.0", "", {}, "sha512-nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA=="],

    "longest-streak": ["longest-streak@3.1.0", "", {}, "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g=="],
@@ -1039,8 +991,6 @@

    "marked": ["marked@15.0.12", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA=="],

-    "marked-shiki": ["marked-shiki@1.2.0", "", { "peerDependencies": { "marked": ">=7.0.0", "shiki": ">=1.0.0" } }, "sha512-N924hp8veE6Mc91g5/kCNVoTU7TkeJfB2G2XEWb+k1fVA0Bck2T0rVt93d39BlOYH6ohP4Q9BFlPk+UkblhXbg=="],
-
    "math-intrinsics": ["math-intrinsics@1.1.0", "", {}, "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g=="],

    "mdast-util-definitions": ["mdast-util-definitions@6.0.0", "", { "dependencies": { "@types/mdast": "^4.0.0", "@types/unist": "^3.0.0", "unist-util-visit": "^5.0.0" } }, "sha512-scTllyX6pnYNZH/AIp/0ePz6s4cZtARxImwoPJ7kS42n+MnVsI4XbnG6d4ibehRIldYMWM2LD7ImQblVhUejVQ=="],
@@ -1173,8 +1123,6 @@

    "minimist": ["minimist@1.2.8", "", {}, "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="],

-    "minimisted": ["minimisted@2.0.1", "", { "dependencies": { "minimist": "^1.2.5" } }, "sha512-1oPjfuLQa2caorJUM8HV8lGgWCc0qqAO1MNv/k05G4qslmsndV/5WdNZrqCiyqiz3wohia2Ij2B7w2Dr7/IyrA=="],
-
    "mkdirp-classic": ["mkdirp-classic@0.5.3", "", {}, "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="],

    "mri": ["mri@1.1.4", "", {}, "sha512-6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w=="],
@@ -1253,7 +1201,7 @@

    "pagefind": ["pagefind@1.3.0", "", { "optionalDependencies": { "@pagefind/darwin-arm64": "1.3.0", "@pagefind/darwin-x64": "1.3.0", "@pagefind/linux-arm64": "1.3.0", "@pagefind/linux-x64": "1.3.0", "@pagefind/windows-x64": "1.3.0" }, "bin": { "pagefind": "lib/runner/bin.cjs" } }, "sha512-8KPLGT5g9s+olKMRTU9LFekLizkVIu9tes90O1/aigJ0T5LmyPqTzGJrETnSw3meSYg58YH7JTzhTTW/3z6VAw=="],

-    "pako": ["pako@1.0.11", "", {}, "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="],
+    "pako": ["pako@0.2.9", "", {}, "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA=="],

    "parse-entities": ["parse-entities@4.0.2", "", { "dependencies": { "@types/unist": "^2.0.0", "character-entities-legacy": "^3.0.0", "character-reference-invalid": "^2.0.0", "decode-named-character-reference": "^1.0.0", "is-alphanumerical": "^2.0.0", "is-decimal": "^2.0.0", "is-hexadecimal": "^2.0.0" } }, "sha512-GG2AQYWoLgL877gQIKeRPGO1xF9+eG1ujIb5soS5gPvLQ1y2o8FL90w2QWNdf9I361Mpp7726c+lj3U0qK1uGw=="],

@@ -1263,8 +1211,6 @@

    "parseurl": ["parseurl@1.3.3", "", {}, "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="],

-    "path-browserify": ["path-browserify@1.0.1", "", {}, "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="],
-
    "path-to-regexp": ["path-to-regexp@6.3.0", "", {}, "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ=="],

    "pathe": ["pathe@2.0.3", "", {}, "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w=="],
@@ -1275,8 +1221,6 @@

    "picomatch": ["picomatch@4.0.2", "", {}, "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="],

-    "pify": ["pify@4.0.1", "", {}, "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="],
-
    "pino": ["pino@7.11.0", "", { "dependencies": { "atomic-sleep": "^1.0.0", "fast-redact": "^3.0.0", "on-exit-leak-free": "^0.2.0", "pino-abstract-transport": "v0.5.0", "pino-std-serializers": "^4.0.0", "process-warning": "^1.0.0", "quick-format-unescaped": "^4.0.3", "real-require": "^0.1.0", "safe-stable-stringify": "^2.1.0", "sonic-boom": "^2.2.1", "thread-stream": "^0.15.1" }, "bin": { "pino": "bin.js" } }, "sha512-dMACeu63HtRLmCG8VKdy4cShCPKaYDR4youZqoSWLxl5Gu99HUw8bw75thbPv9Nip+H+QYX8o3ZJbTdVZZ2TVg=="],

    "pino-abstract-transport": ["pino-abstract-transport@0.5.0", "", { "dependencies": { "duplexify": "^4.1.2", "split2": "^4.0.0" } }, "sha512-+KAgmVeqXYbTtU2FScx1XS3kNyfZ5TrXY07V96QnUSFqo2gAqlvmaxH67Lj7SWazqsMabf+58ctdTcBgnOLUOQ=="],
@@ -1409,8 +1353,6 @@

    "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=="],
@@ -1425,8 +1367,6 @@

    "setprototypeof": ["setprototypeof@1.2.0", "", {}, "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="],

-    "sha.js": ["sha.js@2.4.11", "", { "dependencies": { "inherits": "^2.0.1", "safe-buffer": "^5.0.1" }, "bin": { "sha.js": "./bin.js" } }, "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="],
-
    "sharp": ["sharp@0.32.5", "", { "dependencies": { "color": "^4.2.3", "detect-libc": "^2.0.2", "node-addon-api": "^6.1.0", "prebuild-install": "^7.1.1", "semver": "^7.5.4", "simple-get": "^4.0.1", "tar-fs": "^3.0.4", "tunnel-agent": "^0.6.0" } }, "sha512-0dap3iysgDkNaPOaOL4X/0akdu0ma62GcdC2NBQ+93eqpePdDdr2/LM0sFdDSMmN7yS+odyZtPsb7tx/cYBKnQ=="],

    "shiki": ["shiki@3.4.2", "", { "dependencies": { "@shikijs/core": "3.4.2", "@shikijs/engine-javascript": "3.4.2", "@shikijs/engine-oniguruma": "3.4.2", "@shikijs/langs": "3.4.2", "@shikijs/themes": "3.4.2", "@shikijs/types": "3.4.2", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-wuxzZzQG8kvZndD7nustrNFIKYJ1jJoWIPaBpVe2+KHSvtzMi4SBjOxrigs8qeqce/l3U0cwiC+VAkLKSunHQQ=="],
@@ -1465,23 +1405,23 @@

    "split2": ["split2@3.2.2", "", { "dependencies": { "readable-stream": "^3.0.0" } }, "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="],

-    "sst": ["sst@3.17.8", "", { "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.8", "sst-darwin-x64": "3.17.8", "sst-linux-arm64": "3.17.8", "sst-linux-x64": "3.17.8", "sst-linux-x86": "3.17.8", "sst-win32-arm64": "3.17.8", "sst-win32-x64": "3.17.8", "sst-win32-x86": "3.17.8" }, "bin": { "sst": "bin/sst.mjs" } }, "sha512-P/a9/ZsjtQRrTBerBMO1ODaVa5HVTmNLrQNJiYvu2Bgd0ov+vefQeHv6oima8HLlPwpDIPS2gxJk8BZrTZMfCA=="],
+    "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-darwin-arm64": ["sst-darwin-arm64@3.17.8", "", { "os": "darwin", "cpu": "arm64" }, "sha512-50P6YRMnZVItZUfB0+NzqMww2mmm4vB3zhTVtWUtGoXeiw78g1AEnVlmS28gYXPHM1P987jTvR7EON9u9ig/Dg=="],
+    "sst-darwin-arm64": ["sst-darwin-arm64@3.17.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-IJansQWlPdiaQNsJw3FQ+Q/ZXN1hzrq2Q31xG4l2HhA1doj1C3y+6s57vu4cTRDFo2OwBlC4+zlQBJHsOYGhrA=="],

-    "sst-darwin-x64": ["sst-darwin-x64@3.17.8", "", { "os": "darwin", "cpu": "x64" }, "sha512-P0pnMHCmpkpcsxkWpilmeoD79LkbkoIcv6H0aeM9ArT/71/JBhvqH+HjMHSJCzni/9uR6er+nH5F+qol0UO6Bw=="],
+    "sst-darwin-x64": ["sst-darwin-x64@3.17.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-mHd26/AtaQ79ajqzsutRhgEjkCxX+bXgW4KJIN0AGT3110fo2OL0x2UXmfX+sxSWOFHvJQsjFjFm4CLtQSxyBg=="],

-    "sst-linux-arm64": ["sst-linux-arm64@3.17.8", "", { "os": "linux", "cpu": "arm64" }, "sha512-vun54YA/UzprCu9p8BC4rMwFU5Cj9xrHAHYLYUp/yq4H0pfmBIiQM62nsfIKizRThe/TkBFy60EEi9myf6raYA=="],
+    "sst-linux-arm64": ["sst-linux-arm64@3.17.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-unaNWOY3oEI/jUUG47/2Gbreaoi/D/rLsTPeKyYEWhWEBWCojns7LfMQs1bgW0qjBGmazB2IJD4NVYhYqYQxqQ=="],

-    "sst-linux-x64": ["sst-linux-x64@3.17.8", "", { "os": "linux", "cpu": "x64" }, "sha512-HqByCaLE2gEJbM20P1QRd+GqDMAiieuU53FaZA1F+AGxQi+kR82NWjrPqFcMj4dMYg8w/TWXuV+G5+PwoUmpDw=="],
+    "sst-linux-x64": ["sst-linux-x64@3.17.4", "", { "os": "linux", "cpu": "x64" }, "sha512-zoErI6dVoRxWcmoVVrzNJWKEqfUF/MyQInEkGROGY2YsFFzOM5RD5Dsdm9q6oDGwx+NxFAhQWc8/8C+OmoW1nA=="],

-    "sst-linux-x86": ["sst-linux-x86@3.17.8", "", { "os": "linux", "cpu": "none" }, "sha512-bCd6QM3MejfSmdvg8I/k+aUJQIZEQJg023qmN78fv00vwlAtfECvY7tjT9E2m3LDp33pXrcRYbFOQzPu+tWFfA=="],
+    "sst-linux-x86": ["sst-linux-x86@3.17.4", "", { "os": "linux", "cpu": "none" }, "sha512-7ZHS2rxzxVAxMFW3u5+GMRGGACaBMuLht8JYxqruD8mFVqk9UaPQgrFKIHGKWHLBJLVnF2AdwmlHOcEKP+UJWA=="],

-    "sst-win32-arm64": ["sst-win32-arm64@3.17.8", "", { "os": "win32", "cpu": "arm64" }, "sha512-pilx0n8gm4aHJae/vNiqIwZkWF3tdwWzD/ON7hkytw+CVSZ0FXtyFW/yO/+2u3Yw0Kj0lSWPnUqYgm/eHPLwQA=="],
+    "sst-win32-arm64": ["sst-win32-arm64@3.17.4", "", { "os": "win32", "cpu": "arm64" }, "sha512-q4cedr6WD3NqeQkDvmAsIgMgPIjziIWy81wA3ZmnY6UT0jFgFus23ppLIi6F4BFJfOygvAP2PeGrRR3o8giclw=="],

-    "sst-win32-x64": ["sst-win32-x64@3.17.8", "", { "os": "win32", "cpu": "x64" }, "sha512-Jb0FVRyiOtESudF1V8ucW65PuHrx/iOHUamIO0JnbujWNHZBTRPB2QHN1dbewgkueYDaCmyS8lvuIImLwYJnzQ=="],
+    "sst-win32-x64": ["sst-win32-x64@3.17.4", "", { "os": "win32", "cpu": "x64" }, "sha512-sSQL041YCusZ8/0ynYGe9DCmPYVZOFsemXKUA9tX4IGSDqXae1FN0Sj7HQ17JyY24UUirY1zR7LFk+7KrP6wiA=="],

-    "sst-win32-x86": ["sst-win32-x86@3.17.8", "", { "os": "win32", "cpu": "none" }, "sha512-oVmFa/PoElQmfnGJlB0w6rPXiYuldiagO6AbrLMT/6oAnWerLQ8Uhv9tJWfMh3xtPLImQLTjxDo1v0AIzEv9QA=="],
+    "sst-win32-x86": ["sst-win32-x86@3.17.4", "", { "os": "win32", "cpu": "none" }, "sha512-WhjsD2dkA2fbQ03CgwIJb+2p0osll2PTXlr7HC3L+H8wG2DgLFPjoE+6N8n6r2dVMVaDzuNwy/7J8hRB29blaw=="],

    "stacktracey": ["stacktracey@2.1.8", "", { "dependencies": { "as-table": "^1.0.36", "get-source": "^2.0.12" } }, "sha512-Kpij9riA+UNg7TnphqjH7/CzctQ/owJGNbFkfEeve4Z4uxT5+JapVLFXcsurIfN34gnTWZNJ/f7NMG0E8JDzTw=="],

@@ -1531,7 +1471,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.4.1", "", { "peerDependencies": { "@astrojs/starlight": "^0.34.3", "astro": "^5.7.13" } }, "sha512-lTI4dHZaVNQky29m7sb36Oy4tWPwxsCuFxFjF8hgGW0vpV+S6qPvI9SwsJFvdE/OHO5DoI7VMbryV1pxZHkkHQ=="],
+    "toolbeam-docs-theme": ["toolbeam-docs-theme@0.2.4", "", { "peerDependencies": { "@astrojs/starlight": "^0.34.3", "astro": "^5.7.13" } }, "sha512-W5mdbcgRpTBDFyEdcU81USs3MFZoXMInpSznc/AFZCwqz8atk4iBNDIlhvihpGHY54Nf5crKmZwJjxVojkHFvA=="],

    "tr46": ["tr46@0.0.3", "", {}, "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="],

@@ -1681,7 +1621,7 @@

    "youch": ["youch@3.3.4", "", { "dependencies": { "cookie": "^0.7.1", "mustache": "^4.2.0", "stacktracey": "^2.1.8" } }, "sha512-UeVBXie8cA35DS6+nBkls68xaBBXCye0CNznrhszZjTbRVnJKQuNsyLKBTTL4ln1o1rh2PKtv35twV7irj5SEg=="],

-    "zod": ["zod@3.25.49", "", {}, "sha512-JMMPMy9ZBk3XFEdbM3iL1brx4NUSejd6xr3ELrrGEfGb355gjhiAWtG3K5o+AViV/3ZfkIrCzXsZn6SbLwTR8Q=="],
+    "zod": ["zod@3.24.2", "", {}, "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ=="],

    "zod-openapi": ["zod-openapi@4.2.4", "", { "peerDependencies": { "zod": "^3.21.4" } }, "sha512-tsrQpbpqFCXqVXUzi3TPwFhuMtLN3oNZobOtYnK6/5VkXsNdnIgyNr4r8no4wmYluaxzN3F7iS+8xCW8BmMQ8g=="],

@@ -1689,34 +1629,12 @@

    "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/@ai-sdk/provider": ["@ai-sdk/provider@1.1.3", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-qZMxYJ0qqX/RfnuIaab+zp8UAeJn/ygXXAffR5I4N0n1IrvA6qBsjc8hXLmBiMV2zoXlifkacF7sEFnYnjBcqg=="],
-
-    "@ai-sdk/amazon-bedrock/@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/amazon-bedrock/aws4fetch": ["aws4fetch@1.0.20", "", {}, "sha512-/djoAN709iY65ETD6LKCtyyEI04XIBP5xVvfmNxsEP0uJB5tyaGBztSryRr4HqMStr9R06PisQE7m9zDTXKu6g=="],
-
-    "@ai-sdk/anthropic/@ai-sdk/provider": ["@ai-sdk/provider@1.1.3", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-qZMxYJ0qqX/RfnuIaab+zp8UAeJn/ygXXAffR5I4N0n1IrvA6qBsjc8hXLmBiMV2zoXlifkacF7sEFnYnjBcqg=="],
-
-    "@ai-sdk/anthropic/@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=="],
-
    "@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=="],

-    "@astrojs/sitemap/zod": ["zod@3.24.2", "", {}, "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ=="],
-
-    "@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=="],
@@ -1727,8 +1645,6 @@

    "@jridgewell/gen-mapping/@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=="],

-    "@modelcontextprotocol/sdk/zod": ["zod@3.24.2", "", {}, "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ=="],
-
    "@openauthjs/openauth/@standard-schema/spec": ["@standard-schema/spec@1.0.0-beta.3", "", {}, "sha512-0ifF3BjA1E8SY9C+nUew8RefNOIq0cDlYALPty4rhUm8Rrl6tCM8hBT4bhGhx7I7iXD0uAgt50lgo8dD73ACMw=="],

    "@openauthjs/openauth/aws4fetch": ["aws4fetch@1.0.20", "", {}, "sha512-/djoAN709iY65ETD6LKCtyyEI04XIBP5xVvfmNxsEP0uJB5tyaGBztSryRr4HqMStr9R06PisQE7m9zDTXKu6g=="],
@@ -1739,18 +1655,6 @@

    "@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=="],
@@ -1765,14 +1669,10 @@

    "astro/sharp": ["sharp@0.33.5", "", { "dependencies": { "color": "^4.2.3", "detect-libc": "^2.0.3", "semver": "^7.6.3" }, "optionalDependencies": { "@img/sharp-darwin-arm64": "0.33.5", "@img/sharp-darwin-x64": "0.33.5", "@img/sharp-libvips-darwin-arm64": "1.0.4", "@img/sharp-libvips-darwin-x64": "1.0.4", "@img/sharp-libvips-linux-arm": "1.0.5", "@img/sharp-libvips-linux-arm64": "1.0.4", "@img/sharp-libvips-linux-s390x": "1.0.4", "@img/sharp-libvips-linux-x64": "1.0.4", "@img/sharp-libvips-linuxmusl-arm64": "1.0.4", "@img/sharp-libvips-linuxmusl-x64": "1.0.4", "@img/sharp-linux-arm": "0.33.5", "@img/sharp-linux-arm64": "0.33.5", "@img/sharp-linux-s390x": "0.33.5", "@img/sharp-linux-x64": "0.33.5", "@img/sharp-linuxmusl-arm64": "0.33.5", "@img/sharp-linuxmusl-x64": "0.33.5", "@img/sharp-wasm32": "0.33.5", "@img/sharp-win32-ia32": "0.33.5", "@img/sharp-win32-x64": "0.33.5" } }, "sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw=="],

-    "astro/zod": ["zod@3.24.2", "", {}, "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ=="],
-
    "babel-plugin-jsx-dom-expressions/@babel/helper-module-imports": ["@babel/helper-module-imports@7.18.6", "", { "dependencies": { "@babel/types": "^7.18.6" } }, "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="],

    "bl/buffer": ["buffer@5.7.1", "", { "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" } }, "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="],

-    "eventsource/eventsource-parser": ["eventsource-parser@3.0.2", "", {}, "sha512-6RxOBZ/cYgd8usLwsEl+EC09Au/9BcmCKYF2/xbml6DNczf7nv0MQb+7BA2F+li6//I+28VNlQR37XfQtcAJuA=="],
-
    "express/cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="],

    "get-source/source-map": ["source-map@0.6.1", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="],
@@ -1785,12 +1685,8 @@

    "miniflare/sharp": ["sharp@0.33.5", "", { "dependencies": { "color": "^4.2.3", "detect-libc": "^2.0.3", "semver": "^7.6.3" }, "optionalDependencies": { "@img/sharp-darwin-arm64": "0.33.5", "@img/sharp-darwin-x64": "0.33.5", "@img/sharp-libvips-darwin-arm64": "1.0.4", "@img/sharp-libvips-darwin-x64": "1.0.4", "@img/sharp-libvips-linux-arm": "1.0.5", "@img/sharp-libvips-linux-arm64": "1.0.4", "@img/sharp-libvips-linux-s390x": "1.0.4", "@img/sharp-libvips-linux-x64": "1.0.4", "@img/sharp-libvips-linuxmusl-arm64": "1.0.4", "@img/sharp-libvips-linuxmusl-x64": "1.0.4", "@img/sharp-linux-arm": "0.33.5", "@img/sharp-linux-arm64": "0.33.5", "@img/sharp-linux-s390x": "0.33.5", "@img/sharp-linux-x64": "0.33.5", "@img/sharp-linuxmusl-arm64": "0.33.5", "@img/sharp-linuxmusl-x64": "0.33.5", "@img/sharp-wasm32": "0.33.5", "@img/sharp-win32-ia32": "0.33.5", "@img/sharp-win32-x64": "0.33.5" } }, "sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw=="],

-    "miniflare/zod": ["zod@3.22.3", "", {}, "sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug=="],
-
    "opencontrol/hono": ["hono@4.7.4", "", {}, "sha512-Pst8FuGqz3L7tFF+u9Pu70eI0xa5S3LPUmrNd5Jm8nTHze9FxLTK9Kaj5g/k4UcwuJSXTP65SyHOPLrffpcAJg=="],

-    "opencontrol/zod": ["zod@3.24.2", "", {}, "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ=="],
-
    "opencontrol/zod-to-json-schema": ["zod-to-json-schema@3.24.3", "", { "peerDependencies": { "zod": "^3.24.1" } }, "sha512-HIAfWdYIt1sssHfYZFCXp4rU1w2r8hVVXYIlmoa0r0gABLs5di3RCqPU5DDROogVz1pAdYBaz7HK5n9pSUNs3A=="],

    "openid-client/jose": ["jose@4.15.9", "", {}, "sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA=="],
@@ -1817,8 +1713,6 @@

    "token-types/ieee754": ["ieee754@1.2.1", "", {}, "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="],

-    "unicode-trie/pako": ["pako@0.2.9", "", {}, "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA=="],
-
    "unstorage/lru-cache": ["lru-cache@10.4.3", "", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="],

    "vscode-languageserver-protocol/vscode-jsonrpc": ["vscode-jsonrpc@8.1.0", "", {}, "sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw=="],
@@ -1831,8 +1725,6 @@

    "@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=="],
@@ -1899,8 +1791,6 @@

    "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=="],
@@ -9,9 +9,6 @@ const bucket = new sst.cloudflare.Bucket("Bucket")
 export const api = new sst.cloudflare.Worker("Api", {
  domain: `api.${domain}`,
  handler: "packages/function/src/api.ts",
-  environment: {
-    WEB_DOMAIN: domain,
-  },
  url: true,
  link: [bucket],
  transform: {
@@ -26,21 +23,29 @@ export const api = new sst.cloudflare.Worker("Api", {
        },
      ])
      args.migrations = {
-        // Note: when releasing the next tag, make sure all stages use tag v2
-        oldTag: $app.stage === "production" ? "" : "v1",
-        newTag: $app.stage === "production" ? "" : "v1",
+        oldTag: "v1",
+        newTag: "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",
  environment: {
-    // For astro config
-    SST_STAGE: $app.stage,
    VITE_API_URL: api.url,
  },
 })
@@ -12,28 +12,23 @@ requested_version=${VERSION:-}

 os=$(uname -s | tr '[:upper:]' '[:lower:]')
 if [[ "$os" == "darwin" ]]; then
-    os="darwin"
+    os="mac"
 fi
 arch=$(uname -m)

 if [[ "$arch" == "aarch64" ]]; then
  arch="arm64"
-elif [[ "$arch" == "x86_64" ]]; then
-  arch="x64"
 fi

-filename="$APP-$os-$arch.zip"
+filename="$APP-$os-$arch.tar.gz"


 case "$filename" in
    *"-linux-"*)
-        [[ "$arch" == "x64" || "$arch" == "arm64" ]] || exit 1
+        [[ "$arch" == "x86_64" || "$arch" == "arm64" || "$arch" == "i386" ]] || exit 1
    ;;
-    *"-darwin-"*)
-        [[ "$arch" == "x64" || "$arch" == "arm64" ]] || exit 1
-    ;;
-    *"-windows-"*)
-        [[ "$arch" == "x64" ]] || exit 1
+    *"-mac-"*)
+        [[ "$arch" == "x86_64" || "$arch" == "arm64" ]] || exit 1
    ;;
    *)
        echo "${RED}Unsupported OS/Arch: $os/$arch${NC}"
@@ -93,9 +88,8 @@ check_version() {
 download_and_install() {
    print_message info "Downloading ${ORANGE}opencode ${GREEN}version: ${YELLOW}$specific_version ${GREEN}..."
    mkdir -p opencodetmp && cd opencodetmp
-    curl -# -L -o "$filename" "$url"
-    unzip -q "$filename"
-    mv opencode "$INSTALL_DIR"
+    curl -# -L $url | tar xz
+    mv opencode $INSTALL_DIR
    cd .. && rm -rf opencodetmp 
 }

@@ -107,9 +101,7 @@ add_to_path() {
    local config_file=$1
    local command=$2

-    if grep -Fxq "$command" "$config_file"; then
-        print_message info "Command already exists in $config_file, skipping write."
-    elif [[ -w $config_file ]]; then
+    if [[ -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"
@@ -175,7 +167,6 @@ 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"
        ;;
@@ -1,25 +0,0 @@
-{
-  "$schema": "https://opencode.ai/config.json",
-  "mcp": {
-    "weather": {
-      "type": "local",
-      "command": ["opencode", "x", "@h1deya/mcp-server-weather"]
-    }
-  },
-  "experimental": {
-    "hook": {
-      "file_edited": {
-        ".json": [
-          {
-            "command": ["bun", "run", "prettier", "$FILE"]
-          }
-        ]
-      },
-      "session_completed": [
-        {
-          "command": ["touch", "./node_modules/foo"]
-        }
-      ]
-    }
-  }
-}
@@ -5,10 +5,8 @@
  "type": "module",
  "packageManager": "bun@1.2.14",
  "scripts": {
-    "dev": "bun run packages/opencode/src/index.ts",
    "typecheck": "bun run --filter='*' typecheck",
-    "stainless": "bun run ./packages/opencode/src/index.ts serve ",
-    "postinstall": "./scripts/hooks"
+    "dev": "sst dev"
  },
  "workspaces": {
    "packages": [
@@ -17,13 +15,13 @@
    "catalog": {
      "typescript": "5.8.2",
      "@types/node": "22.13.9",
-      "zod": "3.25.49",
-      "ai": "5.0.0-beta.7"
+      "zod": "3.24.2",
+      "ai": "5.0.0-alpha.7"
    }
  },
  "devDependencies": {
    "prettier": "3.5.3",
-    "sst": "3.17.8"
+    "sst": "3.17.4"
  },
  "repository": {
    "type": "git",
@@ -31,15 +29,14 @@
  },
  "license": "MIT",
  "prettier": {
-    "semi": false,
-    "printWidth": 120
+    "semi": false
+  },
+  "overrides": {
+    "zod": "3.24.2"
  },
  "trustedDependencies": [
    "esbuild",
    "protobufjs",
    "sharp"
-  ],
-  "patchedDependencies": {
-    "ai@4.3.16": "patches/ai@4.3.16.patch"
-  }
+  ]
 }
@@ -4,7 +4,6 @@ import { randomUUID } from "node:crypto"
 type Env = {
  SYNC_SERVER: DurableObjectNamespace<SyncServer>
  Bucket: R2Bucket
-  WEB_DOMAIN: string
 }

 export class SyncServer extends DurableObject<Env> {
@@ -20,9 +19,9 @@ export class SyncServer extends DurableObject<Env> {
    this.ctx.acceptWebSocket(server)

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

    return new Response(null, {
      status: 101,
@@ -36,9 +35,13 @@ export class SyncServer extends DurableObject<Env> {
    ws.close(code, "Durable Object is closing WebSocket")
  }

-  async publish(key: string, content: any) {
+  async publish(secret: string, key: string, content: any) {
+    if (secret !== (await this.getSecret())) throw new Error("Invalid secret")
    const sessionID = await this.getSessionID()
-    if (!key.startsWith(`session/info/${sessionID}`) && !key.startsWith(`session/message/${sessionID}/`))
+    if (
+      !key.startsWith(`session/info/${sessionID}`) &&
+      !key.startsWith(`session/message/${sessionID}/`)
+    )
      return new Response("Error: Invalid key", { status: 400 })

    // store message
@@ -68,13 +71,11 @@ export class SyncServer extends DurableObject<Env> {

  public async getData() {
    const data = await this.ctx.storage.list()
-    return Array.from(data.entries())
-      .filter(([key, _]) => key.startsWith("session/"))
-      .map(([key, content]) => ({ key, content }))
-  }
-
-  public async assertSecret(secret: string) {
-    if (secret !== (await this.getSecret())) throw new Error("Invalid secret")
+    const messages = []
+    for (const [key, content] of data.entries()) {
+      messages.push({ key, content })
+    }
+    return messages
  }

  private async getSecret() {
@@ -85,19 +86,15 @@ export class SyncServer extends DurableObject<Env> {
    return this.ctx.storage.get<string>("sessionID")
  }

-  async clear() {
-    const sessionID = await this.getSessionID()
-    const list = await this.env.Bucket.list({
-      prefix: `session/message/${sessionID}/`,
-      limit: 1000,
-    })
-    for (const item of list.objects) {
-      await this.env.Bucket.delete(item.key)
-    }
-    await this.env.Bucket.delete(`session/info/${sessionID}`)
+  async clear(secret: string) {
+    await this.assertSecret(secret)
    await this.ctx.storage.deleteAll()
  }

+  private async assertSecret(secret: string) {
+    if (secret !== (await this.getSecret())) throw new Error("Invalid secret")
+  }
+
  static shortName(id: string) {
    return id.substring(id.length - 8)
  }
@@ -125,7 +122,7 @@ export default {
      return new Response(
        JSON.stringify({
          secret,
-          url: `https://${env.WEB_DOMAIN}/s/${short}`,
+          url: "https://dev.opencode.ai/s/" + short,
        }),
        {
          headers: { "Content-Type": "application/json" },
@@ -139,17 +136,7 @@ export default {
      const secret = body.secret
      const id = env.SYNC_SERVER.idFromName(SyncServer.shortName(sessionID))
      const stub = env.SYNC_SERVER.get(id)
-      await stub.assertSecret(secret)
-      await stub.clear()
-      return new Response(JSON.stringify({}), {
-        headers: { "Content-Type": "application/json" },
-      })
-    }
-
-    if (request.method === "POST" && method === "share_delete_admin") {
-      const id = env.SYNC_SERVER.idFromName("oVF8Rsiv")
-      const stub = env.SYNC_SERVER.get(id)
-      await stub.clear()
+      await stub.clear(secret)
      return new Response(JSON.stringify({}), {
        headers: { "Content-Type": "application/json" },
      })
@@ -165,8 +152,7 @@ export default {
      const name = SyncServer.shortName(body.sessionID)
      const id = env.SYNC_SERVER.idFromName(name)
      const stub = env.SYNC_SERVER.get(id)
-      await stub.assertSecret(body.secret)
-      await stub.publish(body.key, body.content)
+      await stub.publish(body.secret, body.key, body.content)
      return new Response(JSON.stringify({}), {
        headers: { "Content-Type": "application/json" },
      })
@@ -181,7 +167,8 @@ export default {
      }
      const id = url.searchParams.get("id")
      console.log("share_poll", id)
-      if (!id) return new Response("Error: Share ID is required", { status: 400 })
+      if (!id)
+        return new Response("Error: Share ID is required", { status: 400 })
      const stub = env.SYNC_SERVER.get(env.SYNC_SERVER.idFromName(id))
      return stub.fetch(request)
    }
@@ -189,7 +176,8 @@ export default {
    if (request.method === "GET" && method === "share_data") {
      const id = url.searchParams.get("id")
      console.log("share_data", id)
-      if (!id) return new Response("Error: Share ID is required", { status: 400 })
+      if (!id)
+        return new Response("Error: Share ID is required", { status: 400 })
      const stub = env.SYNC_SERVER.get(env.SYNC_SERVER.idFromName(id))
      const data = await stub.getData()

@@ -6,20 +6,20 @@
 import "sst"
 declare module "sst" {
  export interface Resource {
-    Web: {
-      type: "sst.cloudflare.Astro"
-      url: string
+    "Web": {
+      "type": "sst.cloudflare.Astro"
+      "url": string
    }
  }
 }
-// cloudflare
-import * as cloudflare from "@cloudflare/workers-types"
+// cloudflare 
+import * as cloudflare from "@cloudflare/workers-types";
 declare module "sst" {
  export interface Resource {
-    Api: cloudflare.Service
-    Bucket: cloudflare.R2Bucket
+    "Api": cloudflare.Service
+    "Bucket": cloudflare.R2Bucket
  }
 }

 import "sst"
-export {}
+export {}
@@ -1,3 +1,4 @@
+node_modules
 research
 dist
 gen
@@ -1,4 +1,4 @@
-# opencode agent guidelines
+# OpenCode Agent Guidelines

 ## Build/Test Commands

@@ -16,19 +16,9 @@
 - **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
- 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()
+- DO NOT use else statements unless necessary
+- DO NOT use try catch if it can be avoided

 ## Architecture

@@ -37,4 +27,4 @@
 - **Validation**: All inputs validated with Zod schemas
 - **Logging**: Use `Log.create({ service: "name" })` pattern
 - **Storage**: Use `Storage` namespace for persistence
- **API Client**: Go TUI communicates with TypeScript server via stainless SDK. When adding/modifying server endpoints in `packages/opencode/src/server/server.ts`, ask the user to generate a new client SDK to proceed with client-side changes.
+
@@ -49,7 +49,7 @@ else
    done
    
    if [ -z "$resolved" ]; then
-        printf "It seems that your package manager failed to install the right version of the opencode CLI for your platform. You can try manually installing the \"%s\" package\n" "$name" >&2
+        printf "It seems that your package manager failed to install the right version of the SST CLI for your platform. You can try manually installing the \"%s\" package\n" "$name" >&2
        exit 1
    fi
 fi
@@ -1,56 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-if defined OPENCODE_BIN_PATH (
-    set "resolved=%OPENCODE_BIN_PATH%"
-    goto :execute
-)
-
-rem Get the directory of this script
-set "script_dir=%~dp0"
-set "script_dir=%script_dir:~0,-1%"
-
-rem Detect platform and architecture
-set "platform=win32"
-
-rem Detect architecture
-if "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
-    set "arch=x64"
-) else if "%PROCESSOR_ARCHITECTURE%"=="ARM64" (
-    set "arch=arm64"
-) else if "%PROCESSOR_ARCHITECTURE%"=="x86" (
-    set "arch=x86"
-) else (
-    set "arch=x64"
-)
-
-set "name=opencode-!platform!-!arch!"
-set "binary=opencode.exe"
-
-rem Search for the binary starting from script location
-set "resolved="
-set "current_dir=%script_dir%"
-
-:search_loop
-set "candidate=%current_dir%\node_modules\%name%\bin\%binary%"
-if exist "%candidate%" (
-    set "resolved=%candidate%"
-    goto :execute
-)
-
-rem Move up one directory
-for %%i in ("%current_dir%") do set "parent_dir=%%~dpi"
-set "parent_dir=%parent_dir:~0,-1%"
-
-rem Check if we've reached the root
-if "%current_dir%"=="%parent_dir%" goto :not_found
-set "current_dir=%parent_dir%"
-goto :search_loop
-
-:not_found
-echo It seems that your package manager failed to install the right version of the opencode CLI for your platform. You can try manually installing the "%name%" package >&2
-exit /b 1
-
-:execute
-rem Execute the binary with all arguments
-"%resolved%" %*
@@ -1,369 +0,0 @@
-{
-  "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"
-                },
-                "tool_call": {
-                  "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"
-                },
-                "options": {
-                  "type": "object",
-                  "additionalProperties": {}
-                }
-              },
-              "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"
-              },
-              "enabled": {
-                "type": "boolean",
-                "description": "Enable or disable the MCP server on startup"
-              }
-            },
-            "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"
-              },
-              "enabled": {
-                "type": "boolean",
-                "description": "Enable or disable the MCP server on startup"
-              }
-            },
-            "required": ["type", "url"],
-            "additionalProperties": false
-          }
-        ]
-      },
-      "description": "MCP (Model Context Protocol) server configurations"
-    },
-    "instructions": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "Additional instruction files or patterns to include"
-    },
-    "experimental": {
-      "type": "object",
-      "properties": {
-        "hook": {
-          "type": "object",
-          "properties": {
-            "file_edited": {
-              "type": "object",
-              "additionalProperties": {
-                "type": "array",
-                "items": {
-                  "type": "object",
-                  "properties": {
-                    "command": {
-                      "type": "array",
-                      "items": {
-                        "type": "string"
-                      }
-                    },
-                    "environment": {
-                      "type": "object",
-                      "additionalProperties": {
-                        "type": "string"
-                      }
-                    }
-                  },
-                  "required": ["command"],
-                  "additionalProperties": false
-                }
-              }
-            },
-            "session_completed": {
-              "type": "array",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "command": {
-                    "type": "array",
-                    "items": {
-                      "type": "string"
-                    }
-                  },
-                  "environment": {
-                    "type": "object",
-                    "additionalProperties": {
-                      "type": "string"
-                    }
-                  }
-                },
-                "required": ["command"],
-                "additionalProperties": false
-              }
-            }
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    }
-  },
-  "additionalProperties": false,
-  "$schema": "http://json-schema.org/draft-07/schema#"
-}
@@ -1,28 +1,24 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "0.0.5",
+  "version": "0.0.0",
  "name": "opencode",
  "type": "module",
  "private": true,
  "scripts": {
-    "typecheck": "tsc --noEmit",
-    "dev": "bun run ./src/index.ts"
-  },
-  "bin": {
-    "opencode": "./bin/opencode"
+    "typecheck": "tsc --noEmit"
  },
  "exports": {
-    "./*": "./src/*.ts"
+    "./*": [
+      "./src/*.ts",
+      "./src/*/index.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:",
-    "zod-to-json-schema": "3.24.5"
+    "typescript": "catalog:"
  },
  "dependencies": {
    "@clack/prompts": "0.11.0",
@@ -37,7 +33,6 @@
    "env-paths": "3.0.0",
    "hono": "4.7.10",
    "hono-openapi": "0.4.8",
-    "isomorphic-git": "1.32.1",
    "open": "10.1.2",
    "remeda": "2.22.3",
    "ts-lsp-client": "1.0.3",
@@ -47,7 +42,6 @@
    "xdg-basedir": "5.1.0",
    "yargs": "18.0.0",
    "zod": "catalog:",
-    "zod-openapi": "4.2.4",
-    "zod-validation-error": "3.5.2"
+    "zod-openapi": "4.2.4"
  }
 }
@@ -0,0 +1,23 @@
+# 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"
+}
@@ -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)
  }
 }
@@ -40,7 +40,7 @@ for (const [os, arch] of targets) {
  console.log(`building ${os}-${arch}`)
  const name = `${pkg.name}-${os}-${arch}`
  await $`mkdir -p dist/${name}/bin`
-  await $`CGO_ENABLED=0 GOOS=${os} GOARCH=${GOARCH[arch]} go build -ldflags="-s -w -X main.Version=${version}" -o ../opencode/dist/${name}/bin/tui ../tui/cmd/opencode/main.go`.cwd(
+  await $`GOOS=${os} GOARCH=${GOARCH[arch]} go build -ldflags="-s -w -X main.Version=${version}" -o ../opencode/dist/${name}/bin/tui ../tui/cmd/opencode/main.go`.cwd(
    "../tui",
  )
  await $`bun build --define OPENCODE_VERSION="'${version}'" --compile --minify --target=bun-${os}-${arch} --outfile=dist/${name}/bin/opencode ./src/index.ts ./dist/${name}/bin/tui`
@@ -57,13 +57,14 @@ for (const [os, arch] of targets) {
      2,
    ),
  )
-  if (!dry) await $`cd dist/${name} && bun publish --access public --tag ${npmTag}`
+  if (!dry)
+    await $`cd dist/${name} && bun publish --access public --tag ${npmTag}`
  optionalDependencies[name] = version
 }

 await $`mkdir -p ./dist/${pkg.name}`
 await $`cp -r ./bin ./dist/${pkg.name}/bin`
-await $`cp ./script/postinstall.mjs ./dist/${pkg.name}/postinstall.mjs`
+await $`cp ./script/postinstall.js ./dist/${pkg.name}/postinstall.js`
 await Bun.file(`./dist/${pkg.name}/package.json`).write(
  JSON.stringify(
    {
@@ -72,7 +73,7 @@ await Bun.file(`./dist/${pkg.name}/package.json`).write(
        [pkg.name]: `./bin/${pkg.name}`,
      },
      scripts: {
-        postinstall: "node ./postinstall.mjs",
+        postinstall: "node ./postinstall.js",
      },
      version,
      optionalDependencies,
@@ -81,7 +82,8 @@ await Bun.file(`./dist/${pkg.name}/package.json`).write(
    2,
  ),
 )
-if (!dry) await $`cd ./dist/${pkg.name} && bun publish --access public --tag ${npmTag}`
+if (!dry)
+  await $`cd ./dist/${pkg.name} && bun publish --access public --tag ${npmTag}`

 if (!snapshot) {
  // Github Release
@@ -89,11 +91,15 @@ if (!snapshot) {
    await $`cd dist/${key}/bin && zip -r ../../${key}.zip *`
  }

-  const previous = await fetch("https://api.github.com/repos/sst/opencode/releases/latest")
+  const previous = await fetch(
+    "https://api.github.com/repos/sst/opencode/releases/latest",
+  )
    .then((res) => res.json())
    .then((data) => data.tag_name)

-  const commits = await fetch(`https://api.github.com/repos/sst/opencode/compare/${previous}...HEAD`)
+  const commits = await fetch(
+    `https://api.github.com/repos/sst/opencode/compare/${previous}...HEAD`,
+  )
    .then((res) => res.json())
    .then((data) => data.commits || [])

@@ -102,117 +108,47 @@ if (!snapshot) {
    .filter((x: string) => {
      const lower = x.toLowerCase()
      return (
-        !lower.includes("ignore:") &&
+        !lower.includes("chore:") &&
        !lower.includes("ci:") &&
-        !lower.includes("wip:") &&
-        !lower.includes("docs:") &&
-        !lower.includes("doc:")
+        !lower.includes("docs:")
      )
    })
    .join("\n")

-  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())
+  if (!dry)
+    await $`gh release create v${version} --title "v${version}" --notes ${notes} ./dist/*.zip`

  // AUR package
-  const pkgbuild = [
-    "# Maintainer: dax",
-    "# Maintainer: adam",
-    "",
-    "pkgname='${pkg}'",
-    `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")
+  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()),
+    )

-  for (const pkg of ["opencode", "opencode-bin"]) {
-    await $`rm -rf ./dist/aur-${pkg}`
-    await $`git clone ssh://aur@aur.archlinux.org/${pkg}.git ./dist/aur-${pkg}`
-    await Bun.file(`./dist/aur-${pkg}/PKGBUILD`).write(pkgbuild.replace("${pkg}", pkg))
-    await $`cd ./dist/aur-${pkg} && makepkg --printsrcinfo > .SRCINFO`
-    await $`cd ./dist/aur-${pkg} && git add PKGBUILD .SRCINFO`
-    await $`cd ./dist/aur-${pkg} && git commit -m "Update to v${version}"`
-    if (!dry) await $`cd ./dist/aur-${pkg} && git push`
-  }
+  await $`rm -rf ./dist/aur-opencode-bin`

-  // 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`
+  await $`git clone ssh://aur@aur.archlinux.org/opencode-bin.git ./dist/aur-opencode-bin`
+  await Bun.file("./dist/aur-opencode-bin/PKGBUILD").write(pkgbuild)
+  await $`cd ./dist/aur-opencode-bin && makepkg --printsrcinfo > .SRCINFO`
+  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`
 }
@@ -1,8 +0,0 @@
-#!/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))
@@ -1,4 +1,3 @@
-import "zod-openapi/extend"
 import { Log } from "../util/log"
 import { Context } from "../util/context"
 import { Filesystem } from "../util/filesystem"
@@ -13,50 +12,46 @@ export namespace App {
  export const Info = z
    .object({
      user: z.string(),
-      hostname: z.string(),
      git: z.boolean(),
      path: z.object({
        config: z.string(),
        data: z.string(),
        root: z.string(),
        cwd: z.string(),
-        state: z.string(),
      }),
      time: z.object({
        initialized: z.number().optional(),
      }),
    })
    .openapi({
-      ref: "App",
+      ref: "App.Info",
    })
  export type Info = z.infer<typeof Info>

-  const ctx = Context.create<{
-    info: Info
-    services: Map<any, { state: any; shutdown?: (input: any) => Promise<void> }>
-  }>("app")
-
-  export const use = ctx.use
+  const ctx = Context.create<Awaited<ReturnType<typeof create>>>("app")

  const APP_JSON = "app.json"

-  export type Input = {
-    cwd: string
-  }
-
-  export const provideExisting = ctx.provide
-  export async function provide<T>(input: Input, cb: (app: App.Info) => Promise<T>) {
+  async function create(input: { cwd: string; version: string }) {
    log.info("creating", {
      cwd: input.cwd,
    })
-    const git = await Filesystem.findUp(".git", input.cwd).then(([x]) => (x ? path.dirname(x) : undefined))
+    const git = await Filesystem.findUp(".git", input.cwd).then(([x]) =>
+      x ? path.dirname(x) : undefined,
+    )
    log.info("git", { git })

-    const data = path.join(Global.Path.data, "project", git ? directory(git) : "global")
+    const data = path.join(
+      Global.Path.data,
+      "project",
+      git ? git.split(path.sep).join("-") : "global",
+    )
    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<
@@ -67,40 +62,26 @@ export namespace App {
      }
    >()

-    const root = git ?? input.cwd
-
    const info: Info = {
      user: os.userInfo().username,
-      hostname: os.hostname(),
      time: {
        initialized: state.initialized,
      },
      git: git !== undefined,
      path: {
        config: Global.Path.config,
-        state: Global.Path.state,
        data,
-        root,
+        root: git ?? input.cwd,
        cwd: input.cwd,
      },
    }
-    const app = {
+    const result = {
+      version: input.version,
      services,
      info,
    }

-    return ctx.provide(app, async () => {
-      try {
-        const result = await cb(app.info)
-        return result
-      } finally {
-        for (const [key, entry] of app.services.entries()) {
-          if (!entry.shutdown) continue
-          log.info("shutdown", { name: key })
-          await entry.shutdown?.(await entry.state)
-        }
-      }
-    })
+    return result
  }

  export function state<State>(
@@ -126,22 +107,31 @@ export namespace App {
    return ctx.use().info
  }

+  export async function provide<T>(
+    input: { cwd: string; version: string },
+    cb: (app: Info) => Promise<T>,
+  ) {
+    const app = await create(input)
+    return ctx.provide(app, async () => {
+      const result = await cb(app.info)
+      for (const [key, entry] of app.services.entries()) {
+        if (!entry.shutdown) continue
+        log.info("shutdown", { name: key })
+        await entry.shutdown?.(await entry.state)
+      }
+      return result
+    })
+  }
+
  export async function initialize() {
-    const { info } = ctx.use()
+    const { info, version } = ctx.use()
    info.time.initialized = Date.now()
    await Bun.write(
      path.join(info.path.data, APP_JSON),
      JSON.stringify({
+        version,
        initialized: Date.now(),
      }),
    )
  }
-
-  function directory(input: string): string {
-    return input
-      .split(path.sep)
-      .filter(Boolean)
-      .join("-")
-      .replace(/[^A-Za-z0-9_]/g, "-")
-  }
 }
@@ -1,4 +1,5 @@
 import { generatePKCE } from "@openauthjs/openauth/pkce"
+import fs from "fs/promises"
 import { Auth } from "./index"

 export namespace AuthAnthropic {
@@ -8,10 +9,16 @@ 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", CLIENT_ID)
+    url.searchParams.set("client_id", "9d1c250a-e61b-44d9-88ed-5944d1962f5e")
    url.searchParams.set("response_type", "code")
-    url.searchParams.set("redirect_uri", "https://console.anthropic.com/oauth/code/callback")
-    url.searchParams.set("scope", "org:create_api_key user:profile user:inference")
+    url.searchParams.set(
+      "redirect_uri",
+      "https://console.anthropic.com/oauth/code/callback",
+    )
+    url.searchParams.set(
+      "scope",
+      "org:create_api_key user:profile user:inference",
+    )
    url.searchParams.set("code_challenge", pkce.challenge)
    url.searchParams.set("code_challenge_method", "S256")
    url.searchParams.set("state", pkce.verifier)
@@ -32,7 +39,7 @@ export namespace AuthAnthropic {
        code: splits[0],
        state: splits[1],
        grant_type: "authorization_code",
-        client_id: CLIENT_ID,
+        client_id: "9d1c250a-e61b-44d9-88ed-5944d1962f5e",
        redirect_uri: "https://console.anthropic.com/oauth/code/callback",
        code_verifier: verifier,
      }),
@@ -42,7 +49,6 @@ 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,
    })
  }
@@ -50,24 +56,25 @@ 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", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
+    const response = await fetch(
+      "https://console.anthropic.com/v1/oauth/token",
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          grant_type: "refresh_token",
+          refresh_token: info.refresh,
+          client_id: CLIENT_ID,
+        }),
      },
-      body: JSON.stringify({
-        grant_type: "refresh_token",
-        refresh_token: info.refresh,
-        client_id: CLIENT_ID,
-      }),
-    })
+    )
    if (!response.ok) return
    const json = await response.json()
    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
@@ -1,18 +0,0 @@
-import { Global } from "../global"
-import { lazy } from "../util/lazy"
-import path from "path"
-
-export const AuthCopilot = lazy(async () => {
-  const file = Bun.file(path.join(Global.Path.state, "plugin", "copilot.ts"))
-  const response = fetch("https://raw.githubusercontent.com/sst/opencode-github-copilot/refs/heads/main/auth.ts")
-    .then((x) => Bun.write(file, x))
-    .catch(() => {})
-
-  if (!file.exists()) {
-    const worked = await response
-    if (!worked) return
-  }
-  const result = await import(file.name!).catch(() => {})
-  if (!result) return
-  return result.AuthCopilot
-})
@@ -1,147 +0,0 @@
-import { z } from "zod"
-import { Auth } from "./index"
-import { NamedError } from "../util/error"
-
-export namespace AuthGithubCopilot {
-  const CLIENT_ID = "Iv1.b507a08c87ecfe98"
-  const DEVICE_CODE_URL = "https://github.com/login/device/code"
-  const ACCESS_TOKEN_URL = "https://github.com/login/oauth/access_token"
-  const COPILOT_API_KEY_URL = "https://api.github.com/copilot_internal/v2/token"
-
-  interface DeviceCodeResponse {
-    device_code: string
-    user_code: string
-    verification_uri: string
-    expires_in: number
-    interval: number
-  }
-
-  interface AccessTokenResponse {
-    access_token?: string
-    error?: string
-    error_description?: string
-  }
-
-  interface CopilotTokenResponse {
-    token: string
-    expires_at: number
-    refresh_in: number
-    endpoints: {
-      api: string
-    }
-  }
-
-  export async function authorize() {
-    const deviceResponse = await fetch(DEVICE_CODE_URL, {
-      method: "POST",
-      headers: {
-        Accept: "application/json",
-        "Content-Type": "application/json",
-        "User-Agent": "GitHubCopilotChat/0.26.7",
-      },
-      body: JSON.stringify({
-        client_id: CLIENT_ID,
-        scope: "read:user",
-      }),
-    })
-    const deviceData: DeviceCodeResponse = await deviceResponse.json()
-    return {
-      device: deviceData.device_code,
-      user: deviceData.user_code,
-      verification: deviceData.verification_uri,
-      interval: deviceData.interval || 5,
-      expiry: deviceData.expires_in,
-    }
-  }
-
-  export async function poll(device_code: string) {
-    const response = await fetch(ACCESS_TOKEN_URL, {
-      method: "POST",
-      headers: {
-        Accept: "application/json",
-        "Content-Type": "application/json",
-        "User-Agent": "GitHubCopilotChat/0.26.7",
-      },
-      body: JSON.stringify({
-        client_id: CLIENT_ID,
-        device_code,
-        grant_type: "urn:ietf:params:oauth:grant-type:device_code",
-      }),
-    })
-
-    if (!response.ok) return "failed"
-
-    const data: AccessTokenResponse = await response.json()
-
-    if (data.access_token) {
-      // Store the GitHub OAuth token
-      await Auth.set("github-copilot", {
-        type: "oauth",
-        refresh: data.access_token,
-        access: "",
-        expires: 0,
-      })
-      return "complete"
-    }
-
-    if (data.error === "authorization_pending") return "pending"
-
-    if (data.error) return "failed"
-
-    return "pending"
-  }
-
-  export async function access() {
-    const info = await Auth.get("github-copilot")
-    if (!info || info.type !== "oauth") return
-    if (info.access && info.expires > Date.now()) return info.access
-
-    // Get new Copilot API token
-    const response = await fetch(COPILOT_API_KEY_URL, {
-      headers: {
-        Accept: "application/json",
-        Authorization: `Bearer ${info.refresh}`,
-        "User-Agent": "GitHubCopilotChat/0.26.7",
-        "Editor-Version": "vscode/1.99.3",
-        "Editor-Plugin-Version": "copilot-chat/0.26.7",
-      },
-    })
-
-    if (!response.ok) return
-
-    const tokenData: CopilotTokenResponse = await response.json()
-
-    // Store the Copilot API token
-    await Auth.set("github-copilot", {
-      type: "oauth",
-      refresh: info.refresh,
-      access: tokenData.token,
-      expires: tokenData.expires_at * 1000,
-    })
-
-    return tokenData.token
-  }
-
-  export const DeviceCodeError = NamedError.create("DeviceCodeError", z.object({}))
-
-  export const TokenExchangeError = NamedError.create(
-    "TokenExchangeError",
-    z.object({
-      message: z.string(),
-    }),
-  )
-
-  export const AuthenticationError = NamedError.create(
-    "AuthenticationError",
-    z.object({
-      message: z.string(),
-    }),
-  )
-
-  export const CopilotTokenError = NamedError.create(
-    "CopilotTokenError",
-    z.object({
-      message: z.string(),
-    }),
-  )
-}
@@ -7,7 +7,6 @@ export namespace Auth {
  export const Oauth = z.object({
    type: z.literal("oauth"),
    refresh: z.string(),
-    access: z.string(),
    expires: z.number(),
  })

@@ -1,17 +1,14 @@
-import { z } from "zod"
-import { Global } from "../global"
 import { Log } from "../util/log"
-import path from "path"
-import { NamedError } from "../util/error"
-import { readableStreamToText } from "bun"
-
 export namespace BunProc {
  const log = Log.create({ service: "bun" })

-  export async function run(cmd: string[], options?: Bun.SpawnOptions.OptionsObject<any, any, any>) {
+  export async function run(
+    cmd: string[],
+    options?: Bun.SpawnOptions.OptionsObject<any, any, any>,
+  ) {
    log.info("running", {
      cmd: [which(), ...cmd],
-      ...options,
+      options,
    })
    const result = Bun.spawn([which(), ...cmd], {
      ...options,
@@ -24,21 +21,6 @@ export namespace BunProc {
      },
    })
    const code = await result.exited
-    const stdout = result.stdout
-      ? typeof result.stdout === "number"
-        ? result.stdout
-        : await readableStreamToText(result.stdout)
-      : undefined
-    const stderr = result.stderr
-      ? typeof result.stderr === "number"
-        ? result.stderr
-        : await readableStreamToText(result.stderr)
-      : undefined
-    log.info("done", {
-      code,
-      stdout,
-      stderr,
-    })
    if (code !== 0) {
      throw new Error(`Command failed with exit code ${result.exitCode}`)
    }
@@ -48,34 +30,4 @@ export namespace BunProc {
  export function which() {
    return process.execPath
  }
-
-  export const InstallFailedError = NamedError.create(
-    "BunInstallFailedError",
-    z.object({
-      pkg: z.string(),
-      version: z.string(),
-    }),
-  )
-
-  export async function install(pkg: string, version = "latest") {
-    const mod = path.join(Global.Path.cache, "node_modules", pkg)
-    const pkgjson = Bun.file(path.join(Global.Path.cache, "package.json"))
-    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, "--registry=https://registry.npmjs.org"], {
-      cwd: Global.Path.cache,
-    }).catch((e) => {
-      throw new InstallFailedError(
-        { pkg, version },
-        {
-          cause: e,
-        },
-      )
-    })
-    return mod
-  }
 }
@@ -18,7 +18,10 @@ export namespace Bus {

  const registry = new Map<string, EventDefinition>()

-  export function event<Type extends string, Properties extends ZodType>(type: Type, properties: Properties) {
+  export function event<Type extends string, Properties extends ZodType>(
+    type: Type,
+    properties: Properties,
+  ) {
    const result = {
      type,
      properties,
@@ -46,7 +49,7 @@ export namespace Bus {
    )
  }

-  export async function publish<Definition extends EventDefinition>(
+  export function publish<Definition extends EventDefinition>(
    def: Definition,
    properties: z.output<Definition["properties"]>,
  ) {
@@ -57,19 +60,20 @@ export namespace Bus {
    log.info("publishing", {
      type: def.type,
    })
-    const pending = []
    for (const key of [def.type, "*"]) {
      const match = state().subscriptions.get(key)
      for (const sub of match ?? []) {
-        pending.push(sub(payload))
+        sub(payload)
      }
    }
-    return Promise.all(pending)
  }

  export function subscribe<Definition extends EventDefinition>(
    def: Definition,
-    callback: (event: { type: Definition["type"]; properties: z.infer<Definition["properties"]> }) => void,
+    callback: (event: {
+      type: Definition["type"]
+      properties: z.infer<Definition["properties"]>
+    }) => void,
  ) {
    return raw(def.type, callback)
  }
@@ -1,18 +0,0 @@
-import { App } from "../app/app"
-import { ConfigHooks } from "../config/hooks"
-import { FileWatcher } from "../file/watch"
-import { Format } from "../format"
-import { LSP } from "../lsp"
-import { Share } from "../share/share"
-
-export async function bootstrap<T>(input: App.Input, cb: (app: App.Info) => Promise<T>) {
-  return App.provide(input, async (app) => {
-    Share.init()
-    Format.init()
-    ConfigHooks.init()
-    LSP.init()
-    FileWatcher.init()
-
-    return cb(app)
-  })
-}
@@ -1,22 +1,21 @@
 import { AuthAnthropic } from "../../auth/anthropic"
-import { AuthCopilot } from "../../auth/copilot"
 import { Auth } from "../../auth"
 import { cmd } from "./cmd"
 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"
-import path from "path"
-import os from "os"
-import { Global } from "../../global"

 export const AuthCommand = cmd({
  command: "auth",
  describe: "manage credentials",
  builder: (yargs) =>
-    yargs.command(AuthLoginCommand).command(AuthLogoutCommand).command(AuthListCommand).demandCommand(),
-  async handler() {},
+    yargs
+      .command(AuthLoginCommand)
+      .command(AuthLogoutCommand)
+      .command(AuthListCommand)
+      .demandCommand(),
+  async handler(args) {},
 })

 export const AuthListCommand = cmd({
@@ -25,107 +24,45 @@ export const AuthListCommand = cmd({
  describe: "list providers",
  async handler() {
    UI.empty()
-    const authPath = path.join(Global.Path.data, "auth.json")
-    const homedir = os.homedir()
-    const displayPath = authPath.startsWith(homedir) ? authPath.replace(homedir, "~") : authPath
-    prompts.intro(`Credentials ${UI.Style.TEXT_DIM}${displayPath}`)
+    prompts.intro("Credentials")
    const results = await Auth.all().then((x) => Object.entries(x))
    const database = await ModelsDev.get()

    for (const [providerID, result] of results) {
      const name = database[providerID]?.name || providerID
-      prompts.log.info(`${name} ${UI.Style.TEXT_DIM}${result.type}`)
+      prompts.log.info(`${name} ${UI.Style.TEXT_DIM}(${result.type})`)
    }

    prompts.outro(`${results.length} credentials`)
-
-    // Environment variables section
-    const activeEnvVars: Array<{ provider: string; envVar: string }> = []
-
-    for (const [providerID, provider] of Object.entries(database)) {
-      for (const envVar of provider.env) {
-        if (process.env[envVar]) {
-          activeEnvVars.push({
-            provider: provider.name || providerID,
-            envVar,
-          })
-        }
-      }
-    }
-
-    if (activeEnvVars.length > 0) {
-      UI.empty()
-      prompts.intro("Environment")
-
-      for (const { provider, envVar } of activeEnvVars) {
-        prompts.log.info(`${provider} ${UI.Style.TEXT_DIM}${envVar}`)
-      }
-
-      prompts.outro(`${activeEnvVars.length} environment variables`)
-    }
  },
 })

 export const AuthLoginCommand = cmd({
  command: "login",
-  describe: "log in to a provider",
+  describe: "login to a provider",
  async handler() {
    UI.empty()
    prompts.intro("Add credential")
-    const providers = await ModelsDev.get()
-    const priority: Record<string, number> = {
-      anthropic: 0,
-      "github-copilot": 1,
-      openai: 2,
-      google: 3,
-    }
-    let provider = await prompts.select({
+    const provider = await prompts.select({
      message: "Select provider",
-      maxItems: 8,
+      maxItems: 2,
      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,
-          })),
-        ),
        {
-          value: "other",
-          label: "Other",
+          label: "Anthropic",
+          value: "anthropic",
+        },
+        {
+          label: "OpenAI",
+          value: "openai",
+        },
+        {
+          label: "Google",
+          value: "google",
        },
      ],
    })
-
    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",
@@ -146,14 +83,8 @@ 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("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.note("Opening browser...")
+        await open(url)
        prompts.log.info(url)

        const code = await prompts.text({
@@ -174,40 +105,6 @@ export const AuthLoginCommand = cmd({
      }
    }

-    const copilot = await AuthCopilot()
-    if (provider === "github-copilot" && copilot) {
-      await new Promise((resolve) => setTimeout(resolve, 10))
-      const deviceInfo = await copilot.authorize()
-
-      prompts.note(`Please visit: ${deviceInfo.verification}\nEnter code: ${deviceInfo.user}`)
-
-      const spinner = prompts.spinner()
-      spinner.start("Waiting for authorization...")
-
-      while (true) {
-        await new Promise((resolve) => setTimeout(resolve, deviceInfo.interval * 1000))
-        const response = await copilot.poll(deviceInfo.device)
-        if (response.status === "pending") continue
-        if (response.status === "success") {
-          await Auth.set("github-copilot", {
-            type: "oauth",
-            refresh: response.refresh,
-            access: response.access,
-            expires: response.expires,
-          })
-          spinner.stop("Login successful")
-          break
-        }
-        if (response.status === "failed") {
-          spinner.stop("Failed to authorize", 1)
-          break
-        }
-      }
-
-      prompts.outro("Done")
-      return
-    }
-
    const key = await prompts.password({
      message: "Enter your API key",
      validate: (x) => (x.length > 0 ? undefined : "Required"),
@@ -224,7 +121,7 @@ export const AuthLoginCommand = cmd({

 export const AuthLogoutCommand = cmd({
  command: "logout",
-  describe: "log out from a configured provider",
+  describe: "logout from a configured provider",
  async handler() {
    UI.empty()
    const credentials = await Auth.all().then((x) => Object.entries(x))
@@ -237,7 +134,12 @@ export const AuthLogoutCommand = cmd({
    const providerID = await prompts.select({
      message: "Select provider",
      options: credentials.map(([key, value]) => ({
-        label: (database[key]?.name || key) + UI.Style.TEXT_DIM + " (" + value.type + ")",
+        label:
+          (database[key]?.name || key) +
+          UI.Style.TEXT_DIM +
+          " (" +
+          value.type +
+          ")",
        value: key,
      })),
    })
@@ -1,36 +0,0 @@
-import { File } from "../../../file"
-import { bootstrap } from "../../bootstrap"
-import { cmd } from "../cmd"
-
-const FileReadCommand = cmd({
-  command: "read <path>",
-  builder: (yargs) =>
-    yargs.positional("path", {
-      type: "string",
-      demandOption: true,
-      description: "File path to read",
-    }),
-  async handler(args) {
-    await bootstrap({ cwd: process.cwd() }, async () => {
-      const content = await File.read(args.path)
-      console.log(content)
-    })
-  },
-})
-
-const FileStatusCommand = cmd({
-  command: "status",
-  builder: (yargs) => yargs,
-  async handler() {
-    await bootstrap({ cwd: process.cwd() }, async () => {
-      const status = await File.status()
-      console.log(JSON.stringify(status, null, 2))
-    })
-  },
-})
-
-export const FileCommand = cmd({
-  command: "file",
-  builder: (yargs) => yargs.command(FileReadCommand).command(FileStatusCommand).demandCommand(),
-  async handler() {},
-})
@@ -1,26 +0,0 @@
-import { bootstrap } from "../../bootstrap"
-import { cmd } from "../cmd"
-import { FileCommand } from "./file"
-import { LSPCommand } from "./lsp"
-import { RipgrepCommand } from "./ripgrep"
-import { SnapshotCommand } from "./snapshot"
-
-export const DebugCommand = cmd({
-  command: "debug",
-  builder: (yargs) =>
-    yargs
-      .command(LSPCommand)
-      .command(RipgrepCommand)
-      .command(FileCommand)
-      .command(SnapshotCommand)
-      .command({
-        command: "wait",
-        async handler() {
-          await bootstrap({ cwd: process.cwd() }, async () => {
-            await new Promise((resolve) => setTimeout(resolve, 1_000 * 60 * 60 * 24))
-          })
-        },
-      })
-      .demandCommand(),
-  async handler() {},
-})
@@ -1,34 +0,0 @@
-import { LSP } from "../../../lsp"
-import { bootstrap } from "../../bootstrap"
-import { cmd } from "../cmd"
-import { Log } from "../../../util/log"
-
-export const LSPCommand = cmd({
-  command: "lsp",
-  builder: (yargs) => yargs.command(DiagnosticsCommand).command(SymbolsCommand).demandCommand(),
-  async handler() {},
-})
-
-const DiagnosticsCommand = cmd({
-  command: "diagnostics <file>",
-  builder: (yargs) => yargs.positional("file", { type: "string", demandOption: true }),
-  async handler(args) {
-    await bootstrap({ cwd: process.cwd() }, async () => {
-      await LSP.touchFile(args.file, true)
-      console.log(await LSP.diagnostics())
-    })
-  },
-})
-
-export const SymbolsCommand = cmd({
-  command: "symbols <query>",
-  builder: (yargs) => yargs.positional("query", { type: "string", demandOption: true }),
-  async handler(args) {
-    await bootstrap({ cwd: process.cwd() }, async () => {
-      await LSP.touchFile("./src/index.ts", true)
-      using _ = Log.Default.time("symbols")
-      const results = await LSP.workspaceSymbol(args.query)
-      console.log(JSON.stringify(results, null, 2))
-    })
-  },
-})
@@ -1,82 +0,0 @@
-import { App } from "../../../app/app"
-import { Ripgrep } from "../../../file/ripgrep"
-import { bootstrap } from "../../bootstrap"
-import { cmd } from "../cmd"
-
-export const RipgrepCommand = cmd({
-  command: "rg",
-  builder: (yargs) => yargs.command(TreeCommand).command(FilesCommand).command(SearchCommand).demandCommand(),
-  async handler() {},
-})
-
-const TreeCommand = cmd({
-  command: "tree",
-  builder: (yargs) =>
-    yargs.option("limit", {
-      type: "number",
-    }),
-  async handler(args) {
-    await bootstrap({ cwd: process.cwd() }, async () => {
-      const app = App.info()
-      console.log(await Ripgrep.tree({ cwd: app.path.cwd, limit: args.limit }))
-    })
-  },
-})
-
-const FilesCommand = cmd({
-  command: "files",
-  builder: (yargs) =>
-    yargs
-      .option("query", {
-        type: "string",
-        description: "Filter files by query",
-      })
-      .option("glob", {
-        type: "string",
-        description: "Glob pattern to match files",
-      })
-      .option("limit", {
-        type: "number",
-        description: "Limit number of results",
-      }),
-  async handler(args) {
-    await bootstrap({ cwd: process.cwd() }, async () => {
-      const app = App.info()
-      const files = await Ripgrep.files({
-        cwd: app.path.cwd,
-        query: args.query,
-        glob: args.glob,
-        limit: args.limit,
-      })
-      console.log(files.join("\n"))
-    })
-  },
-})
-
-const SearchCommand = cmd({
-  command: "search <pattern>",
-  builder: (yargs) =>
-    yargs
-      .positional("pattern", {
-        type: "string",
-        demandOption: true,
-        description: "Search pattern",
-      })
-      .option("glob", {
-        type: "array",
-        description: "File glob patterns",
-      })
-      .option("limit", {
-        type: "number",
-        description: "Limit number of results",
-      }),
-  async handler(args) {
-    const results = await Ripgrep.search({
-      cwd: process.cwd(),
-      pattern: args.pattern,
-      glob: args.glob as string[] | undefined,
-      limit: args.limit,
-    })
-    console.log(JSON.stringify(results, null, 2))
-  },
-})
@@ -1,35 +0,0 @@
-import { Snapshot } from "../../../snapshot"
-import { bootstrap } from "../../bootstrap"
-import { cmd } from "../cmd"
-
-export const SnapshotCommand = cmd({
-  command: "snapshot",
-  builder: (yargs) => yargs.command(SnapshotCreateCommand).command(SnapshotRestoreCommand).demandCommand(),
-  async handler() {},
-})
-
-export const SnapshotCreateCommand = cmd({
-  command: "create",
-  async handler() {
-    await bootstrap({ cwd: process.cwd() }, async () => {
-      const result = await Snapshot.create("test")
-      console.log(result)
-    })
-  },
-})
-
-export const SnapshotRestoreCommand = cmd({
-  command: "restore <commit>",
-  builder: (yargs) =>
-    yargs.positional("commit", {
-      type: "string",
-      description: "commit",
-      demandOption: true,
-    }),
-  async handler(args) {
-    await bootstrap({ cwd: process.cwd() }, async () => {
-      await Snapshot.restore("test", args.commit)
-      console.log("restored")
-    })
-  },
-})
@@ -10,6 +10,9 @@ export const GenerateCommand = {
    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))
+    await Bun.write(
+      path.join(dir, "openapi.json"),
+      JSON.stringify(specs, null, 2),
+    )
  },
 } satisfies CommandModule
@@ -0,0 +1,20 @@
+import { AuthAnthropic } from "../../auth/anthropic"
+import { UI } from "../ui"
+
+// Example: https://claude.ai/oauth/authorize?code=true&client_id=9d1c250a-e61b-44d9-88ed-5944d1962f5e&response_type=code&redirect_uri=https%3A%2F%2Fconsole.anthropic.com%2Foauth%2Fcode%2Fcallback&scope=org%3Acreate_api_key+user%3Aprofile+user%3Ainference&code_challenge=MdFtFgFap23AWDSN0oa3-eaKjQRFE4CaEhXx8M9fHZg&code_challenge_method=S256&state=rKLtaDzm88GSwekyEqdi0wXX-YqIr13tSzYymSzpvfs
+
+export const LoginAnthropicCommand = {
+  command: "anthropic",
+  describe: "Login to Anthropic",
+  handler: 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)
+  },
+}
@@ -1,19 +0,0 @@
-import { App } from "../../app/app"
-import { Provider } from "../../provider/provider"
-import { cmd } from "./cmd"
-
-export const ModelsCommand = cmd({
-  command: "models",
-  describe: "list all available models",
-  handler: async () => {
-    await App.provide({ cwd: process.cwd() }, async () => {
-      const providers = await Provider.list()
-
-      for (const [providerID, provider] of Object.entries(providers)) {
-        for (const modelID of Object.keys(provider.info.models)) {
-          console.log(`${providerID}/${modelID}`)
-        }
-      }
-    })
-  },
-})
@@ -1,147 +1,133 @@
 import type { Argv } from "yargs"
+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 { UI } from "../ui"
-import { cmd } from "./cmd"
-import { Flag } from "../../flag/flag"
-import { Config } from "../../config/config"
-import { bootstrap } from "../bootstrap"
-import { MessageV2 } from "../../session/message-v2"
+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,
+]

 const TOOL: Record<string, [string, string]> = {
-  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],
+  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],
 }

-export const RunCommand = cmd({
+export const RunCommand = {
  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",
+        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) => {
-    let message = args.message.join(" ")
+  handler: async (args: {
+    message: string[]
+    session?: string
+    printLogs?: boolean
+  }) => {
+    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()

-    if (!process.stdin.isTTY) message += "\n" + (await Bun.stdin.text())
-
-    await bootstrap({ cwd: process.cwd() }, async () => {
-      const session = await (async () => {
-        if (args.continue) {
-          const first = await Session.list().next()
-          if (first.done) return
-          return first.value
-        }
-
-        if (args.session) return Session.get(args.session)
-
-        return Session.create()
-      })()
-
-      if (!session) {
-        UI.error("Session not found")
-        return
-      }
-
-      const isPiped = !process.stdout.isTTY
-
-      UI.empty()
-      UI.println(UI.logo())
-      UI.empty()
-      const displayMessage = message.length > 300 ? message.slice(0, 300) + "..." : message
-      UI.println(UI.Style.TEXT_NORMAL_BOLD + "> ", displayMessage)
-      UI.empty()
-
-      const cfg = await Config.get()
-      if (cfg.autoshare || Flag.OPENCODE_AUTO_SHARE || args.share) {
-        await Session.share(session.id)
-        UI.println(UI.Style.TEXT_INFO_BOLD + "~  https://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()
-
-      function printEvent(color: string, type: string, title: string) {
+        UI.println(UI.Style.TEXT_HIGHLIGHT_BOLD + "◍  OpenCode", VERSION)
+        UI.empty()
+        UI.println(UI.Style.TEXT_NORMAL_BOLD + "> ", message)
+        UI.empty()
        UI.println(
-          color + `|`,
-          UI.Style.TEXT_NORMAL + UI.Style.TEXT_DIM + ` ${type.padEnd(7, " ")}`,
-          "",
-          UI.Style.TEXT_NORMAL + title,
+          UI.Style.TEXT_INFO_BOLD +
+            "~  https://dev.opencode.ai/s/" +
+            session.id.slice(-8),
        )
-      }
+        UI.empty()

-      Bus.subscribe(MessageV2.Event.PartUpdated, async (evt) => {
-        if (evt.properties.sessionID !== session.id) return
-        const part = evt.properties.part
-
-        if (part.type === "tool" && part.state.status === "completed") {
-          const [tool, color] = TOOL[part.tool] ?? [part.tool, UI.Style.TEXT_INFO_BOLD]
-          printEvent(color, tool, part.state.title || "Unknown")
+        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,
+          )
        }

-        if (part.type === "text") {
-          if (part.text.includes("\n")) {
-            UI.empty()
-            UI.println(part.text)
-            UI.empty()
-            return
+        Bus.subscribe(Message.Event.PartUpdated, async (evt) => {
+          if (evt.properties.sessionID !== session.id) return
+          const part = evt.properties.part
+          const message = await Session.getMessage(
+            evt.properties.sessionID,
+            evt.properties.messageID,
+          )
+
+          if (
+            part.type === "tool-invocation" &&
+            part.toolInvocation.state === "result"
+          ) {
+            const metadata =
+              message.metadata.tool[part.toolInvocation.toolCallId]
+            const [tool, color] = TOOL[part.toolInvocation.toolName] ?? [
+              part.toolInvocation.toolName,
+              UI.Style.TEXT_INFO_BOLD,
+            ]
+            printEvent(color, tool, metadata.title)
          }
-          printEvent(UI.Style.TEXT_NORMAL_BOLD, "Text", part.text)
-        }
-      })

-      const result = await Session.chat({
-        sessionID: session.id,
-        providerID,
-        modelID,
-        parts: [
-          {
-            type: "text",
-            text: message,
-          },
-        ],
-      })
+          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)
+          }
+        })

-      if (isPiped) {
-        const match = result.parts.findLast((x) => x.type === "text")
-        if (match) process.stdout.write(match.text)
-      }
-      UI.empty()
-    })
+        const { providerID, modelID } = await Provider.defaultModel()
+        await Session.chat({
+          sessionID: session.id,
+          providerID,
+          modelID,
+          parts: [
+            {
+              type: "text",
+              text: message,
+            },
+          ],
+        })
+        UI.empty()
+      },
+    )
  },
-})
+}
@@ -0,0 +1,14 @@
+import { App } from "../../app/app"
+import { VERSION } from "../version"
+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)
+    })
+  },
+})
@@ -1,48 +0,0 @@
-import { Provider } from "../../provider/provider"
-import { Server } from "../../server/server"
-import { Share } from "../../share/share"
-import { bootstrap } from "../bootstrap"
-import { cmd } from "./cmd"
-
-export const ServeCommand = cmd({
-  command: "serve",
-  builder: (yargs) =>
-    yargs
-      .option("port", {
-        alias: ["p"],
-        type: "number",
-        describe: "port to listen on",
-        default: 4096,
-      })
-      .option("hostname", {
-        alias: ["h"],
-        type: "string",
-        describe: "hostname to listen on",
-        default: "127.0.0.1",
-      }),
-  describe: "starts a headless opencode server",
-  handler: async (args) => {
-    const cwd = process.cwd()
-    await bootstrap({ cwd }, async () => {
-      const providers = await Provider.list()
-      if (Object.keys(providers).length === 0) {
-        return "needs_provider"
-      }
-
-      const hostname = args.hostname
-      const port = args.port
-
-      await Share.init()
-      const server = Server.listen({
-        port,
-        hostname,
-      })
-
-      console.log(`opencode server listening on http://${server.hostname}:${server.port}`)
-
-      await new Promise(() => {})
-
-      server.stop()
-    })
-  },
-})
@@ -1,153 +0,0 @@
-import { Global } from "../../global"
-import { Provider } from "../../provider/provider"
-import { Server } from "../../server/server"
-import { bootstrap } from "../bootstrap"
-import { UI } from "../ui"
-import { cmd } from "./cmd"
-import path from "path"
-import fs from "fs/promises"
-import { Installation } from "../../installation"
-import { Config } from "../../config/config"
-import { Bus } from "../../bus"
-import { Log } from "../../util/log"
-
-export const TuiCommand = cmd({
-  command: "$0 [project]",
-  describe: "start opencode tui",
-  builder: (yargs) =>
-    yargs
-      .positional("project", {
-        type: "string",
-        describe: "path to start opencode in",
-      })
-      .option("model", {
-        type: "string",
-        alias: ["m"],
-        describe: "model to use in the format of provider/model",
-      })
-      .option("prompt", {
-        alias: ["p"],
-        type: "string",
-        describe: "prompt to use",
-      }),
-  handler: async (args) => {
-    while (true) {
-      const cwd = args.project ? path.resolve(args.project) : process.cwd()
-      try {
-        process.chdir(cwd)
-      } catch (e) {
-        UI.error("Failed to change directory to " + cwd)
-        return
-      }
-      const result = await bootstrap({ cwd }, async (app) => {
-        const providers = await Provider.list()
-        if (Object.keys(providers).length === 0) {
-          return "needs_provider"
-        }
-
-        const server = Server.listen({
-          port: 0,
-          hostname: "127.0.0.1",
-        })
-
-        let cmd = ["go", "run", "./main.go"]
-        let cwd = Bun.fileURLToPath(new URL("../../../../tui/cmd/opencode", import.meta.url))
-        if (Bun.embeddedFiles.length > 0) {
-          const blob = Bun.embeddedFiles[0] as File
-          let binaryName = blob.name
-          if (process.platform === "win32" && !binaryName.endsWith(".exe")) {
-            binaryName += ".exe"
-          }
-          const binary = path.join(Global.Path.cache, "tui", binaryName)
-          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]
-        }
-        Log.Default.info("tui", {
-          cmd,
-        })
-        const proc = Bun.spawn({
-          cmd: [
-            ...cmd,
-            ...(args.model ? ["--model", args.model] : []),
-            ...(args.prompt ? ["--prompt", args.prompt] : []),
-          ],
-          cwd,
-          stdout: "inherit",
-          stderr: "inherit",
-          stdin: "inherit",
-          env: {
-            ...process.env,
-            OPENCODE_SERVER: server.url.toString(),
-            OPENCODE_APP_INFO: JSON.stringify(app),
-          },
-          onExit: () => {
-            server.stop()
-          },
-        })
-
-        ;(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().catch(() => {})
-          if (!latest) return
-          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(() => {})
-        })()
-
-        await proc.exited
-        server.stop()
-
-        return "done"
-      })
-      if (result === "done") break
-      if (result === "needs_provider") {
-        UI.empty()
-        UI.println(UI.logo("   "))
-        const result = await Bun.spawn({
-          cmd: [...getOpencodeCommand(), "auth", "login"],
-          cwd: process.cwd(),
-          stdout: "inherit",
-          stderr: "inherit",
-          stdin: "inherit",
-        }).exited
-        if (result !== 0) return
-        UI.empty()
-      }
-    }
-  },
-})
-
-/**
- * Get the correct command to run opencode CLI
- * In development: ["bun", "run", "packages/opencode/src/index.ts"]
- * In production: ["/path/to/opencode"]
- */
-function getOpencodeCommand(): string[] {
-  // Check if OPENCODE_BIN_PATH is set (used by shell wrapper scripts)
-  if (process.env["OPENCODE_BIN_PATH"]) {
-    return [process.env["OPENCODE_BIN_PATH"]]
-  }
-
-  const execPath = process.execPath.toLowerCase()
-
-  if (Installation.isDev()) {
-    // In development, use bun to run the TypeScript entry point
-    return [execPath, "run", process.argv[1]]
-  }
-
-  // In production, use the current executable path
-  return [process.execPath]
-}
@@ -1,57 +0,0 @@
-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 or a specific version",
-  builder: (yargs: Argv) => {
-    return yargs
-      .positional("target", {
-        describe: "version to upgrade to, for ex '0.1.48' or 'v0.1.48'",
-        type: "string",
-      })
-      .option("method", {
-        alias: "m",
-        describe: "installation method to use",
-        type: "string",
-        choices: ["curl", "npm", "pnpm", "bun", "brew"],
-      })
-  },
-  handler: async (args: { target?: string; method?: string }) => {
-    UI.empty()
-    UI.println(UI.logo("  "))
-    UI.empty()
-    prompts.intro("Upgrade")
-    const detectedMethod = await Installation.method()
-    const method = (args.method as Installation.Method) ?? detectedMethod
-    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
-    }
-    prompts.log.info("Using method: " + method)
-    const target = args.target ?? (await Installation.latest())
-
-    if (Installation.VERSION === target) {
-      prompts.log.warn(`opencode upgrade skipped: ${target} is already installed`)
-      prompts.outro("Done")
-      return
-    }
-
-    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")
-  },
-}
@@ -1,16 +0,0 @@
-import { Config } from "../config/config"
-import { MCP } from "../mcp"
-import { UI } from "./ui"
-
-export function FormatError(input: unknown) {
-  if (MCP.Failed.isInstance(input))
-    return `MCP server "${input.data.name}" failed. Note, opencode does not support MCP authentication yet.`
-  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")
-
-  if (UI.CancelledError.isInstance(input)) return ""
-}
@@ -0,0 +1,193 @@
+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 })
+}
+
@@ -1,12 +1,11 @@
 import { z } from "zod"
-import { EOL } from "os"
 import { NamedError } from "../util/error"

 export namespace UI {
  const LOGO = [
-    [`█▀▀█ █▀▀█ █▀▀ █▀▀▄ `, `█▀▀ █▀▀█ █▀▀▄ █▀▀`],
-    [`█░░█ █░░█ █▀▀ █░░█ `, `█░░ █░░█ █░░█ █▀▀`],
-    [`▀▀▀▀ █▀▀▀ ▀▀▀ ▀  ▀ `, `▀▀▀ ▀▀▀▀ ▀▀▀  ▀▀▀`],
+    `█▀▀█ █▀▀█ █▀▀ █▀▀▄ █▀▀ █▀▀█ █▀▀▄ █▀▀`,
+    `█░░█ █░░█ █▀▀ █░░█ █░░ █░░█ █░░█ █▀▀`,
+    `▀▀▀▀ █▀▀▀ ▀▀▀ ▀  ▀ ▀▀▀ ▀▀▀▀ ▀▀▀  ▀▀▀`,
  ]

  export const CancelledError = NamedError.create("UICancelledError", z.void())
@@ -30,7 +29,7 @@ export namespace UI {

  export function println(...message: string[]) {
    print(...message)
-    Bun.stderr.write(EOL)
+    Bun.stderr.write("\n")
  }

  export function print(...message: string[]) {
@@ -49,11 +48,13 @@ export namespace UI {
    const result = []
    for (const row of LOGO) {
      if (pad) result.push(pad)
-      result.push(Bun.color("gray", "ansi"))
-      result.push(row[0])
-      result.push("\x1b[0m")
-      result.push(row[1])
-      result.push(EOL)
+      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("\n")
    }
    return result.join("").trimEnd()
  }
@@ -72,8 +73,4 @@ export namespace UI {
      })
    })
  }
-
-  export function error(message: string) {
-    println(Style.TEXT_DANGER_BOLD + "Error: " + Style.TEXT_NORMAL + message)
-  }
 }
@@ -0,0 +1,6 @@
+declare global {
+  const OPENCODE_VERSION: string
+}
+
+export const VERSION =
+  typeof OPENCODE_VERSION === "string" ? OPENCODE_VERSION : "dev"
@@ -1,197 +1,66 @@
 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 = await global()
+    let result: Info = {}
    for (const file of ["opencode.jsonc", "opencode.json"]) {
-      const found = await Filesystem.findUp(file, app.path.cwd, app.path.root)
-      for (const resolved of found.toReversed()) {
-        result = mergeDeep(result, await load(resolved))
+      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
      }
    }
    log.info("loaded", result)
-
    return result
  })

-  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"),
-      enabled: z.boolean().optional().describe("Enable or disable the MCP server on startup"),
-    })
-    .strict()
-    .openapi({
-      ref: "McpLocalConfig",
-    })
+  export const McpLocal = z.object({
+    type: z.literal("local"),
+    command: z.string().array(),
+    environment: z.record(z.string(), z.string()).optional(),
+  })

-  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"),
-      enabled: z.boolean().optional().describe("Enable or disable the MCP server on startup"),
-    })
-    .strict()
-    .openapi({
-      ref: "McpRemoteConfig",
-    })
+  export const McpRemote = z.object({
+    type: z.literal("remote"),
+    url: z.string(),
+  })

  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: "KeybindsConfig",
-    })
  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({
-            models: z.record(ModelsDev.Model.partial()),
-            options: z.record(z.any()).optional(),
-          }),
-        )
-        .optional()
-        .describe("Custom provider configurations and model overrides"),
-      mcp: z.record(z.string(), Mcp).optional().describe("MCP (Model Context Protocol) server configurations"),
-      instructions: z.array(z.string()).optional().describe("Additional instruction files or patterns to include"),
-      experimental: z
+      provider: z.record(z.string(), z.record(z.string(), z.any())).optional(),
+      tool: z
        .object({
-          hook: z
-            .object({
-              file_edited: z
-                .record(
-                  z.string(),
-                  z
-                    .object({
-                      command: z.string().array(),
-                      environment: z.record(z.string(), z.string()).optional(),
-                    })
-                    .array(),
-                )
-                .optional(),
-              session_completed: z
-                .object({
-                  command: z.string().array(),
-                  environment: z.record(z.string(), z.string()).optional(),
-                })
-                .array()
-                .optional(),
-            })
-            .optional(),
+          provider: z.record(z.string(), z.string().array()).optional(),
        })
        .optional(),
+      mcp: z.record(z.string(), Mcp).optional(),
    })
    .strict()
-    .openapi({
-      ref: "Config",
-    })

  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()
  }
@@ -1,52 +0,0 @@
-import { App } from "../app/app"
-import { Bus } from "../bus"
-import { File } from "../file"
-import { Session } from "../session"
-import { Log } from "../util/log"
-import { Config } from "./config"
-import path from "path"
-
-export namespace ConfigHooks {
-  const log = Log.create({ service: "config.hooks" })
-
-  export function init() {
-    log.info("init")
-    const app = App.info()
-
-    Bus.subscribe(File.Event.Edited, async (payload) => {
-      const cfg = await Config.get()
-      const ext = path.extname(payload.properties.file)
-      for (const item of cfg.experimental?.hook?.file_edited?.[ext] ?? []) {
-        log.info("file_edited", {
-          file: payload.properties.file,
-          command: item.command,
-        })
-        Bun.spawn({
-          cmd: item.command.map((x) => x.replace("$FILE", payload.properties.file)),
-          env: item.environment,
-          cwd: app.path.cwd,
-          stdout: "ignore",
-          stderr: "ignore",
-        })
-      }
-    })
-
-    Bus.subscribe(Session.Event.Idle, async () => {
-      const cfg = await Config.get()
-      if (cfg.experimental?.hook?.session_completed) {
-        for (const item of cfg.experimental.hook.session_completed) {
-          log.info("session_completed", {
-            command: item.command,
-          })
-          Bun.spawn({
-            cmd: item.command,
-            cwd: App.info().path.cwd,
-            env: item.environment,
-            stdout: "ignore",
-            stderr: "ignore",
-          })
-        }
-      }
-    })
-  }
-}
@@ -1,3 +1,4 @@
+import { App } from "../app/app"
 import path from "path"
 import { Global } from "../global"
 import fs from "fs/promises"
@@ -45,7 +46,10 @@ export namespace Fzf {
      log.info("found", { filepath })
      return { filepath }
    }
-    filepath = path.join(Global.Path.bin, "fzf" + (process.platform === "win32" ? ".exe" : ""))
+    filepath = path.join(
+      Global.Path.bin,
+      "fzf" + (process.platform === "win32" ? ".exe" : ""),
+    )

    const file = Bun.file(filepath)
    if (!(await file.exists())) {
@@ -53,15 +57,18 @@ export namespace Fzf {
      const arch = archMap[process.arch as keyof typeof archMap] ?? "amd64"

      const config = PLATFORM[process.platform as keyof typeof PLATFORM]
-      if (!config) throw new UnsupportedPlatformError({ platform: process.platform })
+      if (!config)
+        throw new UnsupportedPlatformError({ platform: process.platform })

      const version = VERSION
-      const platformName = process.platform === "win32" ? "windows" : process.platform
+      const platformName =
+        process.platform === "win32" ? "windows" : process.platform
      const filename = `fzf-${version}-${platformName}_${arch}.${config.extension}`
      const url = `https://github.com/junegunn/fzf/releases/download/v${version}/${filename}`

      const response = await fetch(url)
-      if (!response.ok) throw new DownloadFailedError({ url, status: response.status })
+      if (!response.ok)
+        throw new DownloadFailedError({ url, status: response.status })

      const buffer = await response.arrayBuffer()
      const archivePath = path.join(Global.Path.bin, filename)
@@ -80,11 +87,14 @@ export namespace Fzf {
          })
      }
      if (config.extension === "zip") {
-        const proc = Bun.spawn(["unzip", "-j", archivePath, "fzf.exe", "-d", Global.Path.bin], {
-          cwd: Global.Path.bin,
-          stderr: "pipe",
-          stdout: "ignore",
-        })
+        const proc = Bun.spawn(
+          ["unzip", "-j", archivePath, "fzf.exe", "-d", Global.Path.bin],
+          {
+            cwd: Global.Path.bin,
+            stderr: "pipe",
+            stdout: "ignore",
+          },
+        )
        await proc.exited
        if (proc.exitCode !== 0)
          throw new ExtractionFailedError({
@@ -105,4 +115,20 @@ export namespace Fzf {
    const { filepath } = await state()
    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
+      .trim()
+      .split("\n")
+      .filter((line) => line.length > 0)
+  }
 }
@@ -0,0 +1,114 @@
+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"
+
+export namespace Ripgrep {
+  const PLATFORM = {
+    darwin: { platform: "apple-darwin", extension: "tar.gz" },
+    linux: { platform: "unknown-linux-musl", extension: "tar.gz" },
+    win32: { platform: "pc-windows-msvc", extension: "zip" },
+  } as const
+
+  export const ExtractionFailedError = NamedError.create(
+    "RipgrepExtractionFailedError",
+    z.object({
+      filepath: z.string(),
+      stderr: z.string(),
+    }),
+  )
+
+  export const UnsupportedPlatformError = NamedError.create(
+    "RipgrepUnsupportedPlatformError",
+    z.object({
+      platform: z.string(),
+    }),
+  )
+
+  export const DownloadFailedError = NamedError.create(
+    "RipgrepDownloadFailedError",
+    z.object({
+      url: z.string(),
+      status: z.number(),
+    }),
+  )
+
+  const state = lazy(async () => {
+    let filepath = Bun.which("rg")
+    if (filepath) return { filepath }
+    filepath = path.join(
+      Global.Path.bin,
+      "rg" + (process.platform === "win32" ? ".exe" : ""),
+    )
+
+    const file = Bun.file(filepath)
+    if (!(await file.exists())) {
+      const archMap = { x64: "x86_64", arm64: "aarch64" } as const
+      const arch = archMap[process.arch as keyof typeof archMap] ?? process.arch
+
+      const config = PLATFORM[process.platform as keyof typeof PLATFORM]
+      if (!config)
+        throw new UnsupportedPlatformError({ platform: process.platform })
+
+      const version = "14.1.1"
+      const filename = `ripgrep-${version}-${arch}-${config.platform}.${config.extension}`
+      const url = `https://github.com/BurntSushi/ripgrep/releases/download/${version}/${filename}`
+
+      const response = await fetch(url)
+      if (!response.ok)
+        throw new DownloadFailedError({ url, status: response.status })
+
+      const buffer = await response.arrayBuffer()
+      const archivePath = path.join(Global.Path.bin, filename)
+      await Bun.write(archivePath, buffer)
+      if (config.extension === "tar.gz") {
+        const args = ["tar", "-xzf", archivePath, "--strip-components=1"]
+
+        if (process.platform === "darwin") args.push("--include=*/rg")
+        if (process.platform === "linux") args.push("--wildcards", "*/rg")
+
+        const proc = Bun.spawn(args, {
+          cwd: Global.Path.bin,
+          stderr: "pipe",
+          stdout: "pipe",
+        })
+        await proc.exited
+        if (proc.exitCode !== 0)
+          throw new ExtractionFailedError({
+            filepath,
+            stderr: await Bun.readableStreamToText(proc.stderr),
+          })
+      }
+      if (config.extension === "zip") {
+        const proc = Bun.spawn(
+          ["unzip", "-j", archivePath, "*/rg.exe", "-d", Global.Path.bin],
+          {
+            cwd: Global.Path.bin,
+            stderr: "pipe",
+            stdout: "ignore",
+          },
+        )
+        await proc.exited
+        if (proc.exitCode !== 0)
+          throw new ExtractionFailedError({
+            filepath: archivePath,
+            stderr: await Bun.readableStreamToText(proc.stderr),
+          })
+      }
+      await fs.unlink(archivePath)
+      if (process.platform !== "win32") await fs.chmod(filepath, 0o755)
+    }
+
+    return {
+      filepath,
+    }
+  })
+
+  export async function filepath() {
+    const { filepath } = await state()
+    return filepath
+  }
+}
@@ -1,110 +1,10 @@
-import { z } from "zod"
-import { Bus } from "../bus"
-import { $ } from "bun"
-import { createPatch } from "diff"
-import path from "path"
-import * as git from "isomorphic-git"
-import { App } from "../app/app"
-import fs from "fs"
-import { Log } from "../util/log"
-
 export namespace File {
-  const log = Log.create({ service: "file" })
-
-  export const Event = {
-    Edited: Bus.event(
-      "file.edited",
-      z.object({
-        file: z.string(),
-      }),
-    ),
-  }
-
-  export async function status() {
-    const app = App.info()
-    if (!app.git) return []
-
-    const diffOutput = await $`git diff --numstat HEAD`.cwd(app.path.cwd).quiet().nothrow().text()
-
-    const changedFiles = []
-
-    if (diffOutput.trim()) {
-      const lines = diffOutput.trim().split("\n")
-      for (const line of lines) {
-        const [added, removed, filepath] = line.split("\t")
-        changedFiles.push({
-          file: filepath,
-          added: added === "-" ? 0 : parseInt(added, 10),
-          removed: removed === "-" ? 0 : parseInt(removed, 10),
-          status: "modified",
-        })
-      }
+  const glob = new Bun.Glob("**/*")
+  export async function search(path: string, query: string) {
+    for await (const entry of glob.scan({
+      cwd: path,
+      onlyFiles: true,
+    })) {
    }
-
-    const untrackedOutput = await $`git ls-files --others --exclude-standard`.cwd(app.path.cwd).quiet().nothrow().text()
-
-    if (untrackedOutput.trim()) {
-      const untrackedFiles = untrackedOutput.trim().split("\n")
-      for (const filepath of untrackedFiles) {
-        try {
-          const content = await Bun.file(path.join(app.path.root, filepath)).text()
-          const lines = content.split("\n").length
-          changedFiles.push({
-            file: filepath,
-            added: lines,
-            removed: 0,
-            status: "added",
-          })
-        } catch {
-          continue
-        }
-      }
-    }
-
-    // Get deleted files
-    const deletedOutput = await $`git diff --name-only --diff-filter=D HEAD`.cwd(app.path.cwd).quiet().nothrow().text()
-
-    if (deletedOutput.trim()) {
-      const deletedFiles = deletedOutput.trim().split("\n")
-      for (const filepath of deletedFiles) {
-        changedFiles.push({
-          file: filepath,
-          added: 0,
-          removed: 0, // Could get original line count but would require another git command
-          status: "deleted",
-        })
-      }
-    }
-
-    return changedFiles.map((x) => ({
-      ...x,
-      file: path.relative(app.path.cwd, path.join(app.path.root, x.file)),
-    }))
-  }
-
-  export async function read(file: string) {
-    using _ = log.time("read", { file })
-    const app = App.info()
-    const full = path.join(app.path.cwd, file)
-    const content = await Bun.file(full)
-      .text()
-      .catch(() => "")
-      .then((x) => x.trim())
-    if (app.git) {
-      const rel = path.relative(app.path.root, full)
-      const diff = await git.status({
-        fs,
-        dir: app.path.root,
-        filepath: rel,
-      })
-      if (diff !== "unmodified") {
-        const original = await $`git show HEAD:${rel}`.cwd(app.path.root).quiet().nothrow().text()
-        const patch = createPatch(file, original, content, "old", "new", {
-          context: Infinity,
-        })
-        return { type: "patch", content: patch }
-      }
-    }
-    return { type: "raw", content }
  }
 }
@@ -1,329 +0,0 @@
-// Ripgrep utility functions
-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 Stats = z.object({
-    elapsed: z.object({
-      secs: z.number(),
-      nanos: z.number(),
-      human: z.string(),
-    }),
-    searches: z.number(),
-    searches_with_match: z.number(),
-    bytes_searched: z.number(),
-    bytes_printed: z.number(),
-    matched_lines: z.number(),
-    matches: z.number(),
-  })
-
-  const Begin = z.object({
-    type: z.literal("begin"),
-    data: z.object({
-      path: z.object({
-        text: z.string(),
-      }),
-    }),
-  })
-
-  export const Match = z.object({
-    type: z.literal("match"),
-    data: z.object({
-      path: z.object({
-        text: z.string(),
-      }),
-      lines: z.object({
-        text: z.string(),
-      }),
-      line_number: z.number(),
-      absolute_offset: z.number(),
-      submatches: z.array(
-        z.object({
-          match: z.object({
-            text: z.string(),
-          }),
-          start: z.number(),
-          end: z.number(),
-        }),
-      ),
-    }),
-  })
-
-  const End = z.object({
-    type: z.literal("end"),
-    data: z.object({
-      path: z.object({
-        text: z.string(),
-      }),
-      binary_offset: z.number().nullable(),
-      stats: Stats,
-    }),
-  })
-
-  const Summary = z.object({
-    type: z.literal("summary"),
-    data: z.object({
-      elapsed_total: z.object({
-        human: z.string(),
-        nanos: z.number(),
-        secs: z.number(),
-      }),
-      stats: Stats,
-    }),
-  })
-
-  const Result = z.union([Begin, Match, End, Summary])
-
-  export type Result = z.infer<typeof Result>
-  export type Match = z.infer<typeof Match>
-  export type Begin = z.infer<typeof Begin>
-  export type End = z.infer<typeof End>
-  export type Summary = z.infer<typeof Summary>
-  const PLATFORM = {
-    "arm64-darwin": { platform: "aarch64-apple-darwin", extension: "tar.gz" },
-    "arm64-linux": {
-      platform: "aarch64-unknown-linux-gnu",
-      extension: "tar.gz",
-    },
-    "x64-darwin": { platform: "x86_64-apple-darwin", extension: "tar.gz" },
-    "x64-linux": { platform: "x86_64-unknown-linux-musl", extension: "tar.gz" },
-    "x64-win32": { platform: "x86_64-pc-windows-msvc", extension: "zip" },
-  } as const
-
-  export const ExtractionFailedError = NamedError.create(
-    "RipgrepExtractionFailedError",
-    z.object({
-      filepath: z.string(),
-      stderr: z.string(),
-    }),
-  )
-
-  export const UnsupportedPlatformError = NamedError.create(
-    "RipgrepUnsupportedPlatformError",
-    z.object({
-      platform: z.string(),
-    }),
-  )
-
-  export const DownloadFailedError = NamedError.create(
-    "RipgrepDownloadFailedError",
-    z.object({
-      url: z.string(),
-      status: z.number(),
-    }),
-  )
-
-  const state = lazy(async () => {
-    let filepath = Bun.which("rg")
-    if (filepath) return { filepath }
-    filepath = path.join(Global.Path.bin, "rg" + (process.platform === "win32" ? ".exe" : ""))
-
-    const file = Bun.file(filepath)
-    if (!(await file.exists())) {
-      const platformKey = `${process.arch}-${process.platform}` as keyof typeof PLATFORM
-      const config = PLATFORM[platformKey]
-      if (!config) throw new UnsupportedPlatformError({ platform: platformKey })
-
-      const version = "14.1.1"
-      const filename = `ripgrep-${version}-${config.platform}.${config.extension}`
-      const url = `https://github.com/BurntSushi/ripgrep/releases/download/${version}/${filename}`
-
-      const response = await fetch(url)
-      if (!response.ok) throw new DownloadFailedError({ url, status: response.status })
-
-      const buffer = await response.arrayBuffer()
-      const archivePath = path.join(Global.Path.bin, filename)
-      await Bun.write(archivePath, buffer)
-      if (config.extension === "tar.gz") {
-        const args = ["tar", "-xzf", archivePath, "--strip-components=1"]
-
-        if (platformKey.endsWith("-darwin")) args.push("--include=*/rg")
-        if (platformKey.endsWith("-linux")) args.push("--wildcards", "*/rg")
-
-        const proc = Bun.spawn(args, {
-          cwd: Global.Path.bin,
-          stderr: "pipe",
-          stdout: "pipe",
-        })
-        await proc.exited
-        if (proc.exitCode !== 0)
-          throw new ExtractionFailedError({
-            filepath,
-            stderr: await Bun.readableStreamToText(proc.stderr),
-          })
-      }
-      if (config.extension === "zip") {
-        const proc = Bun.spawn(["unzip", "-j", archivePath, "*/rg.exe", "-d", Global.Path.bin], {
-          cwd: Global.Path.bin,
-          stderr: "pipe",
-          stdout: "ignore",
-        })
-        await proc.exited
-        if (proc.exitCode !== 0)
-          throw new ExtractionFailedError({
-            filepath: archivePath,
-            stderr: await Bun.readableStreamToText(proc.stderr),
-          })
-      }
-      await fs.unlink(archivePath)
-      if (!platformKey.endsWith("-win32")) await fs.chmod(filepath, 0o755)
-    }
-
-    return {
-      filepath,
-    }
-  })
-
-  export async function filepath() {
-    const { filepath } = await state()
-    return filepath
-  }
-
-  export async function files(input: { cwd: string; query?: string; glob?: string; limit?: number }) {
-    const commands = [
-      `${await filepath()} --files --hidden --glob='!.git/*' ${input.glob ? `--glob='${input.glob}'` : ``}`,
-    ]
-    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).nothrow().text()
-    return result.split("\n").filter(Boolean)
-  }
-
-  export async function tree(input: { cwd: string; limit?: number }) {
-    const files = await Ripgrep.files({ cwd: input.cwd })
-    interface Node {
-      path: string[]
-      children: Node[]
-    }
-
-    function getPath(node: Node, parts: string[], create: boolean) {
-      if (parts.length === 0) return node
-      let current = node
-      for (const part of parts) {
-        let existing = current.children.find((x) => x.path.at(-1) === part)
-        if (!existing) {
-          if (!create) return
-          existing = {
-            path: current.path.concat(part),
-            children: [],
-          }
-          current.children.push(existing)
-        }
-        current = existing
-      }
-      return current
-    }
-
-    const root: Node = {
-      path: [],
-      children: [],
-    }
-    for (const file of files) {
-      const parts = file.split(path.sep)
-      getPath(root, parts, true)
-    }
-
-    function sort(node: Node) {
-      node.children.sort((a, b) => {
-        if (!a.children.length && b.children.length) return 1
-        if (!b.children.length && a.children.length) return -1
-        return a.path.at(-1)!.localeCompare(b.path.at(-1)!)
-      })
-      for (const child of node.children) {
-        sort(child)
-      }
-    }
-    sort(root)
-
-    let current = [root]
-    const result: Node = {
-      path: [],
-      children: [],
-    }
-
-    let processed = 0
-    const limit = input.limit ?? 50
-    while (current.length > 0) {
-      const next = []
-      for (const node of current) {
-        if (node.children.length) next.push(...node.children)
-      }
-      const max = Math.max(...current.map((x) => x.children.length))
-      for (let i = 0; i < max && processed < limit; i++) {
-        for (const node of current) {
-          const child = node.children[i]
-          if (!child) continue
-          getPath(result, child.path, true)
-          processed++
-          if (processed >= limit) break
-        }
-      }
-      if (processed >= limit) {
-        for (const node of [...current, ...next]) {
-          const compare = getPath(result, node.path, false)
-          if (!compare) continue
-          if (compare?.children.length !== node.children.length) {
-            const diff = node.children.length - compare.children.length
-            compare.children.push({
-              path: compare.path.concat(`[${diff} truncated]`),
-              children: [],
-            })
-          }
-        }
-        break
-      }
-      current = next
-    }
-
-    const lines: string[] = []
-
-    function render(node: Node, depth: number) {
-      const indent = "\t".repeat(depth)
-      lines.push(indent + node.path.at(-1) + (node.children.length ? "/" : ""))
-      for (const child of node.children) {
-        render(child, depth + 1)
-      }
-    }
-    result.children.map((x) => render(x, 0))
-
-    return lines.join("\n")
-  }
-
-  export async function search(input: { cwd: string; pattern: string; glob?: string[]; limit?: number }) {
-    const args = [`${await filepath()}`, "--json", "--hidden", "--glob='!.git/*'"]
-
-    if (input.glob) {
-      for (const g of input.glob) {
-        args.push(`--glob=${g}`)
-      }
-    }
-
-    if (input.limit) {
-      args.push(`--max-count=${input.limit}`)
-    }
-
-    args.push(input.pattern)
-
-    const command = args.join(" ")
-    const result = await $`${{ raw: command }}`.cwd(input.cwd).quiet().nothrow()
-    if (result.exitCode !== 0) {
-      return []
-    }
-
-    const lines = result.text().trim().split("\n").filter(Boolean)
-    // Parse JSON lines from ripgrep output
-
-    return lines
-      .map((line) => JSON.parse(line))
-      .map((parsed) => Result.parse(parsed))
-      .filter((r) => r.type === "match")
-      .map((r) => r.data)
-  }
-}
@@ -1,52 +0,0 @@
-import { z } from "zod"
-import { Bus } from "../bus"
-import fs from "fs"
-import { App } from "../app/app"
-import { Log } from "../util/log"
-import { Flag } from "../flag/flag"
-
-export namespace FileWatcher {
-  const log = Log.create({ service: "file.watcher" })
-
-  export const Event = {
-    Updated: Bus.event(
-      "file.watcher.updated",
-      z.object({
-        file: z.string(),
-        event: z.union([z.literal("rename"), z.literal("change")]),
-      }),
-    ),
-  }
-  const state = App.state(
-    "file.watcher",
-    () => {
-      const app = App.use()
-      if (!app.info.git) return {}
-      try {
-        const watcher = fs.watch(app.info.path.cwd, { recursive: true }, (event, file) => {
-          log.info("change", { file, event })
-          if (!file) return
-          // for some reason async local storage is lost here
-          // https://github.com/oven-sh/bun/issues/20754
-          App.provideExisting(app, async () => {
-            Bus.publish(Event.Updated, {
-              file,
-              event,
-            })
-          })
-        })
-        return { watcher }
-      } catch {
-        return {}
-      }
-    },
-    async (state) => {
-      state.watcher?.close()
-    },
-  )
-
-  export function init() {
-    if (Flag.OPENCODE_DISABLE_WATCHER) return
-    state()
-  }
-}
@@ -1,9 +0,0 @@
-export namespace Flag {
-  export const OPENCODE_AUTO_SHARE = truthy("OPENCODE_AUTO_SHARE")
-  export const OPENCODE_DISABLE_WATCHER = truthy("OPENCODE_DISABLE_WATCHER")
-
-  function truthy(key: string) {
-    const value = process.env[key]?.toLowerCase()
-    return value === "true" || value === "1"
-  }
-}
@@ -1,146 +0,0 @@
-import { App } from "../app/app"
-import { BunProc } from "../bun"
-
-export interface Info {
-  name: string
-  command: string[]
-  environment?: Record<string, string>
-  extensions: string[]
-  enabled(): Promise<boolean>
-}
-
-export const gofmt: Info = {
-  name: "gofmt",
-  command: ["gofmt", "-w", "$FILE"],
-  extensions: [".go"],
-  async enabled() {
-    return Bun.which("gofmt") !== null
-  },
-}
-
-export const mix: Info = {
-  name: "mix",
-  command: ["mix", "format", "$FILE"],
-  extensions: [".ex", ".exs", ".eex", ".heex", ".leex", ".neex", ".sface"],
-  async enabled() {
-    return Bun.which("mix") !== null
-  },
-}
-
-export const prettier: Info = {
-  name: "prettier",
-  command: [BunProc.which(), "run", "prettier", "--write", "$FILE"],
-  environment: {
-    BUN_BE_BUN: "1",
-  },
-  extensions: [
-    ".js",
-    ".jsx",
-    ".mjs",
-    ".cjs",
-    ".ts",
-    ".tsx",
-    ".mts",
-    ".cts",
-    ".html",
-    ".htm",
-    ".css",
-    ".scss",
-    ".sass",
-    ".less",
-    ".vue",
-    ".svelte",
-    ".json",
-    ".jsonc",
-    ".yaml",
-    ".yml",
-    ".toml",
-    ".xml",
-    ".md",
-    ".mdx",
-    ".graphql",
-    ".gql",
-  ],
-  async enabled() {
-    // this is more complicated because we only want to use prettier if it's
-    // being used with the current project
-    try {
-      const proc = Bun.spawn({
-        cmd: [BunProc.which(), "run", "prettier", "--version"],
-        cwd: App.info().path.cwd,
-        env: {
-          BUN_BE_BUN: "1",
-        },
-        stdout: "ignore",
-        stderr: "ignore",
-      })
-      const exit = await proc.exited
-      return exit === 0
-    } catch {
-      return false
-    }
-  },
-}
-
-export const zig: Info = {
-  name: "zig",
-  command: ["zig", "fmt", "$FILE"],
-  extensions: [".zig", ".zon"],
-  async enabled() {
-    return Bun.which("zig") !== null
-  },
-}
-
-export const clang: Info = {
-  name: "clang-format",
-  command: ["clang-format", "-i", "$FILE"],
-  extensions: [".c", ".cc", ".cpp", ".cxx", ".c++", ".h", ".hh", ".hpp", ".hxx", ".h++", ".ino", ".C", ".H"],
-  async enabled() {
-    return Bun.which("clang-format") !== null
-  },
-}
-
-export const ktlint: Info = {
-  name: "ktlint",
-  command: ["ktlint", "-F", "$FILE"],
-  extensions: [".kt", ".kts"],
-  async enabled() {
-    return Bun.which("ktlint") !== null
-  },
-}
-
-export const ruff: Info = {
-  name: "ruff",
-  command: ["ruff", "format", "$FILE"],
-  extensions: [".py", ".pyi"],
-  async enabled() {
-    return Bun.which("ruff") !== null
-  },
-}
-
-export const rubocop: Info = {
-  name: "rubocop",
-  command: ["rubocop", "--autocorrect", "$FILE"],
-  extensions: [".rb", ".rake", ".gemspec", ".ru"],
-  async enabled() {
-    return Bun.which("rubocop") !== null
-  },
-}
-
-export const standardrb: Info = {
-  name: "standardrb",
-  command: ["standardrb", "--fix", "$FILE"],
-  extensions: [".rb", ".rake", ".gemspec", ".ru"],
-  async enabled() {
-    return Bun.which("standardrb") !== null
-  },
-}
-
-export const htmlbeautifier: Info = {
-  name: "htmlbeautifier",
-  command: ["htmlbeautifier", "$FILE"],
-  extensions: [".erb", ".html.erb"],
-  async enabled() {
-    return Bun.which("htmlbeautifier") !== null
-  },
-}
@@ -1,65 +0,0 @@
-import { App } from "../app/app"
-import { Bus } from "../bus"
-import { File } from "../file"
-import { Log } from "../util/log"
-import path from "path"
-
-import * as Formatter from "./formatter"
-
-export namespace Format {
-  const log = Log.create({ service: "format" })
-
-  const state = App.state("format", () => {
-    const enabled: Record<string, boolean> = {}
-
-    return {
-      enabled,
-    }
-  })
-
-  async function isEnabled(item: Formatter.Info) {
-    const s = state()
-    let status = s.enabled[item.name]
-    if (status === undefined) {
-      status = await item.enabled()
-      s.enabled[item.name] = status
-    }
-    return status
-  }
-
-  async function getFormatter(ext: string) {
-    const result = []
-    for (const item of Object.values(Formatter)) {
-      if (!item.extensions.includes(ext)) continue
-      if (!(await isEnabled(item))) continue
-      result.push(item)
-    }
-    return result
-  }
-
-  export function init() {
-    log.info("init")
-    Bus.subscribe(File.Event.Edited, async (payload) => {
-      const file = payload.properties.file
-      log.info("formatting", { file })
-      const ext = path.extname(file)
-
-      for (const item of await getFormatter(ext)) {
-        log.info("running", { command: item.command })
-        const proc = Bun.spawn({
-          cmd: item.command.map((x) => x.replace("$FILE", file)),
-          cwd: App.info().path.cwd,
-          env: item.environment,
-          stdout: "ignore",
-          stderr: "ignore",
-        })
-        const exit = await proc.exited
-        if (exit !== 0)
-          log.error("failed", {
-            command: item.command,
-            ...item.environment,
-          })
-      }
-    })
-  }
-}
@@ -1,5 +1,5 @@
 import fs from "fs/promises"
-import { xdgData, xdgCache, xdgConfig, xdgState } from "xdg-basedir"
+import { xdgData, xdgCache, xdgConfig } from "xdg-basedir"
 import path from "path"

 const app = "opencode"
@@ -7,23 +7,18 @@ const app = "opencode"
 const data = path.join(xdgData!, app)
 const cache = path.join(xdgCache!, app)
 const config = path.join(xdgConfig!, app)
-const state = path.join(xdgState!, app)
+
+await Promise.all([
+  fs.mkdir(data, { recursive: true }),
+  fs.mkdir(config, { recursive: true }),
+  fs.mkdir(cache, { recursive: true }),
+])

 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 }),
-])
@@ -26,7 +26,11 @@ export namespace Identifier {
    return generateID(prefix, true, given)
  }

-  function generateID(prefix: keyof typeof prefixes, descending: boolean, given?: string): string {
+  function generateID(
+    prefix: keyof typeof prefixes,
+    descending: boolean,
+    given?: string,
+  ): string {
    if (!given) {
      return generateNewID(prefix, descending)
    }
@@ -37,17 +41,10 @@ export namespace Identifier {
    return given
  }

-  function randomBase62(length: number): string {
-    const chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-    let result = ""
-    const bytes = randomBytes(length)
-    for (let i = 0; i < length; i++) {
-      result += chars[bytes[i] % 62]
-    }
-    return result
-  }
-
-  function generateNewID(prefix: keyof typeof prefixes, descending: boolean): string {
+  function generateNewID(
+    prefix: keyof typeof prefixes,
+    descending: boolean,
+  ): string {
    const currentTimestamp = Date.now()

    if (currentTimestamp !== lastTimestamp) {
@@ -65,6 +62,14 @@ export namespace Identifier {
      timeBytes[i] = Number((now >> BigInt(40 - 8 * i)) & BigInt(0xff))
    }

-    return prefixes[prefix] + "_" + timeBytes.toString("hex") + randomBase62(LENGTH - 12)
+    const randLength = (LENGTH - 12) / 2
+    const random = randomBytes(randLength)
+
+    return (
+      prefixes[prefix] +
+      "_" +
+      timeBytes.toString("hex") +
+      random.toString("hex")
+    )
  }
 }
@@ -1,101 +1,125 @@
 import "zod-openapi/extend"
+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 } from "./cli/cmd/auth"
-import { UpgradeCommand } from "./cli/cmd/upgrade"
-import { ModelsCommand } from "./cli/cmd/models"
+import { AuthCommand, AuthLoginCommand } from "./cli/cmd/auth"
+import { Provider } from "./provider/provider"
 import { UI } from "./cli/ui"
-import { Installation } from "./installation"
-import { NamedError } from "./util/error"
-import { FormatError } from "./cli/error"
-import { ServeCommand } from "./cli/cmd/serve"
-import { TuiCommand } from "./cli/cmd/tui"
-import { DebugCommand } from "./cli/cmd/debug"
-
-const cancel = new AbortController()
-
-process.on("unhandledRejection", (e) => {
-  Log.Default.error("rejection", {
-    e: e instanceof Error ? e.message : e,
-  })
-})
-
-process.on("uncaughtException", (e) => {
-  Log.Default.error("exception", {
-    e: e instanceof Error ? e.message : e,
-  })
-})

 const cli = yargs(hideBin(process.argv))
  .scriptName("opencode")
-  .help("help", "show help")
-  .version("version", "show version number", Installation.VERSION)
-  .alias("version", "v")
+  .version(VERSION)
  .option("print-logs", {
-    describe: "print logs to stderr",
+    describe: "Print logs to stderr",
    type: "boolean",
  })
  .middleware(async () => {
    await Log.init({ print: process.argv.includes("--print-logs") })
    Log.Default.info("opencode", {
-      version: Installation.VERSION,
+      version: VERSION,
      args: process.argv.slice(2),
    })
  })
  .usage("\n" + UI.logo())
-  .command(TuiCommand)
+  .command({
+    command: "$0 [project]",
+    describe: "Start OpenCode TUI",
+    builder: (yargs) =>
+      yargs.positional("project", {
+        type: "string",
+        describe: "path to start opencode in",
+      }),
+    handler: async (args) => {
+      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"
+            }
+
+            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,
+              cwd,
+              stdout: "inherit",
+              stderr: "inherit",
+              stdin: "inherit",
+              env: {
+                ...process.env,
+                OPENCODE_SERVER: server.url.toString(),
+              },
+              onExit: () => {
+                server.stop()
+              },
+            })
+            await proc.exited
+            await server.stop()
+
+            return "done"
+          },
+        )
+        if (result === "done") break
+        if (result === "needs_provider") {
+          UI.empty()
+          UI.println(UI.logo("   "))
+          UI.empty()
+          await AuthLoginCommand.handler(args)
+        }
+      }
+    },
+  })
  .command(RunCommand)
  .command(GenerateCommand)
-  .command(DebugCommand)
+  .command(ScrapCommand)
  .command(AuthCommand)
-  .command(UpgradeCommand)
-  .command(ServeCommand)
-  .command(ModelsCommand)
-  .fail((msg) => {
-    if (msg.startsWith("Unknown argument") || msg.startsWith("Not enough non-option arguments")) {
+  .fail((msg, err) => {
+    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) {
-  let 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(),
-    })
-  }
-
-  if (e instanceof ResolveMessage) {
-    Object.assign(data, {
-      name: e.name,
-      message: e.message,
-      code: e.code,
-      specifier: e.specifier,
-      referrer: e.referrer,
-      position: e.position,
-      importKind: e.importKind,
-    })
-  }
-  Log.Default.error("fatal", data)
-  const formatted = FormatError(e)
-  if (formatted) UI.error(formatted)
-  if (formatted === undefined) UI.error("Unexpected error, check log file at " + Log.file() + " for more details")
-  process.exitCode = 1
+  Log.Default.error(e)
 }
-
-cancel.abort()
@@ -1,145 +0,0 @@
-import path from "path"
-import { $ } from "bun"
-import { z } from "zod"
-import { NamedError } from "../util/error"
-import { Bus } from "../bus"
-import { Log } from "../util/log"
-
-declare global {
-  const OPENCODE_VERSION: string
-}
-
-export namespace Installation {
-  const log = Log.create({ service: "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(),
-      },
-      {
-        name: "brew" as const,
-        command: () => $`brew list --formula opencode-ai`.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`.env({
-            ...process.env,
-            VERSION: target,
-          })
-        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}`
-        case "brew":
-          return $`brew install sst/tap/opencode`.env({
-            HOMEBREW_NO_AUTO_UPDATE: "1",
-          })
-        default:
-          throw new Error(`Unknown method: ${method}`)
-      }
-    })()
-    const result = await cmd.quiet().throws(false)
-    log.info("upgraded", {
-      method,
-      target,
-      stdout: result.stdout.toString(),
-      stderr: result.stderr.toString(),
-    })
-    if (result.exitCode !== 0)
-      throw new UpgradeFailedError({
-        stderr: result.stderr.toString("utf8"),
-      })
-  }
-
-  export const VERSION = typeof OPENCODE_VERSION === "string" ? OPENCODE_VERSION : "dev"
-
-  export async function latest() {
-    return fetch("https://api.github.com/repos/sst/opencode/releases/latest")
-      .then((res) => res.json())
-      .then((data) => data.tag_name.slice(1) as string)
-  }
-}
@@ -1,5 +1,9 @@
 import path from "path"
-import { createMessageConnection, StreamMessageReader, StreamMessageWriter } from "vscode-jsonrpc/node"
+import {
+  createMessageConnection,
+  StreamMessageReader,
+  StreamMessageWriter,
+} from "vscode-jsonrpc/node"
 import type { Diagnostic as VSCodeDiagnostic } from "vscode-languageserver-types"
 import { App } from "../app/app"
 import { Log } from "../util/log"
@@ -7,8 +11,6 @@ import { LANGUAGE_EXTENSIONS } from "./language"
 import { Bus } from "../bus"
 import z from "zod"
 import type { LSPServer } from "./server"
-import { NamedError } from "../util/error"
-import { withTimeout } from "../util/timeout"

 export namespace LSPClient {
  const log = Log.create({ service: "lsp.client" })
@@ -17,13 +19,6 @@ 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",
@@ -49,9 +44,7 @@ export namespace LSPClient {
      log.info("textDocument/publishDiagnostics", {
        path,
      })
-      const exists = diagnostics.has(path)
      diagnostics.set(path, params.diagnostics)
-      if (!exists && serverID === "typescript") return
      Bus.publish(Event.Diagnostics, { path, serverID })
    })
    connection.onRequest("workspace/configuration", async () => {
@@ -59,50 +52,34 @@ export namespace LSPClient {
    })
    connection.listen()

-    log.info("sending initialize", { id: serverID })
-    await withTimeout(
-      connection.sendRequest("initialize", {
-        rootUri: "file://" + app.path.cwd,
-        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,
-            },
-            publishDiagnostics: {
-              versionSupport: true,
-            },
-          },
-        },
-      }),
-      5_000,
-    ).catch((err) => {
-      log.error("initialize error", { error: err })
-      throw new InitializeError(
-        { serverID },
+    await connection.sendRequest("initialize", {
+      processId: server.process.pid,
+      workspaceFolders: [
        {
-          cause: err,
+          name: "workspace",
+          uri: "file://" + app.path.cwd,
        },
-      )
+      ],
+      initializationOptions: {
+        ...server.initialization,
+      },
+      capabilities: {
+        workspace: {
+          configuration: true,
+        },
+        textDocument: {
+          synchronization: {
+            didOpen: true,
+            didChange: true,
+          },
+          publishDiagnostics: {
+            versionSupport: true,
+          },
+        },
+      },
    })
-
    await connection.sendNotification("initialized", {})
-    log.info("initialized", {
-      serverID,
-    })
+    log.info("initialized")

    const files: {
      [path: string]: number
@@ -117,63 +94,82 @@ export namespace LSPClient {
      },
      notify: {
        async open(input: { path: string }) {
-          input.path = path.isAbsolute(input.path) ? input.path : path.resolve(app.path.cwd, input.path)
+          input.path = path.isAbsolute(input.path)
+            ? input.path
+            : path.resolve(app.path.cwd, input.path)
          const file = Bun.file(input.path)
          const text = await file.text()
          const version = files[input.path]
-          if (version !== undefined) {
+          if (version === undefined) {
+            log.info("textDocument/didOpen", input)
            diagnostics.delete(input.path)
-            await connection.sendNotification("textDocument/didClose", {
+            const extension = path.extname(input.path)
+            const languageId = LANGUAGE_EXTENSIONS[extension] ?? "plaintext"
+            await connection.sendNotification("textDocument/didOpen", {
              textDocument: {
                uri: `file://` + input.path,
+                languageId,
+                version: 0,
+                text,
              },
            })
+            files[input.path] = 0
+            return
          }
-          log.info("textDocument/didOpen", input)
+
+          log.info("textDocument/didChange", input)
          diagnostics.delete(input.path)
-          const extension = path.extname(input.path)
-          const languageId = LANGUAGE_EXTENSIONS[extension] ?? "plaintext"
-          await connection.sendNotification("textDocument/didOpen", {
+          await connection.sendNotification("textDocument/didChange", {
            textDocument: {
              uri: `file://` + input.path,
-              languageId,
-              version: 0,
-              text,
+              version: ++files[input.path],
            },
+            contentChanges: [
+              {
+                text,
+              },
+            ],
          })
-          files[input.path] = 0
-          return
        },
      },
      get diagnostics() {
        return diagnostics
      },
      async waitForDiagnostics(input: { path: string }) {
-        input.path = path.isAbsolute(input.path) ? input.path : path.resolve(app.path.cwd, input.path)
+        input.path = path.isAbsolute(input.path)
+          ? input.path
+          : path.resolve(app.path.cwd, input.path)
        log.info("waiting for diagnostics", input)
        let unsub: () => void
-        return await withTimeout(
-          new Promise<void>((resolve) => {
+        let timeout: NodeJS.Timeout
+        return await Promise.race([
+          new Promise<void>(async (resolve) => {
            unsub = Bus.subscribe(Event.Diagnostics, (event) => {
-              if (event.properties.path === input.path && event.properties.serverID === result.serverID) {
+              if (
+                event.properties.path === input.path &&
+                event.properties.serverID === result.serverID
+              ) {
                log.info("got diagnostics", input)
+                clearTimeout(timeout)
                unsub?.()
                resolve()
              }
            })
          }),
-          3000,
-        )
-          .catch(() => {})
-          .finally(() => {
-            unsub?.()
-          })
+          new Promise<void>((resolve) => {
+            timeout = setTimeout(() => {
+              log.info("timed out refreshing diagnostics", input)
+              unsub?.()
+              resolve()
+            }, 5000)
+          }),
+        ])
      },
      async shutdown() {
-        log.info("shutting down", { serverID })
+        log.info("shutting down")
        connection.end()
        connection.dispose()
-        log.info("shutdown", { serverID })
+        server.process.kill("SIGKILL")
      },
    }

@@ -3,56 +3,16 @@ import { Log } from "../util/log"
 import { LSPClient } from "./client"
 import path from "path"
 import { LSPServer } from "./server"
-import { Ripgrep } from "../file/ripgrep"
-import { z } from "zod"

 export namespace LSP {
  const log = Log.create({ service: "lsp" })

-  export const Symbol = z
-    .object({
-      name: z.string(),
-      kind: z.number(),
-      location: z.object({
-        uri: z.string(),
-        range: z.object({
-          start: z.object({
-            line: z.number(),
-            character: z.number(),
-          }),
-          end: z.object({
-            line: z.number(),
-            character: z.number(),
-          }),
-        }),
-      }),
-    })
-    .openapi({
-      ref: "LSP.Symbol",
-    })
-  export type Symbol = z.infer<typeof Symbol>
-
  const state = App.state(
    "lsp",
-    async (app) => {
+    async () => {
      log.info("initializing")
      const clients = new Map<string, LSPClient.Info>()
-      for (const server of Object.values(LSPServer)) {
-        for (const extension of server.extensions) {
-          const [file] = await Ripgrep.files({
-            cwd: app.path.cwd,
-            glob: "*" + extension,
-          })
-          if (!file) continue
-          const handle = await server.spawn(App.info())
-          if (!handle) break
-          const client = await LSPClient.create(server.id, handle).catch((err) => log.error("", { error: err }))
-          if (!client) break
-          clients.set(server.id, client)
-          break
-        }
-      }
-      log.info("initialized")
+
      return {
        clients,
      }
@@ -64,21 +24,27 @@ export namespace LSP {
    },
  )

-  export async function init() {
-    return state()
-  }
-
  export async function touchFile(input: string, waitForDiagnostics?: boolean) {
    const extension = path.parse(input).ext
-    const matches = Object.values(LSPServer)
-      .filter((x) => x.extensions.includes(extension))
-      .map((x) => x.id)
-    await run(async (client) => {
-      if (!matches.includes(client.serverID)) return
-      const wait = waitForDiagnostics ? client.waitForDiagnostics({ path: input }) : Promise.resolve()
-      await client.notify.open({ path: input })
-      return wait
-    })
+    const s = await state()
+    const matches = LSPServer.All.filter((x) =>
+      x.extensions.includes(extension),
+    )
+    for (const match of matches) {
+      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)
+      s.clients.set(match.id, client)
+    }
+    if (waitForDiagnostics) {
+      await run(async (client) => {
+        const wait = client.waitForDiagnostics({ path: input })
+        await client.notify.open({ path: input })
+        return wait
+      })
+    }
  }

  export async function diagnostics() {
@@ -93,7 +59,11 @@ export namespace LSP {
    return results
  }

-  export async function hover(input: { file: string; line: number; character: number }) {
+  export async function hover(input: {
+    file: string
+    line: number
+    character: number
+  }) {
    return run((client) => {
      return client.connection.sendRequest("textDocument/hover", {
        textDocument: {
@@ -107,15 +77,9 @@ export namespace LSP {
    })
  }

-  export async function workspaceSymbol(query: string) {
-    return run((client) =>
-      client.connection.sendRequest("workspace/symbol", {
-        query,
-      }),
-    ).then((result) => result.flat() as LSP.Symbol[])
-  }
-
-  async function run<T>(input: (client: LSPClient.Info) => Promise<T>): Promise<T[]> {
+  async function run<T>(
+    input: (client: LSPClient.Info) => Promise<T>,
+  ): Promise<T[]> {
    const clients = await state().then((x) => [...x.clients.values()])
    const tasks = clients.map((x) => input(x))
    return Promise.all(tasks)
@@ -63,14 +63,6 @@ export const LANGUAGE_EXTENSIONS: Record<string, string> = {
  ".cshtml": "razor",
  ".razor": "razor",
  ".rb": "ruby",
-  ".rake": "ruby",
-  ".gemspec": "ruby",
-  ".ru": "ruby",
-  ".erb": "erb",
-  ".html.erb": "erb",
-  ".js.erb": "erb",
-  ".css.erb": "erb",
-  ".json.erb": "erb",
  ".rs": "rust",
  ".scss": "scss",
  ".sass": "sass",
@@ -4,8 +4,6 @@ import path from "path"
 import { Global } from "../global"
 import { Log } from "../util/log"
 import { BunProc } from "../bun"
-import { $ } from "bun"
-import fs from "fs/promises"

 export namespace LSPServer {
  const log = Log.create({ service: "lsp.server" })
@@ -21,164 +19,75 @@ export namespace LSPServer {
    spawn(app: App.Info): Promise<Handle | undefined>
  }

-  export const Typescript: Info = {
-    id: "typescript",
-    extensions: [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".mts", ".cts"],
-    async spawn(app) {
-      const tsserver = await Bun.resolve("typescript/lib/tsserver.js", app.path.cwd).catch(() => {})
-      if (!tsserver) return
-      const proc = spawn(BunProc.which(), ["x", "typescript-language-server", "--stdio"], {
-        env: {
-          ...process.env,
-          BUN_BE_BUN: "1",
-        },
-      })
-      return {
-        process: proc,
-        initialization: {
-          tsserver: {
-            path: tsserver,
+  export const All: Info[] = [
+    {
+      id: "typescript",
+      extensions: [
+        ".ts",
+        ".tsx",
+        ".js",
+        ".jsx",
+        ".mjs",
+        ".cjs",
+        ".mts",
+        ".cts",
+      ],
+      async spawn(app) {
+        const tsserver = await Bun.resolve(
+          "typescript/lib/tsserver.js",
+          app.path.cwd,
+        ).catch(() => {})
+        if (!tsserver) return
+        const proc = spawn(
+          BunProc.which(),
+          ["x", "typescript-language-server", "--stdio"],
+          {
+            env: {
+              ...process.env,
+              BUN_BE_BUN: "1",
+            },
          },
-        },
-      }
-    },
-  }
-
-  export const Gopls: Info = {
-    id: "golang",
-    extensions: [".go"],
-    async spawn() {
-      let bin = Bun.which("gopls", {
-        PATH: process.env["PATH"] + ":" + Global.Path.bin,
-      })
-      if (!bin) {
-        if (!Bun.which("go")) return
-        log.info("installing gopls")
-        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) {
-          log.error("Failed to install gopls")
-          return
-        }
-        bin = path.join(Global.Path.bin, "gopls" + (process.platform === "win32" ? ".exe" : ""))
-        log.info(`installed gopls`, {
-          bin,
-        })
-      }
-      return {
-        process: spawn(bin!),
-      }
-    },
-  }
-
-  export const RubyLsp: Info = {
-    id: "ruby-lsp",
-    extensions: [".rb", ".rake", ".gemspec", ".ru"],
-    async spawn() {
-      let bin = Bun.which("ruby-lsp", {
-        PATH: process.env["PATH"] + ":" + Global.Path.bin,
-      })
-      if (!bin) {
-        const ruby = Bun.which("ruby")
-        const gem = Bun.which("gem")
-        if (!ruby || !gem) {
-          log.info("Ruby not found, please install Ruby first")
-          return
-        }
-        log.info("installing ruby-lsp")
-        const proc = Bun.spawn({
-          cmd: ["gem", "install", "ruby-lsp", "--bindir", Global.Path.bin],
-          stdout: "pipe",
-          stderr: "pipe",
-          stdin: "pipe",
-        })
-        const exit = await proc.exited
-        if (exit !== 0) {
-          log.error("Failed to install ruby-lsp")
-          return
-        }
-        bin = path.join(Global.Path.bin, "ruby-lsp" + (process.platform === "win32" ? ".exe" : ""))
-        log.info(`installed ruby-lsp`, {
-          bin,
-        })
-      }
-      return {
-        process: spawn(bin!, ["--stdio"]),
-      }
-    },
-  }
-
-  export const Pyright: Info = {
-    id: "pyright",
-    extensions: [".py", ".pyi"],
-    async spawn() {
-      const proc = spawn(BunProc.which(), ["x", "pyright-langserver", "--stdio"], {
-        env: {
-          ...process.env,
-          BUN_BE_BUN: "1",
-        },
-      })
-      return {
-        process: proc,
-      }
-    },
-  }
-
-  export const ElixirLS: Info = {
-    id: "elixir-ls",
-    extensions: [".ex", ".exs"],
-    async spawn() {
-      let binary = Bun.which("elixir-ls")
-      if (!binary) {
-        const elixirLsPath = path.join(Global.Path.bin, "elixir-ls")
-        binary = path.join(
-          Global.Path.bin,
-          "elixir-ls-master",
-          "release",
-          process.platform === "win32" ? "language_server.bar" : "language_server.sh",
        )
-
-        if (!(await Bun.file(binary).exists())) {
-          const elixir = Bun.which("elixir")
-          if (!elixir) {
-            log.error("elixir is required to run elixir-ls")
+        return {
+          process: proc,
+          initialization: {
+            tsserver: {
+              path: tsserver,
+            },
+          },
+        }
+      },
+    },
+    {
+      id: "golang",
+      extensions: [".go"],
+      async spawn() {
+        let bin = Bun.which("gopls", {
+          PATH: process.env["PATH"] + ":" + Global.Path.bin,
+        })
+        if (!bin) {
+          log.info("installing gopls")
+          const proc = Bun.spawn({
+            cmd: ["go", "install", "golang.org/x/tools/gopls@latest"],
+            env: { ...process.env, GOBIN: Global.Path.bin },
+          })
+          const exit = await proc.exited
+          if (exit !== 0) {
+            log.error("Failed to install gopls")
            return
          }
-
-          log.info("downloading elixir-ls from GitHub releases")
-
-          const response = await fetch("https://github.com/elixir-lsp/elixir-ls/archive/refs/heads/master.zip")
-          if (!response.ok) return
-          const zipPath = path.join(Global.Path.bin, "elixir-ls.zip")
-          await Bun.file(zipPath).write(response)
-
-          await $`unzip -o -q ${zipPath}`.cwd(Global.Path.bin).nothrow()
-
-          await fs.rm(zipPath, {
-            force: true,
-            recursive: true,
-          })
-
-          await $`mix deps.get && mix compile && mix elixir_ls.release2 -o release`
-            .quiet()
-            .cwd(path.join(Global.Path.bin, "elixir-ls-master"))
-            .env({ MIX_ENV: "prod", ...process.env })
-
-          log.info(`installed elixir-ls`, {
-            path: elixirLsPath,
+          bin = path.join(
+            Global.Path.bin,
+            "gopls" + (process.platform === "win32" ? ".exe" : ""),
+          )
+          log.info(`installed gopls`, {
+            bin,
          })
        }
-      }
-
-      return {
-        process: spawn(binary),
-      }
+        return {
+          process: spawn(bin!),
+        }
+      },
    },
-  }
+  ]
 }
@@ -2,22 +2,8 @@ import { experimental_createMCPClient, type Tool } from "ai"
 import { Experimental_StdioMCPTransport } from "ai/mcp-stdio"
 import { App } from "../app/app"
 import { Config } from "../config/config"
-import { Log } from "../util/log"
-import { NamedError } from "../util/error"
-import { z } from "zod"
-import { Session } from "../session"
-import { Bus } from "../bus"

 export namespace MCP {
-  const log = Log.create({ service: "mcp" })
-
-  export const Failed = NamedError.create(
-    "MCPFailed",
-    z.object({
-      name: z.string(),
-    }),
-  )
-
  const state = App.state(
    "mcp",
    async () => {
@@ -26,60 +12,27 @@ export namespace MCP {
        [name: string]: Awaited<ReturnType<typeof experimental_createMCPClient>>
      } = {}
      for (const [key, mcp] of Object.entries(cfg.mcp ?? {})) {
-        if (mcp.enabled === false) {
-          log.info("mcp server disabled", { key })
-          continue
-        }
-        log.info("found", { key, type: mcp.type })
        if (mcp.type === "remote") {
-          const client = await experimental_createMCPClient({
+          clients[key] = await experimental_createMCPClient({
            name: key,
            transport: {
              type: "sse",
              url: mcp.url,
            },
-          }).catch(() => {})
-          if (!client) {
-            Bus.publish(Session.Event.Error, {
-              error: {
-                name: "UnknownError",
-                data: {
-                  message: `MCP server ${key} failed to start`,
-                },
-              },
-            })
-            continue
-          }
-          clients[key] = client
+          })
        }

        if (mcp.type === "local") {
          const [cmd, ...args] = mcp.command
-          const client = await experimental_createMCPClient({
+          clients[key] = await experimental_createMCPClient({
            name: key,
            transport: new Experimental_StdioMCPTransport({
              stderr: "ignore",
              command: cmd,
              args,
-              env: {
-                ...process.env,
-                ...(cmd === "opencode" ? { BUN_BE_BUN: "1" } : {}),
-                ...mcp.environment,
-              },
+              env: mcp.environment,
            }),
-          }).catch(() => {})
-          if (!client) {
-            Bus.publish(Session.Event.Error, {
-              error: {
-                name: "UnknownError",
-                data: {
-                  message: `MCP server ${key} failed to start`,
-                },
-              },
-            })
-            continue
-          }
-          clients[key] = client
+          })
        }
      }

@@ -64,7 +64,6 @@ export namespace Permission {
    title: Info["title"]
    metadata: Info["metadata"]
  }) {
-    return
    const { pending, approved } = state()
    log.info("asking", {
      sessionID: input.sessionID,
@@ -1,4 +0,0 @@
-export async function data() {
-  const json = await fetch("https://models.dev/api.json").then((x) => x.text())
-  return json
-}
@@ -1,70 +1,28 @@
 import { Global } from "../global"
 import { Log } from "../util/log"
 import path from "path"
-import { z } from "zod"
-import { data } from "./models-macro" with { type: "macro" }

 export namespace ModelsDev {
  const log = Log.create({ service: "models.dev" })
  const filepath = path.join(Global.Path.cache, "models.json")

-  export const Model = z
-    .object({
-      id: z.string(),
-      name: z.string(),
-      release_date: z.string(),
-      attachment: z.boolean(),
-      reasoning: z.boolean(),
-      temperature: z.boolean(),
-      tool_call: 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(),
-      }),
-      options: z.record(z.any()),
-    })
-    .openapi({
-      ref: "Model",
-    })
-  export type Model = z.infer<typeof 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",
-    })
-
-  export type Provider = z.infer<typeof Provider>
-
  export async function get() {
    const file = Bun.file(filepath)
    const result = await file.json().catch(() => {})
    if (result) {
      refresh()
-      return result as Record<string, Provider>
+      return result
    }
-    refresh()
-    const json = await data()
-    return JSON.parse(json) as Record<string, Provider>
+    await refresh()
+    return get()
  }

  async function refresh() {
    const file = Bun.file(filepath)
    log.info("refreshing")
-    const result = await fetch("https://models.dev/api.json").catch(() => {})
-    if (result && result.ok) await Bun.write(file, result)
+    const result = await fetch("https://models.dev/api.json")
+    if (!result.ok)
+      throw new Error(`Failed to fetch models.dev: ${result.statusText}`)
+    await Bun.write(file, result)
  }
 }
@@ -4,6 +4,8 @@ import { Config } from "../config/config"
 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"
@@ -11,323 +13,168 @@ import { WebFetchTool } from "../tool/webfetch"
 import { GlobTool } from "../tool/glob"
 import { GrepTool } from "../tool/grep"
 import { ListTool } from "../tool/ls"
+import { LspDiagnosticTool } from "../tool/lsp-diagnostics"
+import { LspHoverTool } from "../tool/lsp-hover"
 import { PatchTool } from "../tool/patch"
 import { ReadTool } from "../tool/read"
 import type { Tool } from "../tool/tool"
 import { WriteTool } from "../tool/write"
 import { TodoReadTool, TodoWriteTool } from "../tool/todo"
 import { AuthAnthropic } from "../auth/anthropic"
-import { AuthCopilot } from "../auth/copilot"
 import { ModelsDev } from "./models"
 import { NamedError } from "../util/error"
 import { Auth } from "../auth"
-// import { TaskTool } from "../tool/task"
+import { TaskTool } from "../tool/task"

 export namespace Provider {
  const log = Log.create({ service: "provider" })

-  type CustomLoader = (
-    provider: ModelsDev.Provider,
-    api?: string,
-  ) => Promise<{
-    autoload: boolean
-    getModel?: (sdk: any, modelID: string) => Promise<any>
-    options?: Record<string, any>
-  }>
+  export const Model = z
+    .object({
+      id: z.string(),
+      name: z.string().optional(),
+      attachment: z.boolean(),
+      reasoning: z.boolean().optional(),
+      cost: z.object({
+        input: z.number(),
+        inputCached: z.number(),
+        output: z.number(),
+        outputCached: z.number(),
+      }),
+      limit: z.object({
+        context: z.number(),
+        output: z.number(),
+      }),
+    })
+    .openapi({
+      ref: "Provider.Model",
+    })
+  export type Model = z.output<typeof Model>

-  type Source = "env" | "config" | "custom" | "api"
+  export const Info = z
+    .object({
+      id: z.string(),
+      name: z.string(),
+      models: z.record(z.string(), Model),
+    })
+    .openapi({
+      ref: "Provider.Info",
+    })
+  export type Info = z.output<typeof Info>

-  const CUSTOM_LOADERS: Record<string, CustomLoader> = {
+  type Autodetector = (provider: Info) => Promise<
+    | {
+        source: Source
+        options: Record<string, any>
+      }
+    | false
+  >
+
+  function env(...keys: string[]) {
+    const result: Autodetector = async () => {
+      for (const key of keys) {
+        if (process.env[key])
+          return {
+            source: "env",
+            options: {},
+          }
+      }
+      return false
+    }
+
+    return result
+  }
+
+  type Source = "oauth" | "env" | "config" | "api"
+
+  const AUTODETECT: Record<string, Autodetector> = {
    async anthropic(provider) {
      const access = await AuthAnthropic.access()
-      if (!access) return { autoload: false }
-      for (const model of Object.values(provider.models)) {
-        model.cost = {
-          input: 0,
-          output: 0,
-        }
-      }
-      return {
-        autoload: true,
-        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,
-            })
-          },
-        },
-      }
-    },
-    "github-copilot": async (provider) => {
-      const copilot = await AuthCopilot()
-      if (!copilot) return { autoload: false }
-      let info = await Auth.get("github-copilot")
-      if (!info || info.type !== "oauth") return { autoload: false }
-
-      if (provider && provider.models) {
+      if (access) {
+        // claude sub doesn't have usage cost
        for (const model of Object.values(provider.models)) {
          model.cost = {
            input: 0,
+            inputCached: 0,
            output: 0,
+            outputCached: 0,
          }
        }
-      }
-
-      return {
-        autoload: true,
-        options: {
-          apiKey: "",
-          async fetch(input: any, init: any) {
-            const info = await Auth.get("github-copilot")
-            if (!info || info.type !== "oauth") return
-            if (!info.access || info.expires < Date.now()) {
-              const tokens = await copilot.access(info.refresh)
-              if (!tokens) throw new Error("GitHub Copilot authentication expired")
-              await Auth.set("github-copilot", {
-                type: "oauth",
-                ...tokens,
-              })
-              info.access = tokens.access
-            }
-            let isAgentCall = false
-            try {
-              const body = typeof init.body === "string" ? JSON.parse(init.body) : init.body
-              if (body?.messages) {
-                isAgentCall = body.messages.some((msg: any) => msg.role && ["tool", "assistant"].includes(msg.role))
-              }
-            } catch {}
-            const headers = {
-              ...init.headers,
-              ...copilot.HEADERS,
-              Authorization: `Bearer ${info.access}`,
-              "Openai-Intent": "conversation-edits",
-              "X-Initiator": isAgentCall ? "agent" : "user",
-            }
-            delete headers["x-api-key"]
-            return fetch(input, {
-              ...init,
-              headers,
-            })
+        return {
+          source: "oauth",
+          options: {
+            apiKey: "",
+            headers: {
+              authorization: `Bearer ${access}`,
+              "anthropic-beta": "oauth-2025-04-20",
+            },
          },
-        },
-      }
-    },
-    openai: async () => {
-      return {
-        autoload: false,
-        async getModel(sdk: any, modelID: string) {
-          return sdk.responses(modelID)
-        },
-        options: {},
-      }
-    },
-    "amazon-bedrock": async () => {
-      if (!process.env["AWS_PROFILE"] && !process.env["AWS_ACCESS_KEY_ID"]) return { autoload: false }
-
-      const region = process.env["AWS_REGION"] ?? "us-east-1"
-
-      const { fromNodeProviderChain } = await import(await BunProc.install("@aws-sdk/credential-providers"))
-      return {
-        autoload: true,
-        options: {
-          region,
-          credentialProvider: fromNodeProviderChain(),
-        },
-        async getModel(sdk: any, modelID: string) {
-          let regionPrefix = region.split("-")[0]
-
-          switch (regionPrefix) {
-            case "us": {
-              const modelRequiresPrefix = ["claude", "deepseek"].some((m) => modelID.includes(m))
-              if (modelRequiresPrefix) {
-                modelID = `${regionPrefix}.${modelID}`
-              }
-              break
-            }
-            case "eu": {
-              const regionRequiresPrefix = [
-                "eu-west-1",
-                "eu-west-3",
-                "eu-north-1",
-                "eu-central-1",
-                "eu-south-1",
-                "eu-south-2",
-              ].some((r) => region.includes(r))
-              const modelRequiresPrefix = ["claude", "nova-lite", "nova-micro", "llama3", "pixtral"].some((m) =>
-                modelID.includes(m),
-              )
-              if (regionRequiresPrefix && modelRequiresPrefix) {
-                modelID = `${regionPrefix}.${modelID}`
-              }
-              break
-            }
-            case "ap": {
-              const modelRequiresPrefix = ["claude", "nova-lite", "nova-micro", "nova-pro"].some((m) =>
-                modelID.includes(m),
-              )
-              if (modelRequiresPrefix) {
-                regionPrefix = "apac"
-                modelID = `${regionPrefix}.${modelID}`
-              }
-              break
-            }
-          }
-
-          return sdk.languageModel(modelID)
-        },
-      }
-    },
-    openrouter: async () => {
-      return {
-        autoload: false,
-        options: {
-          headers: {
-            "HTTP-Referer": "https://opencode.ai/",
-            "X-Title": "opencode",
-          },
-        },
+        }
      }
+      return env("ANTHROPIC_API_KEY")(provider)
    },
+    google: env("GOOGLE_GENERATIVE_AI_API_KEY"),
+    openai: env("OPENAI_API_KEY"),
  }

  const state = App.state("provider", async () => {
    const config = await Config.get()
-    const database = await ModelsDev.get()
+    const database: Record<string, Provider.Info> = await ModelsDev.get()

    const providers: {
      [providerID: string]: {
        source: Source
-        info: ModelsDev.Provider
-        getModel?: (sdk: any, modelID: string) => Promise<any>
+        info: Provider.Info
        options: Record<string, any>
      }
    } = {}
-    const models = new Map<string, { info: ModelsDev.Model; language: LanguageModel }>()
+    const models = new Map<string, { info: Model; language: LanguageModel }>()
    const sdk = new Map<string, SDK>()

-    log.info("init")
+    log.info("loading")

    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,
+          info: database[id] ?? {
+            id,
+            name: id,
+            models: [],
+          },
          options,
-          getModel,
        }
        return
      }
      provider.options = mergeDeep(provider.options, options)
      provider.source = source
-      provider.getModel = getModel ?? provider.getModel
    }

-    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 ?? [],
-        api: provider.api ?? existing?.api,
-        models: existing?.models ?? {},
-      }
-
-      for (const [modelID, model] of Object.entries(provider.models ?? {})) {
-        const existing = parsed.models[modelID]
-        const parsedModel: ModelsDev.Model = {
-          id: modelID,
-          name: model.name ?? existing?.name ?? modelID,
-          release_date: model.release_date ?? existing?.release_date,
-          attachment: model.attachment ?? existing?.attachment ?? false,
-          reasoning: model.reasoning ?? existing?.reasoning ?? false,
-          temperature: model.temperature ?? existing?.temperature ?? false,
-          tool_call: model.tool_call ?? existing?.tool_call ?? true,
-          cost: {
-            ...existing?.cost,
-            ...model.cost,
-            input: 0,
-            output: 0,
-            cache_read: 0,
-            cache_write: 0,
-          },
-          options: {
-            ...existing?.options,
-            ...model.options,
-          },
-          limit: model.limit ??
-            existing?.limit ?? {
-              context: 0,
-              output: 0,
-            },
-        }
-        parsed.models[modelID] = parsedModel
-      }
-      database[providerID] = parsed
+    for (const [providerID, fn] of Object.entries(AUTODETECT)) {
+      const provider = database[providerID]
+      if (!provider) continue
+      const result = await fn(provider)
+      if (!result) continue
+      mergeProvider(providerID, result.options, result.source)
    }

-    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
-      const apiKey = provider.env.map((item) => process.env[item]).at(0)
-      if (!apiKey) continue
-      mergeProvider(
-        providerID,
-        // only include apiKey if there's only one potential option
-        provider.env.length === 1 ? { apiKey } : {},
-        "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")
+    for (const [providerID, info] of Object.entries(await Auth.all())) {
+      if (info.type === "api") {
+        mergeProvider(providerID, { apiKey: info.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 && (result.autoload || providers[providerID])) {
-        mergeProvider(providerID, result.options ?? {}, "custom", result.getModel)
-      }
+    for (const [providerID, options] of Object.entries(config.provider ?? {})) {
+      mergeProvider(providerID, options, "config")
    }

-    // load config
-    for (const [providerID, provider] of configProviders) {
-      mergeProvider(providerID, provider.options ?? {}, "config")
-    }
-
-    for (const [providerID, provider] of Object.entries(providers)) {
-      if (Object.keys(provider.info.models).length === 0) {
-        delete providers[providerID]
-        continue
-      }
-      log.info("found", { providerID })
+    for (const providerID of Object.keys(providers)) {
+      log.info("loaded", { providerID })
    }

    return {
@@ -341,22 +188,32 @@ export namespace Provider {
    return state().then((state) => state.providers)
  }

-  async function getSDK(provider: ModelsDev.Provider) {
+  async function getSDK(providerID: string) {
    return (async () => {
-      using _ = log.time("getSDK", {
-        providerID: provider.id,
-      })
      const s = await state()
-      const existing = s.sdk.get(provider.id)
+      const existing = s.sdk.get(providerID)
      if (existing) return existing
-      const pkg = provider.npm ?? provider.id
-      const mod = await import(await BunProc.install(pkg, "beta"))
+      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 fn = mod[Object.keys(mod).find((key) => key.startsWith("create"))!]
-      const loaded = fn(s.providers[provider.id]?.options)
-      s.sdk.set(provider.id, loaded)
+      const loaded = fn(s.providers[providerID]?.options)
+      s.sdk.set(providerID, loaded)
      return loaded as SDK
    })().catch((e) => {
-      throw new InitError({ providerID: provider.id }, { cause: e })
+      throw new InitError({ providerID: providerID }, { cause: e })
    })
  }

@@ -365,7 +222,7 @@ export namespace Provider {
    const s = await state()
    if (s.models.has(key)) return s.models.get(key)!

-    log.info("getModel", {
+    log.info("loading", {
      providerID,
      modelID,
    })
@@ -374,10 +231,13 @@ 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(provider.info)
+
+    const sdk = await getSDK(providerID)

    try {
-      const language = provider.getModel ? await provider.getModel(sdk, modelID) : sdk.languageModel(modelID)
+      const language =
+        // @ts-expect-error
+        "responses" in sdk ? sdk.responses(modelID) : sdk.languageModel(modelID)
      log.info("found", { providerID, modelID })
      s.models.set(key, {
        info,
@@ -401,21 +261,20 @@ export namespace Provider {
  }

  const priority = ["gemini-2.5-pro-preview", "codex-mini", "claude-sonnet-4"]
-  export function sort(models: ModelsDev.Model[]) {
+  export function sort(models: Model[]) {
    return sortBy(
      models,
-      [(model) => priority.findIndex((filter) => model.id.includes(filter)), "desc"],
+      [
+        (model) => priority.findIndex((filter) => model.id.includes(filter)),
+        "desc",
+      ],
      [(model) => (model.id.includes("latest") ? 0 : 1), "asc"],
      [(model) => model.id, "desc"],
    )
  }

  export async function defaultModel() {
-    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)))
+    const [provider] = await list().then((val) => Object.values(val))
    if (!provider) throw new Error("no providers found")
    const [model] = sort(Object.values(provider.info.models))
    if (!model) throw new Error("no models found")
@@ -425,14 +284,6 @@ export namespace Provider {
    }
  }

-  export function parseModel(model: string) {
-    const [providerID, ...rest] = model.split("/")
-    return {
-      providerID: providerID,
-      modelID: rest.join("/"),
-    }
-  }
-
  const TOOLS = [
    BashTool,
    EditTool,
@@ -440,75 +291,31 @@ export namespace Provider {
    GlobTool,
    GrepTool,
    ListTool,
-    // LspDiagnosticTool,
-    // LspHoverTool,
+    LspDiagnosticTool,
+    LspHoverTool,
    PatchTool,
    ReadTool,
+    EditTool,
    // MultiEditTool,
    WriteTool,
    TodoWriteTool,
+    TaskTool,
    TodoReadTool,
-    // TaskTool,
  ]
-
  const TOOL_MAPPING: Record<string, Tool.Info[]> = {
-    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),
-    })),
+    anthropic: TOOLS.filter((t) => t.id !== "opencode.patch"),
+    openai: TOOLS,
    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({
@@ -1,37 +0,0 @@
-import type { ModelMessage } from "ai"
-import { unique } from "remeda"
-
-export namespace ProviderTransform {
-  export function message(msgs: ModelMessage[], providerID: string, modelID: string) {
-    if (providerID === "anthropic" || modelID.includes("anthropic")) {
-      const system = msgs.filter((msg) => msg.role === "system").slice(0, 2)
-      const final = msgs.filter((msg) => msg.role !== "system").slice(-2)
-
-      for (const msg of unique([...system, ...final])) {
-        msg.providerOptions = {
-          ...msg.providerOptions,
-          anthropic: {
-            cacheControl: { type: "ephemeral" },
-          },
-          openaiCompatible: {
-            cache_control: { type: "ephemeral" },
-          },
-        }
-      }
-    }
-    if (providerID === "amazon-bedrock" || modelID.includes("anthropic")) {
-      const system = msgs.filter((msg) => msg.role === "system").slice(0, 2)
-      const final = msgs.filter((msg) => msg.role !== "system").slice(-2)
-
-      for (const msg of unique([...system, ...final])) {
-        msg.providerOptions = {
-          ...msg.providerOptions,
-          bedrock: {
-            cachePoint: { type: "ephemeral" },
-          },
-        }
-      }
-    }
-    return msgs
-  }
-}
@@ -6,16 +6,13 @@ import { streamSSE } from "hono/streaming"
 import { Session } from "../session"
 import { resolver, validator as zValidator } from "hono-openapi/zod"
 import { z } from "zod"
+import { Message } from "../session/message"
 import { Provider } from "../provider/provider"
 import { App } from "../app/app"
+import { Global } from "../global"
 import { mapValues } from "remeda"
 import { NamedError } from "../util/error"
-import { ModelsDev } from "../provider/models"
-import { Ripgrep } from "../file/ripgrep"
-import { Config } from "../config/config"
-import { File } from "../file"
-import { LSP } from "../lsp"
-import { MessageV2 } from "../session/message-v2"
+import { Fzf } from "../external/fzf"

 const ERRORS = {
  400: {
@@ -51,28 +48,27 @@ export namespace Server {
            status: 400,
          })
        }
-        return c.json(new NamedError.Unknown({ message: err.toString() }).toObject(), {
-          status: 400,
-        })
+        return c.json(
+          new NamedError.Unknown({ message: err.toString() }).toObject(),
+          {
+            status: 400,
+          },
+        )
      })
-      .use(async (c, next) => {
+      .use((c, next) => {
        log.info("request", {
          method: c.req.method,
          path: c.req.path,
        })
-        const start = Date.now()
-        await next()
-        log.info("response", {
-          duration: Date.now() - start,
-        })
+        return next()
      })
      .get(
-        "/doc",
+        "/openapi",
        openAPISpecs(app, {
          documentation: {
            info: {
              title: "opencode",
-              version: "0.0.3",
+              version: "1.0.0",
              description: "opencode api",
            },
            openapi: "3.0.0",
@@ -119,8 +115,8 @@ export namespace Server {
          })
        },
      )
-      .get(
-        "/app",
+      .post(
+        "/app_info",
        describeRoute({
          description: "Get app info",
          responses: {
@@ -139,7 +135,7 @@ export namespace Server {
        },
      )
      .post(
-        "/app/init",
+        "/app_initialize",
        describeRoute({
          description: "Initialize the app",
          responses: {
@@ -158,47 +154,69 @@ export namespace Server {
          return c.json(true)
        },
      )
-      .get(
-        "/config",
+      .post(
+        "/session_initialize",
        describeRoute({
-          description: "Get config info",
+          description: "Analyze the app and create an AGENTS.md file",
          responses: {
            200: {
-              description: "Get config info",
+              description: "200",
              content: {
                "application/json": {
-                  schema: resolver(Config.Info),
+                  schema: resolver(z.boolean()),
                },
              },
            },
          },
        }),
+        zValidator(
+          "json",
+          z.object({
+            sessionID: z.string(),
+            providerID: z.string(),
+            modelID: z.string(),
+          }),
+        ),
        async (c) => {
-          return c.json(await Config.get())
-        },
-      )
-      .get(
-        "/session",
-        describeRoute({
-          description: "List all sessions",
-          responses: {
-            200: {
-              description: "List of sessions",
-              content: {
-                "application/json": {
-                  schema: resolver(Session.Info.array()),
-                },
-              },
-            },
-          },
-        }),
-        async (c) => {
-          const sessions = await Array.fromAsync(Session.list())
-          return c.json(sessions)
+          const body = c.req.valid("json")
+          await Session.initialize(body)
+          return c.json(true)
        },
      )
      .post(
-        "/session",
+        "/path_get",
+        describeRoute({
+          description: "Get paths",
+          responses: {
+            200: {
+              description: "200",
+              content: {
+                "application/json": {
+                  schema: resolver(
+                    z.object({
+                      root: z.string(),
+                      data: z.string(),
+                      cwd: z.string(),
+                      config: z.string(),
+                    }),
+                  ),
+                },
+              },
+            },
+          },
+        }),
+        async (c) => {
+          const app = App.info()
+          return c.json({
+            root: app.path.root,
+            data: app.path.data,
+            cwd: app.path.cwd,
+            config: Global.Path.data,
+          })
+        },
+      )
+      .post(
+        "/session_create",
        describeRoute({
          description: "Create a new session",
          responses: {
@@ -218,69 +236,82 @@ export namespace Server {
          return c.json(session)
        },
      )
-      .delete(
-        "/session/:id",
-        describeRoute({
-          description: "Delete a session and all its data",
-          responses: {
-            200: {
-              description: "Successfully deleted session",
-              content: {
-                "application/json": {
-                  schema: resolver(z.boolean()),
-                },
-              },
-            },
-          },
-        }),
-        zValidator(
-          "param",
-          z.object({
-            id: z.string(),
-          }),
-        ),
-        async (c) => {
-          await Session.remove(c.req.valid("param").id)
-          return c.json(true)
-        },
-      )
      .post(
-        "/session/:id/init",
+        "/session_share",
        describeRoute({
-          description: "Analyze the app and create an AGENTS.md file",
+          description: "Share the session",
          responses: {
            200: {
-              description: "200",
+              description: "Successfully shared session",
              content: {
                "application/json": {
-                  schema: resolver(z.boolean()),
+                  schema: resolver(Session.Info),
                },
              },
            },
          },
        }),
-        zValidator(
-          "param",
-          z.object({
-            id: z.string().openapi({ description: "Session ID" }),
-          }),
-        ),
        zValidator(
          "json",
          z.object({
-            providerID: z.string(),
-            modelID: z.string(),
+            sessionID: z.string(),
          }),
        ),
        async (c) => {
-          const sessionID = c.req.valid("param").id
          const body = c.req.valid("json")
-          await Session.initialize({ ...body, sessionID })
-          return c.json(true)
+          await Session.share(body.sessionID)
+          const session = await Session.get(body.sessionID)
+          return c.json(session)
        },
      )
      .post(
-        "/session/:id/abort",
+        "/session_messages",
+        describeRoute({
+          description: "Get messages for a session",
+          responses: {
+            200: {
+              description: "Successfully created session",
+              content: {
+                "application/json": {
+                  schema: resolver(Message.Info.array()),
+                },
+              },
+            },
+          },
+        }),
+        zValidator(
+          "json",
+          z.object({
+            sessionID: z.string(),
+          }),
+        ),
+        async (c) => {
+          const messages = await Session.messages(c.req.valid("json").sessionID)
+          return c.json(messages)
+        },
+      )
+      .post(
+        "/session_list",
+        describeRoute({
+          description: "List all sessions",
+          responses: {
+            200: {
+              description: "List of sessions",
+              content: {
+                "application/json": {
+                  schema: resolver(Session.Info.array()),
+                },
+              },
+            },
+          },
+        }),
+        async (c) => {
+          const sessions = await Array.fromAsync(Session.list())
+          return c.json(sessions)
+        },
+      )
+      .post(
+        "/session_abort",
        describeRoute({
          description: "Abort a session",
          responses: {
@@ -295,78 +326,23 @@ export namespace Server {
          },
        }),
        zValidator(
-          "param",
+          "json",
          z.object({
-            id: z.string(),
+            sessionID: z.string(),
          }),
        ),
        async (c) => {
-          return c.json(Session.abort(c.req.valid("param").id))
+          const body = c.req.valid("json")
+          return c.json(Session.abort(body.sessionID))
        },
      )
      .post(
-        "/session/:id/share",
-        describeRoute({
-          description: "Share a session",
-          responses: {
-            200: {
-              description: "Successfully shared session",
-              content: {
-                "application/json": {
-                  schema: resolver(Session.Info),
-                },
-              },
-            },
-          },
-        }),
-        zValidator(
-          "param",
-          z.object({
-            id: z.string(),
-          }),
-        ),
-        async (c) => {
-          const id = c.req.valid("param").id
-          await Session.share(id)
-          const session = await Session.get(id)
-          return c.json(session)
-        },
-      )
-      .delete(
-        "/session/:id/share",
-        describeRoute({
-          description: "Unshare the session",
-          responses: {
-            200: {
-              description: "Successfully unshared session",
-              content: {
-                "application/json": {
-                  schema: resolver(Session.Info),
-                },
-              },
-            },
-          },
-        }),
-        zValidator(
-          "param",
-          z.object({
-            id: z.string(),
-          }),
-        ),
-        async (c) => {
-          const id = c.req.valid("param").id
-          await Session.unshare(id)
-          const session = await Session.get(id)
-          return c.json(session)
-        },
-      )
-      .post(
-        "/session/:id/summarize",
+        "/session_summarize",
        describeRoute({
          description: "Summarize the session",
          responses: {
            200: {
-              description: "Summarized session",
+              description: "Summarize the session",
              content: {
                "application/json": {
                  schema: resolver(z.boolean()),
@@ -375,90 +351,52 @@ export namespace Server {
            },
          },
        }),
-        zValidator(
-          "param",
-          z.object({
-            id: z.string().openapi({ description: "Session ID" }),
-          }),
-        ),
        zValidator(
          "json",
          z.object({
+            sessionID: z.string(),
            providerID: z.string(),
            modelID: z.string(),
          }),
        ),
        async (c) => {
-          const id = c.req.valid("param").id
          const body = c.req.valid("json")
-          await Session.summarize({ ...body, sessionID: id })
+          await Session.summarize(body)
          return c.json(true)
        },
      )
-      .get(
-        "/session/:id/message",
-        describeRoute({
-          description: "List messages for a session",
-          responses: {
-            200: {
-              description: "List of messages",
-              content: {
-                "application/json": {
-                  schema: resolver(MessageV2.Info.array()),
-                },
-              },
-            },
-          },
-        }),
-        zValidator(
-          "param",
-          z.object({
-            id: z.string().openapi({ description: "Session ID" }),
-          }),
-        ),
-        async (c) => {
-          const messages = await Session.messages(c.req.valid("param").id)
-          return c.json(messages)
-        },
-      )
      .post(
-        "/session/:id/message",
+        "/session_chat",
        describeRoute({
-          description: "Create and send a new message to a session",
+          description: "Chat with a model",
          responses: {
            200: {
-              description: "Created message",
+              description: "Chat with a model",
              content: {
                "application/json": {
-                  schema: resolver(MessageV2.Assistant),
+                  schema: resolver(Message.Info),
                },
              },
            },
          },
        }),
-        zValidator(
-          "param",
-          z.object({
-            id: z.string().openapi({ description: "Session ID" }),
-          }),
-        ),
        zValidator(
          "json",
          z.object({
+            sessionID: z.string(),
            providerID: z.string(),
            modelID: z.string(),
-            parts: MessageV2.UserPart.array(),
+            parts: Message.Part.array(),
          }),
        ),
        async (c) => {
-          const sessionID = c.req.valid("param").id
          const body = c.req.valid("json")
-          const msg = await Session.chat({ ...body, sessionID })
+          const msg = await Session.chat(body)
          return c.json(msg)
        },
      )
-      .get(
-        "/config/providers",
+      .post(
+        "/provider_list",
        describeRoute({
          description: "List all providers",
          responses: {
@@ -468,7 +406,7 @@ export namespace Server {
                "application/json": {
                  schema: resolver(
                    z.object({
-                      providers: ModelsDev.Provider.array(),
+                      providers: Provider.Info.array(),
                      default: z.record(z.string(), z.string()),
                    }),
                  ),
@@ -478,52 +416,25 @@ export namespace Server {
          },
        }),
        async (c) => {
-          const providers = await Provider.list().then((x) => mapValues(x, (item) => item.info))
+          const providers = await Provider.list().then((x) =>
+            mapValues(x, (item) => item.info),
+          )
          return c.json({
            providers: Object.values(providers),
-            default: mapValues(providers, (item) => Provider.sort(Object.values(item.models))[0].id),
+            defaults: mapValues(
+              providers,
+              (item) => Provider.sort(Object.values(item.models))[0].id,
+            ),
          })
        },
      )
-      .get(
-        "/find",
+      .post(
+        "/file_search",
        describeRoute({
-          description: "Find text in files",
+          description: "Search for files",
          responses: {
            200: {
-              description: "Matches",
-              content: {
-                "application/json": {
-                  schema: resolver(Ripgrep.Match.shape.data.array()),
-                },
-              },
-            },
-          },
-        }),
-        zValidator(
-          "query",
-          z.object({
-            pattern: z.string(),
-          }),
-        ),
-        async (c) => {
-          const app = App.info()
-          const pattern = c.req.valid("query").pattern
-          const result = await Ripgrep.search({
-            cwd: app.path.cwd,
-            pattern,
-            limit: 10,
-          })
-          return c.json(result)
-        },
-      )
-      .get(
-        "/find/file",
-        describeRoute({
-          description: "Find files",
-          responses: {
-            200: {
-              description: "File paths",
+              description: "Search for files",
              content: {
                "application/json": {
                  schema: resolver(z.string().array()),
@@ -533,114 +444,18 @@ export namespace Server {
          },
        }),
        zValidator(
-          "query",
+          "json",
          z.object({
            query: z.string(),
          }),
        ),
        async (c) => {
-          const query = c.req.valid("query").query
+          const body = c.req.valid("json")
          const app = App.info()
-          const result = await Ripgrep.files({
-            cwd: app.path.cwd,
-            query,
-            limit: 10,
-          })
+          const result = await Fzf.search(app.path.cwd, body.query)
          return c.json(result)
        },
      )
-      .get(
-        "/find/symbol",
-        describeRoute({
-          description: "Find workspace symbols",
-          responses: {
-            200: {
-              description: "Symbols",
-              content: {
-                "application/json": {
-                  schema: resolver(z.unknown().array()),
-                },
-              },
-            },
-          },
-        }),
-        zValidator(
-          "query",
-          z.object({
-            query: z.string(),
-          }),
-        ),
-        async (c) => {
-          const query = c.req.valid("query").query
-          const result = await LSP.workspaceSymbol(query)
-          return c.json(result)
-        },
-      )
-      .get(
-        "/file",
-        describeRoute({
-          description: "Read a file",
-          responses: {
-            200: {
-              description: "File content",
-              content: {
-                "application/json": {
-                  schema: resolver(
-                    z.object({
-                      type: z.enum(["raw", "patch"]),
-                      content: z.string(),
-                    }),
-                  ),
-                },
-              },
-            },
-          },
-        }),
-        zValidator(
-          "query",
-          z.object({
-            path: z.string(),
-          }),
-        ),
-        async (c) => {
-          const path = c.req.valid("query").path
-          const content = await File.read(path)
-          log.info("read file", {
-            path,
-            content: content.content,
-          })
-          return c.json(content)
-        },
-      )
-      .get(
-        "/file/status",
-        describeRoute({
-          description: "Get file status",
-          responses: {
-            200: {
-              description: "File status",
-              content: {
-                "application/json": {
-                  schema: resolver(
-                    z
-                      .object({
-                        file: z.string(),
-                        added: z.number().int(),
-                        removed: z.number().int(),
-                        status: z.enum(["added", "deleted", "modified"]),
-                      })
-                      .array(),
-                  ),
-                },
-              },
-            },
-          },
-        }),
-        async (c) => {
-          const content = await File.status()
-          return c.json(content)
-        },
-      )

    return result
  }
@@ -660,10 +475,10 @@ export namespace Server {
    return result
  }

-  export function listen(opts: { port: number; hostname: string }) {
+  export function listen() {
    const server = Bun.serve({
-      port: opts.port,
-      hostname: opts.hostname,
+      port: 0,
+      hostname: "0.0.0.0",
      idleTimeout: 0,
      fetch: app().fetch,
    })
@@ -0,0 +1,19 @@
+import { App } from "../app/app"
+import { Filesystem } from "../util/filesystem"
+
+export namespace SessionContext {
+  const FILES = [
+    "AGENTS.md",
+    "CLAUDE.md",
+    "CONTEXT.md", // deprecated
+  ]
+  export async function find() {
+    const { cwd, root } = App.info().path
+    const found = []
+    for (const item of FILES) {
+      const matches = await Filesystem.findUp(item, cwd, root)
+      found.push(...matches.map((x) => Bun.file(x).text()))
+    }
+    return Promise.all(found).then((parts) => parts.join("\n\n"))
+  }
+}
@@ -1,398 +0,0 @@
-import z from "zod"
-import { Bus } from "../bus"
-import { Provider } from "../provider/provider"
-import { NamedError } from "../util/error"
-import { Message } from "./message"
-import { convertToModelMessages, type ModelMessage, type UIMessage } from "ai"
-
-export namespace MessageV2 {
-  export const OutputLengthError = NamedError.create("MessageOutputLengthError", z.object({}))
-
-  export const ToolStatePending = z
-    .object({
-      status: z.literal("pending"),
-    })
-    .openapi({
-      ref: "ToolStatePending",
-    })
-
-  export type ToolStatePending = z.infer<typeof ToolStatePending>
-
-  export const ToolStateRunning = z
-    .object({
-      status: z.literal("running"),
-      input: z.any(),
-      title: z.string().optional(),
-      metadata: z.record(z.any()).optional(),
-      time: z.object({
-        start: z.number(),
-      }),
-    })
-    .openapi({
-      ref: "ToolStateRunning",
-    })
-  export type ToolStateRunning = z.infer<typeof ToolStateRunning>
-
-  export const ToolStateCompleted = z
-    .object({
-      status: z.literal("completed"),
-      input: z.record(z.any()),
-      output: z.string(),
-      title: z.string(),
-      metadata: z.record(z.any()),
-      time: z.object({
-        start: z.number(),
-        end: z.number(),
-      }),
-    })
-    .openapi({
-      ref: "ToolStateCompleted",
-    })
-  export type ToolStateCompleted = z.infer<typeof ToolStateCompleted>
-
-  export const ToolStateError = z
-    .object({
-      status: z.literal("error"),
-      input: z.record(z.any()),
-      error: z.string(),
-      time: z.object({
-        start: z.number(),
-        end: z.number(),
-      }),
-    })
-    .openapi({
-      ref: "ToolStateError",
-    })
-  export type ToolStateError = z.infer<typeof ToolStateError>
-
-  export const ToolState = z
-    .discriminatedUnion("status", [ToolStatePending, ToolStateRunning, ToolStateCompleted, ToolStateError])
-    .openapi({
-      ref: "ToolState",
-    })
-
-  export const TextPart = z
-    .object({
-      type: z.literal("text"),
-      text: z.string(),
-    })
-    .openapi({
-      ref: "TextPart",
-    })
-  export type TextPart = z.infer<typeof TextPart>
-
-  export const ToolPart = z
-    .object({
-      type: z.literal("tool"),
-      id: z.string(),
-      tool: z.string(),
-      state: ToolState,
-    })
-    .openapi({
-      ref: "ToolPart",
-    })
-  export type ToolPart = z.infer<typeof ToolPart>
-
-  export const FilePart = z
-    .object({
-      type: z.literal("file"),
-      mime: z.string(),
-      filename: z.string().optional(),
-      url: z.string(),
-    })
-    .openapi({
-      ref: "FilePart",
-    })
-  export type FilePart = z.infer<typeof FilePart>
-
-  export const StepStartPart = z
-    .object({
-      type: z.literal("step-start"),
-    })
-    .openapi({
-      ref: "StepStartPart",
-    })
-  export type StepStartPart = z.infer<typeof StepStartPart>
-
-  const Base = z.object({
-    id: z.string(),
-    sessionID: z.string(),
-  })
-
-  export const UserPart = z.discriminatedUnion("type", [TextPart, FilePart]).openapi({
-    ref: "UserMessagePart",
-  })
-  export type UserPart = z.infer<typeof UserPart>
-
-  export const User = Base.extend({
-    role: z.literal("user"),
-    parts: z.array(UserPart),
-    time: z.object({
-      created: z.number(),
-    }),
-  }).openapi({
-    ref: "UserMessage",
-  })
-  export type User = z.infer<typeof User>
-
-  export const AssistantPart = z.discriminatedUnion("type", [TextPart, ToolPart, StepStartPart]).openapi({
-    ref: "AssistantMessagePart",
-  })
-  export type AssistantPart = z.infer<typeof AssistantPart>
-
-  export const Assistant = Base.extend({
-    role: z.literal("assistant"),
-    parts: z.array(AssistantPart),
-    time: z.object({
-      created: z.number(),
-      completed: z.number().optional(),
-    }),
-    error: z
-      .discriminatedUnion("name", [Provider.AuthError.Schema, NamedError.Unknown.Schema, OutputLengthError.Schema])
-      .optional(),
-    system: z.string().array(),
-    modelID: z.string(),
-    providerID: z.string(),
-    path: z.object({
-      cwd: z.string(),
-      root: z.string(),
-    }),
-    cost: z.number(),
-    summary: z.boolean().optional(),
-    tokens: z.object({
-      input: z.number(),
-      output: z.number(),
-      reasoning: z.number(),
-      cache: z.object({
-        read: z.number(),
-        write: z.number(),
-      }),
-    }),
-  }).openapi({
-    ref: "AssistantMessage",
-  })
-  export type Assistant = z.infer<typeof Assistant>
-
-  export const Info = z.discriminatedUnion("role", [User, Assistant]).openapi({
-    ref: "Message",
-  })
-  export type Info = z.infer<typeof Info>
-
-  export const Event = {
-    Updated: Bus.event(
-      "message.updated",
-      z.object({
-        info: Info,
-      }),
-    ),
-    Removed: Bus.event(
-      "message.removed",
-      z.object({
-        sessionID: z.string(),
-        messageID: z.string(),
-      }),
-    ),
-    PartUpdated: Bus.event(
-      "message.part.updated",
-      z.object({
-        part: AssistantPart,
-        sessionID: z.string(),
-        messageID: z.string(),
-      }),
-    ),
-  }
-
-  export function fromV1(v1: Message.Info) {
-    if (v1.role === "assistant") {
-      const result: Assistant = {
-        id: v1.id,
-        sessionID: v1.metadata.sessionID,
-        role: "assistant",
-        time: {
-          created: v1.metadata.time.created,
-          completed: v1.metadata.time.completed,
-        },
-        cost: v1.metadata.assistant!.cost,
-        path: v1.metadata.assistant!.path,
-        summary: v1.metadata.assistant!.summary,
-        tokens: v1.metadata.assistant!.tokens,
-        modelID: v1.metadata.assistant!.modelID,
-        providerID: v1.metadata.assistant!.providerID,
-        system: v1.metadata.assistant!.system,
-        error: v1.metadata.error,
-        parts: v1.parts.flatMap((part): AssistantPart[] => {
-          if (part.type === "text") {
-            return [
-              {
-                type: "text",
-                text: part.text,
-              },
-            ]
-          }
-          if (part.type === "step-start") {
-            return [
-              {
-                type: "step-start",
-              },
-            ]
-          }
-          if (part.type === "tool-invocation") {
-            return [
-              {
-                type: "tool",
-                id: part.toolInvocation.toolCallId,
-                tool: part.toolInvocation.toolName,
-                state: (() => {
-                  if (part.toolInvocation.state === "partial-call") {
-                    return {
-                      status: "pending",
-                    }
-                  }
-
-                  const { title, time, ...metadata } = v1.metadata.tool[part.toolInvocation.toolCallId] ?? {}
-                  if (part.toolInvocation.state === "call") {
-                    return {
-                      status: "running",
-                      input: part.toolInvocation.args,
-                      time: {
-                        start: time?.start,
-                      },
-                    }
-                  }
-
-                  if (part.toolInvocation.state === "result") {
-                    return {
-                      status: "completed",
-                      input: part.toolInvocation.args,
-                      output: part.toolInvocation.result,
-                      title,
-                      time,
-                      metadata,
-                    }
-                  }
-                  throw new Error("unknown tool invocation state")
-                })(),
-              },
-            ]
-          }
-          return []
-        }),
-      }
-      return result
-    }
-
-    if (v1.role === "user") {
-      const result: User = {
-        id: v1.id,
-        sessionID: v1.metadata.sessionID,
-        role: "user",
-        time: {
-          created: v1.metadata.time.created,
-        },
-        parts: v1.parts.flatMap((part): UserPart[] => {
-          if (part.type === "text") {
-            return [
-              {
-                type: "text",
-                text: part.text,
-              },
-            ]
-          }
-          if (part.type === "file") {
-            return [
-              {
-                type: "file",
-                mime: part.mediaType,
-                filename: part.filename,
-                url: part.url,
-              },
-            ]
-          }
-          return []
-        }),
-      }
-      return result
-    }
-  }
-
-  export function toModelMessage(input: Info[]): ModelMessage[] {
-    const result: UIMessage[] = []
-
-    for (const msg of input) {
-      if (msg.parts.length === 0) continue
-      if (msg.role === "user") {
-        result.push({
-          id: msg.id,
-          role: "user",
-          parts: msg.parts.flatMap((part): UIMessage["parts"] => {
-            if (part.type === "text")
-              return [
-                {
-                  type: "text",
-                  text: part.text,
-                },
-              ]
-            if (part.type === "file")
-              return [
-                {
-                  type: "file",
-                  url: part.url,
-                  mediaType: part.mime,
-                  filename: part.filename,
-                },
-              ]
-            return []
-          }),
-        })
-      }
-
-      if (msg.role === "assistant") {
-        result.push({
-          id: msg.id,
-          role: "assistant",
-          parts: msg.parts.flatMap((part): UIMessage["parts"] => {
-            if (part.type === "text")
-              return [
-                {
-                  type: "text",
-                  text: part.text,
-                },
-              ]
-            if (part.type === "step-start")
-              return [
-                {
-                  type: "step-start",
-                },
-              ]
-            if (part.type === "tool") {
-              if (part.state.status === "completed")
-                return [
-                  {
-                    type: ("tool-" + part.tool) as `tool-${string}`,
-                    state: "output-available",
-                    toolCallId: part.id,
-                    input: part.state.input,
-                    output: part.state.output,
-                  },
-                ]
-              if (part.state.status === "error")
-                return [
-                  {
-                    type: ("tool-" + part.tool) as `tool-${string}`,
-                    state: "output-error",
-                    toolCallId: part.id,
-                    input: part.state.input,
-                    errorText: part.state.error,
-                  },
-                ]
-            }
-
-            return []
-          }),
-        })
-      }
-    }
-
-    return convertToModelMessages(result)
-  }
-}
@@ -1,10 +1,9 @@
 import z from "zod"
+import { Bus } from "../bus"
 import { Provider } from "../provider/provider"
 import { NamedError } from "../util/error"

 export namespace Message {
-  export const OutputLengthError = NamedError.create("MessageOutputLengthError", z.object({}))
-
  export const ToolCall = z
    .object({
      state: z.literal("call"),
@@ -14,7 +13,7 @@ export namespace Message {
      args: z.custom<Required<unknown>>(),
    })
    .openapi({
-      ref: "ToolCall",
+      ref: "Message.ToolInvocation.ToolCall",
    })
  export type ToolCall = z.infer<typeof ToolCall>

@@ -27,7 +26,7 @@ export namespace Message {
      args: z.custom<Required<unknown>>(),
    })
    .openapi({
-      ref: "ToolPartialCall",
+      ref: "Message.ToolInvocation.ToolPartialCall",
    })
  export type ToolPartialCall = z.infer<typeof ToolPartialCall>

@@ -41,13 +40,15 @@ export namespace Message {
      result: z.string(),
    })
    .openapi({
-      ref: "ToolResult",
+      ref: "Message.ToolInvocation.ToolResult",
    })
  export type ToolResult = z.infer<typeof ToolResult>

-  export const ToolInvocation = z.discriminatedUnion("state", [ToolCall, ToolPartialCall, ToolResult]).openapi({
-    ref: "ToolInvocation",
-  })
+  export const ToolInvocation = z
+    .discriminatedUnion("state", [ToolCall, ToolPartialCall, ToolResult])
+    .openapi({
+      ref: "Message.ToolInvocation",
+    })
  export type ToolInvocation = z.infer<typeof ToolInvocation>

  export const TextPart = z
@@ -56,7 +57,7 @@ export namespace Message {
      text: z.string(),
    })
    .openapi({
-      ref: "TextPart",
+      ref: "Message.Part.Text",
    })
  export type TextPart = z.infer<typeof TextPart>

@@ -67,7 +68,7 @@ export namespace Message {
      providerMetadata: z.record(z.any()).optional(),
    })
    .openapi({
-      ref: "ReasoningPart",
+      ref: "Message.Part.Reasoning",
    })
  export type ReasoningPart = z.infer<typeof ReasoningPart>

@@ -77,7 +78,7 @@ export namespace Message {
      toolInvocation: ToolInvocation,
    })
    .openapi({
-      ref: "ToolInvocationPart",
+      ref: "Message.Part.ToolInvocation",
    })
  export type ToolInvocationPart = z.infer<typeof ToolInvocationPart>

@@ -90,7 +91,7 @@ export namespace Message {
      providerMetadata: z.record(z.any()).optional(),
    })
    .openapi({
-      ref: "SourceUrlPart",
+      ref: "Message.Part.SourceUrl",
    })
  export type SourceUrlPart = z.infer<typeof SourceUrlPart>

@@ -102,7 +103,7 @@ export namespace Message {
      url: z.string(),
    })
    .openapi({
-      ref: "FilePart",
+      ref: "Message.Part.File",
    })
  export type FilePart = z.infer<typeof FilePart>

@@ -111,77 +112,88 @@ export namespace Message {
      type: z.literal("step-start"),
    })
    .openapi({
-      ref: "StepStartPart",
+      ref: "Message.Part.StepStart",
    })
  export type StepStartPart = z.infer<typeof StepStartPart>

-  export const MessagePart = z
-    .discriminatedUnion("type", [TextPart, ReasoningPart, ToolInvocationPart, SourceUrlPart, FilePart, StepStartPart])
+  export const Part = z
+    .discriminatedUnion("type", [
+      TextPart,
+      ReasoningPart,
+      ToolInvocationPart,
+      SourceUrlPart,
+      FilePart,
+      StepStartPart,
+    ])
    .openapi({
-      ref: "MessagePart",
+      ref: "Message.Part",
    })
-  export type MessagePart = z.infer<typeof MessagePart>
+  export type Part = z.infer<typeof Part>

  export const Info = z
    .object({
      id: z.string(),
      role: z.enum(["user", "assistant"]),
-      parts: z.array(MessagePart),
-      metadata: z
-        .object({
-          time: z.object({
-            created: z.number(),
-            completed: z.number().optional(),
-          }),
-          error: z
-            .discriminatedUnion("name", [
-              Provider.AuthError.Schema,
-              NamedError.Unknown.Schema,
-              OutputLengthError.Schema,
-            ])
-            .optional(),
-          sessionID: z.string(),
-          tool: z.record(
-            z.string(),
-            z
-              .object({
-                title: z.string(),
-                snapshot: z.string().optional(),
-                time: z.object({
-                  start: z.number(),
-                  end: z.number(),
-                }),
-              })
-              .catchall(z.any()),
-          ),
-          assistant: z
+      parts: z.array(Part),
+      metadata: z.object({
+        time: z.object({
+          created: z.number(),
+          completed: z.number().optional(),
+        }),
+        error: z
+          .discriminatedUnion("name", [
+            Provider.AuthError.Schema,
+            NamedError.Unknown.Schema,
+          ])
+          .optional(),
+        sessionID: z.string(),
+        tool: z.record(
+          z.string(),
+          z
            .object({
-              system: z.string().array(),
-              modelID: z.string(),
-              providerID: z.string(),
-              path: z.object({
-                cwd: z.string(),
-                root: z.string(),
-              }),
-              cost: z.number(),
-              summary: z.boolean().optional(),
-              tokens: z.object({
-                input: z.number(),
-                output: z.number(),
-                reasoning: z.number(),
-                cache: z.object({
-                  read: z.number(),
-                  write: z.number(),
-                }),
+              title: z.string(),
+              time: z.object({
+                start: z.number(),
+                end: z.number(),
              }),
            })
-            .optional(),
-          snapshot: z.string().optional(),
-        })
-        .openapi({ ref: "MessageMetadata" }),
+            .catchall(z.any()),
+        ),
+        assistant: z
+          .object({
+            system: z.string().array(),
+            modelID: z.string(),
+            providerID: z.string(),
+            path: z.object({
+              cwd: z.string(),
+              root: z.string(),
+            }),
+            cost: z.number(),
+            summary: z.boolean().optional(),
+            tokens: z.object({
+              input: z.number(),
+              output: z.number(),
+              reasoning: z.number(),
+            }),
+          })
+          .optional(),
+      }),
    })
    .openapi({
-      ref: "Message",
+      ref: "Message.Info",
    })
  export type Info = z.infer<typeof Info>
+
+  export const Event = {
+    Updated: Bus.event(
+      "message.updated",
+      z.object({
+        info: Info,
+      }),
+    ),
+    PartUpdated: Bus.event(
+      "message.part.updated",
+      z.object({ part: Part, sessionID: z.string(), messageID: z.string() }),
+    ),
+  }
 }
@@ -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).
@@ -134,7 +134,7 @@ The user will primarily request you perform software engineering tasks. This inc
 - Use the available search tools to understand the codebase and the user's query. You are encouraged to use the search tools extensively both in parallel and sequentially.
 - Implement the solution using all tools available to you
 - Verify the solution if possible with tests. NEVER assume specific test framework or test script. Check the README or search codebase to determine the testing approach.
- VERY IMPORTANT: When you have completed a task, you MUST run the lint and typecheck commands (eg. npm run lint, npm run typecheck, ruff, etc.) with Bash if they were provided to you to ensure your code is correct. If you are unable to find the correct command, ask the user for the command to run and if they supply it, proactively suggest writing it to AGENTS.md so that you will know to run it next time.
+- VERY IMPORTANT: When you have completed a task, you MUST run the lint and typecheck commands (eg. npm run lint, npm run typecheck, ruff, etc.) with Bash if they were provided to you to ensure your code is correct. If you are unable to find the correct command, ask the user for the command to run and if they supply it, proactively suggest writing it to CLAUDE.md so that you will know to run it next time.
 NEVER commit changes unless the user explicitly asks you to. It is VERY IMPORTANT to only commit when explicitly asked, otherwise the user will feel that you are being too proactive.

 - Tool results and user messages may include <system-reminder> tags. <system-reminder> tags contain useful information and reminders. They are NOT part of the user's provided input or the tool result.
@@ -1,11 +1,7 @@
-Generate a short title based on the first message a user begins a conversation with. CRITICAL: Your response must be EXACTLY one line with NO line breaks, newlines, or multiple sentences.
-
-Requirements:
- Maximum 50 characters
- Single line only - NO newlines or line breaks
- Summary of the user's message
- No quotes, colons, or special formatting
- Do not include explanatory text like "summary:" or similar
- Your entire response becomes the title
-
-IMPORTANT: Return only the title text on a single line. Do not add any explanations, formatting, or additional text.
+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
+- do not use quotes or colons
+- the entire text you return will be used as the title
+- never return anything that is more than one sentence (one line) long
@@ -1,10 +1,6 @@
 import { App } from "../app/app"
-import { Ripgrep } from "../file/ripgrep"
-import { Global } from "../global"
+import { ListTool } from "../tool/ls"
 import { Filesystem } from "../util/filesystem"
-import { Config } from "../config/config"
-import path from "path"
-import os from "os"

 import PROMPT_ANTHROPIC from "./prompt/anthropic.txt"
 import PROMPT_ANTHROPIC_SPOOF from "./prompt/anthropic_spoof.txt"
@@ -26,7 +22,7 @@ export namespace SystemPrompt {
    return result
  }

-  export async function environment() {
+  export async function environment(sessionID: string) {
    const app = App.info()
    return [
      [
@@ -38,14 +34,7 @@ export namespace SystemPrompt {
        `  Today's date: ${new Date().toDateString()}`,
        `</env>`,
        `<project>`,
-        `  ${
-          app.git
-            ? await Ripgrep.tree({
-                cwd: app.path.cwd,
-                limit: 200,
-              })
-            : ""
-        }`,
+        `  ${app.git ? await ListTool.execute({ path: app.path.cwd, ignore: [] }, { sessionID: sessionID, messageID: "", abort: AbortSignal.any([]) }).then((x) => x.output) : ""}`,
        `</project>`,
      ].join("\n"),
    ]
@@ -56,38 +45,14 @@ export namespace SystemPrompt {
    "CLAUDE.md",
    "CONTEXT.md", // deprecated
  ]
-
  export async function custom() {
    const { cwd, root } = App.info().path
-    const config = await Config.get()
    const found = []
    for (const item of CUSTOM_FILES) {
      const matches = await Filesystem.findUp(item, cwd, root)
      found.push(...matches.map((x) => Bun.file(x).text()))
    }
-    found.push(
-      Bun.file(path.join(Global.Path.config, "AGENTS.md"))
-        .text()
-        .catch(() => ""),
-    )
-    found.push(
-      Bun.file(path.join(os.homedir(), ".claude", "CLAUDE.md"))
-        .text()
-        .catch(() => ""),
-    )
-
-    if (config.instructions) {
-      for (const instruction of config.instructions) {
-        try {
-          const matches = await Filesystem.globUp(instruction, cwd, root)
-          found.push(...matches.map((x) => Bun.file(x).text()))
-        } catch {
-          continue // Skip invalid glob patterns
-        }
-      }
-    }
-
-    return Promise.all(found).then((result) => result.filter(Boolean))
+    return Promise.all(found)
  }

  export function summarize(providerID: string) {
@@ -1,5 +1,5 @@
+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"
@@ -10,14 +10,19 @@ export namespace Share {
  let queue: Promise<void> = Promise.resolve()
  const pending = new Map<string, any>()

+  const state = App.state("share", async () => {
+    Bus.subscribe(Storage.Event.Write, async (payload) => {
+      await sync(payload.properties.key, payload.properties.content)
+    })
+  })
+
  export async function sync(key: string, content: any) {
    const [root, ...splits] = key.split("/")
    if (root !== "session") return
-    const [sub, sessionID] = splits
-    if (sub === "share") return
-    const share = await Session.getShare(sessionID).catch(() => {})
-    if (!share) return
-    const { secret } = share
+    const [, sessionID] = splits
+    const session = await Session.get(sessionID)
+    if (!session.share) return
+    const { secret } = session.share
    pending.set(key, content)
    queue = queue
      .then(async () => {
@@ -45,15 +50,12 @@ export namespace Share {
      })
  }

-  export function init() {
-    Bus.subscribe(Storage.Event.Write, async (payload) => {
-      await sync(payload.properties.key, payload.properties.content)
-    })
+  export async function init() {
+    await state()
  }

  export const URL =
-    process.env["OPENCODE_API"] ??
-    (Installation.isSnapshot() || Installation.isDev() ? "https://api.dev.opencode.ai" : "https://api.opencode.ai")
+    process.env["OPENCODE_API"] ?? "https://api.dev.opencode.ai"

  export async function create(sessionID: string) {
    return fetch(`${URL}/share_create`, {
@@ -63,11 +65,4 @@ export namespace Share {
      .then((x) => x.json())
      .then((x) => x as { url: string; secret: string })
  }
-
-  export async function remove(sessionID: string, secret: string) {
-    return fetch(`${URL}/share_delete`, {
-      method: "POST",
-      body: JSON.stringify({ sessionID, secret }),
-    }).then((x) => x.json())
-  }
 }
@@ -1,65 +0,0 @@
-import { App } from "../app/app"
-import { $ } from "bun"
-import path from "path"
-import fs from "fs/promises"
-import { Ripgrep } from "../file/ripgrep"
-import { Log } from "../util/log"
-
-export namespace Snapshot {
-  const log = Log.create({ service: "snapshot" })
-
-  export async function create(sessionID: string) {
-    return
-    log.info("creating snapshot")
-    const app = App.info()
-    const git = gitdir(sessionID)
-
-    // not a git repo, check if too big to snapshot
-    if (!app.git) {
-      const files = await Ripgrep.files({
-        cwd: app.path.cwd,
-        limit: 1000,
-      })
-      log.info("found files", { count: files.length })
-      if (files.length > 1000) return
-    }
-
-    if (await fs.mkdir(git, { recursive: true })) {
-      await $`git init`
-        .env({
-          ...process.env,
-          GIT_DIR: git,
-          GIT_WORK_TREE: app.path.root,
-        })
-        .quiet()
-        .nothrow()
-      log.info("initialized")
-    }
-
-    await $`git --git-dir ${git} add .`.quiet().cwd(app.path.cwd).nothrow()
-    log.info("added files")
-
-    const result =
-      await $`git --git-dir ${git} commit --allow-empty -m "snapshot" --author="opencode <mail@opencode.ai>"`
-        .quiet()
-        .cwd(app.path.cwd)
-        .nothrow()
-    log.info("commit")
-
-    const match = result.stdout.toString().match(/\[.+ ([a-f0-9]+)\]/)
-    if (!match) return
-    return match![1]
-  }
-
-  export async function restore(sessionID: string, commit: string) {
-    log.info("restore", { commit })
-    const app = App.info()
-    const git = gitdir(sessionID)
-    await $`git --git-dir=${git} checkout ${commit} --force`.quiet().cwd(app.path.root)
-  }
-
-  function gitdir(sessionID: string) {
-    const app = App.info()
-    return path.join(app.path.data, "snapshot", sessionID)
-  }
-}
@@ -4,79 +4,36 @@ import { Bus } from "../bus"
 import path from "path"
 import z from "zod"
 import fs from "fs/promises"
-import { MessageV2 } from "../session/message-v2"

 export namespace Storage {
  const log = Log.create({ service: "storage" })

  export const Event = {
-    Write: Bus.event("storage.write", z.object({ key: z.string(), content: z.any() })),
+    Write: Bus.event(
+      "storage.write",
+      z.object({ key: z.string(), content: z.any() }),
+    ),
  }

-  type Migration = (dir: string) => Promise<void>
-
-  const MIGRATIONS: Migration[] = [
-    async (dir: string) => {
-      try {
-        const files = new Bun.Glob("session/message/*/*.json").scanSync({
-          cwd: dir,
-          absolute: true,
-        })
-        for (const file of files) {
-          const content = await Bun.file(file).json()
-          if (!content.metadata) continue
-          log.info("migrating to v2 message", { file })
-          try {
-            const result = MessageV2.fromV1(content)
-            await Bun.write(file, JSON.stringify(result, null, 2))
-          } catch (e) {
-            await fs.rename(file, file.replace("storage", "broken"))
-          }
-        }
-      } catch {}
-    },
-  ]
-
-  const state = App.state("storage", async () => {
+  const state = App.state("storage", () => {
    const app = App.info()
    const dir = path.join(app.path.data, "storage")
-    const migration = await Bun.file(path.join(dir, "migration"))
-      .json()
-      .then((x) => parseInt(x))
-      .catch(() => 0)
-    for (let index = migration; index < MIGRATIONS.length; index++) {
-      log.info("running migration", { index })
-      const migration = MIGRATIONS[index]
-      await migration(dir)
-      await Bun.write(path.join(dir, "migration"), (index + 1).toString())
-    }
+    log.info("init", { path: dir })
    return {
      dir,
    }
  })

-  export async function remove(key: string) {
-    const dir = await state().then((x) => x.dir)
-    const target = path.join(dir, key + ".json")
-    await fs.unlink(target).catch(() => {})
-  }
-
-  export async function removeDir(key: string) {
-    const dir = await state().then((x) => x.dir)
-    const target = path.join(dir, key)
-    await fs.rm(target, { recursive: true, force: true }).catch(() => {})
-  }
+  const locks = new Map<string, Promise<void>>()

  export async function readJSON<T>(key: string) {
-    const dir = await state().then((x) => x.dir)
-    return Bun.file(path.join(dir, key + ".json")).json() as Promise<T>
+    return Bun.file(path.join(state().dir, key + ".json")).json() as Promise<T>
  }

  export async function writeJSON<T>(key: string, content: T) {
-    const dir = await state().then((x) => x.dir)
-    const target = path.join(dir, key + ".json")
+    const target = path.join(state().dir, key + ".json")
    const tmp = target + Date.now() + ".tmp"
-    await Bun.write(tmp, JSON.stringify(content, null, 2))
+    await Bun.write(tmp, JSON.stringify(content))
    await fs.rename(tmp, target).catch(() => {})
    await fs.unlink(tmp).catch(() => {})
    Bus.publish(Event.Write, { key, content })
@@ -84,10 +41,9 @@ export namespace Storage {

  const glob = new Bun.Glob("**/*")
  export async function* list(prefix: string) {
-    const dir = await state().then((x) => x.dir)
    try {
      for await (const item of glob.scan({
-        cwd: path.join(dir, prefix),
+        cwd: path.join(state().dir, prefix),
        onlyFiles: true,
      })) {
        const result = path.join(prefix, item.slice(0, -5))
@@ -1,18 +1,41 @@
 import { z } from "zod"
 import { Tool } from "./tool"
 import DESCRIPTION from "./bash.txt"
-import { App } from "../app/app"

 const MAX_OUTPUT_LENGTH = 30000
+const BANNED_COMMANDS = [
+  "alias",
+  "curl",
+  "curlie",
+  "wget",
+  "axel",
+  "aria2c",
+  "nc",
+  "telnet",
+  "lynx",
+  "w3m",
+  "links",
+  "httpie",
+  "xh",
+  "http-prompt",
+  "chrome",
+  "firefox",
+  "safari",
+]
 const DEFAULT_TIMEOUT = 1 * 60 * 1000
 const MAX_TIMEOUT = 10 * 60 * 1000

 export const BashTool = Tool.define({
-  id: "bash",
+  id: "opencode.bash",
  description: DESCRIPTION,
  parameters: z.object({
    command: z.string().describe("The command to execute"),
-    timeout: z.number().min(0).max(MAX_TIMEOUT).describe("Optional timeout in milliseconds").optional(),
+    timeout: z
+      .number()
+      .min(0)
+      .max(MAX_TIMEOUT)
+      .describe("Optional timeout in milliseconds")
+      .nullable(),
    description: z
      .string()
      .describe(
@@ -21,10 +44,11 @@ export const BashTool = Tool.define({
  }),
  async execute(params, ctx) {
    const timeout = Math.min(params.timeout ?? DEFAULT_TIMEOUT, MAX_TIMEOUT)
+    if (BANNED_COMMANDS.some((item) => params.command.startsWith(item)))
+      throw new Error(`Command '${params.command}' is not allowed`)

    const process = Bun.spawn({
      cmd: ["bash", "-c", params.command],
-      cwd: App.info().path.cwd,
      maxBuffer: MAX_OUTPUT_LENGTH,
      signal: ctx.abort,
      timeout: timeout,
@@ -36,14 +60,13 @@ export const BashTool = Tool.define({
    const stderr = await new Response(process.stderr).text()

    return {
-      title: params.command,
      metadata: {
        stderr,
        stdout,
-        exit: process.exitCode,
        description: params.description,
+        title: params.command,
      },
-      output: [`<stdout>`, stdout ?? "", `</stdout>`, `<stderr>`, stderr ?? "", `</stderr>`].join("\n"),
+      output: stdout.replaceAll(/\x1b\[[0-9;]*m/g, ""),
    }
  },
 })
@@ -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>
@@ -1,42 +1,41 @@
-// the approaches in this edit tool are sourced from
-// https://github.com/cline/cline/blob/main/evals/diff-edits/diff-apply/diff-06-23-25.ts
-// https://github.com/google-gemini/gemini-cli/blob/main/packages/core/src/utils/editCorrector.ts
-
 import { z } from "zod"
 import * as path from "path"
 import { Tool } from "./tool"
+import { FileTimes } from "./util/file-times"
 import { LSP } from "../lsp"
 import { createTwoFilesPatch } from "diff"
 import { Permission } from "../permission"
 import DESCRIPTION from "./edit.txt"
 import { App } from "../app/app"
-import { File } from "../file"
-import { Bus } from "../bus"
-import { FileTime } from "../file/time"

 export const EditTool = Tool.define({
-  id: "edit",
+  id: "opencode.edit",
  description: DESCRIPTION,
  parameters: z.object({
    filePath: z.string().describe("The absolute path to the file to modify"),
    oldString: z.string().describe("The text to replace"),
-    newString: z.string().describe("The text to replace it with (must be different from old_string)"),
-    replaceAll: z.boolean().optional().describe("Replace all occurrences of old_string (default false)"),
+    newString: z
+      .string()
+      .describe(
+        "The text to replace it with (must be different from old_string)",
+      ),
+    replaceAll: z
+      .boolean()
+      .nullable()
+      .describe("Replace all occurences of old_string (default false)"),
  }),
  async execute(params, ctx) {
    if (!params.filePath) {
      throw new Error("filePath is required")
    }

-    if (params.oldString === params.newString) {
-      throw new Error("oldString and newString must be different")
-    }
-
    const app = App.info()
-    const filepath = path.isAbsolute(params.filePath) ? params.filePath : path.join(app.path.cwd, params.filePath)
+    const filepath = path.isAbsolute(params.filePath)
+      ? params.filePath
+      : path.join(app.path.cwd, params.filePath)

    await Permission.ask({
-      id: "edit",
+      id: "opencode.edit",
      sessionID: ctx.sessionID,
      title: "Edit this file: " + filepath,
      metadata: {
@@ -52,30 +51,45 @@ export const EditTool = Tool.define({
      if (params.oldString === "") {
        contentNew = params.newString
        await Bun.write(filepath, params.newString)
-        await Bus.publish(File.Event.Edited, {
-          file: filepath,
-        })
        return
      }

      const file = Bun.file(filepath)
-      const stats = await file.stat().catch(() => {})
-      if (!stats) throw new Error(`File ${filepath} not found`)
-      if (stats.isDirectory()) throw new Error(`Path is a directory, not a file: ${filepath}`)
-      await FileTime.assert(ctx.sessionID, filepath)
+      if (!(await file.exists())) throw new Error(`File ${filepath} not found`)
+      const stats = await file.stat()
+      if (stats.isDirectory())
+        throw new Error(`Path is a directory, not a file: ${filepath}`)
+      await FileTimes.assert(ctx.sessionID, filepath)
      contentOld = await file.text()
+      const index = contentOld.indexOf(params.oldString)
+      if (index === -1)
+        throw new Error(
+          `oldString not found in file. Make sure it matches exactly, including whitespace and line breaks`,
+        )
+
+      if (params.replaceAll) {
+        contentNew = contentOld.replaceAll(params.oldString, params.newString)
+      }
+
+      if (!params.replaceAll) {
+        const lastIndex = contentOld.lastIndexOf(params.oldString)
+        if (index !== lastIndex)
+          throw new Error(
+            `oldString appears multiple times in the file. Please provide more context to ensure a unique match`,
+          )
+
+        contentNew =
+          contentOld.substring(0, index) +
+          params.newString +
+          contentOld.substring(index + params.oldString.length)
+      }

-      contentNew = replace(contentOld, params.oldString, params.newString, params.replaceAll)
      await file.write(contentNew)
-      await Bus.publish(File.Event.Edited, {
-        file: filepath,
-      })
-      contentNew = await file.text()
    })()

-    const diff = trimDiff(createTwoFilesPatch(filepath, filepath, contentOld, contentNew))
+    const diff = createTwoFilesPatch(filepath, filepath, contentOld, contentNew)

-    FileTime.read(ctx.sessionID, filepath)
+    FileTimes.read(ctx.sessionID, filepath)

    let output = ""
    await LSP.touchFile(filepath, true)
@@ -93,382 +107,9 @@ export const EditTool = Tool.define({
      metadata: {
        diagnostics,
        diff,
+        title: `${path.relative(app.path.root, filepath)}`,
      },
-      title: `${path.relative(app.path.root, filepath)}`,
      output,
    }
  },
 })
-
-export type Replacer = (content: string, find: string) => Generator<string, void, unknown>
-
-export const SimpleReplacer: Replacer = function* (_content, find) {
-  yield find
-}
-
-export const LineTrimmedReplacer: Replacer = function* (content, find) {
-  const originalLines = content.split("\n")
-  const searchLines = find.split("\n")
-
-  if (searchLines[searchLines.length - 1] === "") {
-    searchLines.pop()
-  }
-
-  for (let i = 0; i <= originalLines.length - searchLines.length; i++) {
-    let matches = true
-
-    for (let j = 0; j < searchLines.length; j++) {
-      const originalTrimmed = originalLines[i + j].trim()
-      const searchTrimmed = searchLines[j].trim()
-
-      if (originalTrimmed !== searchTrimmed) {
-        matches = false
-        break
-      }
-    }
-
-    if (matches) {
-      let matchStartIndex = 0
-      for (let k = 0; k < i; k++) {
-        matchStartIndex += originalLines[k].length + 1
-      }
-
-      let matchEndIndex = matchStartIndex
-      for (let k = 0; k < searchLines.length; k++) {
-        matchEndIndex += originalLines[i + k].length + 1
-      }
-
-      yield content.substring(matchStartIndex, matchEndIndex)
-    }
-  }
-}
-
-export const BlockAnchorReplacer: Replacer = function* (content, find) {
-  const originalLines = content.split("\n")
-  const searchLines = find.split("\n")
-
-  if (searchLines.length < 3) {
-    return
-  }
-
-  if (searchLines[searchLines.length - 1] === "") {
-    searchLines.pop()
-  }
-
-  const firstLineSearch = searchLines[0].trim()
-  const lastLineSearch = searchLines[searchLines.length - 1].trim()
-
-  // Find blocks where first line matches the search first line
-  for (let i = 0; i < originalLines.length; i++) {
-    if (originalLines[i].trim() !== firstLineSearch) {
-      continue
-    }
-
-    // Look for the matching last line after this first line
-    for (let j = i + 2; j < originalLines.length; j++) {
-      if (originalLines[j].trim() === lastLineSearch) {
-        // Found a potential block from i to j
-        let matchStartIndex = 0
-        for (let k = 0; k < i; k++) {
-          matchStartIndex += originalLines[k].length + 1
-        }
-
-        let matchEndIndex = matchStartIndex
-        for (let k = 0; k <= j - i; k++) {
-          matchEndIndex += originalLines[i + k].length
-          if (k < j - i) {
-            matchEndIndex += 1 // Add newline character except for the last line
-          }
-        }
-
-        yield content.substring(matchStartIndex, matchEndIndex)
-        break // Only match the first occurrence of the last line
-      }
-    }
-  }
-}
-
-export const WhitespaceNormalizedReplacer: Replacer = function* (content, find) {
-  const normalizeWhitespace = (text: string) => text.replace(/\s+/g, " ").trim()
-  const normalizedFind = normalizeWhitespace(find)
-
-  // Handle single line matches
-  const lines = content.split("\n")
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i]
-    if (normalizeWhitespace(line) === normalizedFind) {
-      yield line
-    }
-
-    // Also check for substring matches within lines
-    const normalizedLine = normalizeWhitespace(line)
-    if (normalizedLine.includes(normalizedFind)) {
-      // Find the actual substring in the original line that matches
-      const words = find.trim().split(/\s+/)
-      if (words.length > 0) {
-        const pattern = words.map((word) => word.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("\\s+")
-        try {
-          const regex = new RegExp(pattern)
-          const match = line.match(regex)
-          if (match) {
-            yield match[0]
-          }
-        } catch (e) {
-          // Invalid regex pattern, skip
-        }
-      }
-    }
-  }
-
-  // Handle multi-line matches
-  const findLines = find.split("\n")
-  if (findLines.length > 1) {
-    for (let i = 0; i <= lines.length - findLines.length; i++) {
-      const block = lines.slice(i, i + findLines.length)
-      if (normalizeWhitespace(block.join("\n")) === normalizedFind) {
-        yield block.join("\n")
-      }
-    }
-  }
-}
-
-export const IndentationFlexibleReplacer: Replacer = function* (content, find) {
-  const removeIndentation = (text: string) => {
-    const lines = text.split("\n")
-    const nonEmptyLines = lines.filter((line) => line.trim().length > 0)
-    if (nonEmptyLines.length === 0) return text
-
-    const minIndent = Math.min(
-      ...nonEmptyLines.map((line) => {
-        const match = line.match(/^(\s*)/)
-        return match ? match[1].length : 0
-      }),
-    )
-
-    return lines.map((line) => (line.trim().length === 0 ? line : line.slice(minIndent))).join("\n")
-  }
-
-  const normalizedFind = removeIndentation(find)
-  const contentLines = content.split("\n")
-  const findLines = find.split("\n")
-
-  for (let i = 0; i <= contentLines.length - findLines.length; i++) {
-    const block = contentLines.slice(i, i + findLines.length).join("\n")
-    if (removeIndentation(block) === normalizedFind) {
-      yield block
-    }
-  }
-}
-
-export const EscapeNormalizedReplacer: Replacer = function* (content, find) {
-  const unescapeString = (str: string): string => {
-    return str.replace(/\\(n|t|r|'|"|`|\\|\n|\$)/g, (match, capturedChar) => {
-      switch (capturedChar) {
-        case "n":
-          return "\n"
-        case "t":
-          return "\t"
-        case "r":
-          return "\r"
-        case "'":
-          return "'"
-        case '"':
-          return '"'
-        case "`":
-          return "`"
-        case "\\":
-          return "\\"
-        case "\n":
-          return "\n"
-        case "$":
-          return "$"
-        default:
-          return match
-      }
-    })
-  }
-
-  const unescapedFind = unescapeString(find)
-
-  // Try direct match with unescaped find string
-  if (content.includes(unescapedFind)) {
-    yield unescapedFind
-  }
-
-  // Also try finding escaped versions in content that match unescaped find
-  const lines = content.split("\n")
-  const findLines = unescapedFind.split("\n")
-
-  for (let i = 0; i <= lines.length - findLines.length; i++) {
-    const block = lines.slice(i, i + findLines.length).join("\n")
-    const unescapedBlock = unescapeString(block)
-
-    if (unescapedBlock === unescapedFind) {
-      yield block
-    }
-  }
-}
-
-export const MultiOccurrenceReplacer: Replacer = function* (content, find) {
-  // This replacer yields all exact matches, allowing the replace function
-  // to handle multiple occurrences based on replaceAll parameter
-  let startIndex = 0
-
-  while (true) {
-    const index = content.indexOf(find, startIndex)
-    if (index === -1) break
-
-    yield find
-    startIndex = index + find.length
-  }
-}
-
-export const TrimmedBoundaryReplacer: Replacer = function* (content, find) {
-  const trimmedFind = find.trim()
-
-  if (trimmedFind === find) {
-    // Already trimmed, no point in trying
-    return
-  }
-
-  // Try to find the trimmed version
-  if (content.includes(trimmedFind)) {
-    yield trimmedFind
-  }
-
-  // Also try finding blocks where trimmed content matches
-  const lines = content.split("\n")
-  const findLines = find.split("\n")
-
-  for (let i = 0; i <= lines.length - findLines.length; i++) {
-    const block = lines.slice(i, i + findLines.length).join("\n")
-
-    if (block.trim() === trimmedFind) {
-      yield block
-    }
-  }
-}
-
-export const ContextAwareReplacer: Replacer = function* (content, find) {
-  const findLines = find.split("\n")
-  if (findLines.length < 3) {
-    // Need at least 3 lines to have meaningful context
-    return
-  }
-
-  // Remove trailing empty line if present
-  if (findLines[findLines.length - 1] === "") {
-    findLines.pop()
-  }
-
-  const contentLines = content.split("\n")
-
-  // Extract first and last lines as context anchors
-  const firstLine = findLines[0].trim()
-  const lastLine = findLines[findLines.length - 1].trim()
-
-  // Find blocks that start and end with the context anchors
-  for (let i = 0; i < contentLines.length; i++) {
-    if (contentLines[i].trim() !== firstLine) continue
-
-    // Look for the matching last line
-    for (let j = i + 2; j < contentLines.length; j++) {
-      if (contentLines[j].trim() === lastLine) {
-        // Found a potential context block
-        const blockLines = contentLines.slice(i, j + 1)
-        const block = blockLines.join("\n")
-
-        // Check if the middle content has reasonable similarity
-        // (simple heuristic: at least 50% of non-empty lines should match when trimmed)
-        if (blockLines.length === findLines.length) {
-          let matchingLines = 0
-          let totalNonEmptyLines = 0
-
-          for (let k = 1; k < blockLines.length - 1; k++) {
-            const blockLine = blockLines[k].trim()
-            const findLine = findLines[k].trim()
-
-            if (blockLine.length > 0 || findLine.length > 0) {
-              totalNonEmptyLines++
-              if (blockLine === findLine) {
-                matchingLines++
-              }
-            }
-          }
-
-          if (totalNonEmptyLines === 0 || matchingLines / totalNonEmptyLines >= 0.5) {
-            yield block
-            break // Only match the first occurrence
-          }
-        }
-        break
-      }
-    }
-  }
-}
-
-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")
-}
-
-export function replace(content: string, oldString: string, newString: string, replaceAll = false): string {
-  if (oldString === newString) {
-    throw new Error("oldString and newString must be different")
-  }
-
-  for (const replacer of [
-    SimpleReplacer,
-    LineTrimmedReplacer,
-    BlockAnchorReplacer,
-    WhitespaceNormalizedReplacer,
-    IndentationFlexibleReplacer,
-    // EscapeNormalizedReplacer,
-    // TrimmedBoundaryReplacer,
-    // ContextAwareReplacer,
-    // MultiOccurrenceReplacer,
-  ]) {
-    for (const search of replacer(content, oldString)) {
-      const index = content.indexOf(search)
-      if (index === -1) continue
-      if (replaceAll) {
-        return content.replaceAll(search, newString)
-      }
-      const lastIndex = content.lastIndexOf(search)
-      if (index !== lastIndex) continue
-      return content.substring(0, index) + newString + content.substring(index + search.length)
-    }
-  }
-  throw new Error("oldString not found in content or was found multiple times")
-}
@@ -3,16 +3,15 @@ import path from "path"
 import { Tool } from "./tool"
 import { App } from "../app/app"
 import DESCRIPTION from "./glob.txt"
-import { Ripgrep } from "../file/ripgrep"

 export const GlobTool = Tool.define({
-  id: "glob",
+  id: "opencode.glob",
  description: DESCRIPTION,
  parameters: z.object({
    pattern: z.string().describe("The glob pattern to match files against"),
    path: z
      .string()
-      .optional()
+      .nullable()
      .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.`,
      ),
@@ -20,15 +19,15 @@ export const GlobTool = Tool.define({
  async execute(params) {
    const app = App.info()
    let search = params.path ?? app.path.cwd
-    search = path.isAbsolute(search) ? search : path.resolve(app.path.cwd, search)
+    search = path.isAbsolute(search)
+      ? search
+      : path.resolve(app.path.cwd, search)

    const limit = 100
+    const glob = new Bun.Glob(params.pattern)
    const files = []
    let truncated = false
-    for (const file of await Ripgrep.files({
-      cwd: search,
-      glob: params.pattern,
-    })) {
+    for await (const file of glob.scan({ cwd: search })) {
      if (files.length >= limit) {
        truncated = true
        break
@@ -51,15 +50,17 @@ export const GlobTool = Tool.define({
      output.push(...files.map((f) => f.path))
      if (truncated) {
        output.push("")
-        output.push("(Results are truncated. Consider using a more specific path or pattern.)")
+        output.push(
+          "(Results are truncated. Consider using a more specific path or pattern.)",
+        )
      }
    }

    return {
-      title: path.relative(app.path.root, search),
      metadata: {
        count: files.length,
        truncated,
+        title: path.relative(app.path.root, search),
      },
      output: output.join("\n"),
    }
@@ -1,17 +1,29 @@
 import { z } from "zod"
 import { Tool } from "./tool"
 import { App } from "../app/app"
-import { Ripgrep } from "../file/ripgrep"
+import { Ripgrep } from "../external/ripgrep"

 import DESCRIPTION from "./grep.txt"

 export const GrepTool = Tool.define({
-  id: "grep",
+  id: "opencode.grep",
  description: DESCRIPTION,
  parameters: z.object({
-    pattern: z.string().describe("The regex pattern to search for in file contents"),
-    path: z.string().optional().describe("The directory to search in. Defaults to the current working directory."),
-    include: z.string().optional().describe('File pattern to include in the search (e.g. "*.js", "*.{ts,tsx}")'),
+    pattern: z
+      .string()
+      .describe("The regex pattern to search for in file contents"),
+    path: z
+      .string()
+      .nullable()
+      .describe(
+        "The directory to search in. Defaults to the current working directory.",
+      ),
+    include: z
+      .string()
+      .nullable()
+      .describe(
+        'File pattern to include in the search (e.g. "*.js", "*.{ts,tsx}")',
+      ),
  }),
  async execute(params) {
    if (!params.pattern) {
@@ -39,8 +51,7 @@ export const GrepTool = Tool.define({

    if (exitCode === 1) {
      return {
-        title: params.pattern,
-        metadata: { matches: 0, truncated: false },
+        metadata: { matches: 0, truncated: false, title: params.pattern },
        output: "No files found",
      }
    }
@@ -82,8 +93,7 @@ export const GrepTool = Tool.define({

    if (finalMatches.length === 0) {
      return {
-        title: params.pattern,
-        metadata: { matches: 0, truncated: false },
+        metadata: { matches: 0, truncated: false, title: params.pattern },
        output: "No files found",
      }
    }
@@ -104,14 +114,16 @@ export const GrepTool = Tool.define({

    if (truncated) {
      outputLines.push("")
-      outputLines.push("(Results are truncated. Consider using a more specific path or pattern.)")
+      outputLines.push(
+        "(Results are truncated. Consider using a more specific path or pattern.)",
+      )
    }

    return {
-      title: params.pattern,
      metadata: {
        matches: finalMatches.length,
        truncated,
+        title: params.pattern,
      },
      output: outputLines.join("\n"),
    }
@@ -4,7 +4,7 @@ import { App } from "../app/app"
 import * as path from "path"
 import DESCRIPTION from "./ls.txt"

-export const IGNORE_PATTERNS = [
+const IGNORE_PATTERNS = [
  "node_modules/",
  "__pycache__/",
  ".git/",
@@ -18,14 +18,20 @@ export const IGNORE_PATTERNS = [
  ".vscode/",
 ]

-const LIMIT = 100
-
 export const ListTool = Tool.define({
-  id: "list",
+  id: "opencode.list",
  description: DESCRIPTION,
  parameters: z.object({
-    path: z.string().describe("The absolute path to the directory to list (must be absolute, not relative)").optional(),
-    ignore: z.array(z.string()).describe("List of glob patterns to ignore").optional(),
+    path: z
+      .string()
+      .describe(
+        "The absolute path to the directory to list (must be absolute, not relative)",
+      )
+      .nullable(),
+    ignore: z
+      .array(z.string())
+      .describe("List of glob patterns to ignore")
+      .nullable(),
  }),
  async execute(params) {
    const app = App.info()
@@ -34,11 +40,13 @@ export const ListTool = Tool.define({
    const glob = new Bun.Glob("**/*")
    const files = []

-    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
+    for await (const file of glob.scan({ cwd: searchPath })) {
+      if (file.startsWith(".") || 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 >= LIMIT) break
+      if (files.length >= 1000) break
    }

    // Build directory structure
@@ -90,10 +98,10 @@ export const ListTool = Tool.define({
    const output = `${searchPath}/\n` + renderDir(".", 0)

    return {
-      title: path.relative(app.path.root, searchPath),
      metadata: {
        count: files.length,
-        truncated: files.length >= LIMIT,
+        truncated: files.length >= 1000,
+        title: path.relative(app.path.root, searchPath),
      },
      output,
    }
@@ -6,23 +6,27 @@ import { App } from "../app/app"
 import DESCRIPTION from "./lsp-diagnostics.txt"

 export const LspDiagnosticTool = Tool.define({
-  id: "lsp_diagnostics",
+  id: "opencode.lsp_diagnostics",
  description: DESCRIPTION,
  parameters: z.object({
    path: z.string().describe("The path to the file to get diagnostics."),
  }),
  execute: async (args) => {
    const app = App.info()
-    const normalized = path.isAbsolute(args.path) ? args.path : path.join(app.path.cwd, args.path)
+    const normalized = path.isAbsolute(args.path)
+      ? args.path
+      : path.join(app.path.cwd, args.path)
    await LSP.touchFile(normalized, true)
    const diagnostics = await LSP.diagnostics()
    const file = diagnostics[normalized]
    return {
-      title: path.relative(app.path.root, normalized),
      metadata: {
        diagnostics,
+        title: path.relative(app.path.root, normalized),
      },
-      output: file?.length ? file.map(LSP.Diagnostic.pretty).join("\n") : "No errors found",
+      output: file?.length
+        ? file.map(LSP.Diagnostic.pretty).join("\n")
+        : "No errors found",
    }
  },
 })
@@ -6,7 +6,7 @@ import { App } from "../app/app"
 import DESCRIPTION from "./lsp-hover.txt"

 export const LspHoverTool = Tool.define({
-  id: "lsp_hover",
+  id: "opencode.lsp_hover",
  description: DESCRIPTION,
  parameters: z.object({
    file: z.string().describe("The path to the file to get diagnostics."),
@@ -15,7 +15,9 @@ export const LspHoverTool = Tool.define({
  }),
  execute: async (args) => {
    const app = App.info()
-    const file = path.isAbsolute(args.file) ? args.file : path.join(app.path.cwd, args.file)
+    const file = path.isAbsolute(args.file)
+      ? args.file
+      : path.join(app.path.cwd, args.file)
    await LSP.touchFile(file, true)
    const result = await LSP.hover({
      ...args,
@@ -23,9 +25,14 @@ export const LspHoverTool = Tool.define({
    })

    return {
-      title: path.relative(app.path.root, file) + ":" + args.line + ":" + args.character,
      metadata: {
        result,
+        title:
+          path.relative(app.path.root, file) +
+          ":" +
+          args.line +
+          ":" +
+          args.character,
      },
      output: JSON.stringify(result, null, 2),
    }
@@ -6,11 +6,13 @@ import path from "path"
 import { App } from "../app/app"

 export const MultiEditTool = Tool.define({
-  id: "multiedit",
+  id: "opencode.multiedit",
  description: DESCRIPTION,
  parameters: z.object({
    filePath: z.string().describe("The absolute path to the file to modify"),
-    edits: z.array(EditTool.parameters).describe("Array of edit operations to perform sequentially on the file"),
+    edits: z
+      .array(EditTool.parameters)
+      .describe("Array of edit operations to perform sequentially on the file"),
  }),
  async execute(params, ctx) {
    const results = []
@@ -28,9 +30,9 @@ export const MultiEditTool = Tool.define({
    }
    const app = App.info()
    return {
-      title: path.relative(app.path.root, params.filePath),
      metadata: {
        results: results.map((r) => r.metadata),
+        title: path.relative(app.path.root, params.filePath),
      },
      output: results.at(-1)!.output,
    }
@@ -10,7 +10,7 @@ To make multiple file edits, provide the following:
 2. edits: An array of edit operations to perform, where each edit contains:
   - old_string: The text to replace (must match the file contents exactly, including all whitespace and indentation)
   - new_string: The edited text to replace the old_string
-   - replace_all: Replace all occurrences of old_string. This parameter is optional and defaults to false.
+   - replace_all: Replace all occurences of old_string. This parameter is optional and defaults to false.

 IMPORTANT:
 - All edits are applied in sequence, in the order they are provided
@@ -2,11 +2,14 @@ import { z } from "zod"
 import * as path from "path"
 import * as fs from "fs/promises"
 import { Tool } from "./tool"
-import { FileTime } from "../file/time"
+import { FileTimes } from "./util/file-times"
 import DESCRIPTION from "./patch.txt"
+import { App } from "../app/app"

 const PatchParams = z.object({
-  patchText: z.string().describe("The full patch text that describes all changes to be made"),
+  patchText: z
+    .string()
+    .describe("The full patch text that describes all changes to be made"),
 })

 interface Change {
@@ -40,7 +43,10 @@ function identifyFilesNeeded(patchText: string): string[] {
  const files: string[] = []
  const lines = patchText.split("\n")
  for (const line of lines) {
-    if (line.startsWith("*** Update File:") || line.startsWith("*** Delete File:")) {
+    if (
+      line.startsWith("*** Update File:") ||
+      line.startsWith("*** Delete File:")
+    ) {
      const filePath = line.split(":", 2)[1]?.trim()
      if (filePath) files.push(filePath)
    }
@@ -60,7 +66,10 @@ function identifyFilesAdded(patchText: string): string[] {
  return files
 }

-function textToPatch(patchText: string, _currentFiles: Record<string, string>): [PatchOperation[], number] {
+function textToPatch(
+  patchText: string,
+  _currentFiles: Record<string, string>,
+): [PatchOperation[], number] {
  const operations: PatchOperation[] = []
  const lines = patchText.split("\n")
  let i = 0
@@ -85,7 +94,11 @@ function textToPatch(patchText: string, _currentFiles: Record<string, string>):
          const changes: PatchChange[] = []
          i++

-          while (i < lines.length && !lines[i].startsWith("@@") && !lines[i].startsWith("***")) {
+          while (
+            i < lines.length &&
+            !lines[i].startsWith("@@") &&
+            !lines[i].startsWith("***")
+          ) {
            const changeLine = lines[i]
            if (changeLine.startsWith(" ")) {
              changes.push({ type: "keep", content: changeLine.substring(1) })
@@ -139,7 +152,10 @@ function textToPatch(patchText: string, _currentFiles: Record<string, string>):
  return [operations, fuzz]
 }

-function patchToCommit(operations: PatchOperation[], currentFiles: Record<string, string>): Commit {
+function patchToCommit(
+  operations: PatchOperation[],
+  currentFiles: Record<string, string>,
+): Commit {
  const changes: Record<string, Change> = {}

  for (const op of operations) {
@@ -158,7 +174,9 @@ function patchToCommit(operations: PatchOperation[], currentFiles: Record<string
      const lines = originalContent.split("\n")

      for (const hunk of op.hunks) {
-        const contextIndex = lines.findIndex((line) => line.includes(hunk.contextLine))
+        const contextIndex = lines.findIndex((line) =>
+          line.includes(hunk.contextLine),
+        )
        if (contextIndex === -1) {
          throw new Error(`Context line not found: ${hunk.contextLine}`)
        }
@@ -187,7 +205,11 @@ function patchToCommit(operations: PatchOperation[], currentFiles: Record<string
  return { changes }
 }

-function generateDiff(oldContent: string, newContent: string, filePath: string): [string, number, number] {
+function generateDiff(
+  oldContent: string,
+  newContent: string,
+  filePath: string,
+): [string, number, number] {
  // Mock implementation - would need actual diff generation
  const lines1 = oldContent.split("\n")
  const lines2 = newContent.split("\n")
@@ -211,7 +233,7 @@ async function applyCommit(
 }

 export const PatchTool = Tool.define({
-  id: "patch",
+  id: "opencode.patch",
  description: DESCRIPTION,
  parameters: PatchParams,
  execute: async (params, ctx) => {
@@ -223,7 +245,7 @@ export const PatchTool = Tool.define({
        absPath = path.resolve(process.cwd(), absPath)
      }

-      await FileTime.assert(ctx.sessionID, absPath)
+      await FileTimes.assert(ctx.sessionID, absPath)

      try {
        const stats = await fs.stat(absPath)
@@ -275,7 +297,9 @@ export const PatchTool = Tool.define({
    // Process the patch
    const [patch, fuzz] = textToPatch(params.patchText, currentFiles)
    if (fuzz > 3) {
-      throw new Error(`patch contains fuzzy matches (fuzz level: ${fuzz}). Please make your context lines more precise`)
+      throw new Error(
+        `patch contains fuzzy matches (fuzz level: ${fuzz}). Please make your context lines more precise`,
+      )
    }

    // Convert patch to commit
@@ -320,22 +344,26 @@ export const PatchTool = Tool.define({
      const newContent = change.new_content || ""

      // Calculate diff statistics
-      const [, additions, removals] = generateDiff(oldContent, newContent, filePath)
+      const [, additions, removals] = generateDiff(
+        oldContent,
+        newContent,
+        filePath,
+      )
      totalAdditions += additions
      totalRemovals += removals

-      FileTime.read(ctx.sessionID, absPath)
+      FileTimes.read(ctx.sessionID, absPath)
    }

    const result = `Patch applied successfully. ${changedFiles.length} files changed, ${totalAdditions} additions, ${totalRemovals} removals`
    const output = result

    return {
-      title: `${filesToRead.length} files`,
      metadata: {
        changed: changedFiles,
        additions: totalAdditions,
        removals: totalRemovals,
+        title: `${filesToRead.length} files`,
      },
      output,
    }
@@ -3,7 +3,7 @@ import * as fs from "fs"
 import * as path from "path"
 import { Tool } from "./tool"
 import { LSP } from "../lsp"
-import { FileTime } from "../file/time"
+import { FileTimes } from "./util/file-times"
 import DESCRIPTION from "./read.txt"
 import { App } from "../app/app"

@@ -12,12 +12,18 @@ const DEFAULT_READ_LIMIT = 2000
 const MAX_LINE_LENGTH = 2000

 export const ReadTool = Tool.define({
-  id: "read",
+  id: "opencode.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)").optional(),
-    limit: z.number().describe("The number of lines to read (defaults to 2000)").optional(),
+    offset: z
+      .number()
+      .describe("The line number to start reading from (0-based)")
+      .nullable(),
+    limit: z
+      .number()
+      .describe("The number of lines to read (defaults to 2000)")
+      .nullable(),
  }),
  async execute(params, ctx) {
    let filePath = params.filePath
@@ -34,13 +40,16 @@ export const ReadTool = Tool.define({
      const suggestions = dirEntries
        .filter(
          (entry) =>
-            entry.toLowerCase().includes(base.toLowerCase()) || base.toLowerCase().includes(entry.toLowerCase()),
+            entry.toLowerCase().includes(base.toLowerCase()) ||
+            base.toLowerCase().includes(entry.toLowerCase()),
        )
        .map((entry) => path.join(dir, entry))
        .slice(0, 3)

      if (suggestions.length > 0) {
-        throw new Error(`File not found: ${filePath}\n\nDid you mean one of these?\n${suggestions.join("\n")}`)
+        throw new Error(
+          `File not found: ${filePath}\n\nDid you mean one of these?\n${suggestions.join("\n")}`,
+        )
      }

      throw new Error(`File not found: ${filePath}`)
@@ -48,14 +57,21 @@ export const ReadTool = Tool.define({
    const stats = await file.stat()

    if (stats.size > MAX_READ_SIZE)
-      throw new Error(`File is too large (${stats.size} bytes). Maximum size is ${MAX_READ_SIZE} bytes`)
+      throw new Error(
+        `File is too large (${stats.size} bytes). Maximum size is ${MAX_READ_SIZE} bytes`,
+      )
    const limit = params.limit ?? DEFAULT_READ_LIMIT
    const offset = params.offset || 0
    const isImage = isImageFile(filePath)
-    if (isImage) throw new Error(`This is an image file of type: ${isImage}\nUse a different tool to process images`)
+    if (isImage)
+      throw new Error(
+        `This is an image file of type: ${isImage}\nUse a different tool to process images`,
+      )
    const lines = await file.text().then((text) => text.split("\n"))
    const raw = lines.slice(offset, offset + limit).map((line) => {
-      return line.length > MAX_LINE_LENGTH ? line.substring(0, MAX_LINE_LENGTH) + "..." : line
+      return line.length > MAX_LINE_LENGTH
+        ? line.substring(0, MAX_LINE_LENGTH) + "..."
+        : line
    })
    const content = raw.map((line, index) => {
      return `${(index + offset + 1).toString().padStart(5, "0")}| ${line}`
@@ -66,19 +82,21 @@ export const ReadTool = Tool.define({
    output += content.join("\n")

    if (lines.length > offset + content.length) {
-      output += `\n\n(File has more lines. Use 'offset' parameter to read beyond line ${offset + content.length})`
+      output += `\n\n(File has more lines. Use 'offset' parameter to read beyond line ${
+        offset + content.length
+      })`
    }
    output += "\n</file>"

    // just warms the lsp client
-    await LSP.touchFile(filePath, false)
-    FileTime.read(ctx.sessionID, filePath)
+    await LSP.touchFile(filePath, true)
+    FileTimes.read(ctx.sessionID, filePath)

    return {
-      title: path.relative(App.info().path.root, filePath),
      output,
      metadata: {
        preview,
+        title: path.relative(App.info().path.root, filePath),
      },
    }
  },
@@ -7,7 +7,7 @@ Usage:
 - You can optionally specify a line offset and limit (especially handy for long files), but it's recommended to read the whole file by not providing these parameters
 - Any lines longer than 2000 characters will be truncated
 - Results are returned using cat -n format, with line numbers starting at 1
- This tool allows opencode to read images (eg PNG, JPG, etc). When reading an image file the contents are presented visually as opencode is a multimodal LLM.
+- This tool allows OpenCode to read images (eg PNG, JPG, etc). When reading an image file the contents are presented visually as OpenCode is a multimodal LLM.
 - You have the capability to call multiple tools in a single response. It is always better to speculatively read multiple files as a batch that are potentially useful. 
 - You will regularly be asked to read screenshots. If the user provides a path to a screenshot ALWAYS use this tool to view the file at the path. This tool will work with all temporary file paths like /var/folders/123/abc/T/TemporaryItems/NSIRD_screencaptureui_ZfB1tD/Screenshot.png
 - If you read a file that exists but has empty contents you will receive a system reminder warning in place of file contents.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dax Raad	eb5b15bb9f	Update CLI run command and session handling 🤖 Generated with [OpenCode](https://opencode.ai) Co-Authored-By: OpenCode <noreply@opencode.ai>	2025-06-12 17:57:57 -04:00
Dax Raad	ce7489f6d5	subagent	2025-06-12 17:04:38 -04:00