docs: fix

renable todo tool
looser todo tool schema
2025-08-07 21:49:18 -04:00 · 2025-08-07 21:47:37 -04:00 · 2025-08-07 21:47:37 -04:00 · 2025-08-07 19:24:08 -04:00 · 2025-08-07 18:51:54 -04:00 · 2025-08-07 16:35:35 -04:00
362 changed files with 13641 additions and 16275 deletions
@@ -7,12 +7,13 @@ on:
 jobs:
  opencode:
    if: |
-      startsWith(github.event.comment.body, 'opencode') ||
-      startsWith(github.event.comment.body, 'hi opencode') ||
-      startsWith(github.event.comment.body, 'hey opencode') ||
-      contains(github.event.comment.body, '@opencode-agent')
+      contains(github.event.comment.body, ' /oc') ||
+      startsWith(github.event.comment.body, '/oc') ||
+      contains(github.event.comment.body, ' /opencode') ||
+      startsWith(github.event.comment.body, '/opencode')
    runs-on: ubuntu-latest
    permissions:
+      contents: read
      id-token: write
    steps:
      - name: Checkout repository
@@ -1,14 +1,17 @@
 name: publish
+run-name: "${{ format('v{0}', inputs.version) }}"

 on:
  workflow_dispatch:
-  push:
-    branches:
-      - dev
-    tags:
-      - "*"
-      - "!vscode-v*"
-      - "!github-v*"
+    inputs:
+      version:
+        description: "Version to publish"
+        required: true
+        type: string
+      title:
+        description: "Custom title for this run"
+        required: false
+        type: string

 concurrency: ${{ github.workflow }}-${{ github.ref }}

@@ -34,7 +37,16 @@ jobs:

      - uses: oven-sh/setup-bun@v2
        with:
