rename package

2025-06-18 14:57:51 -04:00
226 changed files with 11334 additions and 19816 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
@@ -4,7 +4,6 @@ on:
  push:
    branches:
      - dev
-      - production
  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 }}
@@ -32,7 +32,7 @@ jobs:

      - uses: oven-sh/setup-bun@v2
        with:
-          bun-version: 1.2.17
+          bun-version: 1.2.16

      - name: Install makepkg
        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 "Update download stats $(date -I)"
-          git push
@@ -5,3 +5,5 @@ node_modules
 .env
 .idea
 .vscode
+app.log
+gopls.log
@@ -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,23 +1,25 @@
 <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">
+      <source srcset="packages/web/src/assets/logo-dark.svg" media="(prefers-color-scheme: dark)">
+      <source srcset="packages/web/src/assets/logo-light.svg" media="(prefers-color-scheme: light)">
+      <img src="packages/web/src/assets/logo-light.svg" alt="opencode logo">
    </picture>
  </a>
 </p>
-<p align="center">AI coding agent, built for the terminal.</p>
 <p align="center">
-  <a href="https://opencode.ai/docs"><img alt="View docs" src="https://img.shields.io/badge/view-docs-blue?style=flat-square" /></a>
-  <a href="https://www.npmjs.com/package/opencode-ai"><img alt="npm" src="https://img.shields.io/npm/v/opencode-ai?style=flat-square" /></a>
+  <a href="https://www.npmjs.com/package/opencode.ai"><img alt="npm" src="https://img.shields.io/npm/v/opencode-ai?style=flat-square" /></a>
  <a href="https://github.com/sst/opencode/actions/workflows/publish.yml"><img alt="Build status" src="https://img.shields.io/github/actions/workflow/status/sst/opencode/publish.yml?style=flat-square&branch=dev" /></a>
 </p>

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

+AI coding agent, built for the terminal.
+
+**Note:** Version 0.1.x is a full rewrite, and we do not have proper documentation for it yet. Should have this out week of June 17th 2025.
+
+[![opencode Terminal UI](screenshot.png)](https://opencode.ai)
+
 ### Installation

 ```bash
@@ -25,42 +27,177 @@
 curl -fsSL https://opencode.ai/install | bash

 # Package managers
-npm i -g opencode-ai@latest        # or bun/pnpm/yarn
+npm i -g opencode.ai@latest        # or bun/pnpm/yarn
 brew install sst/tap/opencode      # macOS
 paru -S opencode-bin               # Arch Linux
 ```

 > **Note:** Remove versions older than 0.1.x before installing

-### Documentation
+### Providers

-For more info on how to configure opencode [**head over to our docs**](https://opencode.ai/docs).
+The recommended approach is to sign up for Claude Pro or Max, run `opencode auth login`, and select Anthropic. It's the most cost-effective way to use opencode.
+
+opencode is powered by the provider list at [Models.dev](https://models.dev), so you can use `opencode auth login` to configure API keys for any provider you'd like to use. This is stored in `~/.local/share/opencode/auth.json`.
+
+```bash
+$ opencode auth login
+
+┌  Add credential
+│
+◆  Select provider
+│  ● Anthropic (recommended)
+│  ○ OpenAI
+│  ○ Google
+│  ○ Amazon Bedrock
+│  ○ Azure
+│  ○ DeepSeek
+│  ○ Groq
+│  ...
+└
+```
+
+The Models.dev dataset is also used to detect common environment variables like `OPENAI_API_KEY` to autoload that provider.
+
+If there are additional providers you want to use you can submit a PR to the [Models.dev repo](https://github.com/sst/models.dev). If configuring just for yourself check out the Config section below.
+
+### Global Config
+
+Some basic configuration is available in the global config file.
+
+```toml
+# ~/.config/opencode/config
+theme = "opencode"
+provider = "anthropic"
+model = "claude-sonnet-4-20250514"
+autoupdate = true
+```
+
+You can also extend the models.dev database with your own providers by mirroring the structure found [here](https://github.com/sst/models.dev/tree/dev/providers/anthropic)
+
+Start with a `provider.toml` file in `~/.config/opencode/providers`
+
+```toml
+# ~/.config/opencode/providers/openrouter/provider.toml
+[provider]
+name = "OpenRouter"
+env = ["OPENROUTER_API_KEY"]
+npm = "@openrouter/ai-sdk-provider"
+```
+
+And models in `~/.config/opencode/providers/openrouter/models/[model-id]`
+
+```toml
+# ~/.config/opencode/providers/openrouter/models/anthropic/claude-3.5-sonnet.toml
+name = "Claude 4 Sonnet"
+attachment = true
+reasoning = false
+temperature = true
+
+[cost]
+input = 3.00
+output = 15.00
+inputCached = 3.75
+outputCached = 0.30
+
+[limit]
+context = 200_000
+output = 50_000
+```
+
+### Project Config
+
+Project configuration is optional. You can place an `opencode.json` file in the root of your repo and is meant to be checked in and shared with your team.
+
+```json title="opencode.json"
+{
+  "$schema": "http://opencode.ai/config.json"
+}
+```
+
+#### MCP
+
+```json title="opencode.json"
+{
+  "$schema": "http://opencode.ai/config.json",
+  "mcp": {
+    "localmcp": {
+      "type": "local",
+      "command": ["bun", "x", "my-mcp-command"],
+      "environment": {
+        "MY_ENV_VAR": "my_env_var_value"
+      }
+    },
+    "remotemcp": {
+      "type": "remote",
+      "url": "https://my-mcp-server.com"
+    }
+  }
+}
+```
+
+#### Providers
+
+You can use opencode with any provider listed at [here](https://ai-sdk.dev/providers/ai-sdk-providers). Be sure to specify the npm package to use to load the provider.
+
+```json title="opencode.json"
+{
+  "$schema": "https://opencode.ai/config.json",
+  "provider": {
+    "ollama": {
+      "npm": "@ai-sdk/openai-compatible",
+      "options": {
+        "baseURL": "http://localhost:11434/v1"
+      },
+      "models": {
+        "llama2": {}
+      }
+    }
+  }
+}
+```

 ### 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.
+To run.

 ```bash
 $ bun install
-$ bun run packages/opencode/src/index.ts
+$ cd packages/opencode
+$ bun run src/index.ts
 ```

-#### Development Notes
-
-**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.
-
 ### FAQ

+#### How do I use this with OpenRouter?
+
+OpenRouter is not in the Models.dev database yet, but you can configure it manually.
+
+```json title="opencode.json"
+{
+  "$schema": "https://opencode.ai/config.json",
+  "provider": {
+    "openrouter": {
+      "npm": "@openrouter/ai-sdk-provider",
+      "name": "OpenRouter",
+      "options": {
+        "apiKey": "sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+      },
+      "models": {
+        "anthropic/claude-3.5-sonnet": {
+          "name": "Claude 3.5 Sonnet"
+        }
+      }
+    }
+  }
+}
+```
+
 #### How is this different than Claude Code?

 It's very similar to Claude Code in terms of capability. Here are the key differences:
@@ -70,6 +207,10 @@ It's very similar to Claude Code in terms of capability. Here are the key differ
 - A focus on TUI. opencode is built by neovim users and the creators of [terminal.shop](https://terminal.shop); we are going to push the limits of what's possible in the terminal.
 - A client/server architecture. This for example can allow opencode to run on your computer, while you can drive it remotely from a mobile app. Meaning that the TUI frontend is just one of the possible clients.

+#### What about Windows support?
+
+There are some minor problems blocking opencode from working on windows. We are working on on them now. You'll need to use WSL for now.
+
 #### What's the other repo?

 The other confusingly named repo has no relation to this one. You can [read the story behind it here](https://x.com/thdxr/status/1933561254481666466).
@@ -1,8 +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) |
@@ -5,7 +5,7 @@
      "name": "opencode",
      "devDependencies": {
        "prettier": "3.5.3",
-        "sst": "3.17.6",
+        "sst": "3.17.4",
      },
    },
    "packages/function": {
@@ -18,11 +18,8 @@
      },
    },
    "packages/opencode": {
-      "name": "opencode",
-      "version": "0.0.5",
-      "bin": {
-        "opencode": "./bin/opencode",
-      },
+      "name": "opencode.ai",
+      "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,10 +43,8 @@
        "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",
@@ -75,18 +69,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",
        "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.3.0",
      },
      "devDependencies": {
        "@types/node": "catalog:",
-        "opencode": "workspace:*",
        "typescript": "catalog:",
      },
    },
@@ -108,8 +100,6 @@
    "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/anthropic": ["@ai-sdk/anthropic@1.2.12", "", { "dependencies": { "@ai-sdk/provider": "1.1.3", "@ai-sdk/provider-utils": "2.2.8" }, "peerDependencies": { "zod": "^3.0.0" } }, "sha512-YSzjlko7JvuiyQFmI9RN1tNZdEiZxc+6xld/0tq/VkJaHpEzGAb1yiNxxvmYVcjvfu/PcvCxAAYXmTYQQ63IHQ=="],

    "@ai-sdk/provider": ["@ai-sdk/provider@1.1.3", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-qZMxYJ0qqX/RfnuIaab+zp8UAeJn/ygXXAffR5I4N0n1IrvA6qBsjc8hXLmBiMV2zoXlifkacF7sEFnYnjBcqg=="],
@@ -146,12 +136,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=="],
@@ -432,18 +416,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=="],
@@ -462,7 +434,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.17", "", { "dependencies": { "bun-types": "1.2.17" } }, "sha512-l/BYs/JYt+cXA/0+wUhulYJB6a6p//GTPiJ7nV+QHa8iiId4HZmnu/3J/SowP5g0rTiERY2kfGKXEK5Ehltx4Q=="],
+    "@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=="],

@@ -542,8 +514,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=="],
@@ -602,7 +572,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.17", "", { "dependencies": { "@types/node": "*" } }, "sha512-ElC7ItwT3SCQwYZDYoAH+q6KT4Fxjl8DtZ6qDulUFBmXA8YB4xo+l54J9ZJN+k2pphfn9vk7kfubeSd5QfTVJQ=="],
+    "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=="],

@@ -636,8 +606,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=="],
@@ -674,8 +642,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=="],
@@ -732,8 +698,6 @@

    "diff-match-patch": ["diff-match-patch@1.0.5", "", {}, "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="],

-    "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=="],
@@ -948,8 +912,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=="],
@@ -998,8 +960,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=="],
@@ -1028,10 +988,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=="],
@@ -1182,8 +1138,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=="],
@@ -1246,7 +1200,7 @@

    "openapi-types": ["openapi-types@12.1.3", "", {}, "sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw=="],

-    "opencode": ["opencode@workspace:packages/opencode"],
+    "opencode.ai": ["opencode.ai@workspace:packages/opencode"],

    "opencontrol": ["opencontrol@0.0.6", "", { "dependencies": { "@modelcontextprotocol/sdk": "1.6.1", "@tsconfig/bun": "1.0.7", "hono": "4.7.4", "zod": "3.24.2", "zod-to-json-schema": "3.24.3" }, "bin": { "opencontrol": "bin/index.mjs" } }, "sha512-QeCrpOK5D15QV8kjnGVeD/BHFLwcVr+sn4T6KKmP0WAMs2pww56e4h+eOGHb5iPOufUQXbdbBKi6WV2kk7tefQ=="],

@@ -1262,7 +1216,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=="],

@@ -1272,8 +1226,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=="],
@@ -1284,8 +1236,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=="],
@@ -1436,8 +1386,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=="],
@@ -1476,23 +1424,23 @@

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

-    "sst": ["sst@3.17.6", "", { "dependencies": { "aws-sdk": "2.1692.0", "aws4fetch": "1.0.18", "jose": "5.2.3", "opencontrol": "0.0.6", "openid-client": "5.6.4" }, "optionalDependencies": { "sst-darwin-arm64": "3.17.6", "sst-darwin-x64": "3.17.6", "sst-linux-arm64": "3.17.6", "sst-linux-x64": "3.17.6", "sst-linux-x86": "3.17.6", "sst-win32-arm64": "3.17.6", "sst-win32-x64": "3.17.6", "sst-win32-x86": "3.17.6" }, "bin": { "sst": "bin/sst.mjs" } }, "sha512-p+AcqwfYQUdkxeRjCikQoTMviPCBiGoU7M0vcV6GDVmVis8hzhVw4EFfHTafZC+aWfy1Ke2UQi66vZlEVWuEqA=="],
+    "sst": ["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.6", "", { "os": "darwin", "cpu": "arm64" }, "sha512-6tb7KlcPR7PTi3ofQv8dX/n6Jf7pNP9VfrnYL4HBWnWrcYaZeJ5MWobILfIJ/y2jHgoqmg9e5C3266Eds0JQyw=="],
+    "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.6", "", { "os": "darwin", "cpu": "x64" }, "sha512-lFakq6/EgTuBSjbl8Kry4pfgAPEIyn6o7ZkyRz3hz5331wUaX88yfjs3tL9JQ8Ey6jBUYxwhP/Q1n7fzIG046g=="],
+    "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.6", "", { "os": "linux", "cpu": "arm64" }, "sha512-SdTxXMbTEdiwOqp37w31kXv97vHqSx3oK9h/76lKg7V9k5JxPJ6JMefPLhoKWwK0Zh6AndY2zo2oRoEv4SIaDw=="],
+    "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.6", "", { "os": "linux", "cpu": "x64" }, "sha512-qneh7uWDiTUYx8X1Y3h2YVw3SJ0ybBBlRrVybIvCM09JqQ8+qq/XjKXGzA/3/EF0Jr7Ug8cARSn9CwxhdQGN7Q=="],
+    "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.6", "", { "os": "linux", "cpu": "none" }, "sha512-pU3D5OeqnmfxGqN31DxuwWnc1OayxhkErnITHhZ39D0MTiwbIgCapH26FuLW8B08/uxJWG8djUlOboCRhSBvWA=="],
+    "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.6", "", { "os": "win32", "cpu": "arm64" }, "sha512-Rr3RTYWAsH9sM9CbM/sAZCk7dB1OsSAljjJuuHMvdSAYW3RDpXEza0PBJGxnBID2eOrpswEchzMPL2d8LtL7oA=="],
+    "sst-win32-arm64": ["sst-win32-arm64@3.17.4", "", { "os": "win32", "cpu": "arm64" }, "sha512-q4cedr6WD3NqeQkDvmAsIgMgPIjziIWy81wA3ZmnY6UT0jFgFus23ppLIi6F4BFJfOygvAP2PeGrRR3o8giclw=="],

-    "sst-win32-x64": ["sst-win32-x64@3.17.6", "", { "os": "win32", "cpu": "x64" }, "sha512-yZ3roxwI0Wve9PFzdrrF1kfzCmIMFCCoa8qKeXY7LxCJ4QQIqHbCOccLK1Wv/MIU/mcZHWXTQVCLHw77uaa0GQ=="],
+    "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.6", "", { "os": "win32", "cpu": "none" }, "sha512-zV7TJWPJN9PmIXr15iXFSs0tbGsa52oBR3+xiKrUj2qj9XsZe7HBFwskRnHyiFq0durZY9kk9ZtoVlpuUuzr1g=="],
+    "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=="],

@@ -1546,7 +1494,7 @@

    "token-types": ["token-types@6.0.0", "", { "dependencies": { "@tokenizer/token": "^0.3.0", "ieee754": "^1.2.1" } }, "sha512-lbDrTLVsHhOMljPscd0yitpozq7Ga2M5Cvez5AjGg8GASBjtt6iERCAJ93yommPmz62fb45oFIXHEZ3u9bfJEA=="],

-    "toolbeam-docs-theme": ["toolbeam-docs-theme@0.4.1", "", { "peerDependencies": { "@astrojs/starlight": "^0.34.3", "astro": "^5.7.13" } }, "sha512-lTI4dHZaVNQky29m7sb36Oy4tWPwxsCuFxFjF8hgGW0vpV+S6qPvI9SwsJFvdE/OHO5DoI7VMbryV1pxZHkkHQ=="],
+    "toolbeam-docs-theme": ["toolbeam-docs-theme@0.3.0", "", { "peerDependencies": { "@astrojs/starlight": "^0.34.3", "astro": "^5.7.13" } }, "sha512-qlBkKRp8HVYV7p7jaG9lT2lvQY7c8b9czZ0tnsJUrN2TBTtEyFJymCdkhhpZNC9U4oGZ7lLk0glRJHrndWvVsg=="],

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

@@ -1706,24 +1654,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/aws4fetch": ["aws4fetch@1.0.20", "", {}, "sha512-/djoAN709iY65ETD6LKCtyyEI04XIBP5xVvfmNxsEP0uJB5tyaGBztSryRr4HqMStr9R06PisQE7m9zDTXKu6g=="],
-
    "@ampproject/remapping/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.25", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="],

    "@astrojs/mdx/@astrojs/markdown-remark": ["@astrojs/markdown-remark@6.3.2", "", { "dependencies": { "@astrojs/internal-helpers": "0.6.1", "@astrojs/prism": "3.3.0", "github-slugger": "^2.0.0", "hast-util-from-html": "^2.0.3", "hast-util-to-text": "^4.0.2", "import-meta-resolve": "^4.1.0", "js-yaml": "^4.1.0", "mdast-util-definitions": "^6.0.0", "rehype-raw": "^7.0.0", "rehype-stringify": "^10.0.1", "remark-gfm": "^4.0.1", "remark-parse": "^11.0.0", "remark-rehype": "^11.1.2", "remark-smartypants": "^3.0.2", "shiki": "^3.2.1", "smol-toml": "^1.3.1", "unified": "^11.0.5", "unist-util-remove-position": "^5.0.0", "unist-util-visit": "^5.0.0", "unist-util-visit-parents": "^6.0.1", "vfile": "^6.0.3" } }, "sha512-bO35JbWpVvyKRl7cmSJD822e8YA8ThR/YbUsciWNA7yTcqpIAL2hJDToWP5KcZBWxGT6IOdOkHSXARSNZc4l/Q=="],

-    "@aws-crypto/crc32/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
-
-    "@aws-crypto/util/@smithy/util-utf8": ["@smithy/util-utf8@2.3.0", "", { "dependencies": { "@smithy/util-buffer-from": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A=="],
-
-    "@aws-crypto/util/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
-
-    "@aws-sdk/types/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
-
    "@babel/core/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],

    "@babel/generator/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.25", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="],
@@ -1744,18 +1680,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=="],
@@ -1814,8 +1738,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=="],
@@ -1828,8 +1750,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=="],
@@ -1896,8 +1816,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=="],
@@ -23,9 +23,8 @@ 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"],
      }
    },
@@ -1,19 +1,5 @@
 {
  "$schema": "https://opencode.ai/config.json",
-  "experimental": {
-    "hook": {
-      "file_edited": {
-        ".json": [
-          {
-            "command": ["bun", "run", "prettier", "$FILE"]
-          }
-        ]
-      },
-      "session_completed": [
-        {
-          "command": ["touch", "./node_modules/foo"]
-        }
-      ]
-    }
-  }
+  "mcp": {},
+  "provider": {}
 }
@@ -1,12 +1,10 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "name": "opencode",
  "private": true,
  "type": "module",
  "packageManager": "bun@1.2.14",
  "scripts": {
-    "typecheck": "bun run --filter='*' typecheck",
-    "postinstall": "./scripts/hooks"
+    "typecheck": "bun run --filter='*' typecheck"
  },
  "workspaces": {
    "packages": [
@@ -21,7 +19,7 @@
  },
  "devDependencies": {
    "prettier": "3.5.3",
-    "sst": "3.17.6"
+    "sst": "3.17.4"
  },
  "repository": {
    "type": "git",
@@ -19,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,
@@ -35,7 +35,8 @@ 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}`) &&
@@ -70,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() {
@@ -87,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)
  }
@@ -127,7 +122,7 @@ export default {
      return new Response(
        JSON.stringify({
          secret,
-          url: "https://opencode.ai/s/" + short,
+          url: "https://dev.opencode.ai/s/" + short,
        }),
        {
          headers: { "Content-Type": "application/json" },
@@ -141,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" },
      })
@@ -167,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" },
      })
@@ -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 {}
@@ -37,4 +37,3 @@
 - **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 OpenCode 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%" %*
@@ -2,155 +2,13 @@
  "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"
+      "type": "string"
    },
    "provider": {
      "type": "object",
      "additionalProperties": {
        "type": "object",
        "properties": {
-          "api": {
-            "type": "string"
-          },
          "name": {
            "type": "string"
          },
@@ -183,9 +41,6 @@
                "temperature": {
                  "type": "boolean"
                },
-                "tool_call": {
-                  "type": "boolean"
-                },
                "cost": {
                  "type": "object",
                  "properties": {
@@ -195,14 +50,19 @@
                    "output": {
                      "type": "number"
                    },
-                    "cache_read": {
+                    "inputCached": {
                      "type": "number"
                    },
-                    "cache_write": {
+                    "outputCached": {
                      "type": "number"
                    }
                  },
-                  "required": ["input", "output"],
+                  "required": [
+                    "input",
+                    "output",
+                    "inputCached",
+                    "outputCached"
+                  ],
                  "additionalProperties": false
                },
                "limit": {
@@ -215,15 +75,14 @@
                      "type": "number"
                    }
                  },
-                  "required": ["context", "output"],
+                  "required": [
+                    "context",
+                    "output"
+                  ],
                  "additionalProperties": false
                },
                "id": {
                  "type": "string"
-                },
-                "options": {
-                  "type": "object",
-                  "additionalProperties": {}
                }
              },
              "additionalProperties": false
@@ -234,10 +93,11 @@
            "additionalProperties": {}
          }
        },
-        "required": ["models"],
+        "required": [
+          "models"
+        ],
        "additionalProperties": false
-      },
-      "description": "Custom provider configurations and model overrides"
+      }
    },
    "mcp": {
      "type": "object",
@@ -248,29 +108,25 @@
            "properties": {
              "type": {
                "type": "string",
-                "const": "local",
-                "description": "Type of MCP server connection"
+                "const": "local"
              },
              "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"],
+            "required": [
+              "type",
+              "command"
+            ],
            "additionalProperties": false
          },
          {
@@ -278,85 +134,22 @@
            "properties": {
              "type": {
                "type": "string",
-                "const": "remote",
-                "description": "Type of MCP server connection"
+                "const": "remote"
              },
              "url": {
-                "type": "string",
-                "description": "URL of the remote MCP server"
-              },
-              "enabled": {
-                "type": "boolean",
-                "description": "Enable or disable the MCP server on startup"
+                "type": "string"
              }
            },
-            "required": ["type", "url"],
+            "required": [
+              "type",
+              "url"
+            ],
            "additionalProperties": false
          }
        ]
-      },
-      "description": "MCP (Model Context Protocol) server configurations"
-    },
-    "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,27 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "0.0.5",
-  "name": "opencode",
+  "version": "0.0.0",
+  "name": "opencode.ai",
  "type": "module",
  "private": true,
  "scripts": {
    "typecheck": "tsc --noEmit",
    "dev": "bun run ./src/index.ts"
  },
-  "bin": {
-    "opencode": "./bin/opencode"
-  },
  "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"
+    "zod-to-json-schema": "3.24.5",
+    "@ai-sdk/anthropic": "1.2.12"
  },
  "dependencies": {
    "@clack/prompts": "0.11.0",
@@ -37,7 +36,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 +45,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"
  }
 }
@@ -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)
  }
 }
@@ -29,7 +29,7 @@ const targets = [
  ["linux", "x64"],
  ["darwin", "x64"],
  ["darwin", "arm64"],
-  ["windows", "x64"],
+  // ["windows", "x64"],
 ]

 await $`rm -rf dist`
@@ -68,7 +68,7 @@ await $`cp ./script/postinstall.mjs ./dist/${pkg.name}/postinstall.mjs`
 await Bun.file(`./dist/${pkg.name}/package.json`).write(
  JSON.stringify(
    {
-      name: pkg.name + "-ai",
+      name: pkg.name,
      bin: {
        [pkg.name]: `./bin/${pkg.name}`,
      },
@@ -110,7 +110,6 @@ if (!snapshot) {
      return (
        !lower.includes("ignore:") &&
        !lower.includes("ci:") &&
-        !lower.includes("wip:") &&
        !lower.includes("docs:") &&
        !lower.includes("doc:")
      )
@@ -143,7 +142,7 @@ if (!snapshot) {
    "# Maintainer: dax",
    "# Maintainer: adam",
    "",
-    "pkgname='${pkg}'",
+    "pkgname='opencode-bin'",
    `pkgver=${version.split("-")[0]}`,
    "options=('!debug' '!strip')",
    "pkgrel=1",
@@ -167,17 +166,14 @@ if (!snapshot) {
    "",
  ].join("\n")

-  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`
+
+  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`

  // Homebrew formula
  const homebrewFormula = [
@@ -1,4 +1,3 @@
-import "zod-openapi/extend"
 import { Log } from "../util/log"
 import { Context } from "../util/context"
 import { Filesystem } from "../util/filesystem"
@@ -13,7 +12,6 @@ export namespace App {
  export const Info = z
    .object({
      user: z.string(),
-      hostname: z.string(),
      git: z.boolean(),
      path: z.object({
        config: z.string(),
@@ -27,28 +25,15 @@ export namespace App {
      }),
    })
    .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 }) {
    log.info("creating", {
      cwd: input.cwd,
    })
@@ -60,7 +45,7 @@ export namespace App {
    const data = path.join(
      Global.Path.data,
      "project",
-      git ? directory(git) : "global",
+      git ? git.split(path.sep).join("-") : "global",
    )
    const stateFile = Bun.file(path.join(data, APP_JSON))
    const state = (await stateFile.json().catch(() => ({}))) as {
@@ -76,11 +61,8 @@ export namespace App {
      }
    >()

-    const root = git ?? input.cwd
-
    const info: Info = {
      user: os.userInfo().username,
-      hostname: os.hostname(),
      time: {
        initialized: state.initialized,
      },
@@ -89,27 +71,16 @@ export namespace App {
        config: Global.Path.config,
        state: Global.Path.state,
        data,
-        root,
+        root: git ?? input.cwd,
        cwd: input.cwd,
      },
    }
-    const app = {
+    const result = {
      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>(
@@ -135,6 +106,22 @@ export namespace App {
    return ctx.use().info
  }

+  export async function provide<T>(
+    input: { cwd: 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()
    info.time.initialized = Date.now()
@@ -145,12 +132,4 @@ export namespace App {
      }),
    )
  }
-
-  function directory(input: string): string {
-    return input
-      .split(path.sep)
-      .filter(Boolean)
-      .join("-")
-      .replace(/[^A-Za-z0-9_]/g, "-")
-  }
 }
@@ -8,7 +8,7 @@ export namespace AuthAnthropic {
    const pkce = await generatePKCE()
    const url = new URL("https://claude.ai/oauth/authorize", import.meta.url)
    url.searchParams.set("code", "true")
-    url.searchParams.set("client_id", CLIENT_ID)
+    url.searchParams.set("client_id", "9d1c250a-e61b-44d9-88ed-5944d1962f5e")
    url.searchParams.set("response_type", "code")
    url.searchParams.set(
      "redirect_uri",
@@ -38,7 +38,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,
      }),
@@ -1,20 +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,150 +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(),
-    }),
-  )
-}
@@ -3,7 +3,6 @@ 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" })
@@ -14,7 +13,7 @@ export namespace BunProc {
  ) {
    log.info("running", {
      cmd: [which(), ...cmd],
-      ...options,
+      options,
    })
    const result = Bun.spawn([which(), ...cmd], {
      ...options,
@@ -26,14 +25,7 @@ export namespace BunProc {
        BUN_BE_BUN: "1",
      },
    })
-    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,
-    })
+    const code = await result.exited
    if (code !== 0) {
      throw new Error(`Command failed with exit code ${result.exitCode}`)
    }
@@ -61,10 +53,10 @@ export namespace BunProc {
    if (parsed.dependencies[pkg] === version) return mod
    parsed.dependencies[pkg] = version
    await Bun.write(pkgjson, JSON.stringify(parsed, null, 2))
-    await BunProc.run(["install", "--registry=https://registry.npmjs.org"], {
+    await BunProc.run(["install"], {
      cwd: Global.Path.cache,
    }).catch((e) => {
-      throw new InstallFailedError(
+      new InstallFailedError(
        { pkg, version },
        {
          cause: e,
@@ -49,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"]>,
  ) {
@@ -60,14 +60,12 @@ 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>(
@@ -1,21 +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,5 +1,4 @@
 import { AuthAnthropic } from "../../auth/anthropic"
-import { AuthCopilot } from "../../auth/copilot"
 import { Auth } from "../../auth"
 import { cmd } from "./cmd"
 import * as prompts from "@clack/prompts"
@@ -7,9 +6,6 @@ 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",
@@ -29,61 +25,30 @@ 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,
+      openai: 1,
+      google: 2,
    }
    let provider = await prompts.select({
      message: "Select provider",
@@ -181,44 +146,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"),
@@ -235,7 +162,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))
@@ -1,37 +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,28 +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,37 +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,87 +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,39 +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")
-    })
-  },
-})
@@ -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,163 +1,138 @@
 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 { GlobalConfig } from "../../global/config"
 import { Flag } from "../../flag/flag"
-import { Config } from "../../config/config"
-import { bootstrap } from "../bootstrap"

 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({
  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",
+        describe: "Share the session",
      })
  },
  handler: async (args) => {
    const message = args.message.join(" ")
-    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
+    await App.provide(
+      {
+        cwd: process.cwd(),
+      },
+      async () => {
+        await Share.init()
+        const session = args.session
+          ? await Session.get(args.session)
+          : await Session.create()
+
+        UI.empty()
+        UI.println(UI.logo())
+        UI.empty()
+        UI.println(UI.Style.TEXT_NORMAL_BOLD + "> ", message)
+        UI.empty()
+
+        const cfg = await GlobalConfig.get()
+        if (cfg.autoshare || Flag.OPENCODE_AUTO_SHARE || args.share) {
+          await Session.share(session.id)
+          UI.println(
+            UI.Style.TEXT_INFO_BOLD +
+              "~  https://dev.opencode.ai/s/" +
+              session.id.slice(-8),
+          )
+        }
+        UI.empty()
+
+        const { providerID, modelID } = await Provider.defaultModel()
+        UI.println(
+          UI.Style.TEXT_NORMAL_BOLD + "@ ",
+          UI.Style.TEXT_NORMAL + `${providerID}/${modelID}`,
+        )
+        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,
+          )
        }

-        if (args.session) return Session.get(args.session)
+        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,
+          )

-        return Session.create()
-      })()
-
-      if (!session) {
-        UI.error("Session not found")
-        return
-      }
-
-      const isPiped = !process.stdout.isTTY
-
-      UI.empty()
-      UI.println(UI.logo())
-      UI.empty()
-      UI.println(UI.Style.TEXT_NORMAL_BOLD + "> ", message)
-      UI.empty()
-
-      const cfg = await Config.get()
-      if (cfg.autoshare || Flag.OPENCODE_AUTO_SHARE || args.share) {
-        await Session.share(session.id)
-        UI.println(
-          UI.Style.TEXT_INFO_BOLD +
-            "~  https://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(
-          color + `|`,
-          UI.Style.TEXT_NORMAL + UI.Style.TEXT_DIM + ` ${type.padEnd(7, " ")}`,
-          "",
-          UI.Style.TEXT_NORMAL + title,
-        )
-      }
-
-      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 || "Unknown")
-        }
-
-        if (part.type === "text") {
-          if (part.text.includes("\n")) {
-            UI.empty()
-            UI.println(part.text)
-            UI.empty()
-            return
+          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 (isPiped) {
-        const match = result.parts.findLast((x) => x.type === "text")
-        if (match) process.stdout.write(match.text)
-      }
-      UI.empty()
-    })
+          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)
+          }
+        })
+        await Session.chat({
+          sessionID: session.id,
+          providerID,
+          modelID,
+          parts: [
+            {
+              type: "text",
+              text: message,
+            },
+          ],
+        })
+        UI.empty()
+      },
+    )
  },
 })
@@ -0,0 +1,18 @@
+import { App } from "../../app/app"
+import { LSP } from "../../lsp"
+import { cmd } from "./cmd"
+
+export const ScrapCommand = cmd({
+  command: "scrap <file>",
+  builder: (yargs) =>
+    yargs.positional("file", { type: "string", demandOption: true }),
+  async handler(args) {
+    await App.provide(
+      { cwd: process.cwd() },
+      async () => {
+        await LSP.touchFile(args.file, true)
+        console.log(await LSP.diagnostics())
+      },
+    )
+  },
+})
@@ -1,50 +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,114 +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"
-
-export const TuiCommand = cmd({
-  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()
-      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]
-        }
-        const proc = Bun.spawn({
-          cmd: [...cmd, ...process.argv.slice(2)],
-          cwd,
-          stdout: "inherit",
-          stderr: "inherit",
-          stdin: "inherit",
-          env: {
-            ...process.env,
-            OPENCODE_SERVER: server.url.toString(),
-            OPENCODE_APP_INFO: JSON.stringify(app),
-          },
-          onExit: () => {
-            server.stop()
-          },
-        })
-
-        ;(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: [process.execPath, "auth", "login"],
-          cwd: process.cwd(),
-          stdout: "inherit",
-          stderr: "inherit",
-          stdin: "inherit",
-        }).exited
-        if (result !== 0) return
-        UI.empty()
-      }
-    }
-  },
-})
@@ -5,27 +5,19 @@ import { Installation } from "../../installation"

 export const UpgradeCommand = {
  command: "upgrade [target]",
-  describe: "upgrade opencode to the latest or a specific version",
+  describe: "Upgrade opencode to the latest version 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"],
-      })
+    return yargs.positional("target", {
+      describe: "Specific version to upgrade to (e.g., '0.1.48' or 'v0.1.48')",
+      type: "string",
+    })
  },
-  handler: async (args: { target?: string; method?: string }) => {
+  handler: async (args: { target?: 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
+    const method = await Installation.method()
    if (method === "unknown") {
      prompts.log.error(
        `opencode is installed to ${process.execPath} and seems to be managed by a package manager`,
@@ -33,7 +25,6 @@ export const UpgradeCommand = {
      prompts.outro("Done")
      return
    }
-    prompts.log.info("Using method: " + method)
    const target = args.target ?? (await Installation.latest())
    prompts.log.info(`From ${Installation.VERSION} → ${target}`)
    const spinner = prompts.spinner()
@@ -1,19 +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 ""
-}
@@ -1,5 +1,4 @@
 import { z } from "zod"
-import { EOL } from "os"
 import { NamedError } from "../util/error"

 export namespace UI {
@@ -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[]) {
@@ -53,7 +52,7 @@ export namespace UI {
      result.push(row[0])
      result.push("\x1b[0m")
      result.push(row[1])
-      result.push(EOL)
+      result.push("\n")
    }
    return result.join("").trimEnd()
  }
@@ -72,8 +71,4 @@ export namespace UI {
      })
    })
  }
-
-  export function error(message: string) {
-    println(Style.TEXT_DANGER_BOLD + "Error: " + Style.TEXT_NORMAL + message)
-  }
 }
@@ -1,168 +1,56 @@
 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(),
+      $schema: z.string().optional(),
      provider: z
        .record(
          ModelsDev.Provider.partial().extend({
@@ -170,98 +58,13 @@ export namespace Config {
            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"),
-      experimental: 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(),
-        })
        .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,54 +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",
-          })
-        }
-      }
-    })
-  }
-}
@@ -5,6 +5,7 @@ import { z } from "zod"
 import { NamedError } from "../util/error"
 import { lazy } from "../util/lazy"
 import { Log } from "../util/log"
+import { $ } from "bun"

 export namespace Fzf {
  const log = Log.create({ service: "fzf" })
@@ -114,4 +115,24 @@ export namespace Fzf {
    const { filepath } = await state()
    return filepath
  }
+
+  export async function search(input: {
+    cwd: string
+    query: string
+    limit?: number
+  }) {
+    const results = await $`${await filepath()} --filter=${input.query}`
+      .quiet()
+      .throws(false)
+      .cwd(input.cwd)
+      .text()
+    const split = results
+      .trim()
+      .split("\n")
+      .filter((line) => line.length > 0)
+    log.info("results", {
+      count: split.length,
+    })
+    return split
+  }
 }
@@ -0,0 +1,129 @@
+import path from "path"
+import { Global } from "../global"
+import fs from "fs/promises"
+import { z } from "zod"
+import { NamedError } from "../util/error"
+import { lazy } from "../util/lazy"
+import { $ } from "bun"
+import { Fzf } from "./fzf"
+
+export namespace Ripgrep {
+  const PLATFORM = {
+    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
+  }
+
+  export async function files(input: {
+    cwd: string
+    query?: string
+    limit?: number
+  }) {
+    const commands = [`${await filepath()} --files --hidden --glob='!.git/*'`]
+    if (input.query)
+      commands.push(`${await Fzf.filepath()} --filter=${input.query}`)
+    if (input.limit) commands.push(`head -n ${input.limit}`)
+    const joined = commands.join(" | ")
+    const result = await $`${{ raw: joined }}`.cwd(input.cwd).text()
+    return result.split("\n").filter(Boolean)
+  }
+}
@@ -1,128 +0,0 @@
-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 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,353 +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"
-
-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")]),
-      }),
-    ),
-  }
-
-  export function init() {
-    App.state(
-      "file.watcher",
-      () => {
-        const app = App.use()
-        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()
-      },
-    )()
-  }
-}
@@ -1,160 +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,
-          })
-      }
-    })
-  }
-}
@@ -0,0 +1,26 @@
+import { z } from "zod"
+import { Global } from "."
+import { lazy } from "../util/lazy"
+import path from "path"
+
+export namespace GlobalConfig {
+  export const Info = z.object({
+    provider: z.string().optional(),
+    model: z.string().optional(),
+    autoupdate: z.boolean().optional(),
+    autoshare: z.boolean().optional(),
+    disabled_providers: z.array(z.string()).optional(),
+  })
+  export type Info = z.infer<typeof Info>
+
+  export const get = lazy(async () => {
+    const toml = await import(path.join(Global.Path.config, "config"), {
+      with: {
+        type: "toml",
+      },
+    })
+      .then((mod) => mod.default)
+      .catch(() => ({}))
+    return Info.parse(toml)
+  })
+}
@@ -41,17 +41,6 @@ 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,
@@ -73,11 +62,14 @@ export namespace Identifier {
      timeBytes[i] = Number((now >> BigInt(40 - 8 * i)) & BigInt(0xff))
    }

+    const randLength = (LENGTH - 12) / 2
+    const random = randomBytes(randLength)
+
    return (
      prefixes[prefix] +
      "_" +
      timeBytes.toString("hex") +
-      randomBase62(LENGTH - 12)
+      random.toString("hex")
    )
  }
 }
@@ -1,41 +1,29 @@
 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 { ScrapCommand } from "./cli/cmd/scrap"
 import { Log } from "./util/log"
-import { AuthCommand } from "./cli/cmd/auth"
+import { AuthCommand, AuthLoginCommand } from "./cli/cmd/auth"
 import { UpgradeCommand } from "./cli/cmd/upgrade"
-import { ModelsCommand } from "./cli/cmd/models"
+import { Provider } from "./provider/provider"
 import { UI } from "./cli/ui"
+import { GlobalConfig } from "./global/config"
 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,
-  })
-})
+import { Bus } from "./bus"

 const cli = yargs(hideBin(process.argv))
  .scriptName("opencode")
-  .help("help", "show help")
-  .version("version", "show version number", Installation.VERSION)
-  .alias("version", "v")
+  .version(Installation.VERSION)
  .option("print-logs", {
-    describe: "print logs to stderr",
+    describe: "Print logs to stderr",
    type: "boolean",
  })
  .middleware(async () => {
@@ -46,14 +34,92 @@ const cli = yargs(hideBin(process.argv))
    })
  })
  .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 }, async (app) => {
+          const providers = await Provider.list()
+          if (Object.keys(providers).length === 0) {
+            return "needs_provider"
+          }
+
+          await Share.init()
+          const server = Server.listen()
+
+          let cmd = ["go", "run", "./main.go"]
+          let cwd = new URL("../../tui/cmd/opencode", import.meta.url).pathname
+          if (Bun.embeddedFiles.length > 0) {
+            const blob = Bun.embeddedFiles[0] as File
+            const binary = path.join(Global.Path.cache, "tui", blob.name)
+            const file = Bun.file(binary)
+            if (!(await file.exists())) {
+              await Bun.write(file, blob, { mode: 0o755 })
+              await fs.chmod(binary, 0o755)
+            }
+            cwd = process.cwd()
+            cmd = [binary]
+          }
+          const proc = Bun.spawn({
+            cmd: [...cmd, ...process.argv.slice(2)],
+            cwd,
+            stdout: "inherit",
+            stderr: "inherit",
+            stdin: "inherit",
+            env: {
+              ...process.env,
+              OPENCODE_SERVER: server.url.toString(),
+              OPENCODE_APP_INFO: JSON.stringify(app),
+            },
+            onExit: () => {
+              server.stop()
+            },
+          })
+
+          ;(async () => {
+            if (Installation.VERSION === "dev") return
+            if (Installation.isSnapshot()) return
+            const config = await GlobalConfig.get()
+            if (config.autoupdate === false) return
+            const latest = await Installation.latest()
+            if (Installation.VERSION === latest) return
+            const method = await Installation.method()
+            if (method === "unknown") return
+            await Installation.upgrade(method, latest)
+              .then(() => {
+                Bus.publish(Installation.Event.Updated, { version: latest })
+              })
+              .catch(() => {})
+          })()
+
+          await proc.exited
+          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") ||
@@ -67,41 +133,7 @@ const cli = yargs(hideBin(process.argv))
 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, {
+    stack: e instanceof Error ? e.stack : undefined,
+  })
 }
-
-cancel.abort()
@@ -3,15 +3,12 @@ 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 = {
@@ -44,10 +41,6 @@ export namespace Installation {
    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()
@@ -69,10 +62,6 @@ export namespace Installation {
        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) => {
@@ -85,7 +74,7 @@ export namespace Installation {

    for (const check of checks) {
      const output = await check.command()
-      if (output.includes("opencode-ai")) {
+      if (output.includes("opencode-ai") || output.includes("opencode.ai")) {
        return check.name
      }
    }
@@ -104,31 +93,20 @@ export namespace Installation {
    const cmd = (() => {
      switch (method) {
        case "curl":
-          return $`curl -fsSL https://opencode.ai/install | bash`.env({
-            ...process.env,
-            VERSION: target,
-          })
+          return $`curl -fsSL https://opencode.ai/install | bash`
        case "npm":
-          return $`npm install -g opencode-ai@${target}`
+          return $`npm remove -g opencode-ai && npm install -g opencode.ai@${target}`
        case "pnpm":
-          return $`pnpm install -g opencode-ai@${target}`
+          return $`pnpm remove -g opencode-ai && 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",
-          })
+          return $`bun remove -g opencode-ai && bun install -g opencode.ai@${target}`
+        case "yarn":
+          return $`yarn remove -g opencode-ai && yarn add -g opencode.ai@${target}`
        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"),
@@ -12,7 +12,6 @@ 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" })
@@ -53,9 +52,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 () => {
@@ -64,7 +61,7 @@ export namespace LSPClient {
    connection.listen()

    log.info("sending initialize", { id: serverID })
-    await withTimeout(
+    await Promise.race([
      connection.sendRequest("initialize", {
        processId: server.process.pid,
        workspaceFolders: [
@@ -91,10 +88,12 @@ export namespace LSPClient {
          },
        },
      }),
-      5_000,
-    ).catch(() => {
-      throw new InitializeError({ serverID })
-    })
+      new Promise((_, reject) => {
+        setTimeout(() => {
+          reject(new InitializeError({ serverID }))
+        }, 5_000)
+      }),
+    ])
    await connection.sendNotification("initialized", {})
    log.info("initialized")

@@ -117,28 +116,36 @@ export namespace LSPClient {
          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() {
@@ -150,32 +157,35 @@ export namespace LSPClient {
          : 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
              ) {
                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()
-        server.process.kill("SIGTERM")
-        log.info("shutdown", { serverID })
+        server.process.kill("SIGKILL")
      },
    }

@@ -3,60 +3,19 @@ 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(
-            () => {},
-          )
-          if (!client) break
-          clients.set(server.id, client)
-          break
-        }
-      }
-      log.info("initialized")
+      const skip = new Set<string>()
      return {
        clients,
+        skip,
      }
    },
    async (state) => {
@@ -66,23 +25,35 @@ 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) {
+      if (s.skip.has(match.id)) continue
+      const existing = s.clients.get(match.id)
+      if (existing) continue
+      const handle = await match.spawn(App.info())
+      if (!handle) {
+        s.skip.add(match.id)
+        continue
+      }
+      const client = await LSPClient.create(match.id, handle).catch(() => {})
+      if (!client) {
+        s.skip.add(match.id)
+        continue
+      }
+      s.clients.set(match.id, client)
+    }
+    if (waitForDiagnostics) {
+      await run(async (client) => {
+        const wait = client.waitForDiagnostics({ path: input })
+        await client.notify.open({ path: input })
+        return wait
+      })
+    }
  }

  export async function diagnostics() {
@@ -115,14 +86,6 @@ 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[]> {
@@ -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",
@@ -19,128 +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",
+  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",
+            },
          },
-        },
-      )
-      return {
-        process: proc,
-        initialization: {
-          tsserver: {
-            path: tsserver,
-          },
-        },
-      }
-    },
-  }
-
-  export const Gopls: Info = {
-    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 },
-          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,
+          initialization: {
+            tsserver: {
+              path: tsserver,
+            },
          },
-        },
-      )
-      return {
-        process: proc,
-      }
+        }
+      },
    },
-  }
+    {
+      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
+          }
+          bin = path.join(
+            Global.Path.bin,
+            "gopls" + (process.platform === "win32" ? ".exe" : ""),
+          )
+          log.info(`installed gopls`, {
+            bin,
+          })
+        }
+        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
-}
@@ -2,7 +2,6 @@ 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" })
@@ -10,13 +9,10 @@ export namespace ModelsDev {

  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(),
@@ -27,16 +23,15 @@ export namespace ModelsDev {
        context: z.number(),
        output: z.number(),
      }),
-      options: z.record(z.any()),
+      id: z.string(),
    })
    .openapi({
-      ref: "Model",
+      ref: "Model.Info",
    })
  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(),
@@ -44,7 +39,7 @@ export namespace ModelsDev {
      models: z.record(Model),
    })
    .openapi({
-      ref: "Provider",
+      ref: "Provider.Info",
    })

  export type Provider = z.infer<typeof Provider>
@@ -56,15 +51,16 @@ export namespace ModelsDev {
      refresh()
      return result as Record<string, Provider>
    }
-    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)
  }
 }
@@ -1,4 +1,5 @@
 import z from "zod"
+import path from "path"
 import { App } from "../app/app"
 import { Config } from "../config/config"
 import { mergeDeep, sortBy } from "remeda"
@@ -11,36 +12,34 @@ 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"
+import { GlobalConfig } from "../global/config"
+import { Global } from "../global"

 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>
-  }>
+  ) => Promise<Record<string, any> | false>

  type Source = "env" | "config" | "custom" | "api"

  const CUSTOM_LOADERS: Record<string, CustomLoader> = {
    async anthropic(provider) {
      const access = await AuthAnthropic.access()
-      if (!access) return { autoload: false }
+      if (!access) return false
      for (const model of Object.values(provider.models)) {
        model.cost = {
          input: 0,
@@ -48,172 +47,30 @@ export namespace Provider {
        }
      }
      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) {
-        for (const model of Object.values(provider.models)) {
-          model.cost = {
-            input: 0,
-            output: 0,
+        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",
          }
-        }
-      }
-
-      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,
-            })
-          },
+          delete headers["x-api-key"]
+          return fetch(input, {
+            ...init,
+            headers,
+          })
        },
      }
    },
-    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"
-
+      if (!process.env["AWS_PROFILE"]) return false
      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",
-          },
-        },
+        region: process.env["AWS_REGION"] ?? "us-east-1",
+        credentialProvider: fromNodeProviderChain(),
      }
    },
  }
@@ -226,7 +83,6 @@ export namespace Provider {
      [providerID: string]: {
        source: Source
        info: ModelsDev.Provider
-        getModel?: (sdk: any, modelID: string) => Promise<any>
        options: Record<string, any>
      }
    } = {}
@@ -242,27 +98,49 @@ export namespace Provider {
      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,
          options,
-          getModel,
        }
        return
      }
      provider.options = mergeDeep(provider.options, options)
      provider.source = source
-      provider.getModel = getModel ?? provider.getModel
    }

    const configProviders = Object.entries(config.provider ?? {})
+    for await (const providerPath of new Bun.Glob("*/provider.toml").scan({
+      cwd: Global.Path.providers,
+    })) {
+      const [providerID] = providerPath.split("/")
+      const toml = await import(
+        path.join(Global.Path.providers, providerPath),
+        {
+          with: {
+            type: "toml",
+          },
+        }
+      ).then((mod) => mod.default)
+      toml.models = {}
+      const modelsPath = path.join(Global.Path.providers, providerID, "models")
+      for await (const modelPath of new Bun.Glob("**/*.toml").scan({
+        cwd: modelsPath,
+      })) {
+        const modelID = modelPath.slice(0, -5)
+        toml.models[modelID] = await import(path.join(modelsPath, modelPath), {
+          with: {
+            type: "toml",
+          },
+        })
+      }
+      configProviders.unshift([providerID, toml])
+    }

    for (const [providerID, provider] of configProviders) {
      const existing = database[providerID]
@@ -271,7 +149,6 @@ export namespace Provider {
        npm: provider.npm ?? existing?.npm,
        name: provider.name ?? existing?.name ?? providerID,
        env: provider.env ?? existing?.env ?? [],
-        api: provider.api ?? existing?.api,
        models: existing?.models ?? {},
      }

@@ -280,23 +157,16 @@ export namespace Provider {
        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,
-          },
+          cost: model.cost ??
+            existing?.cost ?? {
+              input: 0,
+              output: 0,
+              inputCached: 0,
+              outputCached: 0,
+            },
          limit: model.limit ??
            existing?.limit ?? {
              context: 0,
@@ -308,20 +178,15 @@ export namespace Provider {
      database[providerID] = parsed
    }

-    const disabled = await Config.get().then(
+    const disabled = await GlobalConfig.get().then(
      (cfg) => new Set(cfg.disabled_providers ?? []),
    )
    // load env
    for (const [providerID, provider] of Object.entries(database)) {
      if (disabled.has(providerID)) continue
-      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",
-      )
+      if (provider.env.some((item) => process.env[item])) {
+        mergeProvider(providerID, {}, "env")
+      }
    }

    // load apikeys
@@ -336,14 +201,7 @@ export namespace Provider {
    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,
-        )
-      }
+      if (result) mergeProvider(providerID, result, "custom")
    }

    // load config
@@ -351,11 +209,7 @@ export namespace Provider {
      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
-      }
+    for (const providerID of Object.keys(providers)) {
      log.info("found", { providerID })
    }

@@ -406,9 +260,9 @@ export namespace Provider {
    const sdk = await getSDK(provider.info)

    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,
@@ -445,15 +299,10 @@ export namespace Provider {
  }

  export async function defaultModel() {
-    const cfg = await Config.get()
-    if (cfg.model) return parseModel(cfg.model)
+    const cfg = await GlobalConfig.get()
    const provider = await list()
      .then((val) => Object.values(val))
-      .then((x) =>
-        x.find(
-          (p) => !cfg.provider || Object.keys(cfg.provider).includes(p.info.id),
-        ),
-      )
+      .then((x) => x.find((p) => !cfg.provider || cfg.provider === p.info.id))
    if (!provider) throw new Error("no providers found")
    const [model] = sort(Object.values(provider.info.models))
    if (!model) throw new Error("no models found")
@@ -463,14 +312,6 @@ export namespace Provider {
    }
  }

-  export function parseModel(model: string) {
-    const [providerID, ...rest] = model.split("/")
-    return {
-      providerID: providerID,
-      modelID: rest.join("/"),
-    }
-  }
-
  const TOOLS = [
    BashTool,
    EditTool,
@@ -478,27 +319,24 @@ 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"),
+    anthropic: TOOLS.filter((t) => t.id !== "opencode.patch"),
    openai: TOOLS.map((t) => ({
      ...t,
      parameters: optionalToNullable(t.parameters),
    })),
-    azure: TOOLS.map((t) => ({
-      ...t,
-      parameters: optionalToNullable(t.parameters),
-    })),
    google: TOOLS,
  }

@@ -1,38 +0,0 @@
-import type { LanguageModelV1Prompt } from "ai"
-import { unique } from "remeda"
-
-export namespace ProviderTransform {
-  export function message(
-    msgs: LanguageModelV1Prompt,
-    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.providerMetadata = {
-          ...msg.providerMetadata,
-          anthropic: {
-            cacheControl: { 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.providerMetadata = {
-          ...msg.providerMetadata,
-          bedrock: {
-            cachePoint: { type: "ephemeral" },
-          },
-        }
-      }
-    }
-    return msgs
-  }
-}
@@ -9,13 +9,12 @@ 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 { Ripgrep } from "../external/ripgrep"
+import { Installation } from "../installation"

 const ERRORS = {
  400: {
@@ -70,12 +69,12 @@ export namespace Server {
        })
      })
      .get(
-        "/doc",
+        "/openapi",
        openAPISpecs(app, {
          documentation: {
            info: {
              title: "opencode",
-              version: "0.0.3",
+              version: "1.0.0",
              description: "opencode api",
            },
            openapi: "3.0.0",
@@ -122,8 +121,8 @@ export namespace Server {
          })
        },
      )
-      .get(
-        "/app",
+      .post(
+        "/app_info",
        describeRoute({
          description: "Get app info",
          responses: {
@@ -142,7 +141,7 @@ export namespace Server {
        },
      )
      .post(
-        "/app/init",
+        "/app_initialize",
        describeRoute({
          description: "Initialize the app",
          responses: {
@@ -161,47 +160,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: {
@@ -221,69 +242,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: {
@@ -298,78 +332,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()),
@@ -378,59 +357,27 @@ 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(Message.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(Message.Info),
@@ -439,29 +386,23 @@ 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(),
-            parts: Message.MessagePart.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: {
@@ -493,45 +434,13 @@ export namespace Server {
          })
        },
      )
-      .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()),
@@ -541,112 +450,39 @@ 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,
+            query: body.query,
            limit: 10,
          })
          return c.json(result)
        },
      )
-      .get(
-        "/find/symbol",
+      .post(
+        "installation_info",
        describeRoute({
-          description: "Find workspace symbols",
+          description: "Get installation info",
          responses: {
            200: {
-              description: "Symbols",
+              description: "Get installation info",
              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(),
-                  ),
+                  schema: resolver(Installation.Info),
                },
              },
            },
          },
        }),
        async (c) => {
-          const content = await File.status()
-          return c.json(content)
+          return c.json(Installation.info())
        },
      )

@@ -668,10 +504,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"))
+  }
+}
@@ -14,7 +14,6 @@ import {
  type CoreMessage,
  type UIMessage,
  type ProviderMetadata,
-  wrapLanguageModel,
 } from "ai"
 import { z, ZodSchema } from "zod"
 import { Decimal } from "decimal.js"
@@ -31,10 +30,8 @@ import type { Tool } from "../tool/tool"
 import { SystemPrompt } from "./system"
 import { Flag } from "../flag/flag"
 import type { ModelsDev } from "../provider/models"
+import { GlobalConfig } from "../global/config"
 import { Installation } from "../installation"
-import { Config } from "../config/config"
-import { ProviderTransform } from "../provider/transform"
-import { Snapshot } from "../snapshot"

 export namespace Session {
  const log = Log.create({ service: "session" })
@@ -45,6 +42,7 @@ export namespace Session {
      parentID: Identifier.schema("session").optional(),
      share: z
        .object({
+          secret: z.string(),
          url: z.string(),
        })
        .optional(),
@@ -54,29 +52,12 @@ export namespace Session {
        created: z.number(),
        updated: z.number(),
      }),
-      revert: z
-        .object({
-          messageID: z.string(),
-          part: z.number(),
-          snapshot: z.string().optional(),
-        })
-        .optional(),
    })
    .openapi({
-      ref: "Session",
+      ref: "session.info",
    })
  export type Info = z.output<typeof Info>

-  export const ShareInfo = z
-    .object({
-      secret: z.string(),
-      url: z.string(),
-    })
-    .openapi({
-      ref: "SessionShare",
-    })
-  export type ShareInfo = z.output<typeof ShareInfo>
-
  export const Event = {
    Updated: Bus.event(
      "session.updated",
@@ -84,18 +65,6 @@ export namespace Session {
        info: Info,
      }),
    ),
-    Deleted: Bus.event(
-      "session.deleted",
-      z.object({
-        info: Info,
-      }),
-    ),
-    Idle: Bus.event(
-      "session.idle",
-      z.object({
-        sessionID: z.string(),
-      }),
-    ),
    Error: Bus.event(
      "session.error",
      z.object({
@@ -140,7 +109,7 @@ export namespace Session {
    log.info("created", result)
    state().sessions.set(result.id, result)
    await Storage.writeJSON("session/info/" + result.id, result)
-    const cfg = await Config.get()
+    const cfg = await GlobalConfig.get()
    if (!result.parentID && (Flag.OPENCODE_AUTO_SHARE || cfg.autoshare))
      share(result.id).then((share) => {
        update(result.id, (draft) => {
@@ -163,35 +132,19 @@ export namespace Session {
    return read as Info
  }

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

-  export async function unshare(id: string) {
-    await Storage.remove("session/share/" + id)
-    await update(id, (draft) => {
-      draft.share = undefined
-    })
-    await Share.remove(id)
-  }
-
  export async function update(id: string, editor: (session: Info) => void) {
    const { sessions } = state()
    const session = await get(id)
@@ -230,17 +183,6 @@ export namespace Session {
    }
  }

-  export async function children(parentID: string) {
-    const result = [] as Session.Info[]
-    for await (const item of Storage.list("session/info")) {
-      const sessionID = path.basename(item, ".json")
-      const session = await get(sessionID)
-      if (session.parentID !== parentID) continue
-      result.push(session)
-    }
-    return result
-  }
-
  export function abort(sessionID: string) {
    const controller = state().pending.get(sessionID)
    if (!controller) return false
@@ -249,28 +191,6 @@ export namespace Session {
    return true
  }

-  export async function remove(sessionID: string, emitEvent = true) {
-    try {
-      abort(sessionID)
-      const session = await get(sessionID)
-      for (const child of await children(sessionID)) {
-        await remove(child.id, false)
-      }
-      await unshare(sessionID).catch(() => {})
-      await Storage.remove(`session/info/${sessionID}`).catch(() => {})
-      await Storage.removeDir(`session/message/${sessionID}/`).catch(() => {})
-      state().sessions.delete(sessionID)
-      state().messages.delete(sessionID)
-      if (emitEvent) {
-        Bus.publish(Event.Deleted, {
-          info: session,
-        })
-      }
-    } catch (e) {
-      log.error(e)
-    }
-  }
-
  async function updateMessage(msg: Message.Info) {
    await Storage.writeJSON(
      "session/message/" + msg.metadata.sessionID + "/" + msg.id,
@@ -285,7 +205,7 @@ export namespace Session {
    sessionID: string
    providerID: string
    modelID: string
-    parts: Message.MessagePart[]
+    parts: Message.Part[]
    system?: string[]
    tools?: Tool.Info[]
  }) {
@@ -293,37 +213,6 @@ export namespace Session {
    l.info("chatting")
    const model = await Provider.getModel(input.providerID, input.modelID)
    let msgs = await messages(input.sessionID)
-    const session = await get(input.sessionID)
-
-    if (session.revert) {
-      const trimmed = []
-      for (const msg of msgs) {
-        if (
-          msg.id > session.revert.messageID ||
-          (msg.id === session.revert.messageID && session.revert.part === 0)
-        ) {
-          await Storage.remove(
-            "session/message/" + input.sessionID + "/" + msg.id,
-          )
-          await Bus.publish(Message.Event.Removed, {
-            sessionID: input.sessionID,
-            messageID: msg.id,
-          })
-          continue
-        }
-
-        if (msg.id === session.revert.messageID) {
-          if (session.revert.part === 0) break
-          msg.parts = msg.parts.slice(0, session.revert.part)
-        }
-        trimmed.push(msg)
-      }
-      msgs = trimmed
-      await update(input.sessionID, (draft) => {
-        draft.revert = undefined
-      })
-    }
-
    const previous = msgs.at(-1)

    // auto summarize if too long
@@ -336,10 +225,7 @@ export namespace Session {
      if (
        model.info.limit.context &&
        tokens >
-          Math.max(
-            (model.info.limit.context - (model.info.limit.output ?? 0)) * 0.9,
-            0,
-          )
+          (model.info.limit.context - (model.info.limit.output ?? 0)) * 0.9
      ) {
        await summarize({
          sessionID: input.sessionID,
@@ -358,15 +244,24 @@ export namespace Session {
    if (lastSummary) msgs = msgs.filter((msg) => msg.id >= lastSummary.id)

    const app = App.info()
+    const session = await get(input.sessionID)
    if (msgs.length === 0 && !session.parentID) {
      generateText({
        maxTokens: input.providerID === "google" ? 1024 : 20,
-        providerOptions: model.info.options,
        messages: [
          ...SystemPrompt.title(input.providerID).map(
            (x): CoreMessage => ({
              role: "system",
              content: x,
+              providerOptions: {
+                ...(input.providerID === "anthropic"
+                  ? {
+                      anthropic: {
+                        cacheControl: { type: "ephemeral" },
+                      },
+                    }
+                  : {}),
+              },
            }),
          ),
          ...convertToCoreMessages([
@@ -387,7 +282,6 @@ export namespace Session {
        })
        .catch(() => {})
    }
-    const snapshot = await Snapshot.create(input.sessionID)
    const msg: Message.Info = {
      role: "user",
      id: Identifier.ascending("message"),
@@ -398,7 +292,6 @@ export namespace Session {
        },
        sessionID: input.sessionID,
        tool: {},
-        snapshot,
      },
    }
    await updateMessage(msg)
@@ -413,7 +306,6 @@ export namespace Session {
      role: "assistant",
      parts: [],
      metadata: {
-        snapshot,
        assistant: {
          system,
          path: {
@@ -465,7 +357,6 @@ export namespace Session {
            })
            next.metadata!.tool![opts.toolCallId] = {
              ...result.metadata,
-              snapshot: await Snapshot.create(input.sessionID),
              time: {
                start,
                end: Date.now(),
@@ -478,7 +369,6 @@ export namespace Session {
              error: true,
              message: e.toString(),
              title: e.toString(),
-              snapshot: await Snapshot.create(input.sessionID),
              time: {
                start,
                end: Date.now(),
@@ -500,7 +390,6 @@ export namespace Session {
          const result = await execute(args, opts)
          next.metadata!.tool![opts.toolCallId] = {
            ...result.metadata,
-            snapshot: await Snapshot.create(input.sessionID),
            time: {
              start,
              end: Date.now(),
@@ -515,7 +404,6 @@ export namespace Session {
          next.metadata!.tool![opts.toolCallId] = {
            error: true,
            message: e.toString(),
-            snapshot: await Snapshot.create(input.sessionID),
            title: "mcp",
            time: {
              start,
@@ -530,6 +418,24 @@ export namespace Session {
    }

    let text: Message.TextPart | undefined
+    await Bun.write(
+      "/tmp/message.json",
+      JSON.stringify(
+        [
+          ...system.map(
+            (x): CoreMessage => ({
+              role: "system",
+              content: x,
+            }),
+          ),
+          ...convertToCoreMessages(
+            msgs.map(toUIMessage).filter((x) => x.parts.length > 0),
+          ),
+        ],
+        null,
+        2,
+      ),
+    )
    const result = streamText({
      onStepFinish: async (step) => {
        log.info("step finish", { finishReason: step.finishReason })
@@ -547,6 +453,15 @@ export namespace Session {
        }
        text = undefined
      },
+      async onFinish(input) {
+        log.info("message finish", {
+          reason: input.finishReason,
+        })
+        const assistant = next.metadata!.assistant!
+        const usage = getUsage(model.info, input.usage, input.providerMetadata)
+        assistant.cost = usage.cost
+        await updateMessage(next)
+      },
      onError(err) {
        log.error("callback error", err)
        switch (true) {
@@ -583,15 +498,22 @@ export namespace Session {
      //   return step
      // },
      toolCallStreaming: true,
-      maxTokens: Math.max(0, model.info.limit.output) || undefined,
      abortSignal: abort.signal,
      maxSteps: 1000,
-      providerOptions: model.info.options,
      messages: [
        ...system.map(
-          (x): CoreMessage => ({
+          (x, index): CoreMessage => ({
            role: "system",
            content: x,
+            providerOptions: {
+              ...(input.providerID === "anthropic" && index < 4
+                ? {
+                    anthropic: {
+                      cacheControl: { type: "ephemeral" },
+                    },
+                  }
+                : {}),
+            },
          }),
        ),
        ...convertToCoreMessages(
@@ -599,24 +521,10 @@ export namespace Session {
        ),
      ],
      temperature: model.info.temperature ? 0 : undefined,
-      tools: model.info.tool_call === false ? undefined : tools,
-      model: wrapLanguageModel({
-        model: model.language,
-        middleware: [
-          {
-            async transformParams(args) {
-              if (args.type === "stream") {
-                args.params.prompt = ProviderTransform.message(
-                  args.params.prompt,
-                  input.providerID,
-                  input.modelID,
-                )
-              }
-              return args.params
-            },
-          },
-        ],
-      }),
+      tools: {
+        ...tools,
+      },
+      model: model.language,
    })
    try {
      for await (const value of result.fullStream) {
@@ -676,7 +584,7 @@ export namespace Session {
            break

          case "tool-call-delta":
-            continue
+            break

          // for some reason ai sdk claims to not send this part but it does
          // @ts-expect-error
@@ -707,26 +615,10 @@ export namespace Session {
            }
            break

-          case "finish":
-            log.info("message finish", {
-              reason: value.finishReason,
-            })
-            const assistant = next.metadata!.assistant!
-            const usage = getUsage(
-              model.info,
-              value.usage,
-              value.providerMetadata,
-            )
-            assistant.cost += usage.cost
-            await updateMessage(next)
-            if (value.finishReason === "length")
-              throw new Message.OutputLengthError({})
-            break
          default:
            l.info("unhandled", {
              type: value.type,
            })
-            continue
        }
        await updateMessage(next)
      }
@@ -735,9 +627,6 @@ export namespace Session {
        error: e,
      })
      switch (true) {
-        case Message.OutputLengthError.isInstance(e):
-          next.metadata.error = e
-          break
        case LoadAPIKeyError.isInstance(e):
          next.metadata.error = new Provider.AuthError(
            {
@@ -780,51 +669,6 @@ export namespace Session {
    return next
  }

-  export async function revert(input: {
-    sessionID: string
-    messageID: string
-    part: number
-  }) {
-    const message = await getMessage(input.sessionID, input.messageID)
-    if (!message) return
-    const part = message.parts[input.part]
-    if (!part) return
-    const session = await get(input.sessionID)
-    const snapshot =
-      session.revert?.snapshot ?? (await Snapshot.create(input.sessionID))
-    const old = (() => {
-      if (message.role === "assistant") {
-        const lastTool = message.parts.findLast(
-          (part, index) =>
-            part.type === "tool-invocation" && index < input.part,
-        )
-        if (lastTool && lastTool.type === "tool-invocation")
-          return message.metadata.tool[lastTool.toolInvocation.toolCallId]
-            .snapshot
-      }
-      return message.metadata.snapshot
-    })()
-    if (old) await Snapshot.restore(input.sessionID, old)
-    await update(input.sessionID, (draft) => {
-      draft.revert = {
-        messageID: input.messageID,
-        part: input.part,
-        snapshot,
-      }
-    })
-  }
-
-  export async function unrevert(sessionID: string) {
-    const session = await get(sessionID)
-    if (!session) return
-    if (!session.revert) return
-    if (session.revert.snapshot)
-      await Snapshot.restore(sessionID, session.revert.snapshot)
-    update(sessionID, (draft) => {
-      draft.revert = undefined
-    })
-  }
-
  export async function summarize(input: {
    sessionID: string
    providerID: string
@@ -870,9 +714,7 @@ export namespace Session {
      },
    }
    await updateMessage(next)
-
-    let text: Message.TextPart | undefined
-    const result = streamText({
+    const result = await generateText({
      abortSignal: abort.signal,
      model: model.language,
      messages: [
@@ -893,46 +735,16 @@ export namespace Session {
          ],
        },
      ],
-      onStepFinish: async (step) => {
-        const assistant = next.metadata!.assistant!
-        const usage = getUsage(model.info, step.usage, step.providerMetadata)
-        assistant.cost += usage.cost
-        assistant.tokens = usage.tokens
-        await updateMessage(next)
-        if (text) {
-          Bus.publish(Message.Event.PartUpdated, {
-            part: text,
-            messageID: next.id,
-            sessionID: next.metadata.sessionID,
-          })
-        }
-        text = undefined
-      },
-      async onFinish(input) {
-        const assistant = next.metadata!.assistant!
-        const usage = getUsage(model.info, input.usage, input.providerMetadata)
-        assistant.cost += usage.cost
-        assistant.tokens = usage.tokens
-        next.metadata!.time.completed = Date.now()
-        await updateMessage(next)
-      },
    })
-
-    for await (const value of result.fullStream) {
-      switch (value.type) {
-        case "text-delta":
-          if (!text) {
-            text = {
-              type: "text",
-              text: value.textDelta,
-            }
-            next.parts.push(text)
-          } else text.text += value.textDelta
-
-          await updateMessage(next)
-          break
-      }
-    }
+    next.parts.push({
+      type: "text",
+      text: result.text,
+    })
+    const assistant = next.metadata!.assistant!
+    const usage = getUsage(model.info, result.usage, result.providerMetadata)
+    assistant.cost = usage.cost
+    assistant.tokens = usage.tokens
+    await updateMessage(next)
  }

  function lock(sessionID: string) {
@@ -945,9 +757,6 @@ export namespace Session {
      [Symbol.dispose]() {
        log.info("unlocking", { sessionID })
        state().pending.delete(sessionID)
-        Bus.publish(Event.Idle, {
-          sessionID,
-        })
      },
    }
  }
@@ -963,12 +772,8 @@ export namespace Session {
      reasoning: 0,
      cache: {
        write: (metadata?.["anthropic"]?.["cacheCreationInputTokens"] ??
-          // @ts-expect-error
-          metadata?.["bedrock"]?.["usage"]?.["cacheWriteInputTokens"] ??
          0) as number,
        read: (metadata?.["anthropic"]?.["cacheReadInputTokens"] ??
-          // @ts-expect-error
-          metadata?.["bedrock"]?.["usage"]?.["cacheReadInputTokens"] ??
          0) as number,
      },
    }
@@ -1040,7 +845,7 @@ function toUIMessage(msg: Message.Info): UIMessage {
  throw new Error("not implemented")
 }

-function toParts(parts: Message.MessagePart[]): UIMessage["parts"] {
+function toParts(parts: Message.Part[]): UIMessage["parts"] {
  const result: UIMessage["parts"] = []
  for (const part of parts) {
    switch (part.type) {
@@ -4,11 +4,6 @@ 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"),
@@ -18,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>

@@ -31,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>

@@ -45,14 +40,14 @@ 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",
+      ref: "Message.ToolInvocation",
    })
  export type ToolInvocation = z.infer<typeof ToolInvocation>

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

@@ -73,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>

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

@@ -96,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>

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

@@ -117,11 +112,11 @@ 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
+  export const Part = z
    .discriminatedUnion("type", [
      TextPart,
      ReasoningPart,
@@ -131,70 +126,65 @@ export namespace Message {
      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(),
+              cache: z.object({
+                read: z.number(),
+                write: z.number(),
+              }),
+            }),
+          })
+          .optional(),
+      }),
    })
    .openapi({
-      ref: "Message",
+      ref: "Message.Info",
    })
  export type Info = z.infer<typeof Info>

@@ -205,20 +195,9 @@ export namespace Message {
        info: Info,
      }),
    ),
-    Removed: Bus.event(
-      "message.removed",
-      z.object({
-        sessionID: z.string(),
-        messageID: z.string(),
-      }),
-    ),
    PartUpdated: Bus.event(
      "message.part.updated",
-      z.object({
-        part: MessagePart,
-        sessionID: z.string(),
-        messageID: z.string(),
-      }),
+      z.object({ part: Part, sessionID: z.string(), messageID: z.string() }),
    ),
  }
 }
@@ -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,9 +1,6 @@
 import { App } from "../app/app"
-import { Ripgrep } from "../file/ripgrep"
-import { Global } from "../global"
+import { Ripgrep } from "../external/ripgrep"
 import { Filesystem } from "../util/filesystem"
-import path from "path"
-import os from "os"

 import PROMPT_ANTHROPIC from "./prompt/anthropic.txt"
 import PROMPT_ANTHROPIC_SPOOF from "./prompt/anthropic_spoof.txt"
@@ -27,6 +24,55 @@ export namespace SystemPrompt {

  export async function environment() {
    const app = App.info()
+
+    const tree = async () => {
+      const files = await Ripgrep.files({
+        cwd: app.path.cwd,
+      })
+      type Node = {
+        children: Record<string, Node>
+      }
+      const root: Node = {
+        children: {},
+      }
+      for (const file of files) {
+        const parts = file.split("/")
+        let node = root
+        for (const part of parts) {
+          const existing = node.children[part]
+          if (existing) {
+            node = existing
+            continue
+          }
+          node.children[part] = {
+            children: {},
+          }
+          node = node.children[part]
+        }
+      }
+
+      function render(path: string[], node: Node): string {
+        // if (path.length === 3) return "\t".repeat(path.length) + "..."
+        const lines: string[] = []
+        const entries = Object.entries(node.children).sort(([a], [b]) =>
+          a.localeCompare(b),
+        )
+
+        for (const [name, child] of entries) {
+          const currentPath = [...path, name]
+          const indent = "\t".repeat(path.length)
+          const hasChildren = Object.keys(child.children).length > 0
+          lines.push(`${indent}${name}` + (hasChildren ? "/" : ""))
+
+          if (hasChildren) lines.push(render(currentPath, child))
+        }
+
+        return lines.join("\n")
+      }
+      const result = render([], root)
+      return result
+    }
+
    return [
      [
        `Here is some useful information about the environment you are running in:`,
@@ -37,14 +83,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 tree() : ""}`,
        `</project>`,
      ].join("\n"),
    ]
@@ -62,17 +101,7 @@ export namespace SystemPrompt {
      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(() => ""),
-    )
-    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,17 +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`, {
@@ -65,11 +65,4 @@ export namespace Share {
      .then((x) => x.json())
      .then((x) => x as { url: string; secret: string })
  }
-
-  export async function remove(id: string) {
-    return fetch(`${URL}/share_delete`, {
-      method: "POST",
-      body: JSON.stringify({ id }),
-    }).then((x) => x.json())
-  }
 }
@@ -1,85 +0,0 @@
-import { App } from "../app/app"
-import {
-  add,
-  commit,
-  init,
-  checkout,
-  statusMatrix,
-  remove,
-} from "isomorphic-git"
-import path from "path"
-import fs from "fs"
-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) {
-    const app = App.info()
-    const git = gitdir(sessionID)
-    const files = await Ripgrep.files({
-      cwd: app.path.cwd,
-      limit: app.git ? undefined : 1000,
-    })
-    // not a git repo and too big to snapshot
-    if (!app.git && files.length === 1000) return
-    await init({
-      dir: app.path.cwd,
-      gitdir: git,
-      fs,
-    })
-    const status = await statusMatrix({
-      fs,
-      gitdir: git,
-      dir: app.path.cwd,
-    })
-    await add({
-      fs,
-      gitdir: git,
-      parallel: true,
-      dir: app.path.cwd,
-      filepath: files,
-    })
-    for (const [file, _head, workdir, stage] of status) {
-      if (workdir === 0 && stage === 1) {
-        log.info("remove", { file })
-        await remove({
-          fs,
-          gitdir: git,
-          dir: app.path.cwd,
-          filepath: file,
-        })
-      }
-    }
-    const result = await commit({
-      fs,
-      gitdir: git,
-      dir: app.path.cwd,
-      message: "snapshot",
-      author: {
-        name: "opencode",
-        email: "mail@opencode.ai",
-      },
-    })
-    log.info("commit", { result })
-    return result
-  }
-
-  export async function restore(sessionID: string, commit: string) {
-    log.info("restore", { commit })
-    const app = App.info()
-    await checkout({
-      fs,
-      gitdir: gitdir(sessionID),
-      dir: app.path.cwd,
-      ref: commit,
-      force: true,
-    })
-  }
-
-  function gitdir(sessionID: string) {
-    const app = App.info()
-    return path.join(app.path.data, "snapshot", sessionID)
-  }
-}
@@ -24,16 +24,6 @@ export namespace Storage {
    }
  })

-  export async function remove(key: string) {
-    const target = path.join(state().dir, key + ".json")
-    await fs.unlink(target).catch(() => {})
-  }
-
-  export async function removeDir(key: string) {
-    const target = path.join(state().dir, key)
-    await fs.rm(target, { recursive: true, force: true }).catch(() => {})
-  }
-
  export async function readJSON<T>(key: string) {
    return Bun.file(path.join(state().dir, key + ".json")).json() as Promise<T>
  }
@@ -1,7 +1,6 @@
 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 = [
@@ -27,7 +26,7 @@ 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"),
@@ -50,7 +49,6 @@ export const BashTool = Tool.define({

    const process = Bun.spawn({
      cmd: ["bash", "-c", params.command],
-      cwd: App.info().path.cwd,
      maxBuffer: MAX_OUTPUT_LENGTH,
      signal: ctx.abort,
      timeout: timeout,
@@ -65,18 +63,10 @@ export const BashTool = Tool.define({
      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, ""),
    }
  },
 })
@@ -1,21 +1,15 @@
-// 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"),
@@ -28,24 +22,20 @@ export const EditTool = Tool.define({
    replaceAll: z
      .boolean()
      .optional()
-      .describe("Replace all occurrences of old_string (default false)"),
+      .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)

    await Permission.ask({
-      id: "edit",
+      id: "opencode.edit",
      sessionID: ctx.sessionID,
      title: "Edit this file: " + filepath,
      metadata: {
@@ -61,38 +51,47 @@ 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 (!(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 FileTime.assert(ctx.sessionID, 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),
    )

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

    let output = ""
    await LSP.touchFile(filepath, true)
@@ -117,326 +116,6 @@ export const EditTool = Tool.define({
  },
 })

-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(
@@ -472,42 +151,3 @@ function trimDiff(diff: string): string {

  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,10 +3,9 @@ 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"),
@@ -25,12 +24,10 @@ export const GlobTool = Tool.define({
      : 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, dot: true })) {
      if (files.length >= limit) {
        truncated = true
        break
@@ -1,12 +1,12 @@
 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
@@ -21,7 +21,7 @@ export const IGNORE_PATTERNS = [
 const LIMIT = 100

 export const ListTool = Tool.define({
-  id: "list",
+  id: "opencode.list",
  description: DESCRIPTION,
  parameters: z.object({
    path: z
@@ -6,7 +6,7 @@ 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."),
@@ -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."),
@@ -6,7 +6,7 @@ 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"),
@@ -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,7 +2,7 @@ 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"

 const PatchParams = z.object({
@@ -232,7 +232,7 @@ async function applyCommit(
 }

 export const PatchTool = Tool.define({
-  id: "patch",
+  id: "opencode.patch",
  description: DESCRIPTION,
  parameters: PatchParams,
  execute: async (params, ctx) => {
@@ -244,7 +244,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)
@@ -351,7 +351,7 @@ export const PatchTool = Tool.define({
      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`
@@ -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,7 +12,7 @@ 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"),
@@ -89,8 +89,8 @@ export const ReadTool = Tool.define({
    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 {
      output,
@@ -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.
@@ -6,7 +6,7 @@ import { Bus } from "../bus"
 import { Message } from "../session/message"

 export const TaskTool = Tool.define({
-  id: "task",
+  id: "opencode.task",
  description: DESCRIPTION,
  parameters: z.object({
    description: z
@@ -34,16 +34,13 @@ export const TaskTool = Tool.define({
    }

    const unsub = Bus.subscribe(Message.Event.Updated, async (evt) => {
-      if (evt.properties.info.metadata.sessionID !== session.id) return
+      if (evt.properties.info.metadata.sessionID !== ctx.sessionID) return
      ctx.metadata({
        title: params.description,
        summary: summary(evt.properties.info),
      })
    })

-    ctx.abort.addEventListener("abort", () => {
-      Session.abort(session.id)
-    })
    const result = await Session.chat({
      sessionID: session.id,
      modelID: metadata.modelID,
@@ -23,7 +23,7 @@ const state = App.state("todo-tool", () => {
 })

 export const TodoWriteTool = Tool.define({
-  id: "todowrite",
+  id: "opencode.todowrite",
  description: DESCRIPTION_WRITE,
  parameters: z.object({
    todos: z.array(TodoInfo).describe("The updated todo list"),
@@ -42,7 +42,7 @@ export const TodoWriteTool = Tool.define({
 })

 export const TodoReadTool = Tool.define({
-  id: "todoread",
+  id: "opencode.todoread",
  description: "Use this tool to read your todo list",
  parameters: z.object({}),
  async execute(_params, opts) {
@@ -1,6 +1,6 @@
-import { App } from "../app/app"
+import { App } from "../../app/app"

-export namespace FileTime {
+export namespace FileTimes {
  export const state = App.state("tool.filetimes", () => {
    const read: {
      [sessionID: string]: {
@@ -8,7 +8,7 @@ const DEFAULT_TIMEOUT = 30 * 1000 // 30 seconds
 const MAX_TIMEOUT = 120 * 1000 // 2 minutes

 export const WebFetchTool = Tool.define({
-  id: "webfetch",
+  id: "opencode.webfetch",
  description: DESCRIPTION,
  parameters: z.object({
    url: z.string().describe("The URL to fetch content from"),
@@ -76,7 +76,7 @@ export const WebFetchTool = Tool.define({
    switch (params.format) {
      case "text":
        if (contentType.includes("text/html")) {
-          const text = await extractTextFromHTML(content)
+          const text = extractTextFromHTML(content)
          return {
            output: text,
            metadata: {
@@ -127,45 +127,10 @@ export const WebFetchTool = Tool.define({
  },
 })

-async function extractTextFromHTML(html: string) {
-  let text = ""
-  let skipContent = false
-
-  const rewriter = new HTMLRewriter()
-    .on("script, style, noscript, iframe, object, embed", {
-      element() {
-        skipContent = true
-      },
-      text() {
-        // Skip text content inside these elements
-      },
-    })
-    .on("*", {
-      element(element) {
-        // Reset skip flag when entering other elements
-        if (
-          ![
-            "script",
-            "style",
-            "noscript",
-            "iframe",
-            "object",
-            "embed",
-          ].includes(element.tagName)
-        ) {
-          skipContent = false
-        }
-      },
-      text(input) {
-        if (!skipContent) {
-          text += input.text
-        }
-      },
-    })
-    .transform(new Response(html))
-
-  await rewriter.text()
-  return text.trim()
+function extractTextFromHTML(html: string): string {
+  const doc = new DOMParser().parseFromString(html, "text/html")
+  const text = doc.body.textContent || doc.body.innerText || ""
+  return text.replace(/\s+/g, " ").trim()
 }

 function convertHTMLToMarkdown(html: string): string {
@@ -1,5 +1,5 @@

- Allows opencode to search the web and use the results to inform responses
+- Allows OpenCode to search the web and use the results to inform responses
 - Provides up-to-date information for current events and recent data
 - Returns search result information formatted as search result blocks
 - Use this tool for accessing information beyond Claude's knowledge cutoff
@@ -1,16 +1,14 @@
 import { z } from "zod"
 import * as path from "path"
 import { Tool } from "./tool"
+import { FileTimes } from "./util/file-times"
 import { LSP } from "../lsp"
 import { Permission } from "../permission"
 import DESCRIPTION from "./write.txt"
 import { App } from "../app/app"
-import { Bus } from "../bus"
-import { File } from "../file"
-import { FileTime } from "../file/time"

 export const WriteTool = Tool.define({
-  id: "write",
+  id: "opencode.write",
  description: DESCRIPTION,
  parameters: z.object({
    filePath: z
@@ -28,10 +26,10 @@ export const WriteTool = Tool.define({

    const file = Bun.file(filepath)
    const exists = await file.exists()
-    if (exists) await FileTime.assert(ctx.sessionID, filepath)
+    if (exists) await FileTimes.assert(ctx.sessionID, filepath)

    await Permission.ask({
-      id: "write",
+      id: "opencode.write",
      sessionID: ctx.sessionID,
      title: exists
        ? "Overwrite this file: " + filepath
@@ -44,10 +42,7 @@ export const WriteTool = Tool.define({
    })

    await Bun.write(filepath, params.content)
-    await Bus.publish(File.Event.Edited, {
-      file: filepath,
-    })
-    FileTime.read(ctx.sessionID, filepath)
+    FileTimes.read(ctx.sessionID, filepath)

    let output = ""
    await LSP.touchFile(filepath, true)
@@ -1,7 +1,7 @@
 import { z, type ZodSchema } from "zod"
-// import { Log } from "./log"
+import { Log } from "./log"

-// const log = Log.create()
+const log = Log.create()

 export abstract class NamedError extends Error {
  abstract schema(): ZodSchema
@@ -30,6 +30,10 @@ export abstract class NamedError extends Error {
      ) {
        super(name, options)
        this.name = name
+        log.error(name, {
+          ...this.data,
+          cause: options?.cause?.toString(),
+        })
      }

      static isInstance(input: any): input is InstanceType<typeof result> {
@@ -4,8 +4,8 @@ export function lazy<T>(fn: () => T) {

  return (): T => {
    if (loaded) return value as T
-    loaded = true
    value = fn()
    return value as T
  }
 }
+
@@ -19,10 +19,7 @@ export namespace Log {
    await fs.mkdir(dir, { recursive: true })
    cleanup(dir)
    if (options.print) return
-    logpath = path.join(
-      dir,
-      new Date().toISOString().split(".")[0].replace(/:/g, "") + ".log",
-    )
+    logpath = path.join(dir, new Date().toISOString().split(".")[0] + ".log")
    const logfile = Bun.file(logpath)
    await fs.truncate(logpath).catch(() => {})
    const writer = logfile.writer()
@@ -71,13 +68,13 @@ export namespace Log {
    }
    const result = {
      info(message?: any, extra?: Record<string, any>) {
-        process.stderr.write("INFO  " + build(message, extra))
+        process.stderr.write(build(message, extra))
      },
      error(message?: any, extra?: Record<string, any>) {
-        process.stderr.write("ERROR " + build(message, extra))
+        process.stderr.write(build(message, extra))
      },
      warn(message?: any, extra?: Record<string, any>) {
-        process.stderr.write("WARN  " + build(message, extra))
+        process.stderr.write(build(message, extra))
      },
      tag(key: string, value: string) {
        if (tags) tags[key] = value
@@ -1,14 +0,0 @@
-export function withTimeout<T>(promise: Promise<T>, ms: number): Promise<T> {
-  let timeout: NodeJS.Timeout
-  return Promise.race([
-    promise.then((result) => {
-      clearTimeout(timeout)
-      return result
-    }),
-    new Promise<never>((_, reject) => {
-      timeout = setTimeout(() => {
-        reject(new Error(`Operation timed out after ${ms}ms`))
-      }, ms)
-    }),
-  ])
-}
@@ -6,4 +6,4 @@
 /// <reference path="../../sst-env.d.ts" />

 import "sst"
-export {}
+export {}
@@ -1,413 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { replace } from "../../src/tool/edit"
-
-interface TestCase {
-  content: string
-  find: string
-  replace: string
-  all?: boolean
-  fail?: boolean
-}
-
-const testCases: TestCase[] = [
-  // SimpleReplacer cases
-  {
-    content: ["function hello() {", '  console.log("world");', "}"].join("\n"),
-    find: 'console.log("world");',
-    replace: 'console.log("universe");',
-  },
-  {
-    content: [
-      "if (condition) {",
-      "  doSomething();",
-      "  doSomethingElse();",
-      "}",
-    ].join("\n"),
-    find: ["  doSomething();", "  doSomethingElse();"].join("\n"),
-    replace: ["  doNewThing();", "  doAnotherThing();"].join("\n"),
-  },
-
-  // LineTrimmedReplacer cases
-  {
-    content: ["function test() {", '    console.log("hello");', "}"].join("\n"),
-    find: 'console.log("hello");',
-    replace: 'console.log("goodbye");',
-  },
-  {
-    content: ["const x = 5;   ", "const y = 10;"].join("\n"),
-    find: "const x = 5;",
-    replace: "const x = 15;",
-  },
-  {
-    content: ["  if (true) {", "    return false;", "  }"].join("\n"),
-    find: ["if (true) {", "return false;", "}"].join("\n"),
-    replace: ["if (false) {", "return true;", "}"].join("\n"),
-  },
-
-  // BlockAnchorReplacer cases
-  {
-    content: [
-      "function calculate(a, b) {",
-      "  const temp = a + b;",
-      "  const result = temp * 2;",
-      "  return result;",
-      "}",
-    ].join("\n"),
-    find: [
-      "function calculate(a, b) {",
-      "  // different middle content",
-      "  return result;",
-      "}",
-    ].join("\n"),
-    replace: ["function calculate(a, b) {", "  return a * b * 2;", "}"].join(
-      "\n",
-    ),
-  },
-  {
-    content: [
-      "class MyClass {",
-      "  constructor() {",
-      "    this.value = 0;",
-      "  }",
-      "  ",
-      "  getValue() {",
-      "    return this.value;",
-      "  }",
-      "}",
-    ].join("\n"),
-    find: ["class MyClass {", "  // different implementation", "}"].join("\n"),
-    replace: [
-      "class MyClass {",
-      "  constructor() {",
-      "    this.value = 42;",
-      "  }",
-      "}",
-    ].join("\n"),
-  },
-
-  // WhitespaceNormalizedReplacer cases
-  {
-    content: ["function test() {", '\tconsole.log("hello");', "}"].join("\n"),
-    find: '  console.log("hello");',
-    replace: '  console.log("world");',
-  },
-  {
-    content: "const   x    =     5;",
-    find: "const x = 5;",
-    replace: "const x = 10;",
-  },
-  {
-    content: "if\t(  condition\t) {",
-    find: "if ( condition ) {",
-    replace: "if (newCondition) {",
-  },
-
-  // IndentationFlexibleReplacer cases
-  {
-    content: [
-      "    function nested() {",
-      '      console.log("deeply nested");',
-      "      return true;",
-      "    }",
-    ].join("\n"),
-    find: [
-      "function nested() {",
-      '  console.log("deeply nested");',
-      "  return true;",
-      "}",
-    ].join("\n"),
-    replace: [
-      "function nested() {",
-      '  console.log("updated");',
-      "  return false;",
-      "}",
-    ].join("\n"),
-  },
-  {
-    content: [
-      "  if (true) {",
-      '    console.log("level 1");',
-      '      console.log("level 2");',
-      "  }",
-    ].join("\n"),
-    find: [
-      "if (true) {",
-      'console.log("level 1");',
-      '  console.log("level 2");',
-      "}",
-    ].join("\n"),
-    replace: ["if (true) {", 'console.log("updated");', "}"].join("\n"),
-  },
-
-  // replaceAll option cases
-  {
-    content: [
-      'console.log("test");',
-      'console.log("test");',
-      'console.log("test");',
-    ].join("\n"),
-    find: 'console.log("test");',
-    replace: 'console.log("updated");',
-    all: true,
-  },
-  {
-    content: ['console.log("test");', 'console.log("test");'].join("\n"),
-    find: 'console.log("test");',
-    replace: 'console.log("updated");',
-    all: false,
-  },
-
-  // Error cases
-  {
-    content: 'console.log("hello");',
-    find: "nonexistent string",
-    replace: "updated",
-    fail: true,
-  },
-  {
-    content: ["test", "test", "different content", "test"].join("\n"),
-    find: "test",
-    replace: "updated",
-    all: false,
-    fail: true,
-  },
-
-  // Edge cases
-  {
-    content: "",
-    find: "",
-    replace: "new content",
-  },
-  {
-    content: "const regex = /[.*+?^${}()|[\\\\]\\\\\\\\]/g;",
-    find: "/[.*+?^${}()|[\\\\]\\\\\\\\]/g",
-    replace: "/\\\\w+/g",
-  },
-  {
-    content: 'const message = "Hello 世界! 🌍";',
-    find: "Hello 世界! 🌍",
-    replace: "Hello World! 🌎",
-  },
-
-  // EscapeNormalizedReplacer cases
-  {
-    content: 'console.log("Hello\nWorld");',
-    find: 'console.log("Hello\\nWorld");',
-    replace: 'console.log("Hello\nUniverse");',
-  },
-  {
-    content: "const str = 'It's working';",
-    find: "const str = 'It\\'s working';",
-    replace: "const str = 'It's fixed';",
-  },
-  {
-    content: "const template = `Hello ${name}`;",
-    find: "const template = `Hello \\${name}`;",
-    replace: "const template = `Hi ${name}`;",
-  },
-  {
-    content: "const path = 'C:\\Users\\test';",
-    find: "const path = 'C:\\\\Users\\\\test';",
-    replace: "const path = 'C:\\Users\\admin';",
-  },
-
-  // MultiOccurrenceReplacer cases (with replaceAll)
-  {
-    content: ["debug('start');", "debug('middle');", "debug('end');"].join(
-      "\n",
-    ),
-    find: "debug",
-    replace: "log",
-    all: true,
-  },
-  {
-    content: "const x = 1; const y = 1; const z = 1;",
-    find: "1",
-    replace: "2",
-    all: true,
-  },
-
-  // TrimmedBoundaryReplacer cases
-  {
-    content: ["  function test() {", "    return true;", "  }"].join("\n"),
-    find: ["function test() {", "  return true;", "}"].join("\n"),
-    replace: ["function test() {", "  return false;", "}"].join("\n"),
-  },
-  {
-    content: "\n  const value = 42;  \n",
-    find: "const value = 42;",
-    replace: "const value = 24;",
-  },
-  {
-    content: ["", "  if (condition) {", "    doSomething();", "  }", ""].join(
-      "\n",
-    ),
-    find: ["if (condition) {", "  doSomething();", "}"].join("\n"),
-    replace: ["if (condition) {", "  doNothing();", "}"].join("\n"),
-  },
-
-  // ContextAwareReplacer cases
-  {
-    content: [
-      "function calculate(a, b) {",
-      "  const temp = a + b;",
-      "  const result = temp * 2;",
-      "  return result;",
-      "}",
-    ].join("\n"),
-    find: [
-      "function calculate(a, b) {",
-      "  // some different content here",
-      "  // more different content",
-      "  return result;",
-      "}",
-    ].join("\n"),
-    replace: ["function calculate(a, b) {", "  return (a + b) * 2;", "}"].join(
-      "\n",
-    ),
-  },
-  {
-    content: [
-      "class TestClass {",
-      "  constructor() {",
-      "    this.value = 0;",
-      "  }",
-      "  ",
-      "  method() {",
-      "    return this.value;",
-      "  }",
-      "}",
-    ].join("\n"),
-    find: [
-      "class TestClass {",
-      "  // different implementation",
-      "  // with multiple lines",
-      "}",
-    ].join("\n"),
-    replace: ["class TestClass {", "  getValue() { return 42; }", "}"].join(
-      "\n",
-    ),
-  },
-
-  // Combined edge cases for new replacers
-  {
-    content: '\tconsole.log("test");\t',
-    find: 'console.log("test");',
-    replace: 'console.log("updated");',
-  },
-  {
-    content: ["  ", "function test() {", "  return 'value';", "}", "  "].join(
-      "\n",
-    ),
-    find: ["function test() {", "return 'value';", "}"].join("\n"),
-    replace: ["function test() {", "return 'new value';", "}"].join("\n"),
-  },
-
-  // Test for same oldString and newString (should fail)
-  {
-    content: 'console.log("test");',
-    find: 'console.log("test");',
-    replace: 'console.log("test");',
-    fail: true,
-  },
-
-  // Additional tests for fixes made
-
-  // WhitespaceNormalizedReplacer - test regex special characters that could cause errors
-  {
-    content: 'const pattern = "test[123]";',
-    find: "test[123]",
-    replace: "test[456]",
-  },
-  {
-    content: 'const regex = "^start.*end$";',
-    find: "^start.*end$",
-    replace: "^begin.*finish$",
-  },
-
-  // EscapeNormalizedReplacer - test single backslash vs double backslash
-  {
-    content: 'const path = "C:\\Users";',
-    find: 'const path = "C:\\Users";',
-    replace: 'const path = "D:\\Users";',
-  },
-  {
-    content: 'console.log("Line1\\nLine2");',
-    find: 'console.log("Line1\\nLine2");',
-    replace: 'console.log("First\\nSecond");',
-  },
-
-  // BlockAnchorReplacer - test edge case with exact newline boundaries
-  {
-    content: ["function test() {", "  return true;", "}"].join("\n"),
-    find: ["function test() {", "  // middle", "}"].join("\n"),
-    replace: ["function test() {", "  return false;", "}"].join("\n"),
-  },
-
-  // ContextAwareReplacer - test with trailing newline in find string
-  {
-    content: [
-      "class Test {",
-      "  method1() {",
-      "    return 1;",
-      "  }",
-      "}",
-    ].join("\n"),
-    find: [
-      "class Test {",
-      "  // different content",
-      "}",
-      "", // trailing empty line
-    ].join("\n"),
-    replace: ["class Test {", "  method2() { return 2; }", "}"].join("\n"),
-  },
-
-  // Test validation for empty strings with same oldString and newString
-  {
-    content: "",
-    find: "",
-    replace: "",
-    fail: true,
-  },
-
-  // Test multiple occurrences with replaceAll=false (should fail)
-  {
-    content: ["const a = 1;", "const b = 1;", "const c = 1;"].join("\n"),
-    find: "= 1",
-    replace: "= 2",
-    all: false,
-    fail: true,
-  },
-
-  // Test whitespace normalization with multiple spaces and tabs mixed
-  {
-    content: "if\t \t( \tcondition\t )\t{",
-    find: "if ( condition ) {",
-    replace: "if (newCondition) {",
-  },
-
-  // Test escape sequences in template literals
-  {
-    content: "const msg = `Hello\\tWorld`;",
-    find: "const msg = `Hello\\tWorld`;",
-    replace: "const msg = `Hi\\tWorld`;",
-  },
-]
-
-describe("EditTool Replacers", () => {
-  test.each(testCases)("case %#", (testCase) => {
-    if (testCase.fail) {
-      expect(() => {
-        replace(testCase.content, testCase.find, testCase.replace, testCase.all)
-      }).toThrow()
-    } else {
-      const result = replace(
-        testCase.content,
-        testCase.find,
-        testCase.replace,
-        testCase.all,
-      )
-      expect(result).toContain(testCase.replace)
-    }
-  })
-})
@@ -14,7 +14,7 @@ describe("tool.glob", () => {
    await App.provide({ cwd: process.cwd() }, async () => {
      let result = await GlobTool.execute(
        {
-          pattern: "../../node_modules/**/*",
+          pattern: "./node_modules/**/*",
          path: undefined,
        },
        ctx,
@@ -33,7 +33,7 @@ describe("tool.glob", () => {
      )
      expect(result.metadata).toMatchObject({
        truncated: false,
-        count: 3,
+        count: 2,
      })
    })
  })
--- a/Show More
+++ b/Show More