diff --git a/.github/ISSUE_TEMPLATE/1.bug-report.yml b/.github/ISSUE_TEMPLATE/1.bug-report.yml
deleted file mode 100644
index 543c22117c2aa889b91fddd9eddd905c09dd0644..0000000000000000000000000000000000000000
--- a/.github/ISSUE_TEMPLATE/1.bug-report.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-name: Report an issue
-description: Report an issue with Zed.
-type: Bug
-body:
- - type: markdown
- attributes:
- value: |
- Feature requests should be opened in [discussions](https://github.com/zed-industries/zed/discussions/new/choose).
-
- Before opening a new issue, please do a [search](https://github.com/zed-industries/zed/issues) of existing issues and :+1: upvote the existing issue instead. This will help us maintain a proper signal-to-noise ratio.
-
- If you need help with your own project, you can ask a question in our [Discord Support Forums](https://discord.com/invite/zedindustries).
- - type: textarea
- attributes:
- label: Reproduction steps
- description: A step-by-step description of how to reproduce the issue from a **clean Zed install**. Any code must be sufficient to reproduce (make sure to include context!). Include code as text, not just as a screenshot. **Issues with insufficient detail may be summarily closed**.
- placeholder: |
- 1. Start Zed
- 2. Click X
- 3. Y will happen
- validations:
- required: true
- - type: textarea
- attributes:
- label: Current vs. Expected behavior
- description: |
- A clear and concise description of what is the current behavior (screenshots, videos), vs. what you expected the behavior to be.
-
- **Skipping this/failure to provide complete information will result in the issue being closed.**
- placeholder: "Based on my reproduction steps above, when I click X, I expect this to happen, but instead Y happens."
- validations:
- required: true
- - type: textarea
- attributes:
- label: If applicable, attach your Zed log file to this issue.
- description: |
- Open the command palette in Zed, then type `zed: open log` to see the last 1000 lines. Or type `zed: reveal log in file manager` in the command palette to reveal the log file itself.
- value: |
- Zed.log
-
-
- ```log
-
- ```
-
- Zed.log
+
+
+ ```log
+
+ ```
+
+ settings.json
+
+
+ ```json
+
+ ```
+
+ keymap.json
+
+
+ ```json
+
+ ```
+
+ [\"'`])?",
- "# `path` is the shortest sequence of any non-space character",
- "(?(?[^ ]+?",
- " # which may end with a line and optionally a column,",
- " (?:+[0-9]+(:[0-9]+)?|:?\\([0-9]+([,:][0-9]+)?\\))?",
- "))",
- "# which must be followed by a matching quote",
- "(?()\\k)",
- "# and optionally a single closing symbol",
- "[)}\\]>]?",
- "# if line/column matched, may be followed by a description",
- "(?():[^ 0-9][^ ]*)?",
- "# which may be followed by trailing punctuation",
- "[.,:)}\\]>]*",
- "# and always includes trailing whitespace or end of line",
- "([ ]+|$)"
- ]
+ "(?",
+ " (",
+ " # multi-char path: first char (not opening delimiter or space)",
+ " [^({\\[<\"'`\\ ]",
+ " # middle chars: non-space, and colon/paren only if not followed by digit/paren",
+ " ([^\\ :(]|[:(][^0-9()])*",
+ " # last char: not closing delimiter or colon",
+ " [^()}\\]>\"'`.,;:\\ ]",
+ " |",
+ " # single-char path: not delimiter, punctuation, or space",
+ " [^(){}\\[\\]<>\"'`.,;:\\ ]",
+ " )",
+ " # optional line/column suffix (included in path for PathWithPosition::parse_str)",
+ " (:+[0-9]+(:[0-9]+)?|:?\\([0-9]+([,:]?[0-9]+)?\\))?",
+ ")",
+ ],
],
// Timeout for hover and Cmd-click path hyperlink discovery in milliseconds. Specifying a
// timeout of `0` will disable path hyperlinking in terminal.
- "path_hyperlink_timeout_ms": 1
+ "path_hyperlink_timeout_ms": 1,
},
"code_actions_on_format": {},
// Settings related to running tasks.
@@ -1663,7 +1698,7 @@
// * Zed task from history (e.g. one-off task was spawned before)
//
// Default: true
- "prefer_lsp": true
+ "prefer_lsp": true,
},
// An object whose keys are language names, and whose values
// are arrays of filenames or extensions of files that should
@@ -1678,9 +1713,14 @@
// }
//
"file_types": {
- "JSONC": ["**/.zed/**/*.json", "**/zed/**/*.json", "**/Zed/**/*.json", "**/.vscode/**/*.json", "tsconfig*.json"],
+ "JSONC": [
+ "**/.zed/*.json",
+ "**/.vscode/**/*.json",
+ "**/{zed,Zed}/{settings,keymap,tasks,debug}.json",
+ "tsconfig*.json",
+ ],
"Markdown": [".rules", ".cursorrules", ".windsurfrules", ".clinerules"],
- "Shell Script": [".env.*"]
+ "Shell Script": [".env.*"],
},
// Settings for which version of Node.js and NPM to use when installing
// language servers and Copilot.
@@ -1696,14 +1736,14 @@
// `path`, but not `npm_path`, Zed will assume that `npm` is located at
// `${path}/../npm`.
"path": null,
- "npm_path": null
+ "npm_path": null,
},
// The extensions that Zed should automatically install on startup.
//
// If you don't want any of these extensions, add this field to your settings
// and change the value to `false`.
"auto_install_extensions": {
- "html": true
+ "html": true,
},
// The capabilities granted to extensions.
//
@@ -1711,7 +1751,7 @@
"granted_extension_capabilities": [
{ "kind": "process:exec", "command": "*", "args": ["**"] },
{ "kind": "download_file", "host": "*", "path": ["**"] },
- { "kind": "npm:install", "package": "*" }
+ { "kind": "npm:install", "package": "*" },
],
// Controls how completions are processed for this language.
"completions": {
@@ -1762,7 +1802,7 @@
// 4. "replace_suffix"
// Behaves like `"replace"` if the text after the cursor is a suffix of the completion, and like
// `"insert"` otherwise.
- "lsp_insert_mode": "replace_suffix"
+ "lsp_insert_mode": "replace_suffix",
},
// Different settings for specific languages.
"languages": {
@@ -1770,113 +1810,116 @@
"language_servers": ["astro-language-server", "..."],
"prettier": {
"allowed": true,
- "plugins": ["prettier-plugin-astro"]
- }
+ "plugins": ["prettier-plugin-astro"],
+ },
},
"Blade": {
"prettier": {
- "allowed": true
- }
+ "allowed": true,
+ },
},
"C": {
"format_on_save": "off",
"use_on_type_format": false,
"prettier": {
- "allowed": false
- }
+ "allowed": false,
+ },
},
"C++": {
"format_on_save": "off",
"use_on_type_format": false,
"prettier": {
- "allowed": false
- }
+ "allowed": false,
+ },
+ },
+ "CSharp": {
+ "language_servers": ["roslyn", "!omnisharp", "..."],
},
"CSS": {
"prettier": {
- "allowed": true
- }
+ "allowed": true,
+ },
},
"Dart": {
- "tab_size": 2
+ "tab_size": 2,
},
"Diff": {
"show_edit_predictions": false,
"remove_trailing_whitespace_on_save": false,
- "ensure_final_newline_on_save": false
+ "ensure_final_newline_on_save": false,
},
"Elixir": {
- "language_servers": ["elixir-ls", "!expert", "!next-ls", "!lexical", "..."]
+ "language_servers": ["elixir-ls", "!expert", "!next-ls", "!lexical", "..."],
},
"Elm": {
- "tab_size": 4
+ "tab_size": 4,
},
"Erlang": {
- "language_servers": ["erlang-ls", "!elp", "..."]
+ "language_servers": ["erlang-ls", "!elp", "..."],
},
"Git Commit": {
"allow_rewrap": "anywhere",
"soft_wrap": "editor_width",
- "preferred_line_length": 72
+ "preferred_line_length": 72,
},
"Go": {
"hard_tabs": true,
"code_actions_on_format": {
- "source.organizeImports": true
+ "source.organizeImports": true,
},
- "debuggers": ["Delve"]
+ "debuggers": ["Delve"],
},
"GraphQL": {
"prettier": {
- "allowed": true
- }
+ "allowed": true,
+ },
},
"HEEX": {
- "language_servers": ["elixir-ls", "!expert", "!next-ls", "!lexical", "..."]
+ "language_servers": ["elixir-ls", "!expert", "!next-ls", "!lexical", "..."],
},
"HTML": {
"prettier": {
- "allowed": true
- }
+ "allowed": true,
+ },
},
"HTML+ERB": {
- "language_servers": ["herb", "!ruby-lsp", "..."]
+ "language_servers": ["herb", "!ruby-lsp", "..."],
},
"Java": {
"prettier": {
"allowed": true,
- "plugins": ["prettier-plugin-java"]
- }
+ "plugins": ["prettier-plugin-java"],
+ },
},
"JavaScript": {
"language_servers": ["!typescript-language-server", "vtsls", "..."],
"prettier": {
- "allowed": true
- }
+ "allowed": true,
+ },
},
"JSON": {
"prettier": {
- "allowed": true
- }
+ "allowed": true,
+ },
},
"JSONC": {
"prettier": {
- "allowed": true
- }
+ "allowed": true,
+ },
},
"JS+ERB": {
- "language_servers": ["!ruby-lsp", "..."]
+ "language_servers": ["!ruby-lsp", "..."],
},
"Kotlin": {
- "language_servers": ["!kotlin-language-server", "kotlin-lsp", "..."]
+ "language_servers": ["!kotlin-language-server", "kotlin-lsp", "..."],
},
"LaTeX": {
"formatter": "language_server",
"language_servers": ["texlab", "..."],
"prettier": {
"allowed": true,
- "plugins": ["prettier-plugin-latex"]
- }
+ "plugins": ["prettier-plugin-latex"],
+ },
},
"Markdown": {
"format_on_save": "off",
@@ -1884,136 +1927,145 @@
"remove_trailing_whitespace_on_save": false,
"allow_rewrap": "anywhere",
"soft_wrap": "editor_width",
+ "completions": {
+ "words": "disabled",
+ },
"prettier": {
- "allowed": true
- }
+ "allowed": true,
+ },
},
"PHP": {
- "language_servers": ["phpactor", "!intelephense", "..."],
+ "language_servers": ["phpactor", "!intelephense", "!phptools", "..."],
"prettier": {
"allowed": true,
"plugins": ["@prettier/plugin-php"],
- "parser": "php"
- }
+ "parser": "php",
+ },
},
"Plain Text": {
"allow_rewrap": "anywhere",
- "soft_wrap": "editor_width"
+ "soft_wrap": "editor_width",
+ "completions": {
+ "words": "disabled",
+ },
+ },
+ "Proto": {
+ "language_servers": ["buf", "!protols", "!protobuf-language-server", "..."],
},
"Python": {
"code_actions_on_format": {
- "source.organizeImports.ruff": true
+ "source.organizeImports.ruff": true,
},
"formatter": {
"language_server": {
- "name": "ruff"
- }
+ "name": "ruff",
+ },
},
"debuggers": ["Debugpy"],
- "language_servers": ["basedpyright", "ruff", "!ty", "!pyrefly", "!pyright", "!pylsp", "..."]
+ "language_servers": ["basedpyright", "ruff", "!ty", "!pyrefly", "!pyright", "!pylsp", "..."],
},
"Ruby": {
- "language_servers": ["solargraph", "!ruby-lsp", "!rubocop", "!sorbet", "!steep", "..."]
+ "language_servers": ["solargraph", "!ruby-lsp", "!rubocop", "!sorbet", "!steep", "..."],
},
"Rust": {
- "debuggers": ["CodeLLDB"]
+ "debuggers": ["CodeLLDB"],
},
"SCSS": {
"prettier": {
- "allowed": true
- }
+ "allowed": true,
+ },
},
"Starlark": {
- "language_servers": ["starpls", "!buck2-lsp", "..."]
+ "language_servers": ["starpls", "!buck2-lsp", "..."],
},
"Svelte": {
"language_servers": ["svelte-language-server", "..."],
"prettier": {
"allowed": true,
- "plugins": ["prettier-plugin-svelte"]
- }
+ "plugins": ["prettier-plugin-svelte"],
+ },
},
"TSX": {
"language_servers": ["!typescript-language-server", "vtsls", "..."],
"prettier": {
- "allowed": true
- }
+ "allowed": true,
+ },
},
"Twig": {
"prettier": {
- "allowed": true
- }
+ "allowed": true,
+ },
},
"TypeScript": {
"language_servers": ["!typescript-language-server", "vtsls", "..."],
"prettier": {
- "allowed": true
- }
+ "allowed": true,
+ },
},
"SystemVerilog": {
"format_on_save": "off",
"language_servers": ["!slang", "..."],
- "use_on_type_format": false
+ "use_on_type_format": false,
},
"Vue.js": {
"language_servers": ["vue-language-server", "vtsls", "..."],
"prettier": {
- "allowed": true
- }
+ "allowed": true,
+ },
},
"XML": {
"prettier": {
"allowed": true,
- "plugins": ["@prettier/plugin-xml"]
- }
+ "plugins": ["@prettier/plugin-xml"],
+ },
},
"YAML": {
"prettier": {
- "allowed": true
- }
+ "allowed": true,
+ },
},
"YAML+ERB": {
- "language_servers": ["!ruby-lsp", "..."]
+ "language_servers": ["!ruby-lsp", "..."],
},
"Zig": {
- "language_servers": ["zls", "..."]
- }
+ "language_servers": ["zls", "..."],
+ },
},
// Different settings for specific language models.
"language_models": {
"anthropic": {
- "api_url": "https://api.anthropic.com"
+ "api_url": "https://api.anthropic.com",
},
"bedrock": {},
"google": {
- "api_url": "https://generativelanguage.googleapis.com"
+ "api_url": "https://generativelanguage.googleapis.com",
},
"ollama": {
- "api_url": "http://localhost:11434"
+ "api_url": "http://localhost:11434",
},
"openai": {
- "api_url": "https://api.openai.com/v1"
+ "api_url": "https://api.openai.com/v1",
},
"openai_compatible": {},
"open_router": {
- "api_url": "https://openrouter.ai/api/v1"
+ "api_url": "https://openrouter.ai/api/v1",
},
"lmstudio": {
- "api_url": "http://localhost:1234/api/v0"
+ "api_url": "http://localhost:1234/api/v0",
},
"deepseek": {
- "api_url": "https://api.deepseek.com/v1"
+ "api_url": "https://api.deepseek.com/v1",
},
"mistral": {
- "api_url": "https://api.mistral.ai/v1"
+ "api_url": "https://api.mistral.ai/v1",
},
"vercel": {
- "api_url": "https://api.v0.dev/v1"
+ "api_url": "https://api.v0.dev/v1",
},
"x_ai": {
- "api_url": "https://api.x.ai/v1"
+ "api_url": "https://api.x.ai/v1",
},
- "zed.dev": {}
+ "zed.dev": {},
},
"session": {
// Whether or not to restore unsaved buffers on restart.
@@ -2022,7 +2074,13 @@
// dirty files when closing the application.
//
// Default: true
- "restore_unsaved_buffers": true
+ "restore_unsaved_buffers": true,
+ // Whether or not to skip worktree trust checks.
+ // When trusted, project settings are synchronized automatically,
+ // language and MCP servers are downloaded and started automatically.
+ //
+ // Default: false
+ "trust_all_worktrees": false,
},
// Zed's Prettier integration settings.
// Allows to enable/disable formatting with Prettier
@@ -2040,11 +2098,11 @@
// "singleQuote": true
// Forces Prettier integration to use a specific parser name when formatting files with the language
// when set to a non-empty string.
- "parser": ""
+ "parser": "",
},
// Settings for auto-closing of JSX tags.
"jsx_tag_auto_close": {
- "enabled": true
+ "enabled": true,
},
// LSP Specific settings.
"lsp": {
@@ -2065,19 +2123,19 @@
// Specify the DAP name as a key here.
"CodeLLDB": {
"env": {
- "RUST_LOG": "info"
- }
- }
+ "RUST_LOG": "info",
+ },
+ },
},
// Common language server settings.
"global_lsp_settings": {
// Whether to show the LSP servers button in the status bar.
- "button": true
+ "button": true,
},
// Jupyter settings
"jupyter": {
"enabled": true,
- "kernel_selections": {}
+ "kernel_selections": {},
// Specify the language name as the key and the kernel name as the value.
// "kernel_selections": {
// "python": "conda-base"
@@ -2091,7 +2149,7 @@
"max_columns": 128,
// Maximum number of lines to keep in REPL's scrollback buffer.
// Clamped with [4, 256] range.
- "max_lines": 32
+ "max_lines": 32,
},
// Vim settings
"vim": {
@@ -2105,7 +2163,14 @@
// Specify the mode as the key and the shape as the value.
// The mode can be one of the following: "normal", "replace", "insert", "visual".
// The shape can be one of the following: "block", "bar", "underline", "hollow".
- "cursor_shape": {}
+ "cursor_shape": {},
+ },
+ // Which-key popup settings
+ "which_key": {
+ // Whether to show the which-key popup when holding down key combinations.
+ "enabled": false,
+ // Delay in milliseconds before showing the which-key popup.
+ "delay_ms": 1000,
},
// The server to connect to. If the environment variable
// ZED_SERVER_URL is set, it will override this setting.
@@ -2138,9 +2203,9 @@
"windows": {
"languages": {
"PHP": {
- "language_servers": ["intelephense", "!phpactor", "..."]
- }
- }
+ "language_servers": ["intelephense", "!phpactor", "!phptools", "..."],
+ },
+ },
},
// Whether to show full labels in line indicator or short ones
//
@@ -2199,7 +2264,7 @@
"dock": "bottom",
"log_dap_communications": true,
"format_dap_log_messages": true,
- "button": true
+ "button": true,
},
// Configures any number of settings profiles that are temporarily applied on
// top of your existing user settings when selected from
@@ -2226,5 +2291,5 @@
// Useful for filtering out noisy logs or enabling more verbose logging.
//
// Example: {"log": {"client": "warn"}}
- "log": {}
+ "log": {},
}
diff --git a/assets/settings/initial_debug_tasks.json b/assets/settings/initial_debug_tasks.json
index af4512bd51aa82d57ce62e605b45ee61e8f98030..851289392a65aecfca17e00d4c123823ac9e21cb 100644
--- a/assets/settings/initial_debug_tasks.json
+++ b/assets/settings/initial_debug_tasks.json
@@ -8,7 +8,7 @@
"adapter": "Debugpy",
"program": "$ZED_FILE",
"request": "launch",
- "cwd": "$ZED_WORKTREE_ROOT"
+ "cwd": "$ZED_WORKTREE_ROOT",
},
{
"label": "Debug active JavaScript file",
@@ -16,7 +16,7 @@
"program": "$ZED_FILE",
"request": "launch",
"cwd": "$ZED_WORKTREE_ROOT",
- "type": "pwa-node"
+ "type": "pwa-node",
},
{
"label": "JavaScript debug terminal",
@@ -24,6 +24,6 @@
"request": "launch",
"cwd": "$ZED_WORKTREE_ROOT",
"console": "integratedTerminal",
- "type": "pwa-node"
- }
+ "type": "pwa-node",
+ },
]
diff --git a/assets/settings/initial_server_settings.json b/assets/settings/initial_server_settings.json
index d6ec33e60128380378610a273a1bbdff1ecdbaa8..29aa569b105157df7ec48164e2066fdac72c7b41 100644
--- a/assets/settings/initial_server_settings.json
+++ b/assets/settings/initial_server_settings.json
@@ -3,5 +3,5 @@
// For a full list of overridable settings, and general information on settings,
// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
{
- "lsp": {}
+ "lsp": {},
}
diff --git a/assets/settings/initial_tasks.json b/assets/settings/initial_tasks.json
index a79e98063237ca297a89b0d151bd48149061b7bb..5bedafbd3a1e75a755598e37cd673742e146fdcc 100644
--- a/assets/settings/initial_tasks.json
+++ b/assets/settings/initial_tasks.json
@@ -47,8 +47,8 @@
// Whether to show the task line in the output of the spawned task, defaults to `true`.
"show_summary": true,
// Whether to show the command line in the output of the spawned task, defaults to `true`.
- "show_command": true
+ "show_command": true,
// Represents the tags for inline runnable indicators, or spawning multiple tasks at once.
// "tags": []
- }
+ },
]
diff --git a/assets/settings/initial_user_settings.json b/assets/settings/initial_user_settings.json
index 5ac2063bdb481e057a2d124c1e72f998390b066b..8b573854895a03243803a71a91a35af647f45ca2 100644
--- a/assets/settings/initial_user_settings.json
+++ b/assets/settings/initial_user_settings.json
@@ -12,6 +12,6 @@
"theme": {
"mode": "system",
"light": "One Light",
- "dark": "One Dark"
- }
+ "dark": "One Dark",
+ },
}
diff --git a/assets/themes/ayu/ayu.json b/assets/themes/ayu/ayu.json
index 7c84c603bda7fd7590067ec9f566f3582ba6aefd..e2b7c3c91fca46ab0e4064719bea5c8793faaccc 100644
--- a/assets/themes/ayu/ayu.json
+++ b/assets/themes/ayu/ayu.json
@@ -45,6 +45,7 @@
"tab.inactive_background": "#1f2127ff",
"tab.active_background": "#0d1016ff",
"search.match_background": "#5ac2fe66",
+ "search.active_match_background": "#ea570166",
"panel.background": "#1f2127ff",
"panel.focused_border": "#5ac1feff",
"pane.focused_border": null,
@@ -436,6 +437,7 @@
"tab.inactive_background": "#ececedff",
"tab.active_background": "#fcfcfcff",
"search.match_background": "#3b9ee566",
+ "search.active_match_background": "#f88b3666",
"panel.background": "#ececedff",
"panel.focused_border": "#3b9ee5ff",
"pane.focused_border": null,
@@ -827,6 +829,7 @@
"tab.inactive_background": "#353944ff",
"tab.active_background": "#242835ff",
"search.match_background": "#73cffe66",
+ "search.active_match_background": "#fd722b66",
"panel.background": "#353944ff",
"panel.focused_border": null,
"pane.focused_border": null,
diff --git a/assets/themes/gruvbox/gruvbox.json b/assets/themes/gruvbox/gruvbox.json
index a0f0a3ad637a4d212c8bf38f95f2e8424919d6bf..16ae188712f7a800ab4fb8a81a2d24cac99da56b 100644
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -46,6 +46,7 @@
"tab.inactive_background": "#3a3735ff",
"tab.active_background": "#282828ff",
"search.match_background": "#83a59866",
+ "search.active_match_background": "#c09f3f66",
"panel.background": "#3a3735ff",
"panel.focused_border": "#83a598ff",
"pane.focused_border": null,
@@ -70,33 +71,33 @@
"editor.document_highlight.read_background": "#83a5981a",
"editor.document_highlight.write_background": "#92847466",
"terminal.background": "#282828ff",
- "terminal.foreground": "#fbf1c7ff",
+ "terminal.foreground": "#ebdbb2ff",
"terminal.bright_foreground": "#fbf1c7ff",
- "terminal.dim_foreground": "#282828ff",
+ "terminal.dim_foreground": "#766b5dff",
"terminal.ansi.black": "#282828ff",
- "terminal.ansi.bright_black": "#73675eff",
+ "terminal.ansi.bright_black": "#928374ff",
"terminal.ansi.dim_black": "#fbf1c7ff",
- "terminal.ansi.red": "#fb4a35ff",
- "terminal.ansi.bright_red": "#93201dff",
- "terminal.ansi.dim_red": "#ffaa95ff",
- "terminal.ansi.green": "#b7bb26ff",
- "terminal.ansi.bright_green": "#605c1bff",
- "terminal.ansi.dim_green": "#e0dc98ff",
- "terminal.ansi.yellow": "#f9bd2fff",
- "terminal.ansi.bright_yellow": "#91611bff",
- "terminal.ansi.dim_yellow": "#fedc9bff",
- "terminal.ansi.blue": "#83a598ff",
- "terminal.ansi.bright_blue": "#414f4aff",
- "terminal.ansi.dim_blue": "#c0d2cbff",
- "terminal.ansi.magenta": "#d3869bff",
- "terminal.ansi.bright_magenta": "#8e5868ff",
- "terminal.ansi.dim_magenta": "#ff9ebbff",
- "terminal.ansi.cyan": "#8ec07cff",
- "terminal.ansi.bright_cyan": "#45603eff",
- "terminal.ansi.dim_cyan": "#c7dfbdff",
- "terminal.ansi.white": "#fbf1c7ff",
- "terminal.ansi.bright_white": "#ffffffff",
- "terminal.ansi.dim_white": "#b0a189ff",
+ "terminal.ansi.red": "#cc241dff",
+ "terminal.ansi.bright_red": "#fb4934ff",
+ "terminal.ansi.dim_red": "#8e1814ff",
+ "terminal.ansi.green": "#98971aff",
+ "terminal.ansi.bright_green": "#b8bb26ff",
+ "terminal.ansi.dim_green": "#6a6912ff",
+ "terminal.ansi.yellow": "#d79921ff",
+ "terminal.ansi.bright_yellow": "#fabd2fff",
+ "terminal.ansi.dim_yellow": "#966a17ff",
+ "terminal.ansi.blue": "#458588ff",
+ "terminal.ansi.bright_blue": "#83a598ff",
+ "terminal.ansi.dim_blue": "#305d5fff",
+ "terminal.ansi.magenta": "#b16286ff",
+ "terminal.ansi.bright_magenta": "#d3869bff",
+ "terminal.ansi.dim_magenta": "#7c455eff",
+ "terminal.ansi.cyan": "#689d6aff",
+ "terminal.ansi.bright_cyan": "#8ec07cff",
+ "terminal.ansi.dim_cyan": "#496e4aff",
+ "terminal.ansi.white": "#a89984ff",
+ "terminal.ansi.bright_white": "#fbf1c7ff",
+ "terminal.ansi.dim_white": "#766b5dff",
"link_text.hover": "#83a598ff",
"version_control.added": "#b7bb26ff",
"version_control.modified": "#f9bd2fff",
@@ -452,6 +453,7 @@
"tab.inactive_background": "#393634ff",
"tab.active_background": "#1d2021ff",
"search.match_background": "#83a59866",
+ "search.active_match_background": "#c9653666",
"panel.background": "#393634ff",
"panel.focused_border": "#83a598ff",
"pane.focused_border": null,
@@ -476,33 +478,33 @@
"editor.document_highlight.read_background": "#83a5981a",
"editor.document_highlight.write_background": "#92847466",
"terminal.background": "#1d2021ff",
- "terminal.foreground": "#fbf1c7ff",
+ "terminal.foreground": "#ebdbb2ff",
"terminal.bright_foreground": "#fbf1c7ff",
- "terminal.dim_foreground": "#1d2021ff",
- "terminal.ansi.black": "#1d2021ff",
- "terminal.ansi.bright_black": "#73675eff",
+ "terminal.dim_foreground": "#766b5dff",
+ "terminal.ansi.black": "#282828ff",
+ "terminal.ansi.bright_black": "#928374ff",
"terminal.ansi.dim_black": "#fbf1c7ff",
- "terminal.ansi.red": "#fb4a35ff",
- "terminal.ansi.bright_red": "#93201dff",
- "terminal.ansi.dim_red": "#ffaa95ff",
- "terminal.ansi.green": "#b7bb26ff",
- "terminal.ansi.bright_green": "#605c1bff",
- "terminal.ansi.dim_green": "#e0dc98ff",
- "terminal.ansi.yellow": "#f9bd2fff",
- "terminal.ansi.bright_yellow": "#91611bff",
- "terminal.ansi.dim_yellow": "#fedc9bff",
- "terminal.ansi.blue": "#83a598ff",
- "terminal.ansi.bright_blue": "#414f4aff",
- "terminal.ansi.dim_blue": "#c0d2cbff",
- "terminal.ansi.magenta": "#d3869bff",
- "terminal.ansi.bright_magenta": "#8e5868ff",
- "terminal.ansi.dim_magenta": "#ff9ebbff",
- "terminal.ansi.cyan": "#8ec07cff",
- "terminal.ansi.bright_cyan": "#45603eff",
- "terminal.ansi.dim_cyan": "#c7dfbdff",
- "terminal.ansi.white": "#fbf1c7ff",
- "terminal.ansi.bright_white": "#ffffffff",
- "terminal.ansi.dim_white": "#b0a189ff",
+ "terminal.ansi.red": "#cc241dff",
+ "terminal.ansi.bright_red": "#fb4934ff",
+ "terminal.ansi.dim_red": "#8e1814ff",
+ "terminal.ansi.green": "#98971aff",
+ "terminal.ansi.bright_green": "#b8bb26ff",
+ "terminal.ansi.dim_green": "#6a6912ff",
+ "terminal.ansi.yellow": "#d79921ff",
+ "terminal.ansi.bright_yellow": "#fabd2fff",
+ "terminal.ansi.dim_yellow": "#966a17ff",
+ "terminal.ansi.blue": "#458588ff",
+ "terminal.ansi.bright_blue": "#83a598ff",
+ "terminal.ansi.dim_blue": "#305d5fff",
+ "terminal.ansi.magenta": "#b16286ff",
+ "terminal.ansi.bright_magenta": "#d3869bff",
+ "terminal.ansi.dim_magenta": "#7c455eff",
+ "terminal.ansi.cyan": "#689d6aff",
+ "terminal.ansi.bright_cyan": "#8ec07cff",
+ "terminal.ansi.dim_cyan": "#496e4aff",
+ "terminal.ansi.white": "#a89984ff",
+ "terminal.ansi.bright_white": "#fbf1c7ff",
+ "terminal.ansi.dim_white": "#766b5dff",
"link_text.hover": "#83a598ff",
"version_control.added": "#b7bb26ff",
"version_control.modified": "#f9bd2fff",
@@ -858,6 +860,7 @@
"tab.inactive_background": "#3b3735ff",
"tab.active_background": "#32302fff",
"search.match_background": "#83a59866",
+ "search.active_match_background": "#aea85166",
"panel.background": "#3b3735ff",
"panel.focused_border": null,
"pane.focused_border": null,
@@ -882,33 +885,33 @@
"editor.document_highlight.read_background": "#83a5981a",
"editor.document_highlight.write_background": "#92847466",
"terminal.background": "#32302fff",
- "terminal.foreground": "#fbf1c7ff",
+ "terminal.foreground": "#ebdbb2ff",
"terminal.bright_foreground": "#fbf1c7ff",
- "terminal.dim_foreground": "#32302fff",
- "terminal.ansi.black": "#32302fff",
- "terminal.ansi.bright_black": "#73675eff",
+ "terminal.dim_foreground": "#766b5dff",
+ "terminal.ansi.black": "#282828ff",
+ "terminal.ansi.bright_black": "#928374ff",
"terminal.ansi.dim_black": "#fbf1c7ff",
- "terminal.ansi.red": "#fb4a35ff",
- "terminal.ansi.bright_red": "#93201dff",
- "terminal.ansi.dim_red": "#ffaa95ff",
- "terminal.ansi.green": "#b7bb26ff",
- "terminal.ansi.bright_green": "#605c1bff",
- "terminal.ansi.dim_green": "#e0dc98ff",
- "terminal.ansi.yellow": "#f9bd2fff",
- "terminal.ansi.bright_yellow": "#91611bff",
- "terminal.ansi.dim_yellow": "#fedc9bff",
- "terminal.ansi.blue": "#83a598ff",
- "terminal.ansi.bright_blue": "#414f4aff",
- "terminal.ansi.dim_blue": "#c0d2cbff",
- "terminal.ansi.magenta": "#d3869bff",
- "terminal.ansi.bright_magenta": "#8e5868ff",
- "terminal.ansi.dim_magenta": "#ff9ebbff",
- "terminal.ansi.cyan": "#8ec07cff",
- "terminal.ansi.bright_cyan": "#45603eff",
- "terminal.ansi.dim_cyan": "#c7dfbdff",
- "terminal.ansi.white": "#fbf1c7ff",
- "terminal.ansi.bright_white": "#ffffffff",
- "terminal.ansi.dim_white": "#b0a189ff",
+ "terminal.ansi.red": "#cc241dff",
+ "terminal.ansi.bright_red": "#fb4934ff",
+ "terminal.ansi.dim_red": "#8e1814ff",
+ "terminal.ansi.green": "#98971aff",
+ "terminal.ansi.bright_green": "#b8bb26ff",
+ "terminal.ansi.dim_green": "#6a6912ff",
+ "terminal.ansi.yellow": "#d79921ff",
+ "terminal.ansi.bright_yellow": "#fabd2fff",
+ "terminal.ansi.dim_yellow": "#966a17ff",
+ "terminal.ansi.blue": "#458588ff",
+ "terminal.ansi.bright_blue": "#83a598ff",
+ "terminal.ansi.dim_blue": "#305d5fff",
+ "terminal.ansi.magenta": "#b16286ff",
+ "terminal.ansi.bright_magenta": "#d3869bff",
+ "terminal.ansi.dim_magenta": "#7c455eff",
+ "terminal.ansi.cyan": "#689d6aff",
+ "terminal.ansi.bright_cyan": "#8ec07cff",
+ "terminal.ansi.dim_cyan": "#496e4aff",
+ "terminal.ansi.white": "#a89984ff",
+ "terminal.ansi.bright_white": "#fbf1c7ff",
+ "terminal.ansi.dim_white": "#766b5dff",
"link_text.hover": "#83a598ff",
"version_control.added": "#b7bb26ff",
"version_control.modified": "#f9bd2fff",
@@ -1264,6 +1267,7 @@
"tab.inactive_background": "#ecddb4ff",
"tab.active_background": "#fbf1c7ff",
"search.match_background": "#0b667866",
+ "search.active_match_background": "#ba2d1166",
"panel.background": "#ecddb4ff",
"panel.focused_border": null,
"pane.focused_border": null,
@@ -1291,30 +1295,30 @@
"terminal.foreground": "#282828ff",
"terminal.bright_foreground": "#282828ff",
"terminal.dim_foreground": "#fbf1c7ff",
- "terminal.ansi.black": "#282828ff",
- "terminal.ansi.bright_black": "#0b6678ff",
- "terminal.ansi.dim_black": "#5f5650ff",
- "terminal.ansi.red": "#9d0308ff",
- "terminal.ansi.bright_red": "#db8b7aff",
- "terminal.ansi.dim_red": "#4e1207ff",
- "terminal.ansi.green": "#797410ff",
- "terminal.ansi.bright_green": "#bfb787ff",
- "terminal.ansi.dim_green": "#3e3a11ff",
- "terminal.ansi.yellow": "#b57615ff",
- "terminal.ansi.bright_yellow": "#e2b88bff",
- "terminal.ansi.dim_yellow": "#5c3a12ff",
- "terminal.ansi.blue": "#0b6678ff",
- "terminal.ansi.bright_blue": "#8fb0baff",
- "terminal.ansi.dim_blue": "#14333bff",
- "terminal.ansi.magenta": "#8f3e71ff",
- "terminal.ansi.bright_magenta": "#c76da0ff",
- "terminal.ansi.dim_magenta": "#5c2848ff",
- "terminal.ansi.cyan": "#437b59ff",
- "terminal.ansi.bright_cyan": "#9fbca8ff",
- "terminal.ansi.dim_cyan": "#253e2eff",
- "terminal.ansi.white": "#fbf1c7ff",
- "terminal.ansi.bright_white": "#ffffffff",
- "terminal.ansi.dim_white": "#b0a189ff",
+ "terminal.ansi.black": "#fbf1c7ff",
+ "terminal.ansi.bright_black": "#928374ff",
+ "terminal.ansi.dim_black": "#7c6f64ff",
+ "terminal.ansi.red": "#cc241dff",
+ "terminal.ansi.bright_red": "#9d0006ff",
+ "terminal.ansi.dim_red": "#c31c16ff",
+ "terminal.ansi.green": "#98971aff",
+ "terminal.ansi.bright_green": "#79740eff",
+ "terminal.ansi.dim_green": "#929015ff",
+ "terminal.ansi.yellow": "#d79921ff",
+ "terminal.ansi.bright_yellow": "#b57614ff",
+ "terminal.ansi.dim_yellow": "#cf8e1aff",
+ "terminal.ansi.blue": "#458588ff",
+ "terminal.ansi.bright_blue": "#076678ff",
+ "terminal.ansi.dim_blue": "#356f77ff",
+ "terminal.ansi.magenta": "#b16286ff",
+ "terminal.ansi.bright_magenta": "#8f3f71ff",
+ "terminal.ansi.dim_magenta": "#a85580ff",
+ "terminal.ansi.cyan": "#689d6aff",
+ "terminal.ansi.bright_cyan": "#427b58ff",
+ "terminal.ansi.dim_cyan": "#5f9166ff",
+ "terminal.ansi.white": "#7c6f64ff",
+ "terminal.ansi.bright_white": "#282828ff",
+ "terminal.ansi.dim_white": "#282828ff",
"link_text.hover": "#0b6678ff",
"version_control.added": "#797410ff",
"version_control.modified": "#b57615ff",
@@ -1670,6 +1674,7 @@
"tab.inactive_background": "#ecddb5ff",
"tab.active_background": "#f9f5d7ff",
"search.match_background": "#0b667866",
+ "search.active_match_background": "#dc351466",
"panel.background": "#ecddb5ff",
"panel.focused_border": null,
"pane.focused_border": null,
@@ -1697,30 +1702,30 @@
"terminal.foreground": "#282828ff",
"terminal.bright_foreground": "#282828ff",
"terminal.dim_foreground": "#f9f5d7ff",
- "terminal.ansi.black": "#282828ff",
- "terminal.ansi.bright_black": "#73675eff",
- "terminal.ansi.dim_black": "#f9f5d7ff",
- "terminal.ansi.red": "#9d0308ff",
- "terminal.ansi.bright_red": "#db8b7aff",
- "terminal.ansi.dim_red": "#4e1207ff",
- "terminal.ansi.green": "#797410ff",
- "terminal.ansi.bright_green": "#bfb787ff",
- "terminal.ansi.dim_green": "#3e3a11ff",
- "terminal.ansi.yellow": "#b57615ff",
- "terminal.ansi.bright_yellow": "#e2b88bff",
- "terminal.ansi.dim_yellow": "#5c3a12ff",
- "terminal.ansi.blue": "#0b6678ff",
- "terminal.ansi.bright_blue": "#8fb0baff",
- "terminal.ansi.dim_blue": "#14333bff",
- "terminal.ansi.magenta": "#8f3e71ff",
- "terminal.ansi.bright_magenta": "#c76da0ff",
- "terminal.ansi.dim_magenta": "#5c2848ff",
- "terminal.ansi.cyan": "#437b59ff",
- "terminal.ansi.bright_cyan": "#9fbca8ff",
- "terminal.ansi.dim_cyan": "#253e2eff",
- "terminal.ansi.white": "#f9f5d7ff",
- "terminal.ansi.bright_white": "#ffffffff",
- "terminal.ansi.dim_white": "#b0a189ff",
+ "terminal.ansi.black": "#fbf1c7ff",
+ "terminal.ansi.bright_black": "#928374ff",
+ "terminal.ansi.dim_black": "#7c6f64ff",
+ "terminal.ansi.red": "#cc241dff",
+ "terminal.ansi.bright_red": "#9d0006ff",
+ "terminal.ansi.dim_red": "#c31c16ff",
+ "terminal.ansi.green": "#98971aff",
+ "terminal.ansi.bright_green": "#79740eff",
+ "terminal.ansi.dim_green": "#929015ff",
+ "terminal.ansi.yellow": "#d79921ff",
+ "terminal.ansi.bright_yellow": "#b57614ff",
+ "terminal.ansi.dim_yellow": "#cf8e1aff",
+ "terminal.ansi.blue": "#458588ff",
+ "terminal.ansi.bright_blue": "#076678ff",
+ "terminal.ansi.dim_blue": "#356f77ff",
+ "terminal.ansi.magenta": "#b16286ff",
+ "terminal.ansi.bright_magenta": "#8f3f71ff",
+ "terminal.ansi.dim_magenta": "#a85580ff",
+ "terminal.ansi.cyan": "#689d6aff",
+ "terminal.ansi.bright_cyan": "#427b58ff",
+ "terminal.ansi.dim_cyan": "#5f9166ff",
+ "terminal.ansi.white": "#7c6f64ff",
+ "terminal.ansi.bright_white": "#282828ff",
+ "terminal.ansi.dim_white": "#282828ff",
"link_text.hover": "#0b6678ff",
"version_control.added": "#797410ff",
"version_control.modified": "#b57615ff",
@@ -2076,6 +2081,7 @@
"tab.inactive_background": "#ecdcb3ff",
"tab.active_background": "#f2e5bcff",
"search.match_background": "#0b667866",
+ "search.active_match_background": "#d7331466",
"panel.background": "#ecdcb3ff",
"panel.focused_border": null,
"pane.focused_border": null,
@@ -2103,30 +2109,30 @@
"terminal.foreground": "#282828ff",
"terminal.bright_foreground": "#282828ff",
"terminal.dim_foreground": "#f2e5bcff",
- "terminal.ansi.black": "#282828ff",
- "terminal.ansi.bright_black": "#73675eff",
- "terminal.ansi.dim_black": "#f2e5bcff",
- "terminal.ansi.red": "#9d0308ff",
- "terminal.ansi.bright_red": "#db8b7aff",
- "terminal.ansi.dim_red": "#4e1207ff",
- "terminal.ansi.green": "#797410ff",
- "terminal.ansi.bright_green": "#bfb787ff",
- "terminal.ansi.dim_green": "#3e3a11ff",
- "terminal.ansi.yellow": "#b57615ff",
- "terminal.ansi.bright_yellow": "#e2b88bff",
- "terminal.ansi.dim_yellow": "#5c3a12ff",
- "terminal.ansi.blue": "#0b6678ff",
- "terminal.ansi.bright_blue": "#8fb0baff",
- "terminal.ansi.dim_blue": "#14333bff",
- "terminal.ansi.magenta": "#8f3e71ff",
- "terminal.ansi.bright_magenta": "#c76da0ff",
- "terminal.ansi.dim_magenta": "#5c2848ff",
- "terminal.ansi.cyan": "#437b59ff",
- "terminal.ansi.bright_cyan": "#9fbca8ff",
- "terminal.ansi.dim_cyan": "#253e2eff",
- "terminal.ansi.white": "#f2e5bcff",
- "terminal.ansi.bright_white": "#ffffffff",
- "terminal.ansi.dim_white": "#b0a189ff",
+ "terminal.ansi.black": "#fbf1c7ff",
+ "terminal.ansi.bright_black": "#928374ff",
+ "terminal.ansi.dim_black": "#7c6f64ff",
+ "terminal.ansi.red": "#cc241dff",
+ "terminal.ansi.bright_red": "#9d0006ff",
+ "terminal.ansi.dim_red": "#c31c16ff",
+ "terminal.ansi.green": "#98971aff",
+ "terminal.ansi.bright_green": "#79740eff",
+ "terminal.ansi.dim_green": "#929015ff",
+ "terminal.ansi.yellow": "#d79921ff",
+ "terminal.ansi.bright_yellow": "#b57614ff",
+ "terminal.ansi.dim_yellow": "#cf8e1aff",
+ "terminal.ansi.blue": "#458588ff",
+ "terminal.ansi.bright_blue": "#076678ff",
+ "terminal.ansi.dim_blue": "#356f77ff",
+ "terminal.ansi.magenta": "#b16286ff",
+ "terminal.ansi.bright_magenta": "#8f3f71ff",
+ "terminal.ansi.dim_magenta": "#a85580ff",
+ "terminal.ansi.cyan": "#689d6aff",
+ "terminal.ansi.bright_cyan": "#427b58ff",
+ "terminal.ansi.dim_cyan": "#5f9166ff",
+ "terminal.ansi.white": "#7c6f64ff",
+ "terminal.ansi.bright_white": "#282828ff",
+ "terminal.ansi.dim_white": "#282828ff",
"link_text.hover": "#0b6678ff",
"version_control.added": "#797410ff",
"version_control.modified": "#b57615ff",
diff --git a/assets/themes/one/one.json b/assets/themes/one/one.json
index 6849cd05dc70752216789ae04e81fad232f7b14b..13f94991ad44fc997144a3d44527dcbce5231504 100644
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -45,6 +45,7 @@
"tab.inactive_background": "#2f343eff",
"tab.active_background": "#282c33ff",
"search.match_background": "#74ade866",
+ "search.active_match_background": "#e8af7466",
"panel.background": "#2f343eff",
"panel.focused_border": null,
"pane.focused_border": null,
@@ -67,37 +68,39 @@
"editor.active_wrap_guide": "#c8ccd41a",
"editor.document_highlight.read_background": "#74ade81a",
"editor.document_highlight.write_background": "#555a6366",
- "terminal.background": "#282c33ff",
- "terminal.foreground": "#dce0e5ff",
+ "terminal.background": "#282c34ff",
+ "terminal.foreground": "#abb2bfff",
"terminal.bright_foreground": "#dce0e5ff",
- "terminal.dim_foreground": "#282c33ff",
- "terminal.ansi.black": "#282c33ff",
- "terminal.ansi.bright_black": "#525561ff",
- "terminal.ansi.dim_black": "#dce0e5ff",
- "terminal.ansi.red": "#d07277ff",
- "terminal.ansi.bright_red": "#673a3cff",
- "terminal.ansi.dim_red": "#eab7b9ff",
- "terminal.ansi.green": "#a1c181ff",
- "terminal.ansi.bright_green": "#4d6140ff",
- "terminal.ansi.dim_green": "#d1e0bfff",
- "terminal.ansi.yellow": "#dec184ff",
- "terminal.ansi.bright_yellow": "#e5c07bff",
- "terminal.ansi.dim_yellow": "#f1dfc1ff",
- "terminal.ansi.blue": "#74ade8ff",
- "terminal.ansi.bright_blue": "#385378ff",
- "terminal.ansi.dim_blue": "#bed5f4ff",
- "terminal.ansi.magenta": "#b477cfff",
- "terminal.ansi.bright_magenta": "#d6b4e4ff",
- "terminal.ansi.dim_magenta": "#612a79ff",
- "terminal.ansi.cyan": "#6eb4bfff",
- "terminal.ansi.bright_cyan": "#3a565bff",
- "terminal.ansi.dim_cyan": "#b9d9dfff",
- "terminal.ansi.white": "#dce0e5ff",
+ "terminal.dim_foreground": "#636d83ff",
+ "terminal.ansi.black": "#282c34ff",
+ "terminal.ansi.bright_black": "#636d83ff",
+ "terminal.ansi.dim_black": "#3b3f4aff",
+ "terminal.ansi.red": "#e06c75ff",
+ "terminal.ansi.bright_red": "#EA858Bff",
+ "terminal.ansi.dim_red": "#a7545aff",
+ "terminal.ansi.green": "#98c379ff",
+ "terminal.ansi.bright_green": "#AAD581ff",
+ "terminal.ansi.dim_green": "#6d8f59ff",
+ "terminal.ansi.yellow": "#e5c07bff",
+ "terminal.ansi.bright_yellow": "#FFD885ff",
+ "terminal.ansi.dim_yellow": "#b8985bff",
+ "terminal.ansi.blue": "#61afefff",
+ "terminal.ansi.bright_blue": "#85C1FFff",
+ "terminal.ansi.dim_blue": "#457cadff",
+ "terminal.ansi.magenta": "#c678ddff",
+ "terminal.ansi.bright_magenta": "#D398EBff",
+ "terminal.ansi.dim_magenta": "#8d54a0ff",
+ "terminal.ansi.cyan": "#56b6c2ff",
+ "terminal.ansi.bright_cyan": "#6ED5DEff",
+ "terminal.ansi.dim_cyan": "#3c818aff",
+ "terminal.ansi.white": "#abb2bfff",
"terminal.ansi.bright_white": "#fafafaff",
- "terminal.ansi.dim_white": "#575d65ff",
+ "terminal.ansi.dim_white": "#8f969bff",
"link_text.hover": "#74ade8ff",
"version_control.added": "#27a657ff",
"version_control.modified": "#d3b020ff",
+ "version_control.word_added": "#2EA04859",
+ "version_control.word_deleted": "#78081BCC",
"version_control.deleted": "#e06c76ff",
"version_control.conflict_marker.ours": "#a1c1811a",
"version_control.conflict_marker.theirs": "#74ade81a",
@@ -446,6 +449,7 @@
"tab.inactive_background": "#ebebecff",
"tab.active_background": "#fafafaff",
"search.match_background": "#5c79e266",
+ "search.active_match_background": "#d0a92366",
"panel.background": "#ebebecff",
"panel.focused_border": null,
"pane.focused_border": null,
@@ -469,36 +473,38 @@
"editor.document_highlight.read_background": "#5c78e225",
"editor.document_highlight.write_background": "#a3a3a466",
"terminal.background": "#fafafaff",
- "terminal.foreground": "#242529ff",
- "terminal.bright_foreground": "#242529ff",
- "terminal.dim_foreground": "#fafafaff",
- "terminal.ansi.black": "#242529ff",
- "terminal.ansi.bright_black": "#747579ff",
- "terminal.ansi.dim_black": "#97979aff",
- "terminal.ansi.red": "#d36151ff",
- "terminal.ansi.bright_red": "#f0b0a4ff",
- "terminal.ansi.dim_red": "#6f312aff",
- "terminal.ansi.green": "#669f59ff",
- "terminal.ansi.bright_green": "#b2cfa9ff",
- "terminal.ansi.dim_green": "#354d2eff",
- "terminal.ansi.yellow": "#dec184ff",
- "terminal.ansi.bright_yellow": "#826221ff",
- "terminal.ansi.dim_yellow": "#786441ff",
- "terminal.ansi.blue": "#5c78e2ff",
- "terminal.ansi.bright_blue": "#b5baf2ff",
- "terminal.ansi.dim_blue": "#2d3d75ff",
- "terminal.ansi.magenta": "#984ea5ff",
- "terminal.ansi.bright_magenta": "#cea6d3ff",
- "terminal.ansi.dim_magenta": "#4b2a50ff",
- "terminal.ansi.cyan": "#3a82b7ff",
- "terminal.ansi.bright_cyan": "#a3bedaff",
- "terminal.ansi.dim_cyan": "#254058ff",
- "terminal.ansi.white": "#fafafaff",
+ "terminal.foreground": "#2a2c33ff",
+ "terminal.bright_foreground": "#2a2c33ff",
+ "terminal.dim_foreground": "#bbbbbbff",
+ "terminal.ansi.black": "#000000ff",
+ "terminal.ansi.bright_black": "#000000ff",
+ "terminal.ansi.dim_black": "#555555ff",
+ "terminal.ansi.red": "#de3e35ff",
+ "terminal.ansi.bright_red": "#de3e35ff",
+ "terminal.ansi.dim_red": "#9c2b26ff",
+ "terminal.ansi.green": "#3f953aff",
+ "terminal.ansi.bright_green": "#3f953aff",
+ "terminal.ansi.dim_green": "#2b6927ff",
+ "terminal.ansi.yellow": "#d2b67cff",
+ "terminal.ansi.bright_yellow": "#d2b67cff",
+ "terminal.ansi.dim_yellow": "#a48c5aff",
+ "terminal.ansi.blue": "#2f5af3ff",
+ "terminal.ansi.bright_blue": "#2f5af3ff",
+ "terminal.ansi.dim_blue": "#2140abff",
+ "terminal.ansi.magenta": "#950095ff",
+ "terminal.ansi.bright_magenta": "#a00095ff",
+ "terminal.ansi.dim_magenta": "#6a006aff",
+ "terminal.ansi.cyan": "#3f953aff",
+ "terminal.ansi.bright_cyan": "#3f953aff",
+ "terminal.ansi.dim_cyan": "#2b6927ff",
+ "terminal.ansi.white": "#bbbbbbff",
"terminal.ansi.bright_white": "#ffffffff",
- "terminal.ansi.dim_white": "#aaaaaaff",
+ "terminal.ansi.dim_white": "#888888ff",
"link_text.hover": "#5c78e2ff",
"version_control.added": "#27a657ff",
"version_control.modified": "#d3b020ff",
+ "version_control.word_added": "#2EA04859",
+ "version_control.word_deleted": "#F85149CC",
"version_control.deleted": "#e06c76ff",
"conflict": "#a48819ff",
"conflict.background": "#faf2e6ff",
diff --git a/clippy.toml b/clippy.toml
index 0ce7a6cd68d4e8210788eb7a67aa06c742cc8274..9dd246074a06c4db7b66eff7a83ef68e3612c378 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -14,6 +14,7 @@ disallowed-methods = [
{ path = "std::process::Command::stderr", reason = "`smol::process::Command::from()` does not preserve stdio configuration", replacement = "smol::process::Command::stderr" },
{ path = "serde_json::from_reader", reason = "Parsing from a buffer is much slower than first reading the buffer into a Vec/String, see https://github.com/serde-rs/json/issues/160#issuecomment-253446892. Use `serde_json::from_slice` instead." },
{ path = "serde_json_lenient::from_reader", reason = "Parsing from a buffer is much slower than first reading the buffer into a Vec/String, see https://github.com/serde-rs/json/issues/160#issuecomment-253446892, Use `serde_json_lenient::from_slice` instead." },
+ { path = "cocoa::foundation::NSString::alloc", reason = "NSString must be autoreleased to avoid memory leaks. Use `ns_string()` helper instead." },
]
disallowed-types = [
# { path = "std::collections::HashMap", replacement = "collections::HashMap" },
diff --git a/crates/acp_thread/Cargo.toml b/crates/acp_thread/Cargo.toml
index 8ef6f1a52c8b207658d59a1e6b877964df9e42ce..70f2e4d259f1611fb42ebc0b064d278c8b3b9c4d 100644
--- a/crates/acp_thread/Cargo.toml
+++ b/crates/acp_thread/Cargo.toml
@@ -46,6 +46,7 @@ url.workspace = true
util.workspace = true
uuid.workspace = true
watch.workspace = true
+urlencoding.workspace = true
[dev-dependencies]
env_logger.workspace = true
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 56e33fda47f095eef1873f7a0724b021e88a0bdc..a994cc8e57e4456ec57092b2257269b104af74c7 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -43,6 +43,7 @@ pub struct UserMessage {
pub content: ContentBlock,
pub chunks: Vec,
pub checkpoint: Option,
+ pub indented: bool,
}
#[derive(Debug)]
@@ -73,6 +74,7 @@ impl UserMessage {
#[derive(Debug, PartialEq)]
pub struct AssistantMessage {
pub chunks: Vec,
+ pub indented: bool,
}
impl AssistantMessage {
@@ -123,6 +125,14 @@ pub enum AgentThreadEntry {
}
impl AgentThreadEntry {
+ pub fn is_indented(&self) -> bool {
+ match self {
+ Self::UserMessage(message) => message.indented,
+ Self::AssistantMessage(message) => message.indented,
+ Self::ToolCall(_) => false,
+ }
+ }
+
pub fn to_markdown(&self, cx: &App) -> String {
match self {
Self::UserMessage(message) => message.to_markdown(cx),
@@ -182,6 +192,7 @@ pub struct ToolCall {
pub locations: Vec,
pub resolved_locations: Vec>,
pub raw_input: Option,
+ pub raw_input_markdown: Option>,
pub raw_output: Option,
}
@@ -201,17 +212,24 @@ impl ToolCall {
};
let mut content = Vec::with_capacity(tool_call.content.len());
for item in tool_call.content {
- content.push(ToolCallContent::from_acp(
+ if let Some(item) = ToolCallContent::from_acp(
item,
language_registry.clone(),
path_style,
terminals,
cx,
- )?);
+ )? {
+ content.push(item);
+ }
}
+ let raw_input_markdown = tool_call
+ .raw_input
+ .as_ref()
+ .and_then(|input| markdown_for_raw_output(input, &language_registry, cx));
+
let result = Self {
- id: tool_call.id,
+ id: tool_call.tool_call_id,
label: cx
.new(|cx| Markdown::new(title.into(), Some(language_registry.clone()), None, cx)),
kind: tool_call.kind,
@@ -220,6 +238,7 @@ impl ToolCall {
resolved_locations: Vec::default(),
status,
raw_input: tool_call.raw_input,
+ raw_input_markdown,
raw_output: tool_call.raw_output,
};
Ok(result)
@@ -241,6 +260,7 @@ impl ToolCall {
locations,
raw_input,
raw_output,
+ ..
} = fields;
if let Some(kind) = kind {
@@ -262,21 +282,29 @@ impl ToolCall {
}
if let Some(content) = content {
- let new_content_len = content.len();
+ let mut new_content_len = content.len();
let mut content = content.into_iter();
// Reuse existing content if we can
for (old, new) in self.content.iter_mut().zip(content.by_ref()) {
- old.update_from_acp(new, language_registry.clone(), path_style, terminals, cx)?;
+ let valid_content =
+ old.update_from_acp(new, language_registry.clone(), path_style, terminals, cx)?;
+ if !valid_content {
+ new_content_len -= 1;
+ }
}
for new in content {
- self.content.push(ToolCallContent::from_acp(
+ if let Some(new) = ToolCallContent::from_acp(
new,
language_registry.clone(),
path_style,
terminals,
cx,
- )?)
+ )? {
+ self.content.push(new);
+ } else {
+ new_content_len -= 1;
+ }
}
self.content.truncate(new_content_len);
}
@@ -286,6 +314,7 @@ impl ToolCall {
}
if let Some(raw_input) = raw_input {
+ self.raw_input_markdown = markdown_for_raw_output(&raw_input, &language_registry, cx);
self.raw_input = Some(raw_input);
}
@@ -347,13 +376,13 @@ impl ToolCall {
let buffer = buffer.await.log_err()?;
let position = buffer
.update(cx, |buffer, _| {
+ let snapshot = buffer.snapshot();
if let Some(row) = location.line {
- let snapshot = buffer.snapshot();
let column = snapshot.indent_size_for_line(row).len;
let point = snapshot.clip_point(Point::new(row, column), Bias::Left);
snapshot.anchor_before(point)
} else {
- Anchor::MIN
+ Anchor::min_for_buffer(snapshot.remote_id())
}
})
.ok()?;
@@ -425,6 +454,7 @@ impl From for ToolCallStatus {
acp::ToolCallStatus::InProgress => Self::InProgress,
acp::ToolCallStatus::Completed => Self::Completed,
acp::ToolCallStatus::Failed => Self::Failed,
+ _ => Self::Pending,
}
}
}
@@ -537,7 +567,7 @@ impl ContentBlock {
..
}) => Self::resource_link_md(&uri, path_style),
acp::ContentBlock::Image(image) => Self::image_md(&image),
- acp::ContentBlock::Audio(_) | acp::ContentBlock::Resource(_) => String::new(),
+ _ => String::new(),
}
}
@@ -591,15 +621,17 @@ impl ToolCallContent {
path_style: PathStyle,
terminals: &HashMap>,
cx: &mut App,
- ) -> Result {
+ ) -> Result> {
match content {
- acp::ToolCallContent::Content { content } => Ok(Self::ContentBlock(ContentBlock::new(
- content,
- &language_registry,
- path_style,
- cx,
- ))),
- acp::ToolCallContent::Diff { diff } => Ok(Self::Diff(cx.new(|cx| {
+ acp::ToolCallContent::Content(acp::Content { content, .. }) => {
+ Ok(Some(Self::ContentBlock(ContentBlock::new(
+ content,
+ &language_registry,
+ path_style,
+ cx,
+ ))))
+ }
+ acp::ToolCallContent::Diff(diff) => Ok(Some(Self::Diff(cx.new(|cx| {
Diff::finalized(
diff.path.to_string_lossy().into_owned(),
diff.old_text,
@@ -607,12 +639,13 @@ impl ToolCallContent {
language_registry,
cx,
)
- }))),
- acp::ToolCallContent::Terminal { terminal_id } => terminals
+ })))),
+ acp::ToolCallContent::Terminal(acp::Terminal { terminal_id, .. }) => terminals
.get(&terminal_id)
.cloned()
- .map(Self::Terminal)
+ .map(|terminal| Some(Self::Terminal(terminal)))
.ok_or_else(|| anyhow::anyhow!("Terminal with id `{}` not found", terminal_id)),
+ _ => Ok(None),
}
}
@@ -623,9 +656,9 @@ impl ToolCallContent {
path_style: PathStyle,
terminals: &HashMap>,
cx: &mut App,
- ) -> Result<()> {
+ ) -> Result {
let needs_update = match (&self, &new) {
- (Self::Diff(old_diff), acp::ToolCallContent::Diff { diff: new_diff }) => {
+ (Self::Diff(old_diff), acp::ToolCallContent::Diff(new_diff)) => {
old_diff.read(cx).needs_update(
new_diff.old_text.as_deref().unwrap_or(""),
&new_diff.new_text,
@@ -635,10 +668,14 @@ impl ToolCallContent {
_ => true,
};
- if needs_update {
- *self = Self::from_acp(new, language_registry, path_style, terminals, cx)?;
+ if let Some(update) = Self::from_acp(new, language_registry, path_style, terminals, cx)? {
+ if needs_update {
+ *self = update;
+ }
+ Ok(true)
+ } else {
+ Ok(false)
}
- Ok(())
}
pub fn to_markdown(&self, cx: &App) -> String {
@@ -660,7 +697,7 @@ pub enum ToolCallUpdate {
impl ToolCallUpdate {
fn id(&self) -> &acp::ToolCallId {
match self {
- Self::UpdateFields(update) => &update.id,
+ Self::UpdateFields(update) => &update.tool_call_id,
Self::UpdateDiff(diff) => &diff.id,
Self::UpdateTerminal(terminal) => &terminal.id,
}
@@ -732,6 +769,7 @@ impl Plan {
acp::PlanEntryStatus::Completed => {
stats.completed += 1;
}
+ _ => {}
}
}
@@ -1154,6 +1192,7 @@ impl AcpThread {
current_mode_id,
..
}) => cx.emit(AcpThreadEvent::ModeUpdated(current_mode_id)),
+ _ => {}
}
Ok(())
}
@@ -1163,6 +1202,16 @@ impl AcpThread {
message_id: Option,
chunk: acp::ContentBlock,
cx: &mut Context,
+ ) {
+ self.push_user_content_block_with_indent(message_id, chunk, false, cx)
+ }
+
+ pub fn push_user_content_block_with_indent(
+ &mut self,
+ message_id: Option,
+ chunk: acp::ContentBlock,
+ indented: bool,
+ cx: &mut Context,
) {
let language_registry = self.project.read(cx).languages().clone();
let path_style = self.project.read(cx).path_style(cx);
@@ -1173,8 +1222,10 @@ impl AcpThread {
id,
content,
chunks,
+ indented: existing_indented,
..
}) = last_entry
+ && *existing_indented == indented
{
*id = message_id.or(id.take());
content.append(chunk.clone(), &language_registry, path_style, cx);
@@ -1189,6 +1240,7 @@ impl AcpThread {
content,
chunks: vec![chunk],
checkpoint: None,
+ indented,
}),
cx,
);
@@ -1200,12 +1252,26 @@ impl AcpThread {
chunk: acp::ContentBlock,
is_thought: bool,
cx: &mut Context,
+ ) {
+ self.push_assistant_content_block_with_indent(chunk, is_thought, false, cx)
+ }
+
+ pub fn push_assistant_content_block_with_indent(
+ &mut self,
+ chunk: acp::ContentBlock,
+ is_thought: bool,
+ indented: bool,
+ cx: &mut Context,
) {
let language_registry = self.project.read(cx).languages().clone();
let path_style = self.project.read(cx).path_style(cx);
let entries_len = self.entries.len();
if let Some(last_entry) = self.entries.last_mut()
- && let AgentThreadEntry::AssistantMessage(AssistantMessage { chunks }) = last_entry
+ && let AgentThreadEntry::AssistantMessage(AssistantMessage {
+ chunks,
+ indented: existing_indented,
+ }) = last_entry
+ && *existing_indented == indented
{
let idx = entries_len - 1;
cx.emit(AcpThreadEvent::EntryUpdated(idx));
@@ -1234,6 +1300,7 @@ impl AcpThread {
self.push_entry(
AgentThreadEntry::AssistantMessage(AssistantMessage {
chunks: vec![chunk],
+ indented,
}),
cx,
);
@@ -1287,11 +1354,7 @@ impl AcpThread {
label: cx.new(|cx| Markdown::new("Tool call not found".into(), None, None, cx)),
kind: acp::ToolKind::Fetch,
content: vec![ToolCallContent::ContentBlock(ContentBlock::new(
- acp::ContentBlock::Text(acp::TextContent {
- text: "Tool call not found".to_string(),
- annotations: None,
- meta: None,
- }),
+ "Tool call not found".into(),
&languages,
path_style,
cx,
@@ -1300,6 +1363,7 @@ impl AcpThread {
locations: Vec::new(),
resolved_locations: Vec::new(),
raw_input: None,
+ raw_input_markdown: None,
raw_output: None,
};
self.push_entry(AgentThreadEntry::ToolCall(failed_tool_call), cx);
@@ -1315,7 +1379,7 @@ impl AcpThread {
let location_updated = update.fields.locations.is_some();
call.update_fields(update.fields, languages, path_style, &self.terminals, cx)?;
if location_updated {
- self.resolve_locations(update.id, cx);
+ self.resolve_locations(update.tool_call_id, cx);
}
}
ToolCallUpdate::UpdateDiff(update) => {
@@ -1353,9 +1417,9 @@ impl AcpThread {
) -> Result<(), acp::Error> {
let language_registry = self.project.read(cx).languages().clone();
let path_style = self.project.read(cx).path_style(cx);
- let id = update.id.clone();
+ let id = update.tool_call_id.clone();
- let agent = self.connection().telemetry_id();
+ let agent_telemetry_id = self.connection().telemetry_id();
let session = self.session_id();
if let ToolCallStatus::Completed | ToolCallStatus::Failed = status {
let status = if matches!(status, ToolCallStatus::Completed) {
@@ -1363,7 +1427,12 @@ impl AcpThread {
} else {
"failed"
};
- telemetry::event!("Agent Tool Call Completed", agent, session, status);
+ telemetry::event!(
+ "Agent Tool Call Completed",
+ agent_telemetry_id,
+ session,
+ status
+ );
}
if let Some(ix) = self.index_for_tool_call(&id) {
@@ -1518,16 +1587,16 @@ impl AcpThread {
// some tools would (incorrectly) continue to auto-accept.
if let Some(allow_once_option) = options.iter().find_map(|option| {
if matches!(option.kind, acp::PermissionOptionKind::AllowOnce) {
- Some(option.id.clone())
+ Some(option.option_id.clone())
} else {
None
}
}) {
self.upsert_tool_call_inner(tool_call, ToolCallStatus::Pending, cx)?;
return Ok(async {
- acp::RequestPermissionOutcome::Selected {
- option_id: allow_once_option,
- }
+ acp::RequestPermissionOutcome::Selected(acp::SelectedPermissionOutcome::new(
+ allow_once_option,
+ ))
}
.boxed());
}
@@ -1543,7 +1612,9 @@ impl AcpThread {
let fut = async {
match rx.await {
- Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option },
+ Ok(option) => acp::RequestPermissionOutcome::Selected(
+ acp::SelectedPermissionOutcome::new(option),
+ ),
Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
}
}
@@ -1570,6 +1641,7 @@ impl AcpThread {
acp::PermissionOptionKind::AllowOnce | acp::PermissionOptionKind::AllowAlways => {
ToolCallStatus::InProgress
}
+ _ => ToolCallStatus::InProgress,
};
let curr_status = mem::replace(&mut call.status, new_status);
@@ -1648,14 +1720,7 @@ impl AcpThread {
message: &str,
cx: &mut Context,
) -> BoxFuture<'static, Result<()>> {
- self.send(
- vec![acp::ContentBlock::Text(acp::TextContent {
- text: message.to_string(),
- annotations: None,
- meta: None,
- })],
- cx,
- )
+ self.send(vec![message.into()], cx)
}
pub fn send(
@@ -1669,11 +1734,7 @@ impl AcpThread {
self.project.read(cx).path_style(cx),
cx,
);
- let request = acp::PromptRequest {
- prompt: message.clone(),
- session_id: self.session_id.clone(),
- meta: None,
- };
+ let request = acp::PromptRequest::new(self.session_id.clone(), message.clone());
let git_store = self.project.read(cx).git_store().clone();
let message_id = if self.connection.truncate(&self.session_id, cx).is_some() {
@@ -1690,6 +1751,7 @@ impl AcpThread {
content: block,
chunks: message,
checkpoint: None,
+ indented: false,
}),
cx,
);
@@ -1765,7 +1827,7 @@ impl AcpThread {
result,
Ok(Ok(acp::PromptResponse {
stop_reason: acp::StopReason::Cancelled,
- meta: None,
+ ..
}))
);
@@ -1781,7 +1843,7 @@ impl AcpThread {
// Handle refusal - distinguish between user prompt and tool call refusals
if let Ok(Ok(acp::PromptResponse {
stop_reason: acp::StopReason::Refusal,
- meta: _,
+ ..
})) = result
{
if let Some((user_msg_ix, _)) = this.last_user_message() {
@@ -2017,7 +2079,7 @@ impl AcpThread {
})?;
Ok(project.open_buffer(path, cx))
})
- .map_err(|e| acp::Error::internal_error().with_data(e.to_string()))
+ .map_err(|e| acp::Error::internal_error().data(e.to_string()))
.flatten()?;
let buffer = load.await?;
@@ -2050,7 +2112,7 @@ impl AcpThread {
let start_position = Point::new(line, 0);
if start_position > max_point {
- return Err(acp::Error::invalid_params().with_data(format!(
+ return Err(acp::Error::invalid_params().data(format!(
"Attempting to read beyond the end of the file, line {}:{}",
max_point.row + 1,
max_point.column
@@ -2120,7 +2182,7 @@ impl AcpThread {
position: edits
.last()
.map(|(range, _)| range.end)
- .unwrap_or(Anchor::MIN),
+ .unwrap_or(Anchor::min_for_buffer(buffer.read(cx).remote_id())),
}),
cx,
);
@@ -2202,7 +2264,7 @@ impl AcpThread {
let language_registry = project.read(cx).languages().clone();
let is_windows = project.read(cx).path_style(cx).is_windows();
- let terminal_id = acp::TerminalId(Uuid::new_v4().to_string().into());
+ let terminal_id = acp::TerminalId::new(Uuid::new_v4().to_string());
let terminal_task = cx.spawn({
let terminal_id = terminal_id.clone();
async move |_this, cx| {
@@ -2412,7 +2474,7 @@ mod tests {
.await
.unwrap();
- let terminal_id = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());
+ let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
// Send Output BEFORE Created - should be buffered by acp_thread
thread.update(cx, |thread, cx| {
@@ -2474,7 +2536,7 @@ mod tests {
.await
.unwrap();
- let terminal_id = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());
+ let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
// Send Output BEFORE Created
thread.update(cx, |thread, cx| {
@@ -2492,11 +2554,7 @@ mod tests {
thread.on_terminal_provider_event(
TerminalProviderEvent::Exit {
terminal_id: terminal_id.clone(),
- status: acp::TerminalExitStatus {
- exit_code: Some(0),
- signal: None,
- meta: None,
- },
+ status: acp::TerminalExitStatus::new().exit_code(0),
},
cx,
);
@@ -2553,15 +2611,7 @@ mod tests {
// Test creating a new user message
thread.update(cx, |thread, cx| {
- thread.push_user_content_block(
- None,
- acp::ContentBlock::Text(acp::TextContent {
- annotations: None,
- text: "Hello, ".to_string(),
- meta: None,
- }),
- cx,
- );
+ thread.push_user_content_block(None, "Hello, ".into(), cx);
});
thread.update(cx, |thread, cx| {
@@ -2577,15 +2627,7 @@ mod tests {
// Test appending to existing user message
let message_1_id = UserMessageId::new();
thread.update(cx, |thread, cx| {
- thread.push_user_content_block(
- Some(message_1_id.clone()),
- acp::ContentBlock::Text(acp::TextContent {
- annotations: None,
- text: "world!".to_string(),
- meta: None,
- }),
- cx,
- );
+ thread.push_user_content_block(Some(message_1_id.clone()), "world!".into(), cx);
});
thread.update(cx, |thread, cx| {
@@ -2600,26 +2642,14 @@ mod tests {
// Test creating new user message after assistant message
thread.update(cx, |thread, cx| {
- thread.push_assistant_content_block(
- acp::ContentBlock::Text(acp::TextContent {
- annotations: None,
- text: "Assistant response".to_string(),
- meta: None,
- }),
- false,
- cx,
- );
+ thread.push_assistant_content_block("Assistant response".into(), false, cx);
});
let message_2_id = UserMessageId::new();
thread.update(cx, |thread, cx| {
thread.push_user_content_block(
Some(message_2_id.clone()),
- acp::ContentBlock::Text(acp::TextContent {
- annotations: None,
- text: "New user message".to_string(),
- meta: None,
- }),
+ "New user message".into(),
cx,
);
});
@@ -2647,27 +2677,22 @@ mod tests {
thread.update(&mut cx, |thread, cx| {
thread
.handle_session_update(
- acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk {
- content: "Thinking ".into(),
- meta: None,
- }),
+ acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk::new(
+ "Thinking ".into(),
+ )),
cx,
)
.unwrap();
thread
.handle_session_update(
- acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk {
- content: "hard!".into(),
- meta: None,
- }),
+ acp::SessionUpdate::AgentThoughtChunk(acp::ContentChunk::new(
+ "hard!".into(),
+ )),
cx,
)
.unwrap();
})?;
- Ok(acp::PromptResponse {
- stop_reason: acp::StopReason::EndTurn,
- meta: None,
- })
+ Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
}
.boxed_local()
},
@@ -2735,10 +2760,7 @@ mod tests {
.unwrap()
.await
.unwrap();
- Ok(acp::PromptResponse {
- stop_reason: acp::StopReason::EndTurn,
- meta: None,
- })
+ Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
}
.boxed_local()
},
@@ -2960,7 +2982,7 @@ mod tests {
.await
.unwrap_err();
- assert_eq!(err.code, acp::ErrorCode::RESOURCE_NOT_FOUND.code);
+ assert_eq!(err.code, acp::ErrorCode::ResourceNotFound);
}
#[gpui::test]
@@ -2969,7 +2991,7 @@ mod tests {
let fs = FakeFs::new(cx.executor());
let project = Project::test(fs, [], cx).await;
- let id = acp::ToolCallId("test".into());
+ let id = acp::ToolCallId::new("test");
let connection = Rc::new(FakeAgentConnection::new().on_user_message({
let id = id.clone();
@@ -2979,26 +3001,17 @@ mod tests {
thread
.update(&mut cx, |thread, cx| {
thread.handle_session_update(
- acp::SessionUpdate::ToolCall(acp::ToolCall {
- id: id.clone(),
- title: "Label".into(),
- kind: acp::ToolKind::Fetch,
- status: acp::ToolCallStatus::InProgress,
- content: vec![],
- locations: vec![],
- raw_input: None,
- raw_output: None,
- meta: None,
- }),
+ acp::SessionUpdate::ToolCall(
+ acp::ToolCall::new(id.clone(), "Label")
+ .kind(acp::ToolKind::Fetch)
+ .status(acp::ToolCallStatus::InProgress),
+ ),
cx,
)
})
.unwrap()
.unwrap();
- Ok(acp::PromptResponse {
- stop_reason: acp::StopReason::EndTurn,
- meta: None,
- })
+ Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
}
.boxed_local()
}
@@ -3040,14 +3053,10 @@ mod tests {
thread
.update(cx, |thread, cx| {
thread.handle_session_update(
- acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate {
+ acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate::new(
id,
- fields: acp::ToolCallUpdateFields {
- status: Some(acp::ToolCallStatus::Completed),
- ..Default::default()
- },
- meta: None,
- }),
+ acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::Completed),
+ )),
cx,
)
})
@@ -3079,33 +3088,21 @@ mod tests {
thread
.update(&mut cx, |thread, cx| {
thread.handle_session_update(
- acp::SessionUpdate::ToolCall(acp::ToolCall {
- id: acp::ToolCallId("test".into()),
- title: "Label".into(),
- kind: acp::ToolKind::Edit,
- status: acp::ToolCallStatus::Completed,
- content: vec![acp::ToolCallContent::Diff {
- diff: acp::Diff {
- path: "/test/test.txt".into(),
- old_text: None,
- new_text: "foo".into(),
- meta: None,
- },
- }],
- locations: vec![],
- raw_input: None,
- raw_output: None,
- meta: None,
- }),
+ acp::SessionUpdate::ToolCall(
+ acp::ToolCall::new("test", "Label")
+ .kind(acp::ToolKind::Edit)
+ .status(acp::ToolCallStatus::Completed)
+ .content(vec![acp::ToolCallContent::Diff(acp::Diff::new(
+ "/test/test.txt",
+ "foo",
+ ))]),
+ ),
cx,
)
})
.unwrap()
.unwrap();
- Ok(acp::PromptResponse {
- stop_reason: acp::StopReason::EndTurn,
- meta: None,
- })
+ Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
}
.boxed_local()
}
@@ -3158,18 +3155,14 @@ mod tests {
thread.update(&mut cx, |thread, cx| {
thread
.handle_session_update(
- acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk {
- content: content.text.to_uppercase().into(),
- meta: None,
- }),
+ acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
+ content.text.to_uppercase().into(),
+ )),
cx,
)
.unwrap();
})?;
- Ok(acp::PromptResponse {
- stop_reason: acp::StopReason::EndTurn,
- meta: None,
- })
+ Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
}
.boxed_local()
}
@@ -3325,34 +3318,22 @@ mod tests {
thread.update(&mut cx, |thread, cx| {
thread
.handle_session_update(
- acp::SessionUpdate::ToolCall(acp::ToolCall {
- id: acp::ToolCallId("tool1".into()),
- title: "Test Tool".into(),
- kind: acp::ToolKind::Fetch,
- status: acp::ToolCallStatus::Completed,
- content: vec![],
- locations: vec![],
- raw_input: Some(serde_json::json!({"query": "test"})),
- raw_output: Some(
- serde_json::json!({"result": "inappropriate content"}),
- ),
- meta: None,
- }),
+ acp::SessionUpdate::ToolCall(
+ acp::ToolCall::new("tool1", "Test Tool")
+ .kind(acp::ToolKind::Fetch)
+ .status(acp::ToolCallStatus::Completed)
+ .raw_input(serde_json::json!({"query": "test"}))
+ .raw_output(serde_json::json!({"result": "inappropriate content"})),
+ ),
cx,
)
.unwrap();
})?;
// Now return refusal because of the tool result
- Ok(acp::PromptResponse {
- stop_reason: acp::StopReason::Refusal,
- meta: None,
- })
+ Ok(acp::PromptResponse::new(acp::StopReason::Refusal))
} else {
- Ok(acp::PromptResponse {
- stop_reason: acp::StopReason::EndTurn,
- meta: None,
- })
+ Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
}
}
.boxed_local()
@@ -3380,16 +3361,7 @@ mod tests {
});
// Send a user message - this will trigger tool call and then refusal
- let send_task = thread.update(cx, |thread, cx| {
- thread.send(
- vec![acp::ContentBlock::Text(acp::TextContent {
- text: "Hello".into(),
- annotations: None,
- meta: None,
- })],
- cx,
- )
- });
+ let send_task = thread.update(cx, |thread, cx| thread.send(vec!["Hello".into()], cx));
cx.background_executor.spawn(send_task).detach();
cx.run_until_parked();
@@ -3435,21 +3407,11 @@ mod tests {
let refuse_next = refuse_next.clone();
move |_request, _thread, _cx| {
if refuse_next.load(SeqCst) {
- async move {
- Ok(acp::PromptResponse {
- stop_reason: acp::StopReason::Refusal,
- meta: None,
- })
- }
- .boxed_local()
+ async move { Ok(acp::PromptResponse::new(acp::StopReason::Refusal)) }
+ .boxed_local()
} else {
- async move {
- Ok(acp::PromptResponse {
- stop_reason: acp::StopReason::EndTurn,
- meta: None,
- })
- }
- .boxed_local()
+ async move { Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)) }
+ .boxed_local()
}
}
}));
@@ -3506,10 +3468,7 @@ mod tests {
let refuse_next = refuse_next.clone();
async move {
if refuse_next.load(SeqCst) {
- return Ok(acp::PromptResponse {
- stop_reason: acp::StopReason::Refusal,
- meta: None,
- });
+ return Ok(acp::PromptResponse::new(acp::StopReason::Refusal));
}
let acp::ContentBlock::Text(content) = &request.prompt[0] else {
@@ -3518,18 +3477,14 @@ mod tests {
thread.update(&mut cx, |thread, cx| {
thread
.handle_session_update(
- acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk {
- content: content.text.to_uppercase().into(),
- meta: None,
- }),
+ acp::SessionUpdate::AgentMessageChunk(acp::ContentChunk::new(
+ content.text.to_uppercase().into(),
+ )),
cx,
)
.unwrap();
})?;
- Ok(acp::PromptResponse {
- stop_reason: acp::StopReason::EndTurn,
- meta: None,
- })
+ Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
}
.boxed_local()
}
@@ -3654,8 +3609,8 @@ mod tests {
}
impl AgentConnection for FakeAgentConnection {
- fn telemetry_id(&self) -> &'static str {
- "fake"
+ fn telemetry_id(&self) -> SharedString {
+ "fake".into()
}
fn auth_methods(&self) -> &[acp::AuthMethod] {
@@ -3668,13 +3623,12 @@ mod tests {
_cwd: &Path,
cx: &mut App,
) -> Task>> {
- let session_id = acp::SessionId(
+ let session_id = acp::SessionId::new(
rand::rng()
.sample_iter(&distr::Alphanumeric)
.take(7)
.map(char::from)
- .collect::()
- .into(),
+ .collect::(),
);
let action_log = cx.new(|_| ActionLog::new(project.clone()));
let thread = cx.new(|cx| {
@@ -3684,12 +3638,12 @@ mod tests {
project,
action_log,
session_id.clone(),
- watch::Receiver::constant(acp::PromptCapabilities {
- image: true,
- audio: true,
- embedded_context: true,
- meta: None,
- }),
+ watch::Receiver::constant(
+ acp::PromptCapabilities::new()
+ .image(true)
+ .audio(true)
+ .embedded_context(true),
+ ),
cx,
)
});
@@ -3718,10 +3672,7 @@ mod tests {
let thread = thread.clone();
cx.spawn(async move |cx| handler(params, thread, cx.clone()).await)
} else {
- Task::ready(Ok(acp::PromptResponse {
- stop_reason: acp::StopReason::EndTurn,
- meta: None,
- }))
+ Task::ready(Ok(acp::PromptResponse::new(acp::StopReason::EndTurn)))
}
}
@@ -3776,17 +3727,13 @@ mod tests {
.unwrap();
// Try to update a tool call that doesn't exist
- let nonexistent_id = acp::ToolCallId("nonexistent-tool-call".into());
+ let nonexistent_id = acp::ToolCallId::new("nonexistent-tool-call");
thread.update(cx, |thread, cx| {
let result = thread.handle_session_update(
- acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate {
- id: nonexistent_id.clone(),
- fields: acp::ToolCallUpdateFields {
- status: Some(acp::ToolCallStatus::Completed),
- ..Default::default()
- },
- meta: None,
- }),
+ acp::SessionUpdate::ToolCallUpdate(acp::ToolCallUpdate::new(
+ nonexistent_id.clone(),
+ acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::Completed),
+ )),
cx,
);
@@ -3861,7 +3808,7 @@ mod tests {
.unwrap();
// Create 2 terminals BEFORE the checkpoint that have completed running
- let terminal_id_1 = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());
+ let terminal_id_1 = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
let mock_terminal_1 = cx.new(|cx| {
let builder = ::terminal::TerminalBuilder::new_display_only(
::terminal::terminal_settings::CursorShape::default(),
@@ -3900,17 +3847,13 @@ mod tests {
thread.on_terminal_provider_event(
TerminalProviderEvent::Exit {
terminal_id: terminal_id_1.clone(),
- status: acp::TerminalExitStatus {
- exit_code: Some(0),
- signal: None,
- meta: None,
- },
+ status: acp::TerminalExitStatus::new().exit_code(0),
},
cx,
);
});
- let terminal_id_2 = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());
+ let terminal_id_2 = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
let mock_terminal_2 = cx.new(|cx| {
let builder = ::terminal::TerminalBuilder::new_display_only(
::terminal::terminal_settings::CursorShape::default(),
@@ -3949,11 +3892,7 @@ mod tests {
thread.on_terminal_provider_event(
TerminalProviderEvent::Exit {
terminal_id: terminal_id_2.clone(),
- status: acp::TerminalExitStatus {
- exit_code: Some(0),
- signal: None,
- meta: None,
- },
+ status: acp::TerminalExitStatus::new().exit_code(0),
},
cx,
);
@@ -3973,7 +3912,7 @@ mod tests {
// Create a terminal AFTER the checkpoint we'll restore to.
// This simulates the AI agent starting a long-running terminal command.
- let terminal_id = acp::TerminalId(uuid::Uuid::new_v4().to_string().into());
+ let terminal_id = acp::TerminalId::new(uuid::Uuid::new_v4().to_string());
let mock_terminal = cx.new(|cx| {
let builder = ::terminal::TerminalBuilder::new_display_only(
::terminal::terminal_settings::CursorShape::default(),
@@ -4015,21 +3954,15 @@ mod tests {
thread.update(cx, |thread, cx| {
thread
.handle_session_update(
- acp::SessionUpdate::ToolCall(acp::ToolCall {
- id: acp::ToolCallId("terminal-tool-1".into()),
- title: "Running command".into(),
- kind: acp::ToolKind::Execute,
- status: acp::ToolCallStatus::InProgress,
- content: vec![acp::ToolCallContent::Terminal {
- terminal_id: terminal_id.clone(),
- }],
- locations: vec![],
- raw_input: Some(
- serde_json::json!({"command": "sleep 1000", "cd": "/test"}),
- ),
- raw_output: None,
- meta: None,
- }),
+ acp::SessionUpdate::ToolCall(
+ acp::ToolCall::new("terminal-tool-1", "Running command")
+ .kind(acp::ToolKind::Execute)
+ .status(acp::ToolCallStatus::InProgress)
+ .content(vec![acp::ToolCallContent::Terminal(acp::Terminal::new(
+ terminal_id.clone(),
+ ))])
+ .raw_input(serde_json::json!({"command": "sleep 1000", "cd": "/test"})),
+ ),
cx,
)
.unwrap();
diff --git a/crates/acp_thread/src/connection.rs b/crates/acp_thread/src/connection.rs
index 80bec0ee9d351711bdf435cfe63eb99eb1e499e3..598d0428174eb2fc124739a18ddeff1098521cb7 100644
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -20,7 +20,7 @@ impl UserMessageId {
}
pub trait AgentConnection {
- fn telemetry_id(&self) -> &'static str;
+ fn telemetry_id(&self) -> SharedString;
fn new_thread(
self: Rc,
@@ -202,6 +202,21 @@ pub trait AgentModelSelector: 'static {
fn should_render_footer(&self) -> bool {
false
}
+
+ /// Whether this selector supports the favorites feature.
+ /// Only the native agent uses the model ID format that maps to settings.
+ fn supports_favorites(&self) -> bool {
+ false
+ }
+}
+
+/// Icon for a model in the model selector.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum AgentModelIcon {
+ /// A built-in icon from Zed's icon set.
+ Named(IconName),
+ /// Path to a custom SVG icon file.
+ Path(SharedString),
}
#[derive(Debug, Clone, PartialEq, Eq)]
@@ -209,7 +224,7 @@ pub struct AgentModelInfo {
pub id: acp::ModelId,
pub name: SharedString,
pub description: Option,
- pub icon: Option,
+ pub icon: Option,
}
impl From for AgentModelInfo {
@@ -239,6 +254,10 @@ impl AgentModelList {
AgentModelList::Grouped(groups) => groups.is_empty(),
}
}
+
+ pub fn is_flat(&self) -> bool {
+ matches!(self, AgentModelList::Flat(_))
+ }
}
#[cfg(feature = "test-support")]
@@ -322,8 +341,8 @@ mod test_support {
}
impl AgentConnection for StubAgentConnection {
- fn telemetry_id(&self) -> &'static str {
- "stub"
+ fn telemetry_id(&self) -> SharedString {
+ "stub".into()
}
fn auth_methods(&self) -> &[acp::AuthMethod] {
@@ -336,7 +355,7 @@ mod test_support {
_cwd: &Path,
cx: &mut gpui::App,
) -> Task>> {
- let session_id = acp::SessionId(self.sessions.lock().len().to_string().into());
+ let session_id = acp::SessionId::new(self.sessions.lock().len().to_string());
let action_log = cx.new(|_| ActionLog::new(project.clone()));
let thread = cx.new(|cx| {
AcpThread::new(
@@ -345,12 +364,12 @@ mod test_support {
project,
action_log,
session_id.clone(),
- watch::Receiver::constant(acp::PromptCapabilities {
- image: true,
- audio: true,
- embedded_context: true,
- meta: None,
- }),
+ watch::Receiver::constant(
+ acp::PromptCapabilities::new()
+ .image(true)
+ .audio(true)
+ .embedded_context(true),
+ ),
cx,
)
});
@@ -389,10 +408,7 @@ mod test_support {
response_tx.replace(tx);
cx.spawn(async move |_| {
let stop_reason = rx.await?;
- Ok(acp::PromptResponse {
- stop_reason,
- meta: None,
- })
+ Ok(acp::PromptResponse::new(stop_reason))
})
} else {
for update in self.next_prompt_updates.lock().drain(..) {
@@ -400,7 +416,7 @@ mod test_support {
let update = update.clone();
let permission_request = if let acp::SessionUpdate::ToolCall(tool_call) =
&update
- && let Some(options) = self.permission_requests.get(&tool_call.id)
+ && let Some(options) = self.permission_requests.get(&tool_call.tool_call_id)
{
Some((tool_call.clone(), options.clone()))
} else {
@@ -429,10 +445,7 @@ mod test_support {
cx.spawn(async move |_| {
try_join_all(tasks).await?;
- Ok(acp::PromptResponse {
- stop_reason: acp::StopReason::EndTurn,
- meta: None,
- })
+ Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
})
}
}
diff --git a/crates/acp_thread/src/diff.rs b/crates/acp_thread/src/diff.rs
index 055b2f7fb86ffe9d7f12459b6b16405ce77815a0..cae1aad90810c217324659d29c065af443494933 100644
--- a/crates/acp_thread/src/diff.rs
+++ b/crates/acp_thread/src/diff.rs
@@ -50,9 +50,14 @@ impl Diff {
let hunk_ranges = {
let buffer = buffer.read(cx);
let diff = diff.read(cx);
- diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, buffer, cx)
- .map(|diff_hunk| diff_hunk.buffer_range.to_point(buffer))
- .collect::>()
+ diff.hunks_intersecting_range(
+ Anchor::min_for_buffer(buffer.remote_id())
+ ..Anchor::max_for_buffer(buffer.remote_id()),
+ buffer,
+ cx,
+ )
+ .map(|diff_hunk| diff_hunk.buffer_range.to_point(buffer))
+ .collect::>()
};
multibuffer.set_excerpts_for_path(
@@ -161,7 +166,7 @@ impl Diff {
}
pub fn has_revealed_range(&self, cx: &App) -> bool {
- self.multibuffer().read(cx).excerpt_paths().next().is_some()
+ self.multibuffer().read(cx).paths().next().is_some()
}
pub fn needs_update(&self, old_text: &str, new_text: &str, cx: &App) -> bool {
@@ -316,7 +321,12 @@ impl PendingDiff {
let buffer = self.new_buffer.read(cx);
let diff = self.diff.read(cx);
let mut ranges = diff
- .hunks_intersecting_range(Anchor::MIN..Anchor::MAX, buffer, cx)
+ .hunks_intersecting_range(
+ Anchor::min_for_buffer(buffer.remote_id())
+ ..Anchor::max_for_buffer(buffer.remote_id()),
+ buffer,
+ cx,
+ )
.map(|diff_hunk| diff_hunk.buffer_range.to_point(buffer))
.collect::>();
ranges.extend(
diff --git a/crates/acp_thread/src/mention.rs b/crates/acp_thread/src/mention.rs
index b78eac4903a259a1044892fb2c8233f7e973f025..3e2e53fb7fbdf581b45566bd747cfcbfc1c0a004 100644
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@@ -4,12 +4,14 @@ use file_icons::FileIcons;
use prompt_store::{PromptId, UserPromptId};
use serde::{Deserialize, Serialize};
use std::{
+ borrow::Cow,
fmt,
ops::RangeInclusive,
path::{Path, PathBuf},
};
use ui::{App, IconName, SharedString};
use url::Url;
+use urlencoding::decode;
use util::paths::PathStyle;
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Hash)]
@@ -74,11 +76,13 @@ impl MentionUri {
let path = url.path();
match url.scheme() {
"file" => {
- let path = if path_style.is_windows() {
+ let normalized = if path_style.is_windows() {
path.trim_start_matches("/")
} else {
path
};
+ let decoded = decode(normalized).unwrap_or(Cow::Borrowed(normalized));
+ let path = decoded.as_ref();
if let Some(fragment) = url.fragment() {
let line_range = parse_line_range(fragment)?;
@@ -108,7 +112,7 @@ impl MentionUri {
if let Some(thread_id) = path.strip_prefix("/agent/thread/") {
let name = single_query_param(&url, "name")?.context("Missing thread name")?;
Ok(Self::Thread {
- id: acp::SessionId(thread_id.into()),
+ id: acp::SessionId::new(thread_id),
name,
})
} else if let Some(path) = path.strip_prefix("/agent/text-thread/") {
@@ -406,6 +410,19 @@ mod tests {
assert_eq!(parsed.to_uri().to_string(), selection_uri);
}
+ #[test]
+ fn test_parse_file_uri_with_non_ascii() {
+ let file_uri = uri!("file:///path/to/%E6%97%A5%E6%9C%AC%E8%AA%9E.txt");
+ let parsed = MentionUri::parse(file_uri, PathStyle::local()).unwrap();
+ match &parsed {
+ MentionUri::File { abs_path } => {
+ assert_eq!(abs_path, Path::new(path!("/path/to/日本語.txt")));
+ }
+ _ => panic!("Expected File variant"),
+ }
+ assert_eq!(parsed.to_uri().to_string(), file_uri);
+ }
+
#[test]
fn test_parse_untitled_selection_uri() {
let selection_uri = uri!("zed:///agent/untitled-buffer#L1:10");
diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
index 8b08868616e19b0d1855558a057af8eebc314e4a..f70e044fbc1b380768dbcd807f1833f6fb5cd48b 100644
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -75,11 +75,9 @@ impl Terminal {
let exit_status = exit_status.map(portable_pty::ExitStatus::from);
- acp::TerminalExitStatus {
- exit_code: exit_status.as_ref().map(|e| e.exit_code()),
- signal: exit_status.and_then(|e| e.signal().map(Into::into)),
- meta: None,
- }
+ acp::TerminalExitStatus::new()
+ .exit_code(exit_status.as_ref().map(|e| e.exit_code()))
+ .signal(exit_status.and_then(|e| e.signal().map(ToOwned::to_owned)))
})
.shared(),
}
@@ -103,25 +101,19 @@ impl Terminal {
if let Some(output) = self.output.as_ref() {
let exit_status = output.exit_status.map(portable_pty::ExitStatus::from);
- acp::TerminalOutputResponse {
- output: output.content.clone(),
- truncated: output.original_content_len > output.content.len(),
- exit_status: Some(acp::TerminalExitStatus {
- exit_code: exit_status.as_ref().map(|e| e.exit_code()),
- signal: exit_status.and_then(|e| e.signal().map(Into::into)),
- meta: None,
- }),
- meta: None,
- }
+ acp::TerminalOutputResponse::new(
+ output.content.clone(),
+ output.original_content_len > output.content.len(),
+ )
+ .exit_status(
+ acp::TerminalExitStatus::new()
+ .exit_code(exit_status.as_ref().map(|e| e.exit_code()))
+ .signal(exit_status.and_then(|e| e.signal().map(ToOwned::to_owned))),
+ )
} else {
let (current_content, original_len) = self.truncated_output(cx);
-
- acp::TerminalOutputResponse {
- truncated: current_content.len() < original_len,
- output: current_content,
- exit_status: None,
- meta: None,
- }
+ let truncated = current_content.len() < original_len;
+ acp::TerminalOutputResponse::new(current_content, truncated)
}
}
@@ -195,8 +187,10 @@ pub async fn create_terminal_entity(
Default::default()
};
- // Disables paging for `git` and hopefully other commands
+ // Disable pagers so agent/terminal commands don't hang behind interactive UIs
env.insert("PAGER".into(), "".into());
+ // Override user core.pager (e.g. delta) which Git prefers over PAGER
+ env.insert("GIT_PAGER".into(), "cat".into());
env.extend(env_vars);
// Use remote shell or default system shell, as appropriate
diff --git a/crates/acp_tools/src/acp_tools.rs b/crates/acp_tools/src/acp_tools.rs
index 7615784676c7d9ff1782a6e9537e608cb927154d..b0d30367da0634dc82f8db96fc099e268aa4790e 100644
--- a/crates/acp_tools/src/acp_tools.rs
+++ b/crates/acp_tools/src/acp_tools.rs
@@ -371,13 +371,13 @@ impl AcpTools {
syntax: cx.theme().syntax().clone(),
code_block_overflow_x_scroll: true,
code_block: StyleRefinement {
- text: Some(TextStyleRefinement {
+ text: TextStyleRefinement {
font_family: Some(
theme_settings.buffer_font.family.clone(),
),
font_size: Some((base_size * 0.8).into()),
..Default::default()
- }),
+ },
..Default::default()
},
..Default::default()
@@ -528,7 +528,7 @@ impl Render for AcpTools {
.with_sizing_behavior(gpui::ListSizingBehavior::Auto)
.size_full(),
)
- .vertical_scrollbar_for(connection.list_state.clone(), window, cx)
+ .vertical_scrollbar_for(&connection.list_state, window, cx)
.into_any()
}
}
diff --git a/crates/action_log/src/action_log.rs b/crates/action_log/src/action_log.rs
index 78265007a5abe3e724166610013ade776d82dbeb..6eb18a4f12325f0c181928f99b4eb921265dbf9c 100644
--- a/crates/action_log/src/action_log.rs
+++ b/crates/action_log/src/action_log.rs
@@ -409,9 +409,11 @@ impl ActionLog {
let new_diff_base = new_diff_base.clone();
async move {
let mut unreviewed_edits = Patch::default();
- for hunk in diff_snapshot
- .hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &buffer_snapshot)
- {
+ for hunk in diff_snapshot.hunks_intersecting_range(
+ Anchor::min_for_buffer(buffer_snapshot.remote_id())
+ ..Anchor::max_for_buffer(buffer_snapshot.remote_id()),
+ &buffer_snapshot,
+ ) {
let old_range = new_diff_base
.offset_to_point(hunk.diff_base_byte_range.start)
..new_diff_base.offset_to_point(hunk.diff_base_byte_range.end);
@@ -732,12 +734,10 @@ impl ActionLog {
cx: &mut Context,
) -> Task<()> {
let futures = self.changed_buffers(cx).into_keys().map(|buffer| {
- let reject = self.reject_edits_in_ranges(
- buffer,
- vec![Anchor::MIN..Anchor::MAX],
- telemetry.clone(),
- cx,
- );
+ let buffer_ranges = vec![Anchor::min_max_range_for_buffer(
+ buffer.read(cx).remote_id(),
+ )];
+ let reject = self.reject_edits_in_ranges(buffer, buffer_ranges, telemetry.clone(), cx);
async move {
reject.await.log_err();
@@ -777,7 +777,7 @@ impl ActionLog {
#[derive(Clone)]
pub struct ActionLogTelemetry {
- pub agent_telemetry_id: &'static str,
+ pub agent_telemetry_id: SharedString,
pub session_id: Arc,
}
@@ -2010,7 +2010,8 @@ mod tests {
// User accepts the single hunk
action_log.update(cx, |log, cx| {
- log.keep_edits_in_range(buffer.clone(), Anchor::MIN..Anchor::MAX, None, cx)
+ let buffer_range = Anchor::min_max_range_for_buffer(buffer.read(cx).remote_id());
+ log.keep_edits_in_range(buffer.clone(), buffer_range, None, cx)
});
cx.run_until_parked();
assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
@@ -2031,7 +2032,14 @@ mod tests {
// User rejects the hunk
action_log
.update(cx, |log, cx| {
- log.reject_edits_in_ranges(buffer.clone(), vec![Anchor::MIN..Anchor::MAX], None, cx)
+ log.reject_edits_in_ranges(
+ buffer.clone(),
+ vec![Anchor::min_max_range_for_buffer(
+ buffer.read(cx).remote_id(),
+ )],
+ None,
+ cx,
+ )
})
.await
.unwrap();
diff --git a/crates/agent/Cargo.toml b/crates/agent/Cargo.toml
index cacbbd6e4e4423e2560fb963ef59daddce2309dc..667033a1bb33ea0372b8a9d8b0bfb00b23f59347 100644
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -83,6 +83,7 @@ ctor.workspace = true
db = { workspace = true, "features" = ["test-support"] }
editor = { workspace = true, "features" = ["test-support"] }
env_logger.workspace = true
+eval_utils.workspace = true
fs = { workspace = true, "features" = ["test-support"] }
git = { workspace = true, "features" = ["test-support"] }
gpui = { workspace = true, "features" = ["test-support"] }
diff --git a/crates/agent/src/agent.rs b/crates/agent/src/agent.rs
index 404cd6549e5786b92c49379918346b83fcc0e0c1..4baa7f4ea4004d2137b5cddb255346fa91523091 100644
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -5,12 +5,12 @@ mod legacy_thread;
mod native_agent_server;
pub mod outline;
mod templates;
-mod thread;
-mod tools;
-
#[cfg(test)]
mod tests;
+mod thread;
+mod tools;
+use context_server::ContextServerId;
pub use db::*;
pub use history_store::*;
pub use native_agent_server::NativeAgentServer;
@@ -18,11 +18,11 @@ pub use templates::*;
pub use thread::*;
pub use tools::*;
-use acp_thread::{AcpThread, AgentModelSelector};
+use acp_thread::{AcpThread, AgentModelSelector, UserMessageId};
use agent_client_protocol as acp;
use anyhow::{Context as _, Result, anyhow};
use chrono::{DateTime, Utc};
-use collections::{HashSet, IndexMap};
+use collections::{HashMap, HashSet, IndexMap};
use fs::Fs;
use futures::channel::{mpsc, oneshot};
use futures::future::Shared;
@@ -30,15 +30,15 @@ use futures::{StreamExt, future};
use gpui::{
App, AppContext, AsyncApp, Context, Entity, SharedString, Subscription, Task, WeakEntity,
};
-use language_model::{LanguageModel, LanguageModelProvider, LanguageModelRegistry};
+use language_model::{IconOrSvg, LanguageModel, LanguageModelProvider, LanguageModelRegistry};
use project::{Project, ProjectItem, ProjectPath, Worktree};
use prompt_store::{
- ProjectContext, PromptStore, RulesFileContext, UserRulesContext, WorktreeContext,
+ ProjectContext, PromptStore, RULES_FILE_NAMES, RulesFileContext, UserRulesContext,
+ WorktreeContext,
};
use serde::{Deserialize, Serialize};
use settings::{LanguageModelSelection, update_settings_file};
use std::any::Any;
-use std::collections::HashMap;
use std::path::{Path, PathBuf};
use std::rc::Rc;
use std::sync::Arc;
@@ -51,18 +51,6 @@ pub struct ProjectSnapshot {
pub timestamp: DateTime,
}
-const RULES_FILE_NAMES: [&str; 9] = [
- ".rules",
- ".cursorrules",
- ".windsurfrules",
- ".clinerules",
- ".github/copilot-instructions.md",
- "CLAUDE.md",
- "AGENT.md",
- "AGENTS.md",
- "GEMINI.md",
-];
-
pub struct RulesLoadingError {
pub message: SharedString,
}
@@ -105,7 +93,7 @@ impl LanguageModels {
fn refresh_list(&mut self, cx: &App) {
let providers = LanguageModelRegistry::global(cx)
.read(cx)
- .providers()
+ .visible_providers()
.into_iter()
.filter(|provider| provider.is_authenticated(cx))
.collect::>();
@@ -165,18 +153,21 @@ impl LanguageModels {
id: Self::model_id(model),
name: model.name().0,
description: None,
- icon: Some(provider.icon()),
+ icon: Some(match provider.icon() {
+ IconOrSvg::Svg(path) => acp_thread::AgentModelIcon::Path(path),
+ IconOrSvg::Icon(name) => acp_thread::AgentModelIcon::Named(name),
+ }),
}
}
fn model_id(model: &Arc) -> acp::ModelId {
- acp::ModelId(format!("{}/{}", model.provider_id().0, model.id().0).into())
+ acp::ModelId::new(format!("{}/{}", model.provider_id().0, model.id().0))
}
fn authenticate_all_language_model_providers(cx: &mut App) -> Task<()> {
let authenticate_all_providers = LanguageModelRegistry::global(cx)
.read(cx)
- .providers()
+ .visible_providers()
.iter()
.map(|provider| (provider.id(), provider.name(), provider.authenticate(cx)))
.collect::>();
@@ -263,12 +254,24 @@ impl NativeAgent {
.await;
cx.new(|cx| {
+ let context_server_store = project.read(cx).context_server_store();
+ let context_server_registry =
+ cx.new(|cx| ContextServerRegistry::new(context_server_store.clone(), cx));
+
let mut subscriptions = vec![
cx.subscribe(&project, Self::handle_project_event),
cx.subscribe(
&LanguageModelRegistry::global(cx),
Self::handle_models_updated_event,
),
+ cx.subscribe(
+ &context_server_store,
+ Self::handle_context_server_store_updated,
+ ),
+ cx.subscribe(
+ &context_server_registry,
+ Self::handle_context_server_registry_event,
+ ),
];
if let Some(prompt_store) = prompt_store.as_ref() {
subscriptions.push(cx.subscribe(prompt_store, Self::handle_prompts_updated_event))
@@ -277,16 +280,14 @@ impl NativeAgent {
let (project_context_needs_refresh_tx, project_context_needs_refresh_rx) =
watch::channel(());
Self {
- sessions: HashMap::new(),
+ sessions: HashMap::default(),
history,
project_context: cx.new(|_| project_context),
project_context_needs_refresh: project_context_needs_refresh_tx,
_maintain_project_context: cx.spawn(async move |this, cx| {
Self::maintain_project_context(this, project_context_needs_refresh_rx, cx).await
}),
- context_server_registry: cx.new(|cx| {
- ContextServerRegistry::new(project.read(cx).context_server_store(), cx)
- }),
+ context_server_registry,
templates,
models: LanguageModels::new(cx),
project,
@@ -355,6 +356,9 @@ impl NativeAgent {
pending_save: Task::ready(()),
},
);
+
+ self.update_available_commands(cx);
+
acp_thread
}
@@ -425,10 +429,7 @@ impl NativeAgent {
.into_iter()
.flat_map(|(contents, prompt_metadata)| match contents {
Ok(contents) => Some(UserRulesContext {
- uuid: match prompt_metadata.id {
- prompt_store::PromptId::User { uuid } => uuid,
- prompt_store::PromptId::EditWorkflow => return None,
- },
+ uuid: prompt_metadata.id.as_user()?,
title: prompt_metadata.title.map(|title| title.to_string()),
contents,
}),
@@ -622,6 +623,99 @@ impl NativeAgent {
}
}
+ fn handle_context_server_store_updated(
+ &mut self,
+ _store: Entity,
+ _event: &project::context_server_store::Event,
+ cx: &mut Context,
+ ) {
+ self.update_available_commands(cx);
+ }
+
+ fn handle_context_server_registry_event(
+ &mut self,
+ _registry: Entity,
+ event: &ContextServerRegistryEvent,
+ cx: &mut Context,
+ ) {
+ match event {
+ ContextServerRegistryEvent::ToolsChanged => {}
+ ContextServerRegistryEvent::PromptsChanged => {
+ self.update_available_commands(cx);
+ }
+ }
+ }
+
+ fn update_available_commands(&self, cx: &mut Context) {
+ let available_commands = self.build_available_commands(cx);
+ for session in self.sessions.values() {
+ if let Some(acp_thread) = session.acp_thread.upgrade() {
+ acp_thread.update(cx, |thread, cx| {
+ thread
+ .handle_session_update(
+ acp::SessionUpdate::AvailableCommandsUpdate(
+ acp::AvailableCommandsUpdate::new(available_commands.clone()),
+ ),
+ cx,
+ )
+ .log_err();
+ });
+ }
+ }
+ }
+
+ fn build_available_commands(&self, cx: &App) -> Vec {
+ let registry = self.context_server_registry.read(cx);
+
+ let mut prompt_name_counts: HashMap<&str, usize> = HashMap::default();
+ for context_server_prompt in registry.prompts() {
+ *prompt_name_counts
+ .entry(context_server_prompt.prompt.name.as_str())
+ .or_insert(0) += 1;
+ }
+
+ registry
+ .prompts()
+ .flat_map(|context_server_prompt| {
+ let prompt = &context_server_prompt.prompt;
+
+ let should_prefix = prompt_name_counts
+ .get(prompt.name.as_str())
+ .copied()
+ .unwrap_or(0)
+ > 1;
+
+ let name = if should_prefix {
+ format!("{}.{}", context_server_prompt.server_id, prompt.name)
+ } else {
+ prompt.name.clone()
+ };
+
+ let mut command = acp::AvailableCommand::new(
+ name,
+ prompt.description.clone().unwrap_or_default(),
+ );
+
+ match prompt.arguments.as_deref() {
+ Some([arg]) => {
+ let hint = format!("<{}>", arg.name);
+
+ command = command.input(acp::AvailableCommandInput::Unstructured(
+ acp::UnstructuredCommandInput::new(hint),
+ ));
+ }
+ Some([]) | None => {}
+ Some(_) => {
+ // skip >1 argument commands since we don't support them yet
+ return None;
+ }
+ }
+
+ Some(command)
+ })
+ .collect()
+ }
+
pub fn load_thread(
&mut self,
id: acp::SessionId,
@@ -720,6 +814,102 @@ impl NativeAgent {
history.update(cx, |history, cx| history.reload(cx)).ok();
});
}
+
+ fn send_mcp_prompt(
+ &self,
+ message_id: UserMessageId,
+ session_id: agent_client_protocol::SessionId,
+ prompt_name: String,
+ server_id: ContextServerId,
+ arguments: HashMap,
+ original_content: Vec,
+ cx: &mut Context,
+ ) -> Task> {
+ let server_store = self.context_server_registry.read(cx).server_store().clone();
+ let path_style = self.project.read(cx).path_style(cx);
+
+ cx.spawn(async move |this, cx| {
+ let prompt =
+ crate::get_prompt(&server_store, &server_id, &prompt_name, arguments, cx).await?;
+
+ let (acp_thread, thread) = this.update(cx, |this, _cx| {
+ let session = this
+ .sessions
+ .get(&session_id)
+ .context("Failed to get session")?;
+ anyhow::Ok((session.acp_thread.clone(), session.thread.clone()))
+ })??;
+
+ let mut last_is_user = true;
+
+ thread.update(cx, |thread, cx| {
+ thread.push_acp_user_block(
+ message_id,
+ original_content.into_iter().skip(1),
+ path_style,
+ cx,
+ );
+ })?;
+
+ for message in prompt.messages {
+ let context_server::types::PromptMessage { role, content } = message;
+ let block = mcp_message_content_to_acp_content_block(content);
+
+ match role {
+ context_server::types::Role::User => {
+ let id = acp_thread::UserMessageId::new();
+
+ acp_thread.update(cx, |acp_thread, cx| {
+ acp_thread.push_user_content_block_with_indent(
+ Some(id.clone()),
+ block.clone(),
+ true,
+ cx,
+ );
+ anyhow::Ok(())
+ })??;
+
+ thread.update(cx, |thread, cx| {
+ thread.push_acp_user_block(id, [block], path_style, cx);
+ anyhow::Ok(())
+ })??;
+ }
+ context_server::types::Role::Assistant => {
+ acp_thread.update(cx, |acp_thread, cx| {
+ acp_thread.push_assistant_content_block_with_indent(
+ block.clone(),
+ false,
+ true,
+ cx,
+ );
+ anyhow::Ok(())
+ })??;
+
+ thread.update(cx, |thread, cx| {
+ thread.push_acp_agent_block(block, cx);
+ anyhow::Ok(())
+ })??;
+ }
+ }
+
+ last_is_user = role == context_server::types::Role::User;
+ }
+
+ let response_stream = thread.update(cx, |thread, cx| {
+ if last_is_user {
+ thread.send_existing(cx)
+ } else {
+ // Resume if MCP prompt did not end with a user message
+ thread.resume(cx)
+ }
+ })??;
+
+ cx.update(|cx| {
+ NativeAgentConnection::handle_thread_events(response_stream, acp_thread, cx)
+ })?
+ .await
+ })
+ }
}
/// Wrapper struct that implements the AgentConnection trait
@@ -789,28 +979,12 @@ impl NativeAgentConnection {
}
ThreadEvent::AgentText(text) => {
acp_thread.update(cx, |thread, cx| {
- thread.push_assistant_content_block(
- acp::ContentBlock::Text(acp::TextContent {
- text,
- annotations: None,
- meta: None,
- }),
- false,
- cx,
- )
+ thread.push_assistant_content_block(text.into(), false, cx)
})?;
}
ThreadEvent::AgentThinking(text) => {
acp_thread.update(cx, |thread, cx| {
- thread.push_assistant_content_block(
- acp::ContentBlock::Text(acp::TextContent {
- text,
- annotations: None,
- meta: None,
- }),
- true,
- cx,
- )
+ thread.push_assistant_content_block(text.into(), true, cx)
})?;
}
ThreadEvent::ToolCallAuthorization(ToolCallAuthorization {
@@ -824,8 +998,9 @@ impl NativeAgentConnection {
)
})??;
cx.background_spawn(async move {
- if let acp::RequestPermissionOutcome::Selected { option_id } =
- outcome_task.await
+ if let acp::RequestPermissionOutcome::Selected(
+ acp::SelectedPermissionOutcome { option_id, .. },
+ ) = outcome_task.await
{
response
.send(option_id)
@@ -852,10 +1027,7 @@ impl NativeAgentConnection {
}
ThreadEvent::Stop(stop_reason) => {
log::debug!("Assistant message complete: {:?}", stop_reason);
- return Ok(acp::PromptResponse {
- stop_reason,
- meta: None,
- });
+ return Ok(acp::PromptResponse::new(stop_reason));
}
}
}
@@ -867,14 +1039,44 @@ impl NativeAgentConnection {
}
log::debug!("Response stream completed");
- anyhow::Ok(acp::PromptResponse {
- stop_reason: acp::StopReason::EndTurn,
- meta: None,
- })
+ anyhow::Ok(acp::PromptResponse::new(acp::StopReason::EndTurn))
})
}
}
+struct Command<'a> {
+ prompt_name: &'a str,
+ arg_value: &'a str,
+ explicit_server_id: Option<&'a str>,
+}
+
+impl<'a> Command<'a> {
+ fn parse(prompt: &'a [acp::ContentBlock]) -> Option {
+ let acp::ContentBlock::Text(text_content) = prompt.first()? else {
+ return None;
+ };
+ let text = text_content.text.trim();
+ let command = text.strip_prefix('/')?;
+ let (command, arg_value) = command
+ .split_once(char::is_whitespace)
+ .unwrap_or((command, ""));
+
+ if let Some((server_id, prompt_name)) = command.split_once('.') {
+ Some(Self {
+ prompt_name,
+ arg_value,
+ explicit_server_id: Some(server_id),
+ })
+ } else {
+ Some(Self {
+ prompt_name: command,
+ arg_value,
+ explicit_server_id: None,
+ })
+ }
+ }
+}
+
struct NativeAgentModelSelector {
session_id: acp::SessionId,
connection: NativeAgentConnection,
@@ -965,11 +1167,15 @@ impl acp_thread::AgentModelSelector for NativeAgentModelSelector {
fn should_render_footer(&self) -> bool {
true
}
+
+ fn supports_favorites(&self) -> bool {
+ true
+ }
}
impl acp_thread::AgentConnection for NativeAgentConnection {
- fn telemetry_id(&self) -> &'static str {
- "zed"
+ fn telemetry_id(&self) -> SharedString {
+ "zed".into()
}
fn new_thread(
@@ -1040,6 +1246,47 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
let session_id = params.session_id.clone();
log::info!("Received prompt request for session: {}", session_id);
log::debug!("Prompt blocks count: {}", params.prompt.len());
+
+ if let Some(parsed_command) = Command::parse(¶ms.prompt) {
+ let registry = self.0.read(cx).context_server_registry.read(cx);
+
+ let explicit_server_id = parsed_command
+ .explicit_server_id
+ .map(|server_id| ContextServerId(server_id.into()));
+
+ if let Some(prompt) =
+ registry.find_prompt(explicit_server_id.as_ref(), parsed_command.prompt_name)
+ {
+ let arguments = if !parsed_command.arg_value.is_empty()
+ && let Some(arg_name) = prompt
+ .prompt
+ .arguments
+ .as_ref()
+ .and_then(|args| args.first())
+ .map(|arg| arg.name.clone())
+ {
+ HashMap::from_iter([(arg_name, parsed_command.arg_value.to_string())])
+ } else {
+ Default::default()
+ };
+
+ let prompt_name = prompt.prompt.name.clone();
+ let server_id = prompt.server_id.clone();
+
+ return self.0.update(cx, |agent, cx| {
+ agent.send_mcp_prompt(
+ id,
+ session_id.clone(),
+ prompt_name,
+ server_id,
+ arguments,
+ params.prompt,
+ cx,
+ )
+ });
+ };
+ };
+
let path_style = self.0.read(cx).project.read(cx).path_style(cx);
self.run_turn(session_id, cx, move |thread, cx| {
@@ -1240,6 +1487,15 @@ impl TerminalHandle for AcpTerminalHandle {
self.terminal
.read_with(cx, |term, cx| term.current_output(cx))
}
+
+ fn kill(&self, cx: &AsyncApp) -> Result<()> {
+ cx.update(|cx| {
+ self.terminal.update(cx, |terminal, cx| {
+ terminal.kill(cx);
+ });
+ })?;
+ Ok(())
+ }
}
#[cfg(test)]
@@ -1374,10 +1630,12 @@ mod internal_tests {
IndexMap::from_iter([(
AgentModelGroupName("Fake".into()),
vec![AgentModelInfo {
- id: acp::ModelId("fake/fake".into()),
+ id: acp::ModelId::new("fake/fake"),
name: "Fake".into(),
description: None,
- icon: Some(ui::IconName::ZedAssistant),
+ icon: Some(acp_thread::AgentModelIcon::Named(
+ ui::IconName::ZedAssistant
+ )),
}]
)])
);
@@ -1435,7 +1693,7 @@ mod internal_tests {
// Select a model
let selector = connection.model_selector(&session_id).unwrap();
- let model_id = acp::ModelId("fake/fake".into());
+ let model_id = acp::ModelId::new("fake/fake");
cx.update(|cx| selector.select_model(model_id.clone(), cx))
.await
.unwrap();
@@ -1521,20 +1779,14 @@ mod internal_tests {
thread.send(
vec![
"What does ".into(),
- acp::ContentBlock::ResourceLink(acp::ResourceLink {
- name: "b.md".into(),
- uri: MentionUri::File {
+ acp::ContentBlock::ResourceLink(acp::ResourceLink::new(
+ "b.md",
+ MentionUri::File {
abs_path: path!("/a/b.md").into(),
}
.to_uri()
.to_string(),
- annotations: None,
- description: None,
- mime_type: None,
- size: None,
- title: None,
- meta: None,
- }),
+ )),
" mean?".into(),
],
cx,
@@ -1633,3 +1885,35 @@ mod internal_tests {
});
}
}
+
+fn mcp_message_content_to_acp_content_block(
+ content: context_server::types::MessageContent,
+) -> acp::ContentBlock {
+ match content {
+ context_server::types::MessageContent::Text {
+ text,
+ annotations: _,
+ } => text.into(),
+ context_server::types::MessageContent::Image {
+ data,
+ mime_type,
+ annotations: _,
+ } => acp::ContentBlock::Image(acp::ImageContent::new(data, mime_type)),
+ context_server::types::MessageContent::Audio {
+ data,
+ mime_type,
+ annotations: _,
+ } => acp::ContentBlock::Audio(acp::AudioContent::new(data, mime_type)),
+ context_server::types::MessageContent::Resource {
+ resource,
+ annotations: _,
+ } => {
+ let mut link =
+ acp::ResourceLink::new(resource.uri.to_string(), resource.uri.to_string());
+ if let Some(mime_type) = resource.mime_type {
+ link = link.mime_type(mime_type);
+ }
+ acp::ContentBlock::ResourceLink(link)
+ }
+ }
+}
diff --git a/crates/agent/src/db.rs b/crates/agent/src/db.rs
index 6b6312e48176c93fbfb12f97e26c7943c6cbf89a..7a88c5870574cae424bd1fff50f1d20cdb00fa44 100644
--- a/crates/agent/src/db.rs
+++ b/crates/agent/src/db.rs
@@ -366,7 +366,7 @@ impl ThreadsDatabase {
for (id, summary, updated_at) in rows {
threads.push(DbThreadMetadata {
- id: acp::SessionId(id),
+ id: acp::SessionId::new(id),
title: summary.into(),
updated_at: DateTime::parse_from_rfc3339(&updated_at)?.with_timezone(&Utc),
});
@@ -424,4 +424,20 @@ impl ThreadsDatabase {
Ok(())
})
}
+
+ pub fn delete_threads(&self) -> Task> {
+ let connection = self.connection.clone();
+
+ self.executor.spawn(async move {
+ let connection = connection.lock();
+
+ let mut delete = connection.exec_bound::<()>(indoc! {"
+ DELETE FROM threads
+ "})?;
+
+ delete(())?;
+
+ Ok(())
+ })
+ }
}
diff --git a/crates/agent/src/edit_agent.rs b/crates/agent/src/edit_agent.rs
index e5b1d1e3871ecb0070f60f5f382196482e24963a..5ea04729a49afae944c5e7ca88ad67791e18b6f3 100644
--- a/crates/agent/src/edit_agent.rs
+++ b/crates/agent/src/edit_agent.rs
@@ -172,14 +172,14 @@ impl EditAgent {
project.set_agent_location(
Some(AgentLocation {
buffer: buffer.downgrade(),
- position: language::Anchor::MAX,
+ position: language::Anchor::max_for_buffer(buffer.read(cx).remote_id()),
}),
cx,
)
});
output_events_tx
.unbounded_send(EditAgentOutputEvent::Edited(
- language::Anchor::MIN..language::Anchor::MAX,
+ Anchor::min_max_range_for_buffer(buffer.read(cx).remote_id()),
))
.ok();
})?;
@@ -187,7 +187,7 @@ impl EditAgent {
while let Some(event) = parse_rx.next().await {
match event? {
CreateFileParserEvent::NewTextChunk { chunk } => {
- cx.update(|cx| {
+ let buffer_id = cx.update(|cx| {
buffer.update(cx, |buffer, cx| buffer.append(chunk, cx));
self.action_log
.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
@@ -195,15 +195,18 @@ impl EditAgent {
project.set_agent_location(
Some(AgentLocation {
buffer: buffer.downgrade(),
- position: language::Anchor::MAX,
+ position: language::Anchor::max_for_buffer(
+ buffer.read(cx).remote_id(),
+ ),
}),
cx,
)
});
+ buffer.read(cx).remote_id()
})?;
output_events_tx
.unbounded_send(EditAgentOutputEvent::Edited(
- language::Anchor::MIN..language::Anchor::MAX,
+ Anchor::min_max_range_for_buffer(buffer_id),
))
.ok();
}
@@ -1200,7 +1203,9 @@ mod tests {
project.read_with(cx, |project, _| project.agent_location()),
Some(AgentLocation {
buffer: buffer.downgrade(),
- position: language::Anchor::MAX
+ position: language::Anchor::max_for_buffer(
+ cx.update(|cx| buffer.read(cx).remote_id())
+ ),
})
);
@@ -1218,7 +1223,9 @@ mod tests {
project.read_with(cx, |project, _| project.agent_location()),
Some(AgentLocation {
buffer: buffer.downgrade(),
- position: language::Anchor::MAX
+ position: language::Anchor::max_for_buffer(
+ cx.update(|cx| buffer.read(cx).remote_id())
+ ),
})
);
@@ -1236,7 +1243,9 @@ mod tests {
project.read_with(cx, |project, _| project.agent_location()),
Some(AgentLocation {
buffer: buffer.downgrade(),
- position: language::Anchor::MAX
+ position: language::Anchor::max_for_buffer(
+ cx.update(|cx| buffer.read(cx).remote_id())
+ ),
})
);
@@ -1254,7 +1263,9 @@ mod tests {
project.read_with(cx, |project, _| project.agent_location()),
Some(AgentLocation {
buffer: buffer.downgrade(),
- position: language::Anchor::MAX
+ position: language::Anchor::max_for_buffer(
+ cx.update(|cx| buffer.read(cx).remote_id())
+ ),
})
);
@@ -1269,7 +1280,9 @@ mod tests {
project.read_with(cx, |project, _| project.agent_location()),
Some(AgentLocation {
buffer: buffer.downgrade(),
- position: language::Anchor::MAX
+ position: language::Anchor::max_for_buffer(
+ cx.update(|cx| buffer.read(cx).remote_id())
+ ),
})
);
}
diff --git a/crates/agent/src/edit_agent/evals.rs b/crates/agent/src/edit_agent/evals.rs
index 81dce33d0394b5757be4934031f31b6f17233e9c..01c81e0103a2d3624c7e8eb9b9c587726fcc4876 100644
--- a/crates/agent/src/edit_agent/evals.rs
+++ b/crates/agent/src/edit_agent/evals.rs
@@ -4,7 +4,7 @@ use crate::{
};
use Role::*;
use client::{Client, UserStore};
-use collections::HashMap;
+use eval_utils::{EvalOutput, EvalOutputProcessor, OutcomeKind};
use fs::FakeFs;
use futures::{FutureExt, future::LocalBoxFuture};
use gpui::{AppContext, TestAppContext, Timer};
@@ -20,16 +20,62 @@ use rand::prelude::*;
use reqwest_client::ReqwestClient;
use serde_json::json;
use std::{
- cmp::Reverse,
fmt::{self, Display},
- io::Write as _,
path::Path,
str::FromStr,
- sync::mpsc,
time::Duration,
};
use util::path;
+#[derive(Default, Clone, Debug)]
+struct EditAgentOutputProcessor {
+ mismatched_tag_threshold: f32,
+ cumulative_tags: usize,
+ cumulative_mismatched_tags: usize,
+ eval_outputs: Vec>,
+}
+
+fn mismatched_tag_threshold(mismatched_tag_threshold: f32) -> EditAgentOutputProcessor {
+ EditAgentOutputProcessor {
+ mismatched_tag_threshold,
+ cumulative_tags: 0,
+ cumulative_mismatched_tags: 0,
+ eval_outputs: Vec::new(),
+ }
+}
+
+#[derive(Clone, Debug)]
+struct EditEvalMetadata {
+ tags: usize,
+ mismatched_tags: usize,
+}
+
+impl EvalOutputProcessor for EditAgentOutputProcessor {
+ type Metadata = EditEvalMetadata;
+
+ fn process(&mut self, output: &EvalOutput) {
+ if matches!(output.outcome, OutcomeKind::Passed | OutcomeKind::Failed) {
+ self.cumulative_mismatched_tags += output.metadata.mismatched_tags;
+ self.cumulative_tags += output.metadata.tags;
+ self.eval_outputs.push(output.clone());
+ }
+ }
+
+ fn assert(&mut self) {
+ let mismatched_tag_ratio =
+ self.cumulative_mismatched_tags as f32 / self.cumulative_tags as f32;
+ if mismatched_tag_ratio > self.mismatched_tag_threshold {
+ for eval_output in &self.eval_outputs {
+ println!("{}", eval_output.data);
+ }
+ panic!(
+ "Too many mismatched tags: {:?}",
+ self.cumulative_mismatched_tags
+ );
+ }
+ }
+}
+
#[test]
#[cfg_attr(not(feature = "unit-eval"), ignore)]
fn eval_extract_handle_command_output() {
@@ -55,22 +101,19 @@ fn eval_extract_handle_command_output() {
include_str!("evals/fixtures/extract_handle_command_output/possible-07.diff"),
];
let edit_description = "Extract `handle_command_output` method from `run_git_blame`.";
- eval(
- 100,
- 0.95,
- 0.05,
- EvalInput::from_conversation(
+ eval_utils::eval(100, 0.95, mismatched_tag_threshold(0.05), move || {
+ run_eval(EvalInput::from_conversation(
vec![
message(
User,
[text(formatdoc! {"
- Read the `{input_file_path}` file and extract a method in
- the final stanza of `run_git_blame` to deal with command failures,
- call it `handle_command_output` and take the std::process::Output as the only parameter.
- Do not document the method and do not add any comments.
+ Read the `{input_file_path}` file and extract a method in
+ the final stanza of `run_git_blame` to deal with command failures,
+ call it `handle_command_output` and take the std::process::Output as the only parameter.
+ Do not document the method and do not add any comments.
- Add it right next to `run_git_blame` and copy it verbatim from `run_git_blame`.
- "})],
+ Add it right next to `run_git_blame` and copy it verbatim from `run_git_blame`.
+ "})],
),
message(
Assistant,
@@ -102,9 +145,9 @@ fn eval_extract_handle_command_output() {
),
],
Some(input_file_content.into()),
- EvalAssertion::assert_diff_any(possible_diffs),
- ),
- );
+ EvalAssertion::assert_diff_any(possible_diffs.clone()),
+ ))
+ });
}
#[test]
@@ -122,18 +165,16 @@ fn eval_delete_run_git_blame() {
let input_file_content = include_str!("evals/fixtures/delete_run_git_blame/before.rs");
let output_file_content = include_str!("evals/fixtures/delete_run_git_blame/after.rs");
let edit_description = "Delete the `run_git_blame` function.";
- eval(
- 100,
- 0.95,
- 0.05,
- EvalInput::from_conversation(
+
+ eval_utils::eval(100, 0.95, mismatched_tag_threshold(0.05), move || {
+ run_eval(EvalInput::from_conversation(
vec![
message(
User,
[text(formatdoc! {"
- Read the `{input_file_path}` file and delete `run_git_blame`. Just that
- one function, not its usages.
- "})],
+ Read the `{input_file_path}` file and delete `run_git_blame`. Just that
+ one function, not its usages.
+ "})],
),
message(
Assistant,
@@ -166,8 +207,8 @@ fn eval_delete_run_git_blame() {
],
Some(input_file_content.into()),
EvalAssertion::assert_eq(output_file_content),
- ),
- );
+ ))
+ });
}
#[test]
@@ -185,18 +226,16 @@ fn eval_translate_doc_comments() {
let input_file_path = "root/canvas.rs";
let input_file_content = include_str!("evals/fixtures/translate_doc_comments/before.rs");
let edit_description = "Translate all doc comments to Italian";
- eval(
- 200,
- 1.,
- 0.05,
- EvalInput::from_conversation(
+
+ eval_utils::eval(200, 1., mismatched_tag_threshold(0.05), move || {
+ run_eval(EvalInput::from_conversation(
vec![
message(
User,
[text(formatdoc! {"
- Read the {input_file_path} file and edit it (without overwriting it),
- translating all the doc comments to italian.
- "})],
+ Read the {input_file_path} file and edit it (without overwriting it),
+ translating all the doc comments to italian.
+ "})],
),
message(
Assistant,
@@ -229,8 +268,8 @@ fn eval_translate_doc_comments() {
],
Some(input_file_content.into()),
EvalAssertion::judge_diff("Doc comments were translated to Italian"),
- ),
- );
+ ))
+ });
}
#[test]
@@ -249,33 +288,31 @@ fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
let input_file_content =
include_str!("evals/fixtures/use_wasi_sdk_in_compile_parser_to_wasm/before.rs");
let edit_description = "Update compile_parser_to_wasm to use wasi-sdk instead of emscripten";
- eval(
- 100,
- 0.95,
- 0.05,
- EvalInput::from_conversation(
+
+ eval_utils::eval(100, 0.95, mismatched_tag_threshold(0.05), move || {
+ run_eval(EvalInput::from_conversation(
vec![
message(
User,
[text(formatdoc! {"
- Read the `{input_file_path}` file and change `compile_parser_to_wasm` to use `wasi-sdk` instead of emscripten.
- Use `ureq` to download the SDK for the current platform and architecture.
- Extract the archive into a sibling of `lib` inside the `tree-sitter` directory in the cache_dir.
- Compile the parser to wasm using the `bin/clang` executable (or `bin/clang.exe` on windows)
- that's inside of the archive.
- Don't re-download the SDK if that executable already exists.
-
- Use these clang flags: -fPIC -shared -Os -Wl,--export=tree_sitter_{{language_name}}
-
- Here are the available wasi-sdk assets:
- - wasi-sdk-25.0-x86_64-macos.tar.gz
- - wasi-sdk-25.0-arm64-macos.tar.gz
- - wasi-sdk-25.0-x86_64-linux.tar.gz
- - wasi-sdk-25.0-arm64-linux.tar.gz
- - wasi-sdk-25.0-x86_64-linux.tar.gz
- - wasi-sdk-25.0-arm64-linux.tar.gz
- - wasi-sdk-25.0-x86_64-windows.tar.gz
- "})],
+ Read the `{input_file_path}` file and change `compile_parser_to_wasm` to use `wasi-sdk` instead of emscripten.
+ Use `ureq` to download the SDK for the current platform and architecture.
+ Extract the archive into a sibling of `lib` inside the `tree-sitter` directory in the cache_dir.
+ Compile the parser to wasm using the `bin/clang` executable (or `bin/clang.exe` on windows)
+ that's inside of the archive.
+ Don't re-download the SDK if that executable already exists.
+
+ Use these clang flags: -fPIC -shared -Os -Wl,--export=tree_sitter_{{language_name}}
+
+ Here are the available wasi-sdk assets:
+ - wasi-sdk-25.0-x86_64-macos.tar.gz
+ - wasi-sdk-25.0-arm64-macos.tar.gz
+ - wasi-sdk-25.0-x86_64-linux.tar.gz
+ - wasi-sdk-25.0-arm64-linux.tar.gz
+ - wasi-sdk-25.0-x86_64-linux.tar.gz
+ - wasi-sdk-25.0-arm64-linux.tar.gz
+ - wasi-sdk-25.0-x86_64-windows.tar.gz
+ "})],
),
message(
Assistant,
@@ -352,11 +389,11 @@ fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
],
Some(input_file_content.into()),
EvalAssertion::judge_diff(indoc! {"
- - The compile_parser_to_wasm method has been changed to use wasi-sdk
- - ureq is used to download the SDK for current platform and architecture
- "}),
- ),
- );
+ - The compile_parser_to_wasm method has been changed to use wasi-sdk
+ - ureq is used to download the SDK for current platform and architecture
+ "}),
+ ))
+ });
}
#[test]
@@ -380,11 +417,8 @@ fn eval_disable_cursor_blinking() {
include_str!("evals/fixtures/disable_cursor_blinking/possible-03.diff"),
include_str!("evals/fixtures/disable_cursor_blinking/possible-04.diff"),
];
- eval(
- 100,
- 0.51,
- 0.05,
- EvalInput::from_conversation(
+ eval_utils::eval(100, 0.51, mismatched_tag_threshold(0.05), move || {
+ run_eval(EvalInput::from_conversation(
vec![
message(User, [text("Let's research how to cursor blinking works.")]),
message(
@@ -421,10 +455,10 @@ fn eval_disable_cursor_blinking() {
message(
User,
[text(indoc! {"
- Comment out the lines that interact with the BlinkManager.
- Keep the outer `update` blocks, but comments everything that's inside (including if statements).
- Don't add additional comments.
- "})],
+ Comment out the lines that interact with the BlinkManager.
+ Keep the outer `update` blocks, but comments everything that's inside (including if statements).
+ Don't add additional comments.
+ "})],
),
message(
Assistant,
@@ -440,9 +474,9 @@ fn eval_disable_cursor_blinking() {
),
],
Some(input_file_content.into()),
- EvalAssertion::assert_diff_any(possible_diffs),
- ),
- );
+ EvalAssertion::assert_diff_any(possible_diffs.clone()),
+ ))
+ });
}
#[test]
@@ -467,20 +501,16 @@ fn eval_from_pixels_constructor() {
let input_file_path = "root/canvas.rs";
let input_file_content = include_str!("evals/fixtures/from_pixels_constructor/before.rs");
let edit_description = "Implement from_pixels constructor and add tests.";
- eval(
- 100,
- 0.95,
- // For whatever reason, this eval produces more mismatched tags.
- // Increasing for now, let's see if we can bring this down.
- 0.25,
- EvalInput::from_conversation(
+
+ eval_utils::eval(100, 0.95, mismatched_tag_threshold(0.25), move || {
+ run_eval(EvalInput::from_conversation(
vec![
message(
User,
[text(indoc! {"
- Introduce a new `from_pixels` constructor in Canvas and
- also add tests for it in the same file.
- "})],
+ Introduce a new `from_pixels` constructor in Canvas and
+ also add tests for it in the same file.
+ "})],
),
message(
Assistant,
@@ -545,92 +575,92 @@ fn eval_from_pixels_constructor() {
"tool_4",
"grep",
indoc! {"
- Found 6 matches:
+ Found 6 matches:
- ## Matches in font-kit/src/loaders/core_text.rs
+ ## Matches in font-kit/src/loaders/core_text.rs
- ### mod test › L926-936
- ```
- mod test {
- use super::Font;
- use crate::properties::{Stretch, Weight};
+ ### mod test › L926-936
+ ```
+ mod test {
+ use super::Font;
+ use crate::properties::{Stretch, Weight};
- #[cfg(feature = \"source\")]
- use crate::source::SystemSource;
+ #[cfg(feature = \"source\")]
+ use crate::source::SystemSource;
- static TEST_FONT_POSTSCRIPT_NAME: &'static str = \"ArialMT\";
+ static TEST_FONT_POSTSCRIPT_NAME: &'static str = \"ArialMT\";
- #[cfg(feature = \"source\")]
- #[test]
- ```
+ #[cfg(feature = \"source\")]
+ #[test]
+ ```
- 55 lines remaining in ancestor node. Read the file to see all.
+ 55 lines remaining in ancestor node. Read the file to see all.
- ### mod test › L947-951
- ```
- }
+ ### mod test › L947-951
+ ```
+ }
- #[test]
- fn test_core_text_to_css_font_weight() {
- // Exact matches
- ```
+ #[test]
+ fn test_core_text_to_css_font_weight() {
+ // Exact matches
+ ```
- ### mod test › L959-963
- ```
- }
+ ### mod test › L959-963
+ ```
+ }
- #[test]
- fn test_core_text_to_css_font_stretch() {
- // Exact matches
- ```
+ #[test]
+ fn test_core_text_to_css_font_stretch() {
+ // Exact matches
+ ```
- ## Matches in font-kit/src/loaders/freetype.rs
+ ## Matches in font-kit/src/loaders/freetype.rs
- ### mod test › L1238-1248
- ```
- mod test {
- use crate::loaders::freetype::Font;
+ ### mod test › L1238-1248
+ ```
+ mod test {
+ use crate::loaders::freetype::Font;
- static PCF_FONT_PATH: &str = \"resources/tests/times-roman-pcf/timR12.pcf\";
- static PCF_FONT_POSTSCRIPT_NAME: &str = \"Times-Roman\";
+ static PCF_FONT_PATH: &str = \"resources/tests/times-roman-pcf/timR12.pcf\";
+ static PCF_FONT_POSTSCRIPT_NAME: &str = \"Times-Roman\";
- #[test]
- fn get_pcf_postscript_name() {
- let font = Font::from_path(PCF_FONT_PATH, 0).unwrap();
- assert_eq!(font.postscript_name().unwrap(), PCF_FONT_POSTSCRIPT_NAME);
- }
- ```
+ #[test]
+ fn get_pcf_postscript_name() {
+ let font = Font::from_path(PCF_FONT_PATH, 0).unwrap();
+ assert_eq!(font.postscript_name().unwrap(), PCF_FONT_POSTSCRIPT_NAME);
+ }
+ ```
- 1 lines remaining in ancestor node. Read the file to see all.
+ 1 lines remaining in ancestor node. Read the file to see all.
- ## Matches in font-kit/src/sources/core_text.rs
+ ## Matches in font-kit/src/sources/core_text.rs
- ### mod test › L265-275
- ```
- mod test {
- use crate::properties::{Stretch, Weight};
+ ### mod test › L265-275
+ ```
+ mod test {
+ use crate::properties::{Stretch, Weight};
- #[test]
- fn test_css_to_core_text_font_weight() {
- // Exact matches
- assert_eq!(super::css_to_core_text_font_weight(Weight(100.0)), -0.7);
- assert_eq!(super::css_to_core_text_font_weight(Weight(400.0)), 0.0);
- assert_eq!(super::css_to_core_text_font_weight(Weight(700.0)), 0.4);
- assert_eq!(super::css_to_core_text_font_weight(Weight(900.0)), 0.8);
+ #[test]
+ fn test_css_to_core_text_font_weight() {
+ // Exact matches
+ assert_eq!(super::css_to_core_text_font_weight(Weight(100.0)), -0.7);
+ assert_eq!(super::css_to_core_text_font_weight(Weight(400.0)), 0.0);
+ assert_eq!(super::css_to_core_text_font_weight(Weight(700.0)), 0.4);
+ assert_eq!(super::css_to_core_text_font_weight(Weight(900.0)), 0.8);
- ```
+ ```
- 27 lines remaining in ancestor node. Read the file to see all.
+ 27 lines remaining in ancestor node. Read the file to see all.
- ### mod test › L278-282
- ```
- }
+ ### mod test › L278-282
+ ```
+ }
- #[test]
- fn test_css_to_core_text_font_stretch() {
- // Exact matches
- ```
- "},
+ #[test]
+ fn test_css_to_core_text_font_stretch() {
+ // Exact matches
+ ```
+ "},
)],
),
message(
@@ -648,11 +678,11 @@ fn eval_from_pixels_constructor() {
],
Some(input_file_content.into()),
EvalAssertion::judge_diff(indoc! {"
- - The diff contains a new `from_pixels` constructor
- - The diff contains new tests for the `from_pixels` constructor
- "}),
- ),
- );
+ - The diff contains a new `from_pixels` constructor
+ - The diff contains new tests for the `from_pixels` constructor
+ "}),
+ ))
+ });
}
#[test]
@@ -670,11 +700,9 @@ fn eval_zode() {
let input_file_path = "root/zode.py";
let input_content = None;
let edit_description = "Create the main Zode CLI script";
- eval(
- 50,
- 1.,
- 0.05,
- EvalInput::from_conversation(
+
+ eval_utils::eval(50, 1., mismatched_tag_threshold(0.05), move || {
+ run_eval(EvalInput::from_conversation(
vec![
message(User, [text(include_str!("evals/fixtures/zode/prompt.md"))]),
message(
@@ -733,7 +761,7 @@ fn eval_zode() {
],
),
],
- input_content,
+ input_content.clone(),
EvalAssertion::new(async move |sample, _, _cx| {
let invalid_starts = [' ', '`', '\n'];
let mut message = String::new();
@@ -758,8 +786,8 @@ fn eval_zode() {
})
}
}),
- ),
- );
+ ))
+ });
}
#[test]
@@ -777,19 +805,17 @@ fn eval_add_overwrite_test() {
let input_file_path = "root/action_log.rs";
let input_file_content = include_str!("evals/fixtures/add_overwrite_test/before.rs");
let edit_description = "Add a new test for overwriting a file in action_log.rs";
- eval(
- 200,
- 0.5, // TODO: make this eval better
- 0.05,
- EvalInput::from_conversation(
+
+ eval_utils::eval(200, 0.5, mismatched_tag_threshold(0.05), move || {
+ run_eval(EvalInput::from_conversation(
vec![
message(
User,
[text(indoc! {"
- Introduce a new test in `action_log.rs` to test overwriting a file.
- That is, a file already exists, but we call `buffer_created` as if the file were new.
- Take inspiration from all the other tests in the file.
- "})],
+ Introduce a new test in `action_log.rs` to test overwriting a file.
+ That is, a file already exists, but we call `buffer_created` as if the file were new.
+ Take inspiration from all the other tests in the file.
+ "})],
),
message(
Assistant,
@@ -809,81 +835,81 @@ fn eval_add_overwrite_test() {
"tool_1",
"read_file",
indoc! {"
- pub struct ActionLog [L13-20]
- tracked_buffers [L15]
- edited_since_project_diagnostics_check [L17]
- project [L19]
- impl ActionLog [L22-498]
- pub fn new [L24-30]
- pub fn project [L32-34]
- pub fn checked_project_diagnostics [L37-39]
- pub fn has_edited_files_since_project_diagnostics_check [L42-44]
- fn track_buffer_internal [L46-101]
- fn handle_buffer_event [L103-116]
- fn handle_buffer_edited [L118-123]
- fn handle_buffer_file_changed [L125-158]
- async fn maintain_diff [L160-264]
- pub fn buffer_read [L267-269]
- pub fn buffer_created [L272-276]
- pub fn buffer_edited [L279-287]
- pub fn will_delete_buffer [L289-304]
- pub fn keep_edits_in_range [L306-364]
- pub fn reject_edits_in_ranges [L366-459]
- pub fn keep_all_edits [L461-473]
- pub fn changed_buffers [L476-482]
- pub fn stale_buffers [L485-497]
- fn apply_non_conflicting_edits [L500-561]
- fn diff_snapshots [L563-585]
- fn point_to_row_edit [L587-614]
- enum ChangeAuthor [L617-620]
- User [L618]
- Agent [L619]
- enum TrackedBufferStatus [L623-627]
- Created [L624]
- Modified [L625]
- Deleted [L626]
- struct TrackedBuffer [L629-641]
- buffer [L630]
- base_text [L631]
- unreviewed_changes [L632]
- status [L633]
- version [L634]
- diff [L635]
- snapshot [L636]
- diff_update [L637]
- _open_lsp_handle [L638]
- _maintain_diff [L639]
- _subscription [L640]
- impl TrackedBuffer [L643-657]
- fn has_changes [L644-650]
- fn schedule_diff_update [L652-656]
- pub struct ChangedBuffer [L659-661]
- pub diff [L660]
- mod tests [L664-1574]
- fn init_logger [L678-682]
- fn init_test [L684-691]
- async fn test_keep_edits [L694-769]
- async fn test_deletions [L772-854]
- async fn test_overlapping_user_edits [L857-951]
- async fn test_creating_files [L954-1010]
- async fn test_deleting_files [L1013-1120]
- async fn test_reject_edits [L1123-1255]
- async fn test_reject_multiple_edits [L1258-1331]
- async fn test_reject_deleted_file [L1334-1388]
- async fn test_reject_created_file [L1391-1443]
- async fn test_random_diffs [L1446-1535]
- fn quiesce [L1510-1534]
- struct HunkStatus [L1538-1542]
- range [L1539]
- diff_status [L1540]
- old_text [L1541]
- fn unreviewed_hunks [L1544-1573]
-
- Showing symbols 1-69 (total symbols: 69)
-
- Using the line numbers in this outline, you can call this tool again while specifying
- the start_line and end_line fields to see the implementations of symbols in the outline.
- "},
+ pub struct ActionLog [L13-20]
+ tracked_buffers [L15]
+ edited_since_project_diagnostics_check [L17]
+ project [L19]
+ impl ActionLog [L22-498]
+ pub fn new [L24-30]
+ pub fn project [L32-34]
+ pub fn checked_project_diagnostics [L37-39]
+ pub fn has_edited_files_since_project_diagnostics_check [L42-44]
+ fn track_buffer_internal [L46-101]
+ fn handle_buffer_event [L103-116]
+ fn handle_buffer_edited [L118-123]
+ fn handle_buffer_file_changed [L125-158]
+ async fn maintain_diff [L160-264]
+ pub fn buffer_read [L267-269]
+ pub fn buffer_created [L272-276]
+ pub fn buffer_edited [L279-287]
+ pub fn will_delete_buffer [L289-304]
+ pub fn keep_edits_in_range [L306-364]
+ pub fn reject_edits_in_ranges [L366-459]
+ pub fn keep_all_edits [L461-473]
+ pub fn changed_buffers [L476-482]
+ pub fn stale_buffers [L485-497]
+ fn apply_non_conflicting_edits [L500-561]
+ fn diff_snapshots [L563-585]
+ fn point_to_row_edit [L587-614]
+ enum ChangeAuthor [L617-620]
+ User [L618]
+ Agent [L619]
+ enum TrackedBufferStatus [L623-627]
+ Created [L624]
+ Modified [L625]
+ Deleted [L626]
+ struct TrackedBuffer [L629-641]
+ buffer [L630]
+ base_text [L631]
+ unreviewed_changes [L632]
+ status [L633]
+ version [L634]
+ diff [L635]
+ snapshot [L636]
+ diff_update [L637]
+ _open_lsp_handle [L638]
+ _maintain_diff [L639]
+ _subscription [L640]
+ impl TrackedBuffer [L643-657]
+ fn has_changes [L644-650]
+ fn schedule_diff_update [L652-656]
+ pub struct ChangedBuffer [L659-661]
+ pub diff [L660]
+ mod tests [L664-1574]
+ fn init_logger [L678-682]
+ fn init_test [L684-691]
+ async fn test_keep_edits [L694-769]
+ async fn test_deletions [L772-854]
+ async fn test_overlapping_user_edits [L857-951]
+ async fn test_creating_files [L954-1010]
+ async fn test_deleting_files [L1013-1120]
+ async fn test_reject_edits [L1123-1255]
+ async fn test_reject_multiple_edits [L1258-1331]
+ async fn test_reject_deleted_file [L1334-1388]
+ async fn test_reject_created_file [L1391-1443]
+ async fn test_random_diffs [L1446-1535]
+ fn quiesce [L1510-1534]
+ struct HunkStatus [L1538-1542]
+ range [L1539]
+ diff_status [L1540]
+ old_text [L1541]
+ fn unreviewed_hunks [L1544-1573]
+
+ Showing symbols 1-69 (total symbols: 69)
+
+ Using the line numbers in this outline, you can call this tool again while specifying
+ the start_line and end_line fields to see the implementations of symbols in the outline.
+ "},
)],
),
message(
@@ -963,17 +989,17 @@ fn eval_add_overwrite_test() {
Assistant,
[
text(indoc! {"
- Based on my understanding of the existing tests and code, I'll now create a new test for overwriting a file. In this test, we'll:
+ Based on my understanding of the existing tests and code, I'll now create a new test for overwriting a file. In this test, we'll:
- 1. Create a file
- 2. Open a buffer for it
- 3. Track it in the action log
- 4. Modify the buffer
- 5. Call `buffer_created` again as if the file were new
- 6. Check that the changes are properly tracked
+ 1. Create a file
+ 2. Open a buffer for it
+ 3. Track it in the action log
+ 4. Modify the buffer
+ 5. Call `buffer_created` again as if the file were new
+ 6. Check that the changes are properly tracked
- Let's write the test:
- "}),
+ Let's write the test:
+ "}),
tool_use(
"tool_5",
"edit_file",
@@ -990,8 +1016,8 @@ fn eval_add_overwrite_test() {
EvalAssertion::judge_diff(
"A new test for overwritten files was created, without changing any previous test",
),
- ),
- );
+ ))
+ });
}
#[test]
@@ -1016,20 +1042,18 @@ fn eval_create_empty_file() {
let input_file_content = None;
let expected_output_content = String::new();
- eval(
- 100,
- 0.99,
- 0.05,
- EvalInput::from_conversation(
+
+ eval_utils::eval(100, 0.99, mismatched_tag_threshold(0.05), move || {
+ run_eval(EvalInput::from_conversation(
vec![
message(User, [text("Create a second empty todo file ")]),
message(
Assistant,
[
text(formatdoc! {"
- I'll help you create a second empty todo file.
- First, let me examine the project structure to see if there's already a todo file, which will help me determine the appropriate name and location for the second one.
- "}),
+ I'll help you create a second empty todo file.
+ First, let me examine the project structure to see if there's already a todo file, which will help me determine the appropriate name and location for the second one.
+ "}),
tool_use(
"toolu_01GAF8TtsgpjKxCr8fgQLDgR",
"list_directory",
@@ -1051,8 +1075,8 @@ fn eval_create_empty_file() {
Assistant,
[
text(formatdoc! {"
- I can see there's already a `TODO` file in the `root` directory. Let me create a second empty todo file called `TODO3` in the same directory:
- "}),
+ I can see there's already a `TODO` file in the `root` directory. Let me create a second empty todo file called `TODO3` in the same directory:
+ "}),
tool_use(
"toolu_01Tb3iQ9griqSYMmVuykQPWU",
"edit_file",
@@ -1065,12 +1089,12 @@ fn eval_create_empty_file() {
],
),
],
- input_file_content,
+ input_file_content.clone(),
// Bad behavior is to write something like
// "I'll create an empty TODO3 file as requested."
- EvalAssertion::assert_eq(expected_output_content),
- ),
- );
+ EvalAssertion::assert_eq(expected_output_content.clone()),
+ ))
+ });
}
fn message(
@@ -1312,115 +1336,45 @@ impl EvalAssertion {
}
}
-fn eval(
- iterations: usize,
- expected_pass_ratio: f32,
- mismatched_tag_threshold: f32,
- mut eval: EvalInput,
-) {
- let mut evaluated_count = 0;
- let mut failed_count = 0;
- report_progress(evaluated_count, failed_count, iterations);
-
- let (tx, rx) = mpsc::channel();
-
- // Cache the last message in the conversation, and run one instance of the eval so that
- // all the next ones are cached.
- eval.conversation.last_mut().unwrap().cache = true;
- run_eval(eval.clone(), tx.clone());
-
- let executor = gpui::background_executor();
- let semaphore = Arc::new(smol::lock::Semaphore::new(32));
- for _ in 1..iterations {
- let eval = eval.clone();
- let tx = tx.clone();
- let semaphore = semaphore.clone();
- executor
- .spawn(async move {
- let _guard = semaphore.acquire().await;
- run_eval(eval, tx)
- })
- .detach();
- }
- drop(tx);
-
- let mut failed_evals = HashMap::default();
- let mut errored_evals = HashMap::default();
- let mut eval_outputs = Vec::new();
- let mut cumulative_parser_metrics = EditParserMetrics::default();
- while let Ok(output) = rx.recv() {
- match output {
- Ok(output) => {
- cumulative_parser_metrics += output.sample.edit_output.parser_metrics.clone();
- eval_outputs.push(output.clone());
- if output.assertion.score < 80 {
- failed_count += 1;
- failed_evals
- .entry(output.sample.text_after.clone())
- .or_insert(Vec::new())
- .push(output);
- }
- }
- Err(error) => {
- failed_count += 1;
- *errored_evals.entry(format!("{:?}", error)).or_insert(0) += 1;
- }
- }
-
- evaluated_count += 1;
- report_progress(evaluated_count, failed_count, iterations);
- }
-
- let actual_pass_ratio = (iterations - failed_count) as f32 / iterations as f32;
- println!("Actual pass ratio: {}\n", actual_pass_ratio);
- if actual_pass_ratio < expected_pass_ratio {
- let mut errored_evals = errored_evals.into_iter().collect::>();
- errored_evals.sort_by_key(|(_, count)| Reverse(*count));
- for (error, count) in errored_evals {
- println!("Eval errored {} times. Error: {}", count, error);
- }
-
- let mut failed_evals = failed_evals.into_iter().collect::>();
- failed_evals.sort_by_key(|(_, evals)| Reverse(evals.len()));
- for (_buffer_output, failed_evals) in failed_evals {
- let eval_output = failed_evals.first().unwrap();
- println!("Eval failed {} times", failed_evals.len());
- println!("{}", eval_output);
- }
-
- panic!(
- "Actual pass ratio: {}\nExpected pass ratio: {}",
- actual_pass_ratio, expected_pass_ratio
- );
- }
-
- let mismatched_tag_ratio =
- cumulative_parser_metrics.mismatched_tags as f32 / cumulative_parser_metrics.tags as f32;
- if mismatched_tag_ratio > mismatched_tag_threshold {
- for eval_output in eval_outputs {
- println!("{}", eval_output);
- }
- panic!("Too many mismatched tags: {:?}", cumulative_parser_metrics);
- }
-}
-
-fn run_eval(eval: EvalInput, tx: mpsc::Sender>) {
+fn run_eval(eval: EvalInput) -> eval_utils::EvalOutput {
let dispatcher = gpui::TestDispatcher::new(StdRng::from_os_rng());
let mut cx = TestAppContext::build(dispatcher, None);
- let output = cx.executor().block_test(async {
+ let result = cx.executor().block_test(async {
let test = EditAgentTest::new(&mut cx).await;
test.eval(eval, &mut cx).await
});
- tx.send(output).unwrap();
+ cx.quit();
+ match result {
+ Ok(output) => eval_utils::EvalOutput {
+ data: output.to_string(),
+ outcome: if output.assertion.score < 80 {
+ eval_utils::OutcomeKind::Failed
+ } else {
+ eval_utils::OutcomeKind::Passed
+ },
+ metadata: EditEvalMetadata {
+ tags: output.sample.edit_output.parser_metrics.tags,
+ mismatched_tags: output.sample.edit_output.parser_metrics.mismatched_tags,
+ },
+ },
+ Err(e) => eval_utils::EvalOutput {
+ data: format!("{e:?}"),
+ outcome: eval_utils::OutcomeKind::Error,
+ metadata: EditEvalMetadata {
+ tags: 0,
+ mismatched_tags: 0,
+ },
+ },
+ }
}
#[derive(Clone)]
-struct EvalOutput {
+struct EditEvalOutput {
sample: EvalSample,
assertion: EvalAssertionOutcome,
}
-impl Display for EvalOutput {
+impl Display for EditEvalOutput {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
writeln!(f, "Score: {:?}", self.assertion.score)?;
if let Some(message) = self.assertion.message.as_ref() {
@@ -1439,22 +1393,6 @@ impl Display for EvalOutput {
}
}
-fn report_progress(evaluated_count: usize, failed_count: usize, iterations: usize) {
- let passed_count = evaluated_count - failed_count;
- let passed_ratio = if evaluated_count == 0 {
- 0.0
- } else {
- passed_count as f64 / evaluated_count as f64
- };
- print!(
- "\r\x1b[KEvaluated {}/{} ({:.2}% passed)",
- evaluated_count,
- iterations,
- passed_ratio * 100.0
- );
- std::io::stdout().flush().unwrap();
-}
-
struct EditAgentTest {
agent: EditAgent,
project: Entity,
@@ -1550,7 +1488,10 @@ impl EditAgentTest {
})
}
- async fn eval(&self, eval: EvalInput, cx: &mut TestAppContext) -> Result {
+ async fn eval(&self, mut eval: EvalInput, cx: &mut TestAppContext) -> Result {
+ // Make sure the last message in the conversation is cached.
+ eval.conversation.last_mut().unwrap().cache = true;
+
let path = self
.project
.read_with(cx, |project, cx| {
@@ -1656,7 +1597,7 @@ impl EditAgentTest {
.run(&sample, self.judge_model.clone(), cx)
.await?;
- Ok(EvalOutput { assertion, sample })
+ Ok(EditEvalOutput { assertion, sample })
}
}
diff --git a/crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md b/crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md
index 902e43857c3214cde68372f1c9ff5f8015528ae2..29755d441f7a4f74709c1ac414e2a9a73fe6ac21 100644
--- a/crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md
+++ b/crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md
@@ -2,12 +2,12 @@
- We're starting from a completely blank project
- Like Aider/Claude Code you take the user's initial prompt and then call the LLM and perform tool calls in a loop until the ultimate goal is achieved.
- Unlike Aider or Claude code, it's not intended to be interactive. Once the initial prompt is passed in, there will be no further input from the user.
-- The system you will build must reach the stated goal just by performing too calls and calling the LLM
+- The system you will build must reach the stated goal just by performing tool calls and calling the LLM
- I want you to build this in python. Use the anthropic python sdk and the model context protocol sdk. Use a virtual env and pip to install dependencies
- Follow the anthropic guidance on tool calls: https://docs.anthropic.com/en/docs/build-with-claude/tool-use/overview
- Use this Anthropic model: `claude-3-7-sonnet-20250219`
- Use this Anthropic API Key: `sk-ant-api03-qweeryiofdjsncmxquywefidopsugus`
-- One of the most important pieces to this is having good too calls. We will be using the tools provided by the Claude MCP server. You can start this server using `claude mcp serve` and then you will need to write code that acts as an MCP **client** to connect to this mcp server via MCP. Likely you want to start this using a subprocess. The JSON schema showing the tools available via this sdk are available below. Via this MCP server you have access to all the tools that zode needs: Bash, GlobTool, GrepTool, LS, View, Edit, Replace, WebFetchTool
+- One of the most important pieces to this is having good tool calls. We will be using the tools provided by the Claude MCP server. You can start this server using `claude mcp serve` and then you will need to write code that acts as an MCP **client** to connect to this mcp server via MCP. Likely you want to start this using a subprocess. The JSON schema showing the tools available via this sdk are available below. Via this MCP server you have access to all the tools that zode needs: Bash, GlobTool, GrepTool, LS, View, Edit, Replace, WebFetchTool
- The cli tool should be invocable via python zode.py file.md where file.md is any possible file that contains the users prompt. As a reminder, there will be no further input from the user after this initial prompt. Zode must take it from there and call the LLM and tools until the user goal is accomplished
- Try and keep all code in zode.py and make heavy use of the asks I mentioned
- Once you’ve implemented this, you must run python zode.py eval/instructions.md to see how well our new agent tool does!
diff --git a/crates/agent/src/history_store.rs b/crates/agent/src/history_store.rs
index 3bfbd99677feed5db53d96d2fa96316ac49abce4..c455f73316e3fc7a641fa8a31ac0ad766a2ae584 100644
--- a/crates/agent/src/history_store.rs
+++ b/crates/agent/src/history_store.rs
@@ -188,6 +188,15 @@ impl HistoryStore {
})
}
+ pub fn delete_threads(&mut self, cx: &mut Context) -> Task> {
+ let database_future = ThreadsDatabase::connect(cx);
+ cx.spawn(async move |this, cx| {
+ let database = database_future.await.map_err(|err| anyhow!(err))?;
+ database.delete_threads().await?;
+ this.update(cx, |this, cx| this.reload(cx))
+ })
+ }
+
pub fn delete_text_thread(
&mut self,
path: Arc,
@@ -207,14 +216,10 @@ impl HistoryStore {
}
pub fn reload(&self, cx: &mut Context) {
- let database_future = ThreadsDatabase::connect(cx);
+ let database_connection = ThreadsDatabase::connect(cx);
cx.spawn(async move |this, cx| {
- let threads = database_future
- .await
- .map_err(|err| anyhow!(err))?
- .list_threads()
- .await?;
-
+ let database = database_connection.await;
+ let threads = database.map_err(|err| anyhow!(err))?.list_threads().await?;
this.update(cx, |this, cx| {
if this.recently_opened_entries.len() < MAX_RECENTLY_OPENED_ENTRIES {
for thread in threads
@@ -335,7 +340,8 @@ impl HistoryStore {
fn load_recently_opened_entries(cx: &AsyncApp) -> Task>> {
cx.background_spawn(async move {
if cfg!(any(feature = "test-support", test)) {
- anyhow::bail!("history store does not persist in tests");
+ log::warn!("history store does not persist in tests");
+ return Ok(VecDeque::new());
}
let json = KEY_VALUE_STORE
.read_kvp(RECENTLY_OPENED_THREADS_KEY)?
@@ -345,9 +351,9 @@ impl HistoryStore {
.into_iter()
.take(MAX_RECENTLY_OPENED_ENTRIES)
.flat_map(|entry| match entry {
- SerializedRecentOpen::AcpThread(id) => Some(HistoryEntryId::AcpThread(
- acp::SessionId(id.as_str().into()),
- )),
+ SerializedRecentOpen::AcpThread(id) => {
+ Some(HistoryEntryId::AcpThread(acp::SessionId::new(id.as_str())))
+ }
SerializedRecentOpen::TextThread(file_name) => Some(
HistoryEntryId::TextThread(text_threads_dir().join(file_name).into()),
),
diff --git a/crates/agent/src/native_agent_server.rs b/crates/agent/src/native_agent_server.rs
index 4c78c5a3f85b6628f9784fe7ecbadc8531b017d0..a9ade8141a678329e0dd8dad9808e55eee3c382b 100644
--- a/crates/agent/src/native_agent_server.rs
+++ b/crates/agent/src/native_agent_server.rs
@@ -21,10 +21,6 @@ impl NativeAgentServer {
}
impl AgentServer for NativeAgentServer {
- fn telemetry_id(&self) -> &'static str {
- "zed"
- }
-
fn name(&self) -> SharedString {
"Zed Agent".into()
}
diff --git a/crates/agent/src/outline.rs b/crates/agent/src/outline.rs
index 40a84bc28b4402d8251e164a423a2309127c50ce..77af4849ffd19c1630331f5c755ff372cb69aeba 100644
--- a/crates/agent/src/outline.rs
+++ b/crates/agent/src/outline.rs
@@ -66,11 +66,9 @@ pub async fn get_buffer_content_or_outline(
let outline_text = render_outline(outline_items, None, 0, usize::MAX).await?;
let text = if let Some(path) = path {
- format!(
- "# File outline for {path} (file too large to show full content)\n\n{outline_text}",
- )
+ format!("# File outline for {path}\n\n{outline_text}",)
} else {
- format!("# File outline (file too large to show full content)\n\n{outline_text}",)
+ format!("# File outline\n\n{outline_text}",)
};
Ok(BufferContent {
text,
diff --git a/crates/agent/src/templates/system_prompt.hbs b/crates/agent/src/templates/system_prompt.hbs
index 4620647135631fdb367b0dc2604e89770a938c07..2477e46a85183813f61bb60d7e3de7f119a4f00c 100644
--- a/crates/agent/src/templates/system_prompt.hbs
+++ b/crates/agent/src/templates/system_prompt.hbs
@@ -16,7 +16,7 @@ You are a highly skilled software engineer with extensive knowledge in many prog
3. DO NOT use tools to access items that are already available in the context section.
4. Use only the tools that are currently available.
5. DO NOT use a tool that is not available just because it appears in the conversation. This means the user turned it off.
-6. NEVER run commands that don't terminate on their own such as web servers (like `npm run start`, `npm run dev`, `python -m http.server`, etc) or file watchers.
+6. When running commands that may run indefinitely or for a long time (such as build scripts, tests, servers, or file watchers), specify `timeout_ms` to bound runtime. If the command times out, the user can always ask you to run it again with a longer timeout or no timeout if they're willing to wait or cancel manually.
7. Avoid HTML entity escaping - use plain characters instead.
## Searching and Reading
diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index efba471f1a927446aa96b1c1426c60b42b725b89..45028902e467fe67945ddf444c9ae417dcaed654 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -9,14 +9,16 @@ use collections::IndexMap;
use context_server::{ContextServer, ContextServerCommand, ContextServerId};
use fs::{FakeFs, Fs};
use futures::{
- StreamExt,
+ FutureExt as _, StreamExt,
channel::{
mpsc::{self, UnboundedReceiver},
oneshot,
},
+ future::{Fuse, Shared},
};
use gpui::{
- App, AppContext, Entity, Task, TestAppContext, UpdateGlobal, http_client::FakeHttpClient,
+ App, AppContext, AsyncApp, Entity, Task, TestAppContext, UpdateGlobal,
+ http_client::FakeHttpClient,
};
use indoc::indoc;
use language_model::{
@@ -35,12 +37,109 @@ use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use serde_json::json;
use settings::{Settings, SettingsStore};
-use std::{path::Path, rc::Rc, sync::Arc, time::Duration};
+use std::{
+ path::Path,
+ pin::Pin,
+ rc::Rc,
+ sync::{
+ Arc,
+ atomic::{AtomicBool, Ordering},
+ },
+ time::Duration,
+};
use util::path;
mod test_tools;
use test_tools::*;
+fn init_test(cx: &mut TestAppContext) {
+ cx.update(|cx| {
+ let settings_store = SettingsStore::test(cx);
+ cx.set_global(settings_store);
+ });
+}
+
+struct FakeTerminalHandle {
+ killed: Arc,
+ wait_for_exit: Shared>,
+ output: acp::TerminalOutputResponse,
+ id: acp::TerminalId,
+}
+
+impl FakeTerminalHandle {
+ fn new_never_exits(cx: &mut App) -> Self {
+ let killed = Arc::new(AtomicBool::new(false));
+
+ let killed_for_task = killed.clone();
+ let wait_for_exit = cx
+ .spawn(async move |cx| {
+ loop {
+ if killed_for_task.load(Ordering::SeqCst) {
+ return acp::TerminalExitStatus::new();
+ }
+ cx.background_executor()
+ .timer(Duration::from_millis(1))
+ .await;
+ }
+ })
+ .shared();
+
+ Self {
+ killed,
+ wait_for_exit,
+ output: acp::TerminalOutputResponse::new("partial output".to_string(), false),
+ id: acp::TerminalId::new("fake_terminal".to_string()),
+ }
+ }
+
+ fn was_killed(&self) -> bool {
+ self.killed.load(Ordering::SeqCst)
+ }
+}
+
+impl crate::TerminalHandle for FakeTerminalHandle {
+ fn id(&self, _cx: &AsyncApp) -> Result {
+ Ok(self.id.clone())
+ }
+
+ fn current_output(&self, _cx: &AsyncApp) -> Result {
+ Ok(self.output.clone())
+ }
+
+ fn wait_for_exit(&self, _cx: &AsyncApp) -> Result>> {
+ Ok(self.wait_for_exit.clone())
+ }
+
+ fn kill(&self, _cx: &AsyncApp) -> Result<()> {
+ self.killed.store(true, Ordering::SeqCst);
+ Ok(())
+ }
+}
+
+struct FakeThreadEnvironment {
+ handle: Rc,
+}
+
+impl crate::ThreadEnvironment for FakeThreadEnvironment {
+ fn create_terminal(
+ &self,
+ _command: String,
+ _cwd: Option,
+ _output_byte_limit: Option,
+ _cx: &mut AsyncApp,
+ ) -> Task>> {
+ Task::ready(Ok(self.handle.clone() as Rc))
+ }
+}
+
+fn always_allow_tools(cx: &mut TestAppContext) {
+ cx.update(|cx| {
+ let mut settings = agent_settings::AgentSettings::get_global(cx).clone();
+ settings.always_allow_tool_actions = true;
+ agent_settings::AgentSettings::override_global(settings, cx);
+ });
+}
+
#[gpui::test]
async fn test_echo(cx: &mut TestAppContext) {
let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
@@ -71,6 +170,120 @@ async fn test_echo(cx: &mut TestAppContext) {
assert_eq!(stop_events(events), vec![acp::StopReason::EndTurn]);
}
+#[gpui::test]
+async fn test_terminal_tool_timeout_kills_handle(cx: &mut TestAppContext) {
+ init_test(cx);
+ always_allow_tools(cx);
+
+ let fs = FakeFs::new(cx.executor());
+ let project = Project::test(fs, [], cx).await;
+
+ let handle = Rc::new(cx.update(|cx| FakeTerminalHandle::new_never_exits(cx)));
+ let environment = Rc::new(FakeThreadEnvironment {
+ handle: handle.clone(),
+ });
+
+ #[allow(clippy::arc_with_non_send_sync)]
+ let tool = Arc::new(crate::TerminalTool::new(project, environment));
+ let (event_stream, mut rx) = crate::ToolCallEventStream::test();
+
+ let task = cx.update(|cx| {
+ tool.run(
+ crate::TerminalToolInput {
+ command: "sleep 1000".to_string(),
+ cd: ".".to_string(),
+ timeout_ms: Some(5),
+ },
+ event_stream,
+ cx,
+ )
+ });
+
+ let update = rx.expect_update_fields().await;
+ assert!(
+ update.content.iter().any(|blocks| {
+ blocks
+ .iter()
+ .any(|c| matches!(c, acp::ToolCallContent::Terminal(_)))
+ }),
+ "expected tool call update to include terminal content"
+ );
+
+ let mut task_future: Pin>>>> = Box::pin(task.fuse());
+
+ let deadline = std::time::Instant::now() + Duration::from_millis(500);
+ loop {
+ if let Some(result) = task_future.as_mut().now_or_never() {
+ let result = result.expect("terminal tool task should complete");
+
+ assert!(
+ handle.was_killed(),
+ "expected terminal handle to be killed on timeout"
+ );
+ assert!(
+ result.contains("partial output"),
+ "expected result to include terminal output, got: {result}"
+ );
+ return;
+ }
+
+ if std::time::Instant::now() >= deadline {
+ panic!("timed out waiting for terminal tool task to complete");
+ }
+
+ cx.run_until_parked();
+ cx.background_executor.timer(Duration::from_millis(1)).await;
+ }
+}
+
+#[gpui::test]
+#[ignore]
+async fn test_terminal_tool_without_timeout_does_not_kill_handle(cx: &mut TestAppContext) {
+ init_test(cx);
+ always_allow_tools(cx);
+
+ let fs = FakeFs::new(cx.executor());
+ let project = Project::test(fs, [], cx).await;
+
+ let handle = Rc::new(cx.update(|cx| FakeTerminalHandle::new_never_exits(cx)));
+ let environment = Rc::new(FakeThreadEnvironment {
+ handle: handle.clone(),
+ });
+
+ #[allow(clippy::arc_with_non_send_sync)]
+ let tool = Arc::new(crate::TerminalTool::new(project, environment));
+ let (event_stream, mut rx) = crate::ToolCallEventStream::test();
+
+ let _task = cx.update(|cx| {
+ tool.run(
+ crate::TerminalToolInput {
+ command: "sleep 1000".to_string(),
+ cd: ".".to_string(),
+ timeout_ms: None,
+ },
+ event_stream,
+ cx,
+ )
+ });
+
+ let update = rx.expect_update_fields().await;
+ assert!(
+ update.content.iter().any(|blocks| {
+ blocks
+ .iter()
+ .any(|c| matches!(c, acp::ToolCallContent::Terminal(_)))
+ }),
+ "expected tool call update to include terminal content"
+ );
+
+ smol::Timer::after(Duration::from_millis(25)).await;
+
+ assert!(
+ !handle.was_killed(),
+ "did not expect terminal handle to be killed without a timeout"
+ );
+}
+
#[gpui::test]
async fn test_thinking(cx: &mut TestAppContext) {
let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
@@ -493,14 +706,14 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
// Approve the first
tool_call_auth_1
.response
- .send(tool_call_auth_1.options[1].id.clone())
+ .send(tool_call_auth_1.options[1].option_id.clone())
.unwrap();
cx.run_until_parked();
// Reject the second
tool_call_auth_2
.response
- .send(tool_call_auth_1.options[2].id.clone())
+ .send(tool_call_auth_1.options[2].option_id.clone())
.unwrap();
cx.run_until_parked();
@@ -510,14 +723,14 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
message.content,
vec![
language_model::MessageContent::ToolResult(LanguageModelToolResult {
- tool_use_id: tool_call_auth_1.tool_call.id.0.to_string().into(),
+ tool_use_id: tool_call_auth_1.tool_call.tool_call_id.0.to_string().into(),
tool_name: ToolRequiringPermission::name().into(),
is_error: false,
content: "Allowed".into(),
output: Some("Allowed".into())
}),
language_model::MessageContent::ToolResult(LanguageModelToolResult {
- tool_use_id: tool_call_auth_2.tool_call.id.0.to_string().into(),
+ tool_use_id: tool_call_auth_2.tool_call.tool_call_id.0.to_string().into(),
tool_name: ToolRequiringPermission::name().into(),
is_error: true,
content: "Permission to run tool denied by user".into(),
@@ -543,7 +756,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
let tool_call_auth_3 = next_tool_call_authorization(&mut events).await;
tool_call_auth_3
.response
- .send(tool_call_auth_3.options[0].id.clone())
+ .send(tool_call_auth_3.options[0].option_id.clone())
.unwrap();
cx.run_until_parked();
let completion = fake_model.pending_completions().pop().unwrap();
@@ -552,7 +765,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
message.content,
vec![language_model::MessageContent::ToolResult(
LanguageModelToolResult {
- tool_use_id: tool_call_auth_3.tool_call.id.0.to_string().into(),
+ tool_use_id: tool_call_auth_3.tool_call.tool_call_id.0.to_string().into(),
tool_name: ToolRequiringPermission::name().into(),
is_error: false,
content: "Allowed".into(),
@@ -1353,20 +1566,20 @@ async fn test_cancellation(cx: &mut TestAppContext) {
ThreadEvent::ToolCall(tool_call) => {
assert_eq!(tool_call.title, expected_tools.remove(0));
if tool_call.title == "Echo" {
- echo_id = Some(tool_call.id);
+ echo_id = Some(tool_call.tool_call_id);
}
}
ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateFields(
acp::ToolCallUpdate {
- id,
+ tool_call_id,
fields:
acp::ToolCallUpdateFields {
status: Some(acp::ToolCallStatus::Completed),
..
},
- meta: None,
+ ..
},
- )) if Some(&id) == echo_id.as_ref() => {
+ )) if Some(&tool_call_id) == echo_id.as_ref() => {
echo_completed = true;
}
_ => {}
@@ -1995,11 +2208,7 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
.update(|cx| {
connection.prompt(
Some(acp_thread::UserMessageId::new()),
- acp::PromptRequest {
- session_id: session_id.clone(),
- prompt: vec!["ghi".into()],
- meta: None,
- },
+ acp::PromptRequest::new(session_id.clone(), vec!["ghi".into()]),
cx,
)
})
@@ -2056,68 +2265,50 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
let tool_call = expect_tool_call(&mut events).await;
assert_eq!(
tool_call,
- acp::ToolCall {
- id: acp::ToolCallId("1".into()),
- title: "Thinking".into(),
- kind: acp::ToolKind::Think,
- status: acp::ToolCallStatus::Pending,
- content: vec![],
- locations: vec![],
- raw_input: Some(json!({})),
- raw_output: None,
- meta: Some(json!({ "tool_name": "thinking" })),
- }
+ acp::ToolCall::new("1", "Thinking")
+ .kind(acp::ToolKind::Think)
+ .raw_input(json!({}))
+ .meta(acp::Meta::from_iter([(
+ "tool_name".into(),
+ "thinking".into()
+ )]))
);
let update = expect_tool_call_update_fields(&mut events).await;
assert_eq!(
update,
- acp::ToolCallUpdate {
- id: acp::ToolCallId("1".into()),
- fields: acp::ToolCallUpdateFields {
- title: Some("Thinking".into()),
- kind: Some(acp::ToolKind::Think),
- raw_input: Some(json!({ "content": "Thinking hard!" })),
- ..Default::default()
- },
- meta: None,
- }
+ acp::ToolCallUpdate::new(
+ "1",
+ acp::ToolCallUpdateFields::new()
+ .title("Thinking")
+ .kind(acp::ToolKind::Think)
+ .raw_input(json!({ "content": "Thinking hard!"}))
+ )
);
let update = expect_tool_call_update_fields(&mut events).await;
assert_eq!(
update,
- acp::ToolCallUpdate {
- id: acp::ToolCallId("1".into()),
- fields: acp::ToolCallUpdateFields {
- status: Some(acp::ToolCallStatus::InProgress),
- ..Default::default()
- },
- meta: None,
- }
+ acp::ToolCallUpdate::new(
+ "1",
+ acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::InProgress)
+ )
);
let update = expect_tool_call_update_fields(&mut events).await;
assert_eq!(
update,
- acp::ToolCallUpdate {
- id: acp::ToolCallId("1".into()),
- fields: acp::ToolCallUpdateFields {
- content: Some(vec!["Thinking hard!".into()]),
- ..Default::default()
- },
- meta: None,
- }
+ acp::ToolCallUpdate::new(
+ "1",
+ acp::ToolCallUpdateFields::new().content(vec!["Thinking hard!".into()])
+ )
);
let update = expect_tool_call_update_fields(&mut events).await;
assert_eq!(
update,
- acp::ToolCallUpdate {
- id: acp::ToolCallId("1".into()),
- fields: acp::ToolCallUpdateFields {
- status: Some(acp::ToolCallStatus::Completed),
- raw_output: Some("Finished thinking.".into()),
- ..Default::default()
- },
- meta: None,
- }
+ acp::ToolCallUpdate::new(
+ "1",
+ acp::ToolCallUpdateFields::new()
+ .status(acp::ToolCallStatus::Completed)
+ .raw_output("Finished thinking.")
+ )
);
}
@@ -2553,7 +2744,7 @@ fn setup_context_server(
let mut settings = ProjectSettings::get_global(cx).clone();
settings.context_servers.insert(
name.into(),
- project::project_settings::ContextServerSettings::Custom {
+ project::project_settings::ContextServerSettings::Stdio {
enabled: true,
command: ContextServerCommand {
path: "somebinary".into(),
@@ -2618,3 +2809,181 @@ fn setup_context_server(
cx.run_until_parked();
mcp_tool_calls_rx
}
+
+#[gpui::test]
+async fn test_tokens_before_message(cx: &mut TestAppContext) {
+ let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+ let fake_model = model.as_fake();
+
+ // First message
+ let message_1_id = UserMessageId::new();
+ thread
+ .update(cx, |thread, cx| {
+ thread.send(message_1_id.clone(), ["First message"], cx)
+ })
+ .unwrap();
+ cx.run_until_parked();
+
+ // Before any response, tokens_before_message should return None for first message
+ thread.read_with(cx, |thread, _| {
+ assert_eq!(
+ thread.tokens_before_message(&message_1_id),
+ None,
+ "First message should have no tokens before it"
+ );
+ });
+
+ // Complete first message with usage
+ fake_model.send_last_completion_stream_text_chunk("Response 1");
+ fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::UsageUpdate(
+ language_model::TokenUsage {
+ input_tokens: 100,
+ output_tokens: 50,
+ cache_creation_input_tokens: 0,
+ cache_read_input_tokens: 0,
+ },
+ ));
+ fake_model.end_last_completion_stream();
+ cx.run_until_parked();
+
+ // First message still has no tokens before it
+ thread.read_with(cx, |thread, _| {
+ assert_eq!(
+ thread.tokens_before_message(&message_1_id),
+ None,
+ "First message should still have no tokens before it after response"
+ );
+ });
+
+ // Second message
+ let message_2_id = UserMessageId::new();
+ thread
+ .update(cx, |thread, cx| {
+ thread.send(message_2_id.clone(), ["Second message"], cx)
+ })
+ .unwrap();
+ cx.run_until_parked();
+
+ // Second message should have first message's input tokens before it
+ thread.read_with(cx, |thread, _| {
+ assert_eq!(
+ thread.tokens_before_message(&message_2_id),
+ Some(100),
+ "Second message should have 100 tokens before it (from first request)"
+ );
+ });
+
+ // Complete second message
+ fake_model.send_last_completion_stream_text_chunk("Response 2");
+ fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::UsageUpdate(
+ language_model::TokenUsage {
+ input_tokens: 250, // Total for this request (includes previous context)
+ output_tokens: 75,
+ cache_creation_input_tokens: 0,
+ cache_read_input_tokens: 0,
+ },
+ ));
+ fake_model.end_last_completion_stream();
+ cx.run_until_parked();
+
+ // Third message
+ let message_3_id = UserMessageId::new();
+ thread
+ .update(cx, |thread, cx| {
+ thread.send(message_3_id.clone(), ["Third message"], cx)
+ })
+ .unwrap();
+ cx.run_until_parked();
+
+ // Third message should have second message's input tokens (250) before it
+ thread.read_with(cx, |thread, _| {
+ assert_eq!(
+ thread.tokens_before_message(&message_3_id),
+ Some(250),
+ "Third message should have 250 tokens before it (from second request)"
+ );
+ // Second message should still have 100
+ assert_eq!(
+ thread.tokens_before_message(&message_2_id),
+ Some(100),
+ "Second message should still have 100 tokens before it"
+ );
+ // First message still has none
+ assert_eq!(
+ thread.tokens_before_message(&message_1_id),
+ None,
+ "First message should still have no tokens before it"
+ );
+ });
+}
+
+#[gpui::test]
+async fn test_tokens_before_message_after_truncate(cx: &mut TestAppContext) {
+ let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
+ let fake_model = model.as_fake();
+
+ // Set up three messages with responses
+ let message_1_id = UserMessageId::new();
+ thread
+ .update(cx, |thread, cx| {
+ thread.send(message_1_id.clone(), ["Message 1"], cx)
+ })
+ .unwrap();
+ cx.run_until_parked();
+ fake_model.send_last_completion_stream_text_chunk("Response 1");
+ fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::UsageUpdate(
+ language_model::TokenUsage {
+ input_tokens: 100,
+ output_tokens: 50,
+ cache_creation_input_tokens: 0,
+ cache_read_input_tokens: 0,
+ },
+ ));
+ fake_model.end_last_completion_stream();
+ cx.run_until_parked();
+
+ let message_2_id = UserMessageId::new();
+ thread
+ .update(cx, |thread, cx| {
+ thread.send(message_2_id.clone(), ["Message 2"], cx)
+ })
+ .unwrap();
+ cx.run_until_parked();
+ fake_model.send_last_completion_stream_text_chunk("Response 2");
+ fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::UsageUpdate(
+ language_model::TokenUsage {
+ input_tokens: 250,
+ output_tokens: 75,
+ cache_creation_input_tokens: 0,
+ cache_read_input_tokens: 0,
+ },
+ ));
+ fake_model.end_last_completion_stream();
+ cx.run_until_parked();
+
+ // Verify initial state
+ thread.read_with(cx, |thread, _| {
+ assert_eq!(thread.tokens_before_message(&message_2_id), Some(100));
+ });
+
+ // Truncate at message 2 (removes message 2 and everything after)
+ thread
+ .update(cx, |thread, cx| thread.truncate(message_2_id.clone(), cx))
+ .unwrap();
+ cx.run_until_parked();
+
+ // After truncation, message_2_id no longer exists, so lookup should return None
+ thread.read_with(cx, |thread, _| {
+ assert_eq!(
+ thread.tokens_before_message(&message_2_id),
+ None,
+ "After truncation, message 2 no longer exists"
+ );
+ // Message 1 still exists but has no tokens before it
+ assert_eq!(
+ thread.tokens_before_message(&message_1_id),
+ None,
+ "First message still has no tokens before it"
+ );
+ });
+}
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index 294c96b3ecb7800ab5b5f62749d335682efebd60..ef3ca23c3caf816a28e91e9e75b21f2cc80451e7 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -2,7 +2,8 @@ use crate::{
ContextServerRegistry, CopyPathTool, CreateDirectoryTool, DbLanguageModel, DbThread,
DeletePathTool, DiagnosticsTool, EditFileTool, FetchTool, FindPathTool, GrepTool,
ListDirectoryTool, MovePathTool, NowTool, OpenTool, ProjectSnapshot, ReadFileTool,
- SystemPromptTemplate, Template, Templates, TerminalTool, ThinkingTool, WebSearchTool,
+ RestoreFileFromDiskTool, SaveFileTool, SystemPromptTemplate, Template, Templates, TerminalTool,
+ ThinkingTool, WebSearchTool,
};
use acp_thread::{MentionUri, UserMessageId};
use action_log::ActionLog;
@@ -107,7 +108,13 @@ impl Message {
pub fn to_request(&self) -> Vec {
match self {
- Message::User(message) => vec![message.to_request()],
+ Message::User(message) => {
+ if message.content.is_empty() {
+ vec![]
+ } else {
+ vec![message.to_request()]
+ }
+ }
Message::Agent(message) => message.to_request(),
Message::Resume => vec![LanguageModelRequestMessage {
role: Role::User,
@@ -530,6 +537,7 @@ pub trait TerminalHandle {
fn id(&self, cx: &AsyncApp) -> Result;
fn current_output(&self, cx: &AsyncApp) -> Result;
fn wait_for_exit(&self, cx: &AsyncApp) -> Result>>;
+ fn kill(&self, cx: &AsyncApp) -> Result<()>;
}
pub trait ThreadEnvironment {
@@ -619,12 +627,9 @@ pub struct Thread {
impl Thread {
fn prompt_capabilities(model: Option<&dyn LanguageModel>) -> acp::PromptCapabilities {
let image = model.map_or(true, |model| model.supports_images());
- acp::PromptCapabilities {
- meta: None,
- image,
- audio: false,
- embedded_context: true,
- }
+ acp::PromptCapabilities::new()
+ .image(image)
+ .embedded_context(true)
}
pub fn new(
@@ -640,7 +645,7 @@ impl Thread {
let (prompt_capabilities_tx, prompt_capabilities_rx) =
watch::channel(Self::prompt_capabilities(model.as_deref()));
Self {
- id: acp::SessionId(uuid::Uuid::new_v4().to_string().into()),
+ id: acp::SessionId::new(uuid::Uuid::new_v4().to_string()),
prompt_id: PromptId::new(),
updated_at: Utc::now(),
title: None,
@@ -737,17 +742,11 @@ impl Thread {
let Some(tool) = tool else {
stream
.0
- .unbounded_send(Ok(ThreadEvent::ToolCall(acp::ToolCall {
- meta: None,
- id: acp::ToolCallId(tool_use.id.to_string().into()),
- title: tool_use.name.to_string(),
- kind: acp::ToolKind::Other,
- status: acp::ToolCallStatus::Failed,
- content: Vec::new(),
- locations: Vec::new(),
- raw_input: Some(tool_use.input.clone()),
- raw_output: None,
- })))
+ .unbounded_send(Ok(ThreadEvent::ToolCall(
+ acp::ToolCall::new(tool_use.id.to_string(), tool_use.name.to_string())
+ .status(acp::ToolCallStatus::Failed)
+ .raw_input(tool_use.input.clone()),
+ )))
.ok();
return;
};
@@ -777,8 +776,8 @@ impl Thread {
stream.update_tool_call_fields(
&tool_use.id,
- acp::ToolCallUpdateFields {
- status: Some(
+ acp::ToolCallUpdateFields::new()
+ .status(
tool_result
.as_ref()
.map_or(acp::ToolCallStatus::Failed, |result| {
@@ -788,10 +787,8 @@ impl Thread {
acp::ToolCallStatus::Completed
}
}),
- ),
- raw_output: output,
- ..Default::default()
- },
+ )
+ .raw_output(output),
);
}
@@ -1012,6 +1009,8 @@ impl Thread {
self.project.clone(),
self.action_log.clone(),
));
+ self.add_tool(SaveFileTool::new(self.project.clone()));
+ self.add_tool(RestoreFileFromDiskTool::new(self.project.clone()));
self.add_tool(TerminalTool::new(self.project.clone(), environment));
self.add_tool(ThinkingTool);
self.add_tool(WebSearchTool);
@@ -1096,6 +1095,28 @@ impl Thread {
})
}
+ /// Get the total input token count as of the message before the given message.
+ ///
+ /// Returns `None` if:
+ /// - `target_id` is the first message (no previous message)
+ /// - The previous message hasn't received a response yet (no usage data)
+ /// - `target_id` is not found in the messages
+ pub fn tokens_before_message(&self, target_id: &UserMessageId) -> Option {
+ let mut previous_user_message_id: Option<&UserMessageId> = None;
+
+ for message in &self.messages {
+ if let Message::User(user_msg) = message {
+ if &user_msg.id == target_id {
+ let prev_id = previous_user_message_id?;
+ let usage = self.request_token_usage.get(prev_id)?;
+ return Some(usage.input_tokens);
+ }
+ previous_user_message_id = Some(&user_msg.id);
+ }
+ }
+ None
+ }
+
/// Look up the active profile and resolve its preferred model if one is configured.
fn resolve_profile_model(
profile_id: &AgentProfileId,
@@ -1148,20 +1169,64 @@ impl Thread {
where
T: Into,
{
+ let content = content.into_iter().map(Into::into).collect::>();
+ log::debug!("Thread::send content: {:?}", content);
+
+ self.messages
+ .push(Message::User(UserMessage { id, content }));
+ cx.notify();
+
+ self.send_existing(cx)
+ }
+
+ pub fn send_existing(
+ &mut self,
+ cx: &mut Context,
+ ) -> Result>> {
let model = self.model().context("No language model configured")?;
log::info!("Thread::send called with model: {}", model.name().0);
self.advance_prompt_id();
- let content = content.into_iter().map(Into::into).collect::>();
- log::debug!("Thread::send content: {:?}", content);
+ log::debug!("Total messages in thread: {}", self.messages.len());
+ self.run_turn(cx)
+ }
+ pub fn push_acp_user_block(
+ &mut self,
+ id: UserMessageId,
+ blocks: impl IntoIterator- ,
+ path_style: PathStyle,
+ cx: &mut Context,
+ ) {
+ let content = blocks
+ .into_iter()
+ .map(|block| UserMessageContent::from_content_block(block, path_style))
+ .collect::>();
self.messages
.push(Message::User(UserMessage { id, content }));
cx.notify();
+ }
- log::debug!("Total messages in thread: {}", self.messages.len());
- self.run_turn(cx)
+ pub fn push_acp_agent_block(&mut self, block: acp::ContentBlock, cx: &mut Context) {
+ let text = match block {
+ acp::ContentBlock::Text(text_content) => text_content.text,
+ acp::ContentBlock::Image(_) => "[image]".to_string(),
+ acp::ContentBlock::Audio(_) => "[audio]".to_string(),
+ acp::ContentBlock::ResourceLink(resource_link) => resource_link.uri,
+ acp::ContentBlock::Resource(resource) => match resource.resource {
+ acp::EmbeddedResourceResource::TextResourceContents(resource) => resource.uri,
+ acp::EmbeddedResourceResource::BlobResourceContents(resource) => resource.uri,
+ _ => "[resource]".to_string(),
+ },
+ _ => "[unknown]".to_string(),
+ };
+
+ self.messages.push(Message::Agent(AgentMessage {
+ content: vec![AgentMessageContent::Text(text)],
+ ..Default::default()
+ }));
+ cx.notify();
}
#[cfg(feature = "eval")]
@@ -1274,15 +1339,13 @@ impl Thread {
event_stream.update_tool_call_fields(
&tool_result.tool_use_id,
- acp::ToolCallUpdateFields {
- status: Some(if tool_result.is_error {
+ acp::ToolCallUpdateFields::new()
+ .status(if tool_result.is_error {
acp::ToolCallStatus::Failed
} else {
acp::ToolCallStatus::Completed
- }),
- raw_output: tool_result.output.clone(),
- ..Default::default()
- },
+ })
+ .raw_output(tool_result.output.clone()),
);
this.update(cx, |this, _cx| {
this.pending_message()
@@ -1560,12 +1623,10 @@ impl Thread {
} else {
event_stream.update_tool_call_fields(
&tool_use.id,
- acp::ToolCallUpdateFields {
- title: Some(title.into()),
- kind: Some(kind),
- raw_input: Some(tool_use.input.clone()),
- ..Default::default()
- },
+ acp::ToolCallUpdateFields::new()
+ .title(title.as_str())
+ .kind(kind)
+ .raw_input(tool_use.input.clone()),
);
}
@@ -1587,10 +1648,9 @@ impl Thread {
let fs = self.project.read(cx).fs().clone();
let tool_event_stream =
ToolCallEventStream::new(tool_use.id.clone(), event_stream.clone(), Some(fs));
- tool_event_stream.update_fields(acp::ToolCallUpdateFields {
- status: Some(acp::ToolCallStatus::InProgress),
- ..Default::default()
- });
+ tool_event_stream.update_fields(
+ acp::ToolCallUpdateFields::new().status(acp::ToolCallStatus::InProgress),
+ );
let supports_images = self.model().is_some_and(|model| model.supports_images());
let tool_result = tool.run(tool_use.input, tool_event_stream, cx);
log::debug!("Running tool {}", tool_use.name);
@@ -1665,6 +1725,10 @@ impl Thread {
self.pending_summary_generation.is_some()
}
+ pub fn is_generating_title(&self) -> bool {
+ self.pending_title_generation.is_some()
+ }
+
pub fn summary(&mut self, cx: &mut Context) -> Shared>> {
if let Some(summary) = self.summary.as_ref() {
return Task::ready(Some(summary.clone())).shared();
@@ -1732,7 +1796,7 @@ impl Thread {
task
}
- fn generate_title(&mut self, cx: &mut Context) {
+ pub fn generate_title(&mut self, cx: &mut Context) {
let Some(model) = self.summarization_model.clone() else {
return;
};
@@ -1981,6 +2045,12 @@ impl Thread {
self.running_turn.as_ref()?.tools.get(name).cloned()
}
+ pub fn has_tool(&self, name: &str) -> bool {
+ self.running_turn
+ .as_ref()
+ .is_some_and(|turn| turn.tools.contains_key(name))
+ }
+
fn build_request_messages(
&self,
available_tools: Vec,
@@ -2381,19 +2451,13 @@ impl ThreadEventStream {
kind: acp::ToolKind,
input: serde_json::Value,
) -> acp::ToolCall {
- acp::ToolCall {
- meta: Some(serde_json::json!({
- "tool_name": tool_name
- })),
- id: acp::ToolCallId(id.to_string().into()),
- title,
- kind,
- status: acp::ToolCallStatus::Pending,
- content: vec![],
- locations: vec![],
- raw_input: Some(input),
- raw_output: None,
- }
+ acp::ToolCall::new(id.to_string(), title)
+ .kind(kind)
+ .raw_input(input)
+ .meta(acp::Meta::from_iter([(
+ "tool_name".into(),
+ tool_name.into(),
+ )]))
}
fn update_tool_call_fields(
@@ -2403,12 +2467,7 @@ impl ThreadEventStream {
) {
self.0
.unbounded_send(Ok(ThreadEvent::ToolCallUpdate(
- acp::ToolCallUpdate {
- meta: None,
- id: acp::ToolCallId(tool_use_id.to_string().into()),
- fields,
- }
- .into(),
+ acp::ToolCallUpdate::new(tool_use_id.to_string(), fields).into(),
)))
.ok();
}
@@ -2471,7 +2530,7 @@ impl ToolCallEventStream {
.0
.unbounded_send(Ok(ThreadEvent::ToolCallUpdate(
acp_thread::ToolCallUpdateDiff {
- id: acp::ToolCallId(self.tool_use_id.to_string().into()),
+ id: acp::ToolCallId::new(self.tool_use_id.to_string()),
diff,
}
.into(),
@@ -2489,33 +2548,26 @@ impl ToolCallEventStream {
.0
.unbounded_send(Ok(ThreadEvent::ToolCallAuthorization(
ToolCallAuthorization {
- tool_call: acp::ToolCallUpdate {
- meta: None,
- id: acp::ToolCallId(self.tool_use_id.to_string().into()),
- fields: acp::ToolCallUpdateFields {
- title: Some(title.into()),
- ..Default::default()
- },
- },
+ tool_call: acp::ToolCallUpdate::new(
+ self.tool_use_id.to_string(),
+ acp::ToolCallUpdateFields::new().title(title.into()),
+ ),
options: vec![
- acp::PermissionOption {
- id: acp::PermissionOptionId("always_allow".into()),
- name: "Always Allow".into(),
- kind: acp::PermissionOptionKind::AllowAlways,
- meta: None,
- },
- acp::PermissionOption {
- id: acp::PermissionOptionId("allow".into()),
- name: "Allow".into(),
- kind: acp::PermissionOptionKind::AllowOnce,
- meta: None,
- },
- acp::PermissionOption {
- id: acp::PermissionOptionId("deny".into()),
- name: "Deny".into(),
- kind: acp::PermissionOptionKind::RejectOnce,
- meta: None,
- },
+ acp::PermissionOption::new(
+ acp::PermissionOptionId::new("always_allow"),
+ "Always Allow",
+ acp::PermissionOptionKind::AllowAlways,
+ ),
+ acp::PermissionOption::new(
+ acp::PermissionOptionId::new("allow"),
+ "Allow",
+ acp::PermissionOptionKind::AllowOnce,
+ ),
+ acp::PermissionOption::new(
+ acp::PermissionOptionId::new("deny"),
+ "Deny",
+ acp::PermissionOptionKind::RejectOnce,
+ ),
],
response: response_tx,
},
@@ -2660,7 +2712,15 @@ impl UserMessageContent {
// TODO
Self::Text("[blob]".to_string())
}
+ other => {
+ log::warn!("Unexpected content type: {:?}", other);
+ Self::Text("[unknown]".to_string())
+ }
},
+ other => {
+ log::warn!("Unexpected content type: {:?}", other);
+ Self::Text("[unknown]".to_string())
+ }
}
}
}
@@ -2668,32 +2728,15 @@ impl UserMessageContent {
impl From for acp::ContentBlock {
fn from(content: UserMessageContent) -> Self {
match content {
- UserMessageContent::Text(text) => acp::ContentBlock::Text(acp::TextContent {
- text,
- annotations: None,
- meta: None,
- }),
- UserMessageContent::Image(image) => acp::ContentBlock::Image(acp::ImageContent {
- data: image.source.to_string(),
- mime_type: "image/png".to_string(),
- meta: None,
- annotations: None,
- uri: None,
- }),
- UserMessageContent::Mention { uri, content } => {
- acp::ContentBlock::Resource(acp::EmbeddedResource {
- meta: None,
- resource: acp::EmbeddedResourceResource::TextResourceContents(
- acp::TextResourceContents {
- meta: None,
- mime_type: None,
- text: content,
- uri: uri.to_uri().to_string(),
- },
- ),
- annotations: None,
- })
+ UserMessageContent::Text(text) => text.into(),
+ UserMessageContent::Image(image) => {
+ acp::ContentBlock::Image(acp::ImageContent::new(image.source, "image/png"))
}
+ UserMessageContent::Mention { uri, content } => acp::ContentBlock::Resource(
+ acp::EmbeddedResource::new(acp::EmbeddedResourceResource::TextResourceContents(
+ acp::TextResourceContents::new(content, uri.to_uri().to_string()),
+ )),
+ ),
}
}
}
@@ -2701,7 +2744,6 @@ impl From for acp::ContentBlock {
fn convert_image(image_content: acp::ImageContent) -> LanguageModelImage {
LanguageModelImage {
source: image_content.data.into(),
- // TODO: make this optional?
- size: gpui::Size::new(0.into(), 0.into()),
+ size: None,
}
}
diff --git a/crates/agent/src/tools.rs b/crates/agent/src/tools.rs
index 1d3c0d557716ec3a52f910971547df4ee764cab0..358903a32baa5ead9b073642015e6829501307a2 100644
--- a/crates/agent/src/tools.rs
+++ b/crates/agent/src/tools.rs
@@ -12,6 +12,9 @@ mod move_path_tool;
mod now_tool;
mod open_tool;
mod read_file_tool;
+mod restore_file_from_disk_tool;
+mod save_file_tool;
+
mod terminal_tool;
mod thinking_tool;
mod web_search_tool;
@@ -33,6 +36,9 @@ pub use move_path_tool::*;
pub use now_tool::*;
pub use open_tool::*;
pub use read_file_tool::*;
+pub use restore_file_from_disk_tool::*;
+pub use save_file_tool::*;
+
pub use terminal_tool::*;
pub use thinking_tool::*;
pub use web_search_tool::*;
@@ -88,6 +94,8 @@ tools! {
NowTool,
OpenTool,
ReadFileTool,
+ RestoreFileFromDiskTool,
+ SaveFileTool,
TerminalTool,
ThinkingTool,
WebSearchTool,
diff --git a/crates/agent/src/tools/context_server_registry.rs b/crates/agent/src/tools/context_server_registry.rs
index 03a0ef84e73d4cbca83d61077d568ec58cd7ae2b..3b01b2feb7dd36615a8ba7c63d81a81694e0d268 100644
--- a/crates/agent/src/tools/context_server_registry.rs
+++ b/crates/agent/src/tools/context_server_registry.rs
@@ -2,12 +2,24 @@ use crate::{AgentToolOutput, AnyAgentTool, ToolCallEventStream};
use agent_client_protocol::ToolKind;
use anyhow::{Result, anyhow, bail};
use collections::{BTreeMap, HashMap};
-use context_server::ContextServerId;
-use gpui::{App, Context, Entity, SharedString, Task};
+use context_server::{ContextServerId, client::NotificationSubscription};
+use gpui::{App, AppContext, AsyncApp, Context, Entity, EventEmitter, SharedString, Task};
use project::context_server_store::{ContextServerStatus, ContextServerStore};
use std::sync::Arc;
use util::ResultExt;
+pub struct ContextServerPrompt {
+ pub server_id: ContextServerId,
+ pub prompt: context_server::types::Prompt,
+}
+
+pub enum ContextServerRegistryEvent {
+ ToolsChanged,
+ PromptsChanged,
+}
+
+impl EventEmitter for ContextServerRegistry {}
+
pub struct ContextServerRegistry {
server_store: Entity,
registered_servers: HashMap,
@@ -16,7 +28,10 @@ pub struct ContextServerRegistry {
struct RegisteredContextServer {
tools: BTreeMap>,
+ prompts: BTreeMap,
load_tools: Task>,
+ load_prompts: Task>,
+ _tools_updated_subscription: Option,
}
impl ContextServerRegistry {
@@ -28,6 +43,7 @@ impl ContextServerRegistry {
};
for server in server_store.read(cx).running_servers() {
this.reload_tools_for_server(server.id(), cx);
+ this.reload_prompts_for_server(server.id(), cx);
}
this
}
@@ -56,6 +72,88 @@ impl ContextServerRegistry {
.map(|(id, server)| (id, &server.tools))
}
+ pub fn prompts(&self) -> impl Iterator
- {
+ self.registered_servers
+ .values()
+ .flat_map(|server| server.prompts.values())
+ }
+
+ pub fn find_prompt(
+ &self,
+ server_id: Option<&ContextServerId>,
+ name: &str,
+ ) -> Option<&ContextServerPrompt> {
+ if let Some(server_id) = server_id {
+ self.registered_servers
+ .get(server_id)
+ .and_then(|server| server.prompts.get(name))
+ } else {
+ self.registered_servers
+ .values()
+ .find_map(|server| server.prompts.get(name))
+ }
+ }
+
+ pub fn server_store(&self) -> &Entity {
+ &self.server_store
+ }
+
+ fn get_or_register_server(
+ &mut self,
+ server_id: &ContextServerId,
+ cx: &mut Context,
+ ) -> &mut RegisteredContextServer {
+ self.registered_servers
+ .entry(server_id.clone())
+ .or_insert_with(|| Self::init_registered_server(server_id, &self.server_store, cx))
+ }
+
+ fn init_registered_server(
+ server_id: &ContextServerId,
+ server_store: &Entity,
+ cx: &mut Context,
+ ) -> RegisteredContextServer {
+ let tools_updated_subscription = server_store
+ .read(cx)
+ .get_running_server(server_id)
+ .and_then(|server| {
+ let client = server.client()?;
+
+ if !client.capable(context_server::protocol::ServerCapability::Tools) {
+ return None;
+ }
+
+ let server_id = server.id();
+ let this = cx.entity().downgrade();
+
+ Some(client.on_notification(
+ "notifications/tools/list_changed",
+ Box::new(move |_params, cx: AsyncApp| {
+ let server_id = server_id.clone();
+ let this = this.clone();
+ cx.spawn(async move |cx| {
+ this.update(cx, |this, cx| {
+ log::info!(
+ "Received tools/list_changed notification for server {}",
+ server_id
+ );
+ this.reload_tools_for_server(server_id, cx);
+ })
+ })
+ .detach();
+ }),
+ ))
+ });
+
+ RegisteredContextServer {
+ tools: BTreeMap::default(),
+ prompts: BTreeMap::default(),
+ load_tools: Task::ready(Ok(())),
+ load_prompts: Task::ready(Ok(())),
+ _tools_updated_subscription: tools_updated_subscription,
+ }
+ }
+
fn reload_tools_for_server(&mut self, server_id: ContextServerId, cx: &mut Context) {
let Some(server) = self.server_store.read(cx).get_running_server(&server_id) else {
return;
@@ -63,17 +161,12 @@ impl ContextServerRegistry {
let Some(client) = server.client() else {
return;
};
+
if !client.capable(context_server::protocol::ServerCapability::Tools) {
return;
}
- let registered_server =
- self.registered_servers
- .entry(server_id.clone())
- .or_insert(RegisteredContextServer {
- tools: BTreeMap::default(),
- load_tools: Task::ready(Ok(())),
- });
+ let registered_server = self.get_or_register_server(&server_id, cx);
registered_server.load_tools = cx.spawn(async move |this, cx| {
let response = client
.request::(())
@@ -94,6 +187,49 @@ impl ContextServerRegistry {
));
registered_server.tools.insert(tool.name(), tool);
}
+ cx.emit(ContextServerRegistryEvent::ToolsChanged);
+ cx.notify();
+ }
+ })
+ });
+ }
+
+ fn reload_prompts_for_server(&mut self, server_id: ContextServerId, cx: &mut Context) {
+ let Some(server) = self.server_store.read(cx).get_running_server(&server_id) else {
+ return;
+ };
+ let Some(client) = server.client() else {
+ return;
+ };
+ if !client.capable(context_server::protocol::ServerCapability::Prompts) {
+ return;
+ }
+
+ let registered_server = self.get_or_register_server(&server_id, cx);
+
+ registered_server.load_prompts = cx.spawn(async move |this, cx| {
+ let response = client
+ .request::(())
+ .await;
+
+ this.update(cx, |this, cx| {
+ let Some(registered_server) = this.registered_servers.get_mut(&server_id) else {
+ return;
+ };
+
+ registered_server.prompts.clear();
+ if let Some(response) = response.log_err() {
+ for prompt in response.prompts {
+ let name: SharedString = prompt.name.clone().into();
+ registered_server.prompts.insert(
+ name,
+ ContextServerPrompt {
+ server_id: server_id.clone(),
+ prompt,
+ },
+ );
+ }
+ cx.emit(ContextServerRegistryEvent::PromptsChanged);
cx.notify();
}
})
@@ -112,9 +248,17 @@ impl ContextServerRegistry {
ContextServerStatus::Starting => {}
ContextServerStatus::Running => {
self.reload_tools_for_server(server_id.clone(), cx);
+ self.reload_prompts_for_server(server_id.clone(), cx);
}
ContextServerStatus::Stopped | ContextServerStatus::Error(_) => {
- self.registered_servers.remove(server_id);
+ if let Some(registered_server) = self.registered_servers.remove(server_id) {
+ if !registered_server.tools.is_empty() {
+ cx.emit(ContextServerRegistryEvent::ToolsChanged);
+ }
+ if !registered_server.prompts.is_empty() {
+ cx.emit(ContextServerRegistryEvent::PromptsChanged);
+ }
+ }
cx.notify();
}
}
@@ -251,3 +395,39 @@ impl AnyAgentTool for ContextServerTool {
Ok(())
}
}
+
+pub fn get_prompt(
+ server_store: &Entity,
+ server_id: &ContextServerId,
+ prompt_name: &str,
+ arguments: HashMap,
+ cx: &mut AsyncApp,
+) -> Task> {
+ let server = match cx.update(|cx| server_store.read(cx).get_running_server(server_id)) {
+ Ok(server) => server,
+ Err(error) => return Task::ready(Err(error)),
+ };
+ let Some(server) = server else {
+ return Task::ready(Err(anyhow::anyhow!("Context server not found")));
+ };
+
+ let Some(protocol) = server.client() else {
+ return Task::ready(Err(anyhow::anyhow!("Context server not initialized")));
+ };
+
+ let prompt_name = prompt_name.to_string();
+
+ cx.background_spawn(async move {
+ let response = protocol
+ .request::(
+ context_server::types::PromptsGetParams {
+ name: prompt_name,
+ arguments: (!arguments.is_empty()).then(|| arguments),
+ meta: None,
+ },
+ )
+ .await?;
+
+ Ok(response)
+ })
+}
diff --git a/crates/agent/src/tools/edit_file_tool.rs b/crates/agent/src/tools/edit_file_tool.rs
index de2dd384693c8af3e04007895c843743c5ead722..3acb7f5951f3ca4b682dcabc62a0d54c35ab08d6 100644
--- a/crates/agent/src/tools/edit_file_tool.rs
+++ b/crates/agent/src/tools/edit_file_tool.rs
@@ -273,14 +273,9 @@ impl AgentTool for EditFileTool {
};
let abs_path = project.read(cx).absolute_path(&project_path, cx);
if let Some(abs_path) = abs_path.clone() {
- event_stream.update_fields(ToolCallUpdateFields {
- locations: Some(vec![acp::ToolCallLocation {
- path: abs_path,
- line: None,
- meta: None,
- }]),
- ..Default::default()
- });
+ event_stream.update_fields(
+ ToolCallUpdateFields::new().locations(vec![acp::ToolCallLocation::new(abs_path)]),
+ );
}
let authorize = self.authorize(&input, &event_stream, cx);
@@ -311,20 +306,39 @@ impl AgentTool for EditFileTool {
// Check if the file has been modified since the agent last read it
if let Some(abs_path) = abs_path.as_ref() {
- let (last_read_mtime, current_mtime, is_dirty) = self.thread.update(cx, |thread, cx| {
+ let (last_read_mtime, current_mtime, is_dirty, has_save_tool, has_restore_tool) = self.thread.update(cx, |thread, cx| {
let last_read = thread.file_read_times.get(abs_path).copied();
let current = buffer.read(cx).file().and_then(|file| file.disk_state().mtime());
let dirty = buffer.read(cx).is_dirty();
- (last_read, current, dirty)
+ let has_save = thread.has_tool("save_file");
+ let has_restore = thread.has_tool("restore_file_from_disk");
+ (last_read, current, dirty, has_save, has_restore)
})?;
// Check for unsaved changes first - these indicate modifications we don't know about
if is_dirty {
- anyhow::bail!(
- "This file cannot be written to because it has unsaved changes. \
- Please end the current conversation immediately by telling the user you want to write to this file (mention its path explicitly) but you can't write to it because it has unsaved changes. \
- Ask the user to save that buffer's changes and to inform you when it's ok to proceed."
- );
+ let message = match (has_save_tool, has_restore_tool) {
+ (true, true) => {
+ "This file has unsaved changes. Ask the user whether they want to keep or discard those changes. \
+ If they want to keep them, ask for confirmation then use the save_file tool to save the file, then retry this edit. \
+ If they want to discard them, ask for confirmation then use the restore_file_from_disk tool to restore the on-disk contents, then retry this edit."
+ }
+ (true, false) => {
+ "This file has unsaved changes. Ask the user whether they want to keep or discard those changes. \
+ If they want to keep them, ask for confirmation then use the save_file tool to save the file, then retry this edit. \
+ If they want to discard them, ask the user to manually revert the file, then inform you when it's ok to proceed."
+ }
+ (false, true) => {
+ "This file has unsaved changes. Ask the user whether they want to keep or discard those changes. \
+ If they want to keep them, ask the user to manually save the file, then inform you when it's ok to proceed. \
+ If they want to discard them, ask for confirmation then use the restore_file_from_disk tool to restore the on-disk contents, then retry this edit."
+ }
+ (false, false) => {
+ "This file has unsaved changes. Ask the user whether they want to keep or discard those changes, \
+ then ask them to save or revert the file manually and inform you when it's ok to proceed."
+ }
+ };
+ anyhow::bail!("{}", message);
}
// Check if the file was modified on disk since we last read it
@@ -389,10 +403,7 @@ impl AgentTool for EditFileTool {
range.start.to_point(&buffer.snapshot()).row
}).ok();
if let Some(abs_path) = abs_path.clone() {
- event_stream.update_fields(ToolCallUpdateFields {
- locations: Some(vec![ToolCallLocation { path: abs_path, line, meta: None }]),
- ..Default::default()
- });
+ event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![ToolCallLocation::new(abs_path).line(line)]));
}
emitted_location = true;
}
@@ -2210,9 +2221,21 @@ mod tests {
assert!(result.is_err(), "Edit should fail when buffer is dirty");
let error_msg = result.unwrap_err().to_string();
assert!(
- error_msg.contains("cannot be written to because it has unsaved changes"),
+ error_msg.contains("This file has unsaved changes."),
"Error should mention unsaved changes, got: {}",
error_msg
);
+ assert!(
+ error_msg.contains("keep or discard"),
+ "Error should ask whether to keep or discard changes, got: {}",
+ error_msg
+ );
+ // Since save_file and restore_file_from_disk tools aren't added to the thread,
+ // the error message should ask the user to manually save or revert
+ assert!(
+ error_msg.contains("save or revert the file manually"),
+ "Error should ask user to manually save or revert when tools aren't available, got: {}",
+ error_msg
+ );
}
}
diff --git a/crates/agent/src/tools/find_path_tool.rs b/crates/agent/src/tools/find_path_tool.rs
index 41954ee31b2a4529e75541e78eff278a521307da..2a33b14b4c87d87154e2aa1ee25363b397189f89 100644
--- a/crates/agent/src/tools/find_path_tool.rs
+++ b/crates/agent/src/tools/find_path_tool.rs
@@ -118,33 +118,29 @@ impl AgentTool for FindPathTool {
let paginated_matches: &[PathBuf] = &matches[cmp::min(input.offset, matches.len())
..cmp::min(input.offset + RESULTS_PER_PAGE, matches.len())];
- event_stream.update_fields(acp::ToolCallUpdateFields {
- title: Some(if paginated_matches.is_empty() {
- "No matches".into()
- } else if paginated_matches.len() == 1 {
- "1 match".into()
- } else {
- format!("{} matches", paginated_matches.len())
- }),
- content: Some(
- paginated_matches
- .iter()
- .map(|path| acp::ToolCallContent::Content {
- content: acp::ContentBlock::ResourceLink(acp::ResourceLink {
- uri: format!("file://{}", path.display()),
- name: path.to_string_lossy().into(),
- annotations: None,
- description: None,
- mime_type: None,
- size: None,
- title: None,
- meta: None,
- }),
- })
- .collect(),
- ),
- ..Default::default()
- });
+ event_stream.update_fields(
+ acp::ToolCallUpdateFields::new()
+ .title(if paginated_matches.is_empty() {
+ "No matches".into()
+ } else if paginated_matches.len() == 1 {
+ "1 match".into()
+ } else {
+ format!("{} matches", paginated_matches.len())
+ })
+ .content(
+ paginated_matches
+ .iter()
+ .map(|path| {
+ acp::ToolCallContent::Content(acp::Content::new(
+ acp::ContentBlock::ResourceLink(acp::ResourceLink::new(
+ path.to_string_lossy(),
+ format!("file://{}", path.display()),
+ )),
+ ))
+ })
+ .collect::>(),
+ ),
+ );
Ok(FindPathToolOutput {
offset: input.offset,
@@ -177,7 +173,7 @@ fn search_paths(glob: &str, project: Entity, cx: &mut App) -> Task
+ /// If the project has the following root directories:
+ ///
+ /// - /a/b/backend
+ /// - /c/d/frontend
+ ///
+ /// Use "backend/**/*.rs" to search only Rust files in the backend root directory.
+ /// Use "frontend/src/**/*.ts" to search TypeScript files only in the frontend root directory (sub-directory "src").
+ /// Use "**/*.rs" to search Rust files across all root directories.
+ ///
pub include_pattern: Option,
/// Optional starting position for paginated results (0-based).
/// When not provided, starts from the beginning.
@@ -132,8 +145,7 @@ impl AgentTool for GrepTool {
let exclude_patterns = global_settings
.file_scan_exclusions
.sources()
- .iter()
- .chain(global_settings.private_files.sources().iter());
+ .chain(global_settings.private_files.sources());
match PathMatcher::new(exclude_patterns, path_style) {
Ok(matcher) => matcher,
@@ -310,7 +322,6 @@ mod tests {
use super::*;
use gpui::{TestAppContext, UpdateGlobal};
- use language::{Language, LanguageConfig, LanguageMatcher};
use project::{FakeFs, Project};
use serde_json::json;
use settings::SettingsStore;
@@ -552,7 +563,7 @@ mod tests {
let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
project.update(cx, |project, _cx| {
- project.languages().add(rust_lang().into())
+ project.languages().add(language::rust_lang())
});
project
@@ -781,22 +792,6 @@ mod tests {
});
}
- fn rust_lang() -> Language {
- Language::new(
- LanguageConfig {
- name: "Rust".into(),
- matcher: LanguageMatcher {
- path_suffixes: vec!["rs".to_string()],
- ..Default::default()
- },
- ..Default::default()
- },
- Some(tree_sitter_rust::LANGUAGE.into()),
- )
- .with_outline_query(include_str!("../../../languages/src/rust/outline.scm"))
- .unwrap()
- }
-
#[gpui::test]
async fn test_grep_security_boundaries(cx: &mut TestAppContext) {
init_test(cx);
diff --git a/crates/agent/src/tools/read_file_tool.rs b/crates/agent/src/tools/read_file_tool.rs
index eccb40737c744d57792655cadb925e18a68d2835..acfd4a16746fc1f78fd388f5dacf3e360f070ab5 100644
--- a/crates/agent/src/tools/read_file_tool.rs
+++ b/crates/agent/src/tools/read_file_tool.rs
@@ -17,6 +17,9 @@ use crate::{AgentTool, Thread, ToolCallEventStream, outline};
/// Reads the content of the given file in the project.
///
/// - Never attempt to read a path that hasn't been previously mentioned.
+/// - For large files, this tool returns a file outline with symbol names and line numbers instead of the full content.
+/// This outline IS a successful response - use the line numbers to read specific sections with start_line/end_line.
+/// Do NOT retry reading the same file without line numbers if you receive an outline.
#[derive(Debug, Serialize, Deserialize, JsonSchema)]
pub struct ReadFileToolInput {
/// The relative path of the file to read.
@@ -150,14 +153,10 @@ impl AgentTool for ReadFileTool {
let file_path = input.path.clone();
- event_stream.update_fields(ToolCallUpdateFields {
- locations: Some(vec![acp::ToolCallLocation {
- path: abs_path.clone(),
- line: input.start_line.map(|line| line.saturating_sub(1)),
- meta: None,
- }]),
- ..Default::default()
- });
+ event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![
+ acp::ToolCallLocation::new(&abs_path)
+ .line(input.start_line.map(|line| line.saturating_sub(1))),
+ ]));
if image_store::is_image_file(&self.project, &project_path, cx) {
return cx.spawn(async move |cx| {
@@ -254,16 +253,15 @@ impl AgentTool for ReadFileTool {
if buffer_content.is_outline {
Ok(formatdoc! {"
- This file was too big to read all at once.
+ SUCCESS: File outline retrieved. This file is too large to read all at once, so the outline below shows the file's structure with line numbers.
- {}
+ IMPORTANT: Do NOT retry this call without line numbers - you will get the same outline.
+ Instead, use the line numbers below to read specific sections by calling this tool again with start_line and end_line parameters.
- Using the line numbers in this outline, you can call this tool again
- while specifying the start_line and end_line fields to see the
- implementations of symbols in the outline.
+ {}
- Alternatively, you can fall back to the `grep` tool (if available)
- to search the file for specific content.", buffer_content.text
+ NEXT STEPS: To read a specific symbol's implementation, call read_file with the same path plus start_line and end_line from the outline above.
+ For example, to read a function shown as [L100-150], use start_line: 100 and end_line: 150.", buffer_content.text
}
.into())
} else {
@@ -275,7 +273,9 @@ impl AgentTool for ReadFileTool {
project.set_agent_location(
Some(AgentLocation {
buffer: buffer.downgrade(),
- position: anchor.unwrap_or(text::Anchor::MIN),
+ position: anchor.unwrap_or_else(|| {
+ text::Anchor::min_for_buffer(buffer.read(cx).remote_id())
+ }),
}),
cx,
);
@@ -285,12 +285,9 @@ impl AgentTool for ReadFileTool {
text,
}
.to_string();
- event_stream.update_fields(ToolCallUpdateFields {
- content: Some(vec![acp::ToolCallContent::Content {
- content: markdown.into(),
- }]),
- ..Default::default()
- })
+ event_stream.update_fields(ToolCallUpdateFields::new().content(vec![
+ acp::ToolCallContent::Content(acp::Content::new(markdown)),
+ ]));
}
})?;
@@ -304,7 +301,6 @@ mod test {
use super::*;
use crate::{ContextServerRegistry, Templates, Thread};
use gpui::{AppContext, TestAppContext, UpdateGlobal as _};
- use language::{Language, LanguageConfig, LanguageMatcher, tree_sitter_rust};
use language_model::fake_provider::FakeLanguageModel;
use project::{FakeFs, Project};
use prompt_store::ProjectContext;
@@ -408,7 +404,7 @@ mod test {
.await;
let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
- language_registry.add(Arc::new(rust_lang()));
+ language_registry.add(language::rust_lang());
let action_log = cx.new(|_| ActionLog::new(project.clone()));
let context_server_registry =
cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
@@ -438,7 +434,7 @@ mod test {
let content = result.to_str().unwrap();
assert_eq!(
- content.lines().skip(4).take(6).collect::>(),
+ content.lines().skip(7).take(6).collect::>(),
vec![
"struct Test0 [L1-4]",
" a [L2]",
@@ -473,7 +469,7 @@ mod test {
pretty_assertions::assert_eq!(
content
.lines()
- .skip(4)
+ .skip(7)
.take(expected_content.len())
.collect::>(),
expected_content
@@ -598,49 +594,6 @@ mod test {
});
}
- fn rust_lang() -> Language {
- Language::new(
- LanguageConfig {
- name: "Rust".into(),
- matcher: LanguageMatcher {
- path_suffixes: vec!["rs".to_string()],
- ..Default::default()
- },
- ..Default::default()
- },
- Some(tree_sitter_rust::LANGUAGE.into()),
- )
- .with_outline_query(
- r#"
- (line_comment) @annotation
-
- (struct_item
- "struct" @context
- name: (_) @name) @item
- (enum_item
- "enum" @context
- name: (_) @name) @item
- (enum_variant
- name: (_) @name) @item
- (field_declaration
- name: (_) @name) @item
- (impl_item
- "impl" @context
- trait: (_)? @name
- "for"? @context
- type: (_) @name
- body: (_ "{" (_)* "}")) @item
- (function_item
- "fn" @context
- name: (_) @name) @item
- (mod_item
- "mod" @context
- name: (_) @name) @item
- "#,
- )
- .unwrap()
- }
-
#[gpui::test]
async fn test_read_file_security(cx: &mut TestAppContext) {
init_test(cx);
diff --git a/crates/agent/src/tools/restore_file_from_disk_tool.rs b/crates/agent/src/tools/restore_file_from_disk_tool.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f5723f6ee3ee46144152dd3ed2939ab2cfaca9c0
--- /dev/null
+++ b/crates/agent/src/tools/restore_file_from_disk_tool.rs
@@ -0,0 +1,352 @@
+use agent_client_protocol as acp;
+use anyhow::Result;
+use collections::FxHashSet;
+use gpui::{App, Entity, SharedString, Task};
+use language::Buffer;
+use project::Project;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use crate::{AgentTool, ToolCallEventStream};
+
+/// Discards unsaved changes in open buffers by reloading file contents from disk.
+///
+/// Use this tool when:
+/// - You attempted to edit files but they have unsaved changes the user does not want to keep.
+/// - You want to reset files to the on-disk state before retrying an edit.
+///
+/// Only use this tool after asking the user for permission, because it will discard unsaved changes.
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct RestoreFileFromDiskToolInput {
+ /// The paths of the files to restore from disk.
+ pub paths: Vec,
+}
+
+pub struct RestoreFileFromDiskTool {
+ project: Entity,
+}
+
+impl RestoreFileFromDiskTool {
+ pub fn new(project: Entity) -> Self {
+ Self { project }
+ }
+}
+
+impl AgentTool for RestoreFileFromDiskTool {
+ type Input = RestoreFileFromDiskToolInput;
+ type Output = String;
+
+ fn name() -> &'static str {
+ "restore_file_from_disk"
+ }
+
+ fn kind() -> acp::ToolKind {
+ acp::ToolKind::Other
+ }
+
+ fn initial_title(
+ &self,
+ input: Result,
+ _cx: &mut App,
+ ) -> SharedString {
+ match input {
+ Ok(input) if input.paths.len() == 1 => "Restore file from disk".into(),
+ Ok(input) => format!("Restore {} files from disk", input.paths.len()).into(),
+ Err(_) => "Restore files from disk".into(),
+ }
+ }
+
+ fn run(
+ self: Arc,
+ input: Self::Input,
+ _event_stream: ToolCallEventStream,
+ cx: &mut App,
+ ) -> Task> {
+ let project = self.project.clone();
+ let input_paths = input.paths;
+
+ cx.spawn(async move |cx| {
+ let mut buffers_to_reload: FxHashSet> = FxHashSet::default();
+
+ let mut restored_paths: Vec = Vec::new();
+ let mut clean_paths: Vec = Vec::new();
+ let mut not_found_paths: Vec = Vec::new();
+ let mut open_errors: Vec<(PathBuf, String)> = Vec::new();
+ let mut dirty_check_errors: Vec<(PathBuf, String)> = Vec::new();
+ let mut reload_errors: Vec = Vec::new();
+
+ for path in input_paths {
+ let project_path =
+ project.read_with(cx, |project, cx| project.find_project_path(&path, cx));
+
+ let project_path = match project_path {
+ Ok(Some(project_path)) => project_path,
+ Ok(None) => {
+ not_found_paths.push(path);
+ continue;
+ }
+ Err(error) => {
+ open_errors.push((path, error.to_string()));
+ continue;
+ }
+ };
+
+ let open_buffer_task =
+ project.update(cx, |project, cx| project.open_buffer(project_path, cx));
+
+ let buffer = match open_buffer_task {
+ Ok(task) => match task.await {
+ Ok(buffer) => buffer,
+ Err(error) => {
+ open_errors.push((path, error.to_string()));
+ continue;
+ }
+ },
+ Err(error) => {
+ open_errors.push((path, error.to_string()));
+ continue;
+ }
+ };
+
+ let is_dirty = match buffer.read_with(cx, |buffer, _| buffer.is_dirty()) {
+ Ok(is_dirty) => is_dirty,
+ Err(error) => {
+ dirty_check_errors.push((path, error.to_string()));
+ continue;
+ }
+ };
+
+ if is_dirty {
+ buffers_to_reload.insert(buffer);
+ restored_paths.push(path);
+ } else {
+ clean_paths.push(path);
+ }
+ }
+
+ if !buffers_to_reload.is_empty() {
+ let reload_task = project.update(cx, |project, cx| {
+ project.reload_buffers(buffers_to_reload, true, cx)
+ });
+
+ match reload_task {
+ Ok(task) => {
+ if let Err(error) = task.await {
+ reload_errors.push(error.to_string());
+ }
+ }
+ Err(error) => {
+ reload_errors.push(error.to_string());
+ }
+ }
+ }
+
+ let mut lines: Vec = Vec::new();
+
+ if !restored_paths.is_empty() {
+ lines.push(format!("Restored {} file(s).", restored_paths.len()));
+ }
+ if !clean_paths.is_empty() {
+ lines.push(format!("{} clean.", clean_paths.len()));
+ }
+
+ if !not_found_paths.is_empty() {
+ lines.push(format!("Not found ({}):", not_found_paths.len()));
+ for path in ¬_found_paths {
+ lines.push(format!("- {}", path.display()));
+ }
+ }
+ if !open_errors.is_empty() {
+ lines.push(format!("Open failed ({}):", open_errors.len()));
+ for (path, error) in &open_errors {
+ lines.push(format!("- {}: {}", path.display(), error));
+ }
+ }
+ if !dirty_check_errors.is_empty() {
+ lines.push(format!(
+ "Dirty check failed ({}):",
+ dirty_check_errors.len()
+ ));
+ for (path, error) in &dirty_check_errors {
+ lines.push(format!("- {}: {}", path.display(), error));
+ }
+ }
+ if !reload_errors.is_empty() {
+ lines.push(format!("Reload failed ({}):", reload_errors.len()));
+ for error in &reload_errors {
+ lines.push(format!("- {}", error));
+ }
+ }
+
+ if lines.is_empty() {
+ Ok("No paths provided.".to_string())
+ } else {
+ Ok(lines.join("\n"))
+ }
+ })
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use fs::Fs;
+ use gpui::TestAppContext;
+ use language::LineEnding;
+ use project::FakeFs;
+ use serde_json::json;
+ use settings::SettingsStore;
+ use util::path;
+
+ fn init_test(cx: &mut TestAppContext) {
+ cx.update(|cx| {
+ let settings_store = SettingsStore::test(cx);
+ cx.set_global(settings_store);
+ });
+ }
+
+ #[gpui::test]
+ async fn test_restore_file_from_disk_output_and_effects(cx: &mut TestAppContext) {
+ init_test(cx);
+
+ let fs = FakeFs::new(cx.executor());
+ fs.insert_tree(
+ "/root",
+ json!({
+ "dirty.txt": "on disk: dirty\n",
+ "clean.txt": "on disk: clean\n",
+ }),
+ )
+ .await;
+
+ let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
+ let tool = Arc::new(RestoreFileFromDiskTool::new(project.clone()));
+
+ // Make dirty.txt dirty in-memory by saving different content into the buffer without saving to disk.
+ let dirty_project_path = project.read_with(cx, |project, cx| {
+ project
+ .find_project_path("root/dirty.txt", cx)
+ .expect("dirty.txt should exist in project")
+ });
+
+ let dirty_buffer = project
+ .update(cx, |project, cx| {
+ project.open_buffer(dirty_project_path, cx)
+ })
+ .await
+ .unwrap();
+ dirty_buffer.update(cx, |buffer, cx| {
+ buffer.edit([(0..buffer.len(), "in memory: dirty\n")], None, cx);
+ });
+ assert!(
+ dirty_buffer.read_with(cx, |buffer, _| buffer.is_dirty()),
+ "dirty.txt buffer should be dirty before restore"
+ );
+
+ // Ensure clean.txt is opened but remains clean.
+ let clean_project_path = project.read_with(cx, |project, cx| {
+ project
+ .find_project_path("root/clean.txt", cx)
+ .expect("clean.txt should exist in project")
+ });
+
+ let clean_buffer = project
+ .update(cx, |project, cx| {
+ project.open_buffer(clean_project_path, cx)
+ })
+ .await
+ .unwrap();
+ assert!(
+ !clean_buffer.read_with(cx, |buffer, _| buffer.is_dirty()),
+ "clean.txt buffer should start clean"
+ );
+
+ let output = cx
+ .update(|cx| {
+ tool.clone().run(
+ RestoreFileFromDiskToolInput {
+ paths: vec![
+ PathBuf::from("root/dirty.txt"),
+ PathBuf::from("root/clean.txt"),
+ ],
+ },
+ ToolCallEventStream::test().0,
+ cx,
+ )
+ })
+ .await
+ .unwrap();
+
+ // Output should mention restored + clean.
+ assert!(
+ output.contains("Restored 1 file(s)."),
+ "expected restored count line, got:\n{output}"
+ );
+ assert!(
+ output.contains("1 clean."),
+ "expected clean count line, got:\n{output}"
+ );
+
+ // Effect: dirty buffer should be restored back to disk content and become clean.
+ let dirty_text = dirty_buffer.read_with(cx, |buffer, _| buffer.text());
+ assert_eq!(
+ dirty_text, "on disk: dirty\n",
+ "dirty.txt buffer should be restored to disk contents"
+ );
+ assert!(
+ !dirty_buffer.read_with(cx, |buffer, _| buffer.is_dirty()),
+ "dirty.txt buffer should not be dirty after restore"
+ );
+
+ // Disk contents should be unchanged (restore-from-disk should not write).
+ let disk_dirty = fs.load(path!("/root/dirty.txt").as_ref()).await.unwrap();
+ assert_eq!(disk_dirty, "on disk: dirty\n");
+
+ // Sanity: clean buffer should remain clean and unchanged.
+ let clean_text = clean_buffer.read_with(cx, |buffer, _| buffer.text());
+ assert_eq!(clean_text, "on disk: clean\n");
+ assert!(
+ !clean_buffer.read_with(cx, |buffer, _| buffer.is_dirty()),
+ "clean.txt buffer should remain clean"
+ );
+
+ // Test empty paths case.
+ let output = cx
+ .update(|cx| {
+ tool.clone().run(
+ RestoreFileFromDiskToolInput { paths: vec![] },
+ ToolCallEventStream::test().0,
+ cx,
+ )
+ })
+ .await
+ .unwrap();
+ assert_eq!(output, "No paths provided.");
+
+ // Test not-found path case (path outside the project root).
+ let output = cx
+ .update(|cx| {
+ tool.clone().run(
+ RestoreFileFromDiskToolInput {
+ paths: vec![PathBuf::from("nonexistent/path.txt")],
+ },
+ ToolCallEventStream::test().0,
+ cx,
+ )
+ })
+ .await
+ .unwrap();
+ assert!(
+ output.contains("Not found (1):"),
+ "expected not-found header line, got:\n{output}"
+ );
+ assert!(
+ output.contains("- nonexistent/path.txt"),
+ "expected not-found path bullet, got:\n{output}"
+ );
+
+ let _ = LineEnding::Unix; // keep import used if the buffer edit API changes
+ }
+}
diff --git a/crates/agent/src/tools/save_file_tool.rs b/crates/agent/src/tools/save_file_tool.rs
new file mode 100644
index 0000000000000000000000000000000000000000..429352200109c52303c9f6f94a28a49136af1a61
--- /dev/null
+++ b/crates/agent/src/tools/save_file_tool.rs
@@ -0,0 +1,351 @@
+use agent_client_protocol as acp;
+use anyhow::Result;
+use collections::FxHashSet;
+use gpui::{App, Entity, SharedString, Task};
+use language::Buffer;
+use project::Project;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use crate::{AgentTool, ToolCallEventStream};
+
+/// Saves files that have unsaved changes.
+///
+/// Use this tool when you need to edit files but they have unsaved changes that must be saved first.
+/// Only use this tool after asking the user for permission to save their unsaved changes.
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct SaveFileToolInput {
+ /// The paths of the files to save.
+ pub paths: Vec,
+}
+
+pub struct SaveFileTool {
+ project: Entity,
+}
+
+impl SaveFileTool {
+ pub fn new(project: Entity) -> Self {
+ Self { project }
+ }
+}
+
+impl AgentTool for SaveFileTool {
+ type Input = SaveFileToolInput;
+ type Output = String;
+
+ fn name() -> &'static str {
+ "save_file"
+ }
+
+ fn kind() -> acp::ToolKind {
+ acp::ToolKind::Other
+ }
+
+ fn initial_title(
+ &self,
+ input: Result,
+ _cx: &mut App,
+ ) -> SharedString {
+ match input {
+ Ok(input) if input.paths.len() == 1 => "Save file".into(),
+ Ok(input) => format!("Save {} files", input.paths.len()).into(),
+ Err(_) => "Save files".into(),
+ }
+ }
+
+ fn run(
+ self: Arc,
+ input: Self::Input,
+ _event_stream: ToolCallEventStream,
+ cx: &mut App,
+ ) -> Task> {
+ let project = self.project.clone();
+ let input_paths = input.paths;
+
+ cx.spawn(async move |cx| {
+ let mut buffers_to_save: FxHashSet> = FxHashSet::default();
+
+ let mut saved_paths: Vec = Vec::new();
+ let mut clean_paths: Vec = Vec::new();
+ let mut not_found_paths: Vec = Vec::new();
+ let mut open_errors: Vec<(PathBuf, String)> = Vec::new();
+ let mut dirty_check_errors: Vec<(PathBuf, String)> = Vec::new();
+ let mut save_errors: Vec<(String, String)> = Vec::new();
+
+ for path in input_paths {
+ let project_path =
+ project.read_with(cx, |project, cx| project.find_project_path(&path, cx));
+
+ let project_path = match project_path {
+ Ok(Some(project_path)) => project_path,
+ Ok(None) => {
+ not_found_paths.push(path);
+ continue;
+ }
+ Err(error) => {
+ open_errors.push((path, error.to_string()));
+ continue;
+ }
+ };
+
+ let open_buffer_task =
+ project.update(cx, |project, cx| project.open_buffer(project_path, cx));
+
+ let buffer = match open_buffer_task {
+ Ok(task) => match task.await {
+ Ok(buffer) => buffer,
+ Err(error) => {
+ open_errors.push((path, error.to_string()));
+ continue;
+ }
+ },
+ Err(error) => {
+ open_errors.push((path, error.to_string()));
+ continue;
+ }
+ };
+
+ let is_dirty = match buffer.read_with(cx, |buffer, _| buffer.is_dirty()) {
+ Ok(is_dirty) => is_dirty,
+ Err(error) => {
+ dirty_check_errors.push((path, error.to_string()));
+ continue;
+ }
+ };
+
+ if is_dirty {
+ buffers_to_save.insert(buffer);
+ saved_paths.push(path);
+ } else {
+ clean_paths.push(path);
+ }
+ }
+
+ // Save each buffer individually since there's no batch save API.
+ for buffer in buffers_to_save {
+ let path_for_buffer = match buffer.read_with(cx, |buffer, _| {
+ buffer
+ .file()
+ .map(|file| file.path().to_rel_path_buf())
+ .map(|path| path.as_rel_path().as_unix_str().to_owned())
+ }) {
+ Ok(path) => path.unwrap_or_else(|| "".to_string()),
+ Err(error) => {
+ save_errors.push(("".to_string(), error.to_string()));
+ continue;
+ }
+ };
+
+ let save_task = project.update(cx, |project, cx| project.save_buffer(buffer, cx));
+
+ match save_task {
+ Ok(task) => {
+ if let Err(error) = task.await {
+ save_errors.push((path_for_buffer, error.to_string()));
+ }
+ }
+ Err(error) => {
+ save_errors.push((path_for_buffer, error.to_string()));
+ }
+ }
+ }
+
+ let mut lines: Vec = Vec::new();
+
+ if !saved_paths.is_empty() {
+ lines.push(format!("Saved {} file(s).", saved_paths.len()));
+ }
+ if !clean_paths.is_empty() {
+ lines.push(format!("{} clean.", clean_paths.len()));
+ }
+
+ if !not_found_paths.is_empty() {
+ lines.push(format!("Not found ({}):", not_found_paths.len()));
+ for path in ¬_found_paths {
+ lines.push(format!("- {}", path.display()));
+ }
+ }
+ if !open_errors.is_empty() {
+ lines.push(format!("Open failed ({}):", open_errors.len()));
+ for (path, error) in &open_errors {
+ lines.push(format!("- {}: {}", path.display(), error));
+ }
+ }
+ if !dirty_check_errors.is_empty() {
+ lines.push(format!(
+ "Dirty check failed ({}):",
+ dirty_check_errors.len()
+ ));
+ for (path, error) in &dirty_check_errors {
+ lines.push(format!("- {}: {}", path.display(), error));
+ }
+ }
+ if !save_errors.is_empty() {
+ lines.push(format!("Save failed ({}):", save_errors.len()));
+ for (path, error) in &save_errors {
+ lines.push(format!("- {}: {}", path, error));
+ }
+ }
+
+ if lines.is_empty() {
+ Ok("No paths provided.".to_string())
+ } else {
+ Ok(lines.join("\n"))
+ }
+ })
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use fs::Fs;
+ use gpui::TestAppContext;
+ use project::FakeFs;
+ use serde_json::json;
+ use settings::SettingsStore;
+ use util::path;
+
+ fn init_test(cx: &mut TestAppContext) {
+ cx.update(|cx| {
+ let settings_store = SettingsStore::test(cx);
+ cx.set_global(settings_store);
+ });
+ }
+
+ #[gpui::test]
+ async fn test_save_file_output_and_effects(cx: &mut TestAppContext) {
+ init_test(cx);
+
+ let fs = FakeFs::new(cx.executor());
+ fs.insert_tree(
+ "/root",
+ json!({
+ "dirty.txt": "on disk: dirty\n",
+ "clean.txt": "on disk: clean\n",
+ }),
+ )
+ .await;
+
+ let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
+ let tool = Arc::new(SaveFileTool::new(project.clone()));
+
+ // Make dirty.txt dirty in-memory.
+ let dirty_project_path = project.read_with(cx, |project, cx| {
+ project
+ .find_project_path("root/dirty.txt", cx)
+ .expect("dirty.txt should exist in project")
+ });
+
+ let dirty_buffer = project
+ .update(cx, |project, cx| {
+ project.open_buffer(dirty_project_path, cx)
+ })
+ .await
+ .unwrap();
+ dirty_buffer.update(cx, |buffer, cx| {
+ buffer.edit([(0..buffer.len(), "in memory: dirty\n")], None, cx);
+ });
+ assert!(
+ dirty_buffer.read_with(cx, |buffer, _| buffer.is_dirty()),
+ "dirty.txt buffer should be dirty before save"
+ );
+
+ // Ensure clean.txt is opened but remains clean.
+ let clean_project_path = project.read_with(cx, |project, cx| {
+ project
+ .find_project_path("root/clean.txt", cx)
+ .expect("clean.txt should exist in project")
+ });
+
+ let clean_buffer = project
+ .update(cx, |project, cx| {
+ project.open_buffer(clean_project_path, cx)
+ })
+ .await
+ .unwrap();
+ assert!(
+ !clean_buffer.read_with(cx, |buffer, _| buffer.is_dirty()),
+ "clean.txt buffer should start clean"
+ );
+
+ let output = cx
+ .update(|cx| {
+ tool.clone().run(
+ SaveFileToolInput {
+ paths: vec![
+ PathBuf::from("root/dirty.txt"),
+ PathBuf::from("root/clean.txt"),
+ ],
+ },
+ ToolCallEventStream::test().0,
+ cx,
+ )
+ })
+ .await
+ .unwrap();
+
+ // Output should mention saved + clean.
+ assert!(
+ output.contains("Saved 1 file(s)."),
+ "expected saved count line, got:\n{output}"
+ );
+ assert!(
+ output.contains("1 clean."),
+ "expected clean count line, got:\n{output}"
+ );
+
+ // Effect: dirty buffer should now be clean and disk should have new content.
+ assert!(
+ !dirty_buffer.read_with(cx, |buffer, _| buffer.is_dirty()),
+ "dirty.txt buffer should not be dirty after save"
+ );
+
+ let disk_dirty = fs.load(path!("/root/dirty.txt").as_ref()).await.unwrap();
+ assert_eq!(
+ disk_dirty, "in memory: dirty\n",
+ "dirty.txt disk content should be updated"
+ );
+
+ // Sanity: clean buffer should remain clean and disk unchanged.
+ let disk_clean = fs.load(path!("/root/clean.txt").as_ref()).await.unwrap();
+ assert_eq!(disk_clean, "on disk: clean\n");
+
+ // Test empty paths case.
+ let output = cx
+ .update(|cx| {
+ tool.clone().run(
+ SaveFileToolInput { paths: vec![] },
+ ToolCallEventStream::test().0,
+ cx,
+ )
+ })
+ .await
+ .unwrap();
+ assert_eq!(output, "No paths provided.");
+
+ // Test not-found path case.
+ let output = cx
+ .update(|cx| {
+ tool.clone().run(
+ SaveFileToolInput {
+ paths: vec![PathBuf::from("nonexistent/path.txt")],
+ },
+ ToolCallEventStream::test().0,
+ cx,
+ )
+ })
+ .await
+ .unwrap();
+ assert!(
+ output.contains("Not found (1):"),
+ "expected not-found header line, got:\n{output}"
+ );
+ assert!(
+ output.contains("- nonexistent/path.txt"),
+ "expected not-found path bullet, got:\n{output}"
+ );
+ }
+}
diff --git a/crates/agent/src/tools/terminal_tool.rs b/crates/agent/src/tools/terminal_tool.rs
index 6d30c19152001deaef5deeacbdf266e28ac03d08..f3302fb1894612287bf04acfbfa301188bf853fb 100644
--- a/crates/agent/src/tools/terminal_tool.rs
+++ b/crates/agent/src/tools/terminal_tool.rs
@@ -1,6 +1,7 @@
use agent_client_protocol as acp;
use anyhow::Result;
-use gpui::{App, Entity, SharedString, Task};
+use futures::FutureExt as _;
+use gpui::{App, AppContext, Entity, SharedString, Task};
use project::Project;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
@@ -8,6 +9,7 @@ use std::{
path::{Path, PathBuf},
rc::Rc,
sync::Arc,
+ time::Duration,
};
use util::markdown::MarkdownInlineCode;
@@ -25,13 +27,17 @@ const COMMAND_OUTPUT_LIMIT: u64 = 16 * 1024;
///
/// Do not use this tool for commands that run indefinitely, such as servers (like `npm run start`, `npm run dev`, `python -m http.server`, etc) or file watchers that don't terminate on their own.
///
+/// For potentially long-running commands, prefer specifying `timeout_ms` to bound runtime and prevent indefinite hangs.
+///
/// Remember that each invocation of this tool will spawn a new shell process, so you can't rely on any state from previous invocations.
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
pub struct TerminalToolInput {
/// The one-liner command to execute.
- command: String,
+ pub command: String,
/// Working directory for the command. This must be one of the root directories of the project.
- cd: String,
+ pub cd: String,
+ /// Optional maximum runtime (in milliseconds). If exceeded, the running terminal task is killed.
+ pub timeout_ms: Option,
}
pub struct TerminalTool {
@@ -112,12 +118,30 @@ impl AgentTool for TerminalTool {
.await?;
let terminal_id = terminal.id(cx)?;
- event_stream.update_fields(acp::ToolCallUpdateFields {
- content: Some(vec![acp::ToolCallContent::Terminal { terminal_id }]),
- ..Default::default()
- });
+ event_stream.update_fields(acp::ToolCallUpdateFields::new().content(vec![
+ acp::ToolCallContent::Terminal(acp::Terminal::new(terminal_id)),
+ ]));
+
+ let timeout = input.timeout_ms.map(Duration::from_millis);
+
+ let exit_status = match timeout {
+ Some(timeout) => {
+ let wait_for_exit = terminal.wait_for_exit(cx)?;
+ let timeout_task = cx.background_spawn(async move {
+ smol::Timer::after(timeout).await;
+ });
+
+ futures::select! {
+ status = wait_for_exit.clone().fuse() => status,
+ _ = timeout_task.fuse() => {
+ terminal.kill(cx)?;
+ wait_for_exit.await
+ }
+ }
+ }
+ None => terminal.wait_for_exit(cx)?.await,
+ };
- let exit_status = terminal.wait_for_exit(cx)?.await;
let output = terminal.current_output(cx)?;
Ok(process_content(output, &input.command, exit_status))
diff --git a/crates/agent/src/tools/thinking_tool.rs b/crates/agent/src/tools/thinking_tool.rs
index 0a68f7545f81ce3202c110b1435d33b57adf409c..96024326f6f1610f500972b1a98be45258e3966b 100644
--- a/crates/agent/src/tools/thinking_tool.rs
+++ b/crates/agent/src/tools/thinking_tool.rs
@@ -43,10 +43,8 @@ impl AgentTool for ThinkingTool {
event_stream: ToolCallEventStream,
_cx: &mut App,
) -> Task> {
- event_stream.update_fields(acp::ToolCallUpdateFields {
- content: Some(vec![input.content.into()]),
- ..Default::default()
- });
+ event_stream
+ .update_fields(acp::ToolCallUpdateFields::new().content(vec![input.content.into()]));
Task::ready(Ok("Finished thinking.".to_string()))
}
}
diff --git a/crates/agent/src/tools/web_search_tool.rs b/crates/agent/src/tools/web_search_tool.rs
index 03e9db6601579e082e4d83de50f1999209d9f197..eb4ebacea2a8e48d6efa9032f46b336ca30c39b6 100644
--- a/crates/agent/src/tools/web_search_tool.rs
+++ b/crates/agent/src/tools/web_search_tool.rs
@@ -76,10 +76,8 @@ impl AgentTool for WebSearchTool {
let response = match search_task.await {
Ok(response) => response,
Err(err) => {
- event_stream.update_fields(acp::ToolCallUpdateFields {
- title: Some("Web Search Failed".to_string()),
- ..Default::default()
- });
+ event_stream
+ .update_fields(acp::ToolCallUpdateFields::new().title("Web Search Failed"));
return Err(err);
}
};
@@ -107,26 +105,23 @@ fn emit_update(response: &WebSearchResponse, event_stream: &ToolCallEventStream)
} else {
format!("{} results", response.results.len())
};
- event_stream.update_fields(acp::ToolCallUpdateFields {
- title: Some(format!("Searched the web: {result_text}")),
- content: Some(
- response
- .results
- .iter()
- .map(|result| acp::ToolCallContent::Content {
- content: acp::ContentBlock::ResourceLink(acp::ResourceLink {
- name: result.title.clone(),
- uri: result.url.clone(),
- title: Some(result.title.clone()),
- description: Some(result.text.clone()),
- mime_type: None,
- annotations: None,
- size: None,
- meta: None,
- }),
- })
- .collect(),
- ),
- ..Default::default()
- });
+ event_stream.update_fields(
+ acp::ToolCallUpdateFields::new()
+ .title(format!("Searched the web: {result_text}"))
+ .content(
+ response
+ .results
+ .iter()
+ .map(|result| {
+ acp::ToolCallContent::Content(acp::Content::new(
+ acp::ContentBlock::ResourceLink(
+ acp::ResourceLink::new(result.title.clone(), result.url.clone())
+ .title(result.title.clone())
+ .description(result.text.clone()),
+ ),
+ ))
+ })
+ .collect::>(),
+ ),
+ );
}
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index a44bdd1f22478e92ace192c939561f855c2814bd..e99855fe8a7241468e93f01fe6c7b6fee161f600 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -9,6 +9,8 @@ use futures::io::BufReader;
use project::Project;
use project::agent_server_store::AgentServerCommand;
use serde::Deserialize;
+use settings::Settings as _;
+use task::ShellBuilder;
use util::ResultExt as _;
use std::path::PathBuf;
@@ -21,7 +23,7 @@ use gpui::{App, AppContext as _, AsyncApp, Entity, SharedString, Task, WeakEntit
use acp_thread::{AcpThread, AuthRequired, LoadError, TerminalProviderEvent};
use terminal::TerminalBuilder;
-use terminal::terminal_settings::{AlternateScroll, CursorShape};
+use terminal::terminal_settings::{AlternateScroll, CursorShape, TerminalSettings};
#[derive(Debug, Error)]
#[error("Unsupported version")]
@@ -29,7 +31,7 @@ pub struct UnsupportedVersion;
pub struct AcpConnection {
server_name: SharedString,
- telemetry_id: &'static str,
+ telemetry_id: SharedString,
connection: Rc,
sessions: Rc>>,
auth_methods: Vec,
@@ -54,7 +56,6 @@ pub struct AcpSession {
pub async fn connect(
server_name: SharedString,
- telemetry_id: &'static str,
command: AgentServerCommand,
root_dir: &Path,
default_mode: Option,
@@ -64,7 +65,6 @@ pub async fn connect(
) -> Result> {
let conn = AcpConnection::stdio(
server_name,
- telemetry_id,
command.clone(),
root_dir,
default_mode,
@@ -76,12 +76,11 @@ pub async fn connect(
Ok(Rc::new(conn) as _)
}
-const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::V1;
+const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::ProtocolVersion::V1;
impl AcpConnection {
pub async fn stdio(
server_name: SharedString,
- telemetry_id: &'static str,
command: AgentServerCommand,
root_dir: &Path,
default_mode: Option,
@@ -89,9 +88,11 @@ impl AcpConnection {
is_remote: bool,
cx: &mut AsyncApp,
) -> Result {
- let mut child = util::command::new_smol_command(&command.path);
+ let shell = cx.update(|cx| TerminalSettings::get(None, cx).shell.clone())?;
+ let builder = ShellBuilder::new(&shell, cfg!(windows)).non_interactive();
+ let mut child =
+ builder.build_command(Some(command.path.display().to_string()), &command.args);
child
- .args(command.args.iter().map(|arg| arg.as_str()))
.envs(command.env.iter().flatten())
.stdin(std::process::Stdio::piped())
.stdout(std::process::Stdio::piped())
@@ -174,34 +175,38 @@ impl AcpConnection {
})?;
let response = connection
- .initialize(acp::InitializeRequest {
- protocol_version: acp::VERSION,
- client_capabilities: acp::ClientCapabilities {
- fs: acp::FileSystemCapability {
- read_text_file: true,
- write_text_file: true,
- meta: None,
- },
- terminal: true,
- meta: Some(serde_json::json!({
- // Experimental: Allow for rendering terminal output from the agents
- "terminal_output": true,
- "terminal-auth": true,
- })),
- },
- client_info: Some(acp::Implementation {
- name: "zed".to_owned(),
- title: release_channel.map(|c| c.to_owned()),
- version,
- }),
- meta: None,
- })
+ .initialize(
+ acp::InitializeRequest::new(acp::ProtocolVersion::V1)
+ .client_capabilities(
+ acp::ClientCapabilities::new()
+ .fs(acp::FileSystemCapability::new()
+ .read_text_file(true)
+ .write_text_file(true))
+ .terminal(true)
+ // Experimental: Allow for rendering terminal output from the agents
+ .meta(acp::Meta::from_iter([
+ ("terminal_output".into(), true.into()),
+ ("terminal-auth".into(), true.into()),
+ ])),
+ )
+ .client_info(
+ acp::Implementation::new("zed", version)
+ .title(release_channel.map(ToOwned::to_owned)),
+ ),
+ )
.await?;
if response.protocol_version < MINIMUM_SUPPORTED_VERSION {
return Err(UnsupportedVersion.into());
}
+ let telemetry_id = response
+ .agent_info
+ // Use the one the agent provides if we have one
+ .map(|info| info.name.into())
+ // Otherwise, just use the name
+ .unwrap_or_else(|| server_name.clone());
+
Ok(Self {
auth_methods: response.auth_methods,
root_dir: root_dir.to_owned(),
@@ -236,8 +241,8 @@ impl Drop for AcpConnection {
}
impl AgentConnection for AcpConnection {
- fn telemetry_id(&self) -> &'static str {
- self.telemetry_id
+ fn telemetry_id(&self) -> SharedString {
+ self.telemetry_id.clone()
}
fn new_thread(
@@ -253,14 +258,13 @@ impl AgentConnection for AcpConnection {
let default_model = self.default_model.clone();
let cwd = cwd.to_path_buf();
let context_server_store = project.read(cx).context_server_store().read(cx);
- let mcp_servers =
- if project.read(cx).is_local() {
- context_server_store
- .configured_server_ids()
- .iter()
- .filter_map(|id| {
- let configuration = context_server_store.configuration_for_server(id)?;
- match &*configuration {
+ let mcp_servers = if project.read(cx).is_local() {
+ context_server_store
+ .configured_server_ids()
+ .iter()
+ .filter_map(|id| {
+ let configuration = context_server_store.configuration_for_server(id)?;
+ match &*configuration {
project::context_server_store::ContextServerConfiguration::Custom {
command,
..
@@ -268,53 +272,47 @@ impl AgentConnection for AcpConnection {
| project::context_server_store::ContextServerConfiguration::Extension {
command,
..
- } => Some(acp::McpServer::Stdio {
- name: id.0.to_string(),
- command: command.path.clone(),
- args: command.args.clone(),
- env: if let Some(env) = command.env.as_ref() {
- env.iter()
- .map(|(name, value)| acp::EnvVariable {
- name: name.clone(),
- value: value.clone(),
- meta: None,
- })
- .collect()
- } else {
- vec![]
- },
- }),
+ } => Some(acp::McpServer::Stdio(
+ acp::McpServerStdio::new(id.0.to_string(), &command.path)
+ .args(command.args.clone())
+ .env(if let Some(env) = command.env.as_ref() {
+ env.iter()
+ .map(|(name, value)| acp::EnvVariable::new(name, value))
+ .collect()
+ } else {
+ vec![]
+ }),
+ )),
project::context_server_store::ContextServerConfiguration::Http {
url,
headers,
- } => Some(acp::McpServer::Http {
- name: id.0.to_string(),
- url: url.to_string(),
- headers: headers.iter().map(|(name, value)| acp::HttpHeader {
- name: name.clone(),
- value: value.clone(),
- meta: None,
- }).collect(),
- }),
+ } => Some(acp::McpServer::Http(
+ acp::McpServerHttp::new(id.0.to_string(), url.to_string()).headers(
+ headers
+ .iter()
+ .map(|(name, value)| acp::HttpHeader::new(name, value))
+ .collect(),
+ ),
+ )),
}
- })
- .collect()
- } else {
- // In SSH projects, the external agent is running on the remote
- // machine, and currently we only run MCP servers on the local
- // machine. So don't pass any MCP servers to the agent in that case.
- Vec::new()
- };
+ })
+ .collect()
+ } else {
+ // In SSH projects, the external agent is running on the remote
+ // machine, and currently we only run MCP servers on the local
+ // machine. So don't pass any MCP servers to the agent in that case.
+ Vec::new()
+ };
cx.spawn(async move |cx| {
let response = conn
- .new_session(acp::NewSessionRequest { mcp_servers, cwd, meta: None })
+ .new_session(acp::NewSessionRequest::new(cwd).mcp_servers(mcp_servers))
.await
.map_err(|err| {
- if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
+ if err.code == acp::ErrorCode::AuthRequired {
let mut error = AuthRequired::new();
- if err.message != acp::ErrorCode::AUTH_REQUIRED.message {
+ if err.message != acp::ErrorCode::AuthRequired.to_string() {
error = error.with_description(err.message);
}
@@ -341,11 +339,7 @@ impl AgentConnection for AcpConnection {
let modes = modes.clone();
let conn = conn.clone();
async move |_| {
- let result = conn.set_session_mode(acp::SetSessionModeRequest {
- session_id,
- mode_id: default_mode,
- meta: None,
- })
+ let result = conn.set_session_mode(acp::SetSessionModeRequest::new(session_id, default_mode))
.await.log_err();
if result.is_none() {
@@ -388,11 +382,7 @@ impl AgentConnection for AcpConnection {
let models = models.clone();
let conn = conn.clone();
async move |_| {
- let result = conn.set_session_model(acp::SetSessionModelRequest {
- session_id,
- model_id: default_model,
- meta: None,
- })
+ let result = conn.set_session_model(acp::SetSessionModelRequest::new(session_id, default_model))
.await.log_err();
if result.is_none() {
@@ -456,12 +446,8 @@ impl AgentConnection for AcpConnection {
fn authenticate(&self, method_id: acp::AuthMethodId, cx: &mut App) -> Task> {
let conn = self.connection.clone();
cx.foreground_executor().spawn(async move {
- conn.authenticate(acp::AuthenticateRequest {
- method_id: method_id.clone(),
- meta: None,
- })
- .await?;
-
+ conn.authenticate(acp::AuthenticateRequest::new(method_id))
+ .await?;
Ok(())
})
}
@@ -488,11 +474,11 @@ impl AgentConnection for AcpConnection {
match result {
Ok(response) => Ok(response),
Err(err) => {
- if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
+ if err.code == acp::ErrorCode::AuthRequired {
return Err(anyhow!(acp::Error::auth_required()));
}
- if err.code != ErrorCode::INTERNAL_ERROR.code {
+ if err.code != ErrorCode::InternalError {
anyhow::bail!(err)
}
@@ -515,10 +501,7 @@ impl AgentConnection for AcpConnection {
&& (details.contains("This operation was aborted")
|| details.contains("The user aborted a request"))
{
- Ok(acp::PromptResponse {
- stop_reason: acp::StopReason::Cancelled,
- meta: None,
- })
+ Ok(acp::PromptResponse::new(acp::StopReason::Cancelled))
} else {
Err(anyhow!(details))
}
@@ -535,10 +518,7 @@ impl AgentConnection for AcpConnection {
session.suppress_abort_err = true;
}
let conn = self.connection.clone();
- let params = acp::CancelNotification {
- session_id: session_id.clone(),
- meta: None,
- };
+ let params = acp::CancelNotification::new(session_id.clone());
cx.foreground_executor()
.spawn(async move { conn.cancel(params).await })
.detach();
@@ -619,11 +599,7 @@ impl acp_thread::AgentSessionModes for AcpSessionModes {
let state = self.state.clone();
cx.foreground_executor().spawn(async move {
let result = connection
- .set_session_mode(acp::SetSessionModeRequest {
- session_id,
- mode_id,
- meta: None,
- })
+ .set_session_mode(acp::SetSessionModeRequest::new(session_id, mode_id))
.await;
if result.is_err() {
@@ -682,11 +658,7 @@ impl acp_thread::AgentModelSelector for AcpModelSelector {
let state = self.state.clone();
cx.foreground_executor().spawn(async move {
let result = connection
- .set_session_model(acp::SetSessionModelRequest {
- session_id,
- model_id,
- meta: None,
- })
+ .set_session_model(acp::SetSessionModelRequest::new(session_id, model_id))
.await;
if result.is_err() {
@@ -748,10 +720,7 @@ impl acp::Client for ClientDelegate {
let outcome = task.await;
- Ok(acp::RequestPermissionResponse {
- outcome,
- meta: None,
- })
+ Ok(acp::RequestPermissionResponse::new(outcome))
}
async fn write_text_file(
@@ -783,10 +752,7 @@ impl acp::Client for ClientDelegate {
let content = task.await?;
- Ok(acp::ReadTextFileResponse {
- content,
- meta: None,
- })
+ Ok(acp::ReadTextFileResponse::new(content))
}
async fn session_notification(
@@ -821,7 +787,7 @@ impl acp::Client for ClientDelegate {
if let Some(terminal_info) = meta.get("terminal_info") {
if let Some(id_str) = terminal_info.get("terminal_id").and_then(|v| v.as_str())
{
- let terminal_id = acp::TerminalId(id_str.into());
+ let terminal_id = acp::TerminalId::new(id_str);
let cwd = terminal_info
.get("cwd")
.and_then(|v| v.as_str().map(PathBuf::from));
@@ -837,7 +803,7 @@ impl acp::Client for ClientDelegate {
let lower = cx.new(|cx| builder.subscribe(cx));
thread.on_terminal_provider_event(
TerminalProviderEvent::Created {
- terminal_id: terminal_id.clone(),
+ terminal_id,
label: tc.title.clone(),
cwd,
output_byte_limit: None,
@@ -862,15 +828,12 @@ impl acp::Client for ClientDelegate {
if let Some(meta) = &tcu.meta {
if let Some(term_out) = meta.get("terminal_output") {
if let Some(id_str) = term_out.get("terminal_id").and_then(|v| v.as_str()) {
- let terminal_id = acp::TerminalId(id_str.into());
+ let terminal_id = acp::TerminalId::new(id_str);
if let Some(s) = term_out.get("data").and_then(|v| v.as_str()) {
let data = s.as_bytes().to_vec();
let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
thread.on_terminal_provider_event(
- TerminalProviderEvent::Output {
- terminal_id: terminal_id.clone(),
- data,
- },
+ TerminalProviderEvent::Output { terminal_id, data },
cx,
);
});
@@ -881,21 +844,24 @@ impl acp::Client for ClientDelegate {
// terminal_exit
if let Some(term_exit) = meta.get("terminal_exit") {
if let Some(id_str) = term_exit.get("terminal_id").and_then(|v| v.as_str()) {
- let terminal_id = acp::TerminalId(id_str.into());
- let status = acp::TerminalExitStatus {
- exit_code: term_exit
- .get("exit_code")
- .and_then(|v| v.as_u64())
- .map(|i| i as u32),
- signal: term_exit
- .get("signal")
- .and_then(|v| v.as_str().map(|s| s.to_string())),
- meta: None,
- };
+ let terminal_id = acp::TerminalId::new(id_str);
+ let status = acp::TerminalExitStatus::new()
+ .exit_code(
+ term_exit
+ .get("exit_code")
+ .and_then(|v| v.as_u64())
+ .map(|i| i as u32),
+ )
+ .signal(
+ term_exit
+ .get("signal")
+ .and_then(|v| v.as_str().map(|s| s.to_string())),
+ );
+
let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
thread.on_terminal_provider_event(
TerminalProviderEvent::Exit {
- terminal_id: terminal_id.clone(),
+ terminal_id,
status,
},
cx,
@@ -932,7 +898,7 @@ impl acp::Client for ClientDelegate {
// Register with renderer
let terminal_entity = thread.update(&mut self.cx.clone(), |thread, cx| {
thread.register_terminal_created(
- acp::TerminalId(uuid::Uuid::new_v4().to_string().into()),
+ acp::TerminalId::new(uuid::Uuid::new_v4().to_string()),
format!("{} {}", args.command, args.args.join(" ")),
args.cwd.clone(),
args.output_byte_limit,
@@ -942,10 +908,7 @@ impl acp::Client for ClientDelegate {
})?;
let terminal_id =
terminal_entity.read_with(&self.cx, |terminal, _| terminal.id().clone())?;
- Ok(acp::CreateTerminalResponse {
- terminal_id,
- meta: None,
- })
+ Ok(acp::CreateTerminalResponse::new(terminal_id))
}
async fn kill_terminal_command(
@@ -1006,10 +969,7 @@ impl acp::Client for ClientDelegate {
})??
.await;
- Ok(acp::WaitForTerminalExitResponse {
- exit_status,
- meta: None,
- })
+ Ok(acp::WaitForTerminalExitResponse::new(exit_status))
}
}
diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs
index cf03b71a78b358d7b110c450f769f9645094baaa..46e8508e44f07e4fb3d613e30387d5afd3f38423 100644
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -56,7 +56,6 @@ impl AgentServerDelegate {
pub trait AgentServer: Send {
fn logo(&self) -> ui::IconName;
fn name(&self) -> SharedString;
- fn telemetry_id(&self) -> &'static str;
fn default_mode(&self, _cx: &mut App) -> Option {
None
}
diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index ac79ab7484de90a84ce3d6720f54bcec6addc6b5..e67ddd5c0698758fdec7c7796b26a1351e9990e5 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -22,10 +22,6 @@ pub struct AgentServerLoginCommand {
}
impl AgentServer for ClaudeCode {
- fn telemetry_id(&self) -> &'static str {
- "claude-code"
- }
-
fn name(&self) -> SharedString {
"Claude Code".into()
}
@@ -41,7 +37,7 @@ impl AgentServer for ClaudeCode {
settings
.as_ref()
- .and_then(|s| s.default_mode.clone().map(|m| acp::SessionModeId(m.into())))
+ .and_then(|s| s.default_mode.clone().map(acp::SessionModeId::new))
}
fn set_default_mode(&self, mode_id: Option, fs: Arc, cx: &mut App) {
@@ -62,7 +58,7 @@ impl AgentServer for ClaudeCode {
settings
.as_ref()
- .and_then(|s| s.default_model.clone().map(|m| acp::ModelId(m.into())))
+ .and_then(|s| s.default_model.clone().map(acp::ModelId::new))
}
fn set_default_model(&self, model_id: Option, fs: Arc, cx: &mut App) {
@@ -83,7 +79,6 @@ impl AgentServer for ClaudeCode {
cx: &mut App,
) -> Task, Option)>> {
let name = self.name();
- let telemetry_id = self.telemetry_id();
let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
let is_remote = delegate.project.read(cx).is_via_remote_server();
let store = delegate.store.downgrade();
@@ -108,7 +103,6 @@ impl AgentServer for ClaudeCode {
.await?;
let connection = crate::acp::connect(
name,
- telemetry_id,
command,
root_dir.as_ref(),
default_mode,
diff --git a/crates/agent_servers/src/codex.rs b/crates/agent_servers/src/codex.rs
index ec01cd4e523b5696b2f09b5e51e7137fcfb16c91..c2b308e48b7a984b0374272c0059286e933916b3 100644
--- a/crates/agent_servers/src/codex.rs
+++ b/crates/agent_servers/src/codex.rs
@@ -23,10 +23,6 @@ pub(crate) mod tests {
}
impl AgentServer for Codex {
- fn telemetry_id(&self) -> &'static str {
- "codex"
- }
-
fn name(&self) -> SharedString {
"Codex".into()
}
@@ -42,7 +38,7 @@ impl AgentServer for Codex {
settings
.as_ref()
- .and_then(|s| s.default_mode.clone().map(|m| acp::SessionModeId(m.into())))
+ .and_then(|s| s.default_mode.clone().map(acp::SessionModeId::new))
}
fn set_default_mode(&self, mode_id: Option, fs: Arc, cx: &mut App) {
@@ -63,7 +59,7 @@ impl AgentServer for Codex {
settings
.as_ref()
- .and_then(|s| s.default_model.clone().map(|m| acp::ModelId(m.into())))
+ .and_then(|s| s.default_model.clone().map(acp::ModelId::new))
}
fn set_default_model(&self, model_id: Option, fs: Arc, cx: &mut App) {
@@ -84,7 +80,6 @@ impl AgentServer for Codex {
cx: &mut App,
) -> Task, Option)>> {
let name = self.name();
- let telemetry_id = self.telemetry_id();
let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
let is_remote = delegate.project.read(cx).is_via_remote_server();
let store = delegate.store.downgrade();
@@ -110,7 +105,6 @@ impl AgentServer for Codex {
let connection = crate::acp::connect(
name,
- telemetry_id,
command,
root_dir.as_ref(),
default_mode,
diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs
index e7625c2cc06095c9a24a2537e4e83bced26d73f3..6b981ce8b8198b275e5d9aa05b6fb66431d22e08 100644
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@@ -1,4 +1,4 @@
-use crate::{AgentServerDelegate, load_proxy_env};
+use crate::{AgentServer, AgentServerDelegate, load_proxy_env};
use acp_thread::AgentConnection;
use agent_client_protocol as acp;
use anyhow::{Context as _, Result};
@@ -20,11 +20,7 @@ impl CustomAgentServer {
}
}
-impl crate::AgentServer for CustomAgentServer {
- fn telemetry_id(&self) -> &'static str {
- "custom"
- }
-
+impl AgentServer for CustomAgentServer {
fn name(&self) -> SharedString {
self.name.clone()
}
@@ -44,7 +40,7 @@ impl crate::AgentServer for CustomAgentServer {
settings
.as_ref()
- .and_then(|s| s.default_mode().map(|m| acp::SessionModeId(m.into())))
+ .and_then(|s| s.default_mode().map(acp::SessionModeId::new))
}
fn set_default_mode(&self, mode_id: Option, fs: Arc, cx: &mut App) {
@@ -80,7 +76,7 @@ impl crate::AgentServer for CustomAgentServer {
settings
.as_ref()
- .and_then(|s| s.default_model().map(|m| acp::ModelId(m.into())))
+ .and_then(|s| s.default_model().map(acp::ModelId::new))
}
fn set_default_model(&self, model_id: Option, fs: Arc, cx: &mut App) {
@@ -112,14 +108,12 @@ impl crate::AgentServer for CustomAgentServer {
cx: &mut App,
) -> Task, Option)>> {
let name = self.name();
- let telemetry_id = self.telemetry_id();
let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
let is_remote = delegate.project.read(cx).is_via_remote_server();
let default_mode = self.default_mode(cx);
let default_model = self.default_model(cx);
let store = delegate.store.downgrade();
let extra_env = load_proxy_env(cx);
-
cx.spawn(async move |cx| {
let (command, root_dir, login) = store
.update(cx, |store, cx| {
@@ -139,7 +133,6 @@ impl crate::AgentServer for CustomAgentServer {
.await?;
let connection = crate::acp::connect(
name,
- telemetry_id,
command,
root_dir.as_ref(),
default_mode,
diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs
index 824b999bdaff46cf3ad3a570b62fecd596612563..9db7535b5e55d88d6856774c20365bbac46fc81e 100644
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -82,26 +82,9 @@ where
.update(cx, |thread, cx| {
thread.send(
vec![
- acp::ContentBlock::Text(acp::TextContent {
- text: "Read the file ".into(),
- annotations: None,
- meta: None,
- }),
- acp::ContentBlock::ResourceLink(acp::ResourceLink {
- uri: "foo.rs".into(),
- name: "foo.rs".into(),
- annotations: None,
- description: None,
- mime_type: None,
- size: None,
- title: None,
- meta: None,
- }),
- acp::ContentBlock::Text(acp::TextContent {
- text: " and tell me what the content of the println! is".into(),
- annotations: None,
- meta: None,
- }),
+ "Read the file ".into(),
+ acp::ContentBlock::ResourceLink(acp::ResourceLink::new("foo.rs", "foo.rs")),
+ " and tell me what the content of the println! is".into(),
],
cx,
)
@@ -429,7 +412,7 @@ macro_rules! common_e2e_tests {
async fn tool_call_with_permission(cx: &mut ::gpui::TestAppContext) {
$crate::e2e_tests::test_tool_call_with_permission(
$server,
- ::agent_client_protocol::PermissionOptionId($allow_option_id.into()),
+ ::agent_client_protocol::PermissionOptionId::new($allow_option_id),
cx,
)
.await;
diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index c1b2efb081551f82752dc15a909eec64ff78d94e..5fea74746aec73f3ea7bb33562244e4a6eea5ba7 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -12,10 +12,6 @@ use project::agent_server_store::GEMINI_NAME;
pub struct Gemini;
impl AgentServer for Gemini {
- fn telemetry_id(&self) -> &'static str {
- "gemini-cli"
- }
-
fn name(&self) -> SharedString {
"Gemini CLI".into()
}
@@ -31,7 +27,6 @@ impl AgentServer for Gemini {
cx: &mut App,
) -> Task, Option)>> {
let name = self.name();
- let telemetry_id = self.telemetry_id();
let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
let is_remote = delegate.project.read(cx).is_via_remote_server();
let store = delegate.store.downgrade();
@@ -66,7 +61,6 @@ impl AgentServer for Gemini {
let connection = crate::acp::connect(
name,
- telemetry_id,
command,
root_dir.as_ref(),
default_mode,
diff --git a/crates/agent_settings/Cargo.toml b/crates/agent_settings/Cargo.toml
index 8ddcac24fe054d1226f2bbac49498fd35d6ed1c3..0d7163549f0a4b172773c9ac95dcbc84b7212667 100644
--- a/crates/agent_settings/Cargo.toml
+++ b/crates/agent_settings/Cargo.toml
@@ -12,6 +12,7 @@ workspace = true
path = "src/agent_settings.rs"
[dependencies]
+agent-client-protocol.workspace = true
anyhow.workspace = true
cloud_llm_client.workspace = true
collections.workspace = true
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index 084ac7c3e7a1be4920126f857145e64b65a255dd..b513ec1a70b6f7ab02382dfa312ea2d4d6a47234 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -2,14 +2,15 @@ mod agent_profile;
use std::sync::Arc;
-use collections::IndexMap;
+use agent_client_protocol::ModelId;
+use collections::{HashSet, IndexMap};
use gpui::{App, Pixels, px};
use language_model::LanguageModel;
use project::DisableAiSettings;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use settings::{
- DefaultAgentView, DockPosition, LanguageModelParameters, LanguageModelSelection,
+ DefaultAgentView, DockPosition, DockSide, LanguageModelParameters, LanguageModelSelection,
NotifyWhenAgentWaiting, RegisterSetting, Settings,
};
@@ -24,13 +25,16 @@ pub struct AgentSettings {
pub enabled: bool,
pub button: bool,
pub dock: DockPosition,
+ pub agents_panel_dock: DockSide,
pub default_width: Pixels,
pub default_height: Pixels,
pub default_model: Option,
pub inline_assistant_model: Option,
+ pub inline_assistant_use_streaming_tools: bool,
pub commit_message_model: Option,
pub thread_summary_model: Option,
pub inline_alternatives: Vec,
+ pub favorite_models: Vec,
pub default_profile: AgentProfileId,
pub default_view: DefaultAgentView,
pub profiles: IndexMap,
@@ -94,6 +98,13 @@ impl AgentSettings {
pub fn set_message_editor_max_lines(&self) -> usize {
self.message_editor_min_lines * 2
}
+
+ pub fn favorite_model_ids(&self) -> HashSet {
+ self.favorite_models
+ .iter()
+ .map(|sel| ModelId::new(format!("{}/{}", sel.provider.0, sel.model)))
+ .collect()
+ }
}
#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Default)]
@@ -151,13 +162,18 @@ impl Settings for AgentSettings {
enabled: agent.enabled.unwrap(),
button: agent.button.unwrap(),
dock: agent.dock.unwrap(),
+ agents_panel_dock: agent.agents_panel_dock.unwrap(),
default_width: px(agent.default_width.unwrap()),
default_height: px(agent.default_height.unwrap()),
default_model: Some(agent.default_model.unwrap()),
inline_assistant_model: agent.inline_assistant_model,
+ inline_assistant_use_streaming_tools: agent
+ .inline_assistant_use_streaming_tools
+ .unwrap_or(true),
commit_message_model: agent.commit_message_model,
thread_summary_model: agent.thread_summary_model,
inline_alternatives: agent.inline_alternatives.unwrap_or_default(),
+ favorite_models: agent.favorite_models,
default_profile: AgentProfileId(agent.default_profile.unwrap()),
default_view: agent.default_view.unwrap(),
profiles: agent
diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml
index 0f52c07078f447c9d8a95312ccd96561516907a1..8a9633e578a85323f2a289bd83c169a1f5d7f272 100644
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -13,7 +13,8 @@ path = "src/agent_ui.rs"
doctest = false
[features]
-test-support = ["gpui/test-support", "language/test-support"]
+test-support = ["assistant_text_thread/test-support", "eval_utils", "gpui/test-support", "language/test-support", "reqwest_client", "workspace/test-support", "agent/test-support"]
+unit-eval = []
[dependencies]
acp_thread.workspace = true
@@ -39,6 +40,7 @@ component.workspace = true
context_server.workspace = true
db.workspace = true
editor.workspace = true
+eval_utils = { workspace = true, optional = true }
extension.workspace = true
extension_host.workspace = true
feature_flags.workspace = true
@@ -47,6 +49,7 @@ fs.workspace = true
futures.workspace = true
fuzzy.workspace = true
gpui.workspace = true
+gpui_tokio.workspace = true
html_to_markdown.workspace = true
http_client.workspace = true
indoc.workspace = true
@@ -69,6 +72,7 @@ postage.workspace = true
project.workspace = true
prompt_store.workspace = true
proto.workspace = true
+rand.workspace = true
release_channel.workspace = true
rope.workspace = true
rules_library.workspace = true
@@ -82,7 +86,6 @@ smol.workspace = true
streaming_diff.workspace = true
task.workspace = true
telemetry.workspace = true
-telemetry_events.workspace = true
terminal.workspace = true
terminal_view.workspace = true
text.workspace = true
@@ -93,19 +96,23 @@ ui.workspace = true
ui_input.workspace = true
url.workspace = true
util.workspace = true
+uuid.workspace = true
watch.workspace = true
workspace.workspace = true
zed_actions.workspace = true
image.workspace = true
async-fs.workspace = true
+reqwest_client = { workspace = true, optional = true }
[dev-dependencies]
acp_thread = { workspace = true, features = ["test-support"] }
agent = { workspace = true, features = ["test-support"] }
assistant_text_thread = { workspace = true, features = ["test-support"] }
buffer_diff = { workspace = true, features = ["test-support"] }
+clock.workspace = true
db = { workspace = true, features = ["test-support"] }
editor = { workspace = true, features = ["test-support"] }
+eval_utils.workspace = true
gpui = { workspace = true, "features" = ["test-support"] }
indoc.workspace = true
language = { workspace = true, "features" = ["test-support"] }
@@ -114,6 +121,6 @@ language_model = { workspace = true, "features" = ["test-support"] }
pretty_assertions.workspace = true
project = { workspace = true, features = ["test-support"] }
semver.workspace = true
-rand.workspace = true
+reqwest_client.workspace = true
tree-sitter-md.workspace = true
unindent.workspace = true
diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index 6fb94dfb6b84826d715e9b28163e9968fc2df3b9..feae74a86bc241c5d2e01f0941eafc60210f1bf6 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -22,7 +22,7 @@ use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
pub struct EntryViewState {
workspace: WeakEntity,
- project: Entity,
+ project: WeakEntity,
history_store: Entity,
prompt_store: Option>,
entries: Vec,
@@ -34,7 +34,7 @@ pub struct EntryViewState {
impl EntryViewState {
pub fn new(
workspace: WeakEntity,
- project: Entity,
+ project: WeakEntity,
history_store: Entity,
prompt_store: Option>,
prompt_capabilities: Rc>,
@@ -328,7 +328,7 @@ impl Entry {
fn create_terminal(
workspace: WeakEntity,
- project: Entity,
+ project: WeakEntity,
terminal: Entity,
window: &mut Window,
cx: &mut App,
@@ -336,9 +336,9 @@ fn create_terminal(
cx.new(|cx| {
let mut view = TerminalView::new(
terminal.read(cx).inner().clone(),
- workspace.clone(),
+ workspace,
None,
- project.downgrade(),
+ project,
window,
cx,
);
@@ -432,24 +432,11 @@ mod tests {
let (workspace, cx) =
cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
- let tool_call = acp::ToolCall {
- id: acp::ToolCallId("tool".into()),
- title: "Tool call".into(),
- kind: acp::ToolKind::Other,
- status: acp::ToolCallStatus::InProgress,
- content: vec![acp::ToolCallContent::Diff {
- diff: acp::Diff {
- path: "/project/hello.txt".into(),
- old_text: Some("hi world".into()),
- new_text: "hello world".into(),
- meta: None,
- },
- }],
- locations: vec![],
- raw_input: None,
- raw_output: None,
- meta: None,
- };
+ let tool_call = acp::ToolCall::new("tool", "Tool call")
+ .status(acp::ToolCallStatus::InProgress)
+ .content(vec![acp::ToolCallContent::Diff(
+ acp::Diff::new("/project/hello.txt", "hello world").old_text("hi world"),
+ )]);
let connection = Rc::new(StubAgentConnection::new());
let thread = cx
.update(|_, cx| {
@@ -471,7 +458,7 @@ mod tests {
let view_state = cx.new(|_cx| {
EntryViewState::new(
workspace.downgrade(),
- project.clone(),
+ project.downgrade(),
history_store,
None,
Default::default(),
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index 169220a3614bf2d74d24a9638f87b9613a556bd6..6bed82accf876aaaba0668d366216c3a965ad8cb 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -21,8 +21,8 @@ use editor::{
};
use futures::{FutureExt as _, future::join_all};
use gpui::{
- AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, ImageFormat, KeyContext,
- SharedString, Subscription, Task, TextStyle, WeakEntity,
+ AppContext, ClipboardEntry, Context, Entity, EventEmitter, FocusHandle, Focusable, ImageFormat,
+ KeyContext, SharedString, Subscription, Task, TextStyle, WeakEntity,
};
use language::{Buffer, Language, language_settings::InlayHintKind};
use project::{CompletionIntent, InlayHint, InlayHintLabel, InlayId, Project, Worktree};
@@ -34,12 +34,11 @@ use theme::ThemeSettings;
use ui::prelude::*;
use util::{ResultExt, debug_panic};
use workspace::{CollaboratorId, Workspace};
-use zed_actions::agent::Chat;
+use zed_actions::agent::{Chat, PasteRaw};
pub struct MessageEditor {
mention_set: Entity,
editor: Entity,
- project: Entity,
workspace: WeakEntity,
prompt_capabilities: Rc>,
available_commands: Rc>>,
@@ -98,7 +97,7 @@ impl PromptCompletionProviderDelegate for Entity {
impl MessageEditor {
pub fn new(
workspace: WeakEntity,
- project: Entity,
+ project: WeakEntity,
history_store: Entity,
prompt_store: Option>,
prompt_capabilities: Rc>,
@@ -124,6 +123,7 @@ impl MessageEditor {
let mut editor = Editor::new(mode, buffer, None, window, cx);
editor.set_placeholder_text(placeholder, window, cx);
editor.set_show_indent_guides(false, cx);
+ editor.set_show_completions_on_input(Some(true));
editor.set_soft_wrap();
editor.set_use_modal_editing(true);
editor.set_context_menu_options(ContextMenuOptions {
@@ -134,13 +134,8 @@ impl MessageEditor {
editor.register_addon(MessageEditorAddon::new());
editor
});
- let mention_set = cx.new(|_cx| {
- MentionSet::new(
- project.downgrade(),
- history_store.clone(),
- prompt_store.clone(),
- )
- });
+ let mention_set =
+ cx.new(|_cx| MentionSet::new(project, history_store.clone(), prompt_store.clone()));
let completion_provider = Rc::new(PromptCompletionProvider::new(
cx.entity(),
editor.downgrade(),
@@ -198,7 +193,6 @@ impl MessageEditor {
Self {
editor,
- project,
mention_set,
workspace,
prompt_capabilities,
@@ -225,8 +219,13 @@ impl MessageEditor {
.iter()
.find(|command| command.name == command_name)?;
- let acp::AvailableCommandInput::Unstructured { mut hint } =
- available_command.input.clone()?;
+ let acp::AvailableCommandInput::Unstructured(acp::UnstructuredCommandInput {
+ mut hint,
+ ..
+ }) = available_command.input.clone()?
+ else {
+ return None;
+ };
let mut hint_pos = MultiBufferOffset(parsed_command.source_range.end) + 1usize;
if hint_pos > snapshot.len() {
@@ -403,34 +402,27 @@ impl MessageEditor {
} => {
all_tracked_buffers.extend(tracked_buffers.iter().cloned());
if supports_embedded_context {
- acp::ContentBlock::Resource(acp::EmbeddedResource {
- annotations: None,
- resource:
- acp::EmbeddedResourceResource::TextResourceContents(
- acp::TextResourceContents {
- mime_type: None,
- text: content.clone(),
- uri: uri.to_uri().to_string(),
- meta: None,
- },
+ acp::ContentBlock::Resource(acp::EmbeddedResource::new(
+ acp::EmbeddedResourceResource::TextResourceContents(
+ acp::TextResourceContents::new(
+ content.clone(),
+ uri.to_uri().to_string(),
),
- meta: None,
- })
+ ),
+ ))
} else {
- acp::ContentBlock::ResourceLink(acp::ResourceLink {
- name: uri.name(),
- uri: uri.to_uri().to_string(),
- annotations: None,
- description: None,
- mime_type: None,
- size: None,
- title: None,
- meta: None,
- })
+ acp::ContentBlock::ResourceLink(acp::ResourceLink::new(
+ uri.name(),
+ uri.to_uri().to_string(),
+ ))
}
}
- Mention::Image(mention_image) => {
- let uri = match uri {
+ Mention::Image(mention_image) => acp::ContentBlock::Image(
+ acp::ImageContent::new(
+ mention_image.data.clone(),
+ mention_image.format.mime_type(),
+ )
+ .uri(match uri {
MentionUri::File { .. } => Some(uri.to_uri().to_string()),
MentionUri::PastedImage => None,
other => {
@@ -440,25 +432,11 @@ impl MessageEditor {
);
None
}
- };
- acp::ContentBlock::Image(acp::ImageContent {
- annotations: None,
- data: mention_image.data.to_string(),
- mime_type: mention_image.format.mime_type().into(),
- uri,
- meta: None,
- })
- }
- Mention::Link => acp::ContentBlock::ResourceLink(acp::ResourceLink {
- name: uri.name(),
- uri: uri.to_uri().to_string(),
- annotations: None,
- description: None,
- mime_type: None,
- size: None,
- title: None,
- meta: None,
- }),
+ }),
+ ),
+ Mention::Link => acp::ContentBlock::ResourceLink(
+ acp::ResourceLink::new(uri.name(), uri.to_uri().to_string()),
+ ),
};
chunks.push(chunk);
ix = crease_range.end.0;
@@ -565,6 +543,142 @@ impl MessageEditor {
}
fn paste(&mut self, _: &Paste, window: &mut Window, cx: &mut Context) {
+ let Some(workspace) = self.workspace.upgrade() else {
+ return;
+ };
+ let editor_clipboard_selections = cx
+ .read_from_clipboard()
+ .and_then(|item| item.entries().first().cloned())
+ .and_then(|entry| match entry {
+ ClipboardEntry::String(text) => {
+ text.metadata_json::>()
+ }
+ _ => None,
+ });
+
+ // Insert creases for pasted clipboard selections that:
+ // 1. Contain exactly one selection
+ // 2. Have an associated file path
+ // 3. Span multiple lines (not single-line selections)
+ // 4. Belong to a file that exists in the current project
+ let should_insert_creases = util::maybe!({
+ let selections = editor_clipboard_selections.as_ref()?;
+ if selections.len() > 1 {
+ return Some(false);
+ }
+ let selection = selections.first()?;
+ let file_path = selection.file_path.as_ref()?;
+ let line_range = selection.line_range.as_ref()?;
+
+ if line_range.start() == line_range.end() {
+ return Some(false);
+ }
+
+ Some(
+ workspace
+ .read(cx)
+ .project()
+ .read(cx)
+ .project_path_for_absolute_path(file_path, cx)
+ .is_some(),
+ )
+ })
+ .unwrap_or(false);
+
+ if should_insert_creases && let Some(selections) = editor_clipboard_selections {
+ cx.stop_propagation();
+ let insertion_target = self
+ .editor
+ .read(cx)
+ .selections
+ .newest_anchor()
+ .start
+ .text_anchor;
+
+ let project = workspace.read(cx).project().clone();
+ for selection in selections {
+ if let (Some(file_path), Some(line_range)) =
+ (selection.file_path, selection.line_range)
+ {
+ let crease_text =
+ acp_thread::selection_name(Some(file_path.as_ref()), &line_range);
+
+ let mention_uri = MentionUri::Selection {
+ abs_path: Some(file_path.clone()),
+ line_range: line_range.clone(),
+ };
+
+ let mention_text = mention_uri.as_link().to_string();
+ let (excerpt_id, text_anchor, content_len) =
+ self.editor.update(cx, |editor, cx| {
+ let buffer = editor.buffer().read(cx);
+ let snapshot = buffer.snapshot(cx);
+ let (excerpt_id, _, buffer_snapshot) = snapshot.as_singleton().unwrap();
+ let text_anchor = insertion_target.bias_left(&buffer_snapshot);
+
+ editor.insert(&mention_text, window, cx);
+ editor.insert(" ", window, cx);
+
+ (*excerpt_id, text_anchor, mention_text.len())
+ });
+
+ let Some((crease_id, tx)) = insert_crease_for_mention(
+ excerpt_id,
+ text_anchor,
+ content_len,
+ crease_text.into(),
+ mention_uri.icon_path(cx),
+ None,
+ self.editor.clone(),
+ window,
+ cx,
+ ) else {
+ continue;
+ };
+ drop(tx);
+
+ let mention_task = cx
+ .spawn({
+ let project = project.clone();
+ async move |_, cx| {
+ let project_path = project
+ .update(cx, |project, cx| {
+ project.project_path_for_absolute_path(&file_path, cx)
+ })
+ .map_err(|e| e.to_string())?
+ .ok_or_else(|| "project path not found".to_string())?;
+
+ let buffer = project
+ .update(cx, |project, cx| project.open_buffer(project_path, cx))
+ .map_err(|e| e.to_string())?
+ .await
+ .map_err(|e| e.to_string())?;
+
+ buffer
+ .update(cx, |buffer, cx| {
+ let start = Point::new(*line_range.start(), 0)
+ .min(buffer.max_point());
+ let end = Point::new(*line_range.end() + 1, 0)
+ .min(buffer.max_point());
+ let content = buffer.text_for_range(start..end).collect();
+ Mention::Text {
+ content,
+ tracked_buffers: vec![cx.entity()],
+ }
+ })
+ .map_err(|e| e.to_string())
+ }
+ })
+ .shared();
+
+ self.mention_set.update(cx, |mention_set, _cx| {
+ mention_set.insert_mention(crease_id, mention_uri.clone(), mention_task)
+ });
+ }
+ }
+ return;
+ }
+
if self.prompt_capabilities.borrow().image
&& let Some(task) =
paste_images_as_context(self.editor.clone(), self.mention_set.clone(), window, cx)
@@ -573,6 +687,13 @@ impl MessageEditor {
}
}
+ fn paste_raw(&mut self, _: &PasteRaw, window: &mut Window, cx: &mut Context) {
+ let editor = self.editor.clone();
+ window.defer(cx, move |window, cx| {
+ editor.update(cx, |editor, cx| editor.paste(&Paste, window, cx));
+ });
+ }
+
pub fn insert_dragged_files(
&mut self,
paths: Vec,
@@ -583,17 +704,18 @@ impl MessageEditor {
let Some(workspace) = self.workspace.upgrade() else {
return;
};
- let path_style = self.project.read(cx).path_style(cx);
+ let project = workspace.read(cx).project().clone();
+ let path_style = project.read(cx).path_style(cx);
let buffer = self.editor.read(cx).buffer().clone();
let Some(buffer) = buffer.read(cx).as_singleton() else {
return;
};
let mut tasks = Vec::new();
for path in paths {
- let Some(entry) = self.project.read(cx).entry_for_path(&path, cx) else {
+ let Some(entry) = project.read(cx).entry_for_path(&path, cx) else {
continue;
};
- let Some(worktree) = self.project.read(cx).worktree_for_id(path.worktree_id, cx) else {
+ let Some(worktree) = project.read(cx).worktree_for_id(path.worktree_id, cx) else {
continue;
};
let abs_path = worktree.read(cx).absolutize(&path.path);
@@ -701,9 +823,13 @@ impl MessageEditor {
window: &mut Window,
cx: &mut Context,
) {
+ let Some(workspace) = self.workspace.upgrade() else {
+ return;
+ };
+
self.clear(window, cx);
- let path_style = self.project.read(cx).path_style(cx);
+ let path_style = workspace.read(cx).project().read(cx).path_style(cx);
let mut text = String::new();
let mut mentions = Vec::new();
@@ -746,8 +872,7 @@ impl MessageEditor {
uri,
data,
mime_type,
- annotations: _,
- meta: _,
+ ..
}) => {
let mention_uri = if let Some(uri) = uri {
MentionUri::parse(&uri, path_style)
@@ -773,7 +898,7 @@ impl MessageEditor {
}),
));
}
- acp::ContentBlock::Audio(_) | acp::ContentBlock::Resource(_) => {}
+ _ => {}
}
}
@@ -846,6 +971,7 @@ impl Render for MessageEditor {
.on_action(cx.listener(Self::chat))
.on_action(cx.listener(Self::chat_with_follow))
.on_action(cx.listener(Self::cancel))
+ .on_action(cx.listener(Self::paste_raw))
.capture_action(cx.listener(Self::paste))
.flex_1()
.child({
@@ -947,7 +1073,7 @@ mod tests {
cx.new(|cx| {
MessageEditor::new(
workspace.downgrade(),
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
Default::default(),
@@ -1058,7 +1184,7 @@ mod tests {
cx.new(|cx| {
MessageEditor::new(
workspace_handle.clone(),
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
prompt_capabilities.clone(),
@@ -1092,12 +1218,7 @@ mod tests {
assert!(error_message.contains("Available commands: none"));
// Now simulate Claude providing its list of available commands (which doesn't include file)
- available_commands.replace(vec![acp::AvailableCommand {
- name: "help".to_string(),
- description: "Get help".to_string(),
- input: None,
- meta: None,
- }]);
+ available_commands.replace(vec![acp::AvailableCommand::new("help", "Get help")]);
// Test that unsupported slash commands trigger an error when we have a list of available commands
editor.update_in(cx, |editor, window, cx| {
@@ -1211,20 +1332,12 @@ mod tests {
let history_store = cx.new(|cx| HistoryStore::new(text_thread_store, cx));
let prompt_capabilities = Rc::new(RefCell::new(acp::PromptCapabilities::default()));
let available_commands = Rc::new(RefCell::new(vec![
- acp::AvailableCommand {
- name: "quick-math".to_string(),
- description: "2 + 2 = 4 - 1 = 3".to_string(),
- input: None,
- meta: None,
- },
- acp::AvailableCommand {
- name: "say-hello".to_string(),
- description: "Say hello to whoever you want".to_string(),
- input: Some(acp::AvailableCommandInput::Unstructured {
- hint: "".to_string(),
- }),
- meta: None,
- },
+ acp::AvailableCommand::new("quick-math", "2 + 2 = 4 - 1 = 3"),
+ acp::AvailableCommand::new("say-hello", "Say hello to whoever you want").input(
+ acp::AvailableCommandInput::Unstructured(acp::UnstructuredCommandInput::new(
+ "",
+ )),
+ ),
]));
let editor = workspace.update_in(&mut cx, |workspace, window, cx| {
@@ -1232,7 +1345,7 @@ mod tests {
let message_editor = cx.new(|cx| {
MessageEditor::new(
workspace_handle,
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
prompt_capabilities.clone(),
@@ -1257,7 +1370,7 @@ mod tests {
cx,
);
});
- message_editor.read(cx).focus_handle(cx).focus(window);
+ message_editor.read(cx).focus_handle(cx).focus(window, cx);
message_editor.read(cx).editor().clone()
});
@@ -1423,7 +1536,7 @@ mod tests {
rel_path("b/eight.txt"),
];
- let slash = PathStyle::local().separator();
+ let slash = PathStyle::local().primary_separator();
let mut opened_editors = Vec::new();
for path in paths {
@@ -1454,7 +1567,7 @@ mod tests {
let message_editor = cx.new(|cx| {
MessageEditor::new(
workspace_handle,
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
prompt_capabilities.clone(),
@@ -1479,7 +1592,7 @@ mod tests {
cx,
);
});
- message_editor.read(cx).focus_handle(cx).focus(window);
+ message_editor.read(cx).focus_handle(cx).focus(window, cx);
let editor = message_editor.read(cx).editor().clone();
(message_editor, editor)
});
@@ -1504,12 +1617,12 @@ mod tests {
editor.set_text("", window, cx);
});
- prompt_capabilities.replace(acp::PromptCapabilities {
- image: true,
- audio: true,
- embedded_context: true,
- meta: None,
- });
+ prompt_capabilities.replace(
+ acp::PromptCapabilities::new()
+ .image(true)
+ .audio(true)
+ .embedded_context(true),
+ );
cx.simulate_input("Lorem ");
@@ -1945,7 +2058,7 @@ mod tests {
cx.new(|cx| {
let editor = MessageEditor::new(
workspace.downgrade(),
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
Default::default(),
@@ -1960,11 +2073,9 @@ mod tests {
cx,
);
// Enable embedded context so files are actually included
- editor.prompt_capabilities.replace(acp::PromptCapabilities {
- embedded_context: true,
- meta: None,
- ..Default::default()
- });
+ editor
+ .prompt_capabilities
+ .replace(acp::PromptCapabilities::new().embedded_context(true));
editor
})
});
@@ -2043,7 +2154,7 @@ mod tests {
// Create a thread metadata to insert as summary
let thread_metadata = agent::DbThreadMetadata {
- id: acp::SessionId("thread-123".into()),
+ id: acp::SessionId::new("thread-123"),
title: "Previous Conversation".into(),
updated_at: chrono::Utc::now(),
};
@@ -2052,7 +2163,7 @@ mod tests {
cx.new(|cx| {
let mut editor = MessageEditor::new(
workspace.downgrade(),
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
Default::default(),
@@ -2121,7 +2232,7 @@ mod tests {
cx.new(|cx| {
MessageEditor::new(
workspace.downgrade(),
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
Default::default(),
@@ -2150,14 +2261,7 @@ mod tests {
.await
.unwrap();
- assert_eq!(
- content,
- vec![acp::ContentBlock::Text(acp::TextContent {
- text: "してhello world".into(),
- annotations: None,
- meta: None
- })]
- );
+ assert_eq!(content, vec!["してhello world".into()]);
}
#[gpui::test]
@@ -2191,7 +2295,7 @@ mod tests {
let message_editor = cx.new(|cx| {
MessageEditor::new(
workspace_handle,
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
Default::default(),
@@ -2216,7 +2320,7 @@ mod tests {
cx,
);
});
- message_editor.read(cx).focus_handle(cx).focus(window);
+ message_editor.read(cx).focus_handle(cx).focus(window, cx);
let editor = message_editor.read(cx).editor().clone();
(message_editor, editor)
});
@@ -2236,38 +2340,24 @@ mod tests {
.0;
let main_rs_uri = if cfg!(windows) {
- "file:///C:/project/src/main.rs".to_string()
+ "file:///C:/project/src/main.rs"
} else {
- "file:///project/src/main.rs".to_string()
+ "file:///project/src/main.rs"
};
// When embedded context is `false` we should get a resource link
pretty_assertions::assert_eq!(
content,
vec![
- acp::ContentBlock::Text(acp::TextContent {
- text: "What is in ".to_string(),
- annotations: None,
- meta: None
- }),
- acp::ContentBlock::ResourceLink(acp::ResourceLink {
- uri: main_rs_uri.clone(),
- name: "main.rs".to_string(),
- annotations: None,
- meta: None,
- description: None,
- mime_type: None,
- size: None,
- title: None,
- })
+ "What is in ".into(),
+ acp::ContentBlock::ResourceLink(acp::ResourceLink::new("main.rs", main_rs_uri))
]
);
message_editor.update(cx, |editor, _cx| {
- editor.prompt_capabilities.replace(acp::PromptCapabilities {
- embedded_context: true,
- ..Default::default()
- })
+ editor
+ .prompt_capabilities
+ .replace(acp::PromptCapabilities::new().embedded_context(true))
});
let content = message_editor
@@ -2280,23 +2370,12 @@ mod tests {
pretty_assertions::assert_eq!(
content,
vec![
- acp::ContentBlock::Text(acp::TextContent {
- text: "What is in ".to_string(),
- annotations: None,
- meta: None
- }),
- acp::ContentBlock::Resource(acp::EmbeddedResource {
- resource: acp::EmbeddedResourceResource::TextResourceContents(
- acp::TextResourceContents {
- text: file_content.to_string(),
- uri: main_rs_uri,
- mime_type: None,
- meta: None
- }
- ),
- annotations: None,
- meta: None
- })
+ "What is in ".into(),
+ acp::ContentBlock::Resource(acp::EmbeddedResource::new(
+ acp::EmbeddedResourceResource::TextResourceContents(
+ acp::TextResourceContents::new(file_content, main_rs_uri)
+ )
+ ))
]
);
}
@@ -2374,7 +2453,7 @@ mod tests {
let message_editor = cx.new(|cx| {
MessageEditor::new(
workspace_handle,
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
Default::default(),
diff --git a/crates/agent_ui/src/acp/mode_selector.rs b/crates/agent_ui/src/acp/mode_selector.rs
index 2db031cafeb8a66e43120be9766debe3c16eb2d0..22af75a6e96edc4f597819e04e2e84b80ba0417a 100644
--- a/crates/agent_ui/src/acp/mode_selector.rs
+++ b/crates/agent_ui/src/acp/mode_selector.rs
@@ -161,7 +161,7 @@ impl Render for ModeSelector {
.map(|mode| mode.name.clone())
.unwrap_or_else(|| "Unknown".into());
- let this = cx.entity();
+ let this = cx.weak_entity();
let icon = if self.menu_handle.is_deployed() {
IconName::ChevronUp
@@ -188,25 +188,25 @@ impl Render for ModeSelector {
.gap_1()
.child(
h_flex()
- .pb_1()
.gap_2()
.justify_between()
- .border_b_1()
- .border_color(cx.theme().colors().border_variant)
- .child(Label::new("Cycle Through Modes"))
+ .child(Label::new("Toggle Mode Menu"))
.child(KeyBinding::for_action_in(
- &CycleModeSelector,
+ &ToggleProfileSelector,
&focus_handle,
cx,
)),
)
.child(
h_flex()
+ .pb_1()
.gap_2()
.justify_between()
- .child(Label::new("Toggle Mode Menu"))
+ .border_b_1()
+ .border_color(cx.theme().colors().border_variant)
+ .child(Label::new("Cycle Through Modes"))
.child(KeyBinding::for_action_in(
- &ToggleProfileSelector,
+ &CycleModeSelector,
&focus_handle,
cx,
)),
@@ -222,7 +222,8 @@ impl Render for ModeSelector {
y: px(-2.0),
})
.menu(move |window, cx| {
- Some(this.update(cx, |this, cx| this.build_context_menu(window, cx)))
+ this.update(cx, |this, cx| this.build_context_menu(window, cx))
+ .ok()
})
}
}
diff --git a/crates/agent_ui/src/acp/model_selector.rs b/crates/agent_ui/src/acp/model_selector.rs
index 8a0c3c9df90e73d0ef00ecd7232115729dd35347..903d5fe425d99389aae0e2a8028d9a31b986fbb3 100644
--- a/crates/agent_ui/src/acp/model_selector.rs
+++ b/crates/agent_ui/src/acp/model_selector.rs
@@ -1,25 +1,26 @@
use std::{cmp::Reverse, rc::Rc, sync::Arc};
-use acp_thread::{AgentModelInfo, AgentModelList, AgentModelSelector};
+use acp_thread::{AgentModelIcon, AgentModelInfo, AgentModelList, AgentModelSelector};
+use agent_client_protocol::ModelId;
use agent_servers::AgentServer;
+use agent_settings::AgentSettings;
use anyhow::Result;
-use collections::IndexMap;
+use collections::{HashSet, IndexMap};
use fs::Fs;
use futures::FutureExt;
use fuzzy::{StringMatchCandidate, match_strings};
use gpui::{
Action, AsyncWindowContext, BackgroundExecutor, DismissEvent, FocusHandle, Task, WeakEntity,
};
+use itertools::Itertools;
use ordered_float::OrderedFloat;
use picker::{Picker, PickerDelegate};
-use ui::{
- DocumentationAside, DocumentationEdge, DocumentationSide, IntoElement, KeyBinding, ListItem,
- ListItemSpacing, prelude::*,
-};
+use settings::Settings;
+use ui::{DocumentationAside, DocumentationEdge, DocumentationSide, IntoElement, prelude::*};
use util::ResultExt;
use zed_actions::agent::OpenSettings;
-use crate::ui::HoldForDefault;
+use crate::ui::{HoldForDefault, ModelSelectorFooter, ModelSelectorHeader, ModelSelectorListItem};
pub type AcpModelSelector = Picker;
@@ -41,7 +42,7 @@ pub fn acp_model_selector(
enum AcpModelPickerEntry {
Separator(SharedString),
- Model(AgentModelInfo),
+ Model(AgentModelInfo, bool),
}
pub struct AcpModelPickerDelegate {
@@ -118,6 +119,67 @@ impl AcpModelPickerDelegate {
pub fn active_model(&self) -> Option<&AgentModelInfo> {
self.selected_model.as_ref()
}
+
+ pub fn cycle_favorite_models(&mut self, window: &mut Window, cx: &mut Context>) {
+ if !self.selector.supports_favorites() {
+ return;
+ }
+
+ let favorites = AgentSettings::get_global(cx).favorite_model_ids();
+
+ if favorites.is_empty() {
+ return;
+ }
+
+ let Some(models) = self.models.clone() else {
+ return;
+ };
+
+ let all_models: Vec = match models {
+ AgentModelList::Flat(list) => list,
+ AgentModelList::Grouped(index_map) => index_map
+ .into_values()
+ .flatten()
+ .collect::>(),
+ };
+
+ let favorite_models = all_models
+ .iter()
+ .filter(|model| favorites.contains(&model.id))
+ .unique_by(|model| &model.id)
+ .cloned()
+ .collect::>();
+
+ let current_id = self.selected_model.as_ref().map(|m| m.id.clone());
+
+ let current_index_in_favorites = current_id
+ .as_ref()
+ .and_then(|id| favorite_models.iter().position(|m| &m.id == id))
+ .unwrap_or(usize::MAX);
+
+ let next_index = if current_index_in_favorites == usize::MAX {
+ 0
+ } else {
+ (current_index_in_favorites + 1) % favorite_models.len()
+ };
+
+ let next_model = favorite_models[next_index].clone();
+
+ self.selector
+ .select_model(next_model.id.clone(), cx)
+ .detach_and_log_err(cx);
+
+ self.selected_model = Some(next_model);
+
+ // Keep the picker selection aligned with the newly-selected model
+ if let Some(new_index) = self.filtered_entries.iter().position(|entry| {
+ matches!(entry, AcpModelPickerEntry::Model(model_info, _) if self.selected_model.as_ref().is_some_and(|selected| model_info.id == selected.id))
+ }) {
+ self.set_selected_index(new_index, window, cx);
+ } else {
+ cx.notify();
+ }
+ }
}
impl PickerDelegate for AcpModelPickerDelegate {
@@ -143,7 +205,7 @@ impl PickerDelegate for AcpModelPickerDelegate {
_cx: &mut Context>,
) -> bool {
match self.filtered_entries.get(ix) {
- Some(AcpModelPickerEntry::Model(_)) => true,
+ Some(AcpModelPickerEntry::Model(_, _)) => true,
Some(AcpModelPickerEntry::Separator(_)) | None => false,
}
}
@@ -158,6 +220,12 @@ impl PickerDelegate for AcpModelPickerDelegate {
window: &mut Window,
cx: &mut Context