update aur

update readme
Context Window Warning (#152 )
2026-08-05 16:41:01 -04:00 · 2025-05-14 23:11:56 +02:00 · 2025-05-14 22:59:28 +02:00 · 2025-05-09 19:30:57 +02:00 · 2025-05-09 16:40:06 +02:00 · 2025-05-09 16:37:02 +02:00
43 changed files with 2498 additions and 690 deletions
@@ -41,7 +41,7 @@ aurs:
      - "kujtimiihoxha <kujtimii.h@gmail.com>"
    license: "MIT"
    private_key: "{{ .Env.AUR_KEY }}"
-    git_url: "ssh://aur@aur.archlinux.org/opencode-bin.git"
+    git_url: "ssh://aur@aur.archlinux.org/opencode-ai.git"
    provides:
      - opencode
    conflicts:
@@ -26,10 +26,10 @@ OpenCode is a Go-based CLI application that brings AI assistance to your termina

 ```bash
 # Install the latest version
-curl -fsSL https://opencode.ai/install | bash
+curl -fsSL https://raw.githubusercontent.com/opencode-ai/opencode/refs/heads/main/install | bash

 # Install a specific version
-curl -fsSL https://opencode.ai/install | VERSION=0.1.0 bash
+curl -fsSL https://raw.githubusercontent.com/opencode-ai/opencode/refs/heads/main/install | VERSION=0.1.0 bash
 ```

 ### Using Homebrew (macOS and Linux)
@@ -38,16 +38,6 @@ curl -fsSL https://opencode.ai/install | VERSION=0.1.0 bash
 brew install opencode-ai/tap/opencode
 ```

-### Using AUR (Arch Linux)
-
-```bash
-# Using yay
-yay -S opencode-bin
-
-# Using paru
-paru -S opencode-bin
-```
-
 ### Using Go

 ```bash
@@ -62,12 +52,29 @@ OpenCode looks for configuration in the following locations:
 - `$XDG_CONFIG_HOME/opencode/.opencode.json`
 - `./.opencode.json` (local directory)

+### Auto Compact Feature
+
+OpenCode includes an auto compact feature that automatically summarizes your conversation when it approaches the model's context window limit. When enabled (default setting), this feature:
+
+- Monitors token usage during your conversation
+- Automatically triggers summarization when usage reaches 95% of the model's context window
+- Creates a new session with the summary, allowing you to continue your work without losing context
+- Helps prevent "out of context" errors that can occur with long conversations
+
+You can enable or disable this feature in your configuration file:
+
+```json
+{
+  "autoCompact": true // default is true
+}
+```
+
 ### Environment Variables

 You can configure OpenCode using environment variables:

 | Environment Variable       | Purpose                                                |
-|----------------------------|--------------------------------------------------------|
+| -------------------------- | ------------------------------------------------------ |
 | `ANTHROPIC_API_KEY`        | For Claude models                                      |
 | `OPENAI_API_KEY`           | For OpenAI models                                      |
 | `GEMINI_API_KEY`           | For Google Gemini models                               |
@@ -79,7 +86,6 @@ You can configure OpenCode using environment variables:
 | `AZURE_OPENAI_API_KEY`     | For Azure OpenAI models (optional when using Entra ID) |
 | `AZURE_OPENAI_API_VERSION` | For Azure OpenAI models                                |

-
 ### Configuration File Structure

 ```json
@@ -134,7 +140,8 @@ You can configure OpenCode using environment variables:
    }
  },
  "debug": false,
-  "debugLSP": false
+  "debugLSP": false,
+  "autoCompact": true
 }
 ```

@@ -318,6 +325,81 @@ OpenCode is built with a modular architecture:
 - **internal/session**: Session management
 - **internal/lsp**: Language Server Protocol integration

+## Custom Commands
+
+OpenCode supports custom commands that can be created by users to quickly send predefined prompts to the AI assistant.
+
+### Creating Custom Commands
+
+Custom commands are predefined prompts stored as Markdown files in one of three locations:
+
+1. **User Commands** (prefixed with `user:`):
+
+   ```
+   $XDG_CONFIG_HOME/opencode/commands/
+   ```
+
+   (typically `~/.config/opencode/commands/` on Linux/macOS)
+
+   or
+
+   ```
+   $HOME/.opencode/commands/
+   ```
+
+2. **Project Commands** (prefixed with `project:`):
+   ```
+   <PROJECT DIR>/.opencode/commands/
+   ```
+
+Each `.md` file in these directories becomes a custom command. The file name (without extension) becomes the command ID.
+
+For example, creating a file at `~/.config/opencode/commands/prime-context.md` with content:
+
+```markdown
+RUN git ls-files
+READ README.md
+```
+
+This creates a command called `user:prime-context`.
+
+### Command Arguments
+
+You can create commands that accept arguments by including the `$ARGUMENTS` placeholder in your command file:
+
+```markdown
+RUN git show $ARGUMENTS
+```
+
+When you run this command, OpenCode will prompt you to enter the text that should replace `$ARGUMENTS`.
+
+### Organizing Commands
+
+You can organize commands in subdirectories:
+
+```
+~/.config/opencode/commands/git/commit.md
+```
+
+This creates a command with ID `user:git:commit`.
+
+### Using Custom Commands
+
+1. Press `Ctrl+K` to open the command dialog
+2. Select your custom command (prefixed with either `user:` or `project:`)
+3. Press Enter to execute the command
+
+The content of the command file will be sent as a message to the AI assistant.
+
+### Built-in Commands
+
+OpenCode includes several built-in commands:
+
+| Command            | Description                                                                                         |
+| ------------------ | --------------------------------------------------------------------------------------------------- |
+| Initialize Project | Creates or updates the OpenCode.md memory file with project-specific information                    |
+| Compact Session    | Manually triggers the summarization of the current session, creating a new session with the summary |
+
 ## MCP (Model Context Protocol)

 OpenCode implements the Model Context Protocol (MCP) to extend its capabilities through external tools. MCP provides a standardized way for the AI assistant to interact with external services and tools.
@@ -218,6 +218,7 @@ func setupSubscriptions(app *app.App, parentCtx context.Context) (chan tea.Msg,
 	setupSubscriber(ctx, &wg, "sessions", app.Sessions.Subscribe, ch)
 	setupSubscriber(ctx, &wg, "messages", app.Messages.Subscribe, ch)
 	setupSubscriber(ctx, &wg, "permissions", app.Permissions.Subscribe, ch)
+	setupSubscriber(ctx, &wg, "coderAgent", app.CoderAgent.Subscribe, ch)

 	cleanupFunc := func() {
 		logging.Info("Cancelling all subscriptions")
@@ -2,8 +2,6 @@ module github.com/opencode-ai/opencode

 go 1.24.0

-toolchain go1.24.2
-
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0
 	github.com/JohannesKaufmann/html-to-markdown v1.6.0
@@ -16,12 +14,10 @@ require (
 	github.com/charmbracelet/bubbles v0.20.0
 	github.com/charmbracelet/bubbletea v1.3.4
 	github.com/charmbracelet/glamour v0.9.1
-	github.com/charmbracelet/huh v0.6.0
 	github.com/charmbracelet/lipgloss v1.1.0
 	github.com/charmbracelet/x/ansi v0.8.0
 	github.com/fsnotify/fsnotify v1.8.0
 	github.com/go-logfmt/logfmt v0.6.0
-	github.com/google/generative-ai-go v0.19.0
 	github.com/google/uuid v1.6.0
 	github.com/lrstanley/bubblezone v0.0.0-20250315020633-c249a3fe1231
 	github.com/mark3labs/mcp-go v0.17.0
@@ -35,16 +31,14 @@ require (
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/viper v1.20.0
 	github.com/stretchr/testify v1.10.0
-	google.golang.org/api v0.215.0
 )

 require (
 	cloud.google.com/go v0.116.0 // indirect
-	cloud.google.com/go/ai v0.8.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	cloud.google.com/go/auth v0.13.0 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
 	cloud.google.com/go/compute/metadata v0.6.0 // indirect
-	cloud.google.com/go/longrunning v0.5.7 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
 	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
@@ -68,11 +62,10 @@ require (
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
 	github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
-	github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect
 	github.com/charmbracelet/x/term v0.2.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/disintegration/imaging v1.6.2
 	github.com/dlclark/regexp2 v1.11.4 // indirect
-	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
@@ -85,13 +78,12 @@ require (
 	github.com/gorilla/css v1.0.1 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
-	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/lucasb-eyer/go-colorful v1.2.0
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/mfridman/interpolate v0.0.2 // indirect
 	github.com/microcosm-cc/bluemonday v1.0.27 // indirect
-	github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/ncruces/julianday v1.0.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
@@ -116,21 +108,19 @@ require (
 	github.com/yuin/goldmark v1.7.8 // indirect
 	github.com/yuin/goldmark-emoji v1.0.5 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
 	go.opentelemetry.io/otel v1.35.0 // indirect
 	go.opentelemetry.io/otel/metric v1.35.0 // indirect
 	go.opentelemetry.io/otel/trace v1.35.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.37.0 // indirect
+	golang.org/x/image v0.26.0 // indirect
 	golang.org/x/net v0.39.0 // indirect
-	golang.org/x/oauth2 v0.25.0 // indirect
 	golang.org/x/sync v0.13.0 // indirect
 	golang.org/x/sys v0.32.0 // indirect
 	golang.org/x/term v0.31.0 // indirect
 	golang.org/x/text v0.24.0 // indirect
-	golang.org/x/time v0.8.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
+	google.golang.org/genai v1.3.0
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
 	google.golang.org/grpc v1.71.0 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect
@@ -1,15 +1,9 @@
 cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE=
 cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U=
-cloud.google.com/go/ai v0.8.0 h1:rXUEz8Wp2OlrM8r1bfmpF2+VKqc1VJpafE3HgzRnD/w=
-cloud.google.com/go/ai v0.8.0/go.mod h1:t3Dfk4cM61sytiggo2UyGsDVW3RF1qGZaUKDrZFyqkE=
 cloud.google.com/go/auth v0.13.0 h1:8Fu8TZy167JkW8Tj3q7dIkr2v4cndv41ouecJx0PAHs=
 cloud.google.com/go/auth v0.13.0/go.mod h1:COOjD9gwfKNKz+IIduatIhYJQIc0mG3H102r/EMxX6Q=
-cloud.google.com/go/auth/oauth2adapt v0.2.6 h1:V6a6XDu2lTwPZWOawrAa9HUK+DB2zfJyTuciBG5hFkU=
-cloud.google.com/go/auth/oauth2adapt v0.2.6/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8=
 cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
 cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
-cloud.google.com/go/longrunning v0.5.7 h1:WLbHekDbjK1fVFD3ibpFFVoyizlLRl73I7YKuAKilhU=
-cloud.google.com/go/longrunning v0.5.7/go.mod h1:8GClkudohy1Fxm3owmBGid8W0pSgodEMwEAztp38Xng=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WWFYBlX1CPTrR+NDToRkQ=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0/go.mod h1:XCW7KnZet0Opnr7HccfUw1PLc4CjHqpcaxW8DHklNkQ=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 h1:tfLQ34V6F7tVSwoTf/4lH5sE0o6eCJuNDTmH09nDpbc=
@@ -82,8 +76,6 @@ github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4p
 github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk=
 github.com/charmbracelet/glamour v0.9.1 h1:11dEfiGP8q1BEqvGoIjivuc2rBk+5qEXdPtaQ2WoiCM=
 github.com/charmbracelet/glamour v0.9.1/go.mod h1:+SHvIS8qnwhgTpVMiXwn7OfGomSqff1cHBCI8jLOetk=
-github.com/charmbracelet/huh v0.6.0 h1:mZM8VvZGuE0hoDXq6XLxRtgfWyTI3b2jZNKh0xWmax8=
-github.com/charmbracelet/huh v0.6.0/go.mod h1:GGNKeWCeNzKpEOh/OJD8WBwTQjV3prFAtQPpLv+AVwU=
 github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
 github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
 github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE=
@@ -92,14 +84,14 @@ github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0G
 github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
 github.com/charmbracelet/x/exp/golden v0.0.0-20240815200342-61de596daa2b h1:MnAMdlwSltxJyULnrYbkZpp4k58Co7Tah3ciKhSNo0Q=
 github.com/charmbracelet/x/exp/golden v0.0.0-20240815200342-61de596daa2b/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
-github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 h1:qko3AQ4gK1MTS/de7F5hPGx6/k1u0w4TeYmBFwzYVP4=
-github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ=
 github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
 github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
+github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
 github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
@@ -125,8 +117,6 @@ github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeD
 github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/generative-ai-go v0.19.0 h1:R71szggh8wHMCUlEMsW2A/3T+5LdEIkiaHSYgSpUgdg=
-github.com/google/generative-ai-go v0.19.0/go.mod h1:JYolL13VG7j79kM5BtHz4qwONHkeJQzOCkKXnpqtS/E=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM=
@@ -139,6 +129,8 @@ github.com/googleapis/gax-go/v2 v2.14.1 h1:hb0FFeiPaQskmvakKu5EbCbpntQn48jyHuvrk
 github.com/googleapis/gax-go/v2 v2.14.1/go.mod h1:Hb/NubMaVM88SrNkvl8X/o8XWwDJEPqouaLeN2IUxoA=
 github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
 github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@@ -169,8 +161,6 @@ github.com/mfridman/interpolate v0.0.2 h1:pnuTK7MQIxxFz1Gr+rjSIx9u7qVjf5VOoM/u6B
 github.com/mfridman/interpolate v0.0.2/go.mod h1:p+7uk6oE07mpE/Ik1b8EckO0O4ZXiGAfshKBWLUM9Xg=
 github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
 github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
-github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
-github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
@@ -258,8 +248,6 @@ github.com/yuin/goldmark-emoji v1.0.5 h1:EMVWyCGPlXJfUXBXpuMu+ii3TIaxbVBnEX9uaDC
 github.com/yuin/goldmark-emoji v1.0.5/go.mod h1:tTkZEbwu5wkPmgTcitqddVxY9osFZiavD+r4AzQrh1U=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 h1:r6I7RJCN86bpD/FQwedZ0vSixDpwuWREjW9oRMsmqDc=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0/go.mod h1:B9yO6b04uB80CzjedvewuqDhxJxi11s7/GtiGa8bAjI=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8=
 go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
@@ -283,6 +271,9 @@ golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
 golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
 golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
 golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
+golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.26.0 h1:4XjIFEZWQmCZi6Wv8BoxsDhRU3RVnLX04dToTDAEPlY=
+golang.org/x/image v0.26.0/go.mod h1:lcxbMFAovzpnJxzXS3nyL83K27tmqtKzIJpctK8YO5c=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -296,8 +287,6 @@ golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
 golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
-golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
-golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -338,17 +327,13 @@ golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
 golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
-golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
-golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.215.0 h1:jdYF4qnyczlEz2ReWIsosNLDuzXyvFHJtI5gcr0J7t0=
-google.golang.org/api v0.215.0/go.mod h1:fta3CVtuJYOEdugLNWm6WodzOS8KdFckABwN4I40hzY=
-google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
-google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
+google.golang.org/genai v1.3.0 h1:tXhPJF30skOjnnDY7ZnjK3q7IKy4PuAlEA0fk7uEaEI=
+google.golang.org/genai v1.3.0/go.mod h1:TyfOKRz/QyCaj6f/ZDt505x+YreXnY40l2I6k8TvgqY=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 h1:e0AIkUUhxyBKh6ssZNrAMeqhA7RKUj42346d1y02i2g=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
@@ -36,9 +36,10 @@ type MCPServer struct {
 type AgentName string

 const (
-	AgentCoder AgentName = "coder"
-	AgentTask  AgentName = "task"
-	AgentTitle AgentName = "title"
+	AgentCoder      AgentName = "coder"
+	AgentSummarizer AgentName = "summarizer"
+	AgentTask       AgentName = "task"
+	AgentTitle      AgentName = "title"
 )

 // Agent defines configuration for different LLM models and their token limits.
@@ -84,6 +85,7 @@ type Config struct {
 	DebugLSP     bool                              `json:"debugLSP,omitempty"`
 	ContextPaths []string                          `json:"contextPaths,omitempty"`
 	TUI          TUIConfig                         `json:"tui"`
+	AutoCompact  bool                              `json:"autoCompact,omitempty"`
 }

 // Application constants
@@ -213,6 +215,7 @@ func setDefaults(debug bool) {
 	viper.SetDefault("data.directory", defaultDataDirectory)
 	viper.SetDefault("contextPaths", defaultContextPaths)
 	viper.SetDefault("tui.theme", "opencode")
+	viper.SetDefault("autoCompact", true)

 	if debug {
 		viper.SetDefault("debug", true)
@@ -242,6 +245,13 @@ func setProviderDefaults() {
 	if apiKey := os.Getenv("OPENROUTER_API_KEY"); apiKey != "" {
 		viper.SetDefault("providers.openrouter.apiKey", apiKey)
 	}
+	if apiKey := os.Getenv("XAI_API_KEY"); apiKey != "" {
+		viper.SetDefault("providers.xai.apiKey", apiKey)
+	}
+	if apiKey := os.Getenv("AZURE_OPENAI_ENDPOINT"); apiKey != "" {
+		// api-key may be empty when using Entra ID credentials – that's okay
+		viper.SetDefault("providers.azure.apiKey", os.Getenv("AZURE_OPENAI_API_KEY"))
+	}

 	// Use this order to set the default models
 	// 1. Anthropic
@@ -253,57 +263,72 @@ func setProviderDefaults() {
 	// 7. Azure

 	// Anthropic configuration
-	if viper.Get("providers.anthropic.apiKey") != "" {
+	if key := viper.GetString("providers.anthropic.apiKey"); strings.TrimSpace(key) != "" {
 		viper.SetDefault("agents.coder.model", models.Claude37Sonnet)
+		viper.SetDefault("agents.summarizer.model", models.Claude37Sonnet)
 		viper.SetDefault("agents.task.model", models.Claude37Sonnet)
 		viper.SetDefault("agents.title.model", models.Claude37Sonnet)
 		return
 	}

 	// OpenAI configuration
-	if viper.Get("providers.openai.apiKey") != "" {
+	if key := viper.GetString("providers.openai.apiKey"); strings.TrimSpace(key) != "" {
 		viper.SetDefault("agents.coder.model", models.GPT41)
+		viper.SetDefault("agents.summarizer.model", models.GPT41)
 		viper.SetDefault("agents.task.model", models.GPT41Mini)
 		viper.SetDefault("agents.title.model", models.GPT41Mini)
 		return
 	}

 	// Google Gemini configuration
-	if viper.Get("providers.google.gemini.apiKey") != "" {
+	if key := viper.GetString("providers.gemini.apiKey"); strings.TrimSpace(key) != "" {
 		viper.SetDefault("agents.coder.model", models.Gemini25)
+		viper.SetDefault("agents.summarizer.model", models.Gemini25)
 		viper.SetDefault("agents.task.model", models.Gemini25Flash)
 		viper.SetDefault("agents.title.model", models.Gemini25Flash)
 		return
 	}

 	// Groq configuration
-	if viper.Get("providers.groq.apiKey") != "" {
+	if key := viper.GetString("providers.groq.apiKey"); strings.TrimSpace(key) != "" {
 		viper.SetDefault("agents.coder.model", models.QWENQwq)
+		viper.SetDefault("agents.summarizer.model", models.QWENQwq)
 		viper.SetDefault("agents.task.model", models.QWENQwq)
 		viper.SetDefault("agents.title.model", models.QWENQwq)
 		return
 	}

 	// OpenRouter configuration
-	if viper.Get("providers.openrouter.apiKey") != "" {
+	if key := viper.GetString("providers.openrouter.apiKey"); strings.TrimSpace(key) != "" {
 		viper.SetDefault("agents.coder.model", models.OpenRouterClaude37Sonnet)
+		viper.SetDefault("agents.summarizer.model", models.OpenRouterClaude37Sonnet)
 		viper.SetDefault("agents.task.model", models.OpenRouterClaude37Sonnet)
 		viper.SetDefault("agents.title.model", models.OpenRouterClaude35Haiku)
 		return
 	}

+	// XAI configuration
+	if key := viper.GetString("providers.xai.apiKey"); strings.TrimSpace(key) != "" {
+		viper.SetDefault("agents.coder.model", models.XAIGrok3Beta)
+		viper.SetDefault("agents.summarizer.model", models.XAIGrok3Beta)
+		viper.SetDefault("agents.task.model", models.XAIGrok3Beta)
+		viper.SetDefault("agents.title.model", models.XAiGrok3MiniFastBeta)
+		return
+	}
+
 	// AWS Bedrock configuration
 	if hasAWSCredentials() {
 		viper.SetDefault("agents.coder.model", models.BedrockClaude37Sonnet)
+		viper.SetDefault("agents.summarizer.model", models.BedrockClaude37Sonnet)
 		viper.SetDefault("agents.task.model", models.BedrockClaude37Sonnet)
 		viper.SetDefault("agents.title.model", models.BedrockClaude37Sonnet)
 		return
 	}

+	// Azure OpenAI configuration
 	if os.Getenv("AZURE_OPENAI_ENDPOINT") != "" {
-		// api-key may be empty when using Entra ID credentials – that's okay
-		viper.SetDefault("providers.azure.apiKey", os.Getenv("AZURE_OPENAI_API_KEY"))
 		viper.SetDefault("agents.coder.model", models.AzureGPT41)
+		viper.SetDefault("agents.summarizer.model", models.AzureGPT41)
 		viper.SetDefault("agents.task.model", models.AzureGPT41Mini)
 		viper.SetDefault("agents.title.model", models.AzureGPT41Mini)
 		return
@@ -69,11 +69,11 @@ func (b *agentTool) Run(ctx context.Context, call tools.ToolCall) (tools.ToolRes
 		return tools.ToolResponse{}, fmt.Errorf("error generating agent: %s", err)
 	}
 	result := <-done
-	if result.Err() != nil {
-		return tools.ToolResponse{}, fmt.Errorf("error generating agent: %s", result.Err())
+	if result.Error != nil {
+		return tools.ToolResponse{}, fmt.Errorf("error generating agent: %s", result.Error)
 	}

-	response := result.Response()
+	response := result.Message
 	if response.Role != message.Assistant {
 		return tools.NewTextErrorResponse("no response"), nil
 	}
@@ -88,8 +88,6 @@ func (b *agentTool) Run(ctx context.Context, call tools.ToolCall) (tools.ToolRes
 	}

 	parentSession.Cost += updatedSession.Cost
-	parentSession.PromptTokens += updatedSession.PromptTokens
-	parentSession.CompletionTokens += updatedSession.CompletionTokens

 	_, err = b.sessions.Save(ctx, parentSession)
 	if err != nil {
@@ -15,6 +15,7 @@ import (
 	"github.com/opencode-ai/opencode/internal/logging"
 	"github.com/opencode-ai/opencode/internal/message"
 	"github.com/opencode-ai/opencode/internal/permission"
+	"github.com/opencode-ai/opencode/internal/pubsub"
 	"github.com/opencode-ai/opencode/internal/session"
 )

@@ -24,35 +25,46 @@ var (
 	ErrSessionBusy      = errors.New("session is currently processing another request")
 )

+type AgentEventType string
+
+const (
+	AgentEventTypeError     AgentEventType = "error"
+	AgentEventTypeResponse  AgentEventType = "response"
+	AgentEventTypeSummarize AgentEventType = "summarize"
+)
+
 type AgentEvent struct {
-	message message.Message
-	err     error
-}
+	Type    AgentEventType
+	Message message.Message
+	Error   error

-func (e *AgentEvent) Err() error {
-	return e.err
-}
-
-func (e *AgentEvent) Response() message.Message {
-	return e.message
+	// When summarizing
+	SessionID string
+	Progress  string
+	Done      bool
 }

 type Service interface {
-	Run(ctx context.Context, sessionID string, content string) (<-chan AgentEvent, error)
+	pubsub.Suscriber[AgentEvent]
+	Model() models.Model
+	Run(ctx context.Context, sessionID string, content string, attachments ...message.Attachment) (<-chan AgentEvent, error)
 	Cancel(sessionID string)
 	IsSessionBusy(sessionID string) bool
 	IsBusy() bool
 	Update(agentName config.AgentName, modelID models.ModelID) (models.Model, error)
+	Summarize(ctx context.Context, sessionID string) error
 }

 type agent struct {
+	*pubsub.Broker[AgentEvent]
 	sessions session.Service
 	messages message.Service

 	tools    []tools.BaseTool
 	provider provider.Provider

-	titleProvider provider.Provider
+	titleProvider     provider.Provider
+	summarizeProvider provider.Provider

 	activeRequests sync.Map
 }
@@ -75,26 +87,48 @@ func NewAgent(
 			return nil, err
 		}
 	}
+	var summarizeProvider provider.Provider
+	if agentName == config.AgentCoder {
+		summarizeProvider, err = createAgentProvider(config.AgentSummarizer)
+		if err != nil {
+			return nil, err
+		}
+	}

 	agent := &agent{
-		provider:       agentProvider,
-		messages:       messages,
-		sessions:       sessions,
-		tools:          agentTools,
-		titleProvider:  titleProvider,
-		activeRequests: sync.Map{},
+		Broker:            pubsub.NewBroker[AgentEvent](),
+		provider:          agentProvider,
+		messages:          messages,
+		sessions:          sessions,
+		tools:             agentTools,
+		titleProvider:     titleProvider,
+		summarizeProvider: summarizeProvider,
+		activeRequests:    sync.Map{},
 	}

 	return agent, nil
 }

+func (a *agent) Model() models.Model {
+	return a.provider.Model()
+}
+
 func (a *agent) Cancel(sessionID string) {
+	// Cancel regular requests
 	if cancelFunc, exists := a.activeRequests.LoadAndDelete(sessionID); exists {
 		if cancel, ok := cancelFunc.(context.CancelFunc); ok {
 			logging.InfoPersist(fmt.Sprintf("Request cancellation initiated for session: %s", sessionID))
 			cancel()
 		}
 	}
+
+	// Also check for summarize requests
+	if cancelFunc, exists := a.activeRequests.LoadAndDelete(sessionID + "-summarize"); exists {
+		if cancel, ok := cancelFunc.(context.CancelFunc); ok {
+			logging.InfoPersist(fmt.Sprintf("Summarize cancellation initiated for session: %s", sessionID))
+			cancel()
+		}
+	}
 }

 func (a *agent) IsBusy() bool {
@@ -117,6 +151,9 @@ func (a *agent) IsSessionBusy(sessionID string) bool {
 }

 func (a *agent) generateTitle(ctx context.Context, sessionID string, content string) error {
+	if content == "" {
+		return nil
+	}
 	if a.titleProvider == nil {
 		return nil
 	}
@@ -124,16 +161,13 @@ func (a *agent) generateTitle(ctx context.Context, sessionID string, content str
 	if err != nil {
 		return err
 	}
+	parts := []message.ContentPart{message.TextContent{Text: content}}
 	response, err := a.titleProvider.SendMessages(
 		ctx,
 		[]message.Message{
 			{
-				Role: message.User,
-				Parts: []message.ContentPart{
-					message.TextContent{
-						Text: content,
-					},
-				},
+				Role:  message.User,
+				Parts: parts,
 			},
 		},
 		make([]tools.BaseTool, 0),
@@ -154,11 +188,15 @@ func (a *agent) generateTitle(ctx context.Context, sessionID string, content str

 func (a *agent) err(err error) AgentEvent {
 	return AgentEvent{
-		err: err,
+		Type:  AgentEventTypeError,
+		Error: err,
 	}
 }

-func (a *agent) Run(ctx context.Context, sessionID string, content string) (<-chan AgentEvent, error) {
+func (a *agent) Run(ctx context.Context, sessionID string, content string, attachments ...message.Attachment) (<-chan AgentEvent, error) {
+	if !a.provider.Model().SupportsAttachments && attachments != nil {
+		attachments = nil
+	}
 	events := make(chan AgentEvent)
 	if a.IsSessionBusy(sessionID) {
 		return nil, ErrSessionBusy
@@ -172,21 +210,25 @@ func (a *agent) Run(ctx context.Context, sessionID string, content string) (<-ch
 		defer logging.RecoverPanic("agent.Run", func() {
 			events <- a.err(fmt.Errorf("panic while running the agent"))
 		})
-
-		result := a.processGeneration(genCtx, sessionID, content)
-		if result.Err() != nil && !errors.Is(result.Err(), ErrRequestCancelled) && !errors.Is(result.Err(), context.Canceled) {
-			logging.ErrorPersist(fmt.Sprintf("Generation error for session %s: %v", sessionID, result))
+		var attachmentParts []message.ContentPart
+		for _, attachment := range attachments {
+			attachmentParts = append(attachmentParts, message.BinaryContent{Path: attachment.FilePath, MIMEType: attachment.MimeType, Data: attachment.Content})
+		}
+		result := a.processGeneration(genCtx, sessionID, content, attachmentParts)
+		if result.Error != nil && !errors.Is(result.Error, ErrRequestCancelled) && !errors.Is(result.Error, context.Canceled) {
+			logging.ErrorPersist(result.Error.Error())
 		}
 		logging.Debug("Request completed", "sessionID", sessionID)
 		a.activeRequests.Delete(sessionID)
 		cancel()
+		a.Publish(pubsub.CreatedEvent, result)
 		events <- result
 		close(events)
 	}()
 	return events, nil
 }

-func (a *agent) processGeneration(ctx context.Context, sessionID, content string) AgentEvent {
+func (a *agent) processGeneration(ctx context.Context, sessionID, content string, attachmentParts []message.ContentPart) AgentEvent {
 	// List existing messages; if none, start title generation asynchronously.
 	msgs, err := a.messages.List(ctx, sessionID)
 	if err != nil {
@@ -204,13 +246,13 @@ func (a *agent) processGeneration(ctx context.Context, sessionID, content string
 		}()
 	}

-	userMsg, err := a.createUserMessage(ctx, sessionID, content)
+	userMsg, err := a.createUserMessage(ctx, sessionID, content, attachmentParts)
 	if err != nil {
 		return a.err(fmt.Errorf("failed to create user message: %w", err))
 	}
-
 	// Append the new user message to the conversation history.
 	msgHistory := append(msgs, userMsg)
+
 	for {
 		// Check for cancellation before each iteration
 		select {
@@ -235,17 +277,19 @@ func (a *agent) processGeneration(ctx context.Context, sessionID, content string
 			continue
 		}
 		return AgentEvent{
-			message: agentMessage,
+			Type:    AgentEventTypeResponse,
+			Message: agentMessage,
+			Done:    true,
 		}
 	}
 }

-func (a *agent) createUserMessage(ctx context.Context, sessionID, content string) (message.Message, error) {
+func (a *agent) createUserMessage(ctx context.Context, sessionID, content string, attachmentParts []message.ContentPart) (message.Message, error) {
+	parts := []message.ContentPart{message.TextContent{Text: content}}
+	parts = append(parts, attachmentParts...)
 	return a.messages.Create(ctx, sessionID, message.CreateMessageParams{
-		Role: message.User,
-		Parts: []message.ContentPart{
-			message.TextContent{Text: content},
-		},
+		Role:  message.User,
+		Parts: parts,
 	})
 }

@@ -310,7 +354,6 @@ func (a *agent) streamAndHandleEvents(ctx context.Context, sessionID string, msg
 				}
 				continue
 			}
-
 			toolResult, toolErr := tool.Run(ctx, tools.ToolCall{
 				ID:    toolCall.ID,
 				Name:  toolCall.Name,
@@ -427,8 +470,8 @@ func (a *agent) TrackUsage(ctx context.Context, sessionID string, model models.M
 		model.CostPer1MOut/1e6*float64(usage.OutputTokens)

 	sess.Cost += cost
-	sess.CompletionTokens += usage.OutputTokens
-	sess.PromptTokens += usage.InputTokens
+	sess.CompletionTokens = usage.OutputTokens + usage.CacheReadTokens
+	sess.PromptTokens = usage.InputTokens + usage.CacheCreationTokens

 	_, err = a.sessions.Save(ctx, sess)
 	if err != nil {
@@ -456,6 +499,162 @@ func (a *agent) Update(agentName config.AgentName, modelID models.ModelID) (mode
 	return a.provider.Model(), nil
 }

+func (a *agent) Summarize(ctx context.Context, sessionID string) error {
+	if a.summarizeProvider == nil {
+		return fmt.Errorf("summarize provider not available")
+	}
+
+	// Check if session is busy
+	if a.IsSessionBusy(sessionID) {
+		return ErrSessionBusy
+	}
+
+	// Create a new context with cancellation
+	summarizeCtx, cancel := context.WithCancel(ctx)
+
+	// Store the cancel function in activeRequests to allow cancellation
+	a.activeRequests.Store(sessionID+"-summarize", cancel)
+
+	go func() {
+		defer a.activeRequests.Delete(sessionID + "-summarize")
+		defer cancel()
+		event := AgentEvent{
+			Type:     AgentEventTypeSummarize,
+			Progress: "Starting summarization...",
+		}
+
+		a.Publish(pubsub.CreatedEvent, event)
+		// Get all messages from the session
+		msgs, err := a.messages.List(summarizeCtx, sessionID)
+		if err != nil {
+			event = AgentEvent{
+				Type:  AgentEventTypeError,
+				Error: fmt.Errorf("failed to list messages: %w", err),
+				Done:  true,
+			}
+			a.Publish(pubsub.CreatedEvent, event)
+			return
+		}
+
+		if len(msgs) == 0 {
+			event = AgentEvent{
+				Type:  AgentEventTypeError,
+				Error: fmt.Errorf("no messages to summarize"),
+				Done:  true,
+			}
+			a.Publish(pubsub.CreatedEvent, event)
+			return
+		}
+
+		event = AgentEvent{
+			Type:     AgentEventTypeSummarize,
+			Progress: "Analyzing conversation...",
+		}
+		a.Publish(pubsub.CreatedEvent, event)
+
+		// Add a system message to guide the summarization
+		summarizePrompt := "Provide a detailed but concise summary of our conversation above. Focus on information that would be helpful for continuing the conversation, including what we did, what we're doing, which files we're working on, and what we're going to do next."
+
+		// Create a new message with the summarize prompt
+		promptMsg := message.Message{
+			Role:  message.User,
+			Parts: []message.ContentPart{message.TextContent{Text: summarizePrompt}},
+		}
+
+		// Append the prompt to the messages
+		msgsWithPrompt := append(msgs, promptMsg)
+
+		event = AgentEvent{
+			Type:     AgentEventTypeSummarize,
+			Progress: "Generating summary...",
+		}
+
+		a.Publish(pubsub.CreatedEvent, event)
+
+		// Send the messages to the summarize provider
+		response, err := a.summarizeProvider.SendMessages(
+			summarizeCtx,
+			msgsWithPrompt,
+			make([]tools.BaseTool, 0),
+		)
+		if err != nil {
+			event = AgentEvent{
+				Type:  AgentEventTypeError,
+				Error: fmt.Errorf("failed to summarize: %w", err),
+				Done:  true,
+			}
+			a.Publish(pubsub.CreatedEvent, event)
+			return
+		}
+
+		summary := strings.TrimSpace(response.Content)
+		if summary == "" {
+			event = AgentEvent{
+				Type:  AgentEventTypeError,
+				Error: fmt.Errorf("empty summary returned"),
+				Done:  true,
+			}
+			a.Publish(pubsub.CreatedEvent, event)
+			return
+		}
+		event = AgentEvent{
+			Type:     AgentEventTypeSummarize,
+			Progress: "Creating new session...",
+		}
+
+		a.Publish(pubsub.CreatedEvent, event)
+		oldSession, err := a.sessions.Get(summarizeCtx, sessionID)
+		if err != nil {
+			event = AgentEvent{
+				Type:  AgentEventTypeError,
+				Error: fmt.Errorf("failed to get session: %w", err),
+				Done:  true,
+			}
+
+			a.Publish(pubsub.CreatedEvent, event)
+			return
+		}
+		// Create a new session with the summary
+		newSession, err := a.sessions.Create(summarizeCtx, oldSession.Title+" - Continuation")
+		if err != nil {
+			event = AgentEvent{
+				Type:  AgentEventTypeError,
+				Error: fmt.Errorf("failed to create new session: %w", err),
+				Done:  true,
+			}
+			a.Publish(pubsub.CreatedEvent, event)
+			return
+		}
+
+		// Create a message in the new session with the summary
+		_, err = a.messages.Create(summarizeCtx, newSession.ID, message.CreateMessageParams{
+			Role:  message.Assistant,
+			Parts: []message.ContentPart{message.TextContent{Text: summary}},
+			Model: a.summarizeProvider.Model().ID,
+		})
+		if err != nil {
+			event = AgentEvent{
+				Type:  AgentEventTypeError,
+				Error: fmt.Errorf("failed to create summary message: %w", err),
+				Done:  true,
+			}
+
+			a.Publish(pubsub.CreatedEvent, event)
+			return
+		}
+		event = AgentEvent{
+			Type:      AgentEventTypeSummarize,
+			SessionID: newSession.ID,
+			Progress:  "Summary complete",
+			Done:      true,
+		}
+		a.Publish(pubsub.CreatedEvent, event)
+		// Send final success event with the new session ID
+	}()
+
+	return nil
+}
+
 func createAgentProvider(agentName config.AgentName) (provider.Provider, error) {
 	cfg := config.Get()
 	agentConfig, ok := cfg.Agents[agentName]
@@ -14,64 +14,69 @@ const (
 // https://docs.anthropic.com/en/docs/about-claude/models/all-models
 var AnthropicModels = map[ModelID]Model{
 	Claude35Sonnet: {
-		ID:                 Claude35Sonnet,
-		Name:               "Claude 3.5 Sonnet",
-		Provider:           ProviderAnthropic,
-		APIModel:           "claude-3-5-sonnet-latest",
-		CostPer1MIn:        3.0,
-		CostPer1MInCached:  3.75,
-		CostPer1MOutCached: 0.30,
-		CostPer1MOut:       15.0,
-		ContextWindow:      200000,
-		DefaultMaxTokens:   5000,
+		ID:                  Claude35Sonnet,
+		Name:                "Claude 3.5 Sonnet",
+		Provider:            ProviderAnthropic,
+		APIModel:            "claude-3-5-sonnet-latest",
+		CostPer1MIn:         3.0,
+		CostPer1MInCached:   3.75,
+		CostPer1MOutCached:  0.30,
+		CostPer1MOut:        15.0,
+		ContextWindow:       200000,
+		DefaultMaxTokens:    5000,
+		SupportsAttachments: true,
 	},
 	Claude3Haiku: {
-		ID:                 Claude3Haiku,
-		Name:               "Claude 3 Haiku",
-		Provider:           ProviderAnthropic,
-		APIModel:           "claude-3-haiku-20240307", // doesn't support "-latest"
-		CostPer1MIn:        0.25,
-		CostPer1MInCached:  0.30,
-		CostPer1MOutCached: 0.03,
-		CostPer1MOut:       1.25,
-		ContextWindow:      200000,
-		DefaultMaxTokens:   4096,
+		ID:                  Claude3Haiku,
+		Name:                "Claude 3 Haiku",
+		Provider:            ProviderAnthropic,
+		APIModel:            "claude-3-haiku-20240307", // doesn't support "-latest"
+		CostPer1MIn:         0.25,
+		CostPer1MInCached:   0.30,
+		CostPer1MOutCached:  0.03,
+		CostPer1MOut:        1.25,
+		ContextWindow:       200000,
+		DefaultMaxTokens:    4096,
+		SupportsAttachments: true,
 	},
 	Claude37Sonnet: {
-		ID:                 Claude37Sonnet,
-		Name:               "Claude 3.7 Sonnet",
-		Provider:           ProviderAnthropic,
-		APIModel:           "claude-3-7-sonnet-latest",
-		CostPer1MIn:        3.0,
-		CostPer1MInCached:  3.75,
-		CostPer1MOutCached: 0.30,
-		CostPer1MOut:       15.0,
-		ContextWindow:      200000,
-		DefaultMaxTokens:   50000,
-		CanReason:          true,
+		ID:                  Claude37Sonnet,
+		Name:                "Claude 3.7 Sonnet",
+		Provider:            ProviderAnthropic,
+		APIModel:            "claude-3-7-sonnet-latest",
+		CostPer1MIn:         3.0,
+		CostPer1MInCached:   3.75,
+		CostPer1MOutCached:  0.30,
+		CostPer1MOut:        15.0,
+		ContextWindow:       200000,
+		DefaultMaxTokens:    50000,
+		CanReason:           true,
+		SupportsAttachments: true,
 	},
 	Claude35Haiku: {
-		ID:                 Claude35Haiku,
-		Name:               "Claude 3.5 Haiku",
-		Provider:           ProviderAnthropic,
-		APIModel:           "claude-3-5-haiku-latest",
-		CostPer1MIn:        0.80,
-		CostPer1MInCached:  1.0,
-		CostPer1MOutCached: 0.08,
-		CostPer1MOut:       4.0,
-		ContextWindow:      200000,
-		DefaultMaxTokens:   4096,
+		ID:                  Claude35Haiku,
+		Name:                "Claude 3.5 Haiku",
+		Provider:            ProviderAnthropic,
+		APIModel:            "claude-3-5-haiku-latest",
+		CostPer1MIn:         0.80,
+		CostPer1MInCached:   1.0,
+		CostPer1MOutCached:  0.08,
+		CostPer1MOut:        4.0,
+		ContextWindow:       200000,
+		DefaultMaxTokens:    4096,
+		SupportsAttachments: true,
 	},
 	Claude3Opus: {
-		ID:                 Claude3Opus,
-		Name:               "Claude 3 Opus",
-		Provider:           ProviderAnthropic,
-		APIModel:           "claude-3-opus-latest",
-		CostPer1MIn:        15.0,
-		CostPer1MInCached:  18.75,
-		CostPer1MOutCached: 1.50,
-		CostPer1MOut:       75.0,
-		ContextWindow:      200000,
-		DefaultMaxTokens:   4096,
+		ID:                  Claude3Opus,
+		Name:                "Claude 3 Opus",
+		Provider:            ProviderAnthropic,
+		APIModel:            "claude-3-opus-latest",
+		CostPer1MIn:         15.0,
+		CostPer1MInCached:   18.75,
+		CostPer1MOutCached:  1.50,
+		CostPer1MOut:        75.0,
+		ContextWindow:       200000,
+		DefaultMaxTokens:    4096,
+		SupportsAttachments: true,
 	},
 }
@@ -18,140 +18,151 @@ const (

 var AzureModels = map[ModelID]Model{
 	AzureGPT41: {
-		ID:                 AzureGPT41,
-		Name:               "Azure OpenAI – GPT 4.1",
-		Provider:           ProviderAzure,
-		APIModel:           "gpt-4.1",
-		CostPer1MIn:        OpenAIModels[GPT41].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[GPT41].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[GPT41].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[GPT41].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[GPT41].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[GPT41].DefaultMaxTokens,
+		ID:                  AzureGPT41,
+		Name:                "Azure OpenAI – GPT 4.1",
+		Provider:            ProviderAzure,
+		APIModel:            "gpt-4.1",
+		CostPer1MIn:         OpenAIModels[GPT41].CostPer1MIn,
+		CostPer1MInCached:   OpenAIModels[GPT41].CostPer1MInCached,
+		CostPer1MOut:        OpenAIModels[GPT41].CostPer1MOut,
+		CostPer1MOutCached:  OpenAIModels[GPT41].CostPer1MOutCached,
+		ContextWindow:       OpenAIModels[GPT41].ContextWindow,
+		DefaultMaxTokens:    OpenAIModels[GPT41].DefaultMaxTokens,
+		SupportsAttachments: true,
 	},
 	AzureGPT41Mini: {
-		ID:                 AzureGPT41Mini,
-		Name:               "Azure OpenAI – GPT 4.1 mini",
-		Provider:           ProviderAzure,
-		APIModel:           "gpt-4.1-mini",
-		CostPer1MIn:        OpenAIModels[GPT41Mini].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[GPT41Mini].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[GPT41Mini].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[GPT41Mini].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[GPT41Mini].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[GPT41Mini].DefaultMaxTokens,
+		ID:                  AzureGPT41Mini,
+		Name:                "Azure OpenAI – GPT 4.1 mini",
+		Provider:            ProviderAzure,
+		APIModel:            "gpt-4.1-mini",
+		CostPer1MIn:         OpenAIModels[GPT41Mini].CostPer1MIn,
+		CostPer1MInCached:   OpenAIModels[GPT41Mini].CostPer1MInCached,
+		CostPer1MOut:        OpenAIModels[GPT41Mini].CostPer1MOut,
+		CostPer1MOutCached:  OpenAIModels[GPT41Mini].CostPer1MOutCached,
+		ContextWindow:       OpenAIModels[GPT41Mini].ContextWindow,
+		DefaultMaxTokens:    OpenAIModels[GPT41Mini].DefaultMaxTokens,
+		SupportsAttachments: true,
 	},
 	AzureGPT41Nano: {
-		ID:                 AzureGPT41Nano,
-		Name:               "Azure OpenAI – GPT 4.1 nano",
-		Provider:           ProviderAzure,
-		APIModel:           "gpt-4.1-nano",
-		CostPer1MIn:        OpenAIModels[GPT41Nano].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[GPT41Nano].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[GPT41Nano].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[GPT41Nano].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[GPT41Nano].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[GPT41Nano].DefaultMaxTokens,
+		ID:                  AzureGPT41Nano,
+		Name:                "Azure OpenAI – GPT 4.1 nano",
+		Provider:            ProviderAzure,
+		APIModel:            "gpt-4.1-nano",
+		CostPer1MIn:         OpenAIModels[GPT41Nano].CostPer1MIn,
+		CostPer1MInCached:   OpenAIModels[GPT41Nano].CostPer1MInCached,
+		CostPer1MOut:        OpenAIModels[GPT41Nano].CostPer1MOut,
+		CostPer1MOutCached:  OpenAIModels[GPT41Nano].CostPer1MOutCached,
+		ContextWindow:       OpenAIModels[GPT41Nano].ContextWindow,
+		DefaultMaxTokens:    OpenAIModels[GPT41Nano].DefaultMaxTokens,
+		SupportsAttachments: true,
 	},
 	AzureGPT45Preview: {
-		ID:                 AzureGPT45Preview,
-		Name:               "Azure OpenAI – GPT 4.5 preview",
-		Provider:           ProviderAzure,
-		APIModel:           "gpt-4.5-preview",
-		CostPer1MIn:        OpenAIModels[GPT45Preview].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[GPT45Preview].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[GPT45Preview].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[GPT45Preview].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[GPT45Preview].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[GPT45Preview].DefaultMaxTokens,
+		ID:                  AzureGPT45Preview,
+		Name:                "Azure OpenAI – GPT 4.5 preview",
+		Provider:            ProviderAzure,
+		APIModel:            "gpt-4.5-preview",
+		CostPer1MIn:         OpenAIModels[GPT45Preview].CostPer1MIn,
+		CostPer1MInCached:   OpenAIModels[GPT45Preview].CostPer1MInCached,
+		CostPer1MOut:        OpenAIModels[GPT45Preview].CostPer1MOut,
+		CostPer1MOutCached:  OpenAIModels[GPT45Preview].CostPer1MOutCached,
+		ContextWindow:       OpenAIModels[GPT45Preview].ContextWindow,
+		DefaultMaxTokens:    OpenAIModels[GPT45Preview].DefaultMaxTokens,
+		SupportsAttachments: true,
 	},
 	AzureGPT4o: {
-		ID:                 AzureGPT4o,
-		Name:               "Azure OpenAI – GPT-4o",
-		Provider:           ProviderAzure,
-		APIModel:           "gpt-4o",
-		CostPer1MIn:        OpenAIModels[GPT4o].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[GPT4o].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[GPT4o].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[GPT4o].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[GPT4o].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[GPT4o].DefaultMaxTokens,
+		ID:                  AzureGPT4o,
+		Name:                "Azure OpenAI – GPT-4o",
+		Provider:            ProviderAzure,
+		APIModel:            "gpt-4o",
+		CostPer1MIn:         OpenAIModels[GPT4o].CostPer1MIn,
+		CostPer1MInCached:   OpenAIModels[GPT4o].CostPer1MInCached,
+		CostPer1MOut:        OpenAIModels[GPT4o].CostPer1MOut,
+		CostPer1MOutCached:  OpenAIModels[GPT4o].CostPer1MOutCached,
+		ContextWindow:       OpenAIModels[GPT4o].ContextWindow,
+		DefaultMaxTokens:    OpenAIModels[GPT4o].DefaultMaxTokens,
+		SupportsAttachments: true,
 	},
 	AzureGPT4oMini: {
-		ID:                 AzureGPT4oMini,
-		Name:               "Azure OpenAI – GPT-4o mini",
-		Provider:           ProviderAzure,
-		APIModel:           "gpt-4o-mini",
-		CostPer1MIn:        OpenAIModels[GPT4oMini].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[GPT4oMini].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[GPT4oMini].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[GPT4oMini].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[GPT4oMini].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[GPT4oMini].DefaultMaxTokens,
+		ID:                  AzureGPT4oMini,
+		Name:                "Azure OpenAI – GPT-4o mini",
+		Provider:            ProviderAzure,
+		APIModel:            "gpt-4o-mini",
+		CostPer1MIn:         OpenAIModels[GPT4oMini].CostPer1MIn,
+		CostPer1MInCached:   OpenAIModels[GPT4oMini].CostPer1MInCached,
+		CostPer1MOut:        OpenAIModels[GPT4oMini].CostPer1MOut,
+		CostPer1MOutCached:  OpenAIModels[GPT4oMini].CostPer1MOutCached,
+		ContextWindow:       OpenAIModels[GPT4oMini].ContextWindow,
+		DefaultMaxTokens:    OpenAIModels[GPT4oMini].DefaultMaxTokens,
+		SupportsAttachments: true,
 	},
 	AzureO1: {
-		ID:                 AzureO1,
-		Name:               "Azure OpenAI – O1",
-		Provider:           ProviderAzure,
-		APIModel:           "o1",
-		CostPer1MIn:        OpenAIModels[O1].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[O1].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[O1].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[O1].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[O1].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[O1].DefaultMaxTokens,
-		CanReason:          OpenAIModels[O1].CanReason,
+		ID:                  AzureO1,
+		Name:                "Azure OpenAI – O1",
+		Provider:            ProviderAzure,
+		APIModel:            "o1",
+		CostPer1MIn:         OpenAIModels[O1].CostPer1MIn,
+		CostPer1MInCached:   OpenAIModels[O1].CostPer1MInCached,
+		CostPer1MOut:        OpenAIModels[O1].CostPer1MOut,
+		CostPer1MOutCached:  OpenAIModels[O1].CostPer1MOutCached,
+		ContextWindow:       OpenAIModels[O1].ContextWindow,
+		DefaultMaxTokens:    OpenAIModels[O1].DefaultMaxTokens,
+		CanReason:           OpenAIModels[O1].CanReason,
+		SupportsAttachments: true,
 	},
 	AzureO1Mini: {
-		ID:                 AzureO1Mini,
-		Name:               "Azure OpenAI – O1 mini",
-		Provider:           ProviderAzure,
-		APIModel:           "o1-mini",
-		CostPer1MIn:        OpenAIModels[O1Mini].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[O1Mini].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[O1Mini].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[O1Mini].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[O1Mini].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[O1Mini].DefaultMaxTokens,
-		CanReason:          OpenAIModels[O1Mini].CanReason,
+		ID:                  AzureO1Mini,
+		Name:                "Azure OpenAI – O1 mini",
+		Provider:            ProviderAzure,
+		APIModel:            "o1-mini",
+		CostPer1MIn:         OpenAIModels[O1Mini].CostPer1MIn,
+		CostPer1MInCached:   OpenAIModels[O1Mini].CostPer1MInCached,
+		CostPer1MOut:        OpenAIModels[O1Mini].CostPer1MOut,
+		CostPer1MOutCached:  OpenAIModels[O1Mini].CostPer1MOutCached,
+		ContextWindow:       OpenAIModels[O1Mini].ContextWindow,
+		DefaultMaxTokens:    OpenAIModels[O1Mini].DefaultMaxTokens,
+		CanReason:           OpenAIModels[O1Mini].CanReason,
+		SupportsAttachments: true,
 	},
 	AzureO3: {
-		ID:                 AzureO3,
-		Name:               "Azure OpenAI – O3",
-		Provider:           ProviderAzure,
-		APIModel:           "o3",
-		CostPer1MIn:        OpenAIModels[O3].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[O3].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[O3].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[O3].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[O3].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[O3].DefaultMaxTokens,
-		CanReason:          OpenAIModels[O3].CanReason,
+		ID:                  AzureO3,
+		Name:                "Azure OpenAI – O3",
+		Provider:            ProviderAzure,
+		APIModel:            "o3",
+		CostPer1MIn:         OpenAIModels[O3].CostPer1MIn,
+		CostPer1MInCached:   OpenAIModels[O3].CostPer1MInCached,
+		CostPer1MOut:        OpenAIModels[O3].CostPer1MOut,
+		CostPer1MOutCached:  OpenAIModels[O3].CostPer1MOutCached,
+		ContextWindow:       OpenAIModels[O3].ContextWindow,
+		DefaultMaxTokens:    OpenAIModels[O3].DefaultMaxTokens,
+		CanReason:           OpenAIModels[O3].CanReason,
+		SupportsAttachments: true,
 	},
 	AzureO3Mini: {
-		ID:                 AzureO3Mini,
-		Name:               "Azure OpenAI – O3 mini",
-		Provider:           ProviderAzure,
-		APIModel:           "o3-mini",
-		CostPer1MIn:        OpenAIModels[O3Mini].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[O3Mini].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[O3Mini].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[O3Mini].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[O3Mini].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[O3Mini].DefaultMaxTokens,
-		CanReason:          OpenAIModels[O3Mini].CanReason,
+		ID:                  AzureO3Mini,
+		Name:                "Azure OpenAI – O3 mini",
+		Provider:            ProviderAzure,
+		APIModel:            "o3-mini",
+		CostPer1MIn:         OpenAIModels[O3Mini].CostPer1MIn,
+		CostPer1MInCached:   OpenAIModels[O3Mini].CostPer1MInCached,
+		CostPer1MOut:        OpenAIModels[O3Mini].CostPer1MOut,
+		CostPer1MOutCached:  OpenAIModels[O3Mini].CostPer1MOutCached,
+		ContextWindow:       OpenAIModels[O3Mini].ContextWindow,
+		DefaultMaxTokens:    OpenAIModels[O3Mini].DefaultMaxTokens,
+		CanReason:           OpenAIModels[O3Mini].CanReason,
+		SupportsAttachments: false,
 	},
 	AzureO4Mini: {
-		ID:                 AzureO4Mini,
-		Name:               "Azure OpenAI – O4 mini",
-		Provider:           ProviderAzure,
-		APIModel:           "o4-mini",
-		CostPer1MIn:        OpenAIModels[O4Mini].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[O4Mini].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[O4Mini].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[O4Mini].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[O4Mini].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[O4Mini].DefaultMaxTokens,
-		CanReason:          OpenAIModels[O4Mini].CanReason,
+		ID:                  AzureO4Mini,
+		Name:                "Azure OpenAI – O4 mini",
+		Provider:            ProviderAzure,
+		APIModel:            "o4-mini",
+		CostPer1MIn:         OpenAIModels[O4Mini].CostPer1MIn,
+		CostPer1MInCached:   OpenAIModels[O4Mini].CostPer1MInCached,
+		CostPer1MOut:        OpenAIModels[O4Mini].CostPer1MOut,
+		CostPer1MOutCached:  OpenAIModels[O4Mini].CostPer1MOutCached,
+		ContextWindow:       OpenAIModels[O4Mini].ContextWindow,
+		DefaultMaxTokens:    OpenAIModels[O4Mini].DefaultMaxTokens,
+		CanReason:           OpenAIModels[O4Mini].CanReason,
+		SupportsAttachments: true,
 	},
 }
@@ -12,52 +12,56 @@ const (

 var GeminiModels = map[ModelID]Model{
 	Gemini25Flash: {
-		ID:                 Gemini25Flash,
-		Name:               "Gemini 2.5 Flash",
-		Provider:           ProviderGemini,
-		APIModel:           "gemini-2.5-flash-preview-04-17",
-		CostPer1MIn:        0.15,
-		CostPer1MInCached:  0,
-		CostPer1MOutCached: 0,
-		CostPer1MOut:       0.60,
-		ContextWindow:      1000000,
-		DefaultMaxTokens:   50000,
+		ID:                  Gemini25Flash,
+		Name:                "Gemini 2.5 Flash",
+		Provider:            ProviderGemini,
+		APIModel:            "gemini-2.5-flash-preview-04-17",
+		CostPer1MIn:         0.15,
+		CostPer1MInCached:   0,
+		CostPer1MOutCached:  0,
+		CostPer1MOut:        0.60,
+		ContextWindow:       1000000,
+		DefaultMaxTokens:    50000,
+		SupportsAttachments: true,
 	},
 	Gemini25: {
-		ID:                 Gemini25,
-		Name:               "Gemini 2.5 Pro",
-		Provider:           ProviderGemini,
-		APIModel:           "gemini-2.5-pro-preview-03-25",
-		CostPer1MIn:        1.25,
-		CostPer1MInCached:  0,
-		CostPer1MOutCached: 0,
-		CostPer1MOut:       10,
-		ContextWindow:      1000000,
-		DefaultMaxTokens:   50000,
+		ID:                  Gemini25,
+		Name:                "Gemini 2.5 Pro",
+		Provider:            ProviderGemini,
+		APIModel:            "gemini-2.5-pro-preview-03-25",
+		CostPer1MIn:         1.25,
+		CostPer1MInCached:   0,
+		CostPer1MOutCached:  0,
+		CostPer1MOut:        10,
+		ContextWindow:       1000000,
+		DefaultMaxTokens:    50000,
+		SupportsAttachments: true,
 	},

 	Gemini20Flash: {
-		ID:                 Gemini20Flash,
-		Name:               "Gemini 2.0 Flash",
-		Provider:           ProviderGemini,
-		APIModel:           "gemini-2.0-flash",
-		CostPer1MIn:        0.10,
-		CostPer1MInCached:  0,
-		CostPer1MOutCached: 0,
-		CostPer1MOut:       0.40,
-		ContextWindow:      1000000,
-		DefaultMaxTokens:   6000,
+		ID:                  Gemini20Flash,
+		Name:                "Gemini 2.0 Flash",
+		Provider:            ProviderGemini,
+		APIModel:            "gemini-2.0-flash",
+		CostPer1MIn:         0.10,
+		CostPer1MInCached:   0,
+		CostPer1MOutCached:  0,
+		CostPer1MOut:        0.40,
+		ContextWindow:       1000000,
+		DefaultMaxTokens:    6000,
+		SupportsAttachments: true,
 	},
 	Gemini20FlashLite: {
-		ID:                 Gemini20FlashLite,
-		Name:               "Gemini 2.0 Flash Lite",
-		Provider:           ProviderGemini,
-		APIModel:           "gemini-2.0-flash-lite",
-		CostPer1MIn:        0.05,
-		CostPer1MInCached:  0,
-		CostPer1MOutCached: 0,
-		CostPer1MOut:       0.30,
-		ContextWindow:      1000000,
-		DefaultMaxTokens:   6000,
+		ID:                  Gemini20FlashLite,
+		Name:                "Gemini 2.0 Flash Lite",
+		Provider:            ProviderGemini,
+		APIModel:            "gemini-2.0-flash-lite",
+		CostPer1MIn:         0.05,
+		CostPer1MInCached:   0,
+		CostPer1MOutCached:  0,
+		CostPer1MOut:        0.30,
+		ContextWindow:       1000000,
+		DefaultMaxTokens:    6000,
+		SupportsAttachments: true,
 	},
 }
@@ -28,55 +28,60 @@ var GroqModels = map[ModelID]Model{
 		ContextWindow:      128_000,
 		DefaultMaxTokens:   50000,
 		// for some reason, the groq api doesn't like the reasoningEffort parameter
-		CanReason: false,
+		CanReason:           false,
+		SupportsAttachments: false,
 	},

 	Llama4Scout: {
-		ID:                 Llama4Scout,
-		Name:               "Llama4Scout",
-		Provider:           ProviderGROQ,
-		APIModel:           "meta-llama/llama-4-scout-17b-16e-instruct",
-		CostPer1MIn:        0.11,
-		CostPer1MInCached:  0,
-		CostPer1MOutCached: 0,
-		CostPer1MOut:       0.34,
-		ContextWindow:      128_000, // 10M when?
+		ID:                  Llama4Scout,
+		Name:                "Llama4Scout",
+		Provider:            ProviderGROQ,
+		APIModel:            "meta-llama/llama-4-scout-17b-16e-instruct",
+		CostPer1MIn:         0.11,
+		CostPer1MInCached:   0,
+		CostPer1MOutCached:  0,
+		CostPer1MOut:        0.34,
+		ContextWindow:       128_000, // 10M when?
+		SupportsAttachments: true,
 	},

 	Llama4Maverick: {
-		ID:                 Llama4Maverick,
-		Name:               "Llama4Maverick",
-		Provider:           ProviderGROQ,
-		APIModel:           "meta-llama/llama-4-maverick-17b-128e-instruct",
-		CostPer1MIn:        0.20,
-		CostPer1MInCached:  0,
-		CostPer1MOutCached: 0,
-		CostPer1MOut:       0.20,
-		ContextWindow:      128_000,
+		ID:                  Llama4Maverick,
+		Name:                "Llama4Maverick",
+		Provider:            ProviderGROQ,
+		APIModel:            "meta-llama/llama-4-maverick-17b-128e-instruct",
+		CostPer1MIn:         0.20,
+		CostPer1MInCached:   0,
+		CostPer1MOutCached:  0,
+		CostPer1MOut:        0.20,
+		ContextWindow:       128_000,
+		SupportsAttachments: true,
 	},

 	Llama3_3_70BVersatile: {
-		ID:                 Llama3_3_70BVersatile,
-		Name:               "Llama3_3_70BVersatile",
-		Provider:           ProviderGROQ,
-		APIModel:           "llama-3.3-70b-versatile",
-		CostPer1MIn:        0.59,
-		CostPer1MInCached:  0,
-		CostPer1MOutCached: 0,
-		CostPer1MOut:       0.79,
-		ContextWindow:      128_000,
+		ID:                  Llama3_3_70BVersatile,
+		Name:                "Llama3_3_70BVersatile",
+		Provider:            ProviderGROQ,
+		APIModel:            "llama-3.3-70b-versatile",
+		CostPer1MIn:         0.59,
+		CostPer1MInCached:   0,
+		CostPer1MOutCached:  0,
+		CostPer1MOut:        0.79,
+		ContextWindow:       128_000,
+		SupportsAttachments: false,
 	},

 	DeepseekR1DistillLlama70b: {
-		ID:                 DeepseekR1DistillLlama70b,
-		Name:               "DeepseekR1DistillLlama70b",
-		Provider:           ProviderGROQ,
-		APIModel:           "deepseek-r1-distill-llama-70b",
-		CostPer1MIn:        0.75,
-		CostPer1MInCached:  0,
-		CostPer1MOutCached: 0,
-		CostPer1MOut:       0.99,
-		ContextWindow:      128_000,
-		CanReason:          true,
+		ID:                  DeepseekR1DistillLlama70b,
+		Name:                "DeepseekR1DistillLlama70b",
+		Provider:            ProviderGROQ,
+		APIModel:            "deepseek-r1-distill-llama-70b",
+		CostPer1MIn:         0.75,
+		CostPer1MInCached:   0,
+		CostPer1MOutCached:  0,
+		CostPer1MOut:        0.99,
+		ContextWindow:       128_000,
+		CanReason:           true,
+		SupportsAttachments: false,
 	},
 }
@@ -8,17 +8,18 @@ type (
 )

 type Model struct {
-	ID                 ModelID       `json:"id"`
-	Name               string        `json:"name"`
-	Provider           ModelProvider `json:"provider"`
-	APIModel           string        `json:"api_model"`
-	CostPer1MIn        float64       `json:"cost_per_1m_in"`
-	CostPer1MOut       float64       `json:"cost_per_1m_out"`
-	CostPer1MInCached  float64       `json:"cost_per_1m_in_cached"`
-	CostPer1MOutCached float64       `json:"cost_per_1m_out_cached"`
-	ContextWindow      int64         `json:"context_window"`
-	DefaultMaxTokens   int64         `json:"default_max_tokens"`
-	CanReason          bool          `json:"can_reason"`
+	ID                  ModelID       `json:"id"`
+	Name                string        `json:"name"`
+	Provider            ModelProvider `json:"provider"`
+	APIModel            string        `json:"api_model"`
+	CostPer1MIn         float64       `json:"cost_per_1m_in"`
+	CostPer1MOut        float64       `json:"cost_per_1m_out"`
+	CostPer1MInCached   float64       `json:"cost_per_1m_in_cached"`
+	CostPer1MOutCached  float64       `json:"cost_per_1m_out_cached"`
+	ContextWindow       int64         `json:"context_window"`
+	DefaultMaxTokens    int64         `json:"default_max_tokens"`
+	CanReason           bool          `json:"can_reason"`
+	SupportsAttachments bool          `json:"supports_attachments"`
 }

 // Model IDs
@@ -89,4 +90,5 @@ func init() {
 	maps.Copy(SupportedModels, GroqModels)
 	maps.Copy(SupportedModels, AzureModels)
 	maps.Copy(SupportedModels, OpenRouterModels)
+	maps.Copy(SupportedModels, XAIModels)
 }
@@ -19,151 +19,163 @@ const (

 var OpenAIModels = map[ModelID]Model{
 	GPT41: {
-		ID:                 GPT41,
-		Name:               "GPT 4.1",
-		Provider:           ProviderOpenAI,
-		APIModel:           "gpt-4.1",
-		CostPer1MIn:        2.00,
-		CostPer1MInCached:  0.50,
-		CostPer1MOutCached: 0.0,
-		CostPer1MOut:       8.00,
-		ContextWindow:      1_047_576,
-		DefaultMaxTokens:   20000,
+		ID:                  GPT41,
+		Name:                "GPT 4.1",
+		Provider:            ProviderOpenAI,
+		APIModel:            "gpt-4.1",
+		CostPer1MIn:         2.00,
+		CostPer1MInCached:   0.50,
+		CostPer1MOutCached:  0.0,
+		CostPer1MOut:        8.00,
+		ContextWindow:       1_047_576,
+		DefaultMaxTokens:    20000,
+		SupportsAttachments: true,
 	},
 	GPT41Mini: {
-		ID:                 GPT41Mini,
-		Name:               "GPT 4.1 mini",
-		Provider:           ProviderOpenAI,
-		APIModel:           "gpt-4.1",
-		CostPer1MIn:        0.40,
-		CostPer1MInCached:  0.10,
-		CostPer1MOutCached: 0.0,
-		CostPer1MOut:       1.60,
-		ContextWindow:      200_000,
-		DefaultMaxTokens:   20000,
+		ID:                  GPT41Mini,
+		Name:                "GPT 4.1 mini",
+		Provider:            ProviderOpenAI,
+		APIModel:            "gpt-4.1",
+		CostPer1MIn:         0.40,
+		CostPer1MInCached:   0.10,
+		CostPer1MOutCached:  0.0,
+		CostPer1MOut:        1.60,
+		ContextWindow:       200_000,
+		DefaultMaxTokens:    20000,
+		SupportsAttachments: true,
 	},
 	GPT41Nano: {
-		ID:                 GPT41Nano,
-		Name:               "GPT 4.1 nano",
-		Provider:           ProviderOpenAI,
-		APIModel:           "gpt-4.1-nano",
-		CostPer1MIn:        0.10,
-		CostPer1MInCached:  0.025,
-		CostPer1MOutCached: 0.0,
-		CostPer1MOut:       0.40,
-		ContextWindow:      1_047_576,
-		DefaultMaxTokens:   20000,
+		ID:                  GPT41Nano,
+		Name:                "GPT 4.1 nano",
+		Provider:            ProviderOpenAI,
+		APIModel:            "gpt-4.1-nano",
+		CostPer1MIn:         0.10,
+		CostPer1MInCached:   0.025,
+		CostPer1MOutCached:  0.0,
+		CostPer1MOut:        0.40,
+		ContextWindow:       1_047_576,
+		DefaultMaxTokens:    20000,
+		SupportsAttachments: true,
 	},
 	GPT45Preview: {
-		ID:                 GPT45Preview,
-		Name:               "GPT 4.5 preview",
-		Provider:           ProviderOpenAI,
-		APIModel:           "gpt-4.5-preview",
-		CostPer1MIn:        75.00,
-		CostPer1MInCached:  37.50,
-		CostPer1MOutCached: 0.0,
-		CostPer1MOut:       150.00,
-		ContextWindow:      128_000,
-		DefaultMaxTokens:   15000,
+		ID:                  GPT45Preview,
+		Name:                "GPT 4.5 preview",
+		Provider:            ProviderOpenAI,
+		APIModel:            "gpt-4.5-preview",
+		CostPer1MIn:         75.00,
+		CostPer1MInCached:   37.50,
+		CostPer1MOutCached:  0.0,
+		CostPer1MOut:        150.00,
+		ContextWindow:       128_000,
+		DefaultMaxTokens:    15000,
+		SupportsAttachments: true,
 	},
 	GPT4o: {
-		ID:                 GPT4o,
-		Name:               "GPT 4o",
-		Provider:           ProviderOpenAI,
-		APIModel:           "gpt-4o",
-		CostPer1MIn:        2.50,
-		CostPer1MInCached:  1.25,
-		CostPer1MOutCached: 0.0,
-		CostPer1MOut:       10.00,
-		ContextWindow:      128_000,
-		DefaultMaxTokens:   4096,
+		ID:                  GPT4o,
+		Name:                "GPT 4o",
+		Provider:            ProviderOpenAI,
+		APIModel:            "gpt-4o",
+		CostPer1MIn:         2.50,
+		CostPer1MInCached:   1.25,
+		CostPer1MOutCached:  0.0,
+		CostPer1MOut:        10.00,
+		ContextWindow:       128_000,
+		DefaultMaxTokens:    4096,
+		SupportsAttachments: true,
 	},
 	GPT4oMini: {
-		ID:                 GPT4oMini,
-		Name:               "GPT 4o mini",
-		Provider:           ProviderOpenAI,
-		APIModel:           "gpt-4o-mini",
-		CostPer1MIn:        0.15,
-		CostPer1MInCached:  0.075,
-		CostPer1MOutCached: 0.0,
-		CostPer1MOut:       0.60,
-		ContextWindow:      128_000,
+		ID:                  GPT4oMini,
+		Name:                "GPT 4o mini",
+		Provider:            ProviderOpenAI,
+		APIModel:            "gpt-4o-mini",
+		CostPer1MIn:         0.15,
+		CostPer1MInCached:   0.075,
+		CostPer1MOutCached:  0.0,
+		CostPer1MOut:        0.60,
+		ContextWindow:       128_000,
+		SupportsAttachments: true,
 	},
 	O1: {
-		ID:                 O1,
-		Name:               "O1",
-		Provider:           ProviderOpenAI,
-		APIModel:           "o1",
-		CostPer1MIn:        15.00,
-		CostPer1MInCached:  7.50,
-		CostPer1MOutCached: 0.0,
-		CostPer1MOut:       60.00,
-		ContextWindow:      200_000,
-		DefaultMaxTokens:   50000,
-		CanReason:          true,
+		ID:                  O1,
+		Name:                "O1",
+		Provider:            ProviderOpenAI,
+		APIModel:            "o1",
+		CostPer1MIn:         15.00,
+		CostPer1MInCached:   7.50,
+		CostPer1MOutCached:  0.0,
+		CostPer1MOut:        60.00,
+		ContextWindow:       200_000,
+		DefaultMaxTokens:    50000,
+		CanReason:           true,
+		SupportsAttachments: true,
 	},
 	O1Pro: {
-		ID:                 O1Pro,
-		Name:               "o1 pro",
-		Provider:           ProviderOpenAI,
-		APIModel:           "o1-pro",
-		CostPer1MIn:        150.00,
-		CostPer1MInCached:  0.0,
-		CostPer1MOutCached: 0.0,
-		CostPer1MOut:       600.00,
-		ContextWindow:      200_000,
-		DefaultMaxTokens:   50000,
-		CanReason:          true,
+		ID:                  O1Pro,
+		Name:                "o1 pro",
+		Provider:            ProviderOpenAI,
+		APIModel:            "o1-pro",
+		CostPer1MIn:         150.00,
+		CostPer1MInCached:   0.0,
+		CostPer1MOutCached:  0.0,
+		CostPer1MOut:        600.00,
+		ContextWindow:       200_000,
+		DefaultMaxTokens:    50000,
+		CanReason:           true,
+		SupportsAttachments: true,
 	},
 	O1Mini: {
-		ID:                 O1Mini,
-		Name:               "o1 mini",
-		Provider:           ProviderOpenAI,
-		APIModel:           "o1-mini",
-		CostPer1MIn:        1.10,
-		CostPer1MInCached:  0.55,
-		CostPer1MOutCached: 0.0,
-		CostPer1MOut:       4.40,
-		ContextWindow:      128_000,
-		DefaultMaxTokens:   50000,
-		CanReason:          true,
+		ID:                  O1Mini,
+		Name:                "o1 mini",
+		Provider:            ProviderOpenAI,
+		APIModel:            "o1-mini",
+		CostPer1MIn:         1.10,
+		CostPer1MInCached:   0.55,
+		CostPer1MOutCached:  0.0,
+		CostPer1MOut:        4.40,
+		ContextWindow:       128_000,
+		DefaultMaxTokens:    50000,
+		CanReason:           true,
+		SupportsAttachments: true,
 	},
 	O3: {
-		ID:                 O3,
-		Name:               "o3",
-		Provider:           ProviderOpenAI,
-		APIModel:           "o3",
-		CostPer1MIn:        10.00,
-		CostPer1MInCached:  2.50,
-		CostPer1MOutCached: 0.0,
-		CostPer1MOut:       40.00,
-		ContextWindow:      200_000,
-		CanReason:          true,
+		ID:                  O3,
+		Name:                "o3",
+		Provider:            ProviderOpenAI,
+		APIModel:            "o3",
+		CostPer1MIn:         10.00,
+		CostPer1MInCached:   2.50,
+		CostPer1MOutCached:  0.0,
+		CostPer1MOut:        40.00,
+		ContextWindow:       200_000,
+		CanReason:           true,
+		SupportsAttachments: true,
 	},
 	O3Mini: {
-		ID:                 O3Mini,
-		Name:               "o3 mini",
-		Provider:           ProviderOpenAI,
-		APIModel:           "o3-mini",
-		CostPer1MIn:        1.10,
-		CostPer1MInCached:  0.55,
-		CostPer1MOutCached: 0.0,
-		CostPer1MOut:       4.40,
-		ContextWindow:      200_000,
-		DefaultMaxTokens:   50000,
-		CanReason:          true,
+		ID:                  O3Mini,
+		Name:                "o3 mini",
+		Provider:            ProviderOpenAI,
+		APIModel:            "o3-mini",
+		CostPer1MIn:         1.10,
+		CostPer1MInCached:   0.55,
+		CostPer1MOutCached:  0.0,
+		CostPer1MOut:        4.40,
+		ContextWindow:       200_000,
+		DefaultMaxTokens:    50000,
+		CanReason:           true,
+		SupportsAttachments: false,
 	},
 	O4Mini: {
-		ID:                 O4Mini,
-		Name:               "o4 mini",
-		Provider:           ProviderOpenAI,
-		APIModel:           "o4-mini",
-		CostPer1MIn:        1.10,
-		CostPer1MInCached:  0.275,
-		CostPer1MOutCached: 0.0,
-		CostPer1MOut:       4.40,
-		ContextWindow:      128_000,
-		DefaultMaxTokens:   50000,
-		CanReason:          true,
+		ID:                  O4Mini,
+		Name:                "o4 mini",
+		Provider:            ProviderOpenAI,
+		APIModel:            "o4-mini",
+		CostPer1MIn:         1.10,
+		CostPer1MInCached:   0.275,
+		CostPer1MOutCached:  0.0,
+		CostPer1MOut:        4.40,
+		ContextWindow:       128_000,
+		DefaultMaxTokens:    50000,
+		CanReason:           true,
+		SupportsAttachments: true,
 	},
 }
@@ -0,0 +1,61 @@
+package models
+
+const (
+	ProviderXAI ModelProvider = "xai"
+
+	XAIGrok3Beta         ModelID = "grok-3-beta"
+	XAIGrok3MiniBeta     ModelID = "grok-3-mini-beta"
+	XAIGrok3FastBeta     ModelID = "grok-3-fast-beta"
+	XAiGrok3MiniFastBeta ModelID = "grok-3-mini-fast-beta"
+)
+
+var XAIModels = map[ModelID]Model{
+	XAIGrok3Beta: {
+		ID:                 XAIGrok3Beta,
+		Name:               "Grok3 Beta",
+		Provider:           ProviderXAI,
+		APIModel:           "grok-3-beta",
+		CostPer1MIn:        3.0,
+		CostPer1MInCached:  0,
+		CostPer1MOut:       15,
+		CostPer1MOutCached: 0,
+		ContextWindow:      131_072,
+		DefaultMaxTokens:   20_000,
+	},
+	XAIGrok3MiniBeta: {
+		ID:                 XAIGrok3MiniBeta,
+		Name:               "Grok3 Mini Beta",
+		Provider:           ProviderXAI,
+		APIModel:           "grok-3-mini-beta",
+		CostPer1MIn:        0.3,
+		CostPer1MInCached:  0,
+		CostPer1MOut:       0.5,
+		CostPer1MOutCached: 0,
+		ContextWindow:      131_072,
+		DefaultMaxTokens:   20_000,
+	},
+	XAIGrok3FastBeta: {
+		ID:                 XAIGrok3FastBeta,
+		Name:               "Grok3 Fast Beta",
+		Provider:           ProviderXAI,
+		APIModel:           "grok-3-fast-beta",
+		CostPer1MIn:        5,
+		CostPer1MInCached:  0,
+		CostPer1MOut:       25,
+		CostPer1MOutCached: 0,
+		ContextWindow:      131_072,
+		DefaultMaxTokens:   20_000,
+	},
+	XAiGrok3MiniFastBeta: {
+		ID:                 XAiGrok3MiniFastBeta,
+		Name:               "Grok3 Mini Fast Beta",
+		Provider:           ProviderXAI,
+		APIModel:           "grok-3-mini-fast-beta",
+		CostPer1MIn:        0.6,
+		CostPer1MInCached:  0,
+		CostPer1MOut:       4.0,
+		CostPer1MOutCached: 0,
+		ContextWindow:      131_072,
+		DefaultMaxTokens:   20_000,
+	},
+}
@@ -21,6 +21,8 @@ func GetAgentPrompt(agentName config.AgentName, provider models.ModelProvider) s
 		basePrompt = TitlePrompt(provider)
 	case config.AgentTask:
 		basePrompt = TaskPrompt(provider)
+	case config.AgentSummarizer:
+		basePrompt = SummarizerPrompt(provider)
 	default:
 		basePrompt = "You are a helpful assistant"
 	}
@@ -0,0 +1,16 @@
+package prompt
+
+import "github.com/opencode-ai/opencode/internal/llm/models"
+
+func SummarizerPrompt(_ models.ModelProvider) string {
+	return `You are a helpful AI assistant tasked with summarizing conversations.
+
+When asked to summarize, provide a detailed but concise summary of the conversation. 
+Focus on information that would be helpful for continuing the conversation, including:
+- What was done
+- What is currently being worked on
+- Which files are being modified
+- What needs to be done next
+
+Your summary should be comprehensive enough to provide context but concise enough to be quickly understood.`
+}
@@ -8,5 +8,6 @@ func TitlePrompt(_ models.ModelProvider) string {
 - the title should be a summary of the user's message
 - it should be one line long
 - do not use quotes or colons
- the entire text you return will be used as the title`
+- the entire text you return will be used as the title
+- never return anything that is more than one sentence (one line) long`
 }
@@ -13,6 +13,7 @@ import (
 	"github.com/anthropics/anthropic-sdk-go/bedrock"
 	"github.com/anthropics/anthropic-sdk-go/option"
 	"github.com/opencode-ai/opencode/internal/config"
+	"github.com/opencode-ai/opencode/internal/llm/models"
 	"github.com/opencode-ai/opencode/internal/llm/tools"
 	"github.com/opencode-ai/opencode/internal/logging"
 	"github.com/opencode-ai/opencode/internal/message"
@@ -70,7 +71,14 @@ func (a *anthropicClient) convertMessages(messages []message.Message) (anthropic
 					Type: "ephemeral",
 				}
 			}
-			anthropicMessages = append(anthropicMessages, anthropic.NewUserMessage(content))
+			var contentBlocks []anthropic.ContentBlockParamUnion
+			contentBlocks = append(contentBlocks, content)
+			for _, binaryContent := range msg.BinaryContent() {
+				base64Image := binaryContent.String(models.ProviderAnthropic)
+				imageBlock := anthropic.NewImageBlockBase64(binaryContent.MIMEType, base64Image)
+				contentBlocks = append(contentBlocks, imageBlock)
+			}
+			anthropicMessages = append(anthropicMessages, anthropic.NewUserMessage(contentBlocks...))

 		case message.Assistant:
 			blocks := []anthropic.ContentBlockParamUnion{}
@@ -196,9 +204,10 @@ func (a *anthropicClient) send(ctx context.Context, messages []message.Message,
 	preparedMessages := a.preparedMessages(a.convertMessages(messages), a.convertTools(tools))
 	cfg := config.Get()
 	if cfg.Debug {
-		// jsonData, _ := json.Marshal(preparedMessages)
-		// logging.Debug("Prepared messages", "messages", string(jsonData))
+		jsonData, _ := json.Marshal(preparedMessages)
+		logging.Debug("Prepared messages", "messages", string(jsonData))
 	}
+
 	attempts := 0
 	for {
 		attempts++
@@ -208,6 +217,7 @@ func (a *anthropicClient) send(ctx context.Context, messages []message.Message,
 		)
 		// If there is an error we are going to see if we can retry the call
 		if err != nil {
+			logging.Error("Error in Anthropic API call", "error", err)
 			retry, after, retryErr := a.shouldRetry(attempts, err)
 			if retryErr != nil {
 				return nil, retryErr
@@ -55,7 +55,7 @@ func newBedrockClient(opts providerClientOptions) BedrockClient {
 	if strings.Contains(string(opts.model.APIModel), "anthropic") {
 		// Create Anthropic client with Bedrock configuration
 		anthropicOpts := opts
-		anthropicOpts.anthropicOptions = append(anthropicOpts.anthropicOptions, 
+		anthropicOpts.anthropicOptions = append(anthropicOpts.anthropicOptions,
 			WithAnthropicBedrock(true),
 			WithAnthropicDisableCache(),
 		)
@@ -84,7 +84,7 @@ func (b *bedrockClient) send(ctx context.Context, messages []message.Message, to

 func (b *bedrockClient) stream(ctx context.Context, messages []message.Message, tools []tools.BaseTool) <-chan ProviderEvent {
 	eventChan := make(chan ProviderEvent)
-	
+
 	if b.childProvider == nil {
 		go func() {
 			eventChan <- ProviderEvent{
@@ -95,6 +95,7 @@ func (b *bedrockClient) stream(ctx context.Context, messages []message.Message,
 		}()
 		return eventChan
 	}
-	
+
 	return b.childProvider.stream(ctx, messages, tools)
-}
+}
+
@@ -9,14 +9,12 @@ import (
 	"strings"
 	"time"

-	"github.com/google/generative-ai-go/genai"
 	"github.com/google/uuid"
 	"github.com/opencode-ai/opencode/internal/config"
 	"github.com/opencode-ai/opencode/internal/llm/tools"
 	"github.com/opencode-ai/opencode/internal/logging"
 	"github.com/opencode-ai/opencode/internal/message"
-	"google.golang.org/api/iterator"
-	"google.golang.org/api/option"
+	"google.golang.org/genai"
 )

 type geminiOptions struct {
@@ -39,7 +37,7 @@ func newGeminiClient(opts providerClientOptions) GeminiClient {
 		o(&geminiOpts)
 	}

-	client, err := genai.NewClient(context.Background(), option.WithAPIKey(opts.apiKey))
+	client, err := genai.NewClient(context.Background(), &genai.ClientConfig{APIKey: opts.apiKey, Backend: genai.BackendGeminiAPI})
 	if err != nil {
 		logging.Error("Failed to create Gemini client", "error", err)
 		return nil
@@ -57,27 +55,37 @@ func (g *geminiClient) convertMessages(messages []message.Message) []*genai.Cont
 	for _, msg := range messages {
 		switch msg.Role {
 		case message.User:
+			var parts []*genai.Part
+			parts = append(parts, &genai.Part{Text: msg.Content().String()})
+			for _, binaryContent := range msg.BinaryContent() {
+				imageFormat := strings.Split(binaryContent.MIMEType, "/")
+				parts = append(parts, &genai.Part{InlineData: &genai.Blob{
+					MIMEType: imageFormat[1],
+					Data:     binaryContent.Data,
+				}})
+			}
 			history = append(history, &genai.Content{
-				Parts: []genai.Part{genai.Text(msg.Content().String())},
+				Parts: parts,
 				Role:  "user",
 			})
-
 		case message.Assistant:
 			content := &genai.Content{
 				Role:  "model",
-				Parts: []genai.Part{},
+				Parts: []*genai.Part{},
 			}

 			if msg.Content().String() != "" {
-				content.Parts = append(content.Parts, genai.Text(msg.Content().String()))
+				content.Parts = append(content.Parts, &genai.Part{Text: msg.Content().String()})
 			}

 			if len(msg.ToolCalls()) > 0 {
 				for _, call := range msg.ToolCalls() {
 					args, _ := parseJsonToMap(call.Input)
-					content.Parts = append(content.Parts, genai.FunctionCall{
-						Name: call.Name,
-						Args: args,
+					content.Parts = append(content.Parts, &genai.Part{
+						FunctionCall: &genai.FunctionCall{
+							Name: call.Name,
+							Args: args,
+						},
 					})
 				}
 			}
@@ -105,10 +113,14 @@ func (g *geminiClient) convertMessages(messages []message.Message) []*genai.Cont
 				}

 				history = append(history, &genai.Content{
-					Parts: []genai.Part{genai.FunctionResponse{
-						Name:     toolCall.Name,
-						Response: response,
-					}},
+					Parts: []*genai.Part{
+						{
+							FunctionResponse: &genai.FunctionResponse{
+								Name:     toolCall.Name,
+								Response: response,
+							},
+						},
+					},
 					Role: "function",
 				})
 			}
@@ -152,18 +164,6 @@ func (g *geminiClient) finishReason(reason genai.FinishReason) message.FinishRea
 }

 func (g *geminiClient) send(ctx context.Context, messages []message.Message, tools []tools.BaseTool) (*ProviderResponse, error) {
-	model := g.client.GenerativeModel(g.providerOptions.model.APIModel)
-	model.SetMaxOutputTokens(int32(g.providerOptions.maxTokens))
-	model.SystemInstruction = &genai.Content{
-		Parts: []genai.Part{
-			genai.Text(g.providerOptions.systemMessage),
-		},
-	}
-	// Convert tools
-	if len(tools) > 0 {
-		model.Tools = g.convertTools(tools)
-	}
-
 	// Convert messages
 	geminiMessages := g.convertMessages(messages)

@@ -173,16 +173,26 @@ func (g *geminiClient) send(ctx context.Context, messages []message.Message, too
 		logging.Debug("Prepared messages", "messages", string(jsonData))
 	}

+	history := geminiMessages[:len(geminiMessages)-1] // All but last message
+	lastMsg := geminiMessages[len(geminiMessages)-1]
+	chat, _ := g.client.Chats.Create(ctx, g.providerOptions.model.APIModel, &genai.GenerateContentConfig{
+		MaxOutputTokens: int32(g.providerOptions.maxTokens),
+		SystemInstruction: &genai.Content{
+			Parts: []*genai.Part{{Text: g.providerOptions.systemMessage}},
+		},
+		Tools: g.convertTools(tools),
+	}, history)
+
 	attempts := 0
 	for {
 		attempts++
 		var toolCalls []message.ToolCall
-		chat := model.StartChat()
-		chat.History = geminiMessages[:len(geminiMessages)-1] // All but last message

-		lastMsg := geminiMessages[len(geminiMessages)-1]
-
-		resp, err := chat.SendMessage(ctx, lastMsg.Parts...)
+		var lastMsgParts []genai.Part
+		for _, part := range lastMsg.Parts {
+			lastMsgParts = append(lastMsgParts, *part)
+		}
+		resp, err := chat.SendMessage(ctx, lastMsgParts...)
 		// If there is an error we are going to see if we can retry the call
 		if err != nil {
 			retry, after, retryErr := g.shouldRetry(attempts, err)
@@ -205,15 +215,15 @@ func (g *geminiClient) send(ctx context.Context, messages []message.Message, too

 		if len(resp.Candidates) > 0 && resp.Candidates[0].Content != nil {
 			for _, part := range resp.Candidates[0].Content.Parts {
-				switch p := part.(type) {
-				case genai.Text:
-					content = string(p)
-				case genai.FunctionCall:
+				switch {
+				case part.Text != "":
+					content = string(part.Text)
+				case part.FunctionCall != nil:
 					id := "call_" + uuid.New().String()
-					args, _ := json.Marshal(p.Args)
+					args, _ := json.Marshal(part.FunctionCall.Args)
 					toolCalls = append(toolCalls, message.ToolCall{
 						ID:       id,
-						Name:     p.Name,
+						Name:     part.FunctionCall.Name,
 						Input:    string(args),
 						Type:     "function",
 						Finished: true,
@@ -239,18 +249,6 @@ func (g *geminiClient) send(ctx context.Context, messages []message.Message, too
 }

 func (g *geminiClient) stream(ctx context.Context, messages []message.Message, tools []tools.BaseTool) <-chan ProviderEvent {
-	model := g.client.GenerativeModel(g.providerOptions.model.APIModel)
-	model.SetMaxOutputTokens(int32(g.providerOptions.maxTokens))
-	model.SystemInstruction = &genai.Content{
-		Parts: []genai.Part{
-			genai.Text(g.providerOptions.systemMessage),
-		},
-	}
-	// Convert tools
-	if len(tools) > 0 {
-		model.Tools = g.convertTools(tools)
-	}
-
 	// Convert messages
 	geminiMessages := g.convertMessages(messages)

@@ -260,6 +258,16 @@ func (g *geminiClient) stream(ctx context.Context, messages []message.Message, t
 		logging.Debug("Prepared messages", "messages", string(jsonData))
 	}

+	history := geminiMessages[:len(geminiMessages)-1] // All but last message
+	lastMsg := geminiMessages[len(geminiMessages)-1]
+	chat, _ := g.client.Chats.Create(ctx, g.providerOptions.model.APIModel, &genai.GenerateContentConfig{
+		MaxOutputTokens: int32(g.providerOptions.maxTokens),
+		SystemInstruction: &genai.Content{
+			Parts: []*genai.Part{{Text: g.providerOptions.systemMessage}},
+		},
+		Tools: g.convertTools(tools),
+	}, history)
+
 	attempts := 0
 	eventChan := make(chan ProviderEvent)

@@ -268,11 +276,6 @@ func (g *geminiClient) stream(ctx context.Context, messages []message.Message, t

 		for {
 			attempts++
-			chat := model.StartChat()
-			chat.History = geminiMessages[:len(geminiMessages)-1]
-			lastMsg := geminiMessages[len(geminiMessages)-1]
-
-			iter := chat.SendMessageStream(ctx, lastMsg.Parts...)

 			currentContent := ""
 			toolCalls := []message.ToolCall{}
@@ -280,11 +283,12 @@ func (g *geminiClient) stream(ctx context.Context, messages []message.Message, t

 			eventChan <- ProviderEvent{Type: EventContentStart}

-			for {
-				resp, err := iter.Next()
-				if err == iterator.Done {
-					break
-				}
+			var lastMsgParts []genai.Part
+
+			for _, part := range lastMsg.Parts {
+				lastMsgParts = append(lastMsgParts, *part)
+			}
+			for resp, err := range chat.SendMessageStream(ctx, lastMsgParts...) {
 				if err != nil {
 					retry, after, retryErr := g.shouldRetry(attempts, err)
 					if retryErr != nil {
@@ -313,9 +317,9 @@ func (g *geminiClient) stream(ctx context.Context, messages []message.Message, t

 				if len(resp.Candidates) > 0 && resp.Candidates[0].Content != nil {
 					for _, part := range resp.Candidates[0].Content.Parts {
-						switch p := part.(type) {
-						case genai.Text:
-							delta := string(p)
+						switch {
+						case part.Text != "":
+							delta := string(part.Text)
 							if delta != "" {
 								eventChan <- ProviderEvent{
 									Type:    EventContentDelta,
@@ -323,12 +327,12 @@ func (g *geminiClient) stream(ctx context.Context, messages []message.Message, t
 								}
 								currentContent += delta
 							}
-						case genai.FunctionCall:
+						case part.FunctionCall != nil:
 							id := "call_" + uuid.New().String()
-							args, _ := json.Marshal(p.Args)
+							args, _ := json.Marshal(part.FunctionCall.Args)
 							newCall := message.ToolCall{
 								ID:       id,
-								Name:     p.Name,
+								Name:     part.FunctionCall.Name,
 								Input:    string(args),
 								Type:     "function",
 								Finished: true,
@@ -416,12 +420,12 @@ func (g *geminiClient) toolCalls(resp *genai.GenerateContentResponse) []message.

 	if len(resp.Candidates) > 0 && resp.Candidates[0].Content != nil {
 		for _, part := range resp.Candidates[0].Content.Parts {
-			if funcCall, ok := part.(genai.FunctionCall); ok {
+			if part.FunctionCall != nil {
 				id := "call_" + uuid.New().String()
-				args, _ := json.Marshal(funcCall.Args)
+				args, _ := json.Marshal(part.FunctionCall.Args)
 				toolCalls = append(toolCalls, message.ToolCall{
 					ID:    id,
-					Name:  funcCall.Name,
+					Name:  part.FunctionCall.Name,
 					Input: string(args),
 					Type:  "function",
 				})
@@ -12,6 +12,7 @@ import (
 	"github.com/openai/openai-go/option"
 	"github.com/openai/openai-go/shared"
 	"github.com/opencode-ai/opencode/internal/config"
+	"github.com/opencode-ai/opencode/internal/llm/models"
 	"github.com/opencode-ai/opencode/internal/llm/tools"
 	"github.com/opencode-ai/opencode/internal/logging"
 	"github.com/opencode-ai/opencode/internal/message"
@@ -71,7 +72,17 @@ func (o *openaiClient) convertMessages(messages []message.Message) (openaiMessag
 	for _, msg := range messages {
 		switch msg.Role {
 		case message.User:
-			openaiMessages = append(openaiMessages, openai.UserMessage(msg.Content().String()))
+			var content []openai.ChatCompletionContentPartUnionParam
+			textBlock := openai.ChatCompletionContentPartTextParam{Text: msg.Content().String()}
+			content = append(content, openai.ChatCompletionContentPartUnionParam{OfText: &textBlock})
+			for _, binaryContent := range msg.BinaryContent() {
+				imageURL := openai.ChatCompletionContentPartImageImageURLParam{URL: binaryContent.String(models.ProviderOpenAI)}
+				imageBlock := openai.ChatCompletionContentPartImageParam{ImageURL: imageURL}
+
+				content = append(content, openai.ChatCompletionContentPartUnionParam{OfImageURL: &imageBlock})
+			}
+
+			openaiMessages = append(openaiMessages, openai.UserMessage(content))

 		case message.Assistant:
 			assistantMsg := openai.ChatCompletionAssistantMessageParam{
@@ -258,15 +269,6 @@ func (o *openaiClient) stream(ctx context.Context, messages []message.Message, t
 				chunk := openaiStream.Current()
 				acc.AddChunk(chunk)

-				if tool, ok := acc.JustFinishedToolCall(); ok {
-					toolCalls = append(toolCalls, message.ToolCall{
-						ID:    tool.Id,
-						Name:  tool.Name,
-						Input: tool.Arguments,
-						Type:  "function",
-					})
-				}
-
 				for _, choice := range chunk.Choices {
 					if choice.Delta.Content != "" {
 						eventChan <- ProviderEvent{
@@ -282,7 +284,9 @@ func (o *openaiClient) stream(ctx context.Context, messages []message.Message, t
 			if err == nil || errors.Is(err, io.EOF) {
 				// Stream completed successfully
 				finishReason := o.finishReason(string(acc.ChatCompletion.Choices[0].FinishReason))
-
+				if len(acc.ChatCompletion.Choices[0].Message.ToolCalls) > 0 {
+					toolCalls = append(toolCalls, o.toolCalls(acc.ChatCompletion)...)
+				}
 				if len(toolCalls) > 0 {
 					finishReason = message.FinishReasonToolUse
 				}
@@ -132,6 +132,15 @@ func NewProvider(providerName models.ModelProvider, opts ...ProviderClientOption
 			options: clientOptions,
 			client:  newOpenAIClient(clientOptions),
 		}, nil
+	case models.ProviderXAI:
+		clientOptions.openaiOptions = append(clientOptions.openaiOptions,
+			WithOpenAIBaseURL("https://api.x.ai/v1"),
+		)
+		return &baseProvider[OpenAIClient]{
+			options: clientOptions,
+			client:  newOpenAIClient(clientOptions),
+		}, nil
+
 	case models.ProviderMock:
 		// TODO: implement mock client for test
 		panic("not implemented")
@@ -0,0 +1,8 @@
+package message
+
+type Attachment struct {
+	FilePath string
+	FileName string
+	MimeType string
+	Content  []byte
+}
@@ -66,13 +66,17 @@ func (iuc ImageURLContent) String() string {
 func (ImageURLContent) isPart() {}

 type BinaryContent struct {
+	Path     string
 	MIMEType string
 	Data     []byte
 }

-func (bc BinaryContent) String() string {
+func (bc BinaryContent) String(provider models.ModelProvider) string {
 	base64Encoded := base64.StdEncoding.EncodeToString(bc.Data)
-	return "data:" + bc.MIMEType + ";base64," + base64Encoded
+	if provider == models.ProviderOpenAI {
+		return "data:" + bc.MIMEType + ";base64," + base64Encoded
+	}
+	return base64Encoded
 }

 func (BinaryContent) isPart() {}
@@ -110,7 +114,6 @@ type Message struct {
 	SessionID string
 	Parts     []ContentPart
 	Model     models.ModelID
-
 	CreatedAt int64
 	UpdatedAt int64
 }
@@ -64,7 +64,6 @@ func (s *service) Create(ctx context.Context, sessionID string, params CreateMes
 	if err != nil {
 		return Message{}, err
 	}
-
 	dbMessage, err := s.q.CreateMessage(ctx, db.CreateMessageParams{
 		ID:        uuid.New().String(),
 		SessionID: sessionID,
@@ -7,6 +7,7 @@ import (
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/x/ansi"
 	"github.com/opencode-ai/opencode/internal/config"
+	"github.com/opencode-ai/opencode/internal/message"
 	"github.com/opencode-ai/opencode/internal/session"
 	"github.com/opencode-ai/opencode/internal/tui/styles"
 	"github.com/opencode-ai/opencode/internal/tui/theme"
@@ -14,7 +15,8 @@ import (
 )

 type SendMsg struct {
-	Text string
+	Text        string
+	Attachments []message.Attachment
 }

 type SessionSelectedMsg = session.Session
@@ -1,14 +1,19 @@
 package chat

 import (
+	"fmt"
 	"os"
 	"os/exec"
+	"slices"
+	"unicode"

 	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/bubbles/textarea"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/opencode-ai/opencode/internal/app"
+	"github.com/opencode-ai/opencode/internal/logging"
+	"github.com/opencode-ai/opencode/internal/message"
 	"github.com/opencode-ai/opencode/internal/session"
 	"github.com/opencode-ai/opencode/internal/tui/components/dialog"
 	"github.com/opencode-ai/opencode/internal/tui/layout"
@@ -18,9 +23,13 @@ import (
 )

 type editorCmp struct {
-	app      *app.App
-	session  session.Session
-	textarea textarea.Model
+	width       int
+	height      int
+	app         *app.App
+	session     session.Session
+	textarea    textarea.Model
+	attachments []message.Attachment
+	deleteMode  bool
 }

 type EditorKeyMaps struct {
@@ -33,6 +42,11 @@ type bluredEditorKeyMaps struct {
 	Focus      key.Binding
 	OpenEditor key.Binding
 }
+type DeleteAttachmentKeyMaps struct {
+	AttachmentDeleteMode key.Binding
+	Escape               key.Binding
+	DeleteAllAttachments key.Binding
+}

 var editorMaps = EditorKeyMaps{
 	Send: key.NewBinding(
@@ -45,7 +59,26 @@ var editorMaps = EditorKeyMaps{
 	),
 }

-func openEditor() tea.Cmd {
+var DeleteKeyMaps = DeleteAttachmentKeyMaps{
+	AttachmentDeleteMode: key.NewBinding(
+		key.WithKeys("ctrl+r"),
+		key.WithHelp("ctrl+r+{i}", "delete attachment at index i"),
+	),
+	Escape: key.NewBinding(
+		key.WithKeys("esc"),
+		key.WithHelp("esc", "cancel delete mode"),
+	),
+	DeleteAllAttachments: key.NewBinding(
+		key.WithKeys("r"),
+		key.WithHelp("ctrl+r+r", "delete all attchments"),
+	),
+}
+
+const (
+	maxAttachments = 5
+)
+
+func (m *editorCmp) openEditor() tea.Cmd {
 	editor := os.Getenv("EDITOR")
 	if editor == "" {
 		editor = "nvim"
@@ -72,8 +105,11 @@ func openEditor() tea.Cmd {
 			return util.ReportWarn("Message is empty")
 		}
 		os.Remove(tmpfile.Name())
+		attachments := m.attachments
+		m.attachments = nil
 		return SendMsg{
-			Text: string(content),
+			Text:        string(content),
+			Attachments: attachments,
 		}
 	})
 }
@@ -89,12 +125,16 @@ func (m *editorCmp) send() tea.Cmd {

 	value := m.textarea.Value()
 	m.textarea.Reset()
+	attachments := m.attachments
+
+	m.attachments = nil
 	if value == "" {
 		return nil
 	}
 	return tea.Batch(
 		util.CmdHandler(SendMsg{
-			Text: value,
+			Text:        value,
+			Attachments: attachments,
 		}),
 	)
 }
@@ -110,7 +150,34 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.session = msg
 		}
 		return m, nil
+	case dialog.AttachmentAddedMsg:
+		if len(m.attachments) >= maxAttachments {
+			logging.ErrorPersist(fmt.Sprintf("cannot add more than %d images", maxAttachments))
+			return m, cmd
+		}
+		m.attachments = append(m.attachments, msg.Attachment)
 	case tea.KeyMsg:
+		if key.Matches(msg, DeleteKeyMaps.AttachmentDeleteMode) {
+			m.deleteMode = true
+			return m, nil
+		}
+		if key.Matches(msg, DeleteKeyMaps.DeleteAllAttachments) && m.deleteMode {
+			m.deleteMode = false
+			m.attachments = nil
+			return m, nil
+		}
+		if m.deleteMode && len(msg.Runes) > 0 && unicode.IsDigit(msg.Runes[0]) {
+			num := int(msg.Runes[0] - '0')
+			m.deleteMode = false
+			if num < 10 && len(m.attachments) > num {
+				if num == 0 {
+					m.attachments = m.attachments[num+1:]
+				} else {
+					m.attachments = slices.Delete(m.attachments, num, num+1)
+				}
+				return m, nil
+			}
+		}
 		if key.Matches(msg, messageKeys.PageUp) || key.Matches(msg, messageKeys.PageDown) ||
 			key.Matches(msg, messageKeys.HalfPageUp) || key.Matches(msg, messageKeys.HalfPageDown) {
 			return m, nil
@@ -119,7 +186,11 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			if m.app.CoderAgent.IsSessionBusy(m.session.ID) {
 				return m, util.ReportWarn("Agent is working, please wait...")
 			}
-			return m, openEditor()
+			return m, m.openEditor()
+		}
+		if key.Matches(msg, DeleteKeyMaps.Escape) {
+			m.deleteMode = false
+			return m, nil
 		}
 		// Handle Enter key
 		if m.textarea.Focused() && key.Matches(msg, editorMaps.Send) {
@@ -133,6 +204,7 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				return m, m.send()
 			}
 		}
+
 	}
 	m.textarea, cmd = m.textarea.Update(msg)
 	return m, cmd
@@ -147,12 +219,23 @@ func (m *editorCmp) View() string {
 		Bold(true).
 		Foreground(t.Primary())

-	return lipgloss.JoinHorizontal(lipgloss.Top, style.Render(">"), m.textarea.View())
+	if len(m.attachments) == 0 {
+		return lipgloss.JoinHorizontal(lipgloss.Top, style.Render(">"), m.textarea.View())
+	}
+	m.textarea.SetHeight(m.height - 1)
+	return lipgloss.JoinVertical(lipgloss.Top,
+		m.attachmentsContent(),
+		lipgloss.JoinHorizontal(lipgloss.Top, style.Render(">"),
+			m.textarea.View()),
+	)
 }

 func (m *editorCmp) SetSize(width, height int) tea.Cmd {
+	m.width = width
+	m.height = height
 	m.textarea.SetWidth(width - 3) // account for the prompt and padding right
 	m.textarea.SetHeight(height)
+	m.textarea.SetWidth(width)
 	return nil
 }

@@ -160,9 +243,33 @@ func (m *editorCmp) GetSize() (int, int) {
 	return m.textarea.Width(), m.textarea.Height()
 }

+func (m *editorCmp) attachmentsContent() string {
+	var styledAttachments []string
+	t := theme.CurrentTheme()
+	attachmentStyles := styles.BaseStyle().
+		MarginLeft(1).
+		Background(t.TextMuted()).
+		Foreground(t.Text())
+	for i, attachment := range m.attachments {
+		var filename string
+		if len(attachment.FileName) > 10 {
+			filename = fmt.Sprintf(" %s %s...", styles.DocumentIcon, attachment.FileName[0:7])
+		} else {
+			filename = fmt.Sprintf(" %s %s", styles.DocumentIcon, attachment.FileName)
+		}
+		if m.deleteMode {
+			filename = fmt.Sprintf("%d%s", i, filename)
+		}
+		styledAttachments = append(styledAttachments, attachmentStyles.Render(filename))
+	}
+	content := lipgloss.JoinHorizontal(lipgloss.Left, styledAttachments...)
+	return content
+}
+
 func (m *editorCmp) BindingKeys() []key.Binding {
 	bindings := []key.Binding{}
 	bindings = append(bindings, layout.KeyMapToSlice(editorMaps)...)
+	bindings = append(bindings, layout.KeyMapToSlice(DeleteKeyMaps)...)
 	return bindings
 }

@@ -198,10 +305,8 @@ func CreateTextArea(existing *textarea.Model) textarea.Model {

 func NewEditorCmp(app *app.App) tea.Model {
 	ta := CreateTextArea(nil)
-
 	return &editorCmp{
 		app:      app,
 		textarea: ta,
 	}
 }
-
@@ -35,6 +35,7 @@ type messagesCmp struct {
 	cachedContent map[string]cacheItem
 	spinner       spinner.Model
 	rendering     bool
+	attachments   viewport.Model
 }
 type renderFinishedMsg struct{}

@@ -229,12 +230,15 @@ func (m *messagesCmp) renderView() {

 	messages := make([]string, 0)
 	for _, v := range m.uiMessages {
-		messages = append(messages, v.content,
+		messages = append(messages, lipgloss.JoinVertical(lipgloss.Left, v.content),
 			baseStyle.
 				Width(m.width).
-				Render(""),
+				Render(
+					"",
+				),
 		)
 	}
+
 	m.viewport.SetContent(
 		baseStyle.
 			Width(m.width).
@@ -413,6 +417,8 @@ func (m *messagesCmp) SetSize(width, height int) tea.Cmd {
 	m.height = height
 	m.viewport.Width = width
 	m.viewport.Height = height - 2
+	m.attachments.Width = width + 40
+	m.attachments.Height = 3
 	m.rerender()
 	return nil
 }
@@ -431,7 +437,9 @@ func (m *messagesCmp) SetSession(session session.Session) tea.Cmd {
 		return util.ReportError(err)
 	}
 	m.messages = messages
-	m.currentMsgID = m.messages[len(m.messages)-1].ID
+	if len(m.messages) > 0 {
+		m.currentMsgID = m.messages[len(m.messages)-1].ID
+	}
 	delete(m.cachedContent, m.currentMsgID)
 	m.rendering = true
 	return func() tea.Msg {
@@ -453,6 +461,7 @@ func NewMessagesCmp(app *app.App) tea.Model {
 	s := spinner.New()
 	s.Spinner = spinner.Pulse
 	vp := viewport.New(0, 0)
+	attachmets := viewport.New(0, 0)
 	vp.KeyMap.PageUp = messageKeys.PageUp
 	vp.KeyMap.PageDown = messageKeys.PageDown
 	vp.KeyMap.HalfPageUp = messageKeys.HalfPageUp
@@ -462,5 +471,6 @@ func NewMessagesCmp(app *app.App) tea.Model {
 		cachedContent: make(map[string]cacheItem),
 		viewport:      vp,
 		spinner:       s,
+		attachments:   attachmets,
 	}
 }
@@ -80,7 +80,29 @@ func renderMessage(msg string, isUser bool, isFocused bool, width int, info ...s
 }

 func renderUserMessage(msg message.Message, isFocused bool, width int, position int) uiMessage {
-	content := renderMessage(msg.Content().String(), true, isFocused, width)
+	var styledAttachments []string
+	t := theme.CurrentTheme()
+	attachmentStyles := styles.BaseStyle().
+		MarginLeft(1).
+		Background(t.TextMuted()).
+		Foreground(t.Text())
+	for _, attachment := range msg.BinaryContent() {
+		file := filepath.Base(attachment.Path)
+		var filename string
+		if len(file) > 10 {
+			filename = fmt.Sprintf(" %s %s...", styles.DocumentIcon, file[0:7])
+		} else {
+			filename = fmt.Sprintf(" %s %s", styles.DocumentIcon, file)
+		}
+		styledAttachments = append(styledAttachments, attachmentStyles.Render(filename))
+	}
+	content := ""
+	if len(styledAttachments) > 0 {
+		attachmentContent := styles.BaseStyle().Width(width).Render(lipgloss.JoinHorizontal(lipgloss.Left, styledAttachments...))
+		content = renderMessage(msg.Content().String(), true, isFocused, width, attachmentContent)
+	} else {
+		content = renderMessage(msg.Content().String(), true, isFocused, width)
+	}
 	userMsg := uiMessage{
 		ID:          msg.ID,
 		messageType: userMessageType,
@@ -21,7 +21,6 @@ import (

 type StatusCmp interface {
 	tea.Model
-	SetHelpWidgetMsg(string)
 }

 type statusCmp struct {
@@ -74,11 +73,9 @@ func (m statusCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 var helpWidget = ""

 // getHelpWidget returns the help widget with current theme colors
-func getHelpWidget(helpText string) string {
+func getHelpWidget() string {
 	t := theme.CurrentTheme()
-	if helpText == "" {
-		helpText = "ctrl+? help"
-	}
+	helpText := "ctrl+? help"

 	return styles.Padded().
 		Background(t.TextMuted()).
@@ -87,7 +84,7 @@ func getHelpWidget(helpText string) string {
 		Render(helpText)
 }

-func formatTokensAndCost(tokens int64, cost float64) string {
+func formatTokensAndCost(tokens, contextWindow int64, cost float64) string {
 	// Format tokens in human-readable format (e.g., 110K, 1.2M)
 	var formattedTokens string
 	switch {
@@ -110,32 +107,48 @@ func formatTokensAndCost(tokens int64, cost float64) string {
 	// Format cost with $ symbol and 2 decimal places
 	formattedCost := fmt.Sprintf("$%.2f", cost)

-	return fmt.Sprintf("Tokens: %s, Cost: %s", formattedTokens, formattedCost)
+	percentage := (float64(tokens) / float64(contextWindow)) * 100
+	if percentage > 80 {
+		// add the warning icon and percentage
+		formattedTokens = fmt.Sprintf("%s(%d%%)", styles.WarningIcon, int(percentage))
+	}
+
+	return fmt.Sprintf("Context: %s, Cost: %s", formattedTokens, formattedCost)
 }

 func (m statusCmp) View() string {
 	t := theme.CurrentTheme()
+	modelID := config.Get().Agents[config.AgentCoder].Model
+	model := models.SupportedModels[modelID]

 	// Initialize the help widget
-	status := getHelpWidget("")
+	status := getHelpWidget()

+	tokenInfoWidth := 0
 	if m.session.ID != "" {
-		tokens := formatTokensAndCost(m.session.PromptTokens+m.session.CompletionTokens, m.session.Cost)
+		totalTokens := m.session.PromptTokens + m.session.CompletionTokens
+		tokens := formatTokensAndCost(totalTokens, model.ContextWindow, m.session.Cost)
 		tokensStyle := styles.Padded().
 			Background(t.Text()).
-			Foreground(t.BackgroundSecondary()).
-			Render(tokens)
-		status += tokensStyle
+			Foreground(t.BackgroundSecondary())
+		percentage := (float64(totalTokens) / float64(model.ContextWindow)) * 100
+		if percentage > 80 {
+			tokensStyle = tokensStyle.Background(t.Warning())
+		}
+		tokenInfoWidth = lipgloss.Width(tokens) + 2
+		status += tokensStyle.Render(tokens)
 	}

 	diagnostics := styles.Padded().
 		Background(t.BackgroundDarker()).
 		Render(m.projectDiagnostics())

+	availableWidht := max(0, m.width-lipgloss.Width(helpWidget)-lipgloss.Width(m.model())-lipgloss.Width(diagnostics)-tokenInfoWidth)
+
 	if m.info.Msg != "" {
 		infoStyle := styles.Padded().
 			Foreground(t.Background()).
-			Width(m.availableFooterMsgWidth(diagnostics))
+			Width(availableWidht)

 		switch m.info.Type {
 		case util.InfoTypeInfo:
@@ -146,18 +159,18 @@ func (m statusCmp) View() string {
 			infoStyle = infoStyle.Background(t.Error())
 		}

+		infoWidth := availableWidht - 10
 		// Truncate message if it's longer than available width
 		msg := m.info.Msg
-		availWidth := m.availableFooterMsgWidth(diagnostics) - 10
-		if len(msg) > availWidth && availWidth > 0 {
-			msg = msg[:availWidth] + "..."
+		if len(msg) > infoWidth && infoWidth > 0 {
+			msg = msg[:infoWidth] + "..."
 		}
 		status += infoStyle.Render(msg)
 	} else {
 		status += styles.Padded().
 			Foreground(t.Text()).
 			Background(t.BackgroundSecondary()).
-			Width(m.availableFooterMsgWidth(diagnostics)).
+			Width(availableWidht).
 			Render("")
 	}

@@ -245,12 +258,10 @@ func (m *statusCmp) projectDiagnostics() string {
 	return strings.Join(diagnostics, " ")
 }

-func (m statusCmp) availableFooterMsgWidth(diagnostics string) int {
-	tokens := ""
+func (m statusCmp) availableFooterMsgWidth(diagnostics, tokenInfo string) int {
 	tokensWidth := 0
 	if m.session.ID != "" {
-		tokens = formatTokensAndCost(m.session.PromptTokens+m.session.CompletionTokens, m.session.Cost)
-		tokensWidth = lipgloss.Width(tokens) + 2
+		tokensWidth = lipgloss.Width(tokenInfo) + 2
 	}
 	return max(0, m.width-lipgloss.Width(helpWidget)-lipgloss.Width(m.model())-lipgloss.Width(diagnostics)-tokensWidth)
 }
@@ -272,14 +283,8 @@ func (m statusCmp) model() string {
 		Render(model.Name)
 }

-func (m statusCmp) SetHelpWidgetMsg(s string) {
-	// Update the help widget text using the getHelpWidget function
-	helpWidget = getHelpWidget(s)
-}
-
 func NewStatusCmp(lspClients map[string]*lsp.Client) StatusCmp {
-	// Initialize the help widget with default text
-	helpWidget = getHelpWidget("")
+	helpWidget = getHelpWidget()

 	return &statusCmp{
 		messageTTL: 10 * time.Second,
@@ -0,0 +1,173 @@
+package dialog
+
+import (
+	"github.com/charmbracelet/bubbles/key"
+	"github.com/charmbracelet/bubbles/textinput"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+
+	"github.com/opencode-ai/opencode/internal/tui/styles"
+	"github.com/opencode-ai/opencode/internal/tui/theme"
+	"github.com/opencode-ai/opencode/internal/tui/util"
+)
+
+// ArgumentsDialogCmp is a component that asks the user for command arguments.
+type ArgumentsDialogCmp struct {
+	width, height int
+	textInput     textinput.Model
+	keys          argumentsDialogKeyMap
+	commandID     string
+	content       string
+}
+
+// NewArgumentsDialogCmp creates a new ArgumentsDialogCmp.
+func NewArgumentsDialogCmp(commandID, content string) ArgumentsDialogCmp {
+	t := theme.CurrentTheme()
+	ti := textinput.New()
+	ti.Placeholder = "Enter arguments..."
+	ti.Focus()
+	ti.Width = 40
+	ti.Prompt = ""
+	ti.PlaceholderStyle = ti.PlaceholderStyle.Background(t.Background())
+	ti.PromptStyle = ti.PromptStyle.Background(t.Background())
+	ti.TextStyle = ti.TextStyle.Background(t.Background())
+
+	return ArgumentsDialogCmp{
+		textInput: ti,
+		keys:      argumentsDialogKeyMap{},
+		commandID: commandID,
+		content:   content,
+	}
+}
+
+type argumentsDialogKeyMap struct {
+	Enter  key.Binding
+	Escape key.Binding
+}
+
+// ShortHelp implements key.Map.
+func (k argumentsDialogKeyMap) ShortHelp() []key.Binding {
+	return []key.Binding{
+		key.NewBinding(
+			key.WithKeys("enter"),
+			key.WithHelp("enter", "confirm"),
+		),
+		key.NewBinding(
+			key.WithKeys("esc"),
+			key.WithHelp("esc", "cancel"),
+		),
+	}
+}
+
+// FullHelp implements key.Map.
+func (k argumentsDialogKeyMap) FullHelp() [][]key.Binding {
+	return [][]key.Binding{k.ShortHelp()}
+}
+
+// Init implements tea.Model.
+func (m ArgumentsDialogCmp) Init() tea.Cmd {
+	return tea.Batch(
+		textinput.Blink,
+		m.textInput.Focus(),
+	)
+}
+
+// Update implements tea.Model.
+func (m ArgumentsDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmd tea.Cmd
+	var cmds []tea.Cmd
+
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		switch {
+		case key.Matches(msg, key.NewBinding(key.WithKeys("esc"))):
+			return m, util.CmdHandler(CloseArgumentsDialogMsg{})
+		case key.Matches(msg, key.NewBinding(key.WithKeys("enter"))):
+			return m, util.CmdHandler(CloseArgumentsDialogMsg{
+				Submit:    true,
+				CommandID: m.commandID,
+				Content:   m.content,
+				Arguments: m.textInput.Value(),
+			})
+		}
+	case tea.WindowSizeMsg:
+		m.width = msg.Width
+		m.height = msg.Height
+	}
+
+	m.textInput, cmd = m.textInput.Update(msg)
+	cmds = append(cmds, cmd)
+
+	return m, tea.Batch(cmds...)
+}
+
+// View implements tea.Model.
+func (m ArgumentsDialogCmp) View() string {
+	t := theme.CurrentTheme()
+	baseStyle := styles.BaseStyle()
+
+	// Calculate width needed for content
+	maxWidth := 60 // Width for explanation text
+
+	title := baseStyle.
+		Foreground(t.Primary()).
+		Bold(true).
+		Width(maxWidth).
+		Padding(0, 1).
+		Render("Command Arguments")
+
+	explanation := baseStyle.
+		Foreground(t.Text()).
+		Width(maxWidth).
+		Padding(0, 1).
+		Render("This command requires arguments. Please enter the text to replace $ARGUMENTS with:")
+
+	inputField := baseStyle.
+		Foreground(t.Text()).
+		Width(maxWidth).
+		Padding(1, 1).
+		Render(m.textInput.View())
+
+	maxWidth = min(maxWidth, m.width-10)
+
+	content := lipgloss.JoinVertical(
+		lipgloss.Left,
+		title,
+		explanation,
+		inputField,
+	)
+
+	return baseStyle.Padding(1, 2).
+		Border(lipgloss.RoundedBorder()).
+		BorderBackground(t.Background()).
+		BorderForeground(t.TextMuted()).
+		Background(t.Background()).
+		Width(lipgloss.Width(content) + 4).
+		Render(content)
+}
+
+// SetSize sets the size of the component.
+func (m *ArgumentsDialogCmp) SetSize(width, height int) {
+	m.width = width
+	m.height = height
+}
+
+// Bindings implements layout.Bindings.
+func (m ArgumentsDialogCmp) Bindings() []key.Binding {
+	return m.keys.ShortHelp()
+}
+
+// CloseArgumentsDialogMsg is a message that is sent when the arguments dialog is closed.
+type CloseArgumentsDialogMsg struct {
+	Submit    bool
+	CommandID string
+	Content   string
+	Arguments string
+}
+
+// ShowArgumentsDialogMsg is a message that is sent to show the arguments dialog.
+type ShowArgumentsDialogMsg struct {
+	CommandID string
+	Content   string
+}
+
@@ -0,0 +1,166 @@
+package dialog
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/opencode-ai/opencode/internal/config"
+	"github.com/opencode-ai/opencode/internal/tui/util"
+)
+
+// Command prefix constants
+const (
+	UserCommandPrefix    = "user:"
+	ProjectCommandPrefix = "project:"
+)
+
+// LoadCustomCommands loads custom commands from both XDG_CONFIG_HOME and project data directory
+func LoadCustomCommands() ([]Command, error) {
+	cfg := config.Get()
+	if cfg == nil {
+		return nil, fmt.Errorf("config not loaded")
+	}
+
+	var commands []Command
+
+	// Load user commands from XDG_CONFIG_HOME/opencode/commands
+	xdgConfigHome := os.Getenv("XDG_CONFIG_HOME")
+	if xdgConfigHome == "" {
+		// Default to ~/.config if XDG_CONFIG_HOME is not set
+		home, err := os.UserHomeDir()
+		if err == nil {
+			xdgConfigHome = filepath.Join(home, ".config")
+		}
+	}
+
+	if xdgConfigHome != "" {
+		userCommandsDir := filepath.Join(xdgConfigHome, "opencode", "commands")
+		userCommands, err := loadCommandsFromDir(userCommandsDir, UserCommandPrefix)
+		if err != nil {
+			// Log error but continue - we'll still try to load other commands
+			fmt.Printf("Warning: failed to load user commands from XDG_CONFIG_HOME: %v\n", err)
+		} else {
+			commands = append(commands, userCommands...)
+		}
+	}
+
+	// Load commands from $HOME/.opencode/commands
+	home, err := os.UserHomeDir()
+	if err == nil {
+		homeCommandsDir := filepath.Join(home, ".opencode", "commands")
+		homeCommands, err := loadCommandsFromDir(homeCommandsDir, UserCommandPrefix)
+		if err != nil {
+			// Log error but continue - we'll still try to load other commands
+			fmt.Printf("Warning: failed to load home commands: %v\n", err)
+		} else {
+			commands = append(commands, homeCommands...)
+		}
+	}
+
+	// Load project commands from data directory
+	projectCommandsDir := filepath.Join(cfg.Data.Directory, "commands")
+	projectCommands, err := loadCommandsFromDir(projectCommandsDir, ProjectCommandPrefix)
+	if err != nil {
+		// Log error but return what we have so far
+		fmt.Printf("Warning: failed to load project commands: %v\n", err)
+	} else {
+		commands = append(commands, projectCommands...)
+	}
+
+	return commands, nil
+}
+
+// loadCommandsFromDir loads commands from a specific directory with the given prefix
+func loadCommandsFromDir(commandsDir string, prefix string) ([]Command, error) {
+	// Check if the commands directory exists
+	if _, err := os.Stat(commandsDir); os.IsNotExist(err) {
+		// Create the commands directory if it doesn't exist
+		if err := os.MkdirAll(commandsDir, 0755); err != nil {
+			return nil, fmt.Errorf("failed to create commands directory %s: %w", commandsDir, err)
+		}
+		// Return empty list since we just created the directory
+		return []Command{}, nil
+	}
+
+	var commands []Command
+
+	// Walk through the commands directory and load all .md files
+	err := filepath.Walk(commandsDir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		// Skip directories
+		if info.IsDir() {
+			return nil
+		}
+
+		// Only process markdown files
+		if !strings.HasSuffix(strings.ToLower(info.Name()), ".md") {
+			return nil
+		}
+
+		// Read the file content
+		content, err := os.ReadFile(path)
+		if err != nil {
+			return fmt.Errorf("failed to read command file %s: %w", path, err)
+		}
+
+		// Get the command ID from the file name without the .md extension
+		commandID := strings.TrimSuffix(info.Name(), filepath.Ext(info.Name()))
+
+		// Get relative path from commands directory
+		relPath, err := filepath.Rel(commandsDir, path)
+		if err != nil {
+			return fmt.Errorf("failed to get relative path for %s: %w", path, err)
+		}
+
+		// Create the command ID from the relative path
+		// Replace directory separators with colons
+		commandIDPath := strings.ReplaceAll(filepath.Dir(relPath), string(filepath.Separator), ":")
+		if commandIDPath != "." {
+			commandID = commandIDPath + ":" + commandID
+		}
+
+		// Create a command
+		command := Command{
+			ID:          prefix + commandID,
+			Title:       prefix + commandID,
+			Description: fmt.Sprintf("Custom command from %s", relPath),
+			Handler: func(cmd Command) tea.Cmd {
+				commandContent := string(content)
+
+				// Check if the command contains $ARGUMENTS placeholder
+				if strings.Contains(commandContent, "$ARGUMENTS") {
+					// Show arguments dialog
+					return util.CmdHandler(ShowArgumentsDialogMsg{
+						CommandID: cmd.ID,
+						Content:   commandContent,
+					})
+				}
+
+				// No arguments needed, run command directly
+				return util.CmdHandler(CommandRunCustomMsg{
+					Content: commandContent,
+				})
+			},
+		}
+
+		commands = append(commands, command)
+		return nil
+	})
+
+	if err != nil {
+		return nil, fmt.Errorf("failed to load custom commands from %s: %w", commandsDir, err)
+	}
+
+	return commands, nil
+}
+
+// CommandRunCustomMsg is sent when a custom command is executed
+type CommandRunCustomMsg struct {
+	Content string
+}
@@ -0,0 +1,471 @@
+package dialog
+
+import (
+	"fmt"
+	"net/http"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+	"time"
+
+	"github.com/charmbracelet/bubbles/key"
+	"github.com/charmbracelet/bubbles/textinput"
+	"github.com/charmbracelet/bubbles/viewport"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/opencode-ai/opencode/internal/app"
+	"github.com/opencode-ai/opencode/internal/config"
+	"github.com/opencode-ai/opencode/internal/logging"
+	"github.com/opencode-ai/opencode/internal/message"
+	"github.com/opencode-ai/opencode/internal/tui/image"
+	"github.com/opencode-ai/opencode/internal/tui/styles"
+	"github.com/opencode-ai/opencode/internal/tui/theme"
+	"github.com/opencode-ai/opencode/internal/tui/util"
+)
+
+const (
+	maxAttachmentSize = int64(5 * 1024 * 1024) // 5MB
+	downArrow         = "down"
+	upArrow           = "up"
+)
+
+type FilePrickerKeyMap struct {
+	Enter          key.Binding
+	Down           key.Binding
+	Up             key.Binding
+	Forward        key.Binding
+	Backward       key.Binding
+	OpenFilePicker key.Binding
+	Esc            key.Binding
+	InsertCWD      key.Binding
+}
+
+var filePickerKeyMap = FilePrickerKeyMap{
+	Enter: key.NewBinding(
+		key.WithKeys("enter"),
+		key.WithHelp("enter", "select file/enter directory"),
+	),
+	Down: key.NewBinding(
+		key.WithKeys("j", downArrow),
+		key.WithHelp("↓/j", "down"),
+	),
+	Up: key.NewBinding(
+		key.WithKeys("k", upArrow),
+		key.WithHelp("↑/k", "up"),
+	),
+	Forward: key.NewBinding(
+		key.WithKeys("l"),
+		key.WithHelp("l", "enter directory"),
+	),
+	Backward: key.NewBinding(
+		key.WithKeys("h", "backspace"),
+		key.WithHelp("h/backspace", "go back"),
+	),
+	OpenFilePicker: key.NewBinding(
+		key.WithKeys("ctrl+f"),
+		key.WithHelp("ctrl+f", "open file picker"),
+	),
+	Esc: key.NewBinding(
+		key.WithKeys("esc"),
+		key.WithHelp("esc", "close/exit"),
+	),
+	InsertCWD: key.NewBinding(
+		key.WithKeys("i"),
+		key.WithHelp("i", "manual path input"),
+	),
+}
+
+type filepickerCmp struct {
+	basePath       string
+	width          int
+	height         int
+	cursor         int
+	err            error
+	cursorChain    stack
+	viewport       viewport.Model
+	dirs           []os.DirEntry
+	cwdDetails     *DirNode
+	selectedFile   string
+	cwd            textinput.Model
+	ShowFilePicker bool
+	app            *app.App
+}
+
+type DirNode struct {
+	parent    *DirNode
+	child     *DirNode
+	directory string
+}
+type stack []int
+
+func (s stack) Push(v int) stack {
+	return append(s, v)
+}
+
+func (s stack) Pop() (stack, int) {
+	l := len(s)
+	return s[:l-1], s[l-1]
+}
+
+type AttachmentAddedMsg struct {
+	Attachment message.Attachment
+}
+
+func (f *filepickerCmp) Init() tea.Cmd {
+	return nil
+}
+
+func (f *filepickerCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmd tea.Cmd
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		f.width = 60
+		f.height = 20
+		f.viewport.Width = 80
+		f.viewport.Height = 22
+		f.cursor = 0
+		f.getCurrentFileBelowCursor()
+	case tea.KeyMsg:
+		if f.cwd.Focused() {
+			f.cwd, cmd = f.cwd.Update(msg)
+		}
+		switch {
+		case key.Matches(msg, filePickerKeyMap.InsertCWD):
+			f.cwd.Focus()
+			return f, cmd
+		case key.Matches(msg, filePickerKeyMap.Esc):
+			if f.cwd.Focused() {
+				f.cwd.Blur()
+			}
+		case key.Matches(msg, filePickerKeyMap.Down):
+			if !f.cwd.Focused() || msg.String() == downArrow {
+				if f.cursor < len(f.dirs)-1 {
+					f.cursor++
+					f.getCurrentFileBelowCursor()
+				}
+			}
+		case key.Matches(msg, filePickerKeyMap.Up):
+			if !f.cwd.Focused() || msg.String() == upArrow {
+				if f.cursor > 0 {
+					f.cursor--
+					f.getCurrentFileBelowCursor()
+				}
+			}
+		case key.Matches(msg, filePickerKeyMap.Enter):
+			var path string
+			var isPathDir bool
+			if f.cwd.Focused() {
+				path = f.cwd.Value()
+				fileInfo, err := os.Stat(path)
+				if err != nil {
+					logging.ErrorPersist("Invalid path")
+					return f, cmd
+				}
+				isPathDir = fileInfo.IsDir()
+			} else {
+				path = filepath.Join(f.cwdDetails.directory, "/", f.dirs[f.cursor].Name())
+				isPathDir = f.dirs[f.cursor].IsDir()
+			}
+			if isPathDir {
+				newWorkingDir := DirNode{parent: f.cwdDetails, directory: path}
+				f.cwdDetails.child = &newWorkingDir
+				f.cwdDetails = f.cwdDetails.child
+				f.cursorChain = f.cursorChain.Push(f.cursor)
+				f.dirs = readDir(f.cwdDetails.directory, false)
+				f.cursor = 0
+				f.cwd.SetValue(f.cwdDetails.directory)
+				f.getCurrentFileBelowCursor()
+			} else {
+				f.selectedFile = path
+				return f.addAttachmentToMessage()
+			}
+		case key.Matches(msg, filePickerKeyMap.Esc):
+			if !f.cwd.Focused() {
+				f.cursorChain = make(stack, 0)
+				f.cursor = 0
+			} else {
+				f.cwd.Blur()
+			}
+		case key.Matches(msg, filePickerKeyMap.Forward):
+			if !f.cwd.Focused() {
+				if f.dirs[f.cursor].IsDir() {
+					path := filepath.Join(f.cwdDetails.directory, "/", f.dirs[f.cursor].Name())
+					newWorkingDir := DirNode{parent: f.cwdDetails, directory: path}
+					f.cwdDetails.child = &newWorkingDir
+					f.cwdDetails = f.cwdDetails.child
+					f.cursorChain = f.cursorChain.Push(f.cursor)
+					f.dirs = readDir(f.cwdDetails.directory, false)
+					f.cursor = 0
+					f.cwd.SetValue(f.cwdDetails.directory)
+					f.getCurrentFileBelowCursor()
+				}
+			}
+		case key.Matches(msg, filePickerKeyMap.Backward):
+			if !f.cwd.Focused() {
+				if len(f.cursorChain) != 0 && f.cwdDetails.parent != nil {
+					f.cursorChain, f.cursor = f.cursorChain.Pop()
+					f.cwdDetails = f.cwdDetails.parent
+					f.cwdDetails.child = nil
+					f.dirs = readDir(f.cwdDetails.directory, false)
+					f.cwd.SetValue(f.cwdDetails.directory)
+					f.getCurrentFileBelowCursor()
+				}
+			}
+		case key.Matches(msg, filePickerKeyMap.OpenFilePicker):
+			f.dirs = readDir(f.cwdDetails.directory, false)
+			f.cursor = 0
+			f.getCurrentFileBelowCursor()
+		}
+	}
+	return f, cmd
+}
+
+func (f *filepickerCmp) addAttachmentToMessage() (tea.Model, tea.Cmd) {
+	modeInfo := GetSelectedModel(config.Get())
+	if !modeInfo.SupportsAttachments {
+		logging.ErrorPersist(fmt.Sprintf("Model %s doesn't support attachments", modeInfo.Name))
+		return f, nil
+	}
+
+	selectedFilePath := f.selectedFile
+	if !isExtSupported(selectedFilePath) {
+		logging.ErrorPersist("Unsupported file")
+		return f, nil
+	}
+
+	isFileLarge, err := image.ValidateFileSize(selectedFilePath, maxAttachmentSize)
+	if err != nil {
+		logging.ErrorPersist("unable to read the image")
+		return f, nil
+	}
+	if isFileLarge {
+		logging.ErrorPersist("file too large, max 5MB")
+		return f, nil
+	}
+
+	content, err := os.ReadFile(selectedFilePath)
+	if err != nil {
+		logging.ErrorPersist("Unable read selected file")
+		return f, nil
+	}
+
+	mimeBufferSize := min(512, len(content))
+	mimeType := http.DetectContentType(content[:mimeBufferSize])
+	fileName := filepath.Base(selectedFilePath)
+	attachment := message.Attachment{FilePath: selectedFilePath, FileName: fileName, MimeType: mimeType, Content: content}
+	f.selectedFile = ""
+	return f, util.CmdHandler(AttachmentAddedMsg{attachment})
+}
+
+func (f *filepickerCmp) View() string {
+	t := theme.CurrentTheme()
+	const maxVisibleDirs = 20
+	const maxWidth = 80
+
+	adjustedWidth := maxWidth
+	for _, file := range f.dirs {
+		if len(file.Name()) > adjustedWidth-4 { // Account for padding
+			adjustedWidth = len(file.Name()) + 4
+		}
+	}
+	adjustedWidth = max(30, min(adjustedWidth, f.width-15)) + 1
+
+	files := make([]string, 0, maxVisibleDirs)
+	startIdx := 0
+
+	if len(f.dirs) > maxVisibleDirs {
+		halfVisible := maxVisibleDirs / 2
+		if f.cursor >= halfVisible && f.cursor < len(f.dirs)-halfVisible {
+			startIdx = f.cursor - halfVisible
+		} else if f.cursor >= len(f.dirs)-halfVisible {
+			startIdx = len(f.dirs) - maxVisibleDirs
+		}
+	}
+
+	endIdx := min(startIdx+maxVisibleDirs, len(f.dirs))
+
+	for i := startIdx; i < endIdx; i++ {
+		file := f.dirs[i]
+		itemStyle := styles.BaseStyle().Width(adjustedWidth)
+
+		if i == f.cursor {
+			itemStyle = itemStyle.
+				Background(t.Primary()).
+				Foreground(t.Background()).
+				Bold(true)
+		}
+		filename := file.Name()
+
+		if len(filename) > adjustedWidth-4 {
+			filename = filename[:adjustedWidth-7] + "..."
+		}
+		if file.IsDir() {
+			filename = filename + "/"
+		}
+		// No need to reassign filename if it's not changing
+
+		files = append(files, itemStyle.Padding(0, 1).Render(filename))
+	}
+
+	// Pad to always show exactly 21 lines
+	for len(files) < maxVisibleDirs {
+		files = append(files, styles.BaseStyle().Width(adjustedWidth).Render(""))
+	}
+
+	currentPath := styles.BaseStyle().
+		Height(1).
+		Width(adjustedWidth).
+		Render(f.cwd.View())
+
+	viewportstyle := lipgloss.NewStyle().
+		Width(f.viewport.Width).
+		Background(t.Background()).
+		Border(lipgloss.RoundedBorder()).
+		BorderForeground(t.TextMuted()).
+		BorderBackground(t.Background()).
+		Padding(2).
+		Render(f.viewport.View())
+	var insertExitText string
+	if f.IsCWDFocused() {
+		insertExitText = "Press esc to exit typing path"
+	} else {
+		insertExitText = "Press i to start typing path"
+	}
+
+	content := lipgloss.JoinVertical(
+		lipgloss.Left,
+		currentPath,
+		styles.BaseStyle().Width(adjustedWidth).Render(""),
+		styles.BaseStyle().Width(adjustedWidth).Render(lipgloss.JoinVertical(lipgloss.Left, files...)),
+		styles.BaseStyle().Width(adjustedWidth).Render(""),
+		styles.BaseStyle().Foreground(t.TextMuted()).Width(adjustedWidth).Render(insertExitText),
+	)
+
+	f.cwd.SetValue(f.cwd.Value())
+	contentStyle := styles.BaseStyle().Padding(1, 2).
+		Border(lipgloss.RoundedBorder()).
+		BorderBackground(t.Background()).
+		BorderForeground(t.TextMuted()).
+		Width(lipgloss.Width(content) + 4)
+
+	return lipgloss.JoinHorizontal(lipgloss.Center, contentStyle.Render(content), viewportstyle)
+}
+
+type FilepickerCmp interface {
+	tea.Model
+	ToggleFilepicker(showFilepicker bool)
+	IsCWDFocused() bool
+}
+
+func (f *filepickerCmp) ToggleFilepicker(showFilepicker bool) {
+	f.ShowFilePicker = showFilepicker
+}
+
+func (f *filepickerCmp) IsCWDFocused() bool {
+	return f.cwd.Focused()
+}
+
+func NewFilepickerCmp(app *app.App) FilepickerCmp {
+	homepath, err := os.UserHomeDir()
+	if err != nil {
+		logging.Error("error loading user files")
+		return nil
+	}
+	baseDir := DirNode{parent: nil, directory: homepath}
+	dirs := readDir(homepath, false)
+	viewport := viewport.New(0, 0)
+	currentDirectory := textinput.New()
+	currentDirectory.CharLimit = 200
+	currentDirectory.Width = 44
+	currentDirectory.Cursor.Blink = true
+	currentDirectory.SetValue(baseDir.directory)
+	return &filepickerCmp{cwdDetails: &baseDir, dirs: dirs, cursorChain: make(stack, 0), viewport: viewport, cwd: currentDirectory, app: app}
+}
+
+func (f *filepickerCmp) getCurrentFileBelowCursor() {
+	if len(f.dirs) == 0 || f.cursor < 0 || f.cursor >= len(f.dirs) {
+		logging.Error(fmt.Sprintf("Invalid cursor position. Dirs length: %d, Cursor: %d", len(f.dirs), f.cursor))
+		f.viewport.SetContent("Preview unavailable")
+		return
+	}
+
+	dir := f.dirs[f.cursor]
+	filename := dir.Name()
+	if !dir.IsDir() && isExtSupported(filename) {
+		fullPath := f.cwdDetails.directory + "/" + dir.Name()
+
+		go func() {
+			imageString, err := image.ImagePreview(f.viewport.Width-4, fullPath)
+			if err != nil {
+				logging.Error(err.Error())
+				f.viewport.SetContent("Preview unavailable")
+				return
+			}
+
+			f.viewport.SetContent(imageString)
+		}()
+	} else {
+		f.viewport.SetContent("Preview unavailable")
+	}
+}
+
+func readDir(path string, showHidden bool) []os.DirEntry {
+	logging.Info(fmt.Sprintf("Reading directory: %s", path))
+
+	entriesChan := make(chan []os.DirEntry, 1)
+	errChan := make(chan error, 1)
+
+	go func() {
+		dirEntries, err := os.ReadDir(path)
+		if err != nil {
+			logging.ErrorPersist(err.Error())
+			errChan <- err
+			return
+		}
+		entriesChan <- dirEntries
+	}()
+
+	select {
+	case dirEntries := <-entriesChan:
+		sort.Slice(dirEntries, func(i, j int) bool {
+			if dirEntries[i].IsDir() == dirEntries[j].IsDir() {
+				return dirEntries[i].Name() < dirEntries[j].Name()
+			}
+			return dirEntries[i].IsDir()
+		})
+
+		if showHidden {
+			return dirEntries
+		}
+
+		var sanitizedDirEntries []os.DirEntry
+		for _, dirEntry := range dirEntries {
+			isHidden, _ := IsHidden(dirEntry.Name())
+			if !isHidden {
+				if dirEntry.IsDir() || isExtSupported(dirEntry.Name()) {
+					sanitizedDirEntries = append(sanitizedDirEntries, dirEntry)
+				}
+			}
+		}
+
+		return sanitizedDirEntries
+
+	case err := <-errChan:
+		logging.ErrorPersist(fmt.Sprintf("Error reading directory %s", path), err)
+		return []os.DirEntry{}
+
+	case <-time.After(5 * time.Second):
+		logging.ErrorPersist(fmt.Sprintf("Timeout reading directory %s", path), nil)
+		return []os.DirEntry{}
+	}
+}
+
+func IsHidden(file string) (bool, error) {
+	return strings.HasPrefix(file, "."), nil
+}
+
+func isExtSupported(path string) bool {
+	ext := strings.ToLower(filepath.Ext(path))
+	return (ext == ".jpg" || ext == ".jpeg" || ext == ".webp" || ext == ".png")
+}
@@ -74,7 +74,7 @@ func (h *helpCmp) render() string {
 	var (
 		pairs []string
 		width int
-		rows  = 10 - 2
+		rows  = 12 - 2
 	)

 	for i := 0; i < len(bindings); i += rows {
@@ -270,20 +270,23 @@ func (m *modelDialogCmp) BindingKeys() []key.Binding {

 func (m *modelDialogCmp) setupModels() {
 	cfg := config.Get()
-
+	modelInfo := GetSelectedModel(cfg)
 	m.availableProviders = getEnabledProviders(cfg)
 	m.hScrollPossible = len(m.availableProviders) > 1

-	agentCfg := cfg.Agents[config.AgentCoder]
-	selectedModelId := agentCfg.Model
-	modelInfo := models.SupportedModels[selectedModelId]
-
 	m.provider = modelInfo.Provider
 	m.hScrollOffset = findProviderIndex(m.availableProviders, m.provider)

 	m.setupModelsForProvider(m.provider)
 }

+func GetSelectedModel(cfg *config.Config) models.Model {
+
+	agentCfg := cfg.Agents[config.AgentCoder]
+	selectedModelId := agentCfg.Model
+	return models.SupportedModels[selectedModelId]
+}
+
 func getEnabledProviders(cfg *config.Config) []models.ModelProvider {
 	var providers []models.ModelProvider
 	for providerId, provider := range cfg.Providers {
@@ -151,7 +151,7 @@ func (p *permissionDialogCmp) selectCurrentOption() tea.Cmd {
 func (p *permissionDialogCmp) renderButtons() string {
 	t := theme.CurrentTheme()
 	baseStyle := styles.BaseStyle()
-	
+
 	allowStyle := baseStyle
 	allowSessionStyle := baseStyle
 	denyStyle := baseStyle
@@ -197,7 +197,7 @@ func (p *permissionDialogCmp) renderButtons() string {
 func (p *permissionDialogCmp) renderHeader() string {
 	t := theme.CurrentTheme()
 	baseStyle := styles.BaseStyle()
-	
+
 	toolKey := baseStyle.Foreground(t.TextMuted()).Bold(true).Render("Tool")
 	toolValue := baseStyle.
 		Foreground(t.Text()).
@@ -230,9 +230,36 @@ func (p *permissionDialogCmp) renderHeader() string {
 	case tools.BashToolName:
 		headerParts = append(headerParts, baseStyle.Foreground(t.TextMuted()).Width(p.width).Bold(true).Render("Command"))
 	case tools.EditToolName:
-		headerParts = append(headerParts, baseStyle.Foreground(t.TextMuted()).Width(p.width).Bold(true).Render("Diff"))
+		params := p.permission.Params.(tools.EditPermissionsParams)
+		fileKey := baseStyle.Foreground(t.TextMuted()).Bold(true).Render("File")
+		filePath := baseStyle.
+			Foreground(t.Text()).
+			Width(p.width - lipgloss.Width(fileKey)).
+			Render(fmt.Sprintf(": %s", params.FilePath))
+		headerParts = append(headerParts,
+			lipgloss.JoinHorizontal(
+				lipgloss.Left,
+				fileKey,
+				filePath,
+			),
+			baseStyle.Render(strings.Repeat(" ", p.width)),
+		)
+
 	case tools.WriteToolName:
-		headerParts = append(headerParts, baseStyle.Foreground(t.TextMuted()).Width(p.width).Bold(true).Render("Diff"))
+		params := p.permission.Params.(tools.WritePermissionsParams)
+		fileKey := baseStyle.Foreground(t.TextMuted()).Bold(true).Render("File")
+		filePath := baseStyle.
+			Foreground(t.Text()).
+			Width(p.width - lipgloss.Width(fileKey)).
+			Render(fmt.Sprintf(": %s", params.FilePath))
+		headerParts = append(headerParts,
+			lipgloss.JoinHorizontal(
+				lipgloss.Left,
+				fileKey,
+				filePath,
+			),
+			baseStyle.Render(strings.Repeat(" ", p.width)),
+		)
 	case tools.FetchToolName:
 		headerParts = append(headerParts, baseStyle.Foreground(t.TextMuted()).Width(p.width).Bold(true).Render("URL"))
 	}
@@ -243,13 +270,13 @@ func (p *permissionDialogCmp) renderHeader() string {
 func (p *permissionDialogCmp) renderBashContent() string {
 	t := theme.CurrentTheme()
 	baseStyle := styles.BaseStyle()
-	
+
 	if pr, ok := p.permission.Params.(tools.BashPermissionsParams); ok {
 		content := fmt.Sprintf("```bash\n%s\n```", pr.Command)

 		// Use the cache for markdown rendering
 		renderedContent := p.GetOrSetMarkdown(p.permission.ID, func() (string, error) {
-			r := styles.GetMarkdownRenderer(p.width-10)
+			r := styles.GetMarkdownRenderer(p.width - 10)
 			s, err := r.Render(content)
 			return styles.ForceReplaceBackgroundWithLipgloss(s, t.Background()), err
 		})
@@ -303,13 +330,13 @@ func (p *permissionDialogCmp) renderWriteContent() string {
 func (p *permissionDialogCmp) renderFetchContent() string {
 	t := theme.CurrentTheme()
 	baseStyle := styles.BaseStyle()
-	
+
 	if pr, ok := p.permission.Params.(tools.FetchPermissionsParams); ok {
 		content := fmt.Sprintf("```bash\n%s\n```", pr.URL)

 		// Use the cache for markdown rendering
 		renderedContent := p.GetOrSetMarkdown(p.permission.ID, func() (string, error) {
-			r := styles.GetMarkdownRenderer(p.width-10)
+			r := styles.GetMarkdownRenderer(p.width - 10)
 			s, err := r.Render(content)
 			return styles.ForceReplaceBackgroundWithLipgloss(s, t.Background()), err
 		})
@@ -326,12 +353,12 @@ func (p *permissionDialogCmp) renderFetchContent() string {
 func (p *permissionDialogCmp) renderDefaultContent() string {
 	t := theme.CurrentTheme()
 	baseStyle := styles.BaseStyle()
-	
+
 	content := p.permission.Description

 	// Use the cache for markdown rendering
 	renderedContent := p.GetOrSetMarkdown(p.permission.ID, func() (string, error) {
-		r := styles.GetMarkdownRenderer(p.width-10)
+		r := styles.GetMarkdownRenderer(p.width - 10)
 		s, err := r.Render(content)
 		return styles.ForceReplaceBackgroundWithLipgloss(s, t.Background()), err
 	})
@@ -359,7 +386,7 @@ func (p *permissionDialogCmp) styleViewport() string {
 func (p *permissionDialogCmp) render() string {
 	t := theme.CurrentTheme()
 	baseStyle := styles.BaseStyle()
-	
+
 	title := baseStyle.
 		Bold(true).
 		Width(p.width - 4).
@@ -0,0 +1,72 @@
+package image
+
+import (
+	"fmt"
+	"image"
+	"os"
+	"strings"
+
+	"github.com/charmbracelet/lipgloss"
+	"github.com/disintegration/imaging"
+	"github.com/lucasb-eyer/go-colorful"
+)
+
+func ValidateFileSize(filePath string, sizeLimit int64) (bool, error) {
+	fileInfo, err := os.Stat(filePath)
+	if err != nil {
+		return false, fmt.Errorf("error getting file info: %w", err)
+	}
+
+	if fileInfo.Size() > sizeLimit {
+		return true, nil
+	}
+
+	return false, nil
+}
+
+func ToString(width int, img image.Image) string {
+	img = imaging.Resize(img, width, 0, imaging.Lanczos)
+	b := img.Bounds()
+	imageWidth := b.Max.X
+	h := b.Max.Y
+	str := strings.Builder{}
+
+	for heightCounter := 0; heightCounter < h; heightCounter += 2 {
+		for x := range imageWidth {
+			c1, _ := colorful.MakeColor(img.At(x, heightCounter))
+			color1 := lipgloss.Color(c1.Hex())
+
+			var color2 lipgloss.Color
+			if heightCounter+1 < h {
+				c2, _ := colorful.MakeColor(img.At(x, heightCounter+1))
+				color2 = lipgloss.Color(c2.Hex())
+			} else {
+				color2 = color1
+			}
+
+			str.WriteString(lipgloss.NewStyle().Foreground(color1).
+				Background(color2).Render("▀"))
+		}
+
+		str.WriteString("\n")
+	}
+
+	return str.String()
+}
+
+func ImagePreview(width int, filename string) (string, error) {
+	imageContent, err := os.Open(filename)
+	if err != nil {
+		return "", err
+	}
+	defer imageContent.Close()
+
+	img, _, err := image.Decode(imageContent)
+	if err != nil {
+		return "", err
+	}
+
+	imageString := ToString(width, img)
+
+	return imageString, nil
+}
@@ -6,8 +6,10 @@ import (
 	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/opencode-ai/opencode/internal/app"
+	"github.com/opencode-ai/opencode/internal/message"
 	"github.com/opencode-ai/opencode/internal/session"
 	"github.com/opencode-ai/opencode/internal/tui/components/chat"
+	"github.com/opencode-ai/opencode/internal/tui/components/dialog"
 	"github.com/opencode-ai/opencode/internal/tui/layout"
 	"github.com/opencode-ai/opencode/internal/tui/util"
 )
@@ -52,7 +54,17 @@ func (p *chatPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		cmd := p.layout.SetSize(msg.Width, msg.Height)
 		cmds = append(cmds, cmd)
 	case chat.SendMsg:
-		cmd := p.sendMessage(msg.Text)
+		cmd := p.sendMessage(msg.Text, msg.Attachments)
+		if cmd != nil {
+			return p, cmd
+		}
+	case dialog.CommandRunCustomMsg:
+		// Check if the agent is busy before executing custom commands
+		if p.app.CoderAgent.IsBusy() {
+			return p, util.ReportWarn("Agent is busy, please wait before executing a command...")
+		}
+		// Handle custom command execution
+		cmd := p.sendMessage(msg.Content, nil)
 		if cmd != nil {
 			return p, cmd
 		}
@@ -99,7 +111,7 @@ func (p *chatPage) clearSidebar() tea.Cmd {
 	return p.layout.ClearRightPanel()
 }

-func (p *chatPage) sendMessage(text string) tea.Cmd {
+func (p *chatPage) sendMessage(text string, attachments []message.Attachment) tea.Cmd {
 	var cmds []tea.Cmd
 	if p.session.ID == "" {
 		session, err := p.app.Sessions.Create(context.Background(), "New Session")
@@ -115,7 +127,10 @@ func (p *chatPage) sendMessage(text string) tea.Cmd {
 		cmds = append(cmds, util.CmdHandler(chat.SessionSelectedMsg(session)))
 	}

-	p.app.CoderAgent.Run(context.Background(), p.session.ID, text)
+	_, err := p.app.CoderAgent.Run(context.Background(), p.session.ID, text, attachments...)
+	if err != nil {
+		return util.ReportError(err)
+	}
 	return tea.Batch(cmds...)
 }

@@ -134,6 +149,7 @@ func (p *chatPage) View() string {
 func (p *chatPage) BindingKeys() []key.Binding {
 	bindings := layout.KeyMapToSlice(keyMap)
 	bindings = append(bindings, p.messages.BindingKeys()...)
+	bindings = append(bindings, p.editor.BindingKeys()...)
 	return bindings
 }

@@ -3,11 +3,12 @@ package styles
 const (
 	OpenCodeIcon string = "⌬"

-	CheckIcon   string = "✓"
-	ErrorIcon   string = "✖"
-	WarningIcon string = "⚠"
-	InfoIcon    string = ""
-	HintIcon    string = "i"
-	SpinnerIcon string = "..."
-	LoadingIcon string = "⟳"
-)
+	CheckIcon    string = "✓"
+	ErrorIcon    string = "✖"
+	WarningIcon  string = "⚠"
+	InfoIcon     string = ""
+	HintIcon     string = "i"
+	SpinnerIcon  string = "..."
+	LoadingIcon  string = "⟳"
+	DocumentIcon string = "🖼"
+)
@@ -5,6 +5,10 @@ import (
 	"github.com/opencode-ai/opencode/internal/tui/theme"
 )

+var (
+	ImageBakcground = "#212121"
+)
+
 // Style generation functions that use the current theme

 // BaseStyle returns the base style with background and foreground colors
@@ -149,4 +153,3 @@ func BorderFocusedColor() lipgloss.AdaptiveColor {
 func BorderDimColor() lipgloss.AdaptiveColor {
 	return theme.CurrentTheme().BorderDim()
 }
-
@@ -3,20 +3,24 @@ package tui
 import (
 	"context"
 	"fmt"
+	"strings"

 	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/opencode-ai/opencode/internal/app"
 	"github.com/opencode-ai/opencode/internal/config"
+	"github.com/opencode-ai/opencode/internal/llm/agent"
 	"github.com/opencode-ai/opencode/internal/logging"
 	"github.com/opencode-ai/opencode/internal/permission"
 	"github.com/opencode-ai/opencode/internal/pubsub"
+	"github.com/opencode-ai/opencode/internal/session"
 	"github.com/opencode-ai/opencode/internal/tui/components/chat"
 	"github.com/opencode-ai/opencode/internal/tui/components/core"
 	"github.com/opencode-ai/opencode/internal/tui/components/dialog"
 	"github.com/opencode-ai/opencode/internal/tui/layout"
 	"github.com/opencode-ai/opencode/internal/tui/page"
+	"github.com/opencode-ai/opencode/internal/tui/theme"
 	"github.com/opencode-ai/opencode/internal/tui/util"
 )

@@ -26,10 +30,17 @@ type keyMap struct {
 	Help          key.Binding
 	SwitchSession key.Binding
 	Commands      key.Binding
+	Filepicker    key.Binding
 	Models        key.Binding
 	SwitchTheme   key.Binding
 }

+type startCompactSessionMsg struct{}
+
+const (
+	quitKey = "q"
+)
+
 var keys = keyMap{
 	Logs: key.NewBinding(
 		key.WithKeys("ctrl+l"),
@@ -54,10 +65,13 @@ var keys = keyMap{
 		key.WithKeys("ctrl+k"),
 		key.WithHelp("ctrl+k", "commands"),
 	),
-
+	Filepicker: key.NewBinding(
+		key.WithKeys("ctrl+f"),
+		key.WithHelp("ctrl+f", "select files to upload"),
+	),
 	Models: key.NewBinding(
-		key.WithKeys("ctrl+m"),
-		key.WithHelp("ctrl+m", "model selection"),
+		key.WithKeys("ctrl+o"),
+		key.WithHelp("ctrl+o", "model selection"),
 	),

 	SwitchTheme: key.NewBinding(
@@ -77,18 +91,19 @@ var returnKey = key.NewBinding(
 )

 var logsKeyReturnKey = key.NewBinding(
-	key.WithKeys("esc", "backspace", "q"),
+	key.WithKeys("esc", "backspace", quitKey),
 	key.WithHelp("esc/q", "go back"),
 )

 type appModel struct {
-	width, height int
-	currentPage   page.PageID
-	previousPage  page.PageID
-	pages         map[page.PageID]tea.Model
-	loadedPages   map[page.PageID]bool
-	status        core.StatusCmp
-	app           *app.App
+	width, height   int
+	currentPage     page.PageID
+	previousPage    page.PageID
+	pages           map[page.PageID]tea.Model
+	loadedPages     map[page.PageID]bool
+	status          core.StatusCmp
+	app             *app.App
+	selectedSession session.Session

 	showPermissions bool
 	permissions     dialog.PermissionDialogCmp
@@ -112,8 +127,17 @@ type appModel struct {
 	showInitDialog bool
 	initDialog     dialog.InitDialogCmp

+	showFilepicker bool
+	filepicker     dialog.FilepickerCmp
+
 	showThemeDialog bool
 	themeDialog     dialog.ThemeDialog
+
+	showArgumentsDialog bool
+	argumentsDialog     dialog.ArgumentsDialogCmp
+
+	isCompacting      bool
+	compactingMessage string
 }

 func (a appModel) Init() tea.Cmd {
@@ -135,6 +159,8 @@ func (a appModel) Init() tea.Cmd {
 	cmds = append(cmds, cmd)
 	cmd = a.initDialog.Init()
 	cmds = append(cmds, cmd)
+	cmd = a.filepicker.Init()
+	cmds = append(cmds, cmd)
 	cmd = a.themeDialog.Init()
 	cmds = append(cmds, cmd)

@@ -182,8 +208,19 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		a.commandDialog = command.(dialog.CommandDialog)
 		cmds = append(cmds, commandCmd)

+		filepicker, filepickerCmd := a.filepicker.Update(msg)
+		a.filepicker = filepicker.(dialog.FilepickerCmp)
+		cmds = append(cmds, filepickerCmd)
+
 		a.initDialog.SetSize(msg.Width, msg.Height)

+		if a.showArgumentsDialog {
+			a.argumentsDialog.SetSize(msg.Width, msg.Height)
+			args, argsCmd := a.argumentsDialog.Update(msg)
+			a.argumentsDialog = args.(dialog.ArgumentsDialogCmp)
+			cmds = append(cmds, argsCmd, a.argumentsDialog.Init())
+		}
+
 		return a, tea.Batch(cmds...)
 	// Status
 	case util.InfoMsg:
@@ -266,6 +303,70 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		a.showCommandDialog = false
 		return a, nil

+	case startCompactSessionMsg:
+		// Start compacting the current session
+		a.isCompacting = true
+		a.compactingMessage = "Starting summarization..."
+
+		if a.selectedSession.ID == "" {
+			a.isCompacting = false
+			return a, util.ReportWarn("No active session to summarize")
+		}
+
+		// Start the summarization process
+		return a, func() tea.Msg {
+			ctx := context.Background()
+			a.app.CoderAgent.Summarize(ctx, a.selectedSession.ID)
+			return nil
+		}
+
+	case pubsub.Event[agent.AgentEvent]:
+		payload := msg.Payload
+		if payload.Error != nil {
+			a.isCompacting = false
+			return a, util.ReportError(payload.Error)
+		}
+
+		a.compactingMessage = payload.Progress
+
+		if payload.Done && payload.Type == agent.AgentEventTypeSummarize {
+			a.isCompacting = false
+
+			if payload.SessionID != "" {
+				// Switch to the new session
+				return a, func() tea.Msg {
+					sessions, err := a.app.Sessions.List(context.Background())
+					if err != nil {
+						return util.InfoMsg{
+							Type: util.InfoTypeError,
+							Msg:  "Failed to list sessions: " + err.Error(),
+						}
+					}
+
+					for _, s := range sessions {
+						if s.ID == payload.SessionID {
+							return dialog.SessionSelectedMsg{Session: s}
+						}
+					}
+
+					return util.InfoMsg{
+						Type: util.InfoTypeError,
+						Msg:  "Failed to find new session",
+					}
+				}
+			}
+			return a, util.ReportInfo("Session summarization complete")
+		} else if payload.Done && payload.Type == agent.AgentEventTypeResponse && a.selectedSession.ID != "" {
+			model := a.app.CoderAgent.Model()
+			contextWindow := model.ContextWindow
+			tokens := a.selectedSession.CompletionTokens + a.selectedSession.PromptTokens
+			if (tokens >= int64(float64(contextWindow)*0.95)) && config.Get().AutoCompact {
+				return a, util.CmdHandler(startCompactSessionMsg{})
+			}
+		}
+		// Continue listening for events
+		return a, nil
+
 	case dialog.CloseThemeDialogMsg:
 		a.showThemeDialog = false
 		return a, nil
@@ -315,7 +416,13 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		return a, nil

 	case chat.SessionSelectedMsg:
+		a.selectedSession = msg
 		a.sessionDialog.SetSelectedSession(msg.ID)
+
+	case pubsub.Event[session.Session]:
+		if msg.Type == pubsub.UpdatedEvent && msg.Payload.ID == a.selectedSession.ID {
+			a.selectedSession = msg.Payload
+		}
 	case dialog.SessionSelectedMsg:
 		a.showSessionDialog = false
 		if a.currentPage == page.ChatPage {
@@ -331,8 +438,38 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		}
 		return a, util.ReportInfo("Command selected: " + msg.Command.Title)

+	case dialog.ShowArgumentsDialogMsg:
+		// Show arguments dialog
+		a.argumentsDialog = dialog.NewArgumentsDialogCmp(msg.CommandID, msg.Content)
+		a.showArgumentsDialog = true
+		return a, a.argumentsDialog.Init()
+
+	case dialog.CloseArgumentsDialogMsg:
+		// Close arguments dialog
+		a.showArgumentsDialog = false
+
+		// If submitted, replace $ARGUMENTS and run the command
+		if msg.Submit {
+			// Replace $ARGUMENTS with the provided arguments
+			content := strings.ReplaceAll(msg.Content, "$ARGUMENTS", msg.Arguments)
+
+			// Execute the command with arguments
+			return a, util.CmdHandler(dialog.CommandRunCustomMsg{
+				Content: content,
+			})
+		}
+		return a, nil
+
 	case tea.KeyMsg:
+		// If arguments dialog is open, let it handle the key press first
+		if a.showArgumentsDialog {
+			args, cmd := a.argumentsDialog.Update(msg)
+			a.argumentsDialog = args.(dialog.ArgumentsDialogCmp)
+			return a, cmd
+		}
+
 		switch {
+
 		case key.Matches(msg, keys.Quit):
 			a.showQuit = !a.showQuit
 			if a.showHelp {
@@ -344,9 +481,16 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			if a.showCommandDialog {
 				a.showCommandDialog = false
 			}
+			if a.showFilepicker {
+				a.showFilepicker = false
+				a.filepicker.ToggleFilepicker(a.showFilepicker)
+			}
 			if a.showModelDialog {
 				a.showModelDialog = false
 			}
+			if a.showArgumentsDialog {
+				a.showArgumentsDialog = false
+			}
 			return a, nil
 		case key.Matches(msg, keys.SwitchSession):
 			if a.currentPage == page.ChatPage && !a.showQuit && !a.showPermissions && !a.showCommandDialog {
@@ -364,7 +508,7 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}
 			return a, nil
 		case key.Matches(msg, keys.Commands):
-			if a.currentPage == page.ChatPage && !a.showQuit && !a.showPermissions && !a.showSessionDialog && !a.showThemeDialog {
+			if a.currentPage == page.ChatPage && !a.showQuit && !a.showPermissions && !a.showSessionDialog && !a.showThemeDialog && !a.showFilepicker {
 				// Show commands dialog
 				if len(a.commands) == 0 {
 					return a, util.ReportWarn("No commands available")
@@ -392,26 +536,36 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				return a, a.themeDialog.Init()
 			}
 			return a, nil
-		case key.Matches(msg, logsKeyReturnKey):
-			if a.currentPage == page.LogsPage {
-				return a, a.moveToPage(page.ChatPage)
-			}
-		case key.Matches(msg, returnKey):
-			if a.showQuit {
-				a.showQuit = !a.showQuit
-				return a, nil
-			}
-			if a.showHelp {
-				a.showHelp = !a.showHelp
-				return a, nil
-			}
-			if a.showInitDialog {
-				a.showInitDialog = false
-				// Mark the project as initialized without running the command
-				if err := config.MarkProjectInitialized(); err != nil {
-					return a, util.ReportError(err)
+		case key.Matches(msg, returnKey) || key.Matches(msg):
+			if msg.String() == quitKey {
+				if a.currentPage == page.LogsPage {
+					return a, a.moveToPage(page.ChatPage)
+				}
+			} else if !a.filepicker.IsCWDFocused() {
+				if a.showQuit {
+					a.showQuit = !a.showQuit
+					return a, nil
+				}
+				if a.showHelp {
+					a.showHelp = !a.showHelp
+					return a, nil
+				}
+				if a.showInitDialog {
+					a.showInitDialog = false
+					// Mark the project as initialized without running the command
+					if err := config.MarkProjectInitialized(); err != nil {
+						return a, util.ReportError(err)
+					}
+					return a, nil
+				}
+				if a.showFilepicker {
+					a.showFilepicker = false
+					a.filepicker.ToggleFilepicker(a.showFilepicker)
+					return a, nil
+				}
+				if a.currentPage == page.LogsPage {
+					return a, a.moveToPage(page.ChatPage)
 				}
-				return a, nil
 			}
 		case key.Matches(msg, keys.Logs):
 			return a, a.moveToPage(page.LogsPage)
@@ -429,10 +583,28 @@ func (a appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				a.showHelp = !a.showHelp
 				return a, nil
 			}
+		case key.Matches(msg, keys.Filepicker):
+			a.showFilepicker = !a.showFilepicker
+			a.filepicker.ToggleFilepicker(a.showFilepicker)
+			return a, nil
 		}
+	default:
+		f, filepickerCmd := a.filepicker.Update(msg)
+		a.filepicker = f.(dialog.FilepickerCmp)
+		cmds = append(cmds, filepickerCmd)

 	}

+	if a.showFilepicker {
+		f, filepickerCmd := a.filepicker.Update(msg)
+		a.filepicker = f.(dialog.FilepickerCmp)
+		cmds = append(cmds, filepickerCmd)
+		// Only block key messages send all other messages down
+		if _, ok := msg.(tea.KeyMsg); ok {
+			return a, tea.Batch(cmds...)
+		}
+	}
+
 	if a.showQuit {
 		q, quitCmd := a.quit.Update(msg)
 		a.quit = q.(dialog.QuitDialog)
@@ -514,11 +686,21 @@ func (a *appModel) RegisterCommand(cmd dialog.Command) {
 	a.commands = append(a.commands, cmd)
 }

+func (a *appModel) findCommand(id string) (dialog.Command, bool) {
+	for _, cmd := range a.commands {
+		if cmd.ID == id {
+			return cmd, true
+		}
+	}
+	return dialog.Command{}, false
+}
+
 func (a *appModel) moveToPage(pageID page.PageID) tea.Cmd {
 	if a.app.CoderAgent.IsBusy() {
 		// For now we don't move to any page if the agent is busy
 		return util.ReportWarn("Agent is busy, please wait...")
 	}
+
 	var cmds []tea.Cmd
 	if _, ok := a.loadedPages[pageID]; !ok {
 		cmd := a.pages[pageID].Init()
@@ -559,10 +741,45 @@ func (a appModel) View() string {
 		)
 	}

-	if !a.app.CoderAgent.IsBusy() {
-		a.status.SetHelpWidgetMsg("ctrl+? help")
-	} else {
-		a.status.SetHelpWidgetMsg("? help")
+	if a.showFilepicker {
+		overlay := a.filepicker.View()
+		row := lipgloss.Height(appView) / 2
+		row -= lipgloss.Height(overlay) / 2
+		col := lipgloss.Width(appView) / 2
+		col -= lipgloss.Width(overlay) / 2
+		appView = layout.PlaceOverlay(
+			col,
+			row,
+			overlay,
+			appView,
+			true,
+		)
+
+	}
+
+	// Show compacting status overlay
+	if a.isCompacting {
+		t := theme.CurrentTheme()
+		style := lipgloss.NewStyle().
+			Border(lipgloss.RoundedBorder()).
+			BorderForeground(t.BorderFocused()).
+			BorderBackground(t.Background()).
+			Padding(1, 2).
+			Background(t.Background()).
+			Foreground(t.Text())
+
+		overlay := style.Render("Summarizing\n" + a.compactingMessage)
+		row := lipgloss.Height(appView) / 2
+		row -= lipgloss.Height(overlay) / 2
+		col := lipgloss.Width(appView) / 2
+		col -= lipgloss.Width(overlay) / 2
+		appView = layout.PlaceOverlay(
+			col,
+			row,
+			overlay,
+			appView,
+			true,
+		)
 	}

 	if a.showHelp {
@@ -681,6 +898,21 @@ func (a appModel) View() string {
 		)
 	}

+	if a.showArgumentsDialog {
+		overlay := a.argumentsDialog.View()
+		row := lipgloss.Height(appView) / 2
+		row -= lipgloss.Height(overlay) / 2
+		col := lipgloss.Width(appView) / 2
+		col -= lipgloss.Width(overlay) / 2
+		appView = layout.PlaceOverlay(
+			col,
+			row,
+			overlay,
+			appView,
+			true,
+		)
+	}
+
 	return appView
 }

@@ -704,6 +936,7 @@ func New(app *app.App) tea.Model {
 			page.ChatPage: page.NewChatPage(app),
 			page.LogsPage: page.NewLogsPage(),
 		},
+		filepicker: dialog.NewFilepickerCmp(app),
 	}

 	model.RegisterCommand(dialog.Command{
@@ -725,5 +958,26 @@ If there are Cursor rules (in .cursor/rules/ or .cursorrules) or Copilot rules (
 			)
 		},
 	})
+
+	model.RegisterCommand(dialog.Command{
+		ID:          "compact",
+		Title:       "Compact Session",
+		Description: "Summarize the current session and create a new one with the summary",
+		Handler: func(cmd dialog.Command) tea.Cmd {
+			return func() tea.Msg {
+				return startCompactSessionMsg{}
+			}
+		},
+	})
+	// Load custom commands
+	customCommands, err := dialog.LoadCustomCommands()
+	if err != nil {
+		logging.Warn("Failed to load custom commands", "error", err)
+	} else {
+		for _, cmd := range customCommands {
+			model.RegisterCommand(cmd)
+		}
+	}
+
 	return model
 }
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Script to check for hidden/invisible characters in Go files
+# This helps detect potential prompt injection attempts
+
+echo "Checking Go files for hidden characters..."
+
+# Find all Go files in the repository
+go_files=$(find . -name "*.go" -type f)
+
+# Counter for files with hidden characters
+files_with_hidden=0
+
+for file in $go_files; do
+  # Check for specific Unicode hidden characters that could be used for prompt injection
+  # This excludes normal whitespace like tabs and newlines
+  # Looking for:
+  # - Zero-width spaces (U+200B)
+  # - Zero-width non-joiners (U+200C)
+  # - Zero-width joiners (U+200D)
+  # - Left-to-right/right-to-left marks (U+200E, U+200F)
+  # - Bidirectional overrides (U+202A-U+202E)
+  # - Byte order mark (U+FEFF)
+  if hexdump -C "$file" | grep -E 'e2 80 8b|e2 80 8c|e2 80 8d|e2 80 8e|e2 80 8f|e2 80 aa|e2 80 ab|e2 80 ac|e2 80 ad|e2 80 ae|ef bb bf' > /dev/null 2>&1; then
+    echo "Hidden characters found in: $file"
+    
+    # Show the file with potential issues
+    echo "  Hexdump showing suspicious characters:"
+    hexdump -C "$file" | grep -E 'e2 80 8b|e2 80 8c|e2 80 8d|e2 80 8e|e2 80 8f|e2 80 aa|e2 80 ab|e2 80 ac|e2 80 ad|e2 80 ae|ef bb bf' | head -10
+    
+    files_with_hidden=$((files_with_hidden + 1))
+  fi
+done
+
+if [ $files_with_hidden -eq 0 ]; then
+  echo "No hidden characters found in any Go files."
+else
+  echo "Found hidden characters in $files_with_hidden Go file(s)."
+fi
+
+exit $files_with_hidden  # Exit with number of affected files as status code
Author	SHA1	Message	Date
Kujtim Hoxha	44bf46209e	update aur	2025-05-14 23:11:56 +02:00
Kujtim Hoxha	b04faf0a3a	update readme	2025-05-14 22:59:28 +02:00
Kujtim Hoxha	90084ce43d	Context Window Warning (#152 ) * context window warning & compact command * auto compact * fix permissions * update readme * fix 3.5 context window * small update * remove unused interface * remove unused msg	2025-05-09 19:30:57 +02:00
Nicholas Hamilton	9345830c8a	Fix filepicker manual input (#146 ) * fix: allows to type i while manual inputting filepath * fix: file selection in filepicker focus mode * remove duplicate code	2025-05-09 16:40:06 +02:00
Kujtim Hoxha	5307100f89	small fix	2025-05-09 16:37:02 +02:00
Ed Zynda	a58e607c5f	feat: custom commands (#133 ) * Implement custom commands * Add User: prefix * Reuse var * Check if the agent is busy and if so report a warning * Update README * fix typo * Implement user and project scoped custom commands * Allow for $ARGUMENTS * UI tweaks * Update internal/tui/components/dialog/arguments.go Co-authored-by: Kujtim Hoxha <kujtimii.h@gmail.com> * Also search in $HOME/.opencode/commands --------- Co-authored-by: Kujtim Hoxha <kujtimii.h@gmail.com>	2025-05-09 16:33:35 +02:00
mineo	cd04c44517	replace `github.com/google/generative-ai-go` with `github.com/googleapis/go-genai` (#138 ) * replace to github.com/googleapis/go-genai * fix history logic * small fixes --------- Co-authored-by: Kujtim Hoxha <kujtimii.h@gmail.com>	2025-05-09 14:15:38 +02:00
Joshua LaMorey-Salzmann	88711db796	Config fix correcting loose viper string check, default model now set correctly (#147 )	2025-05-05 09:40:58 +02:00
phantomreactor	9fec8df7d0	add support for images (#144 )	2025-05-02 22:23:58 +02:00
Kujtim Hoxha	603a3e3c71	add xai support (#135 )	2025-05-01 14:17:33 +02:00