-          bun-version: 1.2.17
+          bun-version: 1.2.19
+
+      - name: Cache ~/.bun
+        id: cache-bun
+        uses: actions/cache@v3
+        with:
+          path: ~/.bun
+          key: ${{ runner.os }}-bun-${{ hashFiles('bun.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-bun-

      - name: Install makepkg
        run: |
@@ -50,15 +62,12 @@ jobs:
          git config --global user.email "opencode@sst.dev"
          git config --global user.name "opencode"

+      - name: Install dependencies
+        run: bun install
+
      - name: Publish
        run: |
-          bun install
-          if [ "${{ startsWith(github.ref, 'refs/tags/') }}" = "true" ]; then
-            ./script/publish.ts
-          else
-            ./script/publish.ts --snapshot
-          fi
-        working-directory: ./packages/opencode
+          OPENCODE_VERSION=${{ inputs.version }} ./script/publish.ts
        env:
          GITHUB_TOKEN: ${{ secrets.SST_GITHUB_TOKEN }}
          AUR_KEY: ${{ secrets.AUR_KEY }}
@@ -21,7 +21,7 @@ jobs:
          bun-version: latest

      - name: Run stats script
-        run: bun scripts/stats.ts
+        run: bun script/stats.ts

      - name: Commit stats
        run: |
@@ -30,3 +30,5 @@ jobs:
          git add STATS.md
          git diff --staged --quiet || git commit -m "ignore: update download stats $(date -I)"
          git push
+        env:
+          POSTHOG_KEY: ${{ secrets.POSTHOG_KEY }}
@@ -0,0 +1,24 @@
+name: Typecheck
+
+on:
+  pull_request:
+    branches: [dev]
+  workflow_dispatch:
+
+jobs:
+  typecheck:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: 1.2.19
+
+      - name: Install dependencies
+        run: bun install
+
+      - name: Run typecheck
+        run: bun typecheck
@@ -5,4 +5,4 @@ node_modules
 .idea
 .vscode
 openapi.json
-scratch
+playground
@@ -0,0 +1,12 @@
+---
+description: You MUST use this agent when writing documentation
+---
+
+You are an expert technical documentation writer
+
+You are not verbose
+
+Every chunk of text should be followed by an example or something besides text
+to look at.
+
+Chunks of text should not be more than 2 sentences long.
@@ -1,44 +0,0 @@
---
-description: >-
-  Use this agent when you need to create or improve documentation that requires
-  concrete examples to illustrate every concept. Examples include:
-  <example>Context: User has written a new API endpoint and needs documentation.
-  user: 'I just created a POST /users endpoint that accepts name and email
-  fields. Can you document this?' assistant: 'I'll use the
-  example-driven-docs-writer agent to create documentation with practical
-  examples for your API endpoint.' <commentary>Since the user needs
-  documentation with examples, use the example-driven-docs-writer agent to
-  create comprehensive docs with code samples.</commentary></example>
-  <example>Context: User has a complex configuration file that needs
-  documentation. user: 'This config file has multiple sections and I need docs
-  that show how each option works' assistant: 'Let me use the
-  example-driven-docs-writer agent to create documentation that breaks down each
-  configuration option with practical examples.' <commentary>The user needs
-  documentation that demonstrates configuration options, perfect for the
-  example-driven-docs-writer agent.</commentary></example>
---
-You are an expert technical documentation writer who specializes in creating clear, example-rich documentation that never leaves readers guessing. Your core principle is that every concept must be immediately illustrated with concrete examples, code samples, or practical demonstrations.
-
-Your documentation approach:
- Never write more than one sentence in any section without providing an example, code snippet, diagram, or practical illustration
- Break up longer explanations with multiple examples showing different scenarios or use cases
- Use concrete, realistic examples rather than abstract or placeholder content
- Include both basic and advanced examples when covering complex topics
- Show expected inputs, outputs, and results for all examples
- Use code blocks, bullet points, tables, or other formatting to visually separate examples from explanatory text
-
-Structural requirements:
- Start each section with a brief one-sentence explanation followed immediately by an example
- For multi-step processes, provide an example after each step
- Include error examples and edge cases alongside success scenarios
- Use consistent formatting and naming conventions throughout examples
- Ensure examples are copy-pasteable and functional when applicable
-
-Quality standards:
- Verify that no paragraph exceeds one sentence without an accompanying example
- Test that examples are accurate and would work in real scenarios
- Ensure examples progress logically from simple to complex
- Include context for when and why to use different approaches shown in examples
- Provide troubleshooting examples for common issues
-
-When you receive a documentation request, immediately identify what needs examples and plan to illustrate every single concept, feature, or instruction with concrete demonstrations. Ask for clarification if you need more context to create realistic, useful examples.
@@ -1,13 +1,12 @@
-## Style
+## IMPORTANT

- prefer single word variable/function names
- avoid try catch where possible - prefer to let exceptions bubble up
- avoid else statements where possible
- do not make useless helper functions - inline functionality unless the
-  function is reusable or composable
- prefer Bun apis
-
-## Workflow
-
- you can regenerate the golang sdk by calling ./scripts/stainless.ts
- we use bun for everything
+- Try to keep things in one function unless composable or reusable
+- DO NOT do unnecessary destructuring of variables
+- DO NOT use `else` statements unless necessary
+- DO NOT use `try`/`catch` if it can be avoided
+- AVOID `try`/`catch` where possible
+- AVOID `else` statements
+- AVOID using `any` type
+- AVOID `let` statements
+- PREFER single word variable names where possible
+- Use as many bun apis as possible like Bun.file()
@@ -83,7 +83,7 @@ And run.

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

 #### Development Notes
@@ -97,7 +97,7 @@ $ bun run packages/opencode/src/index.ts
 It's very similar to Claude Code in terms of capability. Here are the key differences:

 - 100% open source
- Not coupled to any provider. Although Anthropic is recommended, opencode can be used with OpenAI, Google or even local models. As models evolve the gaps between them will close and pricing will drop so being provider agnostic is important.
+- Not coupled to any provider. Although Anthropic is recommended, opencode can be used with OpenAI, Google or even local models. As models evolve the gaps between them will close and pricing will drop so being provider-agnostic is important.
 - A focus on TUI. opencode is built by neovim users and the creators of [terminal.shop](https://terminal.shop); we are going to push the limits of what's possible in the terminal.
 - A client/server architecture. This for example can allow opencode to run on your computer, while you can drive it remotely from a mobile app. Meaning that the TUI frontend is just one of the possible clients.

@@ -1,29 +1,43 @@
 # Download Stats

-| Date       | GitHub Downloads | npm Downloads    | Total             |
-| ---------- | ---------------- | ---------------- | ----------------- |
-| 2025-06-29 | 18,789 (+0)      | 39,420 (+0)      | 58,209 (+0)       |
-| 2025-06-30 | 20,127 (+1,338)  | 41,059 (+1,639)  | 61,186 (+2,977)   |
-| 2025-07-01 | 22,108 (+1,981)  | 43,745 (+2,686)  | 65,853 (+4,667)   |
-| 2025-07-02 | 24,814 (+2,706)  | 46,168 (+2,423)  | 70,982 (+5,129)   |
-| 2025-07-03 | 27,834 (+3,020)  | 49,955 (+3,787)  | 77,789 (+6,807)   |
-| 2025-07-04 | 30,608 (+2,774)  | 54,758 (+4,803)  | 85,366 (+7,577)   |
-| 2025-07-05 | 32,524 (+1,916)  | 58,371 (+3,613)  | 90,895 (+5,529)   |
-| 2025-07-06 | 33,766 (+1,242)  | 59,694 (+1,323)  | 93,460 (+2,565)   |
-| 2025-07-08 | 38,052 (+4,286)  | 64,468 (+4,774)  | 102,520 (+9,060)  |
-| 2025-07-10 | 43,796 (+5,744)  | 71,402 (+6,934)  | 115,198 (+12,678) |
-| 2025-07-11 | 46,982 (+3,186)  | 77,462 (+6,060)  | 124,444 (+9,246)  |
-| 2025-07-12 | 49,302 (+2,320)  | 82,177 (+4,715)  | 131,479 (+7,035)  |
-| 2025-07-13 | 50,803 (+1,501)  | 86,394 (+4,217)  | 137,197 (+5,718)  |
-| 2025-07-14 | 53,283 (+2,480)  | 87,860 (+1,466)  | 141,143 (+3,946)  |
-| 2025-07-15 | 57,590 (+4,307)  | 91,036 (+3,176)  | 148,626 (+7,483)  |
-| 2025-07-16 | 62,313 (+4,723)  | 95,258 (+4,222)  | 157,571 (+8,945)  |
-| 2025-07-17 | 66,684 (+4,371)  | 100,048 (+4,790) | 166,732 (+9,161)  |
-| 2025-07-18 | 70,379 (+3,695)  | 102,587 (+2,539) | 172,966 (+6,234)  |
-| 2025-07-19 | 73,497 (+3,117)  | 105,904 (+3,317) | 179,401 (+6,434)  |
-| 2025-07-20 | 76,453 (+2,956)  | 109,044 (+3,140) | 185,497 (+6,096)  |
-| 2025-07-21 | 80,197 (+3,744)  | 113,537 (+4,493) | 193,734 (+8,237)  |
-| 2025-07-22 | 84,251 (+4,054)  | 118,073 (+4,536) | 202,324 (+8,590)  |
-| 2025-07-23 | 88,589 (+4,338)  | 121,436 (+3,363) | 210,025 (+7,701)  |
-| 2025-07-24 | 92,469 (+3,880)  | 124,091 (+2,655) | 216,560 (+6,535)  |
-| 2025-07-25 | 96,417 (+3,948)  | 126,985 (+2,894) | 223,402 (+6,842)  |
+| Date       | GitHub Downloads | npm Downloads    | Total            |
+| ---------- | ---------------- | ---------------- | ---------------- |
+| 2025-06-29 | 18,789 (+0)      | 39,420 (+0)      | 58,209 (+0)      |
+| 2025-06-30 | 20,127 (+1,338)  | 41,059 (+1,639)  | 61,186 (+2,977)  |
+| 2025-07-01 | 22,108 (+1,981)  | 43,745 (+2,686)  | 65,853 (+4,667)  |
+| 2025-07-02 | 24,814 (+2,706)  | 46,168 (+2,423)  | 70,982 (+5,129)  |
+| 2025-07-03 | 27,834 (+3,020)  | 49,955 (+3,787)  | 77,789 (+6,807)  |
+| 2025-07-04 | 30,608 (+2,774)  | 54,758 (+4,803)  | 85,366 (+7,577)  |
+| 2025-07-05 | 32,524 (+1,916)  | 58,371 (+3,613)  | 90,895 (+5,529)  |
+| 2025-07-06 | 33,766 (+1,242)  | 59,694 (+1,323)  | 93,460 (+2,565)  |
+| 2025-07-08 | 38,052 (+4,286)  | 64,468 (+4,774)  | 102,520 (+9,060) |
+| 2025-07-09 | 40,924 (+2,872)  | 67,935 (+3,467)  | 108,859 (+6,339) |
+| 2025-07-10 | 43,796 (+2,872)  | 71,402 (+3,467)  | 115,198 (+6,339) |
+| 2025-07-11 | 46,982 (+3,186)  | 77,462 (+6,060)  | 124,444 (+9,246) |
+| 2025-07-12 | 49,302 (+2,320)  | 82,177 (+4,715)  | 131,479 (+7,035) |
+| 2025-07-13 | 50,803 (+1,501)  | 86,394 (+4,217)  | 137,197 (+5,718) |
+| 2025-07-14 | 53,283 (+2,480)  | 87,860 (+1,466)  | 141,143 (+3,946) |
+| 2025-07-15 | 57,590 (+4,307)  | 91,036 (+3,176)  | 148,626 (+7,483) |
+| 2025-07-16 | 62,313 (+4,723)  | 95,258 (+4,222)  | 157,571 (+8,945) |
+| 2025-07-17 | 66,684 (+4,371)  | 100,048 (+4,790) | 166,732 (+9,161) |
+| 2025-07-18 | 70,379 (+3,695)  | 102,587 (+2,539) | 172,966 (+6,234) |
+| 2025-07-19 | 73,497 (+3,117)  | 105,904 (+3,317) | 179,401 (+6,434) |
+| 2025-07-20 | 76,453 (+2,956)  | 109,044 (+3,140) | 185,497 (+6,096) |
+| 2025-07-21 | 80,197 (+3,744)  | 113,537 (+4,493) | 193,734 (+8,237) |
+| 2025-07-22 | 84,251 (+4,054)  | 118,073 (+4,536) | 202,324 (+8,590) |
+| 2025-07-23 | 88,589 (+4,338)  | 121,436 (+3,363) | 210,025 (+7,701) |
+| 2025-07-24 | 92,469 (+3,880)  | 124,091 (+2,655) | 216,560 (+6,535) |
+| 2025-07-25 | 96,417 (+3,948)  | 126,985 (+2,894) | 223,402 (+6,842) |
+| 2025-07-26 | 100,646 (+4,229) | 131,411 (+4,426) | 232,057 (+8,655) |
+| 2025-07-27 | 102,644 (+1,998) | 134,736 (+3,325) | 237,380 (+5,323) |
+| 2025-07-28 | 105,446 (+2,802) | 136,016 (+1,280) | 241,462 (+4,082) |
+| 2025-07-29 | 108,998 (+3,552) | 137,542 (+1,526) | 246,540 (+5,078) |
+| 2025-07-30 | 113,544 (+4,546) | 140,317 (+2,775) | 253,861 (+7,321) |
+| 2025-07-31 | 118,339 (+4,795) | 143,344 (+3,027) | 261,683 (+7,822) |
+| 2025-08-01 | 123,539 (+5,200) | 146,680 (+3,336) | 270,219 (+8,536) |
+| 2025-08-02 | 127,864 (+4,325) | 149,236 (+2,556) | 277,100 (+6,881) |
+| 2025-08-03 | 131,397 (+3,533) | 150,451 (+1,215) | 281,848 (+4,748) |
+| 2025-08-04 | 136,266 (+4,869) | 153,260 (+2,809) | 289,526 (+7,678) |
+| 2025-08-05 | 141,596 (+5,330) | 155,752 (+2,492) | 297,348 (+7,822) |
+| 2025-08-06 | 147,067 (+5,471) | 158,309 (+2,557) | 305,376 (+8,028) |
+| 2025-08-07 | 152,591 (+5,524) | 160,889 (+2,580) | 313,480 (+8,104) |
@@ -2,73 +2,77 @@

 A GitHub Action that integrates [opencode](https://opencode.ai) directly into your GitHub workflow.

-Start your comment with `hey opencode`, and opencode will take action via your GitHub Actions runner.
+Mention `/opencode` in your comment, and opencode will execute tasks within your GitHub Actions runner.

 ## Features

-#### Triage and explain issues
+#### Explain an issues
+
+Leave the following comment on a GitHub issue. `opencode` will read the entire thread, including all comments, and reply with a clear explanation.

 ```
-hey opencode, explain this issue
+/opencode explain this issue
 ```

-#### Fix or implement issues - opencode will create a PR with the changes.
+#### Fix an issues
+
+Leave the following comment on a GitHub issue. opencode will create a new branch, implement the changes, and open a PR with the changes.

 ```
-hi opencode, fix this
+/opencode fix this
 ```

- Review PRs and make changes
+#### Review PRs and make changes
+
+Leave the following comment on a GitHub PR. opencode will implement the requested change and commit it to the same PR.

 ```
-Delete the attachment from S3 when the note is removed @opencode-agent
+Delete the attachment from S3 when the note is removed /oc
 ```

 ## Installation

 Run the following command in the terminal from your GitHub repo:

-```
+```bash
 opencode github install
 ```

-This will walk you through installing the GitHub app, configuring the workflow, and setting up secrets.
+This will walk you through installing the GitHub app, creating the workflow, and setting up secrets.

 ### Manual Setup

 1. Install the GitHub app https://github.com/apps/opencode-agent. Make sure it is installed on the target repository.
 2. Add the following workflow file to `.github/workflows/opencode.yml` in your repo. Set the appropriate `model` and required API keys in `env`.

-```yml
-name: opencode
+   ```yml
+   name: opencode

-on:
-  issue_comment:
-    types: [created]
+   on:
+     issue_comment:
+       types: [created]

-jobs:
-  opencode:
-    if: |
-      startsWith(github.event.comment.body, 'opencode') ||
-      startsWith(github.event.comment.body, 'hi opencode') ||
-      startsWith(github.event.comment.body, 'hey opencode') ||
-      contains(github.event.comment.body, '@opencode-agent')
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
+   jobs:
+     opencode:
+       if: |
+         contains(github.event.comment.body, '/oc') ||
+         contains(github.event.comment.body, '/opencode')
+       runs-on: ubuntu-latest
+       permissions:
+         id-token: write
+       steps:
+         - name: Checkout repository
+           uses: actions/checkout@v4
+           with:
+             fetch-depth: 1

-      - name: Run opencode
-        uses: sst/opencode/github@latest
-        env:
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-        with:
-          model: anthropic/claude-sonnet-4-20250514
-```
+         - name: Run opencode
+           uses: sst/opencode/github@latest
+           env:
+             ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
+           with:
+             model: anthropic/claude-sonnet-4-20250514
+   ```

 3. Store the API keys in secrets. In your organization or project **settings**, expand **Secrets and variables** on the left and select **Actions**. Add the required API keys.

@@ -82,32 +86,32 @@ To test locally:

 1. Navigate to a test repo (e.g. `hello-world`):

-```
-cd hello-world
-```
+   ```bash
+   cd hello-world
+   ```

 2. Run:

-```
-MODEL=anthropic/claude-sonnet-4-20250514 \
-  ANTHROPIC_API_KEY=sk-ant-api03-1234567890 \
-  GITHUB_RUN_ID=dummy \
-  bun /path/to/opencode/packages/opencode/src/index.ts github run \
-  --token 'github_pat_1234567890' \
-  --event '{"eventName":"issue_comment",...}'
-```
+   ```bash
+   MODEL=anthropic/claude-sonnet-4-20250514 \
+     ANTHROPIC_API_KEY=sk-ant-api03-1234567890 \
+     GITHUB_RUN_ID=dummy \
+     bun /path/to/opencode/packages/opencode/src/index.ts github run \
+     --token 'github_pat_1234567890' \
+     --event '{"eventName":"issue_comment",...}'
+   ```

- `MODEL`: The model used by opencode. Same as the `MODEL` defined in the GitHub workflow.
- `ANTHROPIC_API_KEY`: Your model provider API key. Same as the keys defined in the GitHub workflow.
- `GITHUB_RUN_ID`: Dummy value to emulate GitHub action environment.
- `/path/to/opencode`: Path to your cloned opencode repo. `bun /path/to/opencode/packages/opencode/src/index.ts` runs your local version of `opencode`.
- `--token`: A GitHub persontal access token. This token is used to verify you have `admin` or `write` access to the test repo. Generate a token [here](https://github.com/settings/personal-access-tokens).
- `--event`: Mock GitHub event payload (see templates below).
+   - `MODEL`: The model used by opencode. Same as the `MODEL` defined in the GitHub workflow.
+   - `ANTHROPIC_API_KEY`: Your model provider API key. Same as the keys defined in the GitHub workflow.
+   - `GITHUB_RUN_ID`: Dummy value to emulate GitHub action environment.
+   - `/path/to/opencode`: Path to your cloned opencode repo. `bun /path/to/opencode/packages/opencode/src/index.ts` runs your local version of `opencode`.
+   - `--token`: A GitHub persontal access token. This token is used to verify you have `admin` or `write` access to the test repo. Generate a token [here](https://github.com/settings/personal-access-tokens).
+   - `--event`: Mock GitHub event payload (see templates below).

-#### Issue comment event
+### Issue comment event

 ```
-  --event '{"eventName":"issue_comment","repo":{"owner":"sst","repo":"hello-world"},"actor":"fwang","payload":{"issue":{"number":4},"comment":{"id":1,"body":"hey opencode, summarize thread"}}}'
+--event '{"eventName":"issue_comment","repo":{"owner":"sst","repo":"hello-world"},"actor":"fwang","payload":{"issue":{"number":4},"comment":{"id":1,"body":"hey opencode, summarize thread"}}}'
 ```

 Replace:
@@ -118,16 +122,16 @@ Replace:
 - `"number":4` with the GitHub issue id
 - `"body":"hey opencode, summarize thread"` with comment body

-#### Issue comment with image attachment.
+### Issue comment with image attachment.

 ```
-  --event '{"eventName":"issue_comment","repo":{"owner":"sst","repo":"hello-world"},"actor":"fwang","payload":{"issue":{"number":4},"comment":{"id":1,"body":"hey opencode, what is in my image ![Image](https://github.com/user-attachments/assets/xxxxxxxx)"}}}'
+--event '{"eventName":"issue_comment","repo":{"owner":"sst","repo":"hello-world"},"actor":"fwang","payload":{"issue":{"number":4},"comment":{"id":1,"body":"hey opencode, what is in my image ![Image](https://github.com/user-attachments/assets/xxxxxxxx)"}}}'
 ```

 Replace the image URL `https://github.com/user-attachments/assets/xxxxxxxx` with a valid GitHub attachment (you can generate one by commenting with an image in any issue).

-#### PR comment event
+### PR comment event

 ```
-  --event '{"eventName":"issue_comment","repo":{"owner":"sst","repo":"hello-world"},"actor":"fwang","payload":{"issue":{"number":4,"pull_request":{}},"comment":{"id":1,"body":"hey opencode, summarize thread"}}}'
+--event '{"eventName":"issue_comment","repo":{"owner":"sst","repo":"hello-world"},"actor":"fwang","payload":{"issue":{"number":4,"pull_request":{}},"comment":{"id":1,"body":"hey opencode, summarize thread"}}}'
 ```
@@ -7,7 +7,7 @@ branding:
 inputs:
  model:
    description: "Model to use"
-    required: false
+    required: true

  share:
    description: "Share the opencode session (defaults to true for public repos)"
@@ -46,3 +46,15 @@ new sst.cloudflare.x.Astro("Web", {
    VITE_API_URL: api.url,
  },
 })
+
+const OPENCODE_API_KEY = new sst.Secret("OPENCODE_API_KEY")
+const ANTHROPIC_API_KEY = new sst.Secret("ANTHROPIC_API_KEY")
+const OPENAI_API_KEY = new sst.Secret("OPENAI_API_KEY")
+const ZHIPU_API_KEY = new sst.Secret("ZHIPU_API_KEY")
+
+export const gateway = new sst.cloudflare.Worker("GatewayApi", {
+  domain: `api.gateway.${domain}`,
+  handler: "packages/function/src/gateway.ts",
+  url: true,
+  link: [OPENCODE_API_KEY, ANTHROPIC_API_KEY, OPENAI_API_KEY, ZHIPU_API_KEY],
+})
@@ -1,25 +1,10 @@
 {
  "$schema": "https://opencode.ai/config.json",
-  "provider": {
-    "openrouter": {
-      "models": {
-        "moonshotai/kimi-k2": {
-          "options": {
-            "provider": {
-              "order": ["baseten"],
-              "allow_fallbacks": false
-            }
-          }
-        }
-      }
-    },
-    "huggingface": {
-      "models": {
-        "Qwen/Qwen3-235B-A22B-Instruct-2507:fireworks-ai": {}
-      }
-    }
-  },
  "mcp": {
+    "context7": {
+      "type": "remote",
+      "url": "https://mcp.context7.com/sse"
+    },
    "weather": {
      "type": "local",
      "command": ["opencode", "x", "@h1deya/mcp-server-weather"]
@@ -5,20 +5,24 @@
  "type": "module",
  "packageManager": "bun@1.2.14",
  "scripts": {
-    "dev": "bun run packages/opencode/src/index.ts",
+    "dev": "bun run --conditions=development packages/opencode/src/index.ts",
    "typecheck": "bun run --filter='*' typecheck",
    "stainless": "./scripts/stainless",
-    "postinstall": "./scripts/hooks"
+    "postinstall": "./script/hooks"
  },
  "workspaces": {
    "packages": [
-      "packages/*"
+      "packages/*",
+      "packages/sdk/js"
    ],
    "catalog": {
-      "typescript": "5.8.2",
      "@types/node": "22.13.9",
+      "@tsconfig/node22": "22.0.2",
+      "ai": "5.0.0-beta.34",
+      "hono": "4.7.10",
+      "typescript": "5.8.2",
      "zod": "3.25.49",
-      "ai": "5.0.0-beta.21"
+      "remeda": "2.26.0"
    }
  },
  "devDependencies": {
@@ -1,17 +1,23 @@
 {
  "name": "@opencode/function",
-  "version": "0.0.1",
+  "version": "0.3.133",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
  "devDependencies": {
    "@cloudflare/workers-types": "4.20250522.0",
-    "typescript": "catalog:",
-    "@types/node": "catalog:"
+    "@types/node": "catalog:",
+    "openai": "5.11.0",
+    "typescript": "catalog:"
  },
  "dependencies": {
+    "@ai-sdk/anthropic": "2.0.0",
+    "@ai-sdk/openai": "2.0.2",
+    "@ai-sdk/openai-compatible": "1.0.1",
    "@octokit/auth-app": "8.0.1",
    "@octokit/rest": "22.0.0",
+    "ai": "catalog:",
+    "hono": "catalog:",
    "jose": "6.0.11"
  }
 }
@@ -1,3 +1,4 @@
+import { Hono } from "hono"
 import { DurableObject } from "cloudflare:workers"
 import { randomUUID } from "node:crypto"
 import { jwtVerify, createRemoteJWKSet } from "jose"
@@ -111,165 +112,156 @@ export class SyncServer extends DurableObject<Env> {
  }
 }

-export default {
-  async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
-    const url = new URL(request.url)
-    const splits = url.pathname.split("/")
-    const method = splits[1]
-
-    if (request.method === "GET" && method === "") {
-      return new Response("Hello, world!", {
-        headers: { "Content-Type": "text/plain" },
-      })
+export default new Hono<{ Bindings: Env }>()
+  .get("/", (c) => c.text("Hello, world!"))
+  .post("/share_create", async (c) => {
+    const body = await c.req.json<{ sessionID: string }>()
+    const sessionID = body.sessionID
+    const short = SyncServer.shortName(sessionID)
+    const id = c.env.SYNC_SERVER.idFromName(short)
+    const stub = c.env.SYNC_SERVER.get(id)
+    const secret = await stub.share(sessionID)
+    return c.json({
+      secret,
+      url: `https://${c.env.WEB_DOMAIN}/s/${short}`,
+    })
+  })
+  .post("/share_delete", async (c) => {
+    const body = await c.req.json<{ sessionID: string; secret: string }>()
+    const sessionID = body.sessionID
+    const secret = body.secret
+    const id = c.env.SYNC_SERVER.idFromName(SyncServer.shortName(sessionID))
+    const stub = c.env.SYNC_SERVER.get(id)
+    await stub.assertSecret(secret)
+    await stub.clear()
+    return c.json({})
+  })
+  .post("/share_delete_admin", async (c) => {
+    const id = c.env.SYNC_SERVER.idFromName("oVF8Rsiv")
+    const stub = c.env.SYNC_SERVER.get(id)
+    await stub.clear()
+    return c.json({})
+  })
+  .post("/share_sync", async (c) => {
+    const body = await c.req.json<{
+      sessionID: string
+      secret: string
+      key: string
+      content: any
+    }>()
+    const name = SyncServer.shortName(body.sessionID)
+    const id = c.env.SYNC_SERVER.idFromName(name)
+    const stub = c.env.SYNC_SERVER.get(id)
+    await stub.assertSecret(body.secret)
+    await stub.publish(body.key, body.content)
+    return c.json({})
+  })
+  .get("/share_poll", async (c) => {
+    const upgradeHeader = c.req.header("Upgrade")
+    if (!upgradeHeader || upgradeHeader !== "websocket") {
+      return c.text("Error: Upgrade header is required", { status: 426 })
    }
+    const id = c.req.query("id")
+    console.log("share_poll", id)
+    if (!id) return c.text("Error: Share ID is required", { status: 400 })
+    const stub = c.env.SYNC_SERVER.get(c.env.SYNC_SERVER.idFromName(id))
+    return stub.fetch(c.req.raw)
+  })
+  .get("/share_data", async (c) => {
+    const id = c.req.query("id")
+    console.log("share_data", id)
+    if (!id) return c.text("Error: Share ID is required", { status: 400 })
+    const stub = c.env.SYNC_SERVER.get(c.env.SYNC_SERVER.idFromName(id))
+    const data = await stub.getData()

-    if (request.method === "POST" && method === "share_create") {
-      const body = await request.json<any>()
-      const sessionID = body.sessionID
-      const short = SyncServer.shortName(sessionID)
-      const id = env.SYNC_SERVER.idFromName(short)
-      const stub = env.SYNC_SERVER.get(id)
-      const secret = await stub.share(sessionID)
-      return new Response(
-        JSON.stringify({
-          secret,
-          url: `https://${env.WEB_DOMAIN}/s/${short}`,
-        }),
-        {
-          headers: { "Content-Type": "application/json" },
-        },
-      )
-    }
-
-    if (request.method === "POST" && method === "share_delete") {
-      const body = await request.json<any>()
-      const sessionID = body.sessionID
-      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()
-      return new Response(JSON.stringify({}), {
-        headers: { "Content-Type": "application/json" },
-      })
-    }
-
-    if (request.method === "POST" && method === "share_sync") {
-      const body = await request.json<{
-        sessionID: string
-        secret: string
-        key: string
-        content: any
-      }>()
-      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)
-      return new Response(JSON.stringify({}), {
-        headers: { "Content-Type": "application/json" },
-      })
-    }
-
-    if (request.method === "GET" && method === "share_poll") {
-      const upgradeHeader = request.headers.get("Upgrade")
-      if (!upgradeHeader || upgradeHeader !== "websocket") {
-        return new Response("Error: Upgrade header is required", {
-          status: 426,
-        })
+    let info
+    const messages: Record<string, any> = {}
+    data.forEach((d) => {
+      const [root, type, ...splits] = d.key.split("/")
+      if (root !== "session") return
+      if (type === "info") {
+        info = d.content
+        return
      }
-      const id = url.searchParams.get("id")
-      console.log("share_poll", id)
-      if (!id) return new Response("Error: Share ID is required", { status: 400 })
-      const stub = env.SYNC_SERVER.get(env.SYNC_SERVER.idFromName(id))
-      return stub.fetch(request)
-    }
+      if (type === "message") {
+        messages[d.content.id] = {
+          parts: [],
+          ...d.content,
+        }
+      }
+      if (type === "part") {
+        messages[d.content.messageID].parts.push(d.content)
+      }
+    })

-    if (request.method === "GET" && method === "share_data") {
-      const id = url.searchParams.get("id")
-      console.log("share_data", id)
-      if (!id) return new Response("Error: Share ID is required", { status: 400 })
-      const stub = env.SYNC_SERVER.get(env.SYNC_SERVER.idFromName(id))
-      const data = await stub.getData()
+    return c.json({ info, messages })
+  })
+  /**
+   * Used by the GitHub action to get GitHub installation access token given the OIDC token
+   */
+  .post("/exchange_github_app_token", async (c) => {
+    const EXPECTED_AUDIENCE = "opencode-github-action"
+    const GITHUB_ISSUER = "https://token.actions.githubusercontent.com"
+    const JWKS_URL = `${GITHUB_ISSUER}/.well-known/jwks`

-      let info
-      const messages: Record<string, any> = {}
-      data.forEach((d) => {
-        const [root, type, ...splits] = d.key.split("/")
-        if (root !== "session") return
-        if (type === "info") {
-          info = d.content
-          return
-        }
-        if (type === "message") {
-          messages[d.content.id] = {
-            parts: [],
-            ...d.content,
-          }
-        }
-        if (type === "part") {
-          messages[d.content.messageID].parts.push(d.content)
-        }
+    // get Authorization header
+    const token = c.req.header("Authorization")?.replace(/^Bearer /, "")
+    if (!token) return c.json({ error: "Authorization header is required" }, { status: 401 })
+
+    // verify token
+    const JWKS = createRemoteJWKSet(new URL(JWKS_URL))
+    let owner, repo
+    try {
+      const { payload } = await jwtVerify(token, JWKS, {
+        issuer: GITHUB_ISSUER,
+        audience: EXPECTED_AUDIENCE,
      })
-
-      return new Response(
-        JSON.stringify({
-          info,
-          messages,
-        }),
-        {
-          headers: { "Content-Type": "application/json" },
-        },
-      )
+      const sub = payload.sub // e.g. 'repo:my-org/my-repo:ref:refs/heads/main'
+      const parts = sub.split(":")[1].split("/")
+      owner = parts[0]
+      repo = parts[1]
+    } catch (err) {
+      console.error("Token verification failed:", err)
+      return c.json({ error: "Invalid or expired token" }, { status: 403 })
    }

-    /**
-     * Used by the GitHub action to get GitHub installation access token given the OIDC token
-     */
-    if (request.method === "POST" && method === "exchange_github_app_token") {
-      const EXPECTED_AUDIENCE = "opencode-github-action"
-      const GITHUB_ISSUER = "https://token.actions.githubusercontent.com"
-      const JWKS_URL = `${GITHUB_ISSUER}/.well-known/jwks`
+    // Create app JWT token
+    const auth = createAppAuth({
+      appId: Resource.GITHUB_APP_ID.value,
+      privateKey: Resource.GITHUB_APP_PRIVATE_KEY.value,
+    })
+    const appAuth = await auth({ type: "app" })

+    // Lookup installation
+    const octokit = new Octokit({ auth: appAuth.token })
+    const { data: installation } = await octokit.apps.getRepoInstallation({ owner, repo })
+
+    // Get installation token
+    const installationAuth = await auth({ type: "installation", installationId: installation.id })
+
+    return c.json({ token: installationAuth.token })
+  })
+  /**
+   * Used by the GitHub action to get GitHub installation access token given user PAT token (used when testing `opencode github run` locally)
+   */
+  .post("/exchange_github_app_token_with_pat", async (c) => {
+    const body = await c.req.json<{ owner: string; repo: string }>()
+    const owner = body.owner
+    const repo = body.repo
+
+    try {
      // get Authorization header
-      const authHeader = request.headers.get("Authorization")
+      const authHeader = c.req.header("Authorization")
      const token = authHeader?.replace(/^Bearer /, "")
-      if (!token)
-        return new Response(JSON.stringify({ error: "Authorization header is required" }), {
-          status: 401,
-          headers: { "Content-Type": "application/json" },
-        })
+      if (!token) throw new Error("Authorization header is required")

-      // verify token
-      const JWKS = createRemoteJWKSet(new URL(JWKS_URL))
-      let owner, repo
-      try {
-        const { payload } = await jwtVerify(token, JWKS, {
-          issuer: GITHUB_ISSUER,
-          audience: EXPECTED_AUDIENCE,
-        })
-        const sub = payload.sub // e.g. 'repo:my-org/my-repo:ref:refs/heads/main'
-        const parts = sub.split(":")[1].split("/")
-        owner = parts[0]
-        repo = parts[1]
-      } catch (err) {
-        console.error("Token verification failed:", err)
-        return new Response(JSON.stringify({ error: "Invalid or expired token" }), {
-          status: 403,
-          headers: { "Content-Type": "application/json" },
-        })
-      }
+      // Verify permissions
+      const userClient = new Octokit({ auth: token })
+      const { data: repoData } = await userClient.repos.get({ owner, repo })
+      if (!repoData.permissions.admin && !repoData.permissions.push && !repoData.permissions.maintain)
+        throw new Error("User does not have write permissions")

-      // Create app JWT token
+      // Get installation token
      const auth = createAppAuth({
        appId: Resource.GITHUB_APP_ID.value,
        privateKey: Resource.GITHUB_APP_PRIVATE_KEY.value,
@@ -277,99 +269,49 @@ export default {
      const appAuth = await auth({ type: "app" })

      // Lookup installation
-      const octokit = new Octokit({ auth: appAuth.token })
-      const { data: installation } = await octokit.apps.getRepoInstallation({ owner, repo })
+      const appClient = new Octokit({ auth: appAuth.token })
+      const { data: installation } = await appClient.apps.getRepoInstallation({ owner, repo })

      // Get installation token
      const installationAuth = await auth({ type: "installation", installationId: installation.id })

-      return new Response(JSON.stringify({ token: installationAuth.token }), {
-        headers: { "Content-Type": "application/json" },
-      })
+      return c.json({ token: installationAuth.token })
+    } catch (e: any) {
+      let error = e
+      if (e instanceof Error) {
+        error = e.message
+      }
+
+      return c.json({ error }, { status: 401 })
    }
+  })
+  /**
+   * Used by the opencode CLI to check if the GitHub app is installed
+   */
+  .get("/get_github_app_installation", async (c) => {
+    const owner = c.req.query("owner")
+    const repo = c.req.query("repo")

-    /**
-     * Used by the GitHub action to get GitHub installation access token given user PAT token (used when testing `opencode github run` locally)
-     */
-    if (request.method === "POST" && method === "exchange_github_app_token_with_pat") {
-      const body = await request.json<any>()
-      const owner = body.owner
-      const repo = body.repo
+    const auth = createAppAuth({
+      appId: Resource.GITHUB_APP_ID.value,
+      privateKey: Resource.GITHUB_APP_PRIVATE_KEY.value,
+    })
+    const appAuth = await auth({ type: "app" })

-      try {
-        // get Authorization header
-        const authHeader = request.headers.get("Authorization")
-        const token = authHeader?.replace(/^Bearer /, "")
-        if (!token) throw new Error("Authorization header is required")
-
-        // Verify permissions
-        const userClient = new Octokit({ auth: token })
-        const { data: repoData } = await userClient.repos.get({ owner, repo })
-        if (!repoData.permissions.admin && !repoData.permissions.push && !repoData.permissions.maintain)
-          throw new Error("User does not have write permissions")
-
-        // Get installation token
-        const auth = createAppAuth({
-          appId: Resource.GITHUB_APP_ID.value,
-          privateKey: Resource.GITHUB_APP_PRIVATE_KEY.value,
-        })
-        const appAuth = await auth({ type: "app" })
-
-        // Lookup installation
-        const appClient = new Octokit({ auth: appAuth.token })
-        const { data: installation } = await appClient.apps.getRepoInstallation({ owner, repo })
-
-        // Get installation token
-        const installationAuth = await auth({ type: "installation", installationId: installation.id })
-
-        return new Response(JSON.stringify({ token: installationAuth.token }), {
-          headers: { "Content-Type": "application/json" },
-        })
-      } catch (e: any) {
-        let error = e
-        if (e instanceof Error) {
-          error = e.message
-        }
-
-        return new Response(JSON.stringify({ error }), {
-          status: 401,
-          headers: { "Content-Type": "application/json" },
-        })
+    // Lookup installation
+    const octokit = new Octokit({ auth: appAuth.token })
+    let installation
+    try {
+      const ret = await octokit.apps.getRepoInstallation({ owner, repo })
+      installation = ret.data
+    } catch (err) {
+      if (err instanceof Error && err.message.includes("Not Found")) {
+        // not installed
+      } else {
+        throw err
      }
    }

-    /**
-     * Used by the opencode CLI to check if the GitHub app is installed
-     */
-    if (request.method === "GET" && method === "get_github_app_installation") {
-      const owner = url.searchParams.get("owner")
-      const repo = url.searchParams.get("repo")
-
-      const auth = createAppAuth({
-        appId: Resource.GITHUB_APP_ID.value,
-        privateKey: Resource.GITHUB_APP_PRIVATE_KEY.value,
-      })
-      const appAuth = await auth({ type: "app" })
-
-      // Lookup installation
-      const octokit = new Octokit({ auth: appAuth.token })
-      let installation
-      try {
-        const ret = await octokit.apps.getRepoInstallation({ owner, repo })
-        installation = ret.data
-      } catch (err) {
-        if (err instanceof Error && err.message.includes("Not Found")) {
-          // not installed
-        } else {
-          throw err
-        }
-      }
-
-      return new Response(JSON.stringify({ installation }), {
-        headers: { "Content-Type": "application/json" },
-      })
-    }
-
-    return new Response("Not Found", { status: 404 })
-  },
-}
+    return c.json({ installation })
+  })
+  .all("*", (c) => c.text("Not Found"))
@@ -0,0 +1,499 @@
+import { Hono, Context, Next } from "hono"
+import { Resource } from "sst"
+import { generateText, streamText } from "ai"
+import { createAnthropic } from "@ai-sdk/anthropic"
+import { createOpenAI } from "@ai-sdk/openai"
+import { createOpenAICompatible } from "@ai-sdk/openai-compatible"
+import { type LanguageModelV2Prompt } from "@ai-sdk/provider"
+import { type ChatCompletionCreateParamsBase } from "openai/resources/chat/completions"
+
+type Env = {}
+
+const auth = async (c: Context, next: Next) => {
+  const authHeader = c.req.header("authorization")
+
+  if (!authHeader || !authHeader.startsWith("Bearer ")) {
+    return c.json(
+      {
+        error: {
+          message: "Missing API key.",
+          type: "invalid_request_error",
+          param: null,
+          code: "unauthorized",
+        },
+      },
+      401,
+    )
+  }
+
+  const apiKey = authHeader.split(" ")[1]
+
+  // Replace with your validation logic
+  if (apiKey !== Resource.OPENCODE_API_KEY.value) {
+    return c.json(
+      {
+        error: {
+          message: "Invalid API key.",
+          type: "invalid_request_error",
+          param: null,
+          code: "unauthorized",
+        },
+      },
+      401,
+    )
+  }
+
+  await next()
+}
+export default new Hono<{ Bindings: Env }>()
+  .get("/", (c) => c.text("Hello, world!"))
+  .post("/v1/chat/completions", auth, async (c) => {
+    try {
+      const body = await c.req.json<ChatCompletionCreateParamsBase>()
+
+      console.log(body)
+
+      const model = (() => {
+        const [provider, ...parts] = body.model.split("/")
+        const model = parts.join("/")
+        if (provider === "anthropic" && model === "claude-sonnet-4") {
+          return createAnthropic({
+            apiKey: Resource.ANTHROPIC_API_KEY.value,
+          })("claude-sonnet-4-20250514")
+        }
+        if (provider === "openai" && model === "gpt-4.1") {
+          return createOpenAI({
+            apiKey: Resource.OPENAI_API_KEY.value,
+          })("gpt-4.1")
+        }
+        if (provider === "zhipuai" && model === "glm-4.5-flash") {
+          return createOpenAICompatible({
+            name: "Zhipu AI",
+            baseURL: "https://api.z.ai/api/paas/v4",
+            apiKey: Resource.ZHIPU_API_KEY.value,
+          })("glm-4.5-flash")
+        }
+        throw new Error(`Unsupported provider: ${provider}`)
+      })()
+
+      const requestBody = transformOpenAIRequestToAiSDK()
+
+      return body.stream ? await handleStream() : await handleGenerate()
+
+      async function handleStream() {
+        const result = await streamText({
+          model,
+          ...requestBody,
+        })
+
+        const encoder = new TextEncoder()
+        const stream = new ReadableStream({
+          async start(controller) {
+            const id = `chatcmpl-${Date.now()}`
+            const created = Math.floor(Date.now() / 1000)
+
+            try {
+              for await (const chunk of result.fullStream) {
+                // TODO
+                //console.log("!!! CHUCK !!!", chunk);
+                switch (chunk.type) {
+                  case "text-delta": {
+                    const data = {
+                      id,
+                      object: "chat.completion.chunk",
+                      created,
+                      model: body.model,
+                      choices: [
+                        {
+                          index: 0,
+                          delta: {
+                            content: chunk.text,
+                          },
+                          finish_reason: null,
+                        },
+                      ],
+                    }
+                    controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`))
+                    break
+                  }
+
+                  case "reasoning-delta": {
+                    const data = {
+                      id,
+                      object: "chat.completion.chunk",
+                      created,
+                      model: body.model,
+                      choices: [
+                        {
+                          index: 0,
+                          delta: {
+                            reasoning_content: chunk.text,
+                          },
+                          finish_reason: null,
+                        },
+                      ],
+                    }
+                    controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`))
+                    break
+                  }
+
+                  case "tool-call": {
+                    const data = {
+                      id,
+                      object: "chat.completion.chunk",
+                      created,
+                      model: body.model,
+                      choices: [
+                        {
+                          index: 0,
+                          delta: {
+                            tool_calls: [
+                              {
+                                id: chunk.toolCallId,
+                                type: "function",
+                                function: {
+                                  name: chunk.toolName,
+                                  arguments: JSON.stringify(chunk.input),
+                                },
+                              },
+                            ],
+                          },
+                          finish_reason: null,
+                        },
+                      ],
+                    }
+                    controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`))
+                    break
+                  }
+
+                  case "error": {
+                    const data = {
+                      id,
+                      object: "chat.completion.chunk",
+                      created,
+                      model: body.model,
+                      error: {
+                        message: chunk.error,
+                        type: "server_error",
+                      },
+                    }
+                    controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`))
+                    controller.enqueue(encoder.encode("data: [DONE]\n\n"))
+                    controller.close()
+                    break
+                  }
+
+                  case "finish": {
+                    const finishReason =
+                      {
+                        stop: "stop",
+                        length: "length",
+                        "content-filter": "content_filter",
+                        "tool-calls": "tool_calls",
+                        error: "stop",
+                        other: "stop",
+                        unknown: "stop",
+                      }[chunk.finishReason] || "stop"
+
+                    const data = {
+                      id,
+                      object: "chat.completion.chunk",
+                      created,
+                      model: body.model,
+                      choices: [
+                        {
+                          index: 0,
+                          delta: {},
+                          finish_reason: finishReason,
+                        },
+                      ],
+                      usage: {
+                        prompt_tokens: chunk.totalUsage.inputTokens,
+                        completion_tokens: chunk.totalUsage.outputTokens,
+                        total_tokens: chunk.totalUsage.totalTokens,
+                        completion_tokens_details: {
+                          reasoning_tokens: chunk.totalUsage.reasoningTokens,
+                        },
+                        prompt_tokens_details: {
+                          cached_tokens: chunk.totalUsage.cachedInputTokens,
+                        },
+                      },
+                    }
+                    controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`))
+                    controller.enqueue(encoder.encode("data: [DONE]\n\n"))
+                    controller.close()
+                    break
+                  }
+
+                  //case "stream-start":
+                  //case "response-metadata":
+                  case "start-step":
+                  case "finish-step":
+                  case "text-start":
+                  case "text-end":
+                  case "reasoning-start":
+                  case "reasoning-end":
+                  case "tool-input-start":
+                  case "tool-input-delta":
+                  case "tool-input-end":
+                  case "raw":
+                  default:
+                    // Log unknown chunk types for debugging
+                    console.warn(`Unknown chunk type: ${(chunk as any).type}`)
+                    break
+                }
+              }
+            } catch (error) {
+              controller.error(error)
+            }
+          },
+        })
+
+        return new Response(stream, {
+          headers: {
+            "Content-Type": "text/plain; charset=utf-8",
+            "Cache-Control": "no-cache",
+            Connection: "keep-alive",
+          },
+        })
+      }
+
+      async function handleGenerate() {
+        const response = await generateText({
+          model,
+          ...requestBody,
+        })
+        return c.json({
+          id: `chatcmpl-${Date.now()}`,
+          object: "chat.completion" as const,
+          created: Math.floor(Date.now() / 1000),
+          model: body.model,
+          choices: [
+            {
+              index: 0,
+              message: {
+                role: "assistant" as const,
+                content: response.content?.find((c) => c.type === "text")?.text ?? "",
+                reasoning_content: response.content?.find((c) => c.type === "reasoning")?.text,
+                tool_calls: response.content
+                  ?.filter((c) => c.type === "tool-call")
+                  .map((toolCall) => ({
+                    id: toolCall.toolCallId,
+                    type: "function" as const,
+                    function: {
+                      name: toolCall.toolName,
+                      arguments: toolCall.input,
+                    },
+                  })),
+              },
+              finish_reason:
+                (
+                  {
+                    stop: "stop",
+                    length: "length",
+                    "content-filter": "content_filter",
+                    "tool-calls": "tool_calls",
+                    error: "stop",
+                    other: "stop",
+                    unknown: "stop",
+                  } as const
+                )[response.finishReason] || "stop",
+            },
+          ],
+          usage: {
+            prompt_tokens: response.usage?.inputTokens,
+            completion_tokens: response.usage?.outputTokens,
+            total_tokens: response.usage?.totalTokens,
+            completion_tokens_details: {
+              reasoning_tokens: response.usage?.reasoningTokens,
+            },
+            prompt_tokens_details: {
+              cached_tokens: response.usage?.cachedInputTokens,
+            },
+          },
+        })
+      }
+
+      function transformOpenAIRequestToAiSDK() {
+        const prompt = transformMessages()
+
+        return {
+          prompt,
+          maxOutputTokens: body.max_tokens ?? body.max_completion_tokens ?? undefined,
+          temperature: body.temperature ?? undefined,
+          topP: body.top_p ?? undefined,
+          frequencyPenalty: body.frequency_penalty ?? undefined,
+          presencePenalty: body.presence_penalty ?? undefined,
+          providerOptions: body.reasoning_effort
+            ? {
+                anthropic: {
+                  reasoningEffort: body.reasoning_effort,
+                },
+              }
+            : undefined,
+          stopSequences: (typeof body.stop === "string" ? [body.stop] : body.stop) ?? undefined,
+          responseFormat: (() => {
+            if (!body.response_format) return { type: "text" }
+            if (body.response_format.type === "json_schema")
+              return {
+                type: "json",
+                schema: body.response_format.json_schema.schema,
+                name: body.response_format.json_schema.name,
+                description: body.response_format.json_schema.description,
+              }
+            if (body.response_format.type === "json_object") return { type: "json" }
+            throw new Error("Unsupported response format")
+          })(),
+          seed: body.seed ?? undefined,
+        }
+
+        function transformTools() {
+          const { tools, tool_choice } = body
+
+          if (!tools || tools.length === 0) {
+            return { tools: undefined, toolChoice: undefined }
+          }
+
+          const aiSdkTools = tools.reduce(
+            (acc, tool) => {
+              acc[tool.function.name] = {
+                type: "function" as const,
+                name: tool.function.name,
+                description: tool.function.description,
+                inputSchema: tool.function.parameters,
+              }
+              return acc
+            },
+            {} as Record<string, any>,
+          )
+
+          let aiSdkToolChoice
+          if (tool_choice == null) {
+            aiSdkToolChoice = undefined
+          } else if (tool_choice === "auto") {
+            aiSdkToolChoice = "auto"
+          } else if (tool_choice === "none") {
+            aiSdkToolChoice = "none"
+          } else if (tool_choice === "required") {
+            aiSdkToolChoice = "required"
+          } else if (tool_choice.type === "function") {
+            aiSdkToolChoice = {
+              type: "tool",
+              toolName: tool_choice.function.name,
+            }
+          }
+
+          return { tools: aiSdkTools, toolChoice: aiSdkToolChoice }
+        }
+
+        function transformMessages() {
+          const { messages } = body
+          const prompt: LanguageModelV2Prompt = []
+
+          for (const message of messages) {
+            switch (message.role) {
+              case "system": {
+                prompt.push({
+                  role: "system",
+                  content: message.content as string,
+                })
+                break
+              }
+
+              case "user": {
+                if (typeof message.content === "string") {
+                  prompt.push({
+                    role: "user",
+                    content: [{ type: "text", text: message.content }],
+                  })
+                } else {
+                  const content = message.content.map((part) => {
+                    switch (part.type) {
+                      case "text":
+                        return { type: "text" as const, text: part.text }
+                      case "image_url":
+                        return {
+                          type: "file" as const,
+                          mediaType: "image/jpeg" as const,
+                          data: part.image_url.url,
+                        }
+                      default:
+                        throw new Error(`Unsupported content part type: ${(part as any).type}`)
+                    }
+                  })
+                  prompt.push({
+                    role: "user",
+                    content,
+                  })
+                }
+                break
+              }
+
+              case "assistant": {
+                const content: Array<
+                  | { type: "text"; text: string }
+                  | {
+                      type: "tool-call"
+                      toolCallId: string
+                      toolName: string
+                      input: any
+                    }
+                > = []
+
+                if (message.content) {
+                  content.push({
+                    type: "text",
+                    text: message.content as string,
+                  })
+                }
+
+                if (message.tool_calls) {
+                  for (const toolCall of message.tool_calls) {
+                    content.push({
+                      type: "tool-call",
+                      toolCallId: toolCall.id,
+                      toolName: toolCall.function.name,
+                      input: JSON.parse(toolCall.function.arguments),
+                    })
+                  }
+                }
+
+                prompt.push({
+                  role: "assistant",
+                  content,
+                })
+                break
+              }
+
+              case "tool": {
+                prompt.push({
+                  role: "tool",
+                  content: [
+                    {
+                      type: "tool-result",
+                      toolName: "placeholder",
+                      toolCallId: message.tool_call_id,
+                      output: {
+                        type: "text",
+                        value: message.content as string,
+                      },
+                    },
+                  ],
+                })
+                break
+              }
+
+              default: {
+                throw new Error(`Unsupported message role: ${message.role}`)
+              }
+            }
+          }
+
+          return prompt
+        }
+      }
+    } catch (error: any) {
+      return c.json({ error: { message: error.message } }, 500)
+    }
+  })
+  .all("*", (c) => c.text("Not Found"))
@@ -6,6 +6,10 @@
 import "sst"
 declare module "sst" {
  export interface Resource {
+    "ANTHROPIC_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
    "GITHUB_APP_ID": {
      "type": "sst.sst.Secret"
      "value": string
@@ -14,10 +18,22 @@ declare module "sst" {
      "type": "sst.sst.Secret"
      "value": string
    }
+    "OPENAI_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
+    "OPENCODE_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
    "Web": {
      "type": "sst.cloudflare.Astro"
      "url": string
    }
+    "ZHIPU_API_KEY": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
  }
 }
 // cloudflare 
@@ -26,6 +42,7 @@ declare module "sst" {
  export interface Resource {
    "Api": cloudflare.Service
    "Bucket": cloudflare.R2Bucket
+    "GatewayApi": cloudflare.Service
  }
 }

@@ -0,0 +1,12 @@
+<svg width="289" height="50" viewBox="0 0 289 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M264.5 0H288.5V8.5H272.5V16.5H288.5V25H272.5V33H288.5V41.5H264.5V0Z" fill="white"/>
+<path d="M248.5 0H224.5V41.5H248.5V33H232.5V8.5H248.5V0Z" fill="white"/>
+<path d="M256.5 8.5H248.5V33H256.5V8.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M184.5 0H216.5V41.5H184.5V0ZM208.5 8.5H192.5V33H208.5V8.5Z" fill="white"/>
+<path d="M144.5 8.5H136.5V41.5H144.5V8.5Z" fill="white"/>
+<path d="M136.5 0H112.5V41.5H120.5V8.5H136.5V0Z" fill="white"/>
+<path d="M80.5 0H104.5V8.5H88.5V16.5H104.5V25H88.5V33H104.5V41.5H80.5V0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.5 0H72.5V41.5H48.5V49.5H40.5V0ZM64.5 8.5H48.5V33H64.5V8.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.5 0H32.5V41.5955H0.5V0ZM24.5 8.5H8.5V33H24.5V8.5Z" fill="white"/>
+<path d="M152.5 0H176.5V8.5H160.5V33H176.5V41.5H152.5V0Z" fill="white"/>
+</svg>
@@ -0,0 +1,12 @@
+<svg width="289" height="50" viewBox="0 0 289 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M264.5 0H288.5V8.5H272.5V16.5H288.5V25H272.5V33H288.5V41.5H264.5V0Z" fill="black"/>
+<path d="M248.5 0H224.5V41.5H248.5V33H232.5V8.5H248.5V0Z" fill="black"/>
+<path d="M256.5 8.5H248.5V33H256.5V8.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M184.5 0H216.5V41.5H184.5V0ZM208.5 8.5H192.5V33H208.5V8.5Z" fill="black"/>
+<path d="M144.5 8.5H136.5V41.5H144.5V8.5Z" fill="black"/>
+<path d="M136.5 0H112.5V41.5H120.5V8.5H136.5V0Z" fill="black"/>
+<path d="M80.5 0H104.5V8.5H88.5V16.5H104.5V25H88.5V33H104.5V41.5H80.5V0Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.5 0H72.5V41.5H48.5V49.5H40.5V0ZM64.5 8.5H48.5V33H64.5V8.5Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.5 0H32.5V41.5955H0.5V0ZM24.5 8.5H8.5V33H24.5V8.5Z" fill="black"/>
+<path d="M152.5 0H176.5V8.5H160.5V33H176.5V41.5H152.5V0Z" fill="black"/>
+</svg>
@@ -0,0 +1,18 @@
+<svg width="289" height="50" viewBox="0 0 289 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.5 16.5H24.5V33H8.5V16.5Z" fill="white" fill-opacity="0.2"/>
+<path d="M48.5 16.5H64.5V33H48.5V16.5Z" fill="white" fill-opacity="0.2"/>
+<path d="M120.5 16.5H136.5V33H120.5V16.5Z" fill="white" fill-opacity="0.2"/>
+<path d="M160.5 16.5H176.5V33H160.5V16.5Z" fill="white" fill-opacity="0.2"/>
+<path d="M192.5 16.5H208.5V33H192.5V16.5Z" fill="white" fill-opacity="0.2"/>
+<path d="M232.5 16.5H248.5V33H232.5V16.5Z" fill="white" fill-opacity="0.2"/>
+<path d="M264.5 0H288.5V8.5H272.5V16.5H288.5V25H272.5V33H288.5V41.5H264.5V0Z" fill="white" fill-opacity="0.95"/>
+<path d="M248.5 0H224.5V41.5H248.5V33H232.5V8.5H248.5V0Z" fill="white" fill-opacity="0.95"/>
+<path d="M256.5 8.5H248.5V33H256.5V8.5Z" fill="white" fill-opacity="0.95"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M184.5 0H216.5V41.5H184.5V0ZM208.5 8.5H192.5V33H208.5V8.5Z" fill="white" fill-opacity="0.95"/>
+<path d="M144.5 8.5H136.5V41.5H144.5V8.5Z" fill="white" fill-opacity="0.5"/>
+<path d="M136.5 0H112.5V41.5H120.5V8.5H136.5V0Z" fill="white" fill-opacity="0.5"/>
+<path d="M80.5 0H104.5V8.5H88.5V16.5H104.5V25H88.5V33H104.5V41.5H80.5V0Z" fill="white" fill-opacity="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.5 0H72.5V41.5H48.5V49.5H40.5V0ZM64.5 8.5H48.5V33H64.5V8.5Z" fill="white" fill-opacity="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.5 0H32.5V41.5955H0.5V0ZM24.5 8.5H8.5V33H24.5V8.5Z" fill="white" fill-opacity="0.5"/>
+<path d="M152.5 0H176.5V8.5H160.5V33H176.5V41.5H152.5V0Z" fill="white" fill-opacity="0.95"/>
+</svg>
@@ -0,0 +1,18 @@
+<svg width="288" height="50" viewBox="0 0 288 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 16.5H24V33H8V16.5Z" fill="black" fill-opacity="0.15"/>
+<path d="M48 16.5H64V33H48V16.5Z" fill="black" fill-opacity="0.15"/>
+<path d="M120 16.5H136V33H120V16.5Z" fill="black" fill-opacity="0.15"/>
+<path d="M160 16.5H176V33H160V16.5Z" fill="black" fill-opacity="0.15"/>
+<path d="M192 16.5H208V33H192V16.5Z" fill="black" fill-opacity="0.15"/>
+<path d="M232 16.5H248V33H232V16.5Z" fill="black" fill-opacity="0.15"/>
+<path d="M264 0H288V8.5H272V16.5H288V25H272V33H288V41.5H264V0Z" fill="black" fill-opacity="0.95"/>
+<path d="M248 0H224V41.5H248V33H232V8.5H248V0Z" fill="black" fill-opacity="0.95"/>
+<path d="M256 8.5H248V33H256V8.5Z" fill="black" fill-opacity="0.95"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M184 0H216V41.5H184V0ZM208 8.5H192V33H208V8.5Z" fill="black" fill-opacity="0.95"/>
+<path d="M144 8.5H136V41.5H144V8.5Z" fill="black" fill-opacity="0.55"/>
+<path d="M136 0H112V41.5H120V8.5H136V0Z" fill="black" fill-opacity="0.55"/>
+<path d="M80 0H104V8.5H88V16.5H104V25H88V33H104V41.5H80V0Z" fill="black" fill-opacity="0.55"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40 0H72V41.5H48V49.5H40V0ZM64 8.5H48V33H64V8.5Z" fill="black" fill-opacity="0.55"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H32V41.5955H0V0ZM24 8.5H8V33H24V8.5Z" fill="black" fill-opacity="0.55"/>
+<path d="M152 0H176V8.5H160V33H176V41.5H152V0Z" fill="black" fill-opacity="0.95"/>
+</svg>
@@ -0,0 +1,4 @@
+<svg width="70" height="70" viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 13H35V58H0V13ZM26.25 22.1957H8.75V48.701H26.25V22.1957Z" fill="white"/>
+<path d="M43.75 13H70V22.1957H52.5V48.701H70V57.8967H43.75V13Z" fill="white"/>
+</svg>
@@ -0,0 +1,4 @@
+<svg width="70" height="70" viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 13H35V58H0V13ZM26.25 22.1957H8.75V48.701H26.25V22.1957Z" fill="black"/>
+<path d="M43.75 13H70V22.1957H52.5V48.701H70V57.8967H43.75V13Z" fill="black"/>
+</svg>
@@ -0,0 +1,4 @@
+<svg width="64" height="42" viewBox="0 0 64 42" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H32V41.5955H0V0ZM24 8.5H8V33H24V8.5Z" fill="white"/>
+<path d="M40 0H64V8.5H48V33H64V41.5H40V0Z" fill="white"/>
+</svg>
@@ -0,0 +1,4 @@
+<svg width="64" height="42" viewBox="0 0 64 42" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H32V41.5955H0V0ZM24 8.5H8V33H24V8.5Z" fill="black"/>
+<path d="M40 0H64V8.5H48V33H64V41.5H40V0Z" fill="black"/>
+</svg>
@@ -17,19 +17,6 @@
 - **Error handling**: Use Result patterns, avoid throwing exceptions in tools
 - **File structure**: Namespace-based organization (e.g., `Tool.define()`, `Session.create()`)

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

 - **Tools**: Implement `Tool.Info` interface with `execute()` method
@@ -1,12 +1,12 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "0.0.5",
+  "version": "0.3.133",
  "name": "opencode",
  "type": "module",
  "private": true,
  "scripts": {
    "typecheck": "tsc --noEmit",
-    "dev": "bun run ./src/index.ts"
+    "dev": "bun run --conditions=development ./src/index.ts"
  },
  "bin": {
    "opencode": "./bin/opencode"
@@ -30,21 +30,36 @@
  "dependencies": {
    "@actions/core": "1.11.1",
    "@actions/github": "6.0.1",
-    "@clack/prompts": "0.11.0",
+    "@clack/prompts": "1.0.0-alpha.1",
    "@hono/zod-validator": "0.4.2",
    "@modelcontextprotocol/sdk": "1.15.1",
+    "@octokit/graphql": "9.0.1",
+    "@octokit/rest": "22.0.0",
    "@openauthjs/openauth": "0.4.3",
+    "@opencode-ai/plugin": "workspace:*",
+    "@opencode-ai/sdk": "workspace:*",
+    "@opentelemetry/auto-instrumentations-node": "0.62.0",
+    "@opentelemetry/exporter-jaeger": "2.0.1",
+    "@opentelemetry/exporter-otlp-http": "0.26.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.203.0",
+    "@opentelemetry/instrumentation-fetch": "0.203.0",
+    "@opentelemetry/sdk-node": "0.203.0",
+    "@opentelemetry/sdk-trace-node": "2.0.1",
    "@standard-schema/spec": "1.0.0",
    "@zip.js/zip.js": "2.7.62",
    "ai": "catalog:",
    "decimal.js": "10.5.0",
    "diff": "8.0.2",
    "gray-matter": "4.0.3",
-    "hono": "4.7.10",
+    "hono": "catalog:",
    "hono-openapi": "0.4.8",
    "isomorphic-git": "1.32.1",
+    "jsonc-parser": "3.3.1",
+    "minimatch": "10.0.3",
    "open": "10.1.2",
-    "remeda": "2.22.3",
+    "remeda": "catalog:",
+    "tree-sitter": "0.22.4",
+    "tree-sitter-bash": "0.23.3",
    "turndown": "7.2.0",
    "vscode-jsonrpc": "8.2.1",
    "xdg-basedir": "5.1.0",
@@ -1,21 +1,13 @@
 #!/usr/bin/env bun
-
+const dir = new URL("..", import.meta.url).pathname
+process.chdir(dir)
 import { $ } from "bun"

 import pkg from "../package.json"

-const dry = process.argv.includes("--dry")
-const snapshot = process.argv.includes("--snapshot")
-
-const version = snapshot
-  ? `0.0.0-${new Date().toISOString().slice(0, 16).replace(/[-:T]/g, "")}`
-  : await $`git describe --tags --abbrev=0`
-      .text()
-      .then((x) => x.substring(1).trim())
-      .catch(() => {
-        console.error("tag not found")
-        process.exit(1)
-      })
+const dry = process.env["OPENCODE_DRY"] === "true"
+const version = process.env["OPENCODE_VERSION"]!
+const snapshot = process.env["OPENCODE_SNAPSHOT"] === "true"

 console.log(`publishing ${version}`)

@@ -26,12 +18,13 @@ const GOARCH: Record<string, string> = {
 }

 const targets = [
+  ["windows", "x64"],
  ["linux", "arm64"],
  ["linux", "x64"],
  ["linux", "x64-baseline"],
  ["darwin", "x64"],
+  ["darwin", "x64-baseline"],
  ["darwin", "arm64"],
-  ["windows", "x64"],
 ]

 await $`rm -rf dist`
@@ -45,7 +38,7 @@ for (const [os, arch] of targets) {
  await $`CGO_ENABLED=0 GOOS=${os} GOARCH=${GOARCH[arch]} go build -ldflags="-s -w -X main.Version=${version}" -o ../opencode/dist/${name}/bin/tui ../tui/cmd/opencode/main.go`.cwd(
    "../tui",
  )
-  await $`bun build --define OPENCODE_VERSION="'${version}'" --compile --minify --target=bun-${os}-${arch} --outfile=dist/${name}/bin/opencode ./src/index.ts ./dist/${name}/bin/tui`
+  await $`bun build --define OPENCODE_TUI_PATH="'../../../dist/${name}/bin/tui'" --define OPENCODE_VERSION="'${version}'" --compile --target=bun-${os}-${arch} --outfile=dist/${name}/bin/opencode ./src/index.ts`
  await $`rm -rf ./dist/${name}/bin/tui`
  await Bun.file(`dist/${name}/package.json`).write(
    JSON.stringify(
@@ -59,7 +52,7 @@ for (const [os, arch] of targets) {
      2,
    ),
  )
-  if (!dry) await $`cd dist/${name} && bun publish --access public --tag ${npmTag}`
+  if (!dry) await $`cd dist/${name} && chmod 777 -R . && bun publish --access public --tag ${npmTag}`
  optionalDependencies[name] = version
 }

@@ -111,6 +104,7 @@ if (!snapshot) {
      .filter((x: string) => {
        const lower = x.toLowerCase()
        return (
+          !lower.includes("release:") &&
          !lower.includes("ignore:") &&
          !lower.includes("chore:") &&
          !lower.includes("ci:") &&
@@ -10,13 +10,16 @@ export namespace Agent {
  export const Info = z
    .object({
      name: z.string(),
+      description: z.string().optional(),
+      mode: z.union([z.literal("subagent"), z.literal("primary"), z.literal("all")]),
+      topP: z.number().optional(),
+      temperature: z.number().optional(),
      model: z
        .object({
          modelID: z.string(),
          providerID: z.string(),
        })
        .optional(),
-      description: z.string(),
      prompt: z.string().optional(),
      tools: z.record(z.boolean()),
    })
@@ -24,6 +27,7 @@ export namespace Agent {
      ref: "Agent",
    })
  export type Info = z.infer<typeof Info>
+
  const state = App.state("agent", async () => {
    const cfg = await Config.get()
    const result: Record<string, Info> = {
@@ -35,22 +39,36 @@ export namespace Agent {
          todoread: false,
          todowrite: false,
        },
+        mode: "subagent",
+      },
+      build: {
+        name: "build",
+        tools: {},
+        mode: "primary",
+      },
+      plan: {
+        name: "plan",
+        tools: {
+          write: false,
+          edit: false,
+          patch: false,
+        },
+        mode: "primary",
      },
    }
    for (const [key, value] of Object.entries(cfg.agent ?? {})) {
-      if (value.disable) continue
+      if (value.disable) {
+        delete result[key]
+        continue
+      }
      let item = result[key]
      if (!item)
        item = result[key] = {
          name: key,
-          description: "",
-          tools: {
-            todowrite: false,
-            todoread: false,
-          },
+          mode: "all",
+          tools: {},
        }
-      const model = value.model ?? cfg.model
-      if (model) item.model = Provider.parseModel(model)
+      if (value.model) item.model = Provider.parseModel(value.model)
      if (value.prompt) item.prompt = value.prompt
      if (value.tools)
        item.tools = {
@@ -58,6 +76,9 @@ export namespace Agent {
          ...value.tools,
        }
      if (value.description) item.description = value.description
+      if (value.temperature != undefined) item.temperature = value.temperature
+      if (value.top_p != undefined) item.topP = value.top_p
+      if (value.mode) item.mode = value.mode
    }
    return result
  })
@@ -16,7 +16,13 @@ export namespace Auth {
    key: z.string(),
  })

-  export const Info = z.discriminatedUnion("type", [Oauth, Api])
+  export const WellKnown = z.object({
+    type: z.literal("wellknown"),
+    key: z.string(),
+    token: z.string(),
+  })
+
+  export const Info = z.discriminatedUnion("type", [Oauth, Api, WellKnown])
  export type Info = z.infer<typeof Info>

  const filepath = path.join(Global.Path.data, "auth.json")
@@ -73,6 +73,7 @@ export namespace BunProc {
    // Let Bun handle registry resolution:
    // - If .npmrc files exist, Bun will use them automatically
    // - If no .npmrc files exist, Bun will default to https://registry.npmjs.org
+    // - No need to pass --registry flag
    log.info("installing package using Bun's default registry resolution", { pkg, version })

    await BunProc.run(args, {
@@ -2,6 +2,7 @@ import { App } from "../app/app"
 import { ConfigHooks } from "../config/hooks"
 import { Format } from "../format"
 import { LSP } from "../lsp"
+import { Plugin } from "../plugin"
 import { Share } from "../share/share"
 import { Snapshot } from "../snapshot"

@@ -9,6 +10,7 @@ export async function bootstrap<T>(input: App.Input, cb: (app: App.Info) => Prom
  return App.provide(input, async (app) => {
    Share.init()
    Format.init()
+    Plugin.init()
    ConfigHooks.init()
    LSP.init()
    Snapshot.init()
@@ -39,7 +39,7 @@ const AgentCreateCommand = cmd({
      const query = await prompts.text({
        message: "Description",
        placeholder: "What should this agent do?",
-        validate: (x) => (x.length > 0 ? undefined : "Required"),
+        validate: (x) => x && (x.length > 0 ? undefined : "Required"),
      })
      if (prompts.isCancel(query)) throw new UI.CancelledError()

@@ -61,17 +61,46 @@ export const AuthListCommand = cmd({
        prompts.log.info(`${provider} ${UI.Style.TEXT_DIM}${envVar}`)
      }

-      prompts.outro(`${activeEnvVars.length} environment variables`)
+      prompts.outro(`${activeEnvVars.length} environment variable` + (activeEnvVars.length === 1 ? "" : "s"))
    }
  },
 })

 export const AuthLoginCommand = cmd({
-  command: "login",
+  command: "login [url]",
  describe: "log in to a provider",
-  async handler() {
+  builder: (yargs) =>
+    yargs.positional("url", {
+      describe: "opencode auth provider",
+      type: "string",
+    }),
+  async handler(args) {
    UI.empty()
    prompts.intro("Add credential")
+    if (args.url) {
+      const wellknown = await fetch(`${args.url}/.well-known/opencode`).then((x) => x.json())
+      prompts.log.info(`Running \`${wellknown.auth.command.join(" ")}\``)
+      const proc = Bun.spawn({
+        cmd: wellknown.auth.command,
+        stdout: "pipe",
+      })
+      const exit = await proc.exited
+      if (exit !== 0) {
+        prompts.log.error("Failed")
+        prompts.outro("Done")
+        return
+      }
+      const token = await new Response(proc.stdout).text()
+      await Auth.set(args.url, {
+        type: "wellknown",
+        key: wellknown.auth.env,
+        token: token.trim(),
+      })
+      prompts.log.success("Logged into " + args.url)
+      prompts.outro("Done")
+      return
+    }
+    await ModelsDev.refresh().catch(() => {})
    const providers = await ModelsDev.get()
    const priority: Record<string, number> = {
      anthropic: 0,
@@ -81,7 +110,7 @@ export const AuthLoginCommand = cmd({
      openrouter: 4,
      vercel: 5,
    }
-    let provider = await prompts.select({
+    let provider = await prompts.autocomplete({
      message: "Select provider",
      maxItems: 8,
      options: [
@@ -110,7 +139,7 @@ export const AuthLoginCommand = cmd({
    if (provider === "other") {
      provider = await prompts.text({
        message: "Enter provider id",
-        validate: (x) => (x.match(/^[0-9a-z-]+$/) ? undefined : "a-z, 0-9 and hyphens only"),
+        validate: (x) => x && (x.match(/^[0-9a-z-]+$/) ? undefined : "a-z, 0-9 and hyphens only"),
      })
      if (prompts.isCancel(provider)) throw new UI.CancelledError()
      provider = provider.replace(/^@ai-sdk\//, "")
@@ -164,7 +193,7 @@ export const AuthLoginCommand = cmd({

        const code = await prompts.text({
          message: "Paste the authorization code here: ",
-          validate: (x) => (x.length > 0 ? undefined : "Required"),
+          validate: (x) => x && (x.length > 0 ? undefined : "Required"),
        })
        if (prompts.isCancel(code)) throw new UI.CancelledError()

@@ -200,7 +229,7 @@ export const AuthLoginCommand = cmd({

        const code = await prompts.text({
          message: "Paste the authorization code here: ",
-          validate: (x) => (x.length > 0 ? undefined : "Required"),
+          validate: (x) => x && (x.length > 0 ? undefined : "Required"),
        })
        if (prompts.isCancel(code)) throw new UI.CancelledError()

@@ -273,7 +302,7 @@ export const AuthLoginCommand = cmd({

    const key = await prompts.password({
      message: "Enter your API key",
-      validate: (x) => (x.length > 0 ? undefined : "Required"),
+      validate: (x) => x && (x.length > 0 ? undefined : "Required"),
    })
    if (prompts.isCancel(key)) throw new UI.CancelledError()
    await Auth.set(provider, {
@@ -4,7 +4,7 @@ import { cmd } from "../cmd"

 export const SnapshotCommand = cmd({
  command: "snapshot",
-  builder: (yargs) => yargs.command(TrackCommand).command(PatchCommand).demandCommand(),
+  builder: (yargs) => yargs.command(TrackCommand).command(PatchCommand).command(DiffCommand).demandCommand(),
  async handler() {},
 })

@@ -31,3 +31,18 @@ const PatchCommand = cmd({
    })
  },
 })
+
+const DiffCommand = cmd({
+  command: "diff <hash>",
+  builder: (yargs) =>
+    yargs.positional("hash", {
+      type: "string",
+      description: "hash",
+      demandOption: true,
+    }),
+  async handler(args) {
+    await bootstrap({ cwd: process.cwd() }, async () => {
+      console.log(await Snapshot.diff(args.hash))
+    })
+  },
+})
@@ -1,14 +1,10 @@
 import { Server } from "../../server/server"
-import fs from "fs/promises"
 import type { CommandModule } from "yargs"

 export const GenerateCommand = {
  command: "generate",
  handler: async () => {
    const specs = await Server.openapi()
-    const dir = "gen"
-    await fs.rmdir(dir, { recursive: true }).catch(() => {})
-    await fs.mkdir(dir, { recursive: true })
    process.stdout.write(JSON.stringify(specs, null, 2))
  },
 } satisfies CommandModule
@@ -156,21 +156,23 @@ export const GithubInstallCommand = cmd({
          step2 =
            "Configure OIDC in AWS - https://docs.github.com/en/actions/how-tos/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services"
        } else {
-          const url = `https://github.com/organizations/${app.owner}/settings/secrets/actions`
-          const env = providers[provider].env
-          const envStr =
-            env.length === 1
-              ? `\`${env[0]}\` secret`
-              : `\`${[env.slice(0, -1).join("\`, \`"), ...env.slice(-1)].join("\` and \`")}\` secrets`
-          step2 = `Add ${envStr} for ${providers[provider].name} - ${url}`
+          step2 = [
+            `    2. Add the following secrets in org or repo (${app.owner}/${app.repo}) settings`,
+            "",
+            ...providers[provider].env.map((e) => `       - ${e}`),
+          ].join("\n")
        }

        prompts.outro(
          [
            "Next steps:",
-            `    1. Commit "${WORKFLOW_FILE}" file and push`,
-            `    2. ${step2}`,
-            "    3. Learn how to use the GitHub agent - https://docs.opencode.ai/docs/github/getting-started",
+            "",
+            `    1. Commit the \`${WORKFLOW_FILE}\` file and push`,
+            step2,
+            "",
+            "    3. Go to a GitHub issue and comment `/oc summarize` to see the agent in action",
+            "",
+            "   Learn more about the GitHub agent - https://opencode.ai/docs/github/#usage-examples",
          ].join("\n"),
        )
      }
@@ -272,7 +274,7 @@ export const GithubInstallCommand = cmd({

        // Wait for installation
        s.message("Waiting for GitHub app to be installed")
-        const MAX_RETRIES = 60
+        const MAX_RETRIES = 120
        let retries = 0
        do {
          const installation = await getInstallation()
@@ -316,18 +318,17 @@ on:
 jobs:
  opencode:
    if: |
-      startsWith(github.event.comment.body, 'opencode') ||
-      startsWith(github.event.comment.body, 'hi opencode') ||
-      startsWith(github.event.comment.body, 'hey opencode') ||
-      contains(github.event.comment.body, '@opencode-agent')
+      contains(github.event.comment.body, ' /oc') ||
+      startsWith(github.event.comment.body, '/oc') ||
+      contains(github.event.comment.body, ' /opencode') ||
+      startsWith(github.event.comment.body, '/opencode')
    runs-on: ubuntu-latest
    permissions:
+      contents: read
      id-token: write
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1

      - name: Run opencode
        uses: sst/opencode/github@latest${envStr}
@@ -375,9 +376,6 @@ export const GithubRunCommand = cmd({
      const runUrl = `/${owner}/${repo}/actions/runs/${runId}`
      const shareBaseUrl = isMock ? "https://dev.opencode.ai" : "https://opencode.ai"

-      // TODO
-      console.log("payload", payload)
-
      let appToken: string
      let octoRest: Octokit
      let octoGraph: typeof graphql
@@ -428,7 +426,7 @@ export const GithubRunCommand = cmd({
            const response = await chat(`${userPrompt}\n\n${dataPrompt}`, promptFiles)
            if (await branchIsDirty()) {
              const summary = await summarize(response)
-              await pushToCurrentBranch(summary)
+              await pushToLocalBranch(summary)
            }
            const hasShared = prData.comments.nodes.some((c) => c.body.includes(`${shareBaseUrl}/s/${shareId}`))
            await updateComment(`${response}${footer({ image: !hasShared })}`)
@@ -454,7 +452,7 @@ export const GithubRunCommand = cmd({
          const response = await chat(`${userPrompt}\n\n${dataPrompt}`, promptFiles)
          if (await branchIsDirty()) {
            const summary = await summarize(response)
-            await pushToCurrentBranch(summary)
+            await pushToNewBranch(summary, branch)
            const pr = await createPR(
              repoData.data.default_branch,
              branch,
@@ -462,8 +460,9 @@ export const GithubRunCommand = cmd({
              `${response}\n\nCloses #${issueId}${footer({ image: true })}`,
            )
            await updateComment(`Created PR #${pr}${footer({ image: true })}`)
+          } else {
+            await updateComment(`${response}${footer({ image: true })}`)
          }
-          await updateComment(`${response}${footer({ image: true })}`)
        }
      } catch (e: any) {
        exitCode = 1
@@ -511,16 +510,10 @@ export const GithubRunCommand = cmd({

      async function getUserPrompt() {
        let prompt = (() => {
-          const body = payload.comment.body
-          if (body.match("@opencode-agent")) return body
-
-          const match = body.match(/^(?:hey|hi)?\s*opencode(?:-agent)?,?\s*(.*)$/is)
-          if (match?.[1] === undefined)
-            throw new Error(
-              "Command must mention @opencode-agent, or start with `opencode`, `hi opencode`, or `hey opencode` followed by instructions",
-            )
-          if (match[1] === "") return "Summarize this thread"
-          return match[1]
+          const body = payload.comment.body.trim()
+          if (body === "/opencode" || body === "/oc") return "Summarize this thread"
+          if (body.includes("/opencode") || body.includes("/oc")) return body
+          throw new Error("Comments must mention `/opencode` or `/oc`")
        })()

        // Handle images
@@ -540,6 +533,7 @@ export const GithubRunCommand = cmd({
        const mdMatches = prompt.matchAll(/!?\[.*?\]\((https:\/\/github\.com\/user-attachments\/[^)]+)\)/gi)
        const tagMatches = prompt.matchAll(/<img .*?src="(https:\/\/github\.com\/user-attachments\/[^"]+)" \/>/gi)
        const matches = [...mdMatches, ...tagMatches].sort((a, b) => a.index - b.index)
+        console.log("Images", JSON.stringify(matches, null, 2))

        let offset = 0
        for (const m of matches) {
@@ -556,9 +550,6 @@ export const GithubRunCommand = cmd({
            },
          })
          if (!res.ok) {
-            // TODO
-            //console.log(res)
-            //throw new Error("manual")
            console.error(`Failed to download image: ${url}`)
            continue
          }
@@ -650,7 +641,7 @@ export const GithubRunCommand = cmd({
          messageID: Identifier.ascending("message"),
          providerID,
          modelID,
-          mode: "build",
+          agent: "build",
          parts: [
            {
              id: Identifier.ascending("part"),
@@ -791,11 +782,20 @@ export const GithubRunCommand = cmd({
        return `opencode/${type}${issueId}-${timestamp}`
      }

-      async function pushToCurrentBranch(summary: string) {
-        console.log("Pushing to current branch...")
+      async function pushToNewBranch(summary: string, branch: string) {
+        console.log("Pushing to new branch...")
        await $`git add .`
        await $`git commit -m "${summary}
-  
+
+Co-authored-by: ${actor} <${actor}@users.noreply.github.com>"`
+        await $`git push -u origin ${branch}`
+      }
+
+      async function pushToLocalBranch(summary: string) {
+        console.log("Pushing to local branch...")
+        await $`git add .`
+        await $`git commit -m "${summary}
+
 Co-authored-by: ${actor} <${actor}@users.noreply.github.com>"`
        await $`git push`
      }
@@ -807,7 +807,7 @@ Co-authored-by: ${actor} <${actor}@users.noreply.github.com>"`

        await $`git add .`
        await $`git commit -m "${summary}
-  
+
 Co-authored-by: ${actor} <${actor}@users.noreply.github.com>"`
        await $`git push fork HEAD:${remoteBranch}`
      }
@@ -19,7 +19,7 @@ export const McpAddCommand = cmd({

    const name = await prompts.text({
      message: "Enter MCP server name",
-      validate: (x) => (x.length > 0 ? undefined : "Required"),
+      validate: (x) => x && (x.length > 0 ? undefined : "Required"),
    })
    if (prompts.isCancel(name)) throw new UI.CancelledError()

@@ -44,7 +44,7 @@ export const McpAddCommand = cmd({
      const command = await prompts.text({
        message: "Enter command to run",
        placeholder: "e.g., opencode x @modelcontextprotocol/server-filesystem",
-        validate: (x) => (x.length > 0 ? undefined : "Required"),
+        validate: (x) => x && (x.length > 0 ? undefined : "Required"),
      })
      if (prompts.isCancel(command)) throw new UI.CancelledError()

@@ -58,6 +58,7 @@ export const McpAddCommand = cmd({
        message: "Enter MCP server URL",
        placeholder: "e.g., https://example.com/mcp",
        validate: (x) => {
+          if (!x) return "Required"
          if (x.length === 0) return "Required"
          const isValid = URL.canParse(x)
          return isValid ? undefined : "Invalid URL"
@@ -8,8 +8,8 @@ import { Flag } from "../../flag/flag"
 import { Config } from "../../config/config"
 import { bootstrap } from "../bootstrap"
 import { MessageV2 } from "../../session/message-v2"
-import { Mode } from "../../session/mode"
 import { Identifier } from "../../id/id"
+import { Agent } from "../../agent/agent"

 const TOOL: Record<string, [string, string]> = {
  todowrite: ["Todo", UI.Style.TEXT_WARNING_BOLD],
@@ -54,9 +54,9 @@ export const RunCommand = cmd({
        alias: ["m"],
        describe: "model to use in the format of provider/model",
      })
-      .option("mode", {
+      .option("agent", {
        type: "string",
-        describe: "mode to use",
+        describe: "agent to use",
      })
  },
  handler: async (args) => {
@@ -103,7 +103,19 @@ export const RunCommand = cmd({
      }
      UI.empty()

-      const { providerID, modelID } = args.model ? Provider.parseModel(args.model) : await Provider.defaultModel()
+      const agent = await (async () => {
+        if (args.agent) return Agent.get(args.agent)
+        const build = Agent.get("build")
+        if (build) return build
+        return Agent.list().then((x) => x[0])
+      })()
+
+      const { providerID, modelID } = await (() => {
+        if (args.model) return Provider.parseModel(args.model)
+        if (agent.model) return agent.model
+        return Provider.defaultModel()
+      })()
+
      UI.println(UI.Style.TEXT_NORMAL_BOLD + "@ ", UI.Style.TEXT_NORMAL + `${providerID}/${modelID}`)
      UI.empty()

@@ -156,19 +168,17 @@ export const RunCommand = cmd({
        UI.error(err)
      })

-      const mode = args.mode ? await Mode.get(args.mode) : await Mode.list().then((x) => x[0])
-
      const messageID = Identifier.ascending("message")
      const result = await Session.chat({
        sessionID: session.id,
        messageID,
-        ...(mode.model
-          ? mode.model
+        ...(agent.model
+          ? agent.model
          : {
              providerID,
              modelID,
            }),
-        mode: mode.name,
+        agent: agent.name,
        parts: [
          {
            id: Identifier.ascending("part"),
@@ -11,8 +11,18 @@ import { Config } from "../../config/config"
 import { Bus } from "../../bus"
 import { Log } from "../../util/log"
 import { FileWatcher } from "../../file/watch"
-import { Mode } from "../../session/mode"
 import { Ide } from "../../ide"
+import { Agent } from "../../agent/agent"
+
+declare global {
+  const OPENCODE_TUI_PATH: string
+}
+
+if (typeof OPENCODE_TUI_PATH !== "undefined") {
+  await import(OPENCODE_TUI_PATH as string, {
+    with: { type: "file" },
+  })
+}

 export const TuiCommand = cmd({
  command: "$0 [project]",
@@ -71,16 +81,16 @@ export const TuiCommand = cmd({

        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
+        const tui = Bun.embeddedFiles.find((item) => (item as File).name.includes("tui")) as File
+        if (tui) {
+          let binaryName = tui.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 Bun.write(file, tui, { mode: 0o755 })
            await fs.chmod(binary, 0o755)
          }
          cwd = process.cwd()
@@ -105,7 +115,7 @@ export const TuiCommand = cmd({
            CGO_ENABLED: "0",
            OPENCODE_SERVER: server.url.toString(),
            OPENCODE_APP_INFO: JSON.stringify(app),
-            OPENCODE_MODES: JSON.stringify(await Mode.list()),
+            OPENCODE_AGENTS: JSON.stringify(await Agent.list()),
          },
          onExit: () => {
            server.stop()
@@ -113,7 +123,7 @@ export const TuiCommand = cmd({
        })

        ;(async () => {
-          if (Installation.VERSION === "dev") return
+          if (Installation.isDev()) return
          if (Installation.isSnapshot()) return
          const config = await Config.global()
          if (config.autoupdate === false) return
@@ -123,19 +133,15 @@ export const TuiCommand = cmd({
          const method = await Installation.method()
          if (method === "unknown") return
          await Installation.upgrade(method, latest)
-            .then(() => {
-              Bus.publish(Installation.Event.Updated, { version: latest })
-            })
+            .then(() => Bus.publish(Installation.Event.Updated, { version: latest }))
            .catch(() => {})
        })()
        ;(async () => {
          if (Ide.alreadyInstalled()) return
-          const ide = await Ide.ide()
+          const ide = Ide.ide()
          if (ide === "unknown") return
          await Ide.install(ide)
-            .then(() => {
-              Bus.publish(Ide.Event.Installed, { ide })
-            })
+            .then(() => Bus.publish(Ide.Event.Installed, { ide }))
            .catch(() => {})
        })()

@@ -32,7 +32,7 @@ export const UpgradeCommand = {
      return
    }
    prompts.log.info("Using method: " + method)
-    const target = args.target ?? (await Installation.latest())
+    const target = args.target ? args.target.replace(/^v/, "") : await Installation.latest()

    if (Installation.VERSION === target) {
      prompts.log.warn(`opencode upgrade skipped: ${target} is already installed`)
@@ -5,7 +5,11 @@ 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.JsonError.isInstance(input)) {
+    return (
+      `Config file at ${input.data.path} is not valid JSON(C)` + (input.data.message ? `: ${input.data.message}` : "")
+    )
+  }
  if (Config.InvalidError.isInstance(input))
    return [
      `Config file at ${input.data.path} is invalid`,
@@ -1,5 +1,6 @@
 import { Log } from "../util/log"
 import path from "path"
+import os from "os"
 import { z } from "zod"
 import { App } from "../app/app"
 import { Filesystem } from "../util/filesystem"
@@ -10,16 +11,34 @@ import fs from "fs/promises"
 import { lazy } from "../util/lazy"
 import { NamedError } from "../util/error"
 import matter from "gray-matter"
+import { Flag } from "../flag/flag"
+import { Auth } from "../auth"
+import { type ParseError as JsoncParseError, parse as parseJsonc, printParseErrorCode } from "jsonc-parser"

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

  export const state = App.state("config", async (app) => {
+    const auth = await Auth.all()
    let result = await global()
    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))
+        result = mergeDeep(result, await loadFile(resolved))
+      }
+    }
+
+    // Override with custom config if provided
+    if (Flag.OPENCODE_CONFIG) {
+      result = mergeDeep(result, await loadFile(Flag.OPENCODE_CONFIG))
+      log.debug("loaded custom config", { path: Flag.OPENCODE_CONFIG })
+    }
+
+    for (const [key, value] of Object.entries(auth)) {
+      if (value.type === "wellknown") {
+        process.env[value.key] = value.token
+        const wellknown = await fetch(`${key}/.well-known/opencode`).then((x) => x.json())
+        result = mergeDeep(result, await load(JSON.stringify(wellknown.config ?? {}), process.cwd()))
      }
    }

@@ -48,6 +67,49 @@ export namespace Config {
      throw new InvalidError({ path: item }, { cause: parsed.error })
    }

+    // Load mode markdown files
+    result.mode = result.mode || {}
+    const markdownModes = [
+      ...(await Filesystem.globUp("mode/*.md", Global.Path.config, Global.Path.config)),
+      ...(await Filesystem.globUp(".opencode/mode/*.md", app.path.cwd, app.path.root)),
+    ]
+    for (const item of markdownModes) {
+      const content = await Bun.file(item).text()
+      const md = matter(content)
+      if (!md.data) continue
+
+      const config = {
+        name: path.basename(item, ".md"),
+        ...md.data,
+        prompt: md.content.trim(),
+      }
+      const parsed = Agent.safeParse(config)
+      if (parsed.success) {
+        result.mode = mergeDeep(result.mode, {
+          [config.name]: parsed.data,
+        })
+        continue
+      }
+      throw new InvalidError({ path: item }, { cause: parsed.error })
+    }
+    // Migrate deprecated mode field to agent field
+    for (const [name, mode] of Object.entries(result.mode)) {
+      result.agent = mergeDeep(result.agent ?? {}, {
+        [name]: {
+          ...mode,
+          mode: "primary" as const,
+        },
+      })
+    }
+
+    result.plugin = result.plugin || []
+    result.plugin.push(
+      ...[
+        ...(await Filesystem.globUp("plugin/*.ts", Global.Path.config, Global.Path.config)),
+        ...(await Filesystem.globUp(".opencode/plugin/*.ts", app.path.cwd, app.path.root)),
+      ].map((x) => "file://" + x),
+    )
+
    // Handle migration from autoshare to share field
    if (result.autoshare === true && !result.share) {
      result.share = "auto"
@@ -55,6 +117,12 @@ export namespace Config {
    if (result.keybinds?.messages_revert && !result.keybinds.messages_undo) {
      result.keybinds.messages_undo = result.keybinds.messages_revert
    }
+    if (result.keybinds?.switch_mode && !result.keybinds.switch_agent) {
+      result.keybinds.switch_agent = result.keybinds.switch_mode
+    }
+    if (result.keybinds?.switch_mode_reverse && !result.keybinds.switch_agent_reverse) {
+      result.keybinds.switch_agent_reverse = result.keybinds.switch_mode_reverse
+    }

    if (!result.username) {
      const os = await import("os")
@@ -96,31 +164,34 @@ export namespace Config {
  export const Mcp = z.discriminatedUnion("type", [McpLocal, McpRemote])
  export type Mcp = z.infer<typeof Mcp>

-  export const Mode = z
+  export const Agent = z
    .object({
      model: z.string().optional(),
      temperature: z.number().optional(),
+      top_p: z.number().optional(),
      prompt: z.string().optional(),
      tools: z.record(z.string(), z.boolean()).optional(),
      disable: z.boolean().optional(),
+      description: z.string().optional().describe("Description of when to use the agent"),
+      mode: z.union([z.literal("subagent"), z.literal("primary"), z.literal("all")]).optional(),
    })
    .openapi({
-      ref: "ModeConfig",
+      ref: "AgentConfig",
    })
-  export type Mode = z.infer<typeof Mode>
-
-  export const Agent = Mode.extend({
-    description: z.string(),
-  }).openapi({
-    ref: "AgentConfig",
-  })
+  export type Agent = z.infer<typeof Agent>

  export const Keybinds = z
    .object({
      leader: z.string().optional().default("ctrl+x").describe("Leader key for keybind combinations"),
      app_help: z.string().optional().default("<leader>h").describe("Show help dialog"),
-      switch_mode: z.string().optional().default("tab").describe("Next mode"),
-      switch_mode_reverse: z.string().optional().default("shift+tab").describe("Previous Mode"),
+      switch_mode: z.string().optional().default("none").describe("@deprecated use switch_agent. Next mode"),
+      switch_mode_reverse: z
+        .string()
+        .optional()
+        .default("none")
+        .describe("@deprecated use switch_agent_reverse. Previous mode"),
+      switch_agent: z.string().optional().default("tab").describe("Next agent"),
+      switch_agent_reverse: z.string().optional().default("shift+tab").describe("Previous agent"),
      editor_open: z.string().optional().default("<leader>e").describe("Open external editor"),
      session_export: z.string().optional().default("<leader>x").describe("Export session to editor"),
      session_new: z.string().optional().default("<leader>n").describe("Create a new session"),
@@ -170,11 +241,16 @@ export namespace Config {
  })
  export type Layout = z.infer<typeof Layout>

+  export const Permission = z.union([z.literal("ask"), z.literal("allow"), z.literal("deny")])
+  export type Permission = z.infer<typeof Permission>
+
  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"),
+      plugin: z.string().array().optional(),
+      snapshot: z.boolean().optional(),
      share: z
        .enum(["manual", "auto", "disabled"])
        .optional()
@@ -190,9 +266,7 @@ export namespace Config {
      model: z.string().describe("Model to use in the format of provider/model, eg anthropic/claude-2").optional(),
      small_model: z
        .string()
-        .describe(
-          "Small model to use for tasks like summarization and title generation in the format of provider/model",
-        )
+        .describe("Small model to use for tasks like title generation in the format of provider/model")
        .optional(),
      username: z
        .string()
@@ -200,19 +274,21 @@ export namespace Config {
        .describe("Custom username to display in conversations instead of system username"),
      mode: z
        .object({
-          build: Mode.optional(),
-          plan: Mode.optional(),
+          build: Agent.optional(),
+          plan: Agent.optional(),
        })
-        .catchall(Mode)
+        .catchall(Agent)
        .optional()
-        .describe("Modes configuration, see https://opencode.ai/docs/modes"),
+        .describe("@deprecated Use `agent` field instead."),
      agent: z
        .object({
+          plan: Agent.optional(),
+          build: Agent.optional(),
          general: Agent.optional(),
        })
        .catchall(Agent)
        .optional()
-        .describe("Modes configuration, see https://opencode.ai/docs/modes"),
+        .describe("Agent configuration, see https://opencode.ai/docs/agent"),
      provider: z
        .record(
          ModelsDev.Provider.partial()
@@ -231,8 +307,42 @@ export namespace Config {
        .optional()
        .describe("Custom provider configurations and model overrides"),
      mcp: z.record(z.string(), Mcp).optional().describe("MCP (Model Context Protocol) server configurations"),
+      formatter: z
+        .record(
+          z.string(),
+          z.object({
+            disabled: z.boolean().optional(),
+            command: z.array(z.string()).optional(),
+            environment: z.record(z.string(), z.string()).optional(),
+            extensions: z.array(z.string()).optional(),
+          }),
+        )
+        .optional(),
+      lsp: z
+        .record(
+          z.string(),
+          z.union([
+            z.object({
+              disabled: z.literal(true),
+            }),
+            z.object({
+              command: z.array(z.string()),
+              extensions: z.array(z.string()).optional(),
+              disabled: z.boolean().optional(),
+              env: z.record(z.string(), z.string()).optional(),
+              initialization: z.record(z.string(), z.any()).optional(),
+            }),
+          ]),
+        )
+        .optional(),
      instructions: z.array(z.string()).optional().describe("Additional instruction files or patterns to include"),
      layout: Layout.optional().describe("@deprecated Always uses stretch layout."),
+      permission: z
+        .object({
+          edit: Permission.optional(),
+          bash: z.union([Permission, z.record(z.string(), Permission)]).optional(),
+        })
+        .optional(),
      experimental: z
        .object({
          hook: z
@@ -268,10 +378,11 @@ export namespace Config {
  export type Info = z.output<typeof Info>

  export const global = lazy(async () => {
-    let result = pipe(
+    let result: Info = pipe(
      {},
-      mergeDeep(await load(path.join(Global.Path.config, "config.json"))),
-      mergeDeep(await load(path.join(Global.Path.config, "opencode.json"))),
+      mergeDeep(await loadFile(path.join(Global.Path.config, "config.json"))),
+      mergeDeep(await loadFile(path.join(Global.Path.config, "opencode.json"))),
+      mergeDeep(await loadFile(path.join(Global.Path.config, "opencode.jsonc"))),
    )

    await import(path.join(Global.Path.config, "config"), {
@@ -292,51 +403,93 @@ export namespace Config {
    return result
  })

-  async function load(configPath: string) {
-    let text = await Bun.file(configPath)
+  async function loadFile(filepath: string): Promise<Info> {
+    log.info("loading", { path: filepath })
+    let text = await Bun.file(filepath)
      .text()
      .catch((err) => {
        if (err.code === "ENOENT") return
-        throw new JsonError({ path: configPath }, { cause: err })
+        throw new JsonError({ path: filepath }, { cause: err })
      })
    if (!text) return {}
+    return load(text, filepath)
+  }

+  async function load(text: string, filepath: string) {
    text = text.replace(/\{env:([^}]+)\}/g, (_, varName) => {
      return process.env[varName] || ""
    })

-    const fileMatches = text.match(/"?\{file:([^}]+)\}"?/g)
+    const fileMatches = text.match(/\{file:[^}]+\}/g)
    if (fileMatches) {
-      const configDir = path.dirname(configPath)
+      const configDir = path.dirname(filepath)
+      const lines = text.split("\n")
+
      for (const match of fileMatches) {
-        const filePath = match.replace(/^"?\{file:/, "").replace(/\}"?$/, "")
+        const lineIndex = lines.findIndex((line) => line.includes(match))
+        if (lineIndex !== -1 && lines[lineIndex].trim().startsWith("//")) {
+          continue // Skip if line is commented
+        }
+        let filePath = match.replace(/^\{file:/, "").replace(/\}$/, "")
+        if (filePath.startsWith("~/")) {
+          filePath = path.join(os.homedir(), filePath.slice(2))
+        }
        const resolvedPath = path.isAbsolute(filePath) ? filePath : path.resolve(configDir, filePath)
-        const fileContent = await Bun.file(resolvedPath).text()
-        text = text.replace(match, JSON.stringify(fileContent))
+        const fileContent = (await Bun.file(resolvedPath).text()).trim()
+        // escape newlines/quotes, strip outer quotes
+        text = text.replace(match, JSON.stringify(fileContent).slice(1, -1))
      }
    }

-    let data: any
-    try {
-      data = JSON.parse(text)
-    } catch (err) {
-      throw new JsonError({ path: configPath }, { cause: err as Error })
+    const errors: JsoncParseError[] = []
+    const data = parseJsonc(text, errors, { allowTrailingComma: true })
+    if (errors.length) {
+      const lines = text.split("\n")
+      const errorDetails = errors
+        .map((e) => {
+          const beforeOffset = text.substring(0, e.offset).split("\n")
+          const line = beforeOffset.length
+          const column = beforeOffset[beforeOffset.length - 1].length + 1
+          const problemLine = lines[line - 1]
+
+          const error = `${printParseErrorCode(e.error)} at line ${line}, column ${column}`
+          if (!problemLine) return error
+
+          return `${error}\n   Line ${line}: ${problemLine}\n${"".padStart(column + 9)}^`
+        })
+        .join("\n")
+
+      throw new JsonError({
+        path: filepath,
+        message: `\n--- JSONC Input ---\n${text}\n--- Errors ---\n${errorDetails}\n--- End ---`,
+      })
    }

    const parsed = Info.safeParse(data)
    if (parsed.success) {
      if (!parsed.data.$schema) {
        parsed.data.$schema = "https://opencode.ai/config.json"
-        await Bun.write(configPath, JSON.stringify(parsed.data, null, 2))
+        await Bun.write(filepath, JSON.stringify(parsed.data, null, 2))
      }
-      return parsed.data
+      const data = parsed.data
+      if (data.plugin) {
+        for (let i = 0; i < data.plugin?.length; i++) {
+          const plugin = data.plugin[i]
+          try {
+            data.plugin[i] = import.meta.resolve(plugin, filepath)
+          } catch (err) {}
+        }
+      }
+      return data
    }
-    throw new InvalidError({ path: configPath, issues: parsed.error.issues })
+
+    throw new InvalidError({ path: filepath, issues: parsed.error.issues })
  }
  export const JsonError = NamedError.create(
    "ConfigJsonError",
    z.object({
      path: z.string(),
+      message: z.string().optional(),
    }),
  )

@@ -1,6 +1,7 @@
 export namespace Flag {
  export const OPENCODE_AUTO_SHARE = truthy("OPENCODE_AUTO_SHARE")
  export const OPENCODE_DISABLE_WATCHER = truthy("OPENCODE_DISABLE_WATCHER")
+  export const OPENCODE_CONFIG = process.env["OPENCODE_CONFIG"]

  function truthy(key: string) {
    const value = process.env[key]?.toLowerCase()
@@ -1,7 +1,6 @@
 import { App } from "../app/app"
 import { BunProc } from "../bun"
 import { Filesystem } from "../util/filesystem"
-import path from "path"

 export interface Info {
  name: string
@@ -65,14 +64,57 @@ export const prettier: Info = {
  ],
  async enabled() {
    const app = App.info()
-    const nms = await Filesystem.findUp("node_modules", app.path.cwd, app.path.root)
-    for (const item of nms) {
-      if (await Bun.file(path.join(item, ".bin", "prettier")).exists()) return true
+    const items = await Filesystem.findUp("package.json", app.path.cwd, app.path.root)
+    for (const item of items) {
+      const json = await Bun.file(item).json()
+      if (json.dependencies?.prettier) return true
+      if (json.devDependencies?.prettier) return true
    }
    return false
  },
 }

+export const biome: Info = {
+  name: "biome",
+  command: [BunProc.which(), "x", "biome", "format", "--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() {
+    const app = App.info()
+    const items = await Filesystem.findUp("biome.json", app.path.cwd, app.path.root)
+    return items.length > 0
+  },
+}
+
 export const zig: Info = {
  name: "zig",
  command: ["zig", "fmt", "$FILE"],
@@ -87,7 +129,9 @@ export const clang: Info = {
  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
+    const app = App.info()
+    const items = await Filesystem.findUp(".clang-format", app.path.cwd, app.path.root)
+    return items.length > 0
  },
 }

@@ -5,20 +5,40 @@ import { Log } from "../util/log"
 import path from "path"

 import * as Formatter from "./formatter"
+import { Config } from "../config/config"
+import { mergeDeep } from "remeda"

 export namespace Format {
  const log = Log.create({ service: "format" })

-  const state = App.state("format", () => {
+  const state = App.state("format", async () => {
    const enabled: Record<string, boolean> = {}
+    const cfg = await Config.get()
+
+    const formatters = { ...Formatter } as Record<string, Formatter.Info>
+    for (const [name, item] of Object.entries(cfg.formatter ?? {})) {
+      if (item.disabled) {
+        delete formatters[name]
+        continue
+      }
+      const result: Formatter.Info = mergeDeep(formatters[name] ?? {}, {
+        command: [],
+        extensions: [],
+        ...item,
+      })
+      result.enabled = async () => true
+      result.name = name
+      formatters[name] = result
+    }

    return {
      enabled,
+      formatters,
    }
  })

  async function isEnabled(item: Formatter.Info) {
-    const s = state()
+    const s = await state()
    let status = s.enabled[item.name]
    if (status === undefined) {
      status = await item.enabled()
@@ -28,8 +48,10 @@ export namespace Format {
  }

  async function getFormatter(ext: string) {
+    const formatters = await state().then((x) => x.formatters)
    const result = []
-    for (const item of Object.values(Formatter)) {
+    for (const item of Object.values(formatters)) {
+      log.info("checking", { name: item.name, ext })
      if (!item.extensions.includes(ext)) continue
      if (!(await isEnabled(item))) continue
      result.push(item)
@@ -13,6 +13,7 @@ export namespace Global {
  export const Path = {
    data,
    bin: path.join(data, "bin"),
+    log: path.join(data, "log"),
    cache,
    config,
    state,
@@ -23,9 +24,10 @@ await Promise.all([
  fs.mkdir(Global.Path.data, { recursive: true }),
  fs.mkdir(Global.Path.config, { recursive: true }),
  fs.mkdir(Global.Path.state, { recursive: true }),
+  fs.mkdir(Global.Path.log, { recursive: true }),
 ])

-const CACHE_VERSION = "3"
+const CACHE_VERSION = "4"

 const version = await Bun.file(path.join(Global.Path.cache, "version"))
  .text()
@@ -5,6 +5,7 @@ export namespace Identifier {
  const prefixes = {
    session: "ses",
    message: "msg",
+    permission: "per",
    user: "usr",
    part: "prt",
  } as const
@@ -1,10 +1,15 @@
-import { $ } from "bun"
+import { spawn } from "bun"
 import { z } from "zod"
 import { NamedError } from "../util/error"
 import { Log } from "../util/log"
 import { Bus } from "../bus"

-const SUPPORTED_IDES = ["Windsurf", "Visual Studio Code", "Cursor", "VSCodium"] as const
+const SUPPORTED_IDES = [
+  { name: "Windsurf" as const, cmd: "windsurf" },
+  { name: "Visual Studio Code" as const, cmd: "code" },
+  { name: "Cursor" as const, cmd: "cursor" },
+  { name: "VSCodium" as const, cmd: "codium" },
+]

 export namespace Ide {
  const log = Log.create({ service: "ide" })
@@ -18,8 +23,6 @@ export namespace Ide {
    ),
  }

-  export type Ide = Awaited<ReturnType<typeof ide>>
-
  export const AlreadyInstalledError = NamedError.create("AlreadyInstalledError", z.object({}))

  export const InstallFailedError = NamedError.create(
@@ -29,11 +32,11 @@ export namespace Ide {
    }),
  )

-  export async function ide() {
+  export function ide() {
    if (process.env["TERM_PROGRAM"] === "vscode") {
      const v = process.env["GIT_ASKPASS"]
      for (const ide of SUPPORTED_IDES) {
-        if (v?.includes(ide)) return ide
+        if (v?.includes(ide.name)) return ide.name
      }
    }
    return "unknown"
@@ -43,32 +46,29 @@ export namespace Ide {
    return process.env["OPENCODE_CALLER"] === "vscode"
  }

-  export async function install(ide: Ide) {
-    const cmd = (() => {
-      switch (ide) {
-        case "Windsurf":
-          return $`windsurf --install-extension sst-dev.opencode`
-        case "Visual Studio Code":
-          return $`code --install-extension sst-dev.opencode`
-        case "Cursor":
-          return $`cursor --install-extension sst-dev.opencode`
-        case "VSCodium":
-          return $`codium --install-extension sst-dev.opencode`
-        default:
-          throw new Error(`Unknown IDE: ${ide}`)
-      }
-    })()
-    // TODO: check OPENCODE_CALLER
-    const result = await cmd.quiet().throws(false)
+  export async function install(ide: (typeof SUPPORTED_IDES)[number]["name"]) {
+    const cmd = SUPPORTED_IDES.find((i) => i.name === ide)?.cmd
+    if (!cmd) throw new Error(`Unknown IDE: ${ide}`)
+
+    const p = spawn([cmd, "--install-extension", "sst-dev.opencode"], {
+      stdout: "pipe",
+      stderr: "pipe",
+    })
+    await p.exited
+    const stdout = await new Response(p.stdout).text()
+    const stderr = await new Response(p.stderr).text()
+
    log.info("installed", {
      ide,
-      stdout: result.stdout.toString(),
-      stderr: result.stderr.toString(),
+      stdout,
+      stderr,
    })
-    if (result.exitCode !== 0)
-      throw new InstallFailedError({
-        stderr: result.stderr.toString("utf8"),
-      })
-    if (result.stdout.toString().includes("already installed")) throw new AlreadyInstalledError({})
+
+    if (p.exitCode !== 0) {
+      throw new InstallFailedError({ stderr })
+    }
+    if (stdout.includes("already installed")) {
+      throw new AlreadyInstalledError({})
+    }
  }
 }
@@ -1,4 +1,6 @@
 import "zod-openapi/extend"
+import { Trace } from "./trace"
+Trace.init()
 import yargs from "yargs"
 import { hideBin } from "yargs/helpers"
 import { RunCommand } from "./cli/cmd/run"
@@ -18,9 +20,6 @@ import { DebugCommand } from "./cli/cmd/debug"
 import { StatsCommand } from "./cli/cmd/stats"
 import { McpCommand } from "./cli/cmd/mcp"
 import { GithubCommand } from "./cli/cmd/github"
-import { Trace } from "./trace"
-
-Trace.init()

 const cancel = new AbortController()

@@ -83,6 +82,7 @@ const cli = yargs(hideBin(process.argv))
    if (msg.startsWith("Unknown argument") || msg.startsWith("Not enough non-option arguments")) {
      cli.showHelp("log")
    }
+    process.exit(1)
  })
  .strict()

@@ -136,6 +136,7 @@ export namespace Installation {
  }

  export const VERSION = typeof OPENCODE_VERSION === "string" ? OPENCODE_VERSION : "dev"
+  export const USER_AGENT = `opencode/${VERSION}`

  export async function latest() {
    return fetch("https://api.github.com/repos/sst/opencode/releases/latest")
@@ -4,6 +4,8 @@ import { LSPClient } from "./client"
 import path from "path"
 import { LSPServer } from "./server"
 import { z } from "zod"
+import { Config } from "../config/config"
+import { spawn } from "child_process"

 export namespace LSP {
  const log = Log.create({ service: "lsp" })
@@ -55,8 +57,35 @@ export namespace LSP {
    "lsp",
    async () => {
      const clients: LSPClient.Info[] = []
+      const servers: Record<string, LSPServer.Info> = LSPServer
+      const cfg = await Config.get()
+      for (const [name, item] of Object.entries(cfg.lsp ?? {})) {
+        const existing = servers[name]
+        if (item.disabled) {
+          delete servers[name]
+          continue
+        }
+        servers[name] = {
+          ...existing,
+          root: existing?.root ?? (async (_file, app) => app.path.root),
+          extensions: item.extensions ?? existing.extensions,
+          spawn: async (_app, root) => {
+            return {
+              process: spawn(item.command[0], item.command.slice(1), {
+                cwd: root,
+                env: {
+                  ...process.env,
+                  ...item.env,
+                },
+              }),
+              initialization: item.initialization,
+            }
+          },
+        }
+      }
      return {
        broken: new Set<string>(),
+        servers,
        clients,
      }
    },
@@ -76,7 +105,7 @@ export namespace LSP {
    const extension = path.parse(file).ext
    const result: LSPClient.Info[] = []
    for (const server of Object.values(LSPServer)) {
-      if (!server.extensions.includes(extension)) continue
+      if (server.extensions.length && !server.extensions.includes(extension)) continue
      const root = await server.root(file, App.info())
      if (!root) continue
      if (s.broken.has(root + server.id)) continue
@@ -1,5 +1,7 @@
 import { experimental_createMCPClient, type Tool } from "ai"
-import { Experimental_StdioMCPTransport } from "ai/mcp-stdio"
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js"
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js"
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js"
 import { App } from "../app/app"
 import { Config } from "../config/config"
 import { Log } from "../util/log"
@@ -32,15 +34,28 @@ export namespace MCP {
        }
        log.info("found", { key, type: mcp.type })
        if (mcp.type === "remote") {
-          const client = await experimental_createMCPClient({
-            name: key,
-            transport: {
-              type: "sse",
-              url: mcp.url,
-              headers: mcp.headers,
-            },
-          }).catch(() => {})
-          if (!client) {
+          const transports = [
+            new StreamableHTTPClientTransport(new URL(mcp.url), {
+              requestInit: {
+                headers: mcp.headers,
+              },
+            }),
+            new SSEClientTransport(new URL(mcp.url), {
+              requestInit: {
+                headers: mcp.headers,
+              },
+            }),
+          ]
+          for (const transport of transports) {
+            const client = await experimental_createMCPClient({
+              name: key,
+              transport,
+            }).catch(() => {})
+            if (!client) continue
+            clients[key] = client
+            break
+          }
+          if (!clients[key])
            Bus.publish(Session.Event.Error, {
              error: {
                name: "UnknownError",
@@ -49,16 +64,13 @@ export namespace MCP {
                },
              },
            })
-            continue
-          }
-          clients[key] = client
        }

        if (mcp.type === "local") {
          const [cmd, ...args] = mcp.command
          const client = await experimental_createMCPClient({
            name: key,
-            transport: new Experimental_StdioMCPTransport({
+            transport: new StdioClientTransport({
              stderr: "ignore",
              command: cmd,
              args,
@@ -103,7 +115,8 @@ export namespace MCP {
    const result: Record<string, Tool> = {}
    for (const [clientName, client] of Object.entries(await clients())) {
      for (const [toolName, tool] of Object.entries(await client.tools())) {
-        result[clientName + "_" + toolName] = tool
+        const sanitizedClientName = clientName.replace(/\s+/g, "_")
+        result[sanitizedClientName + "_" + toolName] = tool
      }
    }
    return result
@@ -2,6 +2,8 @@ import { App } from "../app/app"
 import { z } from "zod"
 import { Bus } from "../bus"
 import { Log } from "../util/log"
+import { Identifier } from "../id/id"
+import { Plugin } from "../plugin"

 export namespace Permission {
  const log = Log.create({ service: "permission" })
@@ -9,7 +11,11 @@ export namespace Permission {
  export const Info = z
    .object({
      id: z.string(),
+      type: z.string(),
+      pattern: z.string().optional(),
      sessionID: z.string(),
+      messageID: z.string(),
+      callID: z.string().optional(),
      title: z.string(),
      metadata: z.record(z.any()),
      time: z.object({
@@ -17,12 +23,16 @@ export namespace Permission {
      }),
    })
    .openapi({
-      ref: "permission.info",
+      ref: "Permission",
    })
  export type Info = z.infer<typeof Info>

  export const Event = {
    Updated: Bus.event("permission.updated", Info),
+    Replied: Bus.event(
+      "permission.replied",
+      z.object({ sessionID: z.string(), permissionID: z.string(), response: z.string() }),
+    ),
  }

  const state = App.state(
@@ -40,7 +50,7 @@ export namespace Permission {

      const approved: {
        [sessionID: string]: {
-          [permissionID: string]: Info
+          [permissionID: string]: boolean
        }
      } = {}

@@ -52,76 +62,90 @@ export namespace Permission {
    async (state) => {
      for (const pending of Object.values(state.pending)) {
        for (const item of Object.values(pending)) {
-          item.reject(new RejectedError(item.info.sessionID, item.info.id))
+          item.reject(new RejectedError(item.info.sessionID, item.info.id, item.info.callID))
        }
      }
    },
  )

-  export function ask(input: {
-    id: Info["id"]
-    sessionID: Info["sessionID"]
+  export async function ask(input: {
+    type: Info["type"]
    title: Info["title"]
+    pattern?: Info["pattern"]
+    callID?: Info["callID"]
+    sessionID: Info["sessionID"]
+    messageID: Info["messageID"]
    metadata: Info["metadata"]
  }) {
-    return
    const { pending, approved } = state()
    log.info("asking", {
      sessionID: input.sessionID,
-      permissionID: input.id,
+      messageID: input.messageID,
+      toolCallID: input.callID,
    })
-    if (approved[input.sessionID]?.[input.id]) {
-      log.info("previously approved", {
-        sessionID: input.sessionID,
-        permissionID: input.id,
-      })
-      return
-    }
+    if (approved[input.sessionID]?.[input.pattern ?? input.type]) return
    const info: Info = {
-      id: input.id,
+      id: Identifier.ascending("permission"),
+      type: input.type,
      sessionID: input.sessionID,
+      messageID: input.messageID,
+      callID: input.callID,
      title: input.title,
      metadata: input.metadata,
      time: {
        created: Date.now(),
      },
    }
+
+    switch (
+      await Plugin.trigger("permission.ask", info, {
+        status: "ask",
+      }).then((x) => x.status)
+    ) {
+      case "deny":
+        throw new RejectedError(info.sessionID, info.id, info.callID)
+      case "allow":
+        return
+    }
+
    pending[input.sessionID] = pending[input.sessionID] || {}
    return new Promise<void>((resolve, reject) => {
-      pending[input.sessionID][input.id] = {
+      pending[input.sessionID][info.id] = {
        info,
        resolve,
        reject,
      }
-      setTimeout(() => {
-        respond({
-          sessionID: input.sessionID,
-          permissionID: input.id,
-          response: "always",
-        })
-      }, 1000)
      Bus.publish(Event.Updated, info)
    })
  }

-  export function respond(input: {
-    sessionID: Info["sessionID"]
-    permissionID: Info["id"]
-    response: "once" | "always" | "reject"
-  }) {
+  export const Response = z.enum(["once", "always", "reject"])
+  export type Response = z.infer<typeof Response>
+
+  export function respond(input: { sessionID: Info["sessionID"]; permissionID: Info["id"]; response: Response }) {
    log.info("response", input)
    const { pending, approved } = state()
    const match = pending[input.sessionID]?.[input.permissionID]
    if (!match) return
    delete pending[input.sessionID][input.permissionID]
    if (input.response === "reject") {
-      match.reject(new RejectedError(input.sessionID, input.permissionID))
+      match.reject(new RejectedError(input.sessionID, input.permissionID, match.info.callID))
      return
    }
    match.resolve()
+    Bus.publish(Event.Replied, {
+      sessionID: input.sessionID,
+      permissionID: input.permissionID,
+      response: input.response,
+    })
    if (input.response === "always") {
      approved[input.sessionID] = approved[input.sessionID] || {}
-      approved[input.sessionID][input.permissionID] = match.info
+      approved[input.sessionID][match.info.pattern ?? match.info.type] = true
+      for (const item of Object.values(pending[input.sessionID])) {
+        if ((item.info.pattern ?? item.info.type) === (match.info.pattern ?? match.info.type)) {
+          respond({ sessionID: item.info.sessionID, permissionID: item.info.id, response: input.response })
+        }
+      }
    }
  }

@@ -129,6 +153,7 @@ export namespace Permission {
    constructor(
      public readonly sessionID: string,
      public readonly permissionID: string,
+      public readonly toolCallID?: string,
    ) {
      super(`The user rejected permission to use this functionality`)
    }
@@ -0,0 +1,69 @@
+import type { Hooks, Plugin as PluginInstance } from "@opencode-ai/plugin"
+import { App } from "../app/app"
+import { Config } from "../config/config"
+import { Bus } from "../bus"
+import { Log } from "../util/log"
+import { createOpencodeClient } from "@opencode-ai/sdk"
+import { Server } from "../server/server"
+import { BunProc } from "../bun"
+
+export namespace Plugin {
+  const log = Log.create({ service: "plugin" })
+
+  const state = App.state("plugin", async (app) => {
+    const client = createOpencodeClient({
+      baseUrl: "http://localhost:4096",
+      fetch: async (...args) => Server.app().fetch(...args),
+    })
+    const config = await Config.get()
+    const hooks = []
+    for (let plugin of config.plugin ?? []) {
+      log.info("loading plugin", { path: plugin })
+      if (!plugin.startsWith("file://")) {
+        const [pkg, version] = plugin.split("@")
+        plugin = await BunProc.install(pkg, version ?? "latest")
+      }
+      const mod = await import(plugin)
+      for (const [_name, fn] of Object.entries<PluginInstance>(mod)) {
+        const init = await fn({
+          client,
+          app,
+          $: Bun.$,
+        })
+        hooks.push(init)
+      }
+    }
+
+    return {
+      hooks,
+    }
+  })
+
+  export async function trigger<
+    Name extends keyof Required<Hooks>,
+    Input = Parameters<Required<Hooks>[Name]>[0],
+    Output = Parameters<Required<Hooks>[Name]>[1],
+  >(name: Name, input: Input, output: Output): Promise<Output> {
+    if (!name) return output
+    for (const hook of await state().then((x) => x.hooks)) {
+      const fn = hook[name]
+      if (!fn) continue
+      // @ts-expect-error if you feel adventurous, please fix the typing, make sure to bump the try-counter if you
+      // give up.
+      // try-counter: 2
+      await fn(input, output)
+    }
+    return output
+  }
+
+  export function init() {
+    Bus.subscribeAll(async (input) => {
+      const hooks = await state().then((x) => x.hooks)
+      for (const hook of hooks) {
+        hook["event"]?.({
+          event: input,
+        })
+      }
+    })
+  }
+}
@@ -3,6 +3,7 @@ import { Log } from "../util/log"
 import path from "path"
 import { z } from "zod"
 import { data } from "./models-macro" with { type: "macro" }
+import { Installation } from "../installation"

 export namespace ModelsDev {
  const log = Log.create({ service: "models.dev" })
@@ -50,21 +51,30 @@ export namespace ModelsDev {
  export type Provider = z.infer<typeof Provider>

  export async function get() {
+    refresh()
    const file = Bun.file(filepath)
    const result = await file.json().catch(() => {})
-    if (result) {
-      refresh()
-      return result as Record<string, Provider>
-    }
-    refresh()
+    if (result) return result as Record<string, Provider>
    const json = await data()
    return JSON.parse(json) as Record<string, Provider>
  }

-  async function refresh() {
+  export 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)
+    log.info("refreshing", {
+      file,
+    })
+    const result = await fetch("https://models.dev/api.json", {
+      headers: {
+        "User-Agent": Installation.USER_AGENT,
+      },
+    }).catch((e) => {
+      log.error("Failed to fetch models.dev", {
+        error: e,
+      })
+    })
+    if (result && result.ok) await Bun.write(file, await result.text())
  }
 }
+
+setInterval(() => ModelsDev.refresh(), 60 * 1000 * 60).unref()
@@ -126,6 +126,15 @@ export namespace Provider {
        options: {},
      }
    },
+    azure: 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"] && !process.env["AWS_BEARER_TOKEN_BEDROCK"])
        return { autoload: false }
@@ -194,6 +203,17 @@ export namespace Provider {
        },
      }
    },
+    vercel: async () => {
+      return {
+        autoload: false,
+        options: {
+          headers: {
+            "http-referer": "https://opencode.ai/",
+            "x-title": "opencode",
+          },
+        },
+      }
+    },
  }

  const state = App.state("provider", async () => {
@@ -366,6 +386,10 @@ export namespace Provider {
    })
  }

+  export async function getProvider(providerID: string) {
+    return state().then((s) => s.providers[providerID])
+  }
+
  export async function getModel(providerID: string, modelID: string) {
    const key = `${providerID}/${modelID}`
    const s = await state()
@@ -2,47 +2,73 @@ import type { ModelMessage } from "ai"
 import { unique } from "remeda"

 export namespace ProviderTransform {
-  export function message(msgs: ModelMessage[], providerID: string, modelID: string) {
-    if (providerID === "anthropic" || modelID.includes("anthropic") || modelID.includes("claude")) {
-      const system = msgs.filter((msg) => msg.role === "system").slice(0, 2)
-      const final = msgs.filter((msg) => msg.role !== "system").slice(-2)
+  function normalizeToolCallIds(msgs: ModelMessage[]): ModelMessage[] {
+    return msgs.map((msg) => {
+      if ((msg.role === "assistant" || msg.role === "tool") && Array.isArray(msg.content)) {
+        msg.content = msg.content.map((part) => {
+          if ((part.type === "tool-call" || part.type === "tool-result") && "toolCallId" in part) {
+            return {
+              ...part,
+              toolCallId: part.toolCallId.replace(/[^a-zA-Z0-9_-]/g, "_"),
+            }
+          }
+          return part
+        })
+      }
+      return msg
+    })
+  }

-      const providerOptions = {
-        anthropic: {
-          cacheControl: { type: "ephemeral" },
-        },
-        openrouter: {
-          cache_control: { type: "ephemeral" },
-        },
-        bedrock: {
-          cachePoint: { type: "ephemeral" },
-        },
-        openaiCompatible: {
-          cache_control: { type: "ephemeral" },
-        },
+  function applyCaching(msgs: ModelMessage[], providerID: string): ModelMessage[] {
+    const system = msgs.filter((msg) => msg.role === "system").slice(0, 2)
+    const final = msgs.filter((msg) => msg.role !== "system").slice(-2)
+
+    const providerOptions = {
+      anthropic: {
+        cacheControl: { type: "ephemeral" },
+      },
+      openrouter: {
+        cache_control: { type: "ephemeral" },
+      },
+      bedrock: {
+        cachePoint: { type: "ephemeral" },
+      },
+      openaiCompatible: {
+        cache_control: { type: "ephemeral" },
+      },
+    }
+
+    for (const msg of unique([...system, ...final])) {
+      const shouldUseContentOptions = providerID !== "anthropic" && Array.isArray(msg.content) && msg.content.length > 0
+
+      if (shouldUseContentOptions) {
+        const lastContent = msg.content[msg.content.length - 1]
+        if (lastContent && typeof lastContent === "object") {
+          lastContent.providerOptions = {
+            ...lastContent.providerOptions,
+            ...providerOptions,
+          }
+          continue
+        }
      }

-      for (const msg of unique([...system, ...final])) {
-        const shouldUseContentOptions =
-          providerID !== "anthropic" && Array.isArray(msg.content) && msg.content.length > 0
-
-        if (shouldUseContentOptions) {
-          const lastContent = msg.content[msg.content.length - 1]
-          if (lastContent && typeof lastContent === "object") {
-            lastContent.providerOptions = {
-              ...lastContent.providerOptions,
-              ...providerOptions,
-            }
-            continue
-          }
-        }
-
-        msg.providerOptions = {
-          ...msg.providerOptions,
-          ...providerOptions,
-        }
+      msg.providerOptions = {
+        ...msg.providerOptions,
+        ...providerOptions,
      }
    }
+
+    return msgs
+  }
+
+  export function message(msgs: ModelMessage[], providerID: string, modelID: string) {
+    if (modelID.includes("claude")) {
+      msgs = normalizeToolCallIds(msgs)
+    }
+    if (providerID === "anthropic" || modelID.includes("anthropic") || modelID.includes("claude")) {
+      msgs = applyCaching(msgs, providerID)
+    }
+
    return msgs
  }

@@ -50,4 +76,9 @@ export namespace ProviderTransform {
    if (modelID.toLowerCase().includes("qwen")) return 0.55
    return 0
  }
+
+  export function topP(_providerID: string, modelID: string) {
+    if (modelID.toLowerCase().includes("qwen")) return 1
+    return undefined
+  }
 }
@@ -16,8 +16,10 @@ import { Config } from "../config/config"
 import { File } from "../file"
 import { LSP } from "../lsp"
 import { MessageV2 } from "../session/message-v2"
-import { Mode } from "../session/mode"
 import { callTui, TuiRoute } from "./tui"
+import { Permission } from "../permission"
+import { lazy } from "../util/lazy"
+import { Agent } from "../agent/agent"

 const ERRORS = {
  400: {
@@ -43,7 +45,11 @@ export namespace Server {

  export type Routes = ReturnType<typeof app>

-  function app() {
+  export const Event = {
+    Connected: Bus.event("server.connected", z.object({})),
+  }
+
+  export const app = lazy(() => {
    const app = new Hono()

    const result = app
@@ -90,6 +96,7 @@ export namespace Server {
        "/event",
        describeRoute({
          description: "Get events",
+          operationId: "event.subscribe",
          responses: {
            200: {
              description: "Event stream",
@@ -109,7 +116,10 @@ export namespace Server {
          log.info("event connected")
          return streamSSE(c, async (stream) => {
            stream.writeSSE({
-              data: JSON.stringify({}),
+              data: JSON.stringify({
+                type: "server.connected",
+                properties: {},
+              }),
            })
            const unsub = Bus.subscribeAll(async (event) => {
              await stream.writeSSE({
@@ -130,6 +140,7 @@ export namespace Server {
        "/app",
        describeRoute({
          description: "Get app info",
+          operationId: "app.get",
          responses: {
            200: {
              description: "200",
@@ -149,6 +160,7 @@ export namespace Server {
        "/app/init",
        describeRoute({
          description: "Initialize the app",
+          operationId: "app.init",
          responses: {
            200: {
              description: "Initialize the app",
@@ -169,6 +181,7 @@ export namespace Server {
        "/config",
        describeRoute({
          description: "Get config info",
+          operationId: "config.get",
          responses: {
            200: {
              description: "Get config info",
@@ -188,6 +201,7 @@ export namespace Server {
        "/session",
        describeRoute({
          description: "List all sessions",
+          operationId: "session.list",
          responses: {
            200: {
              description: "List of sessions",
@@ -205,10 +219,39 @@ export namespace Server {
          return c.json(sessions)
        },
      )
+      .get(
+        "/session/:id",
+        describeRoute({
+          description: "Get session",
+          operationId: "session.get",
+          responses: {
+            200: {
+              description: "Get session",
+              content: {
+                "application/json": {
+                  schema: resolver(Session.Info),
+                },
+              },
+            },
+          },
+        }),
+        zValidator(
+          "param",
+          z.object({
+            id: z.string(),
+          }),
+        ),
+        async (c) => {
+          const sessionID = c.req.valid("param").id
+          const session = await Session.get(sessionID)
+          return c.json(session)
+        },
+      )
      .post(
        "/session",
        describeRoute({
          description: "Create a new session",
+          operationId: "session.create",
          responses: {
            ...ERRORS,
            200: {
@@ -230,6 +273,7 @@ export namespace Server {
        "/session/:id",
        describeRoute({
          description: "Delete a session and all its data",
+          operationId: "session.delete",
          responses: {
            200: {
              description: "Successfully deleted session",
@@ -256,6 +300,7 @@ export namespace Server {
        "/session/:id/init",
        describeRoute({
          description: "Analyze the app and create an AGENTS.md file",
+          operationId: "session.init",
          responses: {
            200: {
              description: "200",
@@ -292,6 +337,7 @@ export namespace Server {
        "/session/:id/abort",
        describeRoute({
          description: "Abort a session",
+          operationId: "session.abort",
          responses: {
            200: {
              description: "Aborted session",
@@ -317,6 +363,7 @@ export namespace Server {
        "/session/:id/share",
        describeRoute({
          description: "Share a session",
+          operationId: "session.share",
          responses: {
            200: {
              description: "Successfully shared session",
@@ -345,6 +392,7 @@ export namespace Server {
        "/session/:id/share",
        describeRoute({
          description: "Unshare the session",
+          operationId: "session.unshare",
          responses: {
            200: {
              description: "Successfully unshared session",
@@ -373,6 +421,7 @@ export namespace Server {
        "/session/:id/summarize",
        describeRoute({
          description: "Summarize the session",
+          operationId: "session.summarize",
          responses: {
            200: {
              description: "Summarized session",
@@ -408,6 +457,7 @@ export namespace Server {
        "/session/:id/message",
        describeRoute({
          description: "List messages for a session",
+          operationId: "session.messages",
          responses: {
            200: {
              description: "List of messages",
@@ -437,10 +487,45 @@ export namespace Server {
          return c.json(messages)
        },
      )
+      .get(
+        "/session/:id/message/:messageID",
+        describeRoute({
+          description: "Get a message from a session",
+          operationId: "session.message",
+          responses: {
+            200: {
+              description: "Message",
+              content: {
+                "application/json": {
+                  schema: resolver(
+                    z.object({
+                      info: MessageV2.Info,
+                      parts: MessageV2.Part.array(),
+                    }),
+                  ),
+                },
+              },
+            },
+          },
+        }),
+        zValidator(
+          "param",
+          z.object({
+            id: z.string().openapi({ description: "Session ID" }),
+            messageID: z.string().openapi({ description: "Message ID" }),
+          }),
+        ),
+        async (c) => {
+          const params = c.req.valid("param")
+          const message = await Session.getMessage(params.id, params.messageID)
+          return c.json(message)
+        },
+      )
      .post(
        "/session/:id/message",
        describeRoute({
          description: "Create and send a new message to a session",
+          operationId: "session.chat",
          responses: {
            200: {
              description: "Created message",
@@ -470,6 +555,7 @@ export namespace Server {
        "/session/:id/revert",
        describeRoute({
          description: "Revert a message",
+          operationId: "session.revert",
          responses: {
            200: {
              description: "Updated session",
@@ -499,6 +585,7 @@ export namespace Server {
        "/session/:id/unrevert",
        describeRoute({
          description: "Restore all reverted messages",
+          operationId: "session.unrevert",
          responses: {
            200: {
              description: "Updated session",
@@ -522,10 +609,42 @@ export namespace Server {
          return c.json(session)
        },
      )
+      .post(
+        "/session/:id/permissions/:permissionID",
+        describeRoute({
+          description: "Respond to a permission request",
+          responses: {
+            200: {
+              description: "Permission processed successfully",
+              content: {
+                "application/json": {
+                  schema: resolver(z.boolean()),
+                },
+              },
+            },
+          },
+        }),
+        zValidator(
+          "param",
+          z.object({
+            id: z.string(),
+            permissionID: z.string(),
+          }),
+        ),
+        zValidator("json", z.object({ response: Permission.Response })),
+        async (c) => {
+          const params = c.req.valid("param")
+          const id = params.id
+          const permissionID = params.permissionID
+          Permission.respond({ sessionID: id, permissionID, response: c.req.valid("json").response })
+          return c.json(true)
+        },
+      )
      .get(
        "/config/providers",
        describeRoute({
          description: "List all providers",
+          operationId: "config.providers",
          responses: {
            200: {
              description: "List of providers",
@@ -554,6 +673,7 @@ export namespace Server {
        "/find",
        describeRoute({
          description: "Find text in files",
+          operationId: "find.text",
          responses: {
            200: {
              description: "Matches",
@@ -586,6 +706,7 @@ export namespace Server {
        "/find/file",
        describeRoute({
          description: "Find files",
+          operationId: "find.files",
          responses: {
            200: {
              description: "File paths",
@@ -618,6 +739,7 @@ export namespace Server {
        "/find/symbol",
        describeRoute({
          description: "Find workspace symbols",
+          operationId: "find.symbols",
          responses: {
            200: {
              description: "Symbols",
@@ -645,6 +767,7 @@ export namespace Server {
        "/file",
        describeRoute({
          description: "Read a file",
+          operationId: "file.read",
          responses: {
            200: {
              description: "File content",
@@ -681,6 +804,7 @@ export namespace Server {
        "/file/status",
        describeRoute({
          description: "Get file status",
+          operationId: "file.status",
          responses: {
            200: {
              description: "File status",
@@ -701,6 +825,7 @@ export namespace Server {
        "/log",
        describeRoute({
          description: "Write a log entry to the server logs",
+          operationId: "app.log",
          responses: {
            200: {
              description: "Log entry written successfully",
@@ -747,22 +872,23 @@ export namespace Server {
        },
      )
      .get(
-        "/mode",
+        "/agent",
        describeRoute({
-          description: "List all modes",
+          description: "List all agents",
+          operationId: "app.agents",
          responses: {
            200: {
-              description: "List of modes",
+              description: "List of agents",
              content: {
                "application/json": {
-                  schema: resolver(Mode.Info.array()),
+                  schema: resolver(Agent.Info.array()),
                },
              },
            },
          },
        }),
        async (c) => {
-          const modes = await Mode.list()
+          const modes = await Agent.list()
          return c.json(modes)
        },
      )
@@ -770,6 +896,7 @@ export namespace Server {
        "/tui/append-prompt",
        describeRoute({
          description: "Append prompt to the TUI",
+          operationId: "tui.appendPrompt",
          responses: {
            200: {
              description: "Prompt processed successfully",
@@ -793,6 +920,7 @@ export namespace Server {
        "/tui/open-help",
        describeRoute({
          description: "Open the help dialog",
+          operationId: "tui.openHelp",
          responses: {
            200: {
              description: "Help dialog opened successfully",
@@ -806,10 +934,124 @@ export namespace Server {
        }),
        async (c) => c.json(await callTui(c)),
      )
+      .post(
+        "/tui/open-sessions",
+        describeRoute({
+          description: "Open the session dialog",
+          operationId: "tui.openSessions",
+          responses: {
+            200: {
+              description: "Session dialog opened successfully",
+              content: {
+                "application/json": {
+                  schema: resolver(z.boolean()),
+                },
+              },
+            },
+          },
+        }),
+        async (c) => c.json(await callTui(c)),
+      )
+      .post(
+        "/tui/open-themes",
+        describeRoute({
+          description: "Open the theme dialog",
+          operationId: "tui.openThemes",
+          responses: {
+            200: {
+              description: "Theme dialog opened successfully",
+              content: {
+                "application/json": {
+                  schema: resolver(z.boolean()),
+                },
+              },
+            },
+          },
+        }),
+        async (c) => c.json(await callTui(c)),
+      )
+      .post(
+        "/tui/open-models",
+        describeRoute({
+          description: "Open the model dialog",
+          operationId: "tui.openModels",
+          responses: {
+            200: {
+              description: "Model dialog opened successfully",
+              content: {
+                "application/json": {
+                  schema: resolver(z.boolean()),
+                },
+              },
+            },
+          },
+        }),
+        async (c) => c.json(await callTui(c)),
+      )
+      .post(
+        "/tui/submit-prompt",
+        describeRoute({
+          description: "Submit the prompt",
+          operationId: "tui.submitPrompt",
+          responses: {
+            200: {
+              description: "Prompt submitted successfully",
+              content: {
+                "application/json": {
+                  schema: resolver(z.boolean()),
+                },
+              },
+            },
+          },
+        }),
+        async (c) => c.json(await callTui(c)),
+      )
+      .post(
+        "/tui/clear-prompt",
+        describeRoute({
+          description: "Clear the prompt",
+          operationId: "tui.clearPrompt",
+          responses: {
+            200: {
+              description: "Prompt cleared successfully",
+              content: {
+                "application/json": {
+                  schema: resolver(z.boolean()),
+                },
+              },
+            },
+          },
+        }),
+        async (c) => c.json(await callTui(c)),
+      )
+      .post(
+        "/tui/execute-command",
+        describeRoute({
+          description: "Execute a TUI command (e.g. switch_agent)",
+          operationId: "tui.executeCommand",
+          responses: {
+            200: {
+              description: "Command executed successfully",
+              content: {
+                "application/json": {
+                  schema: resolver(z.boolean()),
+                },
+              },
+            },
+          },
+        }),
+        zValidator(
+          "json",
+          z.object({
+            command: z.string(),
+          }),
+        ),
+        async (c) => c.json(await callTui(c)),
+      )
      .route("/tui/control", TuiRoute)

    return result
-  }
+  })

  export async function openapi() {
    const a = app()
@@ -36,17 +36,29 @@ import { NamedError } from "../util/error"
 import { SystemPrompt } from "./system"
 import { FileTime } from "../file/time"
 import { MessageV2 } from "./message-v2"
-import { Mode } from "./mode"
 import { LSP } from "../lsp"
 import { ReadTool } from "../tool/read"
 import { mergeDeep, pipe, splitWhen } from "remeda"
 import { ToolRegistry } from "../tool/registry"
+import { Plugin } from "../plugin"
+import { Agent } from "../agent/agent"

 export namespace Session {
  const log = Log.create({ service: "session" })

  const OUTPUT_TOKEN_MAX = 32_000

+  const parentSessionTitlePrefix = "New session - "
+  const childSessionTitlePrefix = "Child session - "
+
+  function createDefaultTitle(isChild = false) {
+    return (isChild ? childSessionTitlePrefix : parentSessionTitlePrefix) + new Date().toISOString()
+  }
+
+  function isDefaultTitle(title: string) {
+    return title.startsWith(parentSessionTitlePrefix)
+  }
+
  export const Info = z
    .object({
      id: Identifier.schema("session"),
@@ -67,6 +79,7 @@ export namespace Session {
          messageID: z.string(),
          partID: z.string().optional(),
          snapshot: z.string().optional(),
+          diff: z.string().optional(),
        })
        .optional(),
    })
@@ -119,6 +132,7 @@ export namespace Session {
      const sessions = new Map<string, Info>()
      const messages = new Map<string, MessageV2.Info[]>()
      const pending = new Map<string, AbortController>()
+      const autoCompacting = new Map<string, boolean>()
      const queued = new Map<
        string,
        {
@@ -134,6 +148,7 @@ export namespace Session {
        sessions,
        messages,
        pending,
+        autoCompacting,
        queued,
      }
    },
@@ -149,7 +164,7 @@ export namespace Session {
      id: Identifier.descending("session"),
      version: Installation.VERSION,
      parentID,
-      title: (parentID ? "Child session - " : "New Session - ") + new Date().toISOString(),
+      title: createDefaultTitle(!!parentID),
      time: {
        created: Date.now(),
        updated: Date.now(),
@@ -255,7 +270,10 @@ export namespace Session {
  }

  export async function getMessage(sessionID: string, messageID: string) {
-    return Storage.readJSON<MessageV2.Info>("session/message/" + sessionID + "/" + messageID)
+    return {
+      info: await Storage.readJSON<MessageV2.Info>("session/message/" + sessionID + "/" + messageID),
+      parts: await getParts(sessionID, messageID),
+    }
  }

  export async function getParts(sessionID: string, messageID: string) {
@@ -289,6 +307,9 @@ export namespace Session {
  export function abort(sessionID: string) {
    const controller = state().pending.get(sessionID)
    if (!controller) return false
+    log.info("aborting", {
+      sessionID,
+    })
    controller.abort()
    state().pending.delete(sessionID)
    return true
@@ -336,7 +357,7 @@ export namespace Session {
    messageID: Identifier.schema("message").optional(),
    providerID: z.string(),
    modelID: z.string(),
-    mode: z.string().optional(),
+    agent: z.string().optional(),
    system: z.string().optional(),
    tools: z.record(z.boolean()).optional(),
    parts: z.array(
@@ -361,6 +382,16 @@ export namespace Session {
          .openapi({
            ref: "FilePartInput",
          }),
+        MessageV2.AgentPart.omit({
+          messageID: true,
+          sessionID: true,
+        })
+          .partial({
+            id: true,
+          })
+          .openapi({
+            ref: "AgentPartInput",
+          }),
      ]),
    ),
  })
@@ -372,7 +403,37 @@ export namespace Session {
    const l = log.clone().tag("session", input.sessionID)
    l.info("chatting")

-    const inputMode = input.mode ?? "build"
+    const inputAgent = input.agent ?? "build"
+
+    // Process revert cleanup first, before creating new messages
+    const session = await get(input.sessionID)
+    if (session.revert) {
+      let msgs = await messages(input.sessionID)
+      const messageID = session.revert.messageID
+      const [preserve, remove] = splitWhen(msgs, (x) => x.info.id === messageID)
+      msgs = preserve
+      for (const msg of remove) {
+        await Storage.remove(`session/message/${input.sessionID}/${msg.info.id}`)
+        await Bus.publish(MessageV2.Event.Removed, { sessionID: input.sessionID, messageID: msg.info.id })
+      }
+      const last = preserve.at(-1)
+      if (session.revert.partID && last) {
+        const partID = session.revert.partID
+        const [preserveParts, removeParts] = splitWhen(last.parts, (x) => x.id === partID)
+        last.parts = preserveParts
+        for (const part of removeParts) {
+          await Storage.remove(`session/part/${input.sessionID}/${last.info.id}/${part.id}`)
+          await Bus.publish(MessageV2.Event.PartRemoved, {
+            sessionID: input.sessionID,
+            messageID: last.info.id,
+            partID: part.id,
+          })
+        }
+      }
+      await update(input.sessionID, (draft) => {
+        draft.revert = undefined
+      })
+    }
    const userMsg: MessageV2.Info = {
      id: input.messageID ?? Identifier.ascending("message"),
      role: "user",
@@ -419,9 +480,7 @@ export namespace Session {
            case "file:":
              // have to normalize, symbol search returns absolute paths
              // Decode the pathname since URL constructor doesn't automatically decode it
-              const pathname = decodeURIComponent(url.pathname)
-              const relativePath = pathname.replace(app.path.cwd, ".")
-              const filePath = path.join(app.path.cwd, relativePath)
+              const filePath = decodeURIComponent(url.pathname)

              if (part.mime === "text/plain") {
                let offset: number | undefined = undefined
@@ -501,7 +560,7 @@ export namespace Session {
                  messageID: userMsg.id,
                  sessionID: input.sessionID,
                  type: "text",
-                  text: `Called the Read tool with the following input: {\"filePath\":\"${pathname}\"}`,
+                  text: `Called the Read tool with the following input: {\"filePath\":\"${filePath}\"}`,
                  synthetic: true,
                },
                {
@@ -517,6 +576,28 @@ export namespace Session {
              ]
          }
        }
+
+        if (part.type === "agent") {
+          return [
+            {
+              id: Identifier.ascending("part"),
+              ...part,
+              messageID: userMsg.id,
+              sessionID: input.sessionID,
+            },
+            {
+              id: Identifier.ascending("part"),
+              messageID: userMsg.id,
+              sessionID: input.sessionID,
+              type: "text",
+              synthetic: true,
+              text:
+                "Use the above message and context to generate a prompt and call the task tool with subagent: " +
+                part.name,
+            },
+          ]
+        }
+
        return [
          {
            id: Identifier.ascending("part"),
@@ -527,7 +608,7 @@ export namespace Session {
        ]
      }),
    ).then((x) => x.flat())
-    if (inputMode === "plan")
+    if (inputAgent === "plan")
      userParts.push({
        id: Identifier.ascending("part"),
        messageID: userMsg.id,
@@ -536,12 +617,21 @@ export namespace Session {
        text: PROMPT_PLAN,
        synthetic: true,
      })
-
+    await Plugin.trigger(
+      "chat.message",
+      {},
+      {
+        message: userMsg,
+        parts: userParts,
+      },
+    )
    await updateMessage(userMsg)
    for (const part of userParts) {
      await updatePart(part)
    }
-    // mark session as updated since a message has been added to it
+
+    // mark session as updated
+    // used for session list sorting (indicates when session was most recently interacted with)
    await update(input.sessionID, (_draft) => {})

    if (isLocked(input.sessionID)) {
@@ -560,30 +650,6 @@ export namespace Session {

    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 messageID = session.revert.messageID
-      const [preserve, remove] = splitWhen(msgs, (x) => x.info.id === messageID)
-      msgs = preserve
-      for (const msg of remove) {
-        await Storage.remove(`session/message/${input.sessionID}/${msg.info.id}`)
-        await Bus.publish(MessageV2.Event.Removed, { sessionID: input.sessionID, messageID: msg.info.id })
-      }
-      const last = preserve.at(-1)
-      if (session.revert.partID && last) {
-        const partID = session.revert.partID
-        const [preserveParts, removeParts] = splitWhen(last.parts, (x) => x.id === partID)
-        last.parts = preserveParts
-        for (const part of removeParts) {
-          await Storage.remove(`session/part/${input.sessionID}/${last.info.id}/${part.id}`)
-          await Bus.publish(MessageV2.Event.PartRemoved, {
-            messageID: last.info.id,
-            partID: part.id,
-          })
-        }
-      }
-    }

    const previous = msgs.filter((x) => x.info.role === "assistant").at(-1)?.info as MessageV2.Assistant
    const outputLimit = Math.min(model.info.limit.output, OUTPUT_TOKEN_MAX) || OUTPUT_TOKEN_MAX
@@ -593,6 +659,8 @@ export namespace Session {
      const tokens =
        previous.tokens.input + previous.tokens.cache.read + previous.tokens.cache.write + previous.tokens.output
      if (model.info.limit.context && tokens > Math.max((model.info.limit.context - outputLimit) * 0.9, 0)) {
+        state().autoCompacting.set(input.sessionID, true)
+
        await summarize({
          sessionID: input.sessionID,
          providerID: input.providerID,
@@ -601,13 +669,12 @@ export namespace Session {
        return chat(input)
      }
    }
-
    using abort = lock(input.sessionID)

    const lastSummary = msgs.findLast((msg) => msg.info.role === "assistant" && msg.info.summary === true)
    if (lastSummary) msgs = msgs.filter((msg) => msg.info.id >= lastSummary.info.id)

-    if (msgs.length === 1 && !session.parentID) {
+    if (msgs.length === 1 && !session.parentID && isDefaultTitle(session.title)) {
      const small = (await Provider.getSmallModel(input.providerID)) ?? model
      generateText({
        maxOutputTokens: small.info.reasoning ? 1024 : 20,
@@ -640,18 +707,20 @@ export namespace Session {
        .then((result) => {
          if (result.text)
            return Session.update(input.sessionID, (draft) => {
-              draft.title = result.text
+              const cleaned = result.text.replace(/<think>[\s\S]*?<\/think>\s*/g, "")
+              const title = cleaned.length > 100 ? cleaned.substring(0, 97) + "..." : cleaned
+              draft.title = title.trim()
            })
        })
        .catch(() => {})
    }

-    const mode = await Mode.get(inputMode)
+    const agent = await Agent.get(inputAgent)
    let system = SystemPrompt.header(input.providerID)
    system.push(
      ...(() => {
        if (input.system) return [input.system]
-        if (mode.prompt) return [mode.prompt]
+        if (agent.prompt) return [agent.prompt]
        return SystemPrompt.provider(input.modelID)
      })(),
    )
@@ -665,7 +734,7 @@ export namespace Session {
      id: Identifier.ascending("message"),
      role: "assistant",
      system,
-      mode: inputMode,
+      mode: inputAgent,
      path: {
        cwd: app.path.cwd,
        root: app.path.root,
@@ -690,8 +759,8 @@ export namespace Session {
    const processor = createProcessor(assistantMsg, model.info)

    const enabledTools = pipe(
-      mode.tools,
-      mergeDeep(ToolRegistry.enabled(input.providerID, input.modelID)),
+      agent.tools,
+      mergeDeep(await ToolRegistry.enabled(input.providerID, input.modelID)),
      mergeDeep(input.tools ?? {}),
    )
    for (const item of await ToolRegistry.tools(input.providerID, input.modelID)) {
@@ -701,11 +770,22 @@ export namespace Session {
        description: item.description,
        inputSchema: item.parameters as ZodSchema,
        async execute(args, options) {
-          await processor.track(options.toolCallId)
+          await Plugin.trigger(
+            "tool.execute.before",
+            {
+              tool: item.id,
+              sessionID: input.sessionID,
+              callID: options.toolCallId,
+            },
+            {
+              args,
+            },
+          )
          const result = await item.execute(args, {
            sessionID: input.sessionID,
-            abort: abort.signal,
+            abort: options.abortSignal!,
            messageID: assistantMsg.id,
+            callID: options.toolCallId,
            metadata: async (val) => {
              const match = processor.partFromToolCall(options.toolCallId)
              if (match && match.state.status === "running") {
@@ -724,6 +804,15 @@ export namespace Session {
              }
            },
          })
+          await Plugin.trigger(
+            "tool.execute.after",
+            {
+              tool: item.id,
+              sessionID: input.sessionID,
+              callID: options.toolCallId,
+            },
+            result,
+          )
          return result
        },
        toModelOutput(result) {
@@ -736,11 +825,10 @@ export namespace Session {
    }

    for (const [key, item] of Object.entries(await MCP.tools())) {
-      if (mode.tools[key] === false) continue
+      if (enabledTools[key] === false) continue
      const execute = item.execute
      if (!execute) continue
      item.execute = async (args, opts) => {
-        await processor.track(opts.toolCallId)
        const result = await execute(args, opts)
        const output = result.content
          .filter((x: any) => x.type === "text")
@@ -760,8 +848,27 @@ export namespace Session {
      tools[key] = item
    }

+    const params = {
+      temperature: model.info.temperature
+        ? (agent.temperature ?? ProviderTransform.temperature(input.providerID, input.modelID))
+        : undefined,
+      topP: agent.topP ?? ProviderTransform.topP(input.providerID, input.modelID),
+    }
+    await Plugin.trigger(
+      "chat.params",
+      {
+        model: model.info,
+        provider: await Provider.getProvider(input.providerID),
+        message: userMsg,
+      },
+      params,
+    )
    const stream = streamText({
-      onError() {},
+      onError(e) {
+        log.error("streamText error", {
+          error: e,
+        })
+      },
      async prepareStep({ messages }) {
        const queue = (state().queued.get(input.sessionID) ?? []).filter((x) => !x.processed)
        if (queue.length) {
@@ -796,7 +903,7 @@ export namespace Session {
            },
            modelID: input.modelID,
            providerID: input.providerID,
-            mode: inputMode,
+            mode: inputAgent,
            time: {
              created: Date.now(),
            },
@@ -808,13 +915,26 @@ export namespace Session {
          messages,
        }
      },
-      maxRetries: 10,
+      async experimental_repairToolCall(input) {
+        return {
+          ...input.toolCall,
+          input: JSON.stringify({
+            tool: input.toolCall.toolName,
+            error: input.error.message,
+          }),
+          toolName: "invalid",
+        }
+      },
+      maxRetries: 3,
+      activeTools: Object.keys(tools).filter((x) => x !== "invalid"),
      maxOutputTokens: outputLimit,
      abortSignal: abort.signal,
      stopWhen: stepCountIs(1000),
      providerOptions: {
        [input.providerID]: model.info.options,
      },
+      temperature: params.temperature,
+      topP: params.topP,
      messages: [
        ...system.map(
          (x): ModelMessage => ({
@@ -824,9 +944,6 @@ export namespace Session {
        ),
        ...MessageV2.toModelMessage(msgs),
      ],
-      temperature: model.info.temperature
-        ? (mode.temperature ?? ProviderTransform.temperature(input.providerID, input.modelID))
-        : undefined,
      tools: model.info.tool_call === false ? undefined : tools,
      model: wrapLanguageModel({
        model: model.language,
@@ -858,15 +975,11 @@ export namespace Session {
  }

  function createProcessor(assistantMsg: MessageV2.Assistant, model: ModelsDev.Model) {
-    const toolCalls: Record<string, MessageV2.ToolPart> = {}
-    const snapshots: Record<string, string> = {}
+    const toolcalls: Record<string, MessageV2.ToolPart> = {}
+    let snapshot: string | undefined
    return {
-      async track(toolCallID: string) {
-        const hash = await Snapshot.track()
-        if (hash) snapshots[toolCallID] = hash
-      },
      partFromToolCall(toolCallID: string) {
-        return toolCalls[toolCallID]
+        return toolcalls[toolCallID]
      },
      async process(stream: StreamTextResult<Record<string, AITool>, never>) {
        try {
@@ -882,7 +995,7 @@ export namespace Session {

              case "tool-input-start":
                const part = await updatePart({
-                  id: Identifier.ascending("part"),
+                  id: toolcalls[value.id]?.id ?? Identifier.ascending("part"),
                  messageID: assistantMsg.id,
                  sessionID: assistantMsg.sessionID,
                  type: "tool",
@@ -892,7 +1005,7 @@ export namespace Session {
                    status: "pending",
                  },
                })
-                toolCalls[value.id] = part as MessageV2.ToolPart
+                toolcalls[value.id] = part as MessageV2.ToolPart
                break

              case "tool-input-delta":
@@ -902,10 +1015,11 @@ export namespace Session {
                break

              case "tool-call": {
-                const match = toolCalls[value.toolCallId]
+                const match = toolcalls[value.toolCallId]
                if (match) {
                  const part = await updatePart({
                    ...match,
+                    tool: value.toolName,
                    state: {
                      status: "running",
                      input: value.input,
@@ -914,12 +1028,12 @@ export namespace Session {
                      },
                    },
                  })
-                  toolCalls[value.toolCallId] = part as MessageV2.ToolPart
+                  toolcalls[value.toolCallId] = part as MessageV2.ToolPart
                }
                break
              }
              case "tool-result": {
-                const match = toolCalls[value.toolCallId]
+                const match = toolcalls[value.toolCallId]
                if (match && match.state.status === "running") {
                  await updatePart({
                    ...match,
@@ -935,27 +1049,13 @@ export namespace Session {
                      },
                    },
                  })
-                  delete toolCalls[value.toolCallId]
-                  const snapshot = snapshots[value.toolCallId]
-                  if (snapshot) {
-                    const patch = await Snapshot.patch(snapshot)
-                    if (patch.files.length) {
-                      await updatePart({
-                        id: Identifier.ascending("part"),
-                        messageID: assistantMsg.id,
-                        sessionID: assistantMsg.sessionID,
-                        type: "patch",
-                        hash: patch.hash,
-                        files: patch.files,
-                      })
-                    }
-                  }
+                  delete toolcalls[value.toolCallId]
                }
                break
              }

              case "tool-error": {
-                const match = toolCalls[value.toolCallId]
+                const match = toolcalls[value.toolCallId]
                if (match && match.state.status === "running") {
                  await updatePart({
                    ...match,
@@ -969,19 +1069,7 @@ export namespace Session {
                      },
                    },
                  })
-                  delete toolCalls[value.toolCallId]
-                  const snapshot = snapshots[value.toolCallId]
-                  if (snapshot) {
-                    const patch = await Snapshot.patch(snapshot)
-                    await updatePart({
-                      id: Identifier.ascending("part"),
-                      messageID: assistantMsg.id,
-                      sessionID: assistantMsg.sessionID,
-                      type: "patch",
-                      hash: patch.hash,
-                      files: patch.files,
-                    })
-                  }
+                  delete toolcalls[value.toolCallId]
                }
                break
              }
@@ -996,6 +1084,7 @@ export namespace Session {
                  sessionID: assistantMsg.sessionID,
                  type: "step-start",
                })
+                snapshot = await Snapshot.track()
                break

              case "finish-step":
@@ -1011,6 +1100,20 @@ export namespace Session {
                  cost: usage.cost,
                })
                await updateMessage(assistantMsg)
+                if (snapshot) {
+                  const patch = await Snapshot.patch(snapshot)
+                  if (patch.files.length) {
+                    await updatePart({
+                      id: Identifier.ascending("part"),
+                      messageID: assistantMsg.id,
+                      sessionID: assistantMsg.sessionID,
+                      type: "patch",
+                      hash: patch.hash,
+                      files: patch.files,
+                    })
+                  }
+                  snapshot = undefined
+                }
                break

              case "text-start":
@@ -1026,20 +1129,20 @@ export namespace Session {
                }
                break

-              case "text":
+              case "text-delta":
                if (currentText) {
                  currentText.text += value.text
-                  await updatePart(currentText)
+                  if (currentText.text) await updatePart(currentText)
                }
                break

              case "text-end":
-                if (currentText && currentText.text) {
+                if (currentText) {
+                  currentText.text = currentText.text.trimEnd()
                  currentText.time = {
                    start: Date.now(),
                    end: Date.now(),
                  }
-                  currentText.text = currentText.text.trimEnd()
                  await updatePart(currentText)
                }
                currentText = undefined
@@ -1095,7 +1198,7 @@ export namespace Session {
        }
        const p = await getParts(assistantMsg.sessionID, assistantMsg.id)
        for (const part of p) {
-          if (part.type === "tool" && part.state.status !== "completed") {
+          if (part.type === "tool" && part.state.status !== "completed" && part.state.status !== "error") {
            updatePart({
              ...part,
              state: {
@@ -1160,6 +1263,7 @@ export namespace Session {
      const session = await get(input.sessionID)
      revert.snapshot = session.revert?.snapshot ?? (await Snapshot.track())
      await Snapshot.revert(patches)
+      if (revert.snapshot) revert.diff = await Snapshot.diff(revert.snapshot)
      return update(input.sessionID, (draft) => {
        draft.revert = revert
      })
@@ -1257,9 +1361,19 @@ export namespace Session {
    state().pending.set(sessionID, controller)
    return {
      signal: controller.signal,
-      [Symbol.dispose]() {
+      async [Symbol.dispose]() {
        log.info("unlocking", { sessionID })
        state().pending.delete(sessionID)
+
+        const isAutoCompacting = state().autoCompacting.get(sessionID) ?? false
+        if (isAutoCompacting) {
+          state().autoCompacting.delete(sessionID)
+          return
+        }
+
+        const session = await get(sessionID)
+        if (session.parentID) return
+
        Bus.publish(Event.Idle, {
          sessionID,
        })
@@ -1282,10 +1396,10 @@ export namespace Session {
    }
    return {
      cost: new Decimal(0)
-        .add(new Decimal(tokens.input).mul(model.cost.input).div(1_000_000))
-        .add(new Decimal(tokens.output).mul(model.cost.output).div(1_000_000))
-        .add(new Decimal(tokens.cache.read).mul(model.cost.cache_read ?? 0).div(1_000_000))
-        .add(new Decimal(tokens.cache.write).mul(model.cost.cache_write ?? 0).div(1_000_000))
+        .add(new Decimal(tokens.input).mul(model.cost?.input ?? 0).div(1_000_000))
+        .add(new Decimal(tokens.output).mul(model.cost?.output ?? 0).div(1_000_000))
+        .add(new Decimal(tokens.cache.read).mul(model.cost?.cache_read ?? 0).div(1_000_000))
+        .add(new Decimal(tokens.cache.write).mul(model.cost?.cache_write ?? 0).div(1_000_000))
        .toNumber(),
      tokens,
    }
@@ -172,6 +172,21 @@ export namespace MessageV2 {
  })
  export type FilePart = z.infer<typeof FilePart>

+  export const AgentPart = PartBase.extend({
+    type: z.literal("agent"),
+    name: z.string(),
+    source: z
+      .object({
+        value: z.string(),
+        start: z.number().int(),
+        end: z.number().int(),
+      })
+      .optional(),
+  }).openapi({
+    ref: "AgentPart",
+  })
+  export type AgentPart = z.infer<typeof AgentPart>
+
  export const StepStartPart = PartBase.extend({
    type: z.literal("step-start"),
  }).openapi({
@@ -212,7 +227,16 @@ export namespace MessageV2 {
  export type User = z.infer<typeof User>

  export const Part = z
-    .discriminatedUnion("type", [TextPart, FilePart, ToolPart, StepStartPart, StepFinishPart, SnapshotPart, PatchPart])
+    .discriminatedUnion("type", [
+      TextPart,
+      FilePart,
+      ToolPart,
+      StepStartPart,
+      StepFinishPart,
+      SnapshotPart,
+      PatchPart,
+      AgentPart,
+    ])
    .openapi({
      ref: "Part",
    })
@@ -284,6 +308,7 @@ export namespace MessageV2 {
    PartRemoved: Bus.event(
      "message.part.removed",
      z.object({
+        sessionID: z.string(),
        messageID: z.string(),
        partID: z.string(),
      }),
@@ -1,72 +0,0 @@
-import { App } from "../app/app"
-import { Config } from "../config/config"
-import z from "zod"
-import { Provider } from "../provider/provider"
-
-export namespace Mode {
-  export const Info = z
-    .object({
-      name: z.string(),
-      temperature: z.number().optional(),
-      model: z
-        .object({
-          modelID: z.string(),
-          providerID: z.string(),
-        })
-        .optional(),
-      prompt: z.string().optional(),
-      tools: z.record(z.boolean()),
-    })
-    .openapi({
-      ref: "Mode",
-    })
-  export type Info = z.infer<typeof Info>
-  const state = App.state("mode", async () => {
-    const cfg = await Config.get()
-    const model = cfg.model ? Provider.parseModel(cfg.model) : undefined
-    const result: Record<string, Info> = {
-      build: {
-        model,
-        name: "build",
-        tools: {},
-      },
-      plan: {
-        name: "plan",
-        model,
-        tools: {
-          write: false,
-          edit: false,
-          patch: false,
-        },
-      },
-    }
-    for (const [key, value] of Object.entries(cfg.mode ?? {})) {
-      if (value.disable) continue
-      let item = result[key]
-      if (!item)
-        item = result[key] = {
-          name: key,
-          tools: {},
-        }
-      item.name = key
-      if (value.model) item.model = Provider.parseModel(value.model)
-      if (value.prompt) item.prompt = value.prompt
-      if (value.temperature) item.temperature = value.temperature
-      if (value.tools)
-        item.tools = {
-          ...value.tools,
-          ...item.tools,
-        }
-    }
-
-    return result
-  })
-
-  export async function get(mode: string) {
-    return state().then((x) => x[mode])
-  }
-
-  export async function list() {
-    return state().then((x) => Object.values(x))
-  }
-}
@@ -1,4 +1,4 @@
-You are opencode, an autonomous agent - please keep going until the user's query is completely resolved, before ending your turn and yielding back to the user.
+You are opencode, an agent - please keep going until the user’s query is completely resolved, before ending your turn and yielding back to the user.

 Your thinking should be thorough and so it's fine if it's very long. However, avoid unnecessary repetition and verbosity. You should be concise, but thorough.

@@ -6,25 +6,26 @@ You MUST iterate and keep going until the problem is solved.

 You have everything you need to resolve this problem. I want you to fully solve this autonomously before coming back to me.

-Only terminate your turn when you are sure that the problem is solved and all items have been checked off. Use the TodoWrite and TodoRead tools to track and manage steps. Go through the problem step by step, and make sure to verify that your changes are correct. Once each step is finished mark it as completed with the TodoWrite tool. NEVER end your turn without having truly and completely solved the problem, use the TodoRead tool to make sure all steps are complete, and when you say you are going to make a tool call, make sure you ACTUALLY make the tool call, instead of ending your turn. If a step is impossible to complete, mark it as cancelled using the TodoWrite tool.
+Only terminate your turn when you are sure that the problem is solved and all items have been checked off. Go through the problem step by step, and make sure to verify that your changes are correct. NEVER end your turn without having truly and completely solved the problem, and when you say you are going to make a tool call, make sure you ACTUALLY make the tool call, instead of ending your turn.

 THE PROBLEM CAN NOT BE SOLVED WITHOUT EXTENSIVE INTERNET RESEARCH.

-You must use the webfetch tool to recursively gather all information from URLs provided to you by the user, as well as any links you find in the content of those pages.
+You must use the webfetch tool to recursively gather all information from URL's provided to  you by the user, as well as any links you find in the content of those pages.

-Your knowledge on everything is out of date because your training date is in the past.
+Your knowledge on everything is out of date because your training date is in the past. 

-You CANNOT successfully complete this task without using Bing to verify your understanding of third party packages and dependencies is up to date. You must use the webfetch tool to search bing for how to properly use libraries, packages, frameworks, dependencies, etc. every single time you install or implement one. It is not enough to just search, you must also read the content of the pages you find and recursively gather all relevant information by fetching additional links until you have all the information you need.
+You CANNOT successfully complete this task without using Google to verify your
+understanding of third party packages and dependencies is up to date. You must use the webfetch tool to search google for how to properly use libraries, packages, frameworks, dependencies, etc. every single time you install or implement one. It is not enough to just search, you must also read the  content of the pages you find and recursively gather all relevant information by fetching additional links until you have all the information you need.

-If the user request is "resume" or "continue" or "try again",use the TodoRead tool to find the next pending step. Continue from that step, and do not hand back control to the user until the entire todo list is complete and all steps are marked as complete or cancelled. Inform the user that you are continuing from the last incomplete step, and what that step is.
+Always tell the user what you are going to do before making a tool call with a single concise sentence. This will help them understand what you are doing and why.

-Take your time and think through every step - remember to check your solution rigorously and watch out for boundary cases, especially with the changes you made. Use the sequential thinking tool if available. Your solution must be perfect. If not, continue working on it. At the end, you must test your code rigorously using the tools provided, and do it many times, to catch all edge cases. If it is not robust, update the plan and iterate more and make it perfect. Failing to test your code sufficiently rigorously is the NUMBER ONE failure mode on these types of tasks; run the build, and verify that the changes you made actually build; make sure you handle all edge cases, and run existing tests if they are provided.
+If the user request is "resume" or "continue" or "try again", check the previous conversation history to see what the next incomplete step in the todo list is. Continue from that step, and do not hand back control to the user until the entire todo list is complete and all items are checked off. Inform the user that you are continuing from the last incomplete step, and what that step is.

-You MUST plan extensively before each tool call, and reflect extensively on the outcomes of the previous tool calls. DO NOT do this entire process by making tool calls only, as this can impair your ability to solve the problem and think insightfully.
+Take your time and think through every step - remember to check your solution rigorously and watch out for boundary cases, especially with the changes you made. Use the sequential thinking tool if available. Your solution must be perfect. If not, continue working on it. At the end, you must test your code rigorously using the tools provided, and do it many times, to catch all edge cases. If it is not robust, iterate more and make it perfect. Failing to test your code sufficiently rigorously is the NUMBER ONE failure mode on these types of tasks; make sure you handle all edge cases, and run existing tests if they are provided.

-You MUST keep working until the problem is completely solved, and all steps in the todo list are complete. Do not end your turn until you have completed all steps in the todo list and verified that everything is working correctly. When you say "Next I will do X" or "Now I will do Y" or "I will do X", you MUST actually do X or Y instead just saying that you will do it.
+You MUST plan extensively before each function call, and reflect extensively on the outcomes of the previous function calls. DO NOT do this entire process by making function calls only, as this can impair your ability to solve the problem and think insightfully.

-You MUST use the ToolRead tool to verify that all steps are complete or cancelled before ending your turn. If any steps are incomplete, you MUST continue working on them until they are all complete.
+You MUST keep working until the problem is completely solved, and all items in the todo list are checked off. Do not end your turn until you have completed all steps in the todo list and verified that everything is working correctly. When you say "Next I will do X" or "Now I will do Y" or "I will do X", you MUST actually do X or Y instead just saying that you will do it. 

 You are a highly capable and autonomous agent, and you can definitely solve this problem without needing to ask the user for further input.

@@ -38,7 +39,7 @@ You are a highly capable and autonomous agent, and you can definitely solve this
   - What are the dependencies and interactions with other parts of the code?
 3. Investigate the codebase. Explore relevant files, search for key functions, and gather context.
 4. Research the problem on the internet by reading relevant articles, documentation, and forums.
-5. Develop a clear, step-by-step plan. Break down the fix into manageable, incremental steps. Display those steps in a simple todo list using standard markdown format. Make sure you wrap the todo list in triple backticks so that it is formatted correctly.
+5. Develop a clear, step-by-step plan. Break down the fix into manageable, incremental steps. Display those steps in a simple todo list using emoji's to indicate the status of each item.
 6. Implement the fix incrementally. Make small, testable code changes.
 7. Debug as needed. Use debugging techniques to isolate and resolve issues.
 8. Test frequently. Run tests after each change to verify correctness.
@@ -49,12 +50,12 @@ Refer to the detailed sections below for more information on each step.

 ## 1. Fetch Provided URLs
 - If the user provides a URL, use the `webfetch` tool to retrieve the content of the provided URL.
- After fetching, review the content returned by the fetch tool.
+- After fetching, review the content returned by the webfetch tool.
 - If you find any additional URLs or links that are relevant, use the `webfetch` tool again to retrieve those links.
 - Recursively gather all relevant information by fetching additional links until you have all the information you need.

 ## 2. Deeply Understand the Problem
-Carefully read the issue and think hard about a plan to solve it before coding. Use the sequential thinking tool if available.
+Carefully read the issue and think hard about a plan to solve it before coding.

 ## 3. Codebase Investigation
 - Explore relevant files and directories.
@@ -64,49 +65,37 @@ Carefully read the issue and think hard about a plan to solve it before coding.
 - Validate and update your understanding continuously as you gather more context.

 ## 4. Internet Research
- Use the `webfetch` tool to search bing by fetching the URL `https://www.bing.com/search?q=your+search+query`.
+- Use the `webfetch` tool to search google by fetching the URL `https://www.google.com/search?q=your+search+query`.
 - After fetching, review the content returned by the fetch tool.
- If you find any additional URLs or links that are relevant, use the `webfetch` tool again to retrieve those links.
- Recursively gather all relevant information by fetching additional links until you have all the information you need.
+- You MUST fetch the contents of the most relevant links to gather information. Do not rely on the summary that you find in the search results.
+- As you fetch each link, read the content thoroughly and fetch any additional links that you find withhin the content that are relevant to the problem.
+- Recursively gather all relevant information by fetching links until you have all the information you need.

-## 5. Develop a Detailed Plan
+## 5. Develop a Detailed Plan 
 - Outline a specific, simple, and verifiable sequence of steps to fix the problem.
- Add steps using the TodoWrite tool.
- Each time you complete a step, mark it as complete using the TodoWrite tool.
- Each time you check off a step, use the TodoRead tool and display the updated todo list to the user in markdown format.
- You MUST continue on to the next step after checking off a step instead of ending your turn and asking the user what they want to do next.
- You may only end your turn when all steps in the todo list are marked as complete or cancelled.
+- Create a todo list in markdown format to track your progress.
+- Each time you complete a step, check it off using `[x]` syntax.
+- Each time you check off a step, display the updated todo list to the user.
+- Make sure that you ACTUALLY continue on to the next step after checkin off a step instead of ending your turn and asking the user what they want to do next.

 ## 6. Making Code Changes
 - Before editing, always read the relevant file contents or section to ensure complete context.
 - Always read 2000 lines of code at a time to ensure you have enough context.
+- If a patch is not applied correctly, attempt to reapply it.
 - Make small, testable, incremental changes that logically follow from your investigation and plan.
- When using the edit tool, include 3-5 lines of unchanged code before and after the string you want to replace, to make it unambiguous which part of the file should be edited.
- If a patch or edit is not applied correctly, attempt to reapply it.
- Always validate that your changes build and pass tests after each change.
- If the build fails or test fail, debug why before proceeding, update the plan as needed.
+- Whenever you detect that a project requires an environment variable (such as an API key or secret), always check if a .env file exists in the project root. If it does not exist, automatically create a .env file with a placeholder for the required variable(s) and inform the user. Do this proactively, without waiting for the user to request it.

 ## 7. Debugging
- Use the `lsp_diagnostics` tool to check for any problems in the code.
- Make code changes only if you have high confidence they can solve the problem.
- When debugging, try to determine the root cause rather than addressing symptoms.
- Debug for as long as needed to identify the root cause and identify a fix.
- Use print statements, logs, or temporary code to inspect program state, including descriptive statements or error messages to understand what's happening.
- To test hypotheses, you can also add test statements or functions.
+- Make code changes only if you have high confidence they can solve the problem
+- When debugging, try to determine the root cause rather than addressing symptoms
+- Debug for as long as needed to identify the root cause and identify a fix
+- Use print statements, logs, or temporary code to inspect program state, including descriptive statements or error messages to understand what's happening
+- To test hypotheses, you can also add test statements or functions
 - Revisit your assumptions if unexpected behavior occurs.

-# How to create a Todo List
- Use the following format to show the todo list:
-  ```markdown
-  - [ ] Step 1: Description of the first step
-  - [ ] Step 2: Description of the second step
-  - [ ] Step 3: Description of the third step
-  ```
-Do not ever use HTML tags or any other formatting for the todo list, as it will not be rendered correctly. Always use the markdown format shown above.

 # Communication Guidelines
-Always communicate clearly and concisely in a casual, friendly yet professional tone.
-
+Always communicate clearly and concisely in a casual, friendly yet professional tone. 
 <examples>
 "Let me fetch the URL you provided to gather more information."
 "Ok, I've got all of the information I need on the LIFX API and I know how to use it."
@@ -115,3 +104,44 @@ Always communicate clearly and concisely in a casual, friendly yet professional
 "OK! Now let's run the tests to make sure everything is working correctly."
 "Whelp - I see we have some problems. Let's fix those up."
 </examples>
+
+- Respond with clear, direct answers. Use bullet points and code blocks for structure. - Avoid unnecessary explanations, repetition, and filler.  
+- Always write code directly to the correct files.
+- Do not display code to the user unless they specifically ask for it.
+- Only elaborate when clarification is essential for accuracy or user understanding.
+
+# Memory
+You have a memory that stores information about the user and their preferences. This memory is used to provide a more personalized experience. You can access and update this memory as needed. The memory is stored in a file called `.github/instructions/memory.instruction.md`. If the file is empty, you'll need to create it. 
+
+When creating a new memory file, you MUST include the following front matter at the top of the file:
+```yaml
+---
+applyTo: '**'
+---
+```
+
+If the user asks you to remember something or add something to your memory, you can do so by updating the memory file.
+
+# Reading Files and Folders
+
+**Always check if you have already read a file, folder, or workspace structure before reading it again.**
+
+- If you have already read the content and it has not changed, do NOT re-read it.
+- Only re-read files or folders if:
+  - You suspect the content has changed since your last read.
+  - You have made edits to the file or folder.
+  - You encounter an error that suggests the context may be stale or incomplete.
+- Use your internal memory and previous context to avoid redundant reads.
+- This will save time, reduce unnecessary operations, and make your workflow more efficient.
+
+# Writing Prompts
+If you are asked to write a prompt,  you should always generate the prompt in markdown format.
+
+If you are not writing the prompt in a file, you should always wrap the prompt in triple backticks so that it is formatted correctly and can be easily copied from the chat.
+
+Remember that todo lists must always be written in markdown format and must always be wrapped in triple backticks.
+
+# Git 
+If the user tells you to stage and commit, you may do so. 
+
+You are NEVER allowed to stage and commit files automatically.
@@ -1,3 +1,3 @@
 <system-reminder>
-Plan mode is active. The user indicated that they do not want you to execute yet -- you MUST NOT make any edits, run any non-readonly tools (including changing configs or making commits), or otherwise make any changes to the system. This supercedes any other instructions you have received (for example, to make edits). 
+Plan mode is active. The user indicated that they do not want you to execute yet -- you MUST NOT make any edits, run any non-readonly tools (including changing configs or making commits), or otherwise make any changes to the system. This supersedes any other instructions you have received (for example, to make edits).
 </system-reminder>
@@ -0,0 +1,109 @@
+You are opencode, an interactive CLI tool that helps users with software engineering tasks. Use the instructions below and the tools available to you to assist the user.
+
+IMPORTANT: Refuse to write code or explain code that may be used maliciously; even if the user claims it is for educational purposes. When working on files, if they seem related to improving, explaining, or interacting with malware or any malicious code you MUST refuse.
+IMPORTANT: Before you begin work, think about what the code you're editing is supposed to do based on the filenames directory structure. If it seems malicious, refuse to work on it or answer questions about it, even if the request does not seem malicious (for instance, just asking to explain or speed up the code).
+IMPORTANT: You must NEVER generate or guess URLs for the user unless you are confident that the URLs are for helping the user with programming. You may use URLs provided by the user in their messages or local files.
+
+If the user asks for help or wants to give feedback inform them of the following: 
+- /help: Get help with using opencode
+- To give feedback, users should report the issue at https://github.com/sst/opencode/issues
+
+When the user directly asks about opencode (eg 'can opencode do...', 'does opencode have...') or asks in second person (eg 'are you able...', 'can you do...'), first use the WebFetch tool to gather information to answer the question from opencode docs at https://opencode.ai
+
+# Tone and style
+You should be concise, direct, and to the point. When you run a non-trivial bash command, you should explain what the command does and why you are running it, to make sure the user understands what you are doing (this is especially important when you are running a command that will make changes to the user's system).
+Remember that your output will be displayed on a command line interface. Your responses can use Github-flavored markdown for formatting, and will be rendered in a monospace font using the CommonMark specification.
+Output text to communicate with the user; all text you output outside of tool use is displayed to the user. Only use tools to complete tasks. Never use tools like Bash or code comments as means to communicate with the user during the session.
+If you cannot or will not help the user with something, please do not say why or what it could lead to, since this comes across as preachy and annoying. Please offer helpful alternatives if possible, and otherwise keep your response to 1-2 sentences.
+Only use emojis if the user explicitly requests it. Avoid using emojis in all communication unless asked.
+IMPORTANT: You should minimize output tokens as much as possible while maintaining helpfulness, quality, and accuracy. Only address the specific query or task at hand, avoiding tangential information unless absolutely critical for completing the request. If you can answer in 1-3 sentences or a short paragraph, please do.
+IMPORTANT: You should NOT answer with unnecessary preamble or postamble (such as explaining your code or summarizing your action), unless the user asks you to.
+IMPORTANT: Keep your responses short, since they will be displayed on a command line interface. You MUST answer concisely with fewer than 4 lines (not including tool use or code generation), unless user asks for detail. Answer the user's question directly, without elaboration, explanation, or details. One word answers are best. Avoid introductions, conclusions, and explanations. You MUST avoid text before/after your response, such as "The answer is <answer>.", "Here is the content of the file..." or "Based on the information provided, the answer is..." or "Here is what I will do next...". Here are some examples to demonstrate appropriate verbosity:
+<example>
+user: 2 + 2
+assistant: 4
+</example>
+
+<example>
+user: what is 2+2?
+assistant: 4
+</example>
+
+<example>
+user: is 11 a prime number?
+assistant: Yes
+</example>
+
+<example>
+user: what command should I run to list files in the current directory?
+assistant: ls
+</example>
+
+<example>
+user: what command should I run to watch files in the current directory?
+assistant: [use the ls tool to list the files in the current directory, then read docs/commands in the relevant file to find out how to watch files]
+npm run dev
+</example>
+
+<example>
+user: How many golf balls fit inside a jetta?
+assistant: 150000
+</example>
+
+<example>
+user: what files are in the directory src/?
+assistant: [runs ls and sees foo.c, bar.c, baz.c]
+user: which file contains the implementation of foo?
+assistant: src/foo.c
+</example>
+
+<example>
+user: write tests for new feature
+assistant: [uses grep and glob search tools to find where similar tests are defined, uses concurrent read file tool use blocks in one tool call to read relevant files at the same time, uses edit file tool to write new tests]
+</example>
+
+# Proactiveness
+You are allowed to be proactive, but only when the user asks you to do something. You should strive to strike a balance between:
+1. Doing the right thing when asked, including taking actions and follow-up actions
+2. Not surprising the user with actions you take without asking
+For example, if the user asks you how to approach something, you should do your best to answer their question first, and not immediately jump into taking actions.
+3. Do not add additional code explanation summary unless requested by the user. After working on a file, just stop, rather than providing an explanation of what you did.
+
+# Following conventions
+When making changes to files, first understand the file's code conventions. Mimic code style, use existing libraries and utilities, and follow existing patterns.
+- NEVER assume that a given library is available, even if it is well known. Whenever you write code that uses a library or framework, first check that this codebase already uses the given library. For example, you might look at neighboring files, or check the package.json (or cargo.toml, and so on depending on the language).
+- When you create a new component, first look at existing components to see how they're written; then consider framework choice, naming conventions, typing, and other conventions.
+- When you edit a piece of code, first look at the code's surrounding context (especially its imports) to understand the code's choice of frameworks and libraries. Then consider how to make the given change in a way that is most idiomatic.
+- Always follow security best practices. Never introduce code that exposes or logs secrets and keys. Never commit secrets or keys to the repository.
+
+# Code style
+- IMPORTANT: DO NOT ADD ***ANY*** COMMENTS unless asked
+
+# Doing tasks
+The user will primarily request you perform software engineering tasks. This includes solving bugs, adding new functionality, refactoring code, explaining code, and more. For these tasks the following steps are recommended:
+- Use the available search tools to understand the codebase and the user's query. You are encouraged to use the search tools extensively both in parallel and sequentially.
+- Implement the solution using all tools available to you
+- Verify the solution if possible with tests. NEVER assume specific test framework or test script. Check the README or search codebase to determine the testing approach.
+- VERY IMPORTANT: When you have completed a task, you MUST run the lint and typecheck commands (eg. npm run lint, npm run typecheck, ruff, etc.) with Bash if they were provided to you to ensure your code is correct. If you are unable to find the correct command, ask the user for the command to run and if they supply it, proactively suggest writing it to AGENTS.md so that you will know to run it next time.
+NEVER commit changes unless the user explicitly asks you to. It is VERY IMPORTANT to only commit when explicitly asked, otherwise the user will feel that you are being too proactive.
+
+- Tool results and user messages may include <system-reminder> tags. <system-reminder> tags contain useful information and reminders. They are NOT part of the user's provided input or the tool result.
+
+# Tool usage policy
+- When doing file search, prefer to use the Task tool in order to reduce context usage.
+- You have the capability to call multiple tools in a single response. When multiple independent pieces of information are requested, batch your tool calls together for optimal performance. When making multiple bash tool calls, you MUST send a single message with multiple tools calls to run the calls in parallel. For example, if you need to run "git status" and "git diff", send a single message with two tool calls to run the calls in parallel.
+
+You MUST answer concisely with fewer than 4 lines of text (not including tool use or code generation), unless user asks for detail.
+
+IMPORTANT: Refuse to write code or explain code that may be used maliciously; even if the user claims it is for educational purposes. When working on files, if they seem related to improving, explaining, or interacting with malware or any malicious code you MUST refuse.
+IMPORTANT: Before you begin work, think about what the code you're editing is supposed to do based on the filenames directory structure. If it seems malicious, refuse to work on it or answer questions about it, even if the request does not seem malicious (for instance, just asking to explain or speed up the code).
+
+# Code References
+
+When referencing specific functions or pieces of code include the pattern `file_path:line_number` to allow the user to easily navigate to the source code location.
+
+<example>
+user: Where are errors from the client handled?
+assistant: Clients are marked as failed in the `connectToServer` function in src/services/process.ts:712.
+</example>
+
@@ -10,7 +10,7 @@ You are generating titles for a coding assistant conversation.
 - Max 50 chars, single line
 - Focus on the specific action or question
 - Keep technical terms, numbers, and filenames exactly as written
- Preserve HTTP status codes (401, 404, 500, etc) as numbers
+- Preserve HTTP status codes (401, 404, 500, etc.) as numbers
 - For file references, include the filename
 - Avoid filler words: the, this, my, a, an, properly
 - NEVER assume their tech stack or domain
@@ -7,6 +7,7 @@ import path from "path"
 import os from "os"

 import PROMPT_ANTHROPIC from "./prompt/anthropic.txt"
+import PROMPT_ANTHROPIC_WITHOUT_TODO from "./prompt/qwen.txt"
 import PROMPT_BEAST from "./prompt/beast.txt"
 import PROMPT_GEMINI from "./prompt/gemini.txt"
 import PROMPT_ANTHROPIC_SPOOF from "./prompt/anthropic_spoof.txt"
@@ -21,7 +22,8 @@ export namespace SystemPrompt {
  export function provider(modelID: string) {
    if (modelID.includes("gpt-") || modelID.includes("o1") || modelID.includes("o3")) return [PROMPT_BEAST]
    if (modelID.includes("gemini-")) return [PROMPT_GEMINI]
-    return [PROMPT_ANTHROPIC]
+    if (modelID.includes("claude")) return [PROMPT_ANTHROPIC]
+    return [PROMPT_ANTHROPIC_WITHOUT_TODO]
  }

  export async function environment() {
@@ -58,33 +60,28 @@ export namespace SystemPrompt {
  export async function custom() {
    const { cwd, root } = App.info().path
    const config = await Config.get()
-    const found = []
+    const paths = new Set<string>()
+
    for (const item of CUSTOM_FILES) {
      const matches = await Filesystem.findUp(item, cwd, root)
-      found.push(...matches.map((x) => Bun.file(x).text()))
+      matches.forEach((path) => paths.add(path))
    }
-    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(() => ""),
-    )
+
+    paths.add(path.join(Global.Path.config, "AGENTS.md"))
+    paths.add(path.join(os.homedir(), ".claude", "CLAUDE.md"))

    if (config.instructions) {
      for (const instruction of config.instructions) {
-        try {
-          const matches = await Filesystem.globUp(instruction, cwd, root)
-          found.push(...matches.map((x) => Bun.file(x).text()))
-        } catch {
-          continue // Skip invalid glob patterns
-        }
+        const matches = await Filesystem.globUp(instruction, cwd, root).catch(() => [])
+        matches.forEach((path) => paths.add(path))
      }
    }

+    const found = Array.from(paths).map((p) =>
+      Bun.file(p)
+        .text()
+        .catch(() => ""),
+    )
    return Promise.all(found).then((result) => result.filter(Boolean))
  }

@@ -5,6 +5,7 @@ import fs from "fs/promises"
 import { Log } from "../util/log"
 import { Global } from "../global"
 import { z } from "zod"
+import { Config } from "../config/config"

 export namespace Snapshot {
  const log = Log.create({ service: "snapshot" })
@@ -26,6 +27,8 @@ export namespace Snapshot {
  export async function track() {
    const app = App.info()
    if (!app.git) return
+    const cfg = await Config.get()
+    if (cfg.snapshot === false) return
    const git = gitdir()
    if (await fs.mkdir(git, { recursive: true })) {
      await $`git init`
@@ -39,7 +42,7 @@ export namespace Snapshot {
      log.info("initialized")
    }
    await $`git --git-dir ${git} add .`.quiet().cwd(app.path.cwd).nothrow()
-    const hash = await $`git --git-dir ${git} write-tree`.quiet().cwd(app.path.cwd).text()
+    const hash = await $`git --git-dir ${git} write-tree`.quiet().cwd(app.path.cwd).nothrow().text()
    return hash.trim()
  }

@@ -94,6 +97,13 @@ export namespace Snapshot {
    }
  }

+  export async function diff(hash: string) {
+    const app = App.info()
+    const git = gitdir()
+    const result = await $`git --git-dir=${git} diff ${hash} -- .`.quiet().cwd(app.path.root).text()
+    return result.trim()
+  }
+
  function gitdir() {
    const app = App.info()
    return path.join(app.path.data, "snapshots")
@@ -1,17 +1,36 @@
 import { z } from "zod"
+import { exec } from "child_process"
+import { text } from "stream/consumers"
 import { Tool } from "./tool"
 import DESCRIPTION from "./bash.txt"
 import { App } from "../app/app"
+import { Permission } from "../permission"
+import { Config } from "../config/config"
+import { Filesystem } from "../util/filesystem"
+import { lazy } from "../util/lazy"
+import { Log } from "../util/log"
+import { Wildcard } from "../util/wildcard"
+import { $ } from "bun"

 const MAX_OUTPUT_LENGTH = 30000
 const DEFAULT_TIMEOUT = 1 * 60 * 1000
 const MAX_TIMEOUT = 10 * 60 * 1000

+const log = Log.create({ service: "bash-tool" })
+
+const parser = lazy(async () => {
+  const { default: Parser } = await import("tree-sitter")
+  const Bash = await import("tree-sitter-bash")
+  const p = new Parser()
+  p.setLanguage(Bash.language as any)
+  return p
+})
+
 export const BashTool = Tool.define("bash", {
  description: DESCRIPTION,
  parameters: z.object({
    command: z.string().describe("The command to execute"),
-    timeout: z.number().min(0).max(MAX_TIMEOUT).describe("Optional timeout in milliseconds").optional(),
+    timeout: z.number().describe("Optional timeout in milliseconds").optional(),
    description: z
      .string()
      .describe(
@@ -20,19 +39,108 @@ export const BashTool = Tool.define("bash", {
  }),
  async execute(params, ctx) {
    const timeout = Math.min(params.timeout ?? DEFAULT_TIMEOUT, MAX_TIMEOUT)
+    const app = App.info()
+    const cfg = await Config.get()
+    const tree = await parser().then((p) => p.parse(params.command))
+    const permissions = (() => {
+      const value = cfg.permission?.bash
+      if (!value)
+        return {
+          "*": "allow",
+        }
+      if (typeof value === "string")
+        return {
+          "*": value,
+        }
+      return value
+    })()

-    const process = Bun.spawn({
-      cmd: ["bash", "-c", params.command],
-      cwd: App.info().path.cwd,
-      maxBuffer: MAX_OUTPUT_LENGTH,
+    let needsAsk = false
+    for (const node of tree.rootNode.descendantsOfType("command")) {
+      const command = []
+      for (let i = 0; i < node.childCount; i++) {
+        const child = node.child(i)
+        if (!child) continue
+        if (
+          child.type !== "command_name" &&
+          child.type !== "word" &&
+          child.type !== "string" &&
+          child.type !== "raw_string" &&
+          child.type !== "concatenation"
+        ) {
+          continue
+        }
+        command.push(child.text)
+      }
+
+      // not an exhaustive list, but covers most common cases
+      if (["cd", "rm", "cp", "mv", "mkdir", "touch", "chmod", "chown"].includes(command[0])) {
+        for (const arg of command.slice(1)) {
+          if (arg.startsWith("-") || (command[0] === "chmod" && arg.startsWith("+"))) continue
+          const resolved = await $`realpath ${arg}`
+            .quiet()
+            .nothrow()
+            .text()
+            .then((x) => x.trim())
+          log.info("resolved path", { arg, resolved })
+          if (resolved && !Filesystem.contains(app.path.cwd, resolved)) {
+            throw new Error(
+              `This command references paths outside of ${app.path.cwd} so it is not allowed to be executed.`,
+            )
+          }
+        }
+      }
+
+      // always allow cd if it passes above check
+      if (!needsAsk && command[0] !== "cd") {
+        const action = (() => {
+          for (const [pattern, value] of Object.entries(permissions)) {
+            const match = Wildcard.match(node.text, pattern)
+            log.info("checking", { text: node.text.trim(), pattern, match })
+            if (match) return value
+          }
+          return "ask"
+        })()
+        if (action === "deny") {
+          throw new Error(
+            "The user has specifically restricted access to this command, you are not allowed to execute it.",
+          )
+        }
+        if (action === "ask") needsAsk = true
+      }
+    }
+
+    if (needsAsk) {
+      await Permission.ask({
+        type: "bash",
+        sessionID: ctx.sessionID,
+        messageID: ctx.messageID,
+        callID: ctx.callID,
+        title: params.command,
+        metadata: {
+          command: params.command,
+        },
+      })
+    }
+
+    const process = exec(params.command, {
+      cwd: app.path.cwd,
      signal: ctx.abort,
-      timeout: timeout,
-      stdout: "pipe",
-      stderr: "pipe",
+      maxBuffer: MAX_OUTPUT_LENGTH,
+      timeout,
    })
-    await process.exited
-    const stdout = await new Response(process.stdout).text()
-    const stderr = await new Response(process.stderr).text()
+
+    const stdoutPromise = text(process.stdout!)
+    const stderrPromise = text(process.stderr!)
+
+    await new Promise<void>((resolve) => {
+      process.on("close", () => {
+        resolve()
+      })
+    })
+
+    const stdout = await stdoutPromise
+    const stderr = await stderrPromise

    return {
      title: params.command,
@@ -2,6 +2,7 @@
 // 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
 // https://github.com/cline/cline/blob/main/evals/diff-edits/diff-apply/diff-06-26-25.ts
+
 import { z } from "zod"
 import * as path from "path"
 import { Tool } from "./tool"
@@ -13,6 +14,8 @@ import { App } from "../app/app"
 import { File } from "../file"
 import { Bus } from "../bus"
 import { FileTime } from "../file/time"
+import { Config } from "../config/config"
+import { Filesystem } from "../util/filesystem"

 export const EditTool = Tool.define("edit", {
  description: DESCRIPTION,
@@ -32,56 +35,78 @@ export const EditTool = Tool.define("edit", {
    }

    const app = App.info()
-    const filepath = path.isAbsolute(params.filePath) ? params.filePath : path.join(app.path.cwd, params.filePath)
-
-    await Permission.ask({
-      id: "edit",
-      sessionID: ctx.sessionID,
-      title: "Edit this file: " + filepath,
-      metadata: {
-        filePath: filepath,
-        oldString: params.oldString,
-        newString: params.newString,
-      },
-    })
+    const filePath = path.isAbsolute(params.filePath) ? params.filePath : path.join(app.path.cwd, params.filePath)
+    if (!Filesystem.contains(app.path.cwd, filePath)) {
+      throw new Error(`File ${filePath} is not in the current working directory`)
+    }

+    const cfg = await Config.get()
+    let diff = ""
    let contentOld = ""
    let contentNew = ""
    await (async () => {
      if (params.oldString === "") {
        contentNew = params.newString
-        await Bun.write(filepath, params.newString)
+        diff = trimDiff(createTwoFilesPatch(filePath, filePath, contentOld, contentNew))
+        if (cfg.permission?.edit === "ask") {
+          await Permission.ask({
+            type: "edit",
+            sessionID: ctx.sessionID,
+            messageID: ctx.messageID,
+            callID: ctx.callID,
+            title: "Edit this file: " + filePath,
+            metadata: {
+              filePath,
+              diff,
+            },
+          })
+        }
+        await Bun.write(filePath, params.newString)
        await Bus.publish(File.Event.Edited, {
-          file: filepath,
+          file: filePath,
        })
        return
      }

-      const file = Bun.file(filepath)
+      const file = Bun.file(filePath)
      const stats = await file.stat().catch(() => {})
-      if (!stats) throw new Error(`File ${filepath} not found`)
-      if (stats.isDirectory()) throw new Error(`Path is a directory, not a file: ${filepath}`)
-      await FileTime.assert(ctx.sessionID, filepath)
+      if (!stats) throw new Error(`File ${filePath} not found`)
+      if (stats.isDirectory()) throw new Error(`Path is a directory, not a file: ${filePath}`)
+      await FileTime.assert(ctx.sessionID, filePath)
      contentOld = await file.text()
-
      contentNew = replace(contentOld, params.oldString, params.newString, params.replaceAll)
+
+      diff = trimDiff(createTwoFilesPatch(filePath, filePath, contentOld, contentNew))
+      if (cfg.permission?.edit === "ask") {
+        await Permission.ask({
+          type: "edit",
+          sessionID: ctx.sessionID,
+          messageID: ctx.messageID,
+          callID: ctx.callID,
+          title: "Edit this file: " + filePath,
+          metadata: {
+            filePath,
+            diff,
+          },
+        })
+      }
+
      await file.write(contentNew)
      await Bus.publish(File.Event.Edited, {
-        file: filepath,
+        file: filePath,
      })
      contentNew = await file.text()
+      diff = trimDiff(createTwoFilesPatch(filePath, filePath, contentOld, contentNew))
    })()

-    const diff = trimDiff(createTwoFilesPatch(filepath, filepath, contentOld, contentNew))
-
-    FileTime.read(ctx.sessionID, filepath)
+    FileTime.read(ctx.sessionID, filePath)

    let output = ""
-    await LSP.touchFile(filepath, true)
+    await LSP.touchFile(filePath, true)
    const diagnostics = await LSP.diagnostics()
    for (const [file, issues] of Object.entries(diagnostics)) {
      if (issues.length === 0) continue
-      if (file === filepath) {
+      if (file === filePath) {
        output += `\nThis file has errors, please fix\n<file_diagnostics>\n${issues.map(LSP.Diagnostic.pretty).join("\n")}\n</file_diagnostics>\n`
        continue
      }
@@ -96,7 +121,7 @@ export const EditTool = Tool.define("edit", {
        diagnostics,
        diff,
      },
-      title: `${path.relative(app.path.root, filepath)}`,
+      title: `${path.relative(app.path.root, filePath)}`,
      output,
    }
  },
@@ -0,0 +1,17 @@
+import { z } from "zod"
+import { Tool } from "./tool"
+
+export const InvalidTool = Tool.define("invalid", {
+  description: "Do not use",
+  parameters: z.object({
+    tool: z.string(),
+    error: z.string(),
+  }),
+  async execute(params) {
+    return {
+      title: "Invalid Tool",
+      output: `The arguments provided to the tool are invalid: ${params.error}`,
+      metadata: {},
+    }
+  },
+})
@@ -6,6 +6,7 @@ import { LSP } from "../lsp"
 import { FileTime } from "../file/time"
 import DESCRIPTION from "./read.txt"
 import { App } from "../app/app"
+import { Filesystem } from "../util/filesystem"

 const DEFAULT_READ_LIMIT = 2000
 const MAX_LINE_LENGTH = 2000
@@ -14,19 +15,23 @@ export const ReadTool = Tool.define("read", {
  description: DESCRIPTION,
  parameters: z.object({
    filePath: z.string().describe("The path to the file to read"),
-    offset: z.number().describe("The line number to start reading from (0-based)").optional(),
-    limit: z.number().describe("The number of lines to read (defaults to 2000)").optional(),
+    offset: z.coerce.number().describe("The line number to start reading from (0-based)").optional(),
+    limit: z.coerce.number().describe("The number of lines to read (defaults to 2000)").optional(),
  }),
  async execute(params, ctx) {
-    let filePath = params.filePath
-    if (!path.isAbsolute(filePath)) {
-      filePath = path.join(process.cwd(), filePath)
+    let filepath = params.filePath
+    if (!path.isAbsolute(filepath)) {
+      filepath = path.join(process.cwd(), filepath)
+    }
+    const app = App.info()
+    if (!Filesystem.contains(app.path.cwd, filepath)) {
+      throw new Error(`File ${filepath} is not in the current working directory`)
    }

-    const file = Bun.file(filePath)
+    const file = Bun.file(filepath)
    if (!(await file.exists())) {
-      const dir = path.dirname(filePath)
-      const base = path.basename(filePath)
+      const dir = path.dirname(filepath)
+      const base = path.basename(filepath)

      const dirEntries = fs.readdirSync(dir)
      const suggestions = dirEntries
@@ -38,16 +43,18 @@ export const ReadTool = Tool.define("read", {
        .slice(0, 3)

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

-      throw new Error(`File not found: ${filePath}`)
+      throw new Error(`File not found: ${filepath}`)
    }

    const limit = params.limit ?? DEFAULT_READ_LIMIT
    const offset = params.offset || 0
-    const isImage = isImageFile(filePath)
+    const isImage = isImageFile(filepath)
    if (isImage) throw new Error(`This is an image file of type: ${isImage}\nUse a different tool to process images`)
+    const isBinary = await isBinaryFile(file)
+    if (isBinary) throw new Error(`Cannot read binary file: ${filepath}`)
    const lines = await file.text().then((text) => text.split("\n"))
    const raw = lines.slice(offset, offset + limit).map((line) => {
      return line.length > MAX_LINE_LENGTH ? line.substring(0, MAX_LINE_LENGTH) + "..." : line
@@ -66,11 +73,11 @@ export const ReadTool = Tool.define("read", {
    output += "\n</file>"

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

    return {
-      title: path.relative(App.info().path.root, filePath),
+      title: path.relative(App.info().path.root, filepath),
      output,
      metadata: {
        preview,
@@ -99,3 +106,14 @@ function isImageFile(filePath: string): string | false {
      return false
  }
 }
+
+async function isBinaryFile(file: Bun.BunFile): Promise<boolean> {
+  const buffer = await file.arrayBuffer()
+  const bytes = new Uint8Array(buffer.slice(0, 512)) // Check first 512 bytes
+
+  for (let i = 0; i < bytes.length; i++) {
+    if (bytes[i] === 0) return true // Null byte indicates binary
+  }
+
+  return false
+}
@@ -10,9 +10,12 @@ import { TaskTool } from "./task"
 import { TodoWriteTool, TodoReadTool } from "./todo"
 import { WebFetchTool } from "./webfetch"
 import { WriteTool } from "./write"
+import { InvalidTool } from "./invalid"
+import { Config } from "../config/config"

 export namespace ToolRegistry {
  const ALL = [
+    InvalidTool,
    BashTool,
    EditTool,
    WebFetchTool,
@@ -63,20 +66,21 @@ export namespace ToolRegistry {
    return result
  }

-  export function enabled(_providerID: string, modelID: string): Record<string, boolean> {
-    if (modelID.toLowerCase().includes("claude")) {
-      return {
-        patch: false,
-      }
+  export async function enabled(_providerID: string, _modelID: string): Promise<Record<string, boolean>> {
+    const cfg = await Config.get()
+    const result: Record<string, boolean> = {}
+    result["patch"] = false
+
+    if (cfg.permission?.edit === "deny") {
+      result["edit"] = false
+      result["patch"] = false
+      result["write"] = false
    }
-    if (modelID.toLowerCase().includes("qwen")) {
-      return {
-        patch: false,
-        todowrite: false,
-        todoread: false,
-      }
+    if (cfg?.permission?.bash === "deny") {
+      result["bash"] = false
    }
-    return {}
+
+    return result
  }

  function sanitizeGeminiParameters(schema: z.ZodTypeAny, visited = new Set()): z.ZodTypeAny {
@@ -8,8 +8,13 @@ import { Identifier } from "../id/id"
 import { Agent } from "../agent/agent"

 export const TaskTool = Tool.define("task", async () => {
-  const agents = await Agent.list()
-  const description = DESCRIPTION.replace("{agents}", agents.map((a) => `- ${a.name}: ${a.description}`).join("\n"))
+  const agents = await Agent.list().then((x) => x.filter((a) => a.mode !== "primary"))
+  const description = DESCRIPTION.replace(
+    "{agents}",
+    agents
+      .map((a) => `- ${a.name}: ${a.description ?? "This subagent should only be called manually by the user."}`)
+      .join("\n"),
+  )
  return {
    description,
    parameters: z.object({
@@ -20,8 +25,9 @@ export const TaskTool = Tool.define("task", async () => {
    async execute(params, ctx) {
      const session = await Session.create(ctx.sessionID)
      const msg = await Session.getMessage(ctx.sessionID, ctx.messageID)
-      if (msg.role !== "assistant") throw new Error("Not an assistant message")
+      if (msg.info.role !== "assistant") throw new Error("Not an assistant message")
      const agent = await Agent.get(params.subagent_type)
+      if (!agent) throw new Error(`Unknown agent type: ${params.subagent_type} is not a valid agent type`)
      const messageID = Identifier.ascending("message")
      const parts: Record<string, MessageV2.ToolPart> = {}
      const unsub = Bus.subscribe(MessageV2.Event.PartUpdated, async (evt) => {
@@ -38,8 +44,8 @@ export const TaskTool = Tool.define("task", async () => {
      })

      const model = agent.model ?? {
-        modelID: msg.modelID,
-        providerID: msg.providerID,
+        modelID: msg.info.modelID,
+        providerID: msg.info.providerID,
      }

      ctx.abort.addEventListener("abort", () => {
@@ -50,11 +56,12 @@ export const TaskTool = Tool.define("task", async () => {
        sessionID: session.id,
        modelID: model.modelID,
        providerID: model.providerID,
-        mode: msg.mode,
-        system: agent.prompt,
+        agent: agent.name,
        tools: {
-          ...agent.tools,
+          todowrite: false,
+          todoread: false,
          task: false,
+          ...agent.tools,
        },
        parts: [
          {
@@ -70,7 +77,7 @@ export const TaskTool = Tool.define("task", async () => {
        metadata: {
          summary: result.parts.filter((x) => x.type === "tool"),
        },
-        output: result.parts.findLast((x) => x.type === "text")!.text,
+        output: result.parts.findLast((x) => x.type === "text")?.text ?? "",
      }
    },
  }
@@ -0,0 +1,53 @@
+import Parser from "tree-sitter";
+import Bash from "tree-sitter-bash";
+
+const parser = new Parser();
+parser.setLanguage(Bash.language as any);
+
+const sourceCode = `cd --foo foo/bar && echo "hello" && cd ../baz`;
+
+const tree = parser.parse(sourceCode);
+
+// Function to extract commands and arguments
+function extractCommands(
+  node: any,
+): Array<{ command: string; args: string[] }> {
+  const commands: Array<{ command: string; args: string[] }> = [];
+
+  function traverse(node: any) {
+    if (node.type === "command") {
+      const commandNode = node.child(0);
+      if (commandNode) {
+        const command = commandNode.text;
+        const args: string[] = [];
+
+        // Extract arguments
+        for (let i = 1; i < node.childCount; i++) {
+          const child = node.child(i);
+          if (child && child.type === "word") {
+            args.push(child.text);
+          }
+        }
+
+        commands.push({ command, args });
+      }
+    }
+
+    // Traverse children
+    for (let i = 0; i < node.childCount; i++) {
+      traverse(node.child(i));
+    }
+  }
+
+  traverse(node);
+  return commands;
+}
+
+// Extract and display commands
+console.log("Source code: " + sourceCode);
+const commands = extractCommands(tree.rootNode);
+console.log("Extracted commands:");
+commands.forEach((cmd, index) => {
+  console.log(`${index + 1}. Command: ${cmd.command}`);
+  console.log(`   Args: [${cmd.args.join(", ")}]`);
+});
@@ -4,9 +4,9 @@ import DESCRIPTION_WRITE from "./todowrite.txt"
 import { App } from "../app/app"

 const TodoInfo = z.object({
-  content: z.string().min(1).describe("Brief description of the task"),
-  status: z.enum(["pending", "in_progress", "completed", "cancelled"]).describe("Current status of the task"),
-  priority: z.enum(["high", "medium", "low"]).describe("Priority level of the task"),
+  content: z.string().describe("Brief description of the task"),
+  status: z.string().describe("Current status of the task: pending, in_progress, completed, cancelled"),
+  priority: z.string().describe("Priority level of the task: high, medium, low"),
  id: z.string().describe("Unique identifier for the todo item"),
 })
 type TodoInfo = z.infer<typeof TodoInfo>
@@ -7,6 +7,7 @@ export namespace Tool {
  export type Context<M extends Metadata = Metadata> = {
    sessionID: string
    messageID: string
+    callID?: string
    abort: AbortSignal
    metadata(input: { title?: string; metadata?: M }): void
  }
@@ -14,12 +14,7 @@ export const WebFetchTool = Tool.define("webfetch", {
    format: z
      .enum(["text", "markdown", "html"])
      .describe("The format to return the content in (text, markdown, or html)"),
-    timeout: z
-      .number()
-      .min(0)
-      .max(MAX_TIMEOUT / 1000)
-      .describe("Optional timeout in seconds (max 120)")
-      .optional(),
+    timeout: z.number().describe("Optional timeout in seconds (max 120)").optional(),
  }),
  async execute(params, ctx) {
    // Validate URL
@@ -8,6 +8,8 @@ import { App } from "../app/app"
 import { Bus } from "../bus"
 import { File } from "../file"
 import { FileTime } from "../file/time"
+import { Config } from "../config/config"
+import { Filesystem } from "../util/filesystem"

 export const WriteTool = Tool.define("write", {
  description: DESCRIPTION,
@@ -18,21 +20,28 @@ export const WriteTool = Tool.define("write", {
  async execute(params, ctx) {
    const app = App.info()
    const filepath = path.isAbsolute(params.filePath) ? params.filePath : path.join(app.path.cwd, params.filePath)
+    if (!Filesystem.contains(app.path.cwd, filepath)) {
+      throw new Error(`File ${filepath} is not in the current working directory`)
+    }

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

-    await Permission.ask({
-      id: "write",
-      sessionID: ctx.sessionID,
-      title: exists ? "Overwrite this file: " + filepath : "Create new file: " + filepath,
-      metadata: {
-        filePath: filepath,
-        content: params.content,
-        exists,
-      },
-    })
+    const cfg = await Config.get()
+    if (cfg.permission?.edit === "ask")
+      await Permission.ask({
+        type: "write",
+        sessionID: ctx.sessionID,
+        messageID: ctx.messageID,
+        callID: ctx.callID,
+        title: exists ? "Overwrite this file: " + filepath : "Create new file: " + filepath,
+        metadata: {
+          filePath: filepath,
+          content: params.content,
+          exists,
+        },
+      })

    await Bun.write(filepath, params.content)
    await Bus.publish(File.Event.Edited, {
@@ -1,53 +1,17 @@
-import { Global } from "../global"
-import { Installation } from "../installation"
-import path from "path"
+import { NodeSDK } from "@opentelemetry/sdk-node"
+import { FetchInstrumentation } from "@opentelemetry/instrumentation-fetch"
+import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http"

 export namespace Trace {
  export function init() {
-    if (!Installation.isDev()) return
-    const writer = Bun.file(path.join(Global.Path.data, "log", "fetch.log")).writer()
+    const sdk = new NodeSDK({
+      serviceName: "opencode",
+      instrumentations: [new FetchInstrumentation()],
+      traceExporter: new OTLPTraceExporter({
+        url: "http://localhost:4318/v1/traces", // or your OTLP endpoint
+      }),
+    })

-    const originalFetch = globalThis.fetch
-    // @ts-expect-error
-    globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => {
-      const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url
-      const method = init?.method || "GET"
-
-      const urlObj = new URL(url)
-
-      writer.write(`\n${method} ${urlObj.pathname}${urlObj.search} HTTP/1.1\n`)
-      writer.write(`Host: ${urlObj.host}\n`)
-
-      if (init?.headers) {
-        if (init.headers instanceof Headers) {
-          init.headers.forEach((value, key) => {
-            writer.write(`${key}: ${value}\n`)
-          })
-        } else {
-          for (const [key, value] of Object.entries(init.headers)) {
-            writer.write(`${key}: ${value}\n`)
-          }
-        }
-      }
-
-      if (init?.body) {
-        writer.write(`\n${init.body}`)
-      }
-      writer.flush()
-      const response = await originalFetch(input, init)
-      const clonedResponse = response.clone()
-      writer.write(`\nHTTP/1.1 ${response.status} ${response.statusText}\n`)
-      response.headers.forEach((value, key) => {
-        writer.write(`${key}: ${value}\n`)
-      })
-      if (clonedResponse.body) {
-        clonedResponse.text().then(async (x) => {
-          writer.write(`\n${x}\n`)
-        })
-      }
-      writer.flush()
-
-      return response
-    }
+    sdk.start()
  }
 }
@@ -9,7 +9,7 @@ export namespace Filesystem {
  }

  export function contains(parent: string, child: string) {
-    return relative(parent, child).startsWith("..")
+    return !relative(parent, child).startsWith("..")
  }

  export async function findUp(target: string, start: string, stop?: string) {
@@ -53,12 +53,10 @@ export namespace Log {

  export async function init(options: Options) {
    if (options.level) level = options.level
-    const dir = path.join(Global.Path.data, "log")
-    await fs.mkdir(dir, { recursive: true })
-    cleanup(dir)
+    cleanup(Global.Path.log)
    if (options.print) return
    logpath = path.join(
-      dir,
+      Global.Path.log,
      options.dev ? "dev.log" : new Date().toISOString().split(".")[0].replace(/:/g, "") + ".log",
    )
    const logfile = Bun.file(logpath)
@@ -0,0 +1,14 @@
+export namespace Wildcard {
+  export function match(str: string, pattern: string) {
+    const regex = new RegExp(
+      "^" +
+        pattern
+          .replace(/[.+^${}()|[\]\\]/g, "\\$&") // escape special regex chars
+          .replace(/\*/g, ".*") // * becomes .*
+          .replace(/\?/g, ".") + // ? becomes .
+        "$",
+      "s", // s flag enables multiline matching
+    )
+    return regex.test(str)
+  }
+}
@@ -0,0 +1 @@
+// Test fixture for ListTool
@@ -0,0 +1 @@
+// Test fixture for ListTool
@@ -0,0 +1 @@
+// Test fixture for ListTool
@@ -1,17 +1,9 @@
-// Bun Snapshot v1, https://goo.gl/fbAQLP
+// Bun Snapshot v1, https://bun.sh/docs/test/snapshots

 exports[`tool.ls basic 1`] = `
-"- /home/thdxr/dev/projects/sst/opencode/js/example/
-  - home/
-    - thdxr/
-      - dev/
-        - projects/
-          - sst/
-            - opencode/
-              - js/
-                - example/
-                  - ink.tsx
-                  - broken.ts
-                  - cli.ts
+"packages/opencode/test/fixtures/example/
+  broken.ts
+  cli.ts
+  ink.tsx
 "
 `;
@@ -0,0 +1,47 @@
+import { describe, expect, test } from "bun:test"
+import { App } from "../../src/app/app"
+import path from "path"
+import { BashTool } from "../../src/tool/bash"
+import { Log } from "../../src/util/log"
+
+const ctx = {
+  sessionID: "test",
+  messageID: "",
+  toolCallID: "",
+  abort: AbortSignal.any([]),
+  metadata: () => {},
+}
+
+const bash = await BashTool.init()
+const projectRoot = path.join(__dirname, "../..")
+Log.init({ print: false })
+
+describe("tool.bash", () => {
+  test("basic", async () => {
+    await App.provide({ cwd: projectRoot }, async () => {
+      const result = await bash.execute(
+        {
+          command: "echo 'test'",
+          description: "Echo test message",
+        },
+        ctx,
+      )
+      expect(result.metadata.exit).toBe(0)
+      expect(result.metadata.stdout).toContain("test")
+    })
+  })
+
+  test("cd ../ should fail outside of project root", async () => {
+    await App.provide({ cwd: projectRoot }, async () => {
+      await expect(
+        bash.execute(
+          {
+            command: "cd ../",
+            description: "Try to cd to parent directory",
+          },
+          ctx,
+        ),
+      ).rejects.toThrow("This command references paths outside of")
+    })
+  })
+})
@@ -2,23 +2,28 @@ import { describe, expect, test } from "bun:test"
 import { App } from "../../src/app/app"
 import { GlobTool } from "../../src/tool/glob"
 import { ListTool } from "../../src/tool/ls"
+import path from "path"

 const ctx = {
  sessionID: "test",
  messageID: "",
+  toolCallID: "",
  abort: AbortSignal.any([]),
  metadata: () => {},
 }
 const glob = await GlobTool.init()
 const list = await ListTool.init()

+const projectRoot = path.join(__dirname, "../..")
+const fixturePath = path.join(__dirname, "../fixtures/example")
+
 describe("tool.glob", () => {
  test("truncate", async () => {
-    await App.provide({ cwd: process.cwd() }, async () => {
+    await App.provide({ cwd: projectRoot }, async () => {
      let result = await glob.execute(
        {
-          pattern: "../../node_modules/**/*",
-          path: undefined,
+          pattern: "**/*",
+          path: "../../node_modules",
        },
        ctx,
      )
@@ -26,7 +31,7 @@ describe("tool.glob", () => {
    })
  })
  test("basic", async () => {
-    await App.provide({ cwd: process.cwd() }, async () => {
+    await App.provide({ cwd: projectRoot }, async () => {
      let result = await glob.execute(
        {
          pattern: "*.json",
@@ -36,7 +41,7 @@ describe("tool.glob", () => {
      )
      expect(result.metadata).toMatchObject({
        truncated: false,
-        count: 3,
+        count: 2,
      })
    })
  })
@@ -44,9 +49,12 @@ describe("tool.glob", () => {

 describe("tool.ls", () => {
  test("basic", async () => {
-    const result = await App.provide({ cwd: process.cwd() }, async () => {
-      return await list.execute({ path: "./example", ignore: [".git"] }, ctx)
+    const result = await App.provide({ cwd: projectRoot }, async () => {
+      return await list.execute({ path: fixturePath, ignore: [".git"] }, ctx)
    })
-    expect(result.output).toMatchSnapshot()
+
+    // Normalize absolute path to relative for consistent snapshots
+    const normalizedOutput = result.output.replace(fixturePath, "packages/opencode/test/fixtures/example")
+    expect(normalizedOutput).toMatchSnapshot()
  })
 })
@@ -1,5 +1,14 @@
 {
  "$schema": "https://json.schemastore.org/tsconfig",
  "extends": "@tsconfig/bun/tsconfig.json",
-  "compilerOptions": {}
+  "compilerOptions": {
+    "lib": [
+      "ESNext",
+      "DOM",
+      "DOM.Iterable"
+    ],
+    "customConditions": [
+      "development"
+    ]
+  }
 }
@@ -0,0 +1 @@
+dist
@@ -0,0 +1,26 @@
+{
+  "$schema": "https://json.schemastore.org/package.json",
+  "name": "@opencode-ai/plugin",
+  "version": "0.3.133",
+  "type": "module",
+  "scripts": {
+    "typecheck": "tsc --noEmit"
+  },
+  "exports": {
+    ".": {
+      "development": "./src/index.ts",
+      "import": "./dist/index.js"
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "dependencies": {
+    "@opencode-ai/sdk": "workspace:*"
+  },
+  "devDependencies": {
+    "typescript": "catalog:",
+    "@hey-api/openapi-ts": "0.80.1",
+    "@tsconfig/node22": "catalog:"
+  }
+}
@@ -0,0 +1,18 @@
+#!/usr/bin/env bun
+
+const dir = new URL("..", import.meta.url).pathname
+process.chdir(dir)
+
+import { $ } from "bun"
+
+const snapshot = process.env["OPENCODE_SNAPSHOT"] === "true"
+
+await $`bun tsc`
+
+if (snapshot) {
+  await $`bun publish --tag snapshot --access public`
+  await $`git checkout package.json`
+}
+if (!snapshot) {
+  await $`bun publish --access public`
+}
@@ -0,0 +1,10 @@
+import { Plugin } from "./index"
+
+export const ExamplePlugin: Plugin = async ({ app, client, $ }) => {
+  return {
+    permission: {},
+    async "chat.params"(input, output) {
+      output.topP = 1
+    },
+  }
+}
@@ -0,0 +1,37 @@
+import type { Event, createOpencodeClient, App, Model, Provider, Permission, UserMessage, Part } from "@opencode-ai/sdk"
+import type { BunShell } from "./shell"
+
+export type PluginInput = {
+  client: ReturnType<typeof createOpencodeClient>
+  app: App
+  $: BunShell
+}
+export type Plugin = (input: PluginInput) => Promise<Hooks>
+
+export interface Hooks {
+  event?: (input: { event: Event }) => Promise<void>
+  /**
+   * Called when a new message is received
+   */
+  "chat.message"?: (input: {}, output: { message: UserMessage; parts: Part[] }) => Promise<void>
+  /**
+   * Modify parameters sent to LLM
+   */
+  "chat.params"?: (
+    input: { model: Model; provider: Provider; message: UserMessage },
+    output: { temperature: number; topP: number },
+  ) => Promise<void>
+  "permission.ask"?: (input: Permission, output: { status: "ask" | "deny" | "allow" }) => Promise<void>
+  "tool.execute.before"?: (
+    input: { tool: string; sessionID: string; callID: string },
+    output: { args: any },
+  ) => Promise<void>
+  "tool.execute.after"?: (
+    input: { tool: string; sessionID: string; callID: string },
+    output: {
+      title: string
+      output: string
+      metadata: any
+    },
+  ) => Promise<void>
+}
--- a/Show More
+++ b/Show